diff --git a/src/docs/asciidoc/data-access-appendix.adoc b/src/docs/asciidoc/data-access-appendix.adoc index 852fbee592..6913179881 100644 --- a/src/docs/asciidoc/data-access-appendix.adoc +++ b/src/docs/asciidoc/data-access-appendix.adoc @@ -19,13 +19,12 @@ The `tx` tags deal with configuring all of those beans in Spring's comprehensive for transactions. These tags are covered in the chapter entitled <>. -TIP: We strongly encourag you to look at the `'spring-tx.xsd'` file that ships with the +TIP: We strongly encourage you to look at the `'spring-tx.xsd'` file that ships with the Spring distribution. This file contains the XML Schema for Spring's transaction configuration and covers all of the various elements in the `tx` namespace, including -attribute defaults and similar information. This file is documented inline, and, thus, the -information is not repeated here in the interests of adhering to the DRY (Don't Repeat -Yourself) principle. -==== +attribute defaults and similar information. This file is documented inline, and, thus, +the information is not repeated here in the interests of adhering to the DRY (Don't +Repeat Yourself) principle. In the interest of completeness, to use the elements in the `tx` schema, you need to have the following preamble at the top of your Spring XML configuration file. The text in the @@ -51,10 +50,11 @@ are available to you: <2> Specify the location (with other schema locations). ==== -NOTE: Often, when you use the elements in the `tx` namespace, you are also using the elements from the -`aop` namespace (since the declarative transaction support in Spring is implemented -by using AOP). The preceding XML snippet contains the relevant lines needed to reference the -`aop` schema so that the elements in the `aop` namespace are available to you. +NOTE: Often, when you use the elements in the `tx` namespace, you are also using the +elements from the `aop` namespace (since the declarative transaction support in Spring is +implemented by using AOP). The preceding XML snippet contains the relevant lines needed +to reference the `aop` schema so that the elements in the `aop` namespace are available +to you. @@ -63,12 +63,12 @@ by using AOP). The preceding XML snippet contains the relevant lines needed to r The `jdbc` elements let you quickly configure an embedded database or initialize an existing data source. These elements are documented in -<> -and <>, respectively. +<> and +<>, respectively. -To use the elements in the `jdbc` schema, you need to have the following preamble at the top -of your Spring XML configuration file. The text in the following snippet references the -correct schema so that the elements in the `jdbc` namespace are available to you: +To use the elements in the `jdbc` schema, you need to have the following preamble at the +top of your Spring XML configuration file. The text in the following snippet references +the correct schema so that the elements in the `jdbc` namespace are available to you: ==== [source,xml,indent=0] diff --git a/src/docs/asciidoc/data-access.adoc b/src/docs/asciidoc/data-access.adoc index 24bafa62b5..0f04b671f4 100644 --- a/src/docs/asciidoc/data-access.adoc +++ b/src/docs/asciidoc/data-access.adoc @@ -2321,7 +2321,7 @@ tedious API. [[jdbc-choose-style]] -==== Choosing an Approach for JDBC Database Access +=== Choosing an Approach for JDBC Database Access You can choose among several approaches to form the basis for your JDBC database access. In addition to three flavors of `JdbcTemplate`, a new `SimpleJdbcInsert` and @@ -2351,7 +2351,7 @@ advanced features require a JDBC 3.0 driver. [[jdbc-packages]] -==== Package Hierarchy +=== Package Hierarchy The Spring Framework's JDBC abstraction framework consists of four different packages: @@ -2389,7 +2389,7 @@ exceptions be propagated to the caller. See <>. [[jdbc-core]] === Using the JDBC Core Classes to Control Basic JDBC Processing and Error Handling -This section covers how to use the JDBC core classes to cotrol basic JDBC processing, +This section covers how to use the JDBC core classes to control basic JDBC processing, including error handling. It includes the following topics: * <> diff --git a/src/docs/asciidoc/web/webflux.adoc b/src/docs/asciidoc/web/webflux.adoc index 72fd9b3aae..80542f3b6f 100644 --- a/src/docs/asciidoc/web/webflux.adoc +++ b/src/docs/asciidoc/web/webflux.adoc @@ -18,7 +18,7 @@ for example, Spring MVC controllers with the reactive `WebClient`. [[webflux-new-framework]] -=== Motivation +== Motivation Why was Spring WebFlux created? @@ -41,7 +41,7 @@ WebFlux to offer functional web endpoints alongside annotated controllers. [[webflux-why-reactive]] -=== Define "`Reactive`" +== Define "`Reactive`" We touched on "`non-blocking`" and "`functional`" but what does reactive mean?