Skip to content

Commit

Permalink
Polish asciidoc attributes
Browse files Browse the repository at this point in the history
  • Loading branch information
sbrannen committed Nov 18, 2022
1 parent 796b8c1 commit 3458f29
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 17 deletions.
28 changes: 15 additions & 13 deletions framework-docs/src/docs/asciidoc/attributes.adoc
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
:docs-java: {docdir}/../../main/java/org/springframework/docs
:docs-kotlin: {docdir}/../../main/kotlin/org/springframework/docs
:docs-resources: {docdir}/../../main/resources
:spring-framework-main-code: https://github.com/spring-projects/spring-framework/tree/main
:docs-site: https://docs.spring.io
:docs-spring-framework: {docs-site}/spring-framework/docs/{spring-version}
:api-spring-framework: {docs-spring-framework}/javadoc-api/org/springframework
:doc-spring-amqp: {docs-site}/spring-amqp/docs/current/reference
:doc-spring-gemfire: {docs-site}/spring-gemfire/docs/current/reference
:gh-rsocket: https://github.com/rsocket
:gh-rsocket-java: {gh-rsocket}/rsocket-java
:gh-rsocket-extensions: {gh-rsocket}/rsocket/blob/master/Extensions
:doc-spring-boot: {docs-site}/spring-boot/docs/current/reference
:docs-site: https://docs.spring.io
// Spring Framework
:docs-spring-framework: {docs-site}/spring-framework/docs/{spring-version}
:api-spring-framework: {docs-spring-framework}/javadoc-api/org/springframework
:docs-java: {docdir}/../../main/java/org/springframework/docs
:docs-kotlin: {docdir}/../../main/kotlin/org/springframework/docs
:docs-resources: {docdir}/../../main/resources
:spring-framework-main-code: https://github.com/spring-projects/spring-framework/tree/main
// Spring portfolio Links
:docs-spring-boot: {docs-site}/spring-boot/docs/current/reference
:docs-spring-gemfire: {docs-site}/spring-gemfire/docs/current/reference
// Third-party Links
:gh-rsocket: https://github.com/rsocket
:gh-rsocket-extensions: {gh-rsocket}/rsocket/blob/master/Extensions
:gh-rsocket-java: {gh-rsocket}/rsocket-java
2 changes: 1 addition & 1 deletion framework-docs/src/docs/asciidoc/integration.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -5647,7 +5647,7 @@ GemFire is a memory-oriented, disk-backed, elastically scalable, continuously av
active (with built-in pattern-based subscription notifications), globally replicated
database and provides fully-featured edge caching. For further information on how to
use GemFire as a `CacheManager` (and more), see the
{doc-spring-gemfire}/html/[Spring Data GemFire reference documentation].
{docs-spring-gemfire}/html/[Spring Data GemFire reference documentation].


[[cache-store-configuration-jsr107]]
Expand Down
4 changes: 2 additions & 2 deletions framework-docs/src/docs/asciidoc/testing.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -7750,7 +7750,7 @@ to perform tests on Spring MVC controllers without a running server. For example

`WebTestClient` can also connect to a live server and perform full end-to-end integration
tests. This is also supported in Spring Boot where you can
{doc-spring-boot}/html/spring-boot-features.html#boot-features-testing-spring-boot-applications-testing-with-running-server[test a running server].
{docs-spring-boot}/html/spring-boot-features.html#boot-features-testing-spring-boot-applications-testing-with-running-server[test a running server].


[[spring-mvc-test-server-filters]]
Expand Down Expand Up @@ -7797,7 +7797,7 @@ for rendering JSON, XML, and other formats through `@ResponseBody` methods.

Alternatively, you may consider the full end-to-end integration testing support from
Spring Boot with `@SpringBootTest`. See the
{doc-spring-boot}/html/spring-boot-features.html#boot-features-testing[Spring Boot Reference Guide].
{docs-spring-boot}/html/spring-boot-features.html#boot-features-testing[Spring Boot Reference Guide].

There are pros and cons for each approach. The options provided in Spring MVC Test are
different stops on the scale from classic unit testing to full integration testing. To be
Expand Down
1 change: 0 additions & 1 deletion framework-docs/src/docs/asciidoc/web/webmvc.adoc
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
[[mvc]]
:chapter: mvc
= Spring Web MVC
:doc-spring-security: {docs-site}/spring-security/reference

Expand Down

0 comments on commit 3458f29

Please sign in to comment.