Skip to content

Commit 2e50738

Browse files
committed
Merge branch '2.0.x'
Closes gh-824
2 parents 5a7dde1 + ce2c7b3 commit 2e50738

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

config/nohttp/allowlist.lines

-1
This file was deleted.

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

+3-2
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ If you want to jump straight in, a number of sample applications are available:
4242

4343
| {samples}/rest-assured[REST Assured]
4444
| Gradle
45-
| Demonstrates the use of Spring REST Docs with http://rest-assured.io[REST Assured].
45+
| Demonstrates the use of Spring REST Docs with https://rest-assured.io/[REST Assured].
4646

4747
|===
4848

@@ -245,7 +245,8 @@ The following listings show how to do so in both Maven and Gradle:
245245

246246
[[getting-started-documentation-snippets]]
247247
=== Generating Documentation Snippets
248-
Spring REST Docs uses Spring MVC's {spring-framework-docs}/testing.html#spring-mvc-test-framework[test framework] or 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.
248+
249+
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.
249250
It then produces documentation snippets for the request and the resulting response.
250251

251252

docs/src/docs/asciidoc/introduction.adoc

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ To this end, Spring REST Docs uses https://asciidoctor.org[Asciidoctor] by defau
99
Asciidoctor processes plain text and produces HTML, styled and laid out to suit your needs.
1010
If you prefer, you can also configure Spring REST Docs to use Markdown.
1111

12-
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 http://rest-assured.io[REST Assured 4].
12+
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 4].
1313
This test-driven approach helps to guarantee the accuracy of your service's documentation.
1414
If a snippet is incorrect, the test that produces it fails.
1515

0 commit comments

Comments
 (0)