You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by ms...@apache.org on 2016/05/16 17:16:25 UTC

[2/4] pdfbox-docs git commit: Site checkin for project Apache PDFBox Website

http://git-wip-us.apache.org/repos/asf/pdfbox-docs/blob/799b1d78/content/2.0/migration.html
----------------------------------------------------------------------
diff --git a/content/2.0/migration.html b/content/2.0/migration.html
index 8d84ee3..3fbae59 100644
--- a/content/2.0/migration.html
+++ b/content/2.0/migration.html
@@ -130,127 +130,128 @@
                 </ul>
             </div>
             <div class="col-xs-12 col-sm-9">
-                <h1 id="migration-to-pdfbox-2-0-0">Migration to PDFBox 2.0.0</h1>
+                <h1 id="migration-to-pdfbox-200">Migration to PDFBox 2.0.0</h1>
 
 <h2 id="environment">Environment</h2>
-
 <p>PDFBox 2.0.0 requires at least Java 6</p>
 
 <h2 id="packages">Packages</h2>
-
 <p>There are some significant changes to the package structure of PDFBox:</p>
 
 <ul>
-<li>Jempbox is no longer supported and was removed in favour of Xmpbox</li>
-<li>all examples were moved to the new package &quot;pdfbox-examples&quot;</li>
-<li>all commandline tools were moved to the new package &quot;pdfbox-tools&quot;</li>
-<li>all debugger related stuff was moved to the new package &quot;pdfbox-debugger&quot;</li>
-<li>the new package &quot;debugger-app&quot; provides a standalone pre built binary for the debugger</li>
+  <li>Jempbox is no longer supported and was removed in favour of Xmpbox</li>
+  <li>all examples were moved to the new package \u201cpdfbox-examples\u201d</li>
+  <li>all commandline tools were moved to the new package \u201cpdfbox-tools\u201d</li>
+  <li>all debugger related stuff was moved to the new package \u201cpdfbox-debugger\u201d</li>
+  <li>the new package \u201cdebugger-app\u201d provides a standalone pre built binary for the debugger</li>
 </ul>
 
 <h2 id="dependency-updates">Dependency updates</h2>
-
 <p>All libraries on which PDFBox depends are updated to their latest stable versions:</p>
 
 <ul>
-<li>Bouncy Castle 1.53</li>
-<li>Apache Commons Logging 1.2</li>
+  <li>Bouncy Castle 1.53</li>
+  <li>Apache Commons Logging 1.2</li>
 </ul>
 
 <p>For test support the libraries are updated to</p>
 
 <ul>
-<li>JUnit 4.12</li>
-<li>JAI Image Core 1.3.1</li>
-<li>JAI JPEG2000 1.3.0</li>
-<li>Levigo JBIG ImageIO Plugin 1.6.3</li>
+  <li>JUnit 4.12</li>
+  <li>JAI Image Core 1.3.1</li>
+  <li>JAI JPEG2000 1.3.0</li>
+  <li>Levigo JBIG ImageIO Plugin 1.6.3</li>
 </ul>
 
 <p>For PDFBox Preflight</p>
 
 <ul>
-<li>Apache Commons IO 2.4</li>
+  <li>Apache Commons IO 2.4</li>
 </ul>
 
 <h2 id="breaking-changes-to-the-library">Breaking Changes to the Library</h2>
 
 <h3 id="deprecated-api-calls">Deprecated API calls</h3>
-
-<p>Most deprecated API calls in PDFBox 1.8.x have been removed for PDFBox 2.0.0 </p>
+<p>Most deprecated API calls in PDFBox 1.8.x have been removed for PDFBox 2.0.0</p>
 
 <h3 id="api-changes">API Changes</h3>
-
 <p>The API changes are reflected in the Javadoc for PDFBox 2.0.0. The most notable changes are:</p>
 
 <ul>
-<li><code>getCOSDictionary()</code> is no longer used. Instead <code>getCOSObject</code> now returns the matching <code>COSBase</code> subtype.</li>
-<li><code>PDXObjectForm</code> was renamed to <code>PDFormXObject</code> to be more in line with the PDF specification.</li>
-<li><code>PDXObjectImage</code> was renamed to <code>PDImageXObject</code> to be more in line with the PDF specification.</li>
-<li><code>PDPage.getContents().createInputStream()</code>was simplified to <code>PDPage.getContents()</code>.</li>
+  <li><code class="highlighter-rouge">getCOSDictionary()</code> is no longer used. Instead <code class="highlighter-rouge">getCOSObject</code> now returns the matching <code class="highlighter-rouge">COSBase</code> subtype.</li>
+  <li><code class="highlighter-rouge">PDXObjectForm</code> was renamed to <code class="highlighter-rouge">PDFormXObject</code> to be more in line with the PDF specification.</li>
+  <li><code class="highlighter-rouge">PDXObjectImage</code> was renamed to <code class="highlighter-rouge">PDImageXObject</code> to be more in line with the PDF specification.</li>
+  <li><code class="highlighter-rouge">PDPage.getContents().createInputStream()</code>was simplified to <code class="highlighter-rouge">PDPage.getContents()</code>.</li>
 </ul>
 
 <h3 id="general-behaviour">General Behaviour</h3>
-
 <p>PDFBox 2.0.0 is now parsing PDF files following the Xref information in the PDF. This is similar to the functionality using
-<code>PDDocument.loadNonSeq</code> with PDFBox 1.8.x. Users still using <code>PDDocument.load</code> with PDFBox 1.8.x might experience different
+<code class="highlighter-rouge">PDDocument.loadNonSeq</code> with PDFBox 1.8.x. Users still using <code class="highlighter-rouge">PDDocument.load</code> with PDFBox 1.8.x might experience different
 results when switching to PDFBox 2.0.0.</p>
 
 <h3 id="font-handling">Font Handling</h3>
-
 <p>Font handling now has full Unicode support and supports font subsetting.</p>
 
 <p>TrueType fonts shall now be loaded using</p>
-<div class="highlight"><pre><code class="language-java" data-lang="java"><span class="n">PDType0Font</span><span class="o">.</span><span class="na">load</span>
-</code></pre></div>
-<p>to leverage that. </p>
 
-<h3 id="pdf-resources-handling">PDF Resources Handling</h3>
+<div class="highlighter-rouge"><pre class="highlight"><code><span class="n">PDType0Font</span><span class="o">.</span><span class="na">load</span>
+</code></pre>
+</div>
 
-<p>The individual calls to add resources such as <code>PDResource.addFont(PDFont font)</code> and <code>PDResource.addXObject(PDXObject xobject, String prefix)</code>
-have been replaced with <code>PDResource.add(resource type)</code> where <code>resource type</code> represents the different resource classes such as <code>PDFont</code>, <code>PDAbstractPattern</code>
-and so on. The <code>add</code> method now supports all the different type of resources available.</p>
+<p>to leverage that.</p>
 
-<h3 id="working-with-images">Working with Images</h3>
+<h3 id="pdf-resources-handling">PDF Resources Handling</h3>
+<p>The individual calls to add resources such as <code class="highlighter-rouge">PDResource.addFont(PDFont font)</code> and <code class="highlighter-rouge">PDResource.addXObject(PDXObject xobject, String prefix)</code>
+have been replaced with <code class="highlighter-rouge">PDResource.add(resource type)</code> where <code class="highlighter-rouge">resource type</code> represents the different resource classes such as <code class="highlighter-rouge">PDFont</code>, <code class="highlighter-rouge">PDAbstractPattern</code>
+and so on. The <code class="highlighter-rouge">add</code> method now supports all the different type of resources available.</p>
 
-<p>The individual classes <code>PDJpeg()</code>, <code>PDPixelMap()</code> and <code>PDCCitt()</code> to import images have been replaced with <code>PDImageXObject.createFromFile</code> which works for JPG, TIFF (only G4 compression), PNG, BMP and GIF.</p>
+<h3 id="working-with-images">Working with Images</h3>
+<p>The individual classes <code class="highlighter-rouge">PDJpeg()</code>, <code class="highlighter-rouge">PDPixelMap()</code> and <code class="highlighter-rouge">PDCCitt()</code> to import images have been replaced with <code class="highlighter-rouge">PDImageXObject.createFromFile</code> which works for JPG, TIFF (only G4 compression), PNG, BMP and GIF.</p>
 
 <p>In addition there are some specialized classes:</p>
 
 <ul>
-<li><code>JPEGFactory.createFromStream</code> which preserve the JPEG data and embed it in the PDF file without modification. (This is best if you have a JPEG file).</li>
-<li><code>CCITTFactory.createFromFile</code> (for bitonal TIFF images with G4 compression).</li>
-<li><code>LosslessFactory.createFromImage</code> (this is best if you start with a BufferedImage).</li>
+  <li><code class="highlighter-rouge">JPEGFactory.createFromStream</code> which preserve the JPEG data and embed it in the PDF file without modification. (This is best if you have a JPEG file).</li>
+  <li><code class="highlighter-rouge">CCITTFactory.createFromFile</code> (for bitonal TIFF images with G4 compression).</li>
+  <li><code class="highlighter-rouge">LosslessFactory.createFromImage</code> (this is best if you start with a BufferedImage).</li>
 </ul>
 
 <h3 id="parsing-the-page-content">Parsing the Page Content</h3>
-
 <p>Getting the content for a page has been simplified.</p>
 
 <p>Prior to PDFBox 2.0 parsing the page content was done using</p>
-<div class="highlight"><pre><code class="language-java" data-lang="java"><span class="n">PDStream</span> <span class="n">contents</span> <span class="o">=</span> <span class="n">page</span><span class="o">.</span><span class="na">getContents</span><span class="o">();</span>
+
+<div class="highlighter-rouge"><pre class="highlight"><code><span class="n">PDStream</span> <span class="n">contents</span> <span class="o">=</span> <span class="n">page</span><span class="o">.</span><span class="na">getContents</span><span class="o">();</span>
 <span class="n">PDFStreamParser</span> <span class="n">parser</span> <span class="o">=</span> <span class="k">new</span> <span class="n">PDFStreamParser</span><span class="o">(</span><span class="n">contents</span><span class="o">.</span><span class="na">getStream</span><span class="o">());</span>
 <span class="n">parser</span><span class="o">.</span><span class="na">parse</span><span class="o">();</span>
 <span class="n">List</span><span class="o">&lt;</span><span class="n">Object</span><span class="o">&gt;</span> <span class="n">tokens</span> <span class="o">=</span> <span class="n">parser</span><span class="o">.</span><span class="na">getTokens</span><span class="o">();</span>
