diff --git a/docs/src/site/docbook/reference/core.xml b/docs/src/site/docbook/reference/core.xml
index e73fafaa7..94a78b8b0 100644
--- a/docs/src/site/docbook/reference/core.xml
+++ b/docs/src/site/docbook/reference/core.xml
@@ -556,8 +556,9 @@
         <imagedata align="center" fileref="images/jobHeirarchyWithSteps.png" />
       </imageobject>
 
-      <imageobject>
-        <imagedata align="center" fileref="images/jobHeirarchyWithSteps.png" />
+      <imageobject role="fo">
+        <imagedata align="center"
+                   fileref="src/site/resources/reference/images/jobHeirarchyWithSteps.png" />
       </imageobject>
     </mediaobject>
 
@@ -694,9 +695,9 @@
       <para>An <classname>ExecutionContext</classname> represents a collection
       of key/value pairs that are persisted and controlled by the framework in
       order to allow developers a place to store persistent state that is
-      scoped to a <classname>StepExecution</classname>. For those familiar with
-      Quartz, it is very similar to <classname>JobDataMap</classname>. The
-      best usage example is restart. Using flat file input as an example,
+      scoped to a <classname>StepExecution</classname>. For those familiar
+      with Quartz, it is very similar to <classname>JobDataMap</classname>.
+      The best usage example is restart. Using flat file input as an example,
       while processing individual lines, the framework periodically persists
       the <classname>ExecutionContext</classname> at commit points. This
       allows the <classname>ItemReader</classname> to store its state in case
@@ -856,4 +857,4 @@
     logic that is not natural to split into read-(transform)-write phases,
     such as invoking a system command or a stored procedure.</para>
   </section>
-</chapter>
+</chapter>
\ No newline at end of file
diff --git a/docs/src/site/docbook/reference/readersAndWriters.xml b/docs/src/site/docbook/reference/readersAndWriters.xml
index e0338205e..e04395883 100644
--- a/docs/src/site/docbook/reference/readersAndWriters.xml
+++ b/docs/src/site/docbook/reference/readersAndWriters.xml
@@ -1196,8 +1196,9 @@
           <imagedata align="center" fileref="images/cursorExample.png" />
         </imageobject>
 
-        <imageobject role="html">
-          <imagedata align="center" fileref="images/cursorExample.png" />
+        <imageobject role="fo">
+          <imagedata align="center"
+                     fileref="src/site/resources/reference/images/cursorExample.png" />
         </imageobject>
       </mediaobject>
 
diff --git a/docs/src/site/docbook/reference/testing.xml b/docs/src/site/docbook/reference/testing.xml
index 2d4ca5fd2..8b491c3dd 100644
--- a/docs/src/site/docbook/reference/testing.xml
+++ b/docs/src/site/docbook/reference/testing.xml
@@ -39,7 +39,8 @@
 
   inputSource.open(new ExecutionContext());
 
-  jdbcTemplate.query("SELECT ID, ISIN, QUANTITY, PRICE, CUSTOMER FROM trade ORDER BY id", new RowCallbackHandler() {
+  jdbcTemplate.query("SELECT ID, ISIN, QUANTITY, PRICE, CUSTOMER FROM trade ORDER BY id", 
+       new RowCallbackHandler() {
 
     public void processRow(ResultSet rs) throws SQLException {
       Trade trade;
diff --git a/docs/src/site/resources/reference/images/oxm-fragments.png b/docs/src/site/resources/reference/images/oxm-fragments.png
index f77af97e7..a23301a31 100755
Binary files a/docs/src/site/resources/reference/images/oxm-fragments.png and b/docs/src/site/resources/reference/images/oxm-fragments.png differ
diff --git a/docs/src/site/resources/reference/images/xmlinput.png b/docs/src/site/resources/reference/images/xmlinput.png
index f270346c2..c61dbefe0 100755
Binary files a/docs/src/site/resources/reference/images/xmlinput.png and b/docs/src/site/resources/reference/images/xmlinput.png differ