Skip to content

Commit e0b1c0e

Browse files
philwebbphilwebb
committed
Remove duplicate imagedata from reference guide
Prior to this commit many imagedata elements were duplicated in order to configure PDF sizes. Since HTML generation is configured to ignore image scaling altogether this was unnecessary duplication. Issue: SPR-10033
1 parent c37080d commit e0b1c0e

File tree

8 files changed

+28
-121
lines changed

8 files changed

+28
-121
lines changed

‎src/reference/docbook/aop.xml

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2657,16 +2657,10 @@ public @interface Idempotent {
26572657
be seen below.</para>
26582658

26592659
<para><mediaobject>
2660-
<imageobject role="fo">
2660+
<imageobject>
26612661
<imagedata align="center"
26622662
fileref="images/aop-proxy-plain-pojo-call.png"
2663-
format="PNG" />
2664-
</imageobject>
2665-
2666-
<imageobject role="html">
2667-
<imagedata align="center"
2668-
fileref="images/aop-proxy-plain-pojo-call.png"
2669-
format="PNG" />
2663+
format="PNG" width="400"/>
26702664
</imageobject>
26712665
</mediaobject></para>
26722666

@@ -2685,14 +2679,9 @@ public @interface Idempotent {
26852679
a proxy. Consider the following diagram and code snippet.</para>
26862680

26872681
<para><mediaobject>
2688-
<imageobject role="fo">
2689-
<imagedata align="center" fileref="images/aop-proxy-call.png"
2690-
format="PNG" />
2691-
</imageobject>
2692-
2693-
<imageobject role="html">
2682+
<imageobject>
26942683
<imagedata align="center" fileref="images/aop-proxy-call.png"
2695-
format="PNG" />
2684+
format="PNG" width="400" />
26962685
</imageobject>
26972686
</mediaobject></para>
26982687

‎src/reference/docbook/beans-scopes.xml

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -121,13 +121,8 @@
121121
bean return the cached object.</para>
122122

123123
<para><mediaobject>
124-
<imageobject role="fo">
125-
<imagedata align="center" fileref="images/singleton.png" format="PNG"
126-
width="400"/>
127-
</imageobject>
128-
129-
<imageobject role="html">
130-
<imagedata align="center" fileref="images/singleton.png" format="PNG"/>
124+
<imageobject>
125+
<imagedata align="center" fileref="images/singleton.png" format="PNG" width="400" />
131126
</imageobject>
132127
</mediaobject></para>
133128

@@ -167,13 +162,8 @@
167162
diagram.</emphasis><!--First it says diagram illustrates scope, but then says it's not typical of a prototype scope. Why not use realistic one? --></para>
168163

169164
<para><mediaobject>
170-
<imageobject role="fo">
171-
<imagedata align="center" fileref="images/prototype.png" format="PNG"
172-
width="400" />
173-
</imageobject>
174-
175-
<imageobject role="html">
176-
<imagedata align="center" fileref="images/prototype.png" format="PNG"/>
165+
<imageobject>
166+
<imagedata align="center" fileref="images/prototype.png" format="PNG" width="400"/>
177167
</imageobject>
178168
</mediaobject></para>
179169

‎src/reference/docbook/beans.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,7 @@ The footnote should x-ref to first section in that chapter but I can't find the
112112

113113
<para><mediaobject>
114114
<imageobject>
115-
<imagedata align="center" fileref="images/container-magic.png"
116-
format="PNG" width="400" />
115+
<imagedata align="center" fileref="images/container-magic.png" format="PNG" width="250" />
117116
</imageobject>
118117

119118
<caption><para>The Spring IoC container</para></caption>

‎src/reference/docbook/dao.xml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -63,14 +63,8 @@
6363
hierarchy.)</para>
6464

6565
<mediaobject>
66-
<imageobject role="fo">
67-
<imagedata align="center" fileref="images/DataAccessException.gif"
68-
format="PNG" width="400"/>
69-
</imageobject>
70-
71-
<imageobject role="html">
72-
<imagedata align="center" fileref="images/DataAccessException.gif"
73-
format="PNG" width="400"/>
66+
<imageobject>
67+
<imagedata align="center" fileref="images/DataAccessException.gif" format="PNG" width="400" />
7468
</imageobject>
7569
</mediaobject>
7670
</section>

‎src/reference/docbook/mvc.xml

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -235,13 +235,8 @@
235235
Spring Web MVC shares with many other leading web frameworks).</para>
236236

