diff --git a/src/reference/docbook/aop.xml b/src/reference/docbook/aop.xml index c85432caab3..f8c01ab352c 100644 --- a/src/reference/docbook/aop.xml +++ b/src/reference/docbook/aop.xml @@ -2657,16 +2657,10 @@ public @interface Idempotent { be seen below. - + - - - - + format="PNG" width="400"/> @@ -2685,14 +2679,9 @@ public @interface Idempotent { a proxy. Consider the following diagram and code snippet. - - - - - + + format="PNG" width="400" /> diff --git a/src/reference/docbook/beans-scopes.xml b/src/reference/docbook/beans-scopes.xml index abba10043f6..3b1c05dbcd6 100644 --- a/src/reference/docbook/beans-scopes.xml +++ b/src/reference/docbook/beans-scopes.xml @@ -121,13 +121,8 @@ bean return the cached object. - - - - - - + + @@ -167,13 +162,8 @@ diagram. - - - - - - + + diff --git a/src/reference/docbook/beans.xml b/src/reference/docbook/beans.xml index 05f32bd57ce..d35606e0085 100644 --- a/src/reference/docbook/beans.xml +++ b/src/reference/docbook/beans.xml @@ -112,8 +112,7 @@ The footnote should x-ref to first section in that chapter but I can't find the - + The Spring IoC container diff --git a/src/reference/docbook/dao.xml b/src/reference/docbook/dao.xml index 12d0c487afc..98fe5c226cf 100644 --- a/src/reference/docbook/dao.xml +++ b/src/reference/docbook/dao.xml @@ -63,14 +63,8 @@ hierarchy.) - - - - - - + + diff --git a/src/reference/docbook/mvc.xml b/src/reference/docbook/mvc.xml index 37d0a27c4af..9fe2f3269df 100644 --- a/src/reference/docbook/mvc.xml +++ b/src/reference/docbook/mvc.xml @@ -235,13 +235,8 @@ Spring Web MVC shares with many other leading web frameworks). - - - - - - + + The request processing workflow in Spring Web MVC (high @@ -319,14 +314,8 @@ new scope-specific beans local to a given Servlet instance. - - - - - - + + Context hierarchy in Spring Web MVC diff --git a/src/reference/docbook/overview.xml b/src/reference/docbook/overview.xml index d01981d5e74..38f0f53f925 100644 --- a/src/reference/docbook/overview.xml +++ b/src/reference/docbook/overview.xml @@ -99,14 +99,8 @@ TR: This section doesn't read well and I think we should try to rewrite it.-->Nu Instrumentation, and Test, as shown in the following diagram. - - - - - - + + Overview of the Spring Framework @@ -261,14 +255,8 @@ TR: OK. Added to diagram.--> web framework integration. - - - - - - + + Typical full-fledged Spring web @@ -291,17 +279,12 @@ TR: OK. Added to diagram.--> that transform HTTP parameters to values for your domain model. - + - - - - Spring middle-tier using a third-party web framework @@ -318,16 +301,10 @@ TR: OK. Added to diagram.--> layer. - + - - - - - Remoting usage scenario @@ -338,16 +315,10 @@ TR: OK. Added to diagram.--> difficult. - + - - - - - EJBs - Wrapping existing POJOs diff --git a/src/reference/docbook/oxm.xml b/src/reference/docbook/oxm.xml index 04526df4fab..7e6be7536e1 100644 --- a/src/reference/docbook/oxm.xml +++ b/src/reference/docbook/oxm.xml @@ -189,26 +189,11 @@ public interface Unmarshaller { The O/X Mapping exception hierarchy is shown in the following figure: - + - - - O/X Mapping exception hierarchy - - - - - - - - - - O/X Mapping exception hierarchy - - + O/X Mapping exception hierarchy diff --git a/src/reference/docbook/transaction.xml b/src/reference/docbook/transaction.xml index 9ed2f71825c..17413b0bcf5 100644 --- a/src/reference/docbook/transaction.xml +++ b/src/reference/docbook/transaction.xml @@ -721,14 +721,10 @@ would be rolled back, not necessarily following the EJB rules--> TR: OK AS IS. images don't show up in the editor, but they do show up in the generated docs--> - + - - - - @@ -1869,17 +1865,11 @@ TR: REVISED, PLS REVIEW - changed it back; it's not just settings, the section d Required - - - - - + - - PROPAGATION_REQUIRED + PROPAGATION_REQUIRED When the propagation setting is @@ -1916,7 +1906,7 @@ TR: REVISED, PLS REVIEW - changed it back; it's not just settings, the section d + format="PNG" width="400" /> PROPAGATION_REQUIRES_NEW