-</code></pre></div>
-<p>With PDFBox 2.0 the code is reduced to </p>
-<div class="highlight"><pre><code class="language-java" data-lang="java"><span class="n">PDFStreamParser</span> <span class="n">parser</span> <span class="o">=</span> <span class="k">new</span> <span class="n">PDFStreamParser</span><span class="o">(</span><span class="n">page</span><span class="o">);</span>
+</code></pre>
+</div>
+
+<p>With PDFBox 2.0 the code is reduced to</p>
+
+<div class="highlighter-rouge"><pre class="highlight"><code><span class="n">PDFStreamParser</span> <span class="n">parser</span> <span class="o">=</span> <span class="k">new</span> <span class="n">PDFStreamParser</span><span class="o">(</span><span class="n">page</span><span class="o">);</span>
 <span class="n">parser</span><span class="o">.</span><span class="na">parse</span><span class="o">();</span>
 <span class="n">List</span><span class="o">&lt;</span><span class="n">Object</span><span class="o">&gt;</span> <span class="n">tokens</span> <span class="o">=</span> <span class="n">parser</span><span class="o">.</span><span class="na">getTokens</span><span class="o">();</span>
-</code></pre></div>
+</code></pre>
+</div>
+
 <p>In addition this also works if the page content is defined as an <strong>array of content streams</strong>.</p>
 
 <h3 id="iterating-pages">Iterating Pages</h3>
-
 <p>With PDFBox 2.0.0 the prefered way to iterate through the pages of a document is</p>
-<div class="highlight"><pre><code class="language-java" data-lang="java"><span class="k">for</span><span class="o">(</span><span class="n">PDPage</span> <span class="n">page</span> <span class="o">:</span> <span class="n">document</span><span class="o">.</span><span class="na">getPages</span><span class="o">())</span>
+
+<div class="highlighter-rouge"><pre class="highlight"><code><span class="k">for</span><span class="o">(</span><span class="n">PDPage</span> <span class="n">page</span> <span class="o">:</span> <span class="n">document</span><span class="o">.</span><span class="na">getPages</span><span class="o">())</span>
 <span class="o">{</span>
     <span class="o">...</span> <span class="o">(</span><span class="k">do</span> <span class="n">something</span><span class="o">)</span>
 <span class="o">}</span>
-</code></pre></div>
+</code></pre>
+</div>
+
 <h3 id="pdf-rendering">PDF Rendering</h3>
+<p>With PDFBox 2.0.0 <code class="highlighter-rouge">PDPage.convertToImage</code> and <code class="highlighter-rouge">PDFImageWriter</code> have been removed. Instead the new <code class="highlighter-rouge">PDFRenderer</code> class shall be used.</p>
 
-<p>With PDFBox 2.0.0 <code>PDPage.convertToImage</code> and <code>PDFImageWriter</code> have been removed. Instead the new <code>PDFRenderer</code> class shall be used.</p>
-<div class="highlight"><pre><code class="language-java" data-lang="java"><span class="n">PDDocument</span> <span class="n">document</span> <span class="o">=</span> <span class="n">PDDocument</span><span class="o">.</span><span class="na">load</span><span class="o">(</span><span class="k">new</span> <span class="n">File</span><span class="o">(</span><span class="n">pdfFilename</span><span class="o">));</span>
+<div class="highlighter-rouge"><pre class="highlight"><code><span class="n">PDDocument</span> <span class="n">document</span> <span class="o">=</span> <span class="n">PDDocument</span><span class="o">.</span><span class="na">load</span><span class="o">(</span><span class="k">new</span> <span class="n">File</span><span class="o">(</span><span class="n">pdfFilename</span><span class="o">));</span>
 <span class="n">PDFRenderer</span> <span class="n">pdfRenderer</span> <span class="o">=</span> <span class="k">new</span> <span class="n">PDFRenderer</span><span class="o">(</span><span class="n">document</span><span class="o">);</span>
 <span class="kt">int</span> <span class="n">pageCounter</span> <span class="o">=</span> <span class="mi">0</span><span class="o">;</span>
 <span class="k">for</span> <span class="o">(</span><span class="n">PDPage</span> <span class="n">page</span> <span class="o">:</span> <span class="n">document</span><span class="o">.</span><span class="na">getPages</span><span class="o">())</span>
@@ -261,47 +262,53 @@ and so on. The <code>add</code> method now supports all the different type of re
     <span class="n">ImageIOUtil</span><span class="o">.</span><span class="na">writeImage</span><span class="o">(</span><span class="n">bim</span><span class="o">,</span> <span class="n">pdfFilename</span> <span class="o">+</span> <span class="s">"-"</span> <span class="o">+</span> <span class="o">(</span><span class="n">pageCounter</span><span class="o">++)</span> <span class="o">+</span> <span class="s">".png"</span><span class="o">,</span> <span class="mi">300</span><span class="o">);</span>
 <span class="o">}</span>
 <span class="n">document</span><span class="o">.</span><span class="na">close</span><span class="o">();</span>
-</code></pre></div>
-<p><code>ImageIOUtil</code> has been moved into the <code>org.apache.pdfbox.tools.imageio</code> package. This is in the <code>pdfbox-tools</code> download. If you are using maven, the <code>artifactId</code> has the same name.</p>
+</code></pre>
+</div>
+
+<p><code class="highlighter-rouge">ImageIOUtil</code> has been moved into the <code class="highlighter-rouge">org.apache.pdfbox.tools.imageio</code> package. This is in the <code class="highlighter-rouge">pdfbox-tools</code> download. If you are using maven, the <code class="highlighter-rouge">artifactId</code> has the same name.</p>
 
 <p class="alert alert-warning">Important notice when using PDFBox with Java 8
 </p>
-
-<p>Due to the change of the java color management module towards &quot;LittleCMS&quot;, users can experience slow performance in color operations.
+<p>Due to the change of the java color management module towards \u201cLittleCMS\u201d, users can experience slow performance in color operations.
 Solution: disable LittleCMS in favour of the old KCMS (Kodak Color Management System):</p>
 
 <ul>
-<li>start with <code>-Dsun.java2d.cmm=sun.java2d.cmm.kcms.KcmsServiceProvider</code>or call</li>
-<li><code>System.setProperty(&quot;sun.java2d.cmm&quot;, &quot;sun.java2d.cmm.kcms.KcmsServiceProvider&quot;);</code></li>
+  <li>start with <code class="highlighter-rouge">-Dsun.java2d.cmm=sun.java2d.cmm.kcms.KcmsServiceProvider</code>or call</li>
+  <li><code class="highlighter-rouge">System.setProperty("sun.java2d.cmm", "sun.java2d.cmm.kcms.KcmsServiceProvider");</code></li>
 </ul>
 
-<p>Sources:<br>
-<a href="http://www.subshell.com/en/subshell/blog/Wrong-Colors-in-Images-with-Java8-100.html">http://www.subshell.com/en/subshell/blog/Wrong-Colors-in-Images-with-Java8-100.html</a><br>
-<a href="https://bugs.openjdk.java.net/browse/JDK-8041125">https://bugs.openjdk.java.net/browse/JDK-8041125</a></p>
+<p>Sources:<br />
+http://www.subshell.com/en/subshell/blog/Wrong-Colors-in-Images-with-Java8-100.html<br />
+https://bugs.openjdk.java.net/browse/JDK-8041125</p>
 
 <h3 id="pdf-printing">PDF Printing</h3>
+<p>With PDFBox 2.0.0 <code class="highlighter-rouge">PDFPrinter</code> has been removed.</p>
 
-<p>With PDFBox 2.0.0 <code>PDFPrinter</code> has been removed.</p>
+<p>Users of <code class="highlighter-rouge">PDFPrinter.silentPrint()</code> should now use this code:</p>
 
-<p>Users of <code>PDFPrinter.silentPrint()</code> should now use this code:</p>
-<div class="highlight"><pre><code class="language-java" data-lang="java"><span class="n">PrinterJob</span> <span class="n">job</span> <span class="o">=</span> <span class="n">PrinterJob</span><span class="o">.</span><span class="na">getPrinterJob</span><span class="o">();</span>
+<div class="highlighter-rouge"><pre class="highlight"><code><span class="n">PrinterJob</span> <span class="n">job</span> <span class="o">=</span> <span class="n">PrinterJob</span><span class="o">.</span><span class="na">getPrinterJob</span><span class="o">();</span>
 <span class="n">job</span><span class="o">.</span><span class="na">setPageable</span><span class="o">(</span><span class="k">new</span> <span class="n">PDFPageable</span><span class="o">(</span><span class="n">document</span><span class="o">));</span>
 <span class="n">job</span><span class="o">.</span><span class="na">print</span><span class="o">();</span>
-</code></pre></div>
-<p>While users of <code>PDFPrinter.print()</code> should now use this code:</p>
-<div class="highlight"><pre><code class="language-java" data-lang="java"><span class="n">PrinterJob</span> <span class="n">job</span> <span class="o">=</span> <span class="n">PrinterJob</span><span class="o">.</span><span class="na">getPrinterJob</span><span class="o">();</span>
+</code></pre>
+</div>
+
+<p>While users of <code class="highlighter-rouge">PDFPrinter.print()</code> should now use this code:</p>
+
+<div class="highlighter-rouge"><pre class="highlight"><code><span class="n">PrinterJob</span> <span class="n">job</span> <span class="o">=</span> <span class="n">PrinterJob</span><span class="o">.</span><span class="na">getPrinterJob</span><span class="o">();</span>
 <span class="n">job</span><span class="o">.</span><span class="na">setPageable</span><span class="o">(</span><span class="k">new</span> <span class="n">PDFPageable</span><span class="o">(</span><span class="n">document</span><span class="o">));</span>
 <span class="k">if</span> <span class="o">(</span><span class="n">job</span><span class="o">.</span><span class="na">printDialog</span><span class="o">())</span> <span class="o">{</span>
     <span class="n">job</span><span class="o">.</span><span class="na">print</span><span class="o">();</span>
 <span class="o">}</span>
-</code></pre></div>
+</code></pre>
+</div>
+
 <p>Advanced use case examples can be found in th examples package under org/apache/pdfbox/examples/printing/Printing.java</p>
 
 <h3 id="text-extraction">Text Extraction</h3>
-
 <p>In 1.8, to get the text colors, one method was to pass an expanded .properties file to the PDFStripper constructor. To achieve the same 
