Merge branch '3.0.x'

Closes gh-978

Author: wilkinsona

docs/src/docs/asciidoc/getting-started.adoc

@@ -194,7 +194,7 @@ If you are not using Spring Boot and its plugin management, declare the plugin w
 [[getting-started-documentation-snippets]]
 === Generating Documentation Snippets
 
-Spring REST Docs uses Spring MVC's {spring-framework-docs}/testing.html#spring-mvc-test-framework[test framework], Spring WebFlux's {spring-framework-docs}/testing.html#webtestclient[`WebTestClient`], or https://rest-assured.io/[REST Assured] to make requests to the service that you are documenting.
+Spring REST Docs uses Spring MVC's {spring-framework-docs}/testing/mockmvc.html[test framework], Spring WebFlux's {spring-framework-docs}/testing/webtestclient.html[`WebTestClient`], or https://rest-assured.io/[REST Assured] to make requests to the service that you are documenting.
 It then produces documentation snippets for the request and the resulting response.
 
 

docs/src/docs/asciidoc/index.adoc

@@ -13,7 +13,7 @@ Andy Wilkinson; Jay Bryant
 :samples: https://github.com/spring-projects/spring-restdocs-samples/tree/main
 :templates: {source}spring-restdocs/src/main/resources/org/springframework/restdocs/templates
 :spring-boot-docs: https://docs.spring.io/spring-boot/docs/current/reference/htmlsingle
-:spring-framework-docs: https://docs.spring.io/spring-framework/docs/{spring-framework-version}/reference/html/
+:spring-framework-docs: https://docs.spring.io/spring-framework/reference/7.0
 :spring-framework-api: https://docs.spring.io/spring-framework/docs/{spring-framework-version}/javadoc-api
 
 [[abstract]]

docs/src/docs/asciidoc/introduction.adoc

@@ -9,7 +9,7 @@ To this end, Spring REST Docs uses https://asciidoctor.org[Asciidoctor] by defau
 Asciidoctor processes plain text and produces HTML, styled and laid out to suit your needs.
 If you prefer, you can also configure Spring REST Docs to use Markdown.
 
-Spring REST Docs uses snippets produced by tests written with Spring MVC's {spring-framework-docs}/testing.html#spring-mvc-test-framework[test framework], Spring WebFlux's {spring-framework-docs}/testing.html#webtestclient[`WebTestClient`] or https://rest-assured.io/[REST Assured 5].
+Spring REST Docs uses snippets produced by tests written with Spring MVC's {spring-framework-docs}/testing/mockmvc.html[test framework], Spring WebFlux's {spring-framework-docs}/testing/webtestclient.html[`WebTestClient`] or https://rest-assured.io/[REST Assured 5].
 This test-driven approach helps to guarantee the accuracy of your service's documentation.
 If a snippet is incorrect, the test that produces it fails.