Skip to content

Commit

Permalink
Add missing section ids in reference documentation
Browse files Browse the repository at this point in the history
Add missing id attributes to <section> elements in the reference
documentation to ensure stable anchor links in HTML output.

Issue: SPR-9346
  • Loading branch information
odrotbohm authored and cbeams committed May 15, 2012
1 parent 1d0e484 commit 2a75c57
Show file tree
Hide file tree
Showing 13 changed files with 86 additions and 86 deletions.
2 changes: 1 addition & 1 deletion src/reference/docbook/beans-context-additional.xml
Original file line number Diff line number Diff line change
Expand Up @@ -611,7 +611,7 @@ argument.required=Ebagum lad, the '{0}' argument is required, I say, required.</
does.</para>
</section>

<section>
<section id="context-deploy-rar">
<title>Deploying a Spring ApplicationContext as a J2EE RAR file</title>

<para>In Spring 2.5 and later, it is possible to deploy a Spring
Expand Down
4 changes: 2 additions & 2 deletions src/reference/docbook/beans-dependencies.xml
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ public class ExampleBean {
</sidebar>
</section>

<section>
<section id="beans-dependency-resolution">
<title>Dependency resolution process</title>

<para>The container performs bean dependency resolution as follows:</para>
Expand Down Expand Up @@ -859,7 +859,7 @@ support=support@example.co.uk</programlisting>
the container uses internally.</para>
</section>

<section>
<section id="beans-collection-merge-limitations">
<title>Limitations of collection merging</title>

<para>You cannot merge different collection types (such as a
Expand Down
10 changes: 5 additions & 5 deletions src/reference/docbook/classic-spring.xml
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,7 @@
<para>...</para>
</section>

<section>
<section id="classic-spring-jms">
<title>JMS Usage</title>

<para>One of the benefits of Spring's JMS support is to shield the user
Expand Down Expand Up @@ -392,7 +392,7 @@
</note>
</sidebar>

<section>
<section id="classic-spring-jms-template">
<title>JmsTemplate</title>

<para>Located in the package
Expand All @@ -407,7 +407,7 @@
that the point-to-point domain, Queues, will be used.</para>
</section>

<section>
<section id="classic-spring-aysnc-messages">
<title>Asynchronous Message Reception </title>

<para><link
Expand All @@ -423,7 +423,7 @@
rely only on the JMS 1.0.2 API. </para>
</section>

<section>
<section id="classic-spring-jms-connections">
<title>Connections</title>

<para>The <classname>ConnectionFactory</classname> interface is part of
Expand All @@ -441,7 +441,7 @@
<classname>javax.jmsTopicConnection</classname>.</para>
</section>

<section>
<section id="classic-spring-jms-tx-management">
<title>Transaction Management</title>

<para>In a JMS 1.0.2 environment the class
Expand Down
44 changes: 22 additions & 22 deletions src/reference/docbook/expressions.xml
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@ String name = (String) exp.getValue(tesla);
<programlisting language="java">Expression exp = parser.parseExpression("name == 'Nikola Tesla'");
boolean result = exp.getValue(context, Boolean.class); // evaluates to true</programlisting>

<section>
<section id="expressions-evaluation-context">
<title>The EvaluationContext interface</title>

<para>The interface <interfacename>EvaluationContext</interfacename> is
Expand Down Expand Up @@ -306,7 +306,7 @@ boolean result = exp.getValue(context, Boolean.class); // evaluates to true</pr
expressions. Please refer to the JavaDoc of these classes for more
details.</para>

<section>
<section id="expressions-type-conversion">
<title>Type Conversion</title>

<para>By default SpEL uses the conversion service available in Spring
Expand Down Expand Up @@ -514,7 +514,7 @@ Object nullValue = parser.parseExpression("null").getValue();
Double.parseDouble().</para>
</section>

<section>
<section id="expressions-properties-arrays">
<title>Properties, Arrays, Lists, Maps, Indexers</title>

<para>Navigating with property references is easy, just use a period to
Expand Down Expand Up @@ -576,7 +576,7 @@ parser.parseExpression("Officers['advisors'][0].PlaceOfBirth.Country").setValue(

</programlisting>
</section>
<section>
<section id="expressions-inline-lists">
<title>Inline lists</title>

<para>Lists can be expressed directly in an expression using {} notation.
Expand All @@ -593,7 +593,7 @@ List listOfLists = (List) parser.parseExpression("{{'a','b'},{'x','y'}}").getVal
to represent the expression, rather than building a new list on each evaluation.</para>
</section>

<section>
<section id="expressions-array-construction">
<title>Array construction</title>

<para>Arrays can be built using the familiar Java syntax, optionally
Expand All @@ -612,7 +612,7 @@ int[][] numbers3 = (int[][]) parser.parseExpression("new int[4][5]").getValue(co
a multi-dimensional array.</para>
</section>

<section>
<section id="expressions-methods">
<title>Methods</title>

<para>Methods are invoked using typical Java programming syntax. You may
Expand All @@ -626,10 +626,10 @@ boolean isMember = parser.parseExpression("isMember('Mihajlo Pupin')").getValue(
Boolean.class);</programlisting>
</section>

<section>
<section id="expressions-operators">
<title>Operators</title>

<section>
<section id="expressions-operators-relational">
<title>Relational operators</title>

<para>The relational operators; equal, not equal, less than, less than
Expand Down Expand Up @@ -667,7 +667,7 @@ boolean falseValue =
These are case insensitive.</para>
</section>

<section>
<section id="expressions-operators-logical">
<title>Logical operators</title>

<para>The logical operators that are supported are and, or, and not.
Expand Down Expand Up @@ -702,7 +702,7 @@ String expression = "isMember('Nikola Tesla') and !isMember('Mihajlo Pupin')";
boolean falseValue = parser.parseExpression(expression).getValue(societyContext, Boolean.class);</programlisting></para>
</section>

<section>
<section id="expressions-operators-mathematical">
<title>Mathematical operators</title>

<para>The addition operator can be used on numbers, strings and dates.
Expand Down Expand Up @@ -743,7 +743,7 @@ int minusTwentyOne = parser.parseExpression("1+2-3*8").getValue(Integer.class);
</section>
</section>

<section>
<section id="expressions-assignment">
<title>Assignment</title>

<para>Setting of a property is done by using the assignment operator.
Expand All @@ -765,7 +765,7 @@ String aleks = parser.parseExpression("Name = 'Alexandar Seovic'").getValue(inve
<para></para>
</section>

<section>
<section id="expressions-types">
<title>Types</title>

<para>The special 'T' operator can be used to specify an instance of
Expand All @@ -787,7 +787,7 @@ boolean trueValue =
</programlisting>
</section>

<section>
<section id="expressions-constrcutors">
<title>Constructors</title>

<para>Constructors can be invoked using the new operator. The fully
Expand Down Expand Up @@ -821,7 +821,7 @@ parser.parseExpression("Name = #newName").getValue(context);

System.out.println(tesla.getName()) // "Mike Tesla"</programlisting>

<section>
<section id="expressions-this-root">
<title>The #this and #root variables</title>

<para>The variable #this is always defined and refers to the current
Expand All @@ -848,7 +848,7 @@ List&lt;Integer&gt; primesGreaterThanTen =
</section>

<!--
<section>
<section id="expressions-root">
<title>The #root variable</title>
<para>The variable #root is always defined and refers to the
Expand Down Expand Up @@ -906,7 +906,7 @@ String helloWorldReversed =
parser.parseExpression("#reverseString('hello')").getValue(context, String.class);</programlisting>
</section>

<section>
<section id="expressions-bean-references">
<title>Bean references</title>
<para>If the evaluation context has been configured with a bean resolver it is possible to
lookup beans from an expression using the (@) symbol.
Expand All @@ -919,7 +919,7 @@ context.setBeanResolver(new MyBeanResolver());
Object bean = parser.parseExpression("@foo").getValue(context);</programlisting>
</section>

<section>
<section id="expressions-operator-ternary">
<title>Ternary Operator (If-Then-Else)</title>

<para>You can use the ternary operator for performing if-then-else
Expand All @@ -945,7 +945,7 @@ String queryResultString =
shorter syntax for the ternary operator.</para>
</section>

<section>
<section id="expressions-operator-elvis">
<title>The Elvis Operator</title>

<para>The Elvis operator is a shortening of the ternary operator syntax
Expand Down Expand Up @@ -986,7 +986,7 @@ name = parser.parseExpression("Name?:'Elvis Presley'").getValue(context, String.
System.out.println(name); // Elvis Presley</programlisting>
</section>

<section>
<section id="expressions-operator-safe-navigation">
<title>Safe Navigation operator</title>

<para>The Safe Navigation operator is used to avoid a
Expand Down Expand Up @@ -1023,7 +1023,7 @@ System.out.println(city); // null - does not throw NullPointerException!!!</prog
</note>
</section>

<section>
<section id="expressions-collection-selection">
<title>Collection Selection</title>

<para>Selection is a powerful expression language feature that allows you
Expand Down Expand Up @@ -1058,7 +1058,7 @@ System.out.println(city); // null - does not throw NullPointerException!!!</prog
<literal>$[...]</literal>.</para>
</section>

<section>
<section id="expressions-collection-projection">
<title>Collection Projection</title>

<para>Projection allows a collection to drive the evaluation of a
Expand All @@ -1079,7 +1079,7 @@ List placesOfBirth = (List)parser.parseExpression("Members.![placeOfBirth.city]"
projection expression against each map entry.</para>
</section>

<section>
<section id="expressions-templating">
<title>Expression templating</title>

<para>Expression templates allow a mixing of literal text with one or
Expand Down
6 changes: 3 additions & 3 deletions src/reference/docbook/jdbc.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2925,7 +2925,7 @@ public class DataAccessUnitTestTemplate {
</section>
</section>

<section>
<section id="jdbc-intializing-datasource">
<title>Initializing a DataSource</title>

<para>The <literal>org.springframework.jdbc.datasource.init</literal>
Expand All @@ -2935,7 +2935,7 @@ public class DataAccessUnitTestTemplate {
<classname>DataSource</classname> for an application, but sometimes you
need to initialize an instance running on a server somewhere.</para>

<section>
<section id="jdbc-initializing-datasource-xml">
<title>Initializing a database instance using Spring XML</title>

<para>If you want to initialize a database and you can provide a
Expand Down Expand Up @@ -2999,7 +2999,7 @@ public class DataAccessUnitTestTemplate {
can simply use the <classname>DataSourceInitializer</classname>
directly, and define it as a component in your application.</para>

<section>
<section id="jdbc-client-component-initialization">
<title>Initialization of Other Components that Depend on the
Database</title>

Expand Down
6 changes: 3 additions & 3 deletions src/reference/docbook/jms.xml
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@
should ensure that it references the managed implementation of the
<classname>ConnectionFactory</classname>.</para>

<section>
<section id="jms-caching-resources">
<title>Caching Messaging Resources</title>

<para>The standard API involves creating many intermediate objects. To
Expand All @@ -154,7 +154,7 @@
IConnectionFactory are provided.</para>
</section>

<section>
<section id="jms-connection-factory">
<title>SingleConnectionFactory</title>

<para>Spring provides an implementation of the
Expand All @@ -171,7 +171,7 @@
from JNDI.</para>
</section>

<section>
<section id="jdbc-connection-factory-caching">
<title>CachingConnectionFactory</title>

<para>The <classname>CachingConnectionFactory</classname> extends the
Expand Down
2 changes: 1 addition & 1 deletion src/reference/docbook/mvc.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3600,7 +3600,7 @@ public String onSubmit(<emphasis role="bold">@RequestPart("meta-data") MetaData
<section id="mvc-exceptionhandlers">
<title>Handling exceptions</title>

<section>
<section id="mvc-exceptionhandlers-resolver">
<title
id="mvc-HandlerExceptionResolver"><interfacename>HandlerExceptionResolver</interfacename></title>

Expand Down
6 changes: 3 additions & 3 deletions src/reference/docbook/new-in-3.0.xml
Original file line number Diff line number Diff line change
Expand Up @@ -404,7 +404,7 @@ public class AppConfig {
<literal>AnnotationConfigApplicationContext</literal>.</para>
</section>

<section>
<section id="new-bean-metadata-in-components">
<title>Defining bean metadata within components</title>

<para><literal>@Bean</literal> annotated methods are also supported
Expand Down Expand Up @@ -448,7 +448,7 @@ public class AppConfig {
building RESTful web services and web applications. There are also some
new annotations that can be used in any web application.</para>

<section>
<section id="new-feature-rest-support">
<title>Comprehensive REST support</title>

<para>Server-side support for building RESTful applications has been
Expand All @@ -471,7 +471,7 @@ public class AppConfig {
information.</para>
</section>

<section>
<section id="new-feature-at-mvc">
<title>@MVC additions</title>

<para>A <literal>mvc</literal> namespace has been introduced that greatly simplifies Spring MVC configuration.</para>
Expand Down
Loading

0 comments on commit 2a75c57

Please sign in to comment.