-in PDFBox 2.0 you can extend <code>PDFTextStripper</code>and add the following <code>Operators</code> to the constructor:</p>
-<div class="highlight"><pre><code class="language-java" data-lang="java"><span class="n">addOperator</span><span class="o">(</span><span class="k">new</span> <span class="n">SetStrokingColorSpace</span><span class="o">());</span>
+in PDFBox 2.0 you can extend <code class="highlighter-rouge">PDFTextStripper</code>and add the following <code class="highlighter-rouge">Operators</code> to the constructor:</p>
+
+<div class="highlighter-rouge"><pre class="highlight"><code><span class="n">addOperator</span><span class="o">(</span><span class="k">new</span> <span class="n">SetStrokingColorSpace</span><span class="o">());</span>
 <span class="n">addOperator</span><span class="o">(</span><span class="k">new</span> <span class="n">SetNonStrokingColorSpace</span><span class="o">());</span>
 <span class="n">addOperator</span><span class="o">(</span><span class="k">new</span> <span class="n">SetStrokingDeviceCMYKColor</span><span class="o">());</span>
 <span class="n">addOperator</span><span class="o">(</span><span class="k">new</span> <span class="n">SetNonStrokingDeviceCMYKColor</span><span class="o">());</span>
@@ -313,49 +320,52 @@ in PDFBox 2.0 you can extend <code>PDFTextStripper</code>and add the following <
 <span class="n">addOperator</span><span class="o">(</span><span class="k">new</span> <span class="n">SetStrokingColorN</span><span class="o">());</span>
 <span class="n">addOperator</span><span class="o">(</span><span class="k">new</span> <span class="n">SetNonStrokingColor</span><span class="o">());</span>
 <span class="n">addOperator</span><span class="o">(</span><span class="k">new</span> <span class="n">SetNonStrokingColorN</span><span class="o">());</span>
-</code></pre></div>
-<h3 id="interactive-forms">Interactive Forms</h3>
+</code></pre>
+</div>
 
+<h3 id="interactive-forms">Interactive Forms</h3>
 <p>Large parts of the support for interactive forms (AcroForms) have been rewritten. The most notable change from 1.8.x is that
 there is a clear distinction between fields and the annotations representing them visually. Intermediate nodes in a field 
-tree are now represented by the <code>PDNonTerminalField</code> class.</p>
+tree are now represented by the <code class="highlighter-rouge">PDNonTerminalField</code> class.</p>
 
 <p>With PDFBox 2.0.0 the prefered way to iterate through the fields is now</p>
-<div class="highlight"><pre><code class="language-java" data-lang="java"><span class="n">PDAcroForm</span> <span class="n">form</span><span class="o">;</span>
+
+<div class="highlighter-rouge"><pre class="highlight"><code><span class="n">PDAcroForm</span> <span class="n">form</span><span class="o">;</span>
 <span class="o">...</span>
 <span class="k">for</span> <span class="o">(</span><span class="n">PDField</span> <span class="n">field</span> <span class="o">:</span> <span class="n">form</span><span class="o">.</span><span class="na">getFieldTree</span><span class="o">())</span>
 <span class="o">{</span>
     <span class="o">...</span> <span class="o">(</span><span class="k">do</span> <span class="n">something</span><span class="o">)</span>
 <span class="o">}</span>
-</code></pre></div>
-<p>Most <code>PDField</code> subclasses now accept Java generic types such as <code>String</code> as parameters instead of the former <code>COSBase</code> subclasses.</p>
+</code></pre>
+</div>
 
-<h4 id="pdfield-getwidget-removed">PDField.getWidget() removed</h4>
+<p>Most <code class="highlighter-rouge">PDField</code> subclasses now accept Java generic types such as <code class="highlighter-rouge">String</code> as parameters instead of the former <code class="highlighter-rouge">COSBase</code> subclasses.</p>
 
-<p>As form fields do support multiple annotations <code>PDField.getWidget()</code> has been removed in favour of <code>PDField.getWidgets()</code>which returns all
+<h4 id="pdfieldgetwidget-removed">PDField.getWidget() removed</h4>
+<p>As form fields do support multiple annotations <code class="highlighter-rouge">PDField.getWidget()</code> has been removed in favour of <code class="highlighter-rouge">PDField.getWidgets()</code>which returns all
 annotations associated with a field.</p>
 
 <h4 id="pdunknownfield-removed">PDUnknownField removed</h4>
-
-<p>The <code>PDUnknownField</code> class has been removed, such fields are treated as <code>null</code> <a href="https://issues.apache.org/jira/browse/PDFBOX-2885">see PDFBOX-2885</a>.</p>
+<p>The <code class="highlighter-rouge">PDUnknownField</code> class has been removed, such fields are treated as <code class="highlighter-rouge">null</code> <a href="https://issues.apache.org/jira/browse/PDFBOX-2885">see PDFBOX-2885</a>.</p>
 
 <h3 id="document-outline">Document Outline</h3>
-
-<p>The method <code>PDOutlineNode.appendChild()</code> has been renamed to <code>PDOutlineNode.addLast()</code>. There is now also a complementary method <code>PDOutlineNode.addFirst()</code>.</p>
+<p>The method <code class="highlighter-rouge">PDOutlineNode.appendChild()</code> has been renamed to <code class="highlighter-rouge">PDOutlineNode.addLast()</code>. There is now also a complementary method <code class="highlighter-rouge">PDOutlineNode.addFirst()</code>.</p>
 
 <h3 id="why-was-the-replacetext-example-removed">Why was the ReplaceText example removed?</h3>
-
 <p>The ReplaceText example has been removed as it gave the incorrect illusion that text can be replaced easily.
 Words are often split, as seen by this excerpt of a content stream:</p>
-<div class="highlight"><pre><code class="language-" data-lang="">[ (Do) -29 (c) -1 (umen) 30 (tation) ] TJ
-</code></pre></div>
+
+<div class="highlighter-rouge"><pre class="highlight"><code>[ (Do) -29 (c) -1 (umen) 30 (tation) ] TJ
+</code></pre>
+</div>
+
 <p>Other problems will appear with font subsets: for example, if only the glyphs for a, b and c are used,
-these would be encoded as hex 0, 1 and 2, so you won&#39;t find &quot;abc&quot;. Additionally, you can&#39;t replace &quot;c&quot; with &quot;d&quot; because it isn&#39;t part of the subset.</p>
+these would be encoded as hex 0, 1 and 2, so you won\u2019t find \u201cabc\u201d. Additionally, you can\u2019t replace \u201cc\u201d with \u201cd\u201d because it isn\u2019t part of the subset.</p>
 
-<p>You could also have problems with ligatures, e.g. &quot;ff&quot;, &quot;fl&quot;, &quot;fi&quot;, &quot;ffi&quot;, &quot;ffl&quot;, which can be represented by a single code in many fonts.
-To understand this yourself, view any file with PDFDebugger and have a look at the &quot;Contents&quot; entry of a page.</p>
+<p>You could also have problems with ligatures, e.g. \u201cff\u201d, \u201cfl\u201d, \u201cfi\u201d, \u201cffi\u201d, \u201cffl\u201d, which can be represented by a single code in many fonts.
+To understand this yourself, view any file with PDFDebugger and have a look at the \u201cContents\u201d entry of a page.</p>
 
-<p>See also <a href="https://stackoverflow.com/questions/35420609/pdfbox-2-0-rc3-find-and-replace-text">https://stackoverflow.com/questions/35420609/pdfbox-2-0-rc3-find-and-replace-text</a></p>
+<p>See also https://stackoverflow.com/questions/35420609/pdfbox-2-0-rc3-find-and-replace-text</p>
 
             </div>
         </div>

http://git-wip-us.apache.org/repos/asf/pdfbox-docs/blob/799b1d78/content/building.html
----------------------------------------------------------------------
diff --git a/content/building.html b/content/building.html
index 1cc2565..2dd602b 100644
--- a/content/building.html
+++ b/content/building.html
@@ -132,73 +132,82 @@
             <div class="col-xs-12 col-sm-9">
                 <h1 id="building-from-source">Building from Source</h1>
 
-<p>Building PDFBox from source is only necessary if you&#39;re wanting to contribute code to the PDFBox project. Most users should use the <a href="http://pdfbox.apache.org/download.cgi">binary releases</a> instead.</p>
+<p>Building PDFBox from source is only necessary if you\u2019re wanting to contribute code to the PDFBox project. Most users should use the <a href="http://pdfbox.apache.org/download.cgi">binary releases</a> instead.</p>
 
 <h2 id="obtaining-the-source">Obtaining the Source</h2>
 
 <p>You can obtain the latest source of PDFBox from our <a href="http://pdfbox.apache.org/download.cgi">SVN repo</a> The current trunk is v2.0.0-SNAPSHOT. There is a seperate branch for the 1.8.x series. You can fetch the latest 2.0 trunk using Subversion:</p>
-<div class="highlight"><pre><code class="language-" data-lang="">svn checkout http://svn.apache.org/repos/asf/pdfbox/trunk/
+
+<div class="highlighter-rouge"><pre class="highlight"><code>svn checkout http://svn.apache.org/repos/asf/pdfbox/trunk/
 cd trunk
-</code></pre></div>
+</code></pre>
+</div>
+
 <h2 id="build-dependencies">Build dependencies</h2>
 
-<h3 id="pdfbox-1-8">PDFBox 1.8</h3>
+<h3 id="pdfbox-18">PDFBox 1.8</h3>
 
 <ul>
-<li>JDK 5 or 6</li>
-<li><a href="http://maven.apache.org/">Maven 3</a></li>
+  <li>JDK 5 or 6</li>
+  <li><a href="http://maven.apache.org/">Maven 3</a></li>
 </ul>
 
-<h3 id="pdfbox-2-0">PDFBox 2.0</h3>
+<h3 id="pdfbox-20">PDFBox 2.0</h3>
 
 <ul>
-<li>JDK 6+</li>
-<li><a href="#java-cryptography-extension-jce">Java Cryptography Extension (JCE)</a></li>
-<li><a href="http://maven.apache.org/">Maven 3</a></li>
+  <li>JDK 6+</li>
+  <li><a href="#java-cryptography-extension-jce">Java Cryptography Extension (JCE)</a></li>
+  <li><a href="http://maven.apache.org/">Maven 3</a></li>
 </ul>
 
 <h3 id="java-cryptography-extension-jce">Java Cryptography Extension (JCE)</h3>
 
