Skip to content

Commit eab61f6

Browse files
diguagesbrannen
authored andcommitted
Merge source and substitution configuration in reference docs
Closes gh-25545
1 parent ee41ebc commit eab61f6

12 files changed

+290
-580
lines changed

src/docs/asciidoc/core/core-appendix.adoc

+1-2
Original file line numberDiff line numberDiff line change
@@ -682,8 +682,7 @@ XML extension (a custom XML element) that lets us configure objects of the type
682682
`SimpleDateFormat` (from the `java.text` package). When we are done,
683683
we will be able to define bean definitions of type `SimpleDateFormat` as follows:
684684

685-
[source,xml,indent=0]
686-
[subs="verbatim,quotes"]
685+
[source,xml,indent=0,subs="verbatim,quotes"]
687686
----
688687
<myns:dateformat id="dateFormat"
689688
pattern="yyyy-MM-dd HH:mm"

src/docs/asciidoc/core/core-beans.adoc

+4-8
Original file line numberDiff line numberDiff line change
@@ -135,8 +135,7 @@ dependency-inject domain objects with Spring>>.
135135

136136
The following example shows the basic structure of XML-based configuration metadata:
137137

138-
[source,xml,indent=0]
139-
[subs="verbatim,quotes"]
138+
[source,xml,indent=0,subs="verbatim,quotes"]
140139
----
141140
<?xml version="1.0" encoding="UTF-8"?>
142141
<beans xmlns="http://www.springframework.org/schema/beans"
@@ -1980,8 +1979,7 @@ then nested `constructor-arg` elements.
19801979
The following example uses the `c:` namespace to do the same thing as the from
19811980
<<beans-constructor-injection>>:
19821981

1983-
[source,xml,indent=0]
1984-
[subs="verbatim,quotes"]
1982+
[source,xml,indent=0,subs="verbatim,quotes"]
19851983
----
19861984
<beans xmlns="http://www.springframework.org/schema/beans"
19871985
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -3428,8 +3426,7 @@ you can use the `init-method` attribute to specify the name of the method that h
34283426
no-argument signature. With Java configuration, you can use the `initMethod` attribute of
34293427
`@Bean`. See <<beans-java-lifecycle-callbacks>>. Consider the following example:
34303428

3431-
[source,xml,indent=0]
3432-
[subs="verbatim,quotes"]
3429+
[source,xml,indent=0,subs="verbatim,quotes"]
34333430
----
34343431
<bean id="exampleInitBean" class="examples.ExampleBean" init-method="init"/>
34353432
----
@@ -7852,8 +7849,7 @@ To enable component scanning, you can annotate your `@Configuration` class as fo
78527849
Experienced Spring users may be familiar with the XML declaration equivalent from
78537850
Spring's `context:` namespace, shown in the following example:
78547851
7855-
[source,xml,indent=0]
7856-
[subs="verbatim,quotes"]
7852+
[source,xml,indent=0,subs="verbatim,quotes"]
78577853
----
78587854
<beans>
78597855
<context:component-scan base-package="com.acme"/>

src/docs/asciidoc/data-access.adoc

+1-2
Original file line numberDiff line numberDiff line change
@@ -8844,8 +8844,7 @@ You can configure marshallers more concisely by using tags from the OXM namespac
88448844
To make these tags available, you must first reference the appropriate schema in the
88458845
preamble of the XML configuration file. The following example shows how to do so:
88468846

8847-
[source,xml,indent=0]
8848-
[subs="verbatim,quotes"]
8847+
[source,xml,indent=0,subs="verbatim,quotes"]
88498848
----
88508849
<?xml version="1.0" encoding="UTF-8"?>
88518850
<beans xmlns="http://www.springframework.org/schema/beans"

src/docs/asciidoc/data-access/data-access-appendix.adoc

+2-4
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,7 @@ the following preamble at the top of your Spring XML configuration file. The tex
3232
following snippet references the correct schema so that the tags in the `tx` namespace
3333
are available to you:
3434

35-
[source,xml,indent=0]
36-
[subs="verbatim,quotes"]
35+
[source,xml,indent=0,subs="verbatim,quotes"]
3736
----
3837
<?xml version="1.0" encoding="UTF-8"?>
3938
<beans xmlns="http://www.springframework.org/schema/beans"
@@ -72,8 +71,7 @@ To use the elements in the `jdbc` schema, you need to have the following preambl
7271
top of your Spring XML configuration file. The text in the following snippet references
7372
the correct schema so that the elements in the `jdbc` namespace are available to you:
7473

75-
[source,xml,indent=0]
76-
[subs="verbatim,quotes"]
74+
[source,xml,indent=0,subs="verbatim,quotes"]
7775
----
7876
<?xml version="1.0" encoding="UTF-8"?>
7977
<beans xmlns="http://www.springframework.org/schema/beans"

0 commit comments

Comments
 (0)