237237
<para><mediaobject>
238-
<imageobject role="fo">
239-
<imagedata align="center" fileref="images/mvc.png" format="PNG"
240-
width="400" />
241-
</imageobject>
242-
243-
<imageobject role="html">
244-
<imagedata align="center" fileref="images/mvc.png" format="PNG" />
238+
<imageobject>
239+
<imagedata align="center" fileref="images/mvc.png" format="PNG" width="400"/>
245240
</imageobject>
246241

247242
<caption><para>The request processing workflow in Spring Web MVC (high
@@ -319,14 +314,8 @@
319314
new scope-specific beans local to a given Servlet instance.</para>
320315

321316
<para><mediaobject>
322-
<imageobject role="fo">
323-
<imagedata align="center" fileref="images/mvc-contexts.gif"
324-
format="GIF" width="400" />
325-
</imageobject>
326-
327-
<imageobject role="html">
328-
<imagedata align="center" fileref="images/mvc-contexts.gif"
329-
format="GIF" />
317+
<imageobject>
318+
<imagedata align="center" fileref="images/mvc-contexts.gif" format="GIF" width="400" />
330319
</imageobject>
331320

332321
<caption>Context hierarchy in Spring Web MVC</caption>

‎src/reference/docbook/overview.xml

Lines changed: 7 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -99,14 +99,8 @@ TR: This section doesn't read well and I think we should try to rewrite it.-->Nu
9999
Instrumentation, and Test, as shown in the following diagram.</para>
100100

101101
<para><mediaobject>
102-
<imageobject role="fo">
103-
<imagedata align="left" fileref="images/spring-overview.png"
104-
format="PNG" width="400" />
105-
</imageobject>
106-
107-
<imageobject role="html">
108-
<imagedata align="center" fileref="images/spring-overview.png"
109-
format="PNG" />
102+
<imageobject>
103+
<imagedata align="center" fileref="images/spring-overview.png" format="PNG" width="400" />
110104
</imageobject>
111105

112106
<caption><para>Overview of the Spring Framework</para></caption>
@@ -261,14 +255,8 @@ TR: OK. Added to diagram.--></para>
261255
web framework integration.</para>
262256

263257
<para><mediaobject>
264-
<imageobject role="fo">
265-
<imagedata align="center" fileref="images/overview-full.png"
266-
format="PNG" width="400" />
267-
</imageobject>
268-
269-
<imageobject role="html">
270-
<imagedata align="center" fileref="images/overview-full.png"
271-
format="PNG" />
258+
<imageobject>
259+
<imagedata align="center" fileref="images/overview-full.png" format="PNG" width="400" />
272260
</imageobject>
273261

274262
<caption><para>Typical full-fledged Spring web
@@ -291,17 +279,12 @@ TR: OK. Added to diagram.--></para>
291279
that transform HTTP parameters to values for your domain model.</para>
292280

293281
<para><mediaobject>
294-
<imageobject role="fo">
282+
<imageobject>
295283
<imagedata align="center"
296284
fileref="images/overview-thirdparty-web.png" format="PNG"
297285
width="400"/>
298286
</imageobject>
299287

300-
<imageobject role="html">
301-
<imagedata align="center"
302-
fileref="images/overview-thirdparty-web.png" format="PNG" />
303-
</imageobject>
304-
305288
<caption><para>Spring middle-tier using a third-party web
306289
framework</para></caption>
307290
</mediaobject></para>
@@ -318,16 +301,10 @@ TR: OK. Added to diagram.--></para>
318301
layer.</para>
319302

320303
<para><mediaobject>
321-
<imageobject role="fo">
304+
<imageobject>
322305
<imagedata align="center" fileref="images/overview-remoting.png"
323306
format="PNG" width="400" />
324307
</imageobject>
325-
326-
<imageobject role="html">
327-
<imagedata align="center" fileref="images/overview-remoting.png"
328-
format="PNG" />
329-
</imageobject>
330-
331308
<caption><para>Remoting usage scenario</para></caption>
332309
</mediaobject></para>
333310

@@ -338,16 +315,10 @@ TR: OK. Added to diagram.--></para>
338315
difficult.</para>
339316

340317
<para><mediaobject>
341-
<imageobject role="fo">
318+
<imageobject>
342319
<imagedata align="center" fileref="images/overview-ejb.png"
343320
format="PNG" width="400" />
344321
</imageobject>
345-
346-
<imageobject role="html">
347-
<imagedata align="center" fileref="images/overview-ejb.png"
348-
format="PNG" />
349-
</imageobject>
350-
351322
<caption><para>EJBs - Wrapping existing POJOs</para></caption>
352323
</mediaobject></para>
353324

‎src/reference/docbook/oxm.xml

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -189,26 +189,11 @@ public interface Unmarshaller {
189189
<para>
190190
The O/X Mapping exception hierarchy is shown in the following figure:
191191
<mediaobject>
192-
<imageobject role="fo">
192+
<imageobject>
193193
<imagedata align="center" fileref="images/oxm-exceptions.png"
194194
format="PNG" width="400"/>
195195
</imageobject>
196-
<caption>
197-
<para>
198-
O/X Mapping exception hierarchy
199-
</para>
200-
</caption>
201-
</mediaobject>
202-
<mediaobject>
203-
<imageobject role="html">
204-
<imagedata align="center" fileref="images/oxm-exceptions.png"
205-
format="PNG" width="400"/>
206-
</imageobject>
207-
<caption>
208-
<para>
209-
O/X Mapping exception hierarchy
210-
</para>
211-
</caption>
196+
<caption>O/X Mapping exception hierarchy</caption>
212197
</mediaobject>
213198
</para>
214199
</section>

‎src/reference/docbook/transaction.xml

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -721,14 +721,10 @@ would be rolled back, not necessarily following the EJB rules-->
721721
TR: OK AS IS. images don't show up in the editor, but they do show up in the generated docs-->
722722

723723
<para><mediaobject>
724-
<imageobject role="fo">
724+
<imageobject>
725725
<imagedata align="center" fileref="images/tx.png" format="PNG"
726726
width="400"/>
727727
</imageobject>
728-
729-
<imageobject role="html">
730-
<imagedata align="center" fileref="images/tx.png" format="PNG" />
731-
</imageobject>
732728
</mediaobject></para>
733729
</section>
734730

@@ -1869,17 +1865,11 @@ TR: REVISED, PLS REVIEW - changed it back; it's not just settings, the section d
18691865
<title>Required</title>
18701866

18711867
<para><mediaobject>
1872-
<imageobject role="fo">
1873-
<imagedata align="center" fileref="images/tx_prop_required.png"
1874-
format="PNG" width="400"/>
1875-
</imageobject>
1876-
1877-
<imageobject role="html">
1868+
<imageobject>
18781869
<imagedata align="center" fileref="images/tx_prop_required.png"
18791870
format="PNG" width="400"/>
18801871
</imageobject>
1881-
1882-
<caption><para>PROPAGATION_REQUIRED</para></caption>
1872+
<caption>PROPAGATION_REQUIRED</caption>
18831873
</mediaobject></para>
18841874

18851875
<para>When the propagation setting is
@@ -1916,7 +1906,7 @@ TR: REVISED, PLS REVIEW - changed it back; it's not just settings, the section d
19161906
<imageobject>
19171907
<imagedata align="center"
19181908
fileref="images/tx_prop_requires_new.png"
1919-
format="PNG" />
1909+
format="PNG" width="400" />
19201910
</imageobject>
19211911

19221912
<caption><para>PROPAGATION_REQUIRES_NEW</para></caption>

0 commit comments

Comments
 (0)