diff --git a/framework-docs/modules/ROOT/pages/appendix.adoc b/framework-docs/modules/ROOT/pages/appendix.adoc index ab1f7a86be..3a75550f6e 100644 --- a/framework-docs/modules/ROOT/pages/appendix.adoc +++ b/framework-docs/modules/ROOT/pages/appendix.adoc @@ -1,7 +1,5 @@ [[appendix]] = Appendix -include::attributes.adoc[] -include::page-layout.adoc[] This part of the reference documentation covers topics that apply to multiple modules within the core Spring Framework. diff --git a/framework-docs/modules/ROOT/pages/core.adoc b/framework-docs/modules/ROOT/pages/core.adoc index 1517d75108..6803a4b889 100644 --- a/framework-docs/modules/ROOT/pages/core.adoc +++ b/framework-docs/modules/ROOT/pages/core.adoc @@ -1,7 +1,5 @@ [[spring-core]] = Core Technologies -include::attributes.adoc[] -include::page-layout.adoc[] This part of the reference documentation covers all the technologies that are absolutely integral to the Spring Framework. @@ -20,24 +18,13 @@ is also provided. AOT processing can be used to optimize your application ahead-of-time. It is typically used for native image deployment using GraalVM. -include::core/beans.adoc[leveloffset=+1] -include::core/resources.adoc[leveloffset=+1] -include::core/validation.adoc[leveloffset=+1] -include::core/expressions.adoc[leveloffset=+1] -include::core/aop.adoc[leveloffset=+1] -include::core/aop-api.adoc[leveloffset=+1] -include::core/null-safety.adoc[leveloffset=+1] -include::core/databuffer-codec.adoc[leveloffset=+1] -include::core/spring-jcl.adoc[leveloffset=+1] -include::core/aot.adoc[leveloffset=+1] -include::core/appendix.adoc[leveloffset=+1] diff --git a/framework-docs/modules/ROOT/pages/data-access.adoc b/framework-docs/modules/ROOT/pages/data-access.adoc index 90adba00db..0c13876f24 100644 --- a/framework-docs/modules/ROOT/pages/data-access.adoc +++ b/framework-docs/modules/ROOT/pages/data-access.adoc @@ -1,7 +1,5 @@ [[spring-data-tier]] = Data Access -include::attributes.adoc[] -include::page-layout.adoc[] This part of the reference documentation is concerned with data access and the interaction between the data access layer and the business or service layer. diff --git a/framework-docs/modules/ROOT/pages/index.adoc b/framework-docs/modules/ROOT/pages/index.adoc index 80a46c4f19..c62a2b2899 100644 --- a/framework-docs/modules/ROOT/pages/index.adoc +++ b/framework-docs/modules/ROOT/pages/index.adoc @@ -1,7 +1,6 @@ :noheader: [[spring-framework-documentation]] = Spring Framework Documentation -include::attributes.adoc[] [horizontal] <> :: History, Design Philosophy, Feedback, diff --git a/framework-docs/modules/ROOT/pages/integration.adoc b/framework-docs/modules/ROOT/pages/integration.adoc index 83f6b3c28f..e4de8269af 100644 --- a/framework-docs/modules/ROOT/pages/integration.adoc +++ b/framework-docs/modules/ROOT/pages/integration.adoc @@ -1,23 +1,13 @@ [[spring-integration]] = Integration -include::attributes.adoc[] -include::page-layout.adoc[] This part of the reference documentation covers Spring Framework's integration with a number of technologies. -include::integration/rest-clients.adoc[leveloffset=+1] -include::integration/jms.adoc[leveloffset=+1] -include::integration/jmx.adoc[leveloffset=+1] -include::integration/email.adoc[leveloffset=+1] -include::integration/scheduling.adoc[leveloffset=+1] -include::integration/cache.adoc[leveloffset=+1] -include::integration/observability.adoc[leveloffset=+1] -include::integration/appendix.adoc[leveloffset=+1] diff --git a/framework-docs/modules/ROOT/pages/languages.adoc b/framework-docs/modules/ROOT/pages/languages.adoc index 42c9615ae6..b41773c13e 100644 --- a/framework-docs/modules/ROOT/pages/languages.adoc +++ b/framework-docs/modules/ROOT/pages/languages.adoc @@ -1,12 +1,7 @@ [[languages]] = Language Support -include::attributes.adoc[] -include::page-layout.adoc[] - -include::languages/kotlin.adoc[leveloffset=+1] - -include::languages/groovy.adoc[leveloffset=+1] - -include::languages/dynamic.adoc[leveloffset=+1] + + + diff --git a/framework-docs/modules/ROOT/pages/overview.adoc b/framework-docs/modules/ROOT/pages/overview.adoc index 61b3b5bec0..b0ed76a7d8 100644 --- a/framework-docs/modules/ROOT/pages/overview.adoc +++ b/framework-docs/modules/ROOT/pages/overview.adoc @@ -1,6 +1,5 @@ [[overview]] = Spring Framework Overview -include::attributes.adoc[] :docinfo1: Spring makes it easy to create Java enterprise applications. It provides everything you diff --git a/framework-docs/modules/ROOT/pages/rsocket.adoc b/framework-docs/modules/ROOT/pages/rsocket.adoc index 4da739d73c..f3580d824d 100644 --- a/framework-docs/modules/ROOT/pages/rsocket.adoc +++ b/framework-docs/modules/ROOT/pages/rsocket.adoc @@ -1,7 +1,5 @@ [[rsocket]] = RSocket -include::attributes.adoc[] -include::page-layout.adoc[] This section describes Spring Framework's support for the RSocket protocol. diff --git a/framework-docs/modules/ROOT/pages/testing.adoc b/framework-docs/modules/ROOT/pages/testing.adoc index 4f696b048d..6339dbbe14 100644 --- a/framework-docs/modules/ROOT/pages/testing.adoc +++ b/framework-docs/modules/ROOT/pages/testing.adoc @@ -1,7 +1,5 @@ [[testing]] = Testing -include::attributes.adoc[] -include::page-layout.adoc[] This chapter covers Spring's support for integration testing and best practices for unit testing. The Spring team advocates test-driven development (TDD). The Spring team has @@ -11,20 +9,11 @@ constructors on classes makes them easier to wire together in a test without hav set up service locator registries and similar structures). -include::testing/introduction.adoc[leveloffset=+1] -include::testing/unit.adoc[leveloffset=+1] -include::testing/integration.adoc[leveloffset=+1] -include::testing/support-jdbc.adoc[leveloffset=+1] -include::testing/testcontext-framework.adoc[leveloffset=+1] -include::testing/webtestclient.adoc[leveloffset=+1] -include::testing/spring-mvc-test-framework.adoc[leveloffset=+1] -include::testing/spring-mvc-test-client.adoc[leveloffset=+1] -include::testing/appendix.adoc[leveloffset=+1] diff --git a/framework-docs/modules/ROOT/pages/testing/appendix.adoc b/framework-docs/modules/ROOT/pages/testing/appendix.adoc index 3d01da459c..580253377d 100644 --- a/framework-docs/modules/ROOT/pages/testing/appendix.adoc +++ b/framework-docs/modules/ROOT/pages/testing/appendix.adoc @@ -1,6 +1,4 @@ [[testing.appendix]] = Appendix -include::annotations.adoc[leveloffset=+1] -include::resources.adoc[leveloffset=+1] diff --git a/framework-docs/modules/ROOT/pages/web-reactive.adoc b/framework-docs/modules/ROOT/pages/web-reactive.adoc index ea5d4c2b32..01d6cc8c55 100644 --- a/framework-docs/modules/ROOT/pages/web-reactive.adoc +++ b/framework-docs/modules/ROOT/pages/web-reactive.adoc @@ -1,7 +1,5 @@ [[spring-web-reactive]] = Web on Reactive Stack -include::attributes.adoc[] -include::page-layout.adoc[] This part of the documentation covers support for reactive-stack web applications built on a https://www.reactive-streams.org/[Reactive Streams] API to run on non-blocking @@ -11,9 +9,7 @@ the reactive <>, support for <>. For Servlet-stack web applications, see <>. -include::web/webflux.adoc[leveloffset=+1] -include::web/webflux-webclient.adoc[leveloffset=+1] [[webflux-http-interface-client]] @@ -27,7 +23,6 @@ flexibility for to choose an API style such as synchronous or reactive. See <> for details. -include::web/webflux-websocket.adoc[leveloffset=+1] @@ -44,7 +39,6 @@ discussion of mock objects. response objects to provide support for testing WebFlux applications without an HTTP server. You can use the `WebTestClient` for end-to-end integration tests, too. -include::rsocket.adoc[leveloffset=+1] diff --git a/framework-docs/modules/ROOT/pages/web.adoc b/framework-docs/modules/ROOT/pages/web.adoc index 9a6fe6f541..2772fc3508 100644 --- a/framework-docs/modules/ROOT/pages/web.adoc +++ b/framework-docs/modules/ROOT/pages/web.adoc @@ -1,19 +1,12 @@ [[spring-web]] = Web on Servlet Stack -include::attributes.adoc[] -include::page-layout.adoc[] This part of the documentation covers support for Servlet-stack web applications built on the Servlet API and deployed to Servlet containers. Individual chapters include <>, <>, <>, and <>. For reactive-stack web applications, see <>. -include::web/webmvc.adoc[leveloffset=+1] -include::web/webmvc-client.adoc[leveloffset=+1] -include::web/webmvc-test.adoc[leveloffset=+1] -include::web/websocket.adoc[leveloffset=+1] -include::web/integration.adoc[leveloffset=+1] diff --git a/framework-docs/modules/ROOT/pages/web/webflux-websocket.adoc b/framework-docs/modules/ROOT/pages/web/webflux-websocket.adoc index d3644cf654..5e9b0e0108 100644 --- a/framework-docs/modules/ROOT/pages/web/webflux-websocket.adoc +++ b/framework-docs/modules/ROOT/pages/web/webflux-websocket.adoc @@ -5,7 +5,6 @@ This part of the reference documentation covers support for reactive-stack WebSocket messaging. -include::websocket-intro.adoc[leveloffset=+1] diff --git a/framework-docs/modules/ROOT/pages/web/websocket.adoc b/framework-docs/modules/ROOT/pages/web/websocket.adoc index dec37b4eae..c429f5fe70 100644 --- a/framework-docs/modules/ROOT/pages/web/websocket.adoc +++ b/framework-docs/modules/ROOT/pages/web/websocket.adoc @@ -6,7 +6,6 @@ This part of the reference documentation covers support for Servlet stack, WebSo messaging that includes raw WebSocket interactions, WebSocket emulation through SockJS, and publish-subscribe messaging through STOMP as a sub-protocol over WebSocket. -include::websocket-intro.adoc[leveloffset=+1]