-<p>Building PDFBox 2.0 requires a JDK with &quot;unlimited strength&quot; cryptography, which requires extra files to be installed. For JDK 7, see <a href="http://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html">Java Cryptography Extension (JCE)</a>. If these files are not installed, building PDFBox will fail the following test:</p>
-<div class="highlight"><pre><code class="language-" data-lang="">TestPublicKeyEncryption.setUp:70 JCE unlimited strength jurisdiction policy files are not installed
-</code></pre></div>
+<p>Building PDFBox 2.0 requires a JDK with \u201cunlimited strength\u201d cryptography, which requires extra files to be installed. For JDK 7, see <a href="http://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html">Java Cryptography Extension (JCE)</a>. If these files are not installed, building PDFBox will fail the following test:</p>
+
+<div class="highlighter-rouge"><pre class="highlight"><code>TestPublicKeyEncryption.setUp:70 JCE unlimited strength jurisdiction policy files are not installed
+</code></pre>
+</div>
+
 <h2 id="building-with-maven">Building with Maven</h2>
 
 <p>In the root directory of PDFBox:</p>
-<div class="highlight"><pre><code class="language-" data-lang="">mvn clean install
-</code></pre></div>
-<hr>
 
-<h2 id="building-with-ant-deprecated-removed-in-2-0-0">Building with Ant (Deprecated, removed in 2.0.0)</h2>
+<div class="highlighter-rouge"><pre class="highlight"><code>mvn clean install
+</code></pre>
+</div>
+
+<hr />
+
+<h2 id="building-with-ant-deprecated-removed-in-200">Building with Ant (Deprecated, removed in 2.0.0)</h2>
 
 <p>The old Ant build is still available, and can be used especially for
 building .NET binaries with IKVM:</p>
 
 <ol>
-<li> Install <a href="http://ant.apache.org/">ANT</a>. PDFBox currently uses 1.6.2
+  <li>Install <a href="http://ant.apache.org/">ANT</a>. PDFBox currently uses 1.6.2
 but other versions probably work as well.</li>
-<li><p>(optional) Setup IKVM, if you want to build the .NET DLL version of
-PDFBox.</p>
-
-<ol>
-<li> <a href="http://www.ikvm.net/">IKVM</a> binaries</li>
-<li> In the build.properties, set the ikvm.dir property:\
- <code>ikvm.dir=C:\\javalib\\ikvm-12-07-2004\\ikvm</code></li>
-</ol></li>
-<li><p>Run &quot;<code>ant</code>&quot; from the root PDFBox directory. This will create the
-.zip package distribution. See the build file for other ant targets.</p></li>
+  <li>(optional) Setup IKVM, if you want to build the .NET DLL version of
+PDFBox.
+    <ol>
+      <li><a href="http://www.ikvm.net/">IKVM</a> binaries</li>
+      <li>In the build.properties, set the ikvm.dir property:\
+ <code class="highlighter-rouge">ikvm.dir=C:\\javalib\\ikvm-12-07-2004\\ikvm</code></li>
+    </ol>
+  </li>
+  <li>Run \u201c<code class="highlighter-rouge">ant</code>\u201d from the root PDFBox directory. This will create the
+.zip package distribution. See the build file for other ant targets.</li>
 </ol>
 
 <p>NOTE: If you want to run PDFBox from an IDE them you will need to add
-the &#39;Resources&#39; directory to the project classpath in your IDE.</p>
+the \u2018Resources\u2019 directory to the project classpath in your IDE.</p>
 
 <h3 id="dependencies-for-ant-builds">Dependencies for Ant Builds</h3>
 
-<p>The above instructions expect that you&#39;re using <a href="http://maven.apache.org/">Maven</a> or another build tool like <a href="http://ant.apache.org/ivy/">Ivy</a> that supports Maven dependencies.
-If you instead use tools like <a href="http://ant.apache.org/">Ant</a> where you need to explicitly include all the required library jars in your application, you&#39;ll need to do
+<p>The above instructions expect that you\u2019re using <a href="http://maven.apache.org/">Maven</a> or another build tool like <a href="http://ant.apache.org/ivy/">Ivy</a> that supports Maven dependencies.
+If you instead use tools like <a href="http://ant.apache.org/">Ant</a> where you need to explicitly include all the required library jars in your application, you\u2019ll need to do
 something different.</p>
 
-<p>The easiest approach is to run <code>mvn dependency:copy-dependencies</code> inside the pdfbox directory of the latest PDFBox source release. This will copy all the required and optional
+<p>The easiest approach is to run <code class="highlighter-rouge">mvn dependency:copy-dependencies</code> inside the pdfbox directory of the latest PDFBox source release. This will copy all the required and optional
 libraries discussed above into the pdfbox/target/dependencies directory. You can then simply copy all the libraries you need from this directory to your application.</p>
 
             </div>

http://git-wip-us.apache.org/repos/asf/pdfbox-docs/blob/799b1d78/content/codingconventions.html
----------------------------------------------------------------------
diff --git a/content/codingconventions.html b/content/codingconventions.html
index d4c0897..7b1caa9 100644
--- a/content/codingconventions.html
+++ b/content/codingconventions.html
@@ -137,86 +137,155 @@
 <h3 id="formatting">Formatting</h3>
 
 <ul>
-<li><p>Braces go on their own line.</p></li>
-<li><p>Always use braces with control flow statements.</p></li>
-<li><p>No lines longer than 100 characters, including JavaDoc.</p></li>
-<li><p>Wrapped lines should use either an indent of 4 or 8 characters or align with the expression at the same level on the previous line.</p></li>
-<li><p>Wrapped lines should be broken after operators, not before.</p></li>
-<li><p>Prefer aligned wrapped lines.</p></li>
-<li><p>Prefer aligned wrapped parameter lists.</p></li>
+  <li>
+    <p>Braces go on their own line.</p>
+  </li>
+  <li>
+    <p>Always use braces with control flow statements.</p>
+  </li>
+  <li>
+    <p>No lines longer than 100 characters, including JavaDoc.</p>
+  </li>
+  <li>
+    <p>Wrapped lines should use either an indent of 4 or 8 characters or align with the expression at the same level on the previous line.</p>
+  </li>
+  <li>
+    <p>Wrapped lines should be broken after operators, not before.</p>
+  </li>
+  <li>
+    <p>Prefer aligned wrapped lines.</p>
+  </li>
+  <li>
+    <p>Prefer aligned wrapped parameter lists.</p>
+  </li>
 </ul>
 
 <h3 id="whitespace">Whitespace</h3>
 
 <ul>
-<li><p>Four spaces for indents, no tabs.</p></li>
-<li><p>Do not use spaces around parenthesis.</p></li>
-<li><p>Use spaces after control flow keywords.</p></li>
-<li><p>Prefer using blank lines to separate logical blocks of code, but do not be excessive.</p></li>
-<li><p>Prefer not following casts with a blank space.</p></li>
+  <li>
+    <p>Four spaces for indents, no tabs.</p>
+  </li>
+  <li>
+    <p>Do not use spaces around parenthesis.</p>
+  </li>
+  <li>
+    <p>Use spaces after control flow keywords.</p>
+  </li>
+  <li>
+    <p>Prefer using blank lines to separate logical blocks of code, but do not be excessive.</p>
+  </li>
+  <li>
+    <p>Prefer not following casts with a blank space.</p>
+  </li>
 </ul>
 
 <h3 id="structure">Structure</h3>
 
 <ul>
-<li><p>Do not use package imports (e.g. <code>import java.util.*</code>)</p></li>
-<li><p>Static fields and methods must appear at the top of a class, before any other code.</p></li>
-<li><p>Within a class, definitions should be ordered as follows:</p>
-
-<p>Class (static) variables<br>
-Instance variables<br>
-Constructors<br>
-Methods  </p></li>
+  <li>
+    <p>Do not use package imports (e.g. <code class="highlighter-rouge">import java.util.*</code>)</p>
+  </li>
+  <li>
+    <p>Static fields and methods must appear at the top of a class, before any other code.</p>
+  </li>
+  <li>
+    <p>Within a class, definitions should be ordered as follows:</p>
+
+    <p>Class (static) variables<br />
+  Instance variables<br />
+  Constructors<br />
+  Methods</p>
+  </li>
 </ul>
 
 <h3 id="javadoc">JavaDoc</h3>
 
 <ul>
-<li><p>Public and protected methods and fields must have JavaDoc.</p></li>
-<li><p>Don&#39;t use <code>@version</code> tags.</p></li>
-<li><p>Don&#39;t use <code>@since</code> tags.</p></li>
-<li><p>Don&#39;t include your e-mail address in <code>@author</code> tags.</p></li>
-<li><p>You may omit <code>@return</code> tags for getters as long as you include a summary which begins with the word &quot;Returns&quot;.</p></li>
-<li><p>Private methods do not require JavaDoc but may have partial JavaDoc if it adds valuable information.</p></li>
+  <li>
+    <p>Public and protected methods and fields must have JavaDoc.</p>
+  </li>
+  <li>
+    <p>Don\u2019t use <code class="highlighter-rouge">@version</code> tags.</p>
+  </li>
+  <li>
+    <p>Don\u2019t use <code class="highlighter-rouge">@since</code> tags.</p>
+  </li>
+  <li>
+    <p>Don\u2019t include your e-mail address in <code class="highlighter-rouge">@author</code> tags.</p>
+  </li>
+  <li>
+    <p>You may omit <code class="highlighter-rouge">@return</code> tags for getters as long as you include a summary which begins with the word \u201cReturns\u201d.</p>
+  </li>
+  <li>
+    <p>Private methods do not require JavaDoc but may have partial JavaDoc if it adds valuable information.</p>
+  </li>
 </ul>
 
 <h3 id="comments">Comments</h3>
 
 <ul>
-<li><p>Only use line comments within code, never block comments.</p></li>
-<li><p>Prefer comments on their own line, rather than trailing, unless the latter is more readable.</p></li>
-<li><p>Prefix line comments by a space <code>// like this</code>.</p></li>
+  <li>
+    <p>Only use line comments within code, never block comments.</p>
+  </li>
+  <li>
+    <p>Prefer comments on their own line, rather than trailing, unless the latter is more readable.</p>
+  </li>
+  <li>
+    <p>Prefix line comments by a space <code class="highlighter-rouge">// like this</code>.</p>
+  </li>
 </ul>
 
 <h3 id="variables">Variables</h3>
 
 <ul>
