diff --git a/src/documentation/content/xdocs/howtobuild.xml b/src/documentation/content/xdocs/howtobuild.xml
index bce7552de3..ad2cd1cf87 100644
--- a/src/documentation/content/xdocs/howtobuild.xml
+++ b/src/documentation/content/xdocs/howtobuild.xml
@@ -91,11 +91,11 @@
                 </tr>
                 <tr>
                     <td>compile</td>
-                    <td>Compiles all files from main, contrib and scratchpad</td>
+                    <td>Compiles all files from main, ooxml and scratchpad</td>
                 </tr>
                 <tr>
                     <td>test</td>
-                    <td>Run all unit tests from main, ooxml, contrib and scratchpad</td>
+                    <td>Run all unit tests from main, ooxml and scratchpad</td>
                 </tr>
                 <tr>
                     <td>jar</td>
diff --git a/src/documentation/content/xdocs/hpsf/how-to.xml b/src/documentation/content/xdocs/hpsf/how-to.xml
index f7a5ad087e..520f9d0c03 100644
--- a/src/documentation/content/xdocs/hpsf/how-to.xml
+++ b/src/documentation/content/xdocs/hpsf/how-to.xml
@@ -352,8 +352,8 @@ else
      only difference is that they are not located in the POI filesystem's root
      but in a <strong>nested directory</strong> instead. Just register a
      <code>POIFSReaderListener</code> for the property set streams you are
-     interested in. For example, the <em>POIBrowser</em> application in the
-     contrib section tries to open each and every document in a POI filesystem
+     interested in. For example, the <em>POIBrowser</em> application
+     tries to open each and every document in a POI filesystem
      as a property set stream. If this operation was successful it displays the
      properties.</p>
    </section>
diff --git a/src/documentation/content/xdocs/overview.xml b/src/documentation/content/xdocs/overview.xml
index d457d22488..02e105b470 100644
--- a/src/documentation/content/xdocs/overview.xml
+++ b/src/documentation/content/xdocs/overview.xml
@@ -282,33 +282,38 @@
     </section>
     <section><title>Examples</title>
       <p>
-	Small sample programs using the POI API are available in the
+	    Small sample programs using the POI API are available in the
         <em>src/examples</em> directory of the source distribution. Before
         studying the source code you might want to have a look at the
         "Examples" section of the <link href="apidocs/overview-summary.html">POI API
-          documentation</link>.
+        documentation</link>.
       </p>
+        <section><title>POI Browser</title>
+          <p>
+            The POI Browser is a very simple Swing GUI tool that displays the
+            internal structure of a Microsoft Office file and especially the
+            property set streams. Further information and  instructions how to
+            execute it can be found in the <link
+          href="http://svn.apache.org/repos/asf/poi/trunk/src/examples/src/org/apache/poi/poifs/poibrowser/POIBrowser.java">POI
+              source code</link>.
+          </p>
+        </section>
       <p>
-	Also note that we now include all of the examples in the distribution.
+        All of the examples are inclided in POI distributions as a poi-examples artifact.
       </p>
     </section>
     <section><title>Contributed Software</title>
       <p>
-	Besides the "official" components outlined above there is some further
-	software distributed with POI. This is called "contributed" software. It
+	    Besides the "official" components outlined above there is some further
+	    software distributed with POI. This is called "contributed" software. It
         is not explicitly recommended or even maintained by the POI team, but
         it might still be useful to you.
       </p>
-      <section><title>POI Browser</title>
-        <p>
-	  The POI Browser is a very simple Swing GUI tool that displays the
-          internal structure of a Microsoft Office file and especially the
-          property set streams. Further information and  instructions how to
-          execute it can be found in the <link
-	    href="apidocs/org/apache/poi/contrib/poibrowser/package-summary.html#package_description">POI
-            Browser package description</link>.
-	</p>
-      </section>
+      <p>
+          See <link href="poi-ruby.html">POI Ruby Bindings</link>  and other code in the
+          <link
+         href="http://svn.apache.org/repos/asf/poi/trunk/src/contrib/">poi-contrib module</link>
+      </p>
     </section>
   </body>
   <footer>
diff --git a/src/documentation/content/xdocs/poi-ruby.xml b/src/documentation/content/xdocs/poi-ruby.xml
index 07fe1ab090..8579380e7a 100644
--- a/src/documentation/content/xdocs/poi-ruby.xml
+++ b/src/documentation/content/xdocs/poi-ruby.xml
@@ -51,7 +51,7 @@
 	</section>
 	<section><title>Subversion</title>
 	<p>
-	The POI-Ruby module sits under the POI <link href="http://jakarta.apache.org/site/cvsindex.html">Subversion</link> in the <em>src/contrib/poi-ruby</em> directory. Running <em>make</em>
+	The POI-Ruby module sits under the POI <link href="http://svn.apache.org/repos/asf/poi/trunk/src/contrib/poi-ruby/">Subversion</link>. Running <em>make</em>
 	inside that directory will create a loadable ruby extention <em>poi4r.so</em> in the release subdirectory. Tests
 	are in the <em>tests/</em> subdirectory, and should be run from the <em>poi-ruby</em> directory. Please read the tests to figure out the usage.
 	</p>
diff --git a/src/documentation/content/xdocs/spreadsheet/limitations.xml b/src/documentation/content/xdocs/spreadsheet/limitations.xml
index 8dad71e172..bbb806bf1f 100644
--- a/src/documentation/content/xdocs/spreadsheet/limitations.xml
+++ b/src/documentation/content/xdocs/spreadsheet/limitations.xml
@@ -27,7 +27,7 @@
         </authors>
     </header>
     <body>
-        <section><title>Version 2.5 limitations</title>
+        <section><title>Version 3.7 limitations</title>
             <p>
                 The intent of this document is to outline some of the known limitations of the
                 POI HSSF API's.  It is not intended to be complete list of every bug or missing
diff --git a/src/documentation/content/xdocs/spreadsheet/quick-guide.xml b/src/documentation/content/xdocs/spreadsheet/quick-guide.xml
index adb7f607dc..0e2d6a05b3 100644
--- a/src/documentation/content/xdocs/spreadsheet/quick-guide.xml
+++ b/src/documentation/content/xdocs/spreadsheet/quick-guide.xml
@@ -336,7 +336,7 @@
     Sheet sheet1 = wb.getSheetAt(0);
     for (Row row : sheet1) {
         for (Cell cell : row) {
-            CellReference cellRef = new CellReference(row.getRowNum(), cell.getCellNum());
+            CellReference cellRef = new CellReference(row.getRowNum(), cell.getColumnIndex());
             System.out.print(cellRef.formatAsString());
             System.out.print(" - ");
 
@@ -711,7 +711,7 @@ Examples:
                 <anchor id="ConvenienceFunctions"/>
                 <section><title>Using the Convenience Functions</title>
                     <p>
-                        The convenience functions live in contrib and provide
+                        The convenience functions  provide
                         utility features such as setting borders around merged
                         regions and changing style attributes without explicitly
                         creating new styles.