diff --git a/spring-framework-reference/images/oxm-exceptions.png b/spring-framework-reference/images/oxm-exceptions.png
new file mode 100644
index 00000000000..9503d600793
Binary files /dev/null and b/spring-framework-reference/images/oxm-exceptions.png differ
diff --git a/spring-framework-reference/images/oxm-exceptions.svg b/spring-framework-reference/images/oxm-exceptions.svg
new file mode 100644
index 00000000000..e33c67ae638
--- /dev/null
+++ b/spring-framework-reference/images/oxm-exceptions.svg
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN"
+ "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
+<!-- Generated by dot version 1.13 (v16) (Mon August 23, 2004)
+     For user: (arjen) Arjen Poutsma   Title: G    Pages: 1 -->
+<svg width="525pt" height="192pt"
+ viewBox = "-1 -1 524 191"
+ xmlns="http://www.w3.org/2000/svg">
+<g id="graph0" class="graph" style="font-family:Times-Roman;font-size:14.00;">
+<title>G</title>
+<g id="node1" class="node"><title>c1</title>
+<polygon style="fill:none;stroke:black;" points="259,40 374,40 374,4 259,4 259,40"/>
+<text text-anchor="middle" x="316" y="25" style="font-family:Arial Italic;font-size:10.00;">XmlMappingException</text>
+</g>
+<g id="node2" class="node"><title>c2</title>
+<polygon style="fill:none;stroke:black;" points="88,112 321,112 321,76 88,76 88,112"/>
+<text text-anchor="middle" x="204" y="97" style="font-family:Arial Regular;font-size:10.00;">GenericMarshallingFailureException</text>
+</g>
+<g id="edge2" class="edge"><title>c1-&gt;c2</title>
+<path style="fill:none;stroke:black;" d="M279,46C264,56 246,67 232,76"/>
+<polygon style="fill:none;stroke:black;" points="278,43 288,40 282,48 278,43"/>
+</g>
+<g id="node8" class="node"><title>c5</title>
+<polygon style="fill:none;stroke:black;" points="338,112 518,112 518,76 338,76 338,112"/>
+<text text-anchor="middle" x="428" y="97" style="font-family:Arial Regular;font-size:10.00;">ValidationFailureException</text>
+</g>
+<g id="edge8" class="edge"><title>c1-&gt;c5</title>
+<path style="fill:none;stroke:black;" d="M353,46C368,56 386,67 400,76"/>
+<polygon style="fill:none;stroke:black;" points="350,48 344,40 354,43 350,48"/>
+</g>
+<g id="node4" class="node"><title>c3</title>
+<polygon style="fill:none;stroke:black;" points="5,184 191,184 191,148 5,148 5,184"/>
+<text text-anchor="middle" x="98" y="169" style="font-family:Arial Regular;font-size:10.00;">MarshallingFailureException</text>
+</g>
+<g id="edge4" class="edge"><title>c2-&gt;c3</title>
+<path style="fill:none;stroke:black;" d="M168,118C154,128 138,139 124,148"/>
+<polygon style="fill:none;stroke:black;" points="167,115 177,112 171,120 167,115"/>
+</g>
+<g id="node6" class="node"><title>c4</title>
+<polygon style="fill:none;stroke:black;" points="209,184 413,184 413,148 209,148 209,184"/>
+<text text-anchor="middle" x="311" y="169" style="font-family:Arial Regular;font-size:10.00;">UnmarshallingFailureException</text>
+</g>
+<g id="edge6" class="edge"><title>c2-&gt;c4</title>
+<path style="fill:none;stroke:black;" d="M240,118C254,128 271,139 284,148"/>
+<polygon style="fill:none;stroke:black;" points="237,120 231,112 241,115 237,120"/>
+</g>
+</g>
+</svg>
diff --git a/spring-framework-reference/src/oxm.xml b/spring-framework-reference/src/oxm.xml
index 3f1b7af7de5..325fc285581 100644
--- a/spring-framework-reference/src/oxm.xml
+++ b/spring-framework-reference/src/oxm.xml
@@ -78,21 +78,21 @@ public interface Marshaller {
                     <tgroup cols="2">
                         <thead>
                             <row>
-                                <entry><interfacename>javax.xml.transform.Result</interfacename> implementation</entry>
+                                <entry><interfacename>Result</interfacename> implementation</entry>
                                 <entry>Wraps XML representation</entry>
                             </row>
                         </thead>
                         <tbody>
                             <row>
-                                <entry><classname>javax.xml.transform.dom.DOMResult</classname></entry>
+                                <entry><classname>DOMResult</classname></entry>
                                 <entry><interfacename>org.w3c.dom.Node</interfacename></entry>
                             </row>
                             <row>
-                                <entry><classname>javax.xml.transform.sax.SAXResult</classname></entry>
+                                <entry><classname>SAXResult</classname></entry>
                                 <entry><interfacename>org.xml.sax.ContentHandler</interfacename></entry>
                             </row>
                             <row>
-                                <entry><interfacename>javax.xml.transform.stream.StreamResult</interfacename></entry>
+                                <entry><interfacename>StreamResult</interfacename></entry>
                                 <entry>
                                     <classname>java.io.File</classname>,
                                     <classname>java.io.OutputStream</classname>, or
@@ -106,9 +106,9 @@ public interface Marshaller {
                     <para>
                         Although the <methodname>marshal</methodname> method accepts a plain object as its first 
                         parameter, most <classname>Marshaller</classname> implementations cannot handle arbitrary 
-                        objects. Instead, an object class must be mapped in a mapping file, registered with the 
-                        marshaller, or have a common base class. Refer to the further sections in this chapter to 
-                        determine how your O/X technology of choice manages this.
+                        objects. Instead, an object class must be mapped in a mapping file, marked with an annotation,
+                        registered with the marshaller, or have a common base class. Refer to the further sections
+                        in this chapter to determine how your O/X technology of choice manages this.
                     </para>
                 </note>
             </para>
@@ -135,24 +135,24 @@ public interface Unmarshaller {
                     <tgroup cols="2">
                         <thead>
                             <row>
-                                <entry><interfacename>javax.xml.transform.Source</interfacename> implementation</entry>
+                                <entry><interfacename>Source</interfacename> implementation</entry>
                                 <entry>Wraps XML representation</entry>
                             </row>
                         </thead>
                         <tbody>
                             <row>
-                                <entry><classname>javax.xml.transform.dom.DOMSource</classname></entry>
+                                <entry><classname>DOMSource</classname></entry>
                                 <entry><interfacename>org.w3c.dom.Node</interfacename></entry>
                             </row>
                             <row>
-                                <entry><classname>javax.xml.transform.sax.SAXSource</classname></entry>
+                                <entry><classname>SAXSource</classname></entry>
                                 <entry>
                                     <classname>org.xml.sax.InputSource</classname>, and
                                     <interfacename>org.xml.sax.XMLReader</interfacename>
                                 </entry>
                             </row>
                             <row>
-                                <entry><classname>javax.xml.transform.stream.StreamSource</classname></entry>
+                                <entry><classname>StreamSource</classname></entry>
                                 <entry>
                                     <classname>java.io.File</classname>,
                                     <classname>java.io.InputStream</classname>, or
@@ -185,13 +185,8 @@ public interface Unmarshaller {
             <para>
                 The O/X Mapping exception hierarchy is shown in the following figure:
                 <mediaobject>
-                    <imageobject role="fo">
-                        <imagedata fileref="src/docbkx/resources/images/oxm-exceptions.svg"
-                                   format="SVG" align="center"/>
-                    </imageobject>
-                    <imageobject role="html">
-                        <imagedata fileref="images/oxm-exceptions.png"
-                                   format="PNG" align="center"/>
+                    <imageobject>
+                        <imagedata fileref="images/oxm-exceptions.png" align="center"/>
                     </imageobject>
                     <caption>
                         <para>
diff --git a/spring-framework-reference/src/spring-framework-reference.xml b/spring-framework-reference/src/spring-framework-reference.xml
index 418dbbf58fc..b76f93f2603 100644
--- a/spring-framework-reference/src/spring-framework-reference.xml
+++ b/spring-framework-reference/src/spring-framework-reference.xml
@@ -95,12 +95,16 @@
 				<firstname>Arjen</firstname>
 				<surname>Poutsma</surname>
 			</author>
+            <author>
+                <firstname>Tareq</firstname>
+                <surname>Abed Rabbo</surname>
+            </author>
 		</authorgroup>
 		<copyright>
 			<year>2004-2009</year>
 			<holder>Rod Johnson, Juergen Hoeller, Alef Arendsen, Colin Sampaleanu, Rob Harrop, Thomas Risberg, Darren Davison, 
 				Dmitriy Kopylenko, Mark Pollack, Thierry Templier, Erwin Vervaet, Portia Tung, Ben Hale, Adrian Colyer, John Lewis, 
-				Costin Leau, Mark Fisher, Sam Brannen, Ramnivas Laddad, Arjen Poutsma
+                Costin Leau, Mark Fisher, Sam Brannen, Ramnivas Laddad, Arjen Poutsma, Tareq Abbed Rabbo
 			</holder>
 		</copyright>
 		<legalnotice>