-<li><p>Prefer initializing variables when they are declared, rather than C-style declaration before use.</p></li>
-<li><p>Always use final fields when possible.</p></li>
+  <li>
+    <p>Prefer initializing variables when they are declared, rather than C-style declaration before use.</p>
+  </li>
+  <li>
+    <p>Always use final fields when possible.</p>
+  </li>
 </ul>
 
 <h3 id="control-flow">Control Flow</h3>
 
 <ul>
-<li><p>Prefer multiple return statements over additional control flow logic.</p></li>
-<li><p>Prefer switch statements over multi-clause if-then statements.</p></li>
+  <li>
+    <p>Prefer multiple return statements over additional control flow logic.</p>
+  </li>
+  <li>
+    <p>Prefer switch statements over multi-clause if-then statements.</p>
+  </li>
 </ul>
 
 <h3 id="api-design">API Design</h3>
 
 <ul>
-<li><p>Give variables and methods meaningful names. Keep these short but don&#39;t use abbreviations. Prefer using the same terminology as the PDF spec.</p></li>
-<li><p>Prefer final classes and final protected methods for non-final public classes, this reduces the surface area of the public API.</p></li>
-<li><p>Avoid non-final protected variables in public classes. Prefer protected getters over protected variables when protected fields are necessery in public classes.</p></li>
-<li><p>Minimize the API. Don&#39;t make everything public just because you can.</p></li>
-<li><p>Don&#39;t expose implementation details unless there is a clear need: allowing subclassing means that the behaviour of protected methods becomes part of the contract of the public AP.</p></li>
-<li><p>Avoid unnecesary abstraction. While you&#39;re encouraged to avoid brittle designs, it&#39;s unlikey that an API designed for &quot;future use&quot; will have the correct API without any code which actually uses it.</p></li>
+  <li>
+    <p>Give variables and methods meaningful names. Keep these short but don\u2019t use abbreviations. Prefer using the same terminology as the PDF spec.</p>
+  </li>
+  <li>
+    <p>Prefer final classes and final protected methods for non-final public classes, this reduces the surface area of the public API.</p>
+  </li>
+  <li>
+    <p>Avoid non-final protected variables in public classes. Prefer protected getters over protected variables when protected fields are necessery in public classes.</p>
+  </li>
+  <li>
+    <p>Minimize the API. Don\u2019t make everything public just because you can.</p>
+  </li>
+  <li>
+    <p>Don\u2019t expose implementation details unless there is a clear need: allowing subclassing means that the behaviour of protected methods becomes part of the contract of the public AP.</p>
+  </li>
+  <li>
+    <p>Avoid unnecesary abstraction. While you\u2019re encouraged to avoid brittle designs, it\u2019s unlikey that an API designed for \u201cfuture use\u201d will have the correct API without any code which actually uses it.</p>
+  </li>
 </ul>
 
 <h3 id="example">Example</h3>
 
-<p>Here&#39;s an example of PDFBox&#39;s formatting style:</p>
-<div class="highlight"><pre><code class="language-" data-lang="">public class Foo extends Bar
+<p>Here\u2019s an example of PDFBox\u2019s formatting style:</p>
+
+<div class="highlighter-rouge"><pre class="highlight"><code>public class Foo extends Bar
 {
     public static void main(String args[])
     {
@@ -233,11 +302,13 @@ Methods  </p></li>
         }
     }
 }
-</code></pre></div>
+</code></pre>
+</div>
+
 <h2 id="eclipse-formatter">Eclipse Formatter</h2>
 
 <p>Eclipse users may download this preferences file: pdfbox-eclipse-formatter.xml and import this into Eclipse. 
-(Window-&gt;Preferences, go to Java-&gt;Code Style-&gt;Formatter and click &quot;Import...&quot;).
+(Window-&gt;Preferences, go to Java-&gt;Code Style-&gt;Formatter and click \u201cImport\u2026\u201d).
 Once you have done this you can reformat your code by using Source-&gt;Format (Ctrl+Shift+F).</p>
 
 <p>Also note that Eclipse will automatically format your import statements appropriately when 

http://git-wip-us.apache.org/repos/asf/pdfbox-docs/blob/799b1d78/content/css/site.css
----------------------------------------------------------------------
diff --git a/content/css/site.css b/content/css/site.css
index 34b2fc8..d8281e8 100644
--- a/content/css/site.css
+++ b/content/css/site.css
@@ -77,7 +77,7 @@ h4 .open-iconic {
     fill: #0088cc;
 }
 
-.highlight > pre {
+pre.highlight, .highlight > pre {
     color: darkslategrey;
     border: 0pt;
     border-radius: 0pt;

http://git-wip-us.apache.org/repos/asf/pdfbox-docs/blob/799b1d78/content/errors/403.html
----------------------------------------------------------------------
diff --git a/content/errors/403.html b/content/errors/403.html
index 00955e3..0849db4 100644
--- a/content/errors/403.html
+++ b/content/errors/403.html
@@ -130,15 +130,15 @@
                 </ul>
             </div>
             <div class="col-xs-12 col-sm-9">
-                <h1 id="403">403</h1>
+                <h1 id="section">403</h1>
 
-<p>We&#39;re sorry, but the page you requested cannot be accessed. </p>
+<p>We\u2019re sorry, but the page you requested cannot be accessed.</p>
 
-<p>Maybe you </p>
+<p>Maybe you</p>
 
 <ul>
-<li>typed the address incorrectly</li>
-<li>followed a link from another site that pointed to this page.</li>
+  <li>typed the address incorrectly</li>
+  <li>followed a link from another site that pointed to this page.</li>
 </ul>
 
 <p>If you came by following a broken link, please report the <a href="https://issues.apache.org/jira/browse/pdfbox">issue</a>.</p>

http://git-wip-us.apache.org/repos/asf/pdfbox-docs/blob/799b1d78/content/errors/404.html
----------------------------------------------------------------------
diff --git a/content/errors/404.html b/content/errors/404.html
index d4ff654..6f9ba92 100644
--- a/content/errors/404.html
+++ b/content/errors/404.html
@@ -130,15 +130,15 @@
                 </ul>
             </div>
             <div class="col-xs-12 col-sm-9">
-                <h1 id="404">404</h1>
+                <h1 id="section">404</h1>
 
-<p>We&#39;re sorry, but the page you requested cannot be found. </p>
+<p>We\u2019re sorry, but the page you requested cannot be found.</p>
 
-<p>Maybe you </p>
+<p>Maybe you</p>
 
 <ul>
-<li>typed the address incorrectly</li>
-<li>followed a link from another site that pointed to this page.</li>
+  <li>typed the address incorrectly</li>
+  <li>followed a link from another site that pointed to this page.</li>
 </ul>
 
 <p>If you came by following a broken link, please report the <a href="https://issues.apache.org/jira/browse/pdfbox">issue</a>.</p>

http://git-wip-us.apache.org/repos/asf/pdfbox-docs/blob/799b1d78/content/ideas.html
----------------------------------------------------------------------
diff --git a/content/ideas.html b/content/ideas.html
index 79199c3..d7496d2 100644
--- a/content/ideas.html
+++ b/content/ideas.html
@@ -149,47 +149,47 @@ implementation.</p>
 <p>In addition to the PDF parsing pdfbox does not always handle large PDF files well as some 
 of the references are implemented as int instead of long</p>
 
-<h2 id="switch-to-java-1-6"><span class="complete">Switch to Java 1.6</span></h2>
+<h2 id="span-classcompleteswitch-to-java-16span"><span class="complete">Switch to Java 1.6</span></h2>
 
 <p><span class="complete">PDFBox 2.0.0 has Java 6 as minimum requirement.</span></p>
 
-<h2 id="break-pdfbox-into-modules"><span class="complete">Break PDFBox into modules</span></h2>
+<h2 id="span-classcompletebreak-pdfbox-into-modulesspan"><span class="complete">Break PDFBox into modules</span></h2>
 
 <p><span class="complete">In order to support different use cases and provide a minimal toolset PDFBox 2.0.0 should be 
 separated into different modules. This goes inline with rearranging some of the code
 e.g. remove AWT from PDDocument.
 </span></p>
 
-<h2 id="enhance-the-font-rendering"><span class="complete">Enhance the font rendering</span></h2>
+<h2 id="span-classcompleteenhance-the-font-renderingspan"><span class="complete">Enhance the font rendering</span></h2>
 
 <p><span class="complete">PDFBox 2.0.0 will render most of the fonts without using AWT.</span></p>
 
-<h2 id="replace-enhance-pdf-parsing">Replace/enhance PDF parsing</h2>
+<h2 id="replaceenhance-pdf-parsing">Replace/enhance PDF parsing</h2>
 
-<p><span class="complete">The old &quot;classic&quot; PDF parser in PDFBox is not in line with the PDF specification as it parses
+<p><span class="complete">The old \u201cclassic\u201d PDF parser in PDFBox is not in line with the PDF specification as it parses
 a PDF from top to bottom instead of respecting the XRef information.</span> The NonSequentialParser
 enhanced that situation but there is a need to have a cleaner foundation broken into several levels</p>
 
 <ul>
-<li>io</li>
-<li>tokenization</li>
-<li>parsing according to structure</li>
-<li>COS level document</li>
-<li>PD level document</li>
-<li>add some self healing mechanism to process corrupt files</li>
+  <li>io</li>
+  <li>tokenization</li>
+  <li>parsing according to structure</li>
+  <li>COS level document</li>
+  <li>PD level document</li>
+  <li>add some self healing mechanism to process corrupt files</li>
 </ul>
 
-<p>In addition handling documents which are not conforming shouldn&#39;t be part of the core parser
+<p>In addition handling documents which are not conforming shouldn\u2019t be part of the core parser
 but of a extentable approach e.g. by adding hooks to allow for handling parsing exceptions.</p>
 
-<h2 id="add-the-ability-to-create-pdfs-using-unicode-encoded-text"><span class="complete">Add the ability to create PDFs using unicode encoded text</span></h2>
+<h2 id="span-classcompleteadd-the-ability-to-create-pdfs-using-unicode-encoded-textspan"><span class="complete">Add the ability to create PDFs using unicode encoded text</span></h2>
 
 <p><span class="complete">The recent PDFBox version is limited to WinANSI encoded text. 2.0.0 should have unicode support as well.</span></p>
 
 <h2 id="rearchitect-the-cos-level-objects">Rearchitect the COS level objects</h2>
 
 <p>The COS level objects need to be refactored to be in line with the new parser. In addition
-method signatures, constructing ... should be made similar across the COS objects</p>
+method signatures, constructing \u2026 should be made similar across the COS objects</p>
 
 <h2 id="parsing-on-demand">Parsing on demand</h2>
 
@@ -198,24 +198,24 @@ objects only available as they are needed to enhance performance and minimize me
 
 <p>This might be achieved by providing a layered approach where a base (non caching) parser provides
 the on demand parsing and a caching parser built on top caches objects for use cases where
-this is beneficial e.g. rendering, debugging ...</p>
+this is beneficial e.g. rendering, debugging \u2026</p>
 
 <ul>
-<li>the lexer would be the low level component delivering tokens to the parser.
+  <li>the lexer would be the low level component delivering tokens to the parser.
 A sample implementation exists as part of PDFBOX-1000. The benefit would be a clean low
 level handling of tokens. The current implementation needs to be (slightly ?) revised though</li>
-<li>the incremental (non caching) parser would allow for page by page processing moving forward 
+  <li>the incremental (non caching) parser would allow for page by page processing moving forward 
 only to support text extraction, merging, splitting \u2026 - the benefit would be a lower memory 
 consumption as well as a potential faster processing</li>
-<li>the caching parser would support applications such a PDFDebugger or PDFReader </li>
+  <li>the caching parser would support applications such a PDFDebugger or PDFReader</li>
 </ul>
 
 <h2 id="handling-of-pdf-versions">Handling of PDF versions</h2>
-
 <p>The current implementation is a mix of PDF 1.4 and some adhoc additions without a clear 
 distinction what is and is not supported. We could ad some support for explicitly handling
 versions in PDFBox e.g. my marking certain methods and properties to the PDF version support
-level. This could in addition be a good basis for PDF/A and other compliance checks. </p>
+level. This could in addition be a good basis for PDF/A and other compliance checks.</p>
+
 
             </div>
         </div>

http://git-wip-us.apache.org/repos/asf/pdfbox-docs/blob/799b1d78/content/index.html
----------------------------------------------------------------------
diff --git a/content/index.html b/content/index.html
index 6ec7c7b..7bae124 100644
--- a/content/index.html
+++ b/content/index.html
@@ -130,7 +130,7 @@
                 </ul>
             </div>
             <div class="col-xs-12 col-sm-9">
-                <h1 id="apache-pdfbox-a-java-pdf-library">Apache PDFBox - A Java PDF Library</h1>
+                <h1 id="apache-pdfbox---a-java-pdf-library">Apache PDFBox - A Java PDF Library</h1>
 
 <p class="lead">The Apache PDFBox\u2122 library is an open source Java tool for working with
     PDF documents. This project allows creation of new PDF documents, manipulation of existing
@@ -140,20 +140,19 @@
     Apache PDFBox is published under the Apache License v2.0.</p>
 
 <h2>Apache PDFBox 1.8.12 and 2.0.1 released (2016-04-26)</h2>
-
 <p>The Apache PDFBox community is pleased to announce the release of
 Apache PDFBox version 1.8.12 and 2.0.1. They are available for download at:</p>
 
-<p><a href="http://pdfbox.apache.org/download.cgi">http://pdfbox.apache.org/download.cgi</a></p>
+<p>http://pdfbox.apache.org/download.cgi</p>
 
 <p>See the full release notes <a href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310760&amp;version=12334652">1.8.12</a> and <a href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310760&amp;version=12335342">2.0.1</a> for details about this release.</p>
 
 <h2 id="getting-help">Getting Help</h2>
 
-<p>To get help on using PDFBox, please <a href="mailto:users-subscribe@pdfbox.apache.org">Subscribe to the Users Mailing List</a> and post your
-questions there. We&#39;re happy to help.</p>
+<p>To get help on using PDFBox, please <a href="&#109;&#097;&#105;&#108;&#116;&#111;:&#117;&#115;&#101;&#114;&#115;&#045;&#115;&#117;&#098;&#115;&#099;&#114;&#105;&#098;&#101;&#064;&#112;&#100;&#102;&#098;&#111;&#120;&#046;&#097;&#112;&#097;&#099;&#104;&#101;&#046;&#111;&#114;&#103;">Subscribe to the Users Mailing List</a> and post your
+questions there. We\u2019re happy to help.</p>
 
-<p>The project is a volunteer effort and we&#39;re always looking for interested people to help
+<p>The project is a volunteer effort and we\u2019re always looking for interested people to help
 us improve PDFBox. There are a multitude of ways that you can help us depending on your
 skills. Subscribe to the <a href="/mailinglists.html">Mailing Lists</a> and find out how you can help.</p>
 
@@ -161,38 +160,38 @@ skills. Subscribe to the <a href="/mailinglists.html">Mailing Lists</a> and find
 
 <div class="row">
     <div class="col-md-3">
-        <header><h4><svg aria-hidden="true" class="open-iconic open-iconic-box" width="8" height="8" viewBox="0 0 8 8" role="img" version="1.1" alt="box image" ><path d="M0 0v1h8v-1h-8zm0 2v5.91c0 .05.04.09.09.09h7.81c.05 0 .09-.04.09-.09v-5.91h-2.97v1.03h-2.03v-1.03h-3z" /></svg>Extract Text</h4></header>
+        <header><h4><svg aria-hidden="true" class="open-iconic open-iconic-box" width="8" height="8" viewbox="0 0 8 8" role="img" version="1.1" alt="box image"><path d="M0 0v1h8v-1h-8zm0 2v5.91c0 .05.04.09.09.09h7.81c.05 0 .09-.04.09-.09v-5.91h-2.97v1.03h-2.03v-1.03h-3z" /></svg>Extract Text</h4></header>
         <p>Extract Unicode text from PDF files.</p>
     </div>
     <div class="col-md-3">
-        <header><h4><svg aria-hidden="true" class="open-iconic open-iconic-box" width="8" height="8" viewBox="0 0 8 8" role="img" version="1.1" alt="box image" ><path d="M0 0v1h8v-1h-8zm0 2v5.91c0 .05.04.09.09.09h7.81c.05 0 .09-.04.09-.09v-5.91h-2.97v1.03h-2.03v-1.03h-3z" /></svg>Split &amp; Merge</h4></header>
+        <header><h4><svg aria-hidden="true" class="open-iconic open-iconic-box" width="8" height="8" viewbox="0 0 8 8" role="img" version="1.1" alt="box image"><path d="M0 0v1h8v-1h-8zm0 2v5.91c0 .05.04.09.09.09h7.81c.05 0 .09-.04.09-.09v-5.91h-2.97v1.03h-2.03v-1.03h-3z" /></svg>Split &amp; Merge</h4></header>
         <p>Split a single PDF into many files or merge multiple PDF files.</p>
     </div>
     <div class="col-md-3">
-        <header><h4><svg aria-hidden="true" class="open-iconic open-iconic-box" width="8" height="8" viewBox="0 0 8 8" role="img" version="1.1" alt="box image" ><path d="M0 0v1h8v-1h-8zm0 2v5.91c0 .05.04.09.09.09h7.81c.05 0 .09-.04.09-.09v-5.91h-2.97v1.03h-2.03v-1.03h-3z" /></svg>Fill Forms</h4></header>
+        <header><h4><svg aria-hidden="true" class="open-iconic open-iconic-box" width="8" height="8" viewbox="0 0 8 8" role="img" version="1.1" alt="box image"><path d="M0 0v1h8v-1h-8zm0 2v5.91c0 .05.04.09.09.09h7.81c.05 0 .09-.04.09-.09v-5.91h-2.97v1.03h-2.03v-1.03h-3z" /></svg>Fill Forms</h4></header>
         <p>Extract data from PDF forms or fill a PDF form.</p>
     </div>
     <div class="col-md-3">
-        <header><h4><svg aria-hidden="true" class="open-iconic open-iconic-box" width="8" height="8" viewBox="0 0 8 8" role="img" version="1.1" alt="box image" ><path d="M0 0v1h8v-1h-8zm0 2v5.91c0 .05.04.09.09.09h7.81c.05 0 .09-.04.09-.09v-5.91h-2.97v1.03h-2.03v-1.03h-3z" /></svg>Preflight</h4></header>
+        <header><h4><svg aria-hidden="true" class="open-iconic open-iconic-box" width="8" height="8" viewbox="0 0 8 8" role="img" version="1.1" alt="box image"><path d="M0 0v1h8v-1h-8zm0 2v5.91c0 .05.04.09.09.09h7.81c.05 0 .09-.04.09-.09v-5.91h-2.97v1.03h-2.03v-1.03h-3z" /></svg>Preflight</h4></header>
         <p>Validate PDF files against the PDF/A-1b standard.</p>
     </div>
 </div>
 
 <div class="row">
     <div class="col-md-3">
-        <header><h4><svg aria-hidden="true" class="open-iconic open-iconic-box" width="8" height="8" viewBox="0 0 8 8" role="img" version="1.1" alt="box image" ><path d="M0 0v1h8v-1h-8zm0 2v5.91c0 .05.04.09.09.09h7.81c.05 0 .09-.04.09-.09v-5.91h-2.97v1.03h-2.03v-1.03h-3z" /></svg>Print</h4></header>
+        <header><h4><svg aria-hidden="true" class="open-iconic open-iconic-box" width="8" height="8" viewbox="0 0 8 8" role="img" version="1.1" alt="box image"><path d="M0 0v1h8v-1h-8zm0 2v5.91c0 .05.04.09.09.09h7.81c.05 0 .09-.04.09-.09v-5.91h-2.97v1.03h-2.03v-1.03h-3z" /></svg>Print</h4></header>
         <p>Print a PDF file using the standard Java printing API.</p>
     </div>
     <div class="col-md-3">
-        <header><h4><svg aria-hidden="true" class="open-iconic open-iconic-box" width="8" height="8" viewBox="0 0 8 8" role="img" version="1.1" alt="box image" ><path d="M0 0v1h8v-1h-8zm0 2v5.91c0 .05.04.09.09.09h7.81c.05 0 .09-.04.09-.09v-5.91h-2.97v1.03h-2.03v-1.03h-3z" /></svg>Save as Image</h4></header>
+        <header><h4><svg aria-hidden="true" class="open-iconic open-iconic-box" width="8" height="8" viewbox="0 0 8 8" role="img" version="1.1" alt="box image"><path d="M0 0v1h8v-1h-8zm0 2v5.91c0 .05.04.09.09.09h7.81c.05 0 .09-.04.09-.09v-5.91h-2.97v1.03h-2.03v-1.03h-3z" /></svg>Save as Image</h4></header>
         <p>Save PDFs as image files, such as PNG or JPEG.</p>
     </div>
     <div class="col-md-3">
-        <header><h4><svg aria-hidden="true" class="open-iconic open-iconic-box" width="8" height="8" viewBox="0 0 8 8" role="img" version="1.1" alt="box image" ><path d="M0 0v1h8v-1h-8zm0 2v5.91c0 .05.04.09.09.09h7.81c.05 0 .09-.04.09-.09v-5.91h-2.97v1.03h-2.03v-1.03h-3z" /></svg>Create PDFs</h4></header>
+        <header><h4><svg aria-hidden="true" class="open-iconic open-iconic-box" width="8" height="8" viewbox="0 0 8 8" role="img" version="1.1" alt="box image"><path d="M0 0v1h8v-1h-8zm0 2v5.91c0 .05.04.09.09.09h7.81c.05 0 .09-.04.09-.09v-5.91h-2.97v1.03h-2.03v-1.03h-3z" /></svg>Create PDFs</h4></header>
         <p>Create a PDF from scratch, with embedded fonts and images.</p>
     </div>
     <div class="col-md-3">
-        <header><h4><svg aria-hidden="true" class="open-iconic open-iconic-box" width="8" height="8" viewBox="0 0 8 8" role="img" version="1.1" alt="box image" ><path d="M0 0v1h8v-1h-8zm0 2v5.91c0 .05.04.09.09.09h7.81c.05 0 .09-.04.09-.09v-5.91h-2.97v1.03h-2.03v-1.03h-3z" /></svg>Signing</h4></header>
+        <header><h4><svg aria-hidden="true" class="open-iconic open-iconic-box" width="8" height="8" viewbox="0 0 8 8" role="img" version="1.1" alt="box image"><path d="M0 0v1h8v-1h-8zm0 2v5.91c0 .05.04.09.09.09h7.81c.05 0 .09-.04.09-.09v-5.91h-2.97v1.03h-2.03v-1.03h-3z" /></svg>Signing</h4></header>
         <p>Digitally sign PDF files.</p>
     </div>
 </div>
@@ -200,11 +199,10 @@ skills. Subscribe to the <a href="/mailinglists.html">Mailing Lists</a> and find
 <h2 id="news">News</h2>
 
 <h3>Apache PDFBox 2.0.0 released (2016-03-18) </h3>
-
 <p>After more than 3 years of development the Apache PDFBox community is pleased to 
 announce the release of Apache PDFBox version 2.0.0. It is available for download at:</p>
 
-<p><a href="http://pdfbox.apache.org/download.cgi">http://pdfbox.apache.org/download.cgi</a></p>
+<p>http://pdfbox.apache.org/download.cgi</p>
 
 <p>The <a href="http://pdfbox.apache.org/2.0/migration.html">Migration Guide</a> shall give users coming from
 PDFBox 1.8 or earlier an overview about things to look at when switching over. More details to come.</p>
@@ -212,46 +210,42 @@ PDFBox 1.8 or earlier an overview about things to look at when switching over. M
 <p>See the <a href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310760&amp;version=12319281">full release notes</a> for details about this release.</p>
 
 <h3>Apache PDFBox 1.8.11 released (2016-01-18) </h3>
-
 <p>The Apache PDFBox community is pleased to announce the release of
-Apache PDFBox version 1.8.11. </p>
+Apache PDFBox version 1.8.11.</p>
 
-<p>The release is available for download at: <a href="http://pdfbox.apache.org/download.cgi">http://pdfbox.apache.org/download.cgi</a></p>
+<p>The release is available for download at: http://pdfbox.apache.org/download.cgi</p>
 
 <p>See the <a href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310760&amp;version=12333061">full release notes</a> for details about this release.</p>
 
 <h3>Apache PDFBox 2.0.0 RC3 released (2016-01-15) </h3>
-
 <p>The Apache PDFBox community is pleased to announce the release of
 Apache PDFBox version 2.0.0 RC3. The release is available for download at:</p>
 
-<p><a href="http://pdfbox.apache.org/download.cgi">http://pdfbox.apache.org/download.cgi</a></p>
+<p>http://pdfbox.apache.org/download.cgi</p>
 
 <p>The numerous feedback on our second release candidate helps us to make
 this release candidate better again, e. g. optimized font cache, improved text
 extraction. A lot of bug fixes are included as well.
-We&#39;d like to thank everybody who helps us to get a step foward.
+We\u2019d like to thank everybody who helps us to get a step foward.
 Please have a look at the new release candidate as well, so that the next
 release hopefully could be the final one.</p>
 
 <p>See the <a href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310760&amp;version=12319281">full release notes</a> for details about this release.</p>
 
 <h3>Apache PDFBox 2.0.0 RC2 released (2015-11-22) </h3>
-
 <p>The Apache PDFBox community is pleased to announce the release of
 Apache PDFBox version 2.0.0 RC2. The release is available for download at:</p>
 
-<p><a href="http://pdfbox.apache.org/download.cgi">http://pdfbox.apache.org/download.cgi</a></p>
+<p>http://pdfbox.apache.org/download.cgi</p>
 
 <p>The numerous feedback on our first release candidate helps us to fix a lot
-of issues. We&#39;d like to thank everybody who helps us to get a step foward.
+of issues. We\u2019d like to thank everybody who helps us to get a step foward.
 Please have a look at the new release candidate as well, so that the next
 release hopefully could be the final one.</p>
 
 <p>See the <a href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310760&amp;version=12319281">full release notes</a> for details about this release.</p>
 
 <h3>Apache PDFBox 2.0.0 RC1 released (2015-10-19) </h3>
-
 <p>With the initial discussions starting 3 years ago PDFBox 2.0.0 is in the works for
 quite some time now - <strong>and we are in the final stages!</strong> To give you the opportunity
 to provide feedback a <a href="http://pdfbox.apache.org/download.cgi">PDFBox 2.0.0-RC1 Release Candidate</a>
@@ -260,6 +254,7 @@ is now available.</p>
 <p>The <a href="http://pdfbox.apache.org/2.0/migration.html">Migration Guide</a> shall give users coming from
 PDFBox 1.8 or earlier an overview about things to look at when switching over. More details to come.</p>
 
+
             </div>
         </div>
     </div>

http://git-wip-us.apache.org/repos/asf/pdfbox-docs/blob/799b1d78/content/mailinglists.html
----------------------------------------------------------------------
diff --git a/content/mailinglists.html b/content/mailinglists.html
index 02240f6..1d71352 100644
--- a/content/mailinglists.html
+++ b/content/mailinglists.html
@@ -133,60 +133,63 @@
                 <h1 id="mailing-lists">Mailing Lists</h1>
 
 <p>Mailing Lists are the primary communication channels for all projects at 
-The Apache Software Foundation. Therefore, this applies to Apache PDFBox, too. </p>
+The Apache Software Foundation. Therefore, this applies to Apache PDFBox, too.</p>
 
 <p><strong>Please read the <a href="http://www.apache.org/foundation/public-archives.html">public forum archive policy</a> carefully before subscribing to one of our list.</strong></p>
 
 <p>If you have any questions about or problems with Apache PDFBox, you can get them addressed 
-on the <strong>Users Mailing List</strong>. </p>
+on the <strong>Users Mailing List</strong>.</p>
 
 <p>If you like to participate in the development of Apache PDFBox, 
-the <strong>Developers Mailing List</strong> is the place to be. </p>
+the <strong>Developers Mailing List</strong> is the place to be.</p>
 
-<p>If you like to keep track of what&#39;s being changed inside the project, you can subscribe 
+<p>If you like to keep track of what\u2019s being changed inside the project, you can subscribe 
 to the <strong>Commit Mailing List</strong>.</p>
 
 <p class="alert alert-info">Please use the Users Mailing List if you are unsure which list to use</p>
 
-<table><thead>
-<tr>
-<th>Name</th>
-<th>Address</th>
-<th>Subscribe</th>
-<th>Unsubscribe</th>
-<th>Help</th>
-<th>Archive</th>
-<th>MarkMail</th>
-</tr>
-</thead><tbody>
-<tr>
-<td>Users</td>
-<td><a href="mailto:users@pdfbox.apache.org">users@pdfbox.apache.org</a></td>
-<td><a href="mailto:users-subscribe@pdfbox.apache.org">Subscribe</a></td>
-<td><a href="mailto:users-unsubscribe@pdfbox.apache.org">Unsubscribe</a></td>
-<td><a href="mailto:users-help@pdfbox.apache.org">Help</a></td>
-<td><a href="http://mail-archives.apache.org/mod_mbox/pdfbox-users/">Archive</a></td>
-<td><a href="http://pdfbox-users.markmail.org/">MarkMail</a></td>
-</tr>
-<tr>
-<td>Developers</td>
-<td><a href="mailto:dev@pdfbox.apache.org">dev@pdfbox.apache.org</a></td>
-<td><a href="mailto:dev-subscribe@pdfbox.apache.org">Subscribe</a></td>
-<td><a href="mailto:dev-unsubscribe@pdfbox.apache.org">Unsubscribe</a></td>
-<td><a href="mailto:dev-help@pdfbox.apache.org">Help</a></td>
-<td><a href="http://mail-archives.apache.org/mod_mbox/pdfbox-dev/">Archive</a></td>
-<td><a href="http://pdfbox-dev.markmail.org/">MarkMail</a></td>
-</tr>
-<tr>
-<td>Commits List</td>
-<td><a href="mailto:commits@pdfbox.apache.org">commits@pdfbox.apache.org</a></td>
-<td><a href="mailto:commits-subscribe@pdfbox.apache.org">Subscribe</a></td>
-<td><a href="mailto:commits-unsubscribe@pdfbox.apache.org">Unsubscribe</a></td>
-<td><a href="mailto:commits-help@pdfbox.apache.org">Help</a></td>
-<td><a href="http://mail-archives.apache.org/mod_mbox/pdfbox-commits/">Archive</a></td>
-<td><a href="http://pdfbox-commits.markmail.org/">MarkMail</a></td>
-</tr>
-</tbody></table>
+<table>
+  <thead>
+    <tr>
+      <th>Name</th>
+      <th>Address</th>
+      <th>Subscribe</th>
+      <th>Unsubscribe</th>
+      <th>Help</th>
+      <th>Archive</th>
+      <th>MarkMail</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td>Users</td>
+      <td>users@pdfbox.apache.org</td>
+      <td><a href="&#109;&#097;&#105;&#108;&#116;&#111;:&#117;&#115;&#101;&#114;&#115;&#045;&#115;&#117;&#098;&#115;&#099;&#114;&#105;&#098;&#101;&#064;&#112;&#100;&#102;&#098;&#111;&#120;&#046;&#097;&#112;&#097;&#099;&#104;&#101;&#046;&#111;&#114;&#103;">Subscribe</a></td>
+      <td><a href="&#109;&#097;&#105;&#108;&#116;&#111;:&#117;&#115;&#101;&#114;&#115;&#045;&#117;&#110;&#115;&#117;&#098;&#115;&#099;&#114;&#105;&#098;&#101;&#064;&#112;&#100;&#102;&#098;&#111;&#120;&#046;&#097;&#112;&#097;&#099;&#104;&#101;&#046;&#111;&#114;&#103;">Unsubscribe</a></td>
+      <td><a href="&#109;&#097;&#105;&#108;&#116;&#111;:&#117;&#115;&#101;&#114;&#115;&#045;&#104;&#101;&#108;&#112;&#064;&#112;&#100;&#102;&#098;&#111;&#120;&#046;&#097;&#112;&#097;&#099;&#104;&#101;&#046;&#111;&#114;&#103;">Help</a></td>
+      <td><a href="http://mail-archives.apache.org/mod_mbox/pdfbox-users/">Archive</a></td>
+      <td><a href="http://pdfbox-users.markmail.org/">MarkMail</a></td>
+    </tr>
+    <tr>
+      <td>Developers</td>
+      <td>dev@pdfbox.apache.org</td>
+      <td><a href="&#109;&#097;&#105;&#108;&#116;&#111;:&#100;&#101;&#118;&#045;&#115;&#117;&#098;&#115;&#099;&#114;&#105;&#098;&#101;&#064;&#112;&#100;&#102;&#098;&#111;&#120;&#046;&#097;&#112;&#097;&#099;&#104;&#101;&#046;&#111;&#114;&#103;">Subscribe</a></td>
+      <td><a href="&#109;&#097;&#105;&#108;&#116;&#111;:&#100;&#101;&#118;&#045;&#117;&#110;&#115;&#117;&#098;&#115;&#099;&#114;&#105;&#098;&#101;&#064;&#112;&#100;&#102;&#098;&#111;&#120;&#046;&#097;&#112;&#097;&#099;&#104;&#101;&#046;&#111;&#114;&#103;">Unsubscribe</a></td>
+      <td><a href="&#109;&#097;&#105;&#108;&#116;&#111;:&#100;&#101;&#118;&#045;&#104;&#101;&#108;&#112;&#064;&#112;&#100;&#102;&#098;&#111;&#120;&#046;&#097;&#112;&#097;&#099;&#104;&#101;&#046;&#111;&#114;&#103;">Help</a></td>
+      <td><a href="http://mail-archives.apache.org/mod_mbox/pdfbox-dev/">Archive</a></td>
+      <td><a href="http://pdfbox-dev.markmail.org/">MarkMail</a></td>
+    </tr>
+    <tr>
+      <td>Commits List</td>
+      <td>commits@pdfbox.apache.org</td>
+      <td><a href="&#109;&#097;&#105;&#108;&#116;&#111;:&#099;&#111;&#109;&#109;&#105;&#116;&#115;&#045;&#115;&#117;&#098;&#115;&#099;&#114;&#105;&#098;&#101;&#064;&#112;&#100;&#102;&#098;&#111;&#120;&#046;&#097;&#112;&#097;&#099;&#104;&#101;&#046;&#111;&#114;&#103;">Subscribe</a></td>
+      <td><a href="&#109;&#097;&#105;&#108;&#116;&#111;:&#099;&#111;&#109;&#109;&#105;&#116;&#115;&#045;&#117;&#110;&#115;&#117;&#098;&#115;&#099;&#114;&#105;&#098;&#101;&#064;&#112;&#100;&#102;&#098;&#111;&#120;&#046;&#097;&#112;&#097;&#099;&#104;&#101;&#046;&#111;&#114;&#103;">Unsubscribe</a></td>
+      <td><a href="&#109;&#097;&#105;&#108;&#116;&#111;:&#099;&#111;&#109;&#109;&#105;&#116;&#115;&#045;&#104;&#101;&#108;&#112;&#064;&#112;&#100;&#102;&#098;&#111;&#120;&#046;&#097;&#112;&#097;&#099;&#104;&#101;&#046;&#111;&#114;&#103;">Help</a></td>
+      <td><a href="http://mail-archives.apache.org/mod_mbox/pdfbox-commits/">Archive</a></td>
+      <td><a href="http://pdfbox-commits.markmail.org/">MarkMail</a></td>
+    </tr>
+  </tbody>
+</table>
 
             </div>
         </div>

http://git-wip-us.apache.org/repos/asf/pdfbox-docs/blob/799b1d78/content/news/2015/11/22/pdfbox-2.0.0-RC2-released.html
----------------------------------------------------------------------
diff --git a/content/news/2015/11/22/pdfbox-2.0.0-RC2-released.html b/content/news/2015/11/22/pdfbox-2.0.0-RC2-released.html
index c69e0f9..b309bb7 100644
--- a/content/news/2015/11/22/pdfbox-2.0.0-RC2-released.html
+++ b/content/news/2015/11/22/pdfbox-2.0.0-RC2-released.html
@@ -133,10 +133,10 @@
                 <p>The Apache PDFBox community is pleased to announce the release of
 Apache PDFBox version 2.0.0 RC2. The release is available for download at:</p>
 
-<p><a href="http://pdfbox.apache.org/download.cgi">http://pdfbox.apache.org/download.cgi</a></p>
+<p>http://pdfbox.apache.org/download.cgi</p>
 
 <p>The numerous feedback on our first release candidate helps us to fix a lot
-of issues. We&#39;d like to thank everybody who helps us to get a step foward.
+of issues. We\u2019d like to thank everybody who helps us to get a step foward.
 Please have a look at the new release candidate as well, so that the next
 release hopefully could be the final one.</p>
 

http://git-wip-us.apache.org/repos/asf/pdfbox-docs/blob/799b1d78/content/news/2016/01/15/pdfbox-2.0.0-RC3-released.html
----------------------------------------------------------------------
diff --git a/content/news/2016/01/15/pdfbox-2.0.0-RC3-released.html b/content/news/2016/01/15/pdfbox-2.0.0-RC3-released.html
index a431345..da0d9b2 100644
--- a/content/news/2016/01/15/pdfbox-2.0.0-RC3-released.html
+++ b/content/news/2016/01/15/pdfbox-2.0.0-RC3-released.html
@@ -133,12 +133,12 @@
                 <p>The Apache PDFBox community is pleased to announce the release of
 Apache PDFBox version 2.0.0 RC3. The release is available for download at:</p>
 
-<p><a href="http://pdfbox.apache.org/download.cgi">http://pdfbox.apache.org/download.cgi</a></p>
+<p>http://pdfbox.apache.org/download.cgi</p>
 
 <p>The numerous feedback on our second release candidate helps us to make
 this release candidate better again, e. g. optimized font cache, improved text
 extraction. A lot of bug fixes are included as well.
-We&#39;d like to thank everybody who helps us to get a step foward.
+We\u2019d like to thank everybody who helps us to get a step foward.
 Please have a look at the new release candidate as well, so that the next
 release hopefully could be the final one.</p>
 

http://git-wip-us.apache.org/repos/asf/pdfbox-docs/blob/799b1d78/content/news/2016/01/18/pdfbox-1.8.11-released.html
----------------------------------------------------------------------
diff --git a/content/news/2016/01/18/pdfbox-1.8.11-released.html b/content/news/2016/01/18/pdfbox-1.8.11-released.html
index def68ab..ce9480b 100644
--- a/content/news/2016/01/18/pdfbox-1.8.11-released.html
+++ b/content/news/2016/01/18/pdfbox-1.8.11-released.html
@@ -131,9 +131,9 @@
             </div>
             <div class="col-xs-12 col-sm-9">
                 <p>The Apache PDFBox community is pleased to announce the release of
-Apache PDFBox version 1.8.11. </p>
+Apache PDFBox version 1.8.11.</p>
 
-<p>The release is available for download at: <a href="http://pdfbox.apache.org/download.cgi">http://pdfbox.apache.org/download.cgi</a></p>
+<p>The release is available for download at: http://pdfbox.apache.org/download.cgi</p>
 
 <p>See the <a href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310760&amp;version=12333061">full release notes</a> for details about this release.</p>
 

http://git-wip-us.apache.org/repos/asf/pdfbox-docs/blob/799b1d78/content/news/2016/03/18/pdfbox-2.0.0-released.html
----------------------------------------------------------------------
diff --git a/content/news/2016/03/18/pdfbox-2.0.0-released.html b/content/news/2016/03/18/pdfbox-2.0.0-released.html
index d37b360..e6f943d 100644
--- a/content/news/2016/03/18/pdfbox-2.0.0-released.html
+++ b/content/news/2016/03/18/pdfbox-2.0.0-released.html
@@ -133,7 +133,7 @@
                 <p>After more than 3 years of development the Apache PDFBox community is pleased to 
 announce the release of Apache PDFBox version 2.0.0. It is available for download at:</p>
 
-<p><a href="http://pdfbox.apache.org/download.cgi">http://pdfbox.apache.org/download.cgi</a></p>
+<p>http://pdfbox.apache.org/download.cgi</p>
 
 <p>The <a href="http://pdfbox.apache.org/2.0/migration.html">Migration Guide</a> shall give users coming from
 PDFBox 1.8 or earlier an overview about things to look at when switching over. More details to come.</p>

http://git-wip-us.apache.org/repos/asf/pdfbox-docs/blob/799b1d78/content/news/2016/04/26/new-pdfbox-releases.html
----------------------------------------------------------------------
diff --git a/content/news/2016/04/26/new-pdfbox-releases.html b/content/news/2016/04/26/new-pdfbox-releases.html
index ee23620..5e2a4c9 100644
--- a/content/news/2016/04/26/new-pdfbox-releases.html
+++ b/content/news/2016/04/26/new-pdfbox-releases.html
@@ -133,7 +133,7 @@
                 <p>The Apache PDFBox community is pleased to announce the release of
 Apache PDFBox version 1.8.12 and 2.0.1. They are available for download at:</p>
 
-<p><a href="http://pdfbox.apache.org/download.cgi">http://pdfbox.apache.org/download.cgi</a></p>
+<p>http://pdfbox.apache.org/download.cgi</p>
 
 <p>See the full release notes <a href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310760&amp;version=12334652">1.8.12</a> and <a href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310760&amp;version=12335342">2.0.1</a> for details about this release.</p>