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:24 UTC

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

Repository: pdfbox-docs
Updated Branches:
  refs/heads/asf-site fa128c8e7 -> 799b1d78d


http://git-wip-us.apache.org/repos/asf/pdfbox-docs/blob/799b1d78/content/references.html
----------------------------------------------------------------------
diff --git a/content/references.html b/content/references.html
index ae37808..aebd9c0 100644
--- a/content/references.html
+++ b/content/references.html
@@ -137,135 +137,141 @@ Please file an <a href="https://issues.apache.org/jira/browse/PDFBOX">improvemen
 
 <h2 id="projects-using-pdfbox">Projects using PDFBox</h2>
 
-<table><thead>
-<tr>
-<th>Project Name</th>
-<th>License</th>
-<th>Project Description</th>
-</tr>
-</thead><tbody>
-<tr>
-<td><a href="http://www.alfresco.org/">Alfresco</a></td>
-<td>LGPL - commercial services/support/training is available</td>
-<td>Alfresco is an open source, open-standards content repository built by the most experienced content management team that includes the co-founder of Documentum.</td>
-</tr>
-<tr>
-<td><a href="http://nutch.apache.org/">Apache Nutch</a></td>
-<td>Apache License v2</td>
-<td>Apache Nutch is open source web-search software. It builds on Apache Lucene, adding web-specifics, such as a crawler, a link-graph database, parsers for HTML and other document formats, etc.</td>
-</tr>
-<tr>
-<td><a href="http://tika.apache.org/">Apache Tika</a></td>
-<td>Apache License v2</td>
-<td>Apache Tika is a toolkit for detecting and extracting metadata and structured text content from various documents using existing parser libraries.</td>
-</tr>
-<tr>
-<td><a href="http://webtest.canoo.com/webtest/manual/WebTestHome.html">Canoo Webtest</a></td>
-<td>BSD Like</td>
-<td>Free OpenSource tool for XP-style acceptance testing of Java-based Web applications.</td>
-</tr>
-<tr>
-<td><a href="http://www.rewoo.de/">ECM REWOO Scope</a></td>
-<td>Commercial</td>
-<td>REWOO Scope is an Enterprise Content Management (ECM) software to organize, structure and consolidate enterprise data. Apache PDFBox is an integral part to read and index PDF documents.</td>
-</tr>
-<tr>
-<td><a href="http://jomic.sourceforge.net/">Jomic</a></td>
-<td>GPL</td>
-<td>Jomic is a viewer for comic book archives.</td>
-</tr>
-<tr>
-<td><a href="http://jpdfunit.sourceforge.net/">JpdfUnit</a></td>
-<td>Apache License v2</td>
-<td>pdfUnit is a framework for testing a generated pdf document with the JUnit Test Framework.</td>
-</tr>
-<tr>
-<td><a href="http://www.liferay.com/">Liferay Portal</a></td>
-<td>MIT</td>
-<td>Liferay Portal is an open source portal that helps organizations collaborate more efficiently by providing a consolidated view of disparate applications.</td>
-</tr>
-<tr>
-<td><a href="http://gmod.org/wiki/LuceGene">LuceGene</a></td>
-<td>Artistic License</td>
-<td>LuceGene is an open-source document/object search and retrieval system specially tuned for bioinformatics text databases and documents.</td>
-</tr>
-<tr>
-<td><a href="http://www.lutece.paris.fr/">Lutece</a></td>
-<td>BSD-like</td>
-<td>Lutece is a portal engine which allows you to easily create your websites or intranets based upon HTML,XML content.</td>
-</tr>
-<tr>
-<td><a href="http://mmapps.sourceforge.net/lucenemodule/">MMBase Lucene Module</a></td>
-<td>MPL</td>
-<td>Lucenemodule is a plugin (module) for the MMBase content management system that enables Lucene full text search through it&#39;s content, and thanks to PDFBox also PDF content.</td>
-</tr>
-<tr>
-<td><a href="http://www.opencms.org/">OpenCms</a></td>
-<td>LGPL</td>
-<td>OpenCms is a professional level Open Source Website Content Management System.</td>
-</tr>
-<tr>
-<td><a href="http://www.open-search-server.com/">OpenSearchServer</a></td>
-<td>GPLv3</td>
-<td>An open source search engine and crawler based on best open source technologies. It is a modern search engine and a suite of high-powered full text search algorithms.</td>
-</tr>
-<tr>
-<td><a href="http://forge.objectweb.org/projects/ops">Orbeon PresentationServer</a></td>
-<td>LGPL</td>
-<td>Orbeon PresentationServer (OPS) is an open source J2EE-based platform for XML-centric web applications. OPS is built around XHTML, XForms, XSLT, XML pipelines, and Web Services, which makes it ideal for applications that capture, process and present XML data. Commercial consulting/training/support is available through orbeon.</td>
-</tr>
-<tr>
-<td><a href="http://www.searchblox.com/">SearchBlox</a></td>
-<td>Commercial</td>
-<td>SearchBlox is a high-performance corporate search software designed for the Java 2 Enterprise Edition (J2EE) platform.</td>
-</tr>
-<tr>
-<td><a href="https://www.semanticscholar.org">Semantic Scholar</a></td>
-<td>Web Based</td>
-<td>Semantic Scholar is a new service from AI2 for scientific literature search and discovery, focusing on semantics and textual understanding.</td>
-</tr>
-<tr>
-<td><a href="http://www.simplexrepaginator.com/">SimplexRepaginator</a></td>
-<td>Apache License v2</td>
-<td>Simplex Repaginator converts simplex-scanned PDFs into properly duplex-paginated PDFs and vice versa.</td>
-</tr>
-<tr>
-<td><a href="http://ir.dcs.gla.ac.uk/terrier/">Terrier</a></td>
-<td>MPL</td>
-<td>Terrier is software for the rapid development of Web, intranet and desktop search engines.</td>
-</tr>
-<tr>
-<td><a href="http://www.triboni.com/triboni/exec/x/int.triboni.website.display/xsl/display/name/Default/chapter/ginkgo/language/en">Triboni GinkGO</a></td>
-<td>Commercial</td>
-<td>Triboni GinkGO is a highly scalable J2EE services platform that is based on a simple XML business object defintion and scripting language. Toghether with XSLT content centric web applications can be configured in a very short time.</td>
-</tr>
-</tbody></table>
+<table>
+  <thead>
+    <tr>
+      <th>Project Name</th>
+      <th>License</th>
+      <th>Project Description</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td><a href="http://www.alfresco.org/">Alfresco</a></td>
+      <td>LGPL - commercial services/support/training is available</td>
+      <td>Alfresco is an open source, open-standards content repository built by the most experienced content management team that includes the co-founder of Documentum.</td>
+    </tr>
+    <tr>
+      <td><a href="http://nutch.apache.org/">Apache Nutch</a></td>
+      <td>Apache License v2</td>
+      <td>Apache Nutch is open source web-search software. It builds on Apache Lucene, adding web-specifics, such as a crawler, a link-graph database, parsers for HTML and other document formats, etc.</td>
+    </tr>
+    <tr>
+      <td><a href="http://tika.apache.org/">Apache Tika</a></td>
+      <td>Apache License v2</td>
+      <td>Apache Tika is a toolkit for detecting and extracting metadata and structured text content from various documents using existing parser libraries.</td>
+    </tr>
+    <tr>
+      <td><a href="http://webtest.canoo.com/webtest/manual/WebTestHome.html">Canoo Webtest</a></td>
+      <td>BSD Like</td>
+      <td>Free OpenSource tool for XP-style acceptance testing of Java-based Web applications.</td>
+    </tr>
+    <tr>
+      <td><a href="http://www.rewoo.de/">ECM REWOO Scope</a></td>
+      <td>Commercial</td>
+      <td>REWOO Scope is an Enterprise Content Management (ECM) software to organize, structure and consolidate enterprise data. Apache PDFBox is an integral part to read and index PDF documents.</td>
+    </tr>
+    <tr>
+      <td><a href="http://jomic.sourceforge.net/">Jomic</a></td>
+      <td>GPL</td>
+      <td>Jomic is a viewer for comic book archives.</td>
+    </tr>
+    <tr>
+      <td><a href="http://jpdfunit.sourceforge.net/">JpdfUnit</a></td>
+      <td>Apache License v2</td>
+      <td>pdfUnit is a framework for testing a generated pdf document with the JUnit Test Framework.</td>
+    </tr>
+    <tr>
+      <td><a href="http://www.liferay.com/">Liferay Portal</a></td>
+      <td>MIT</td>
+      <td>Liferay Portal is an open source portal that helps organizations collaborate more efficiently by providing a consolidated view of disparate applications.</td>
+    </tr>
+    <tr>
+      <td><a href="http://gmod.org/wiki/LuceGene">LuceGene</a></td>
+      <td>Artistic License</td>
+      <td>LuceGene is an open-source document/object search and retrieval system specially tuned for bioinformatics text databases and documents.</td>
+    </tr>
+    <tr>
+      <td><a href="http://www.lutece.paris.fr/">Lutece</a></td>
+      <td>BSD-like</td>
+      <td>Lutece is a portal engine which allows you to easily create your websites or intranets based upon HTML,XML content.</td>
+    </tr>
+    <tr>
+      <td><a href="http://mmapps.sourceforge.net/lucenemodule/">MMBase Lucene Module</a></td>
+      <td>MPL</td>
+      <td>Lucenemodule is a plugin (module) for the MMBase content management system that enables Lucene full text search through it\u2019s content, and thanks to PDFBox also PDF content.</td>
+    </tr>
+    <tr>
+      <td><a href="http://www.opencms.org/">OpenCms</a></td>
+      <td>LGPL</td>
+      <td>OpenCms is a professional level Open Source Website Content Management System.</td>
+    </tr>
+    <tr>
+      <td><a href="http://www.open-search-server.com/">OpenSearchServer</a></td>
+      <td>GPLv3</td>
+      <td>An open source search engine and crawler based on best open source technologies. It is a modern search engine and a suite of high-powered full text search algorithms.</td>
+    </tr>
+    <tr>
+      <td><a href="http://forge.objectweb.org/projects/ops">Orbeon PresentationServer</a></td>
+      <td>LGPL</td>
+      <td>Orbeon PresentationServer (OPS) is an open source J2EE-based platform for XML-centric web applications. OPS is built around XHTML, XForms, XSLT, XML pipelines, and Web Services, which makes it ideal for applications that capture, process and present XML data. Commercial consulting/training/support is available through orbeon.</td>
+    </tr>
+    <tr>
+      <td><a href="http://www.searchblox.com/">SearchBlox</a></td>
+      <td>Commercial</td>
+      <td>SearchBlox is a high-performance corporate search software designed for the Java 2 Enterprise Edition (J2EE) platform.</td>
+    </tr>
+    <tr>
+      <td><a href="https://www.semanticscholar.org">Semantic Scholar</a></td>
+      <td>Web Based</td>
+      <td>Semantic Scholar is a new service from AI2 for scientific literature search and discovery, focusing on semantics and textual understanding.</td>
+    </tr>
+    <tr>
+      <td><a href="http://www.simplexrepaginator.com/">SimplexRepaginator</a></td>
+      <td>Apache License v2</td>
+      <td>Simplex Repaginator converts simplex-scanned PDFs into properly duplex-paginated PDFs and vice versa.</td>
+    </tr>
+    <tr>
+      <td><a href="http://ir.dcs.gla.ac.uk/terrier/">Terrier</a></td>
+      <td>MPL</td>
+      <td>Terrier is software for the rapid development of Web, intranet and desktop search engines.</td>
+    </tr>
+    <tr>
+      <td><a href="http://www.triboni.com/triboni/exec/x/int.triboni.website.display/xsl/display/name/Default/chapter/ginkgo/language/en">Triboni GinkGO</a></td>
+      <td>Commercial</td>
+      <td>Triboni GinkGO is a highly scalable J2EE services platform that is based on a simple XML business object defintion and scripting language. Toghether with XSLT content centric web applications can be configured in a very short time.</td>
+    </tr>
+  </tbody>
+</table>
 
-<h2 id="articles-books">Articles/Books</h2>
+<h2 id="articlesbooks">Articles/Books</h2>
 
-<table><thead>
-<tr>
-<th>Article Name</th>
-<th>Article Abstract</th>
-</tr>
-</thead><tbody>
-<tr>
-<td>Build an eDoc Reader for your iPod <br/> <a href="http://www.oreillynet.com/pub/a/mac/2004/12/14/ipod_reader.html">Part 1 - User Interface</a> <br/> <a href="http://www.oreillynet.com/pub/a/mac/2004/12/17/ipod_reader.html">Part 2 - Document Reading Engine</a> <br/> <a href="http://www.oreillynet.com/pub/a/mac/2005/01/07/ipod_reader.html">Part 3 - <em>Integration with PDFBox</em></a></td>
-<td>A three part article that discusses the implementation of the PodReader application. PodReader is Cocoa application written in Objective-C and article discusses how to use the Cocoa-Java bridge to integrate with the Java version of PDFBox.</td>
-</tr>
-<tr>
-<td><a href="http://www.manning.com/hatcher2/">Lucene In Action</a></td>
-<td>A book that discusses integrating with the lucene search engine. One chapter discusses how to index various file formats and highlights PDFBox for indexing PDF documents.</td>
-</tr>
-<tr>
-<td><a href="http://java.sys-con.com/node/48543">Java Developers Journal - March 2005</a></td>
-<td>An article written by the lead developer of PDFBox discussing text extraction and AcroForm integration using PDFBox functionality.</td>
-</tr>
-<tr>
-<td><a href="http://www.dcs.bbk.ac.uk/research/techreps/2005/bbkcs-05-02.pdf">Refactoring trends across N versions of N Java open source systems: an empirical study</a></td>
-<td>This article describes an empirical study of multiple versions of a range of open source Java systems in an attempt to understand whether refactoring occur and, if so, which types of refactoring were most (and least) common. PDFBox is used as a case study.</td>
-</tr>
-</tbody></table>
+<table>
+  <thead>
+    <tr>
+      <th>Article Name</th>
+      <th>Article Abstract</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td>Build an eDoc Reader for your iPod <br /> <a href="http://www.oreillynet.com/pub/a/mac/2004/12/14/ipod_reader.html">Part 1 - User Interface</a> <br /> <a href="http://www.oreillynet.com/pub/a/mac/2004/12/17/ipod_reader.html">Part 2 - Document Reading Engine</a> <br /> <a href="http://www.oreillynet.com/pub/a/mac/2005/01/07/ipod_reader.html">Part 3 - <em>Integration with PDFBox</em></a></td>
+      <td>A three part article that discusses the implementation of the PodReader application. PodReader is Cocoa application written in Objective-C and article discusses how to use the Cocoa-Java bridge to integrate with the Java version of PDFBox.</td>
+    </tr>
+    <tr>
+      <td><a href="http://www.manning.com/hatcher2/">Lucene In Action</a></td>
+      <td>A book that discusses integrating with the lucene search engine. One chapter discusses how to index various file formats and highlights PDFBox for indexing PDF documents.</td>
+    </tr>
+    <tr>
+      <td><a href="http://java.sys-con.com/node/48543">Java Developers Journal - March 2005</a></td>
+      <td>An article written by the lead developer of PDFBox discussing text extraction and AcroForm integration using PDFBox functionality.</td>
+    </tr>
+    <tr>
+      <td><a href="http://www.dcs.bbk.ac.uk/research/techreps/2005/bbkcs-05-02.pdf">Refactoring trends across N versions of N Java open source systems: an empirical study</a></td>
+      <td>This article describes an empirical study of multiple versions of a range of open source Java systems in an attempt to understand whether refactoring occur and, if so, which types of refactoring were most (and least) common. PDFBox is used as a case study.</td>
+    </tr>
+  </tbody>
+</table>
 
             </div>
         </div>

http://git-wip-us.apache.org/repos/asf/pdfbox-docs/blob/799b1d78/content/siteupdate.html
----------------------------------------------------------------------
diff --git a/content/siteupdate.html b/content/siteupdate.html
index d8f04a6..3e9b879 100644
--- a/content/siteupdate.html
+++ b/content/siteupdate.html
@@ -135,72 +135,89 @@
 <p>The content for the PDFBox website is kept in a <a href="https://git-wip-us.apache.org/repos/asf/pdfbox-docs">git repository</a> which is also mirrored to <a href="https://github.com/apache/pdfbox-docs">GitHub</a>. The site is split into two parts: the static content and the Javadoc for the PDFBox API. Both parts are build independently as further described below.</p>
 
 <h2 id="project-info">Project info</h2>
-
 <p>The site is based on <a href="http://jekyllrb.com">Jekyll</a>. So you have to be familiar with the <a href="http://daringfireball.net/projects/markdown/syntax">Markdown</a> template language and have Jekyll (ver. 2+) installed to contribute to the project.</p>
 
 <h2 id="contribute">Contribute</h2>
-
-<p>If you would like to enhance the website content you can submit a patch. To do so please open a ticket at our <a href="https://issues.apache.org/jira/browse/PDFBOX">Issue Tracker</a>, use <code>Documentation</code> for the <code>Component</code> and add your patch to the ticket.</p>
+<p>If you would like to enhance the website content you can submit a patch. To do so please open a ticket at our <a href="https://issues.apache.org/jira/browse/PDFBOX">Issue Tracker</a>, use <code class="highlighter-rouge">Documentation</code> for the <code class="highlighter-rouge">Component</code> and add your patch to the ticket.</p>
 
 <h2 id="development">Development</h2>
 
 <h3 id="install-jekyll">Install Jekyll</h3>
-
 <p>Follow the instructions available on the <a href="http://jekyllrb.com">Jekyll</a> website.</p>
 
 <h3 id="check-out-from-the-git-repository">Check out from the git repository</h3>
-
 <p>Before you can edit the site, you need to check it out from the git repository:</p>
-<div class="highlight"><pre><code class="language-" data-lang="">git clone https://git-wip-us.apache.org/repos/asf/pdfbox-docs
-</code></pre></div>
-<h3 id="local-changes">Local changes</h3>
 
+<div class="highlighter-rouge"><pre class="highlight"><code>git clone https://git-wip-us.apache.org/repos/asf/pdfbox-docs
+</code></pre>
+</div>
+
+<h3 id="local-changes">Local changes</h3>
 <p>You can now do the changes and additions to the sources of the PDFBox website. To test these locally use</p>
-<div class="highlight"><pre><code class="language-" data-lang="">jekyll serve
-</code></pre></div>
-<p>which will compile the changes and run a local webserver at </p>
-<div class="highlight"><pre><code class="language-" data-lang="">http://localhost:4000
-</code></pre></div>
-<h3 id="publish-the-website-for-comitters-only">Publish the website (for comitters only)</h3>
 
+<div class="highlighter-rouge"><pre class="highlight"><code>jekyll serve
+</code></pre>
+</div>
+
+<p>which will compile the changes and run a local webserver at</p>
+
+<div class="highlighter-rouge"><pre class="highlight"><code>http://localhost:4000
+</code></pre>
+</div>
+
+<h3 id="publish-the-website-for-comitters-only">Publish the website (for comitters only)</h3>
 <p>After you have done the local changes follow these steps to publish the content:</p>
 
 <p>Add the following server configuration in your ~/.m2/settings.xml file</p>
-<div class="highlight"><pre><code class="language-" data-lang="">&lt;server&gt;
+
+<div class="highlighter-rouge"><pre class="highlight"><code>&lt;server&gt;
   &lt;id&gt;pdfbox-site&lt;/id&gt;
   &lt;username&gt;** USERNAME **&lt;/username&gt;
   &lt;password&gt;** PASSWORD **&lt;/password&gt;
 &lt;/server&gt;
-</code></pre></div>
-<p><code>pdfbox-site</code> is referenced from the PDFBox pom.xml file.</p>
+</code></pre>
+</div>
+
+<p><code class="highlighter-rouge">pdfbox-site</code> is referenced from the PDFBox pom.xml file.</p>
 
 <p class="alert alert-warning">The password should be encrypted following <a href="https://maven.apache.org/guides/mini/guide-encryption.html">Maven Password Encryption</a></p>
 
 <p>Ensure that the new website content is build locally</p>
-<div class="highlight"><pre><code class="language-" data-lang="">jekyll build
-</code></pre></div>
-<p>This will read the sources and generate the new content in the <code>./staging</code> directory.</p>
 
-<p>When you are happy with the new content update the source repository</p>
-<div class="highlight"><pre><code class="language-" data-lang="">git commit -m "..."
+<div class="highlighter-rouge"><pre class="highlight"><code>jekyll build
+~~~
+
+This will read the sources and generate the new content in the ``./staging`` directory.
+
+When you are happy with the new content update the source repository
+
+</code></pre>
+</div>
+<p>git commit -m \u201c\u2026\u201d
 git push origin master
-</code></pre></div>
+~~~</p>
+
 <p>Upload the new content to the production site</p>
-<div class="highlight"><pre><code class="language-" data-lang="">mvn scm-publish:publish-scm
-</code></pre></div>
-<p>This will checkout the current content into the <code>./target</code>directory, apply the changes from <code>./staging</code> and publish
-the changes to the PDFBox production website.</p>
 
-<h3 id="update-the-javadocs-for-pdfbox-2-x">Update the JavaDocs for PDFBOX 2.x</h3>
+<div class="highlighter-rouge"><pre class="highlight"><code>mvn scm-publish:publish-scm
+</code></pre>
+</div>
+
+<p>This will checkout the current content into the <code class="highlighter-rouge">./target</code>directory, apply the changes from <code class="highlighter-rouge">./staging</code> and publish
+the changes to the PDFBox production website.</p>
 
+<h3 id="update-the-javadocs-for-pdfbox-2x">Update the JavaDocs for PDFBOX 2.x</h3>
 <p>To publish the javadocs follow these steps:</p>
 
 <p>Run</p>
-<div class="highlight"><pre><code class="language-" data-lang="">$ mvn clean javadoc:aggregate scm-publish:publish-scm
-</code></pre></div>
-<p>from the <code>&lt;SVN_ROOT&gt;/../pdfbox</code> directory.</p>
 
-<p>It uses the same <code>pdfbox-site</code> settings from above to connect to the repository.</p>
+<div class="highlighter-rouge"><pre class="highlight"><code>$ mvn clean javadoc:aggregate scm-publish:publish-scm
+</code></pre>
+</div>
+
+<p>from the <code class="highlighter-rouge">&lt;SVN_ROOT&gt;/../pdfbox</code> directory.</p>
+
+<p>It uses the same <code class="highlighter-rouge">pdfbox-site</code> settings from above to connect to the repository.</p>
 
 <p class="alert alert-info">As <code>mvn clean</code> will delete the javadoc files download from the Apache CMS it's advised to configure <code>${svn.scmJavadocCheckoutDirectory}</code> to a local directory not below <code>./target</code>.</p>
 

http://git-wip-us.apache.org/repos/asf/pdfbox-docs/blob/799b1d78/content/support.html
----------------------------------------------------------------------
diff --git a/content/support.html b/content/support.html
index 27cce57..bbfc4c5 100644
--- a/content/support.html
+++ b/content/support.html
@@ -147,40 +147,40 @@ you are really certain it's a problem in the PDFBox software. Try using the Mail
 before.</p>
 
 <p>If you are sure you have found a bug the please report the problem in our 
-<a href="https://issues.apache.org/jira/browse/PDFBOX">Issue Tracker</a>. </p>
+<a href="https://issues.apache.org/jira/browse/PDFBOX">Issue Tracker</a>.</p>
 
 <p><strong>Before you submit a bug there are several things you can try first</strong></p>
 
 <ul>
-<li>for <strong>PDFBOX 1.8.x</strong> try using the non-sequential parser (<code>PDDocument.loadNonSeq</code> instead of <code>PDDocument.load</code>, and &quot;-nonSeq&quot; with the command line applications)</li>
-<li>for issues with text extraction try if Adobe Reader can extract the text</li>
-<li>try the latest SNAPSHOT to see if it&#39;s fixed in the pre-release</li>
-<li>search the mailing list to see if has been discussed before</li>
-<li>check the issue tracker to see if the issue has already been reported</li>
+  <li>for <strong>PDFBOX 1.8.x</strong> try using the non-sequential parser (<code class="highlighter-rouge">PDDocument.loadNonSeq</code> instead of <code class="highlighter-rouge">PDDocument.load</code>, and \u201c-nonSeq\u201d with the command line applications)</li>
+  <li>for issues with text extraction try if Adobe Reader can extract the text</li>
+  <li>try the latest SNAPSHOT to see if it\u2019s fixed in the pre-release</li>
+  <li>search the mailing list to see if has been discussed before</li>
+  <li>check the issue tracker to see if the issue has already been reported</li>
 </ul>
 
 <p><strong>To help us resolving a bug quicker</strong></p>
 
 <ul>
-<li>attach the PDF that makes trouble by using &quot;More&quot;, &quot;Attach files&quot; in the issue tracker</li>
-<li>if your file is too large, upload it to a sharehoster, or use the PDFSplit application to isolate the troublesome page</li>
-<li>mention the PDFBox version you are using.</li>
-<li>attach the shortest possible code that reproduces the problem. Insert java code between {code}...{code}. Or try to reproduce the problem with the command line applications.</li>
-<li>mention what you were doing, what was the expected behaviour, and what happened instead</li>
-<li>provide a stack trace of an exception if there is one</li>
-<li>try using the non-sequential parser (loadNonSeq() instead of load(), and &quot;-nonSeq&quot; with the command line applications)</li>
-<li>search JIRA if your problem has been mentioned before.</li>
-<li>Be patient: all the people here are unpaid volunteers who work for you in their free time</li>
+  <li>attach the PDF that makes trouble by using \u201cMore\u201d, \u201cAttach files\u201d in the issue tracker</li>
+  <li>if your file is too large, upload it to a sharehoster, or use the PDFSplit application to isolate the troublesome page</li>
+  <li>mention the PDFBox version you are using.</li>
+  <li>attach the shortest possible code that reproduces the problem. Insert java code between {code}\u2026{code}. Or try to reproduce the problem with the command line applications.</li>
+  <li>mention what you were doing, what was the expected behaviour, and what happened instead</li>
+  <li>provide a stack trace of an exception if there is one</li>
+  <li>try using the non-sequential parser (loadNonSeq() instead of load(), and \u201c-nonSeq\u201d with the command line applications)</li>
+  <li>search JIRA if your problem has been mentioned before.</li>
+  <li>Be patient: all the people here are unpaid volunteers who work for you in their free time</li>
 </ul>
 
-<p><strong>And please DON&#39;T</strong></p>
+<p><strong>And please DON\u2019T</strong></p>
 
 <ul>
-<li>upload files to a hoster that requires registration to read the file.</li>
-<li>create an issue in JIRA and then go on vacation so you won&#39;t repond to our questions / suggestions.</li>
-<li>ask &quot;how to&quot; questions in JIRA. Ask such questions on the mailing lists, on stackoverflow.com, and look at the sample and the test code in the sources.</li>
-<li>attach PDF files with confidential and/or personal data (name, DoB, bank data, health data, SSN) without getting permission from the client and/or the people mentioned on the PDF</li>
-<li>create issues about obsolete PDFBox versions</li>
+  <li>upload files to a hoster that requires registration to read the file.</li>
+  <li>create an issue in JIRA and then go on vacation so you won\u2019t repond to our questions / suggestions.</li>
+  <li>ask \u201chow to\u201d questions in JIRA. Ask such questions on the mailing lists, on stackoverflow.com, and look at the sample and the test code in the sources.</li>
+  <li>attach PDF files with confidential and/or personal data (name, DoB, bank data, health data, SSN) without getting permission from the client and/or the people mentioned on the PDF</li>
+  <li>create issues about obsolete PDFBox versions</li>
 </ul>
 
 <p class="alert alert-info">We can sometimes solve problems without having the PDF, but it is difficult.</p>

http://git-wip-us.apache.org/repos/asf/pdfbox-docs/blob/799b1d78/content/team.html
----------------------------------------------------------------------
diff --git a/content/team.html b/content/team.html
index 504a675..70e6ce1 100644
--- a/content/team.html
+++ b/content/team.html
@@ -143,117 +143,123 @@ Get involved today. All contributions to the project are greatly appreciated.</p
 
 <p>The following is a list of developers with commit privileges that have directly contributed to the project in one way or another.</p>
 
-<table><thead>
-<tr>
-<th>Id</th>
-<th>Name</th>
-<th>Roles</th>
-</tr>
-</thead><tbody>
-<tr>
-<td>adam</td>
-<td>Adam Nichols</td>
-<td>PMC Member</td>
-</tr>
-<tr>
-<td>lehmi</td>
-<td>Andreas Lehmk�hler</td>
-<td>PMC Chair</td>
-</tr>
-<tr>
-<td>blitchfield</td>
-<td>Ben Litchfield</td>
-<td>PMC Member</td>
-</tr>
-<tr>
-<td>carrier</td>
-<td>Brian Carrier</td>
-<td>PMC Member</td>
-</tr>
-<tr>
-<td>danielwilson</td>
-<td>Daniel Wilson</td>
-<td>PMC Member</td>
-</tr>
-<tr>
-<td>gbailleul</td>
-<td>Guillaume Bailleul</td>
-<td>PMC Member</td>
-</tr>
-<tr>
-<td>jeremias</td>
-<td>Jeremias Maerki</td>
-<td>PMC Member</td>
-</tr>
-<tr>
-<td>koch</td>
-<td>Johannes Koch</td>
-<td>PMC Member</td>
-</tr>
-<tr>
-<td>jahewson</td>
-<td>John Hewson</td>
-<td>PMC Member</td>
-</tr>
-<tr>
-<td>kjackson</td>
-<td>Kevin Jackson</td>
-<td>PMC Member</td>
-</tr>
-<tr>
-<td>msahyoun</td>
-<td>Maruan Sahyoun</td>
-<td>PMC Member</td>
-</tr>
-<tr>
-<td>pkoch</td>
-<td>Phillipp Koch</td>
-<td>PMC Member</td>
-</tr>
-<tr>
-<td>tchojecki</td>
-<td>Thomas Chojecki</td>
-<td>PMC Member</td>
-</tr>
-<tr>
-<td>tboehme</td>
-<td>Timo Boehme</td>
-<td>PMC Member</td>
-</tr>
-<tr>
-<td>tilman</td>
-<td>Tilman Hausherr</td>
-<td>PMC Member</td>
-</tr>
-<tr>
-<td>vfed</td>
-<td>Villu Ruusmann</td>
-<td>PMC Member</td>
-</tr>
-</tbody></table>
+<table>
+  <thead>
+    <tr>
+      <th>Id</th>
+      <th>Name</th>
+      <th>Roles</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td>adam</td>
+      <td>Adam Nichols</td>
+      <td>PMC Member</td>
+    </tr>
+    <tr>
+      <td>lehmi</td>
+      <td>Andreas Lehmk�hler</td>
+      <td>PMC Chair</td>
+    </tr>
+    <tr>
+      <td>blitchfield</td>
+      <td>Ben Litchfield</td>
+      <td>PMC Member</td>
+    </tr>
+    <tr>
+      <td>carrier</td>
+      <td>Brian Carrier</td>
+      <td>PMC Member</td>
+    </tr>
+    <tr>
+      <td>danielwilson</td>
+      <td>Daniel Wilson</td>
+      <td>PMC Member</td>
+    </tr>
+    <tr>
+      <td>gbailleul</td>
+      <td>Guillaume Bailleul</td>
+      <td>PMC Member</td>
+    </tr>
+    <tr>
+      <td>jeremias</td>
+      <td>Jeremias Maerki</td>
+      <td>PMC Member</td>
+    </tr>
+    <tr>
+      <td>koch</td>
+      <td>Johannes Koch</td>
+      <td>PMC Member</td>
+    </tr>
+    <tr>
+      <td>jahewson</td>
+      <td>John Hewson</td>
+      <td>PMC Member</td>
+    </tr>
+    <tr>
+      <td>kjackson</td>
+      <td>Kevin Jackson</td>
+      <td>PMC Member</td>
+    </tr>
+    <tr>
+      <td>msahyoun</td>
+      <td>Maruan Sahyoun</td>
+      <td>PMC Member</td>
+    </tr>
+    <tr>
+      <td>pkoch</td>
+      <td>Phillipp Koch</td>
+      <td>PMC Member</td>
+    </tr>
+    <tr>
+      <td>tchojecki</td>
+      <td>Thomas Chojecki</td>
+      <td>PMC Member</td>
+    </tr>
+    <tr>
+      <td>tboehme</td>
+      <td>Timo Boehme</td>
+      <td>PMC Member</td>
+    </tr>
+    <tr>
+      <td>tilman</td>
+      <td>Tilman Hausherr</td>
+      <td>PMC Member</td>
+    </tr>
+    <tr>
+      <td>vfed</td>
+      <td>Villu Ruusmann</td>
+      <td>PMC Member</td>
+    </tr>
+  </tbody>
+</table>
 
 <h2 id="emeritus-members">Emeritus members</h2>
 
 <p>The following is a list of former developers going emeritus from the PDFBox PMC.</p>
 
-<table><thead>
-<tr>
-<th>Id</th>
-<th>Name</th>
-<th>Roles</th>
-</tr>
-</thead><tbody>
-<tr>
-<td>leleueri</td>
-<td>Eric Leleu</td>
-<td></td>
-</tr>
-<tr>
-<td>jukka</td>
-<td>Jukka Zitting</td>
-<td></td>
-</tr>
-</tbody></table>
+<table>
+  <thead>
+    <tr>
+      <th>Id</th>
+      <th>Name</th>
+      <th>Roles</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td>leleueri</td>
+      <td>Eric Leleu</td>
+      <td>�</td>
+    </tr>
+    <tr>
+      <td>jukka</td>
+      <td>Jukka Zitting</td>
+      <td>�</td>
+    </tr>
+  </tbody>
+</table>
 
             </div>
         </div>


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

Posted by ms...@apache.org.
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>
 


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

Posted by ms...@apache.org.
Site checkin for project Apache PDFBox Website


Project: http://git-wip-us.apache.org/repos/asf/pdfbox-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/pdfbox-docs/commit/799b1d78
Tree: http://git-wip-us.apache.org/repos/asf/pdfbox-docs/tree/799b1d78
Diff: http://git-wip-us.apache.org/repos/asf/pdfbox-docs/diff/799b1d78

Branch: refs/heads/asf-site
Commit: 799b1d78d8ba26568c2efc5d762327d647a0369d
Parents: fa128c8
Author: Maruan Sahyoun <sa...@fileaffairs.de>
Authored: Mon May 16 19:16:19 2016 +0200
Committer: Maruan Sahyoun <sa...@fileaffairs.de>
Committed: Mon May 16 19:16:19 2016 +0200

----------------------------------------------------------------------
 content/1.8/architecture.html                   |  170 +--
 content/1.8/commandline.html                    | 1007 +++++++++---------
 content/1.8/cookbook/documentcreation.html      |   16 +-
 content/1.8/cookbook/encryption.html            |    9 +-
 content/1.8/cookbook/fill-form-field.html       |   38 +-
 content/1.8/cookbook/pdfacreation.html          |   32 +-
 content/1.8/cookbook/pdfavalidation.html        |   92 +-
 content/1.8/cookbook/rendering.html             |   11 +-
 content/1.8/cookbook/textextraction.html        |  121 ++-
 .../1.8/cookbook/workingwithattachments.html    |   21 +-
 content/1.8/cookbook/workingwithfonts.html      |  158 +--
 content/1.8/cookbook/workingwithmetadata.html   |   29 +-
 content/1.8/dependencies.html                   |   47 +-
 content/1.8/faq.html                            |  108 +-
 content/2.0/commandline.html                    |  904 ++++++++--------
 content/2.0/cookbook/encryption.html            |   17 +-
 content/2.0/dependencies.html                   |   30 +-
 content/2.0/getting-started.html                |   22 +-
 content/2.0/migration.html                      |  184 ++--
 content/building.html                           |   73 +-
 content/codingconventions.html                  |  157 ++-
 content/css/site.css                            |    2 +-
 content/errors/403.html                         |   10 +-
 content/errors/404.html                         |   10 +-
 content/ideas.html                              |   40 +-
 content/index.html                              |   47 +-
 content/mailinglists.html                       |   89 +-
 .../2015/11/22/pdfbox-2.0.0-RC2-released.html   |    4 +-
 .../2016/01/15/pdfbox-2.0.0-RC3-released.html   |    4 +-
 .../news/2016/01/18/pdfbox-1.8.11-released.html |    4 +-
 .../news/2016/03/18/pdfbox-2.0.0-released.html  |    2 +-
 .../news/2016/04/26/new-pdfbox-releases.html    |    2 +-
 content/references.html                         |  260 ++---
 content/siteupdate.html                         |   81 +-
 content/support.html                            |   42 +-
 content/team.html                               |  218 ++--
 36 files changed, 2180 insertions(+), 1881 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/pdfbox-docs/blob/799b1d78/content/1.8/architecture.html
----------------------------------------------------------------------
diff --git a/content/1.8/architecture.html b/content/1.8/architecture.html
index a1d6be5..f4aad24 100644
--- a/content/1.8/architecture.html
+++ b/content/1.8/architecture.html
@@ -137,8 +137,8 @@ is organized as PDFBox was architected around the concepts layed out in the
 ISO-32000 (PDF) Specification</p>
 
 <ul>
-<li><a href="http://www.iso.org/iso/catalogue_detail.htm?csnumber=51502">ISO Site</a></li>
-<li><a href="http://wwwimages.adobe.com/www.adobe.com/content/dam/Adobe/en/devnet/pdf/pdfs/PDF32000_2008.pdf">Adobe Version</a></li>
+  <li><a href="http://www.iso.org/iso/catalogue_detail.htm?csnumber=51502">ISO Site</a></li>
+  <li><a href="http://wwwimages.adobe.com/www.adobe.com/content/dam/Adobe/en/devnet/pdf/pdfs/PDF32000_2008.pdf">Adobe Version</a></li>
 </ul>
 
 <h2 id="quick-introduction-to-the-pdf-format">Quick Introduction to the PDF format</h2>
@@ -151,7 +151,7 @@ make up the basic objects upon which higher level objects and structures are bui
 </p>
 
 <p>The organization of these objects, how to they are read and how to write them is defined in the file structure of the 
-PDF [see ISO-32000 7.5]. In addition a file can be encrpyted to protect the document&#39;s content [see ISO-32000 7.5].</p>
+PDF [see ISO-32000 7.5]. In addition a file can be encrpyted to protect the document\u2019s content [see ISO-32000 7.5].</p>
 
 <p class="alert alert-info">PDFBox handles the reading in the *org.apache.pdfbox.pdfparser* package. 
 Writing of PDF files is handled in the *org.apache.pdfbox.pdfwriter* package.
@@ -162,11 +162,11 @@ as pages, bookmarks, annotations [see ISO-32000 7.7].</p>
 
 <p class="alert alert-info">PDFBox makes these higher level objects available through the 
 *org.apache.pdfbox.pdfmodel* package (The PD Model).
-</p> 
+</p>
 
 <p>In addition there is a COS representation available for the PD model if there is a need to 
 inspect the underlying structure or to handle special cases where the higher level PD model
-doesn&#39;t provide the functionality needed.</p>
+doesn\u2019t provide the functionality needed.</p>
 
 <p class="alert alert-info">It's always the COS model which is represented in the PDF file.</p>
 
@@ -174,85 +174,94 @@ doesn&#39;t provide the functionality needed.</p>
 
 <p>As outlined above the basic PDF objects are represented in PDFBox in the org.apache.pdfbox.cos package.</p>
 
-<table><thead>
-<tr>
-<th>PDF Type</th>
-<th>Description</th>
-<th>Example</th>
-<th>PDFBox class</th>
-<th>ISO 32000</th>
-</tr>
-</thead><tbody>
-<tr>
-<td>Boolean</td>
-<td>Standard True/False values</td>
-<td>true</td>
-<td>org.apache.pdfbox.cos.COSBoolean</td>
-<td>7.3.2</td>
-</tr>
-<tr>
-<td>Number</td>
-<td>Integer and floating point numbers</td>
-<td>1 2.3</td>
-<td>org.apache.pdfbox.cos.COSInteger<br/>org.apache.pdfbox.cos.COSFloat</td>
-<td>7.3.3</td>
-</tr>
-<tr>
-<td>String</td>
-<td>A sequence of characters</td>
-<td>(This is a string)</td>
-<td>org.apache.pdfbox.cos.COSString</td>
-<td>7.3.4</td>
-</tr>
-<tr>
-<td>Name</td>
-<td>A predefined value in a PDF document, typically used as a key in a dictionary</td>
-<td>/Type</td>
-<td>org.apache.pdfbox.cos.COSName</td>
-<td>7.3.5</td>
-</tr>
-<tr>
-<td>Array</td>
-<td>Arrays are one-dimensional lists of objects accessed by a numeric index. Within an array each basic object is permitted as an entry.</td>
-<td>[549 3.14 false (Ralph) /SomeName]</td>
-<td>org.apache.pdfbox.cos.COSArray</td>
-<td>7.3.6</td>
-</tr>
-<tr>
-<td>Dictionary</td>
-<td>A map of name value pairs</td>
-<td>&lt;&lt;<br/>/Type /XObject<br/>/Name (Name)</br>/Size 1</br>&gt;&gt;</td>
-<td>org.apache.pdfbox.cos.COSDictionary</td>
-<td>7.3.7</td>
-</tr>
-<tr>
-<td>Stream</td>
-<td>A stream of data, typically compressed. This is used for page contents, images and embedded font streams.</td>
-<td>12 0 obj &lt;&lt; /Type /XObject &gt;&gt; stream 030004040404040404 endstream</td>
-<td>org.apache.pdfbox.cos.COSStream</td>
-<td>7.3.8</td>
-</tr>
-<tr>
-<td>Object</td>
-<td>A wrapper to any of the other objects, this can be used to reference an object multiple times. An object is referenced by using two numbers, an object number and a generation number. Initially the generation number will be zero unless the object got replaced later in the stream.</td>
-<td>12 0 obj &lt;&lt; /Type /XObject &gt;&gt; endobj</td>
-<td>org.apache.pdfbox.cos.COSObject</td>
-<td></td>
-</tr>
-</tbody></table>
+<table>
+  <thead>
+    <tr>
+      <th>PDF Type</th>
+      <th>Description</th>
+      <th>Example</th>
+      <th>PDFBox class</th>
+      <th>ISO 32000</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td>Boolean</td>
+      <td>Standard True/False values</td>
+      <td>true</td>
+      <td>org.apache.pdfbox.cos.COSBoolean</td>
+      <td>7.3.2</td>
+    </tr>
+    <tr>
+      <td>Number</td>
+      <td>Integer and floating point numbers</td>
+      <td>1 2.3</td>
+      <td>org.apache.pdfbox.cos.COSInteger<br />org.apache.pdfbox.cos.COSFloat</td>
+      <td>7.3.3</td>
+    </tr>
+    <tr>
+      <td>String</td>
+      <td>A sequence of characters</td>
+      <td>(This is a string)</td>
+      <td>org.apache.pdfbox.cos.COSString</td>
+      <td>7.3.4</td>
+    </tr>
+    <tr>
+      <td>Name</td>
+      <td>A predefined value in a PDF document, typically used as a key in a dictionary</td>
+      <td>/Type</td>
+      <td>org.apache.pdfbox.cos.COSName</td>
+      <td>7.3.5</td>
+    </tr>
+    <tr>
+      <td>Array</td>
+      <td>Arrays are one-dimensional lists of objects accessed by a numeric index. Within an array each basic object is permitted as an entry.</td>
+      <td>[549 3.14 false (Ralph) /SomeName]</td>
+      <td>org.apache.pdfbox.cos.COSArray</td>
+      <td>7.3.6</td>
+    </tr>
+    <tr>
+      <td>Dictionary</td>
+      <td>A map of name value pairs</td>
+      <td>�<br />/Type /XObject<br />/Name (Name)&lt;/br&gt;/Size 1&lt;/br&gt;�</td>
+      <td>org.apache.pdfbox.cos.COSDictionary</td>
+      <td>7.3.7</td>
+    </tr>
+    <tr>
+      <td>Stream</td>
+      <td>A stream of data, typically compressed. This is used for page contents, images and embedded font streams.</td>
+      <td>12 0 obj ��/Type /XObject�� stream 030004040404040404 endstream</td>
+      <td>org.apache.pdfbox.cos.COSStream</td>
+      <td>7.3.8</td>
+    </tr>
+    <tr>
+      <td>Object</td>
+      <td>A wrapper to any of the other objects, this can be used to reference an object multiple times. An object is referenced by using two numbers, an object number and a generation number. Initially the generation number will be zero unless the object got replaced later in the stream.</td>
+      <td>12 0 obj ��/Type /XObject�� endobj</td>
+      <td>org.apache.pdfbox.cos.COSObject</td>
+      <td>�</td>
+    </tr>
+  </tbody>
+</table>
 
 <p>A page in a pdf document is represented with a COSDictionary. The entries that are available for a page can be seen in the PDF Reference and an example of a page looks like this:</p>
-<div class="highlight"><pre><code class="language-text" data-lang="text">&lt;&lt;
+
+<div class="highlighter-rouge"><pre class="highlight"><code>&lt;&lt;
     /Type /Page
     /MediaBox [0 0 612 915]
     /Contents 56 0 R
 &gt;&gt;
-</code></pre></div>
+</code></pre>
+</div>
+
 <p>The information within the dictionary can be accessed using the COS model</p>
-<div class="highlight"><pre><code class="language-java" data-lang="java"><span class="n">COSDictionary</span> <span class="n">page</span> <span class="o">=</span> <span class="o">...;</span>
+
+<div class="highlighter-rouge"><pre class="highlight"><code><span class="n">COSDictionary</span> <span class="n">page</span> <span class="o">=</span> <span class="o">...;</span>
 <span class="n">COSArray</span> <span class="n">mediaBox</span> <span class="o">=</span> <span class="o">(</span><span class="n">COSArray</span><span class="o">)</span><span class="n">page</span><span class="o">.</span><span class="na">getDictionaryObject</span><span class="o">(</span> <span class="s">"MediaBox"</span> <span class="o">);</span>
 <span class="n">System</span><span class="o">.</span><span class="na">out</span><span class="o">.</span><span class="na">println</span><span class="o">(</span> <span class="s">"Width:"</span> <span class="o">+</span> <span class="n">mediaBox</span><span class="o">.</span><span class="na">get</span><span class="o">(</span> <span class="mi">3</span> <span class="o">)</span> <span class="o">);</span>
-</code></pre></div>
+</code></pre>
+</div>
+
 <p>As can be seen from that little example the COS model provides a low level API to access 
 information within the PDF. In order to use the COS model successfully a good knowledge of
 the PDF specification is needed.</p>
@@ -265,17 +274,20 @@ parameters and no helper methods are available. The PD Model was created to help
 alleviate this problem. Each type of object(page, font, image) has a set of defined
 attributes that can be available in the dictionary. 
 A PD Model class is available for each of these so that strongly typed methods are
-available to access the attributes. </p>
+available to access the attributes.</p>
 
 <p>The same code from above to get the page width can be rewritten to use PD Model classes.</p>
-<div class="highlight"><pre><code class="language-java" data-lang="java"><span class="n">PDPage</span> <span class="n">page</span> <span class="o">=</span> <span class="o">...;</span>
+
+<div class="highlighter-rouge"><pre class="highlight"><code><span class="n">PDPage</span> <span class="n">page</span> <span class="o">=</span> <span class="o">...;</span>
 <span class="n">PDRectangle</span> <span class="n">mediaBox</span> <span class="o">=</span> <span class="n">page</span><span class="o">.</span><span class="na">getMediaBox</span><span class="o">();</span>
 <span class="n">System</span><span class="o">.</span><span class="na">out</span><span class="o">.</span><span class="na">println</span><span class="o">(</span> <span class="s">"Width:"</span> <span class="o">+</span> <span class="n">mediaBox</span><span class="o">.</span><span class="na">getWidth</span><span class="o">()</span> <span class="o">);</span>
-</code></pre></div>
+</code></pre>
+</div>
+
 <p>PD Model objects sit on top of COS model. Typically, the classes in the PD Model will only
 store a COS object and all setter/getter methods will modify data that is stored in the
 COS object. For example, when you call PDPage.getLastModified() the method will do a
-lookup in the COSDictionary with the key &quot;LastModified&quot;, if it is found the value is then
+lookup in the COSDictionary with the key \u201cLastModified\u201d, if it is found the value is then
 converter to a java.util.Calendar. When PDPage.setLastModified( Calendar ) is called then
 the Calendar is converted to a string in the COSDictionary.</p>
 

http://git-wip-us.apache.org/repos/asf/pdfbox-docs/blob/799b1d78/content/1.8/commandline.html
----------------------------------------------------------------------
diff --git a/content/1.8/commandline.html b/content/1.8/commandline.html
index 474b699..c19f7db 100644
--- a/content/1.8/commandline.html
+++ b/content/1.8/commandline.html
@@ -137,7 +137,7 @@
 <p>See the <a href="/1.8/dependencies.html">Dependencies</a> page for instructions on how to set your classpath in order to run 
 PDFBox tools as Java applications.</p>
 
-<p><strong>Table of Contents</strong><br>
+<p><strong>Table of Contents</strong><br />
 <a href="#decrypt">Decrypt</a>
 <a href="#encrypt">Encrypt</a>
 <a href="#extractimages">ExtractImages</a>
@@ -158,292 +158,307 @@ PDFBox tools as Java applications.</p>
 
 <p>NOTE: You must have the owner password to decrypt the document!</p>
 
-<p>usage: <code>java -jar pdfbox-app-x.y.z.jar Decrypt [OPTIONS] &lt;inputfile&gt; [outputfile]</code></p>
-
-<table><thead>
-<tr>
-<th>Command Line Parameter</th>
-<th>Description</th>
-</tr>
-</thead><tbody>
-<tr>
-<td>-password</td>
-<td>Password to the PDF or certificate in keystore.</td>
-</tr>
-<tr>
-<td>-keyStore</td>
-<td>Path to keystore that holds certificate to decrypt the document. This is only required if the document is encrypted with a certificate, otherwise only the password is required.</td>
-</tr>
-<tr>
-<td>-alias</td>
-<td>The alias to the certificate in the keystore.</td>
-</tr>
-<tr>
-<td>inputfile</td>
-<td>The PDF file to decrypt.</td>
-</tr>
-<tr>
-<td>outputfile</td>
-<td>The file to save the decrypted document to. If left blank then it will be the same as the input file.</td>
-</tr>
-</tbody></table>
+<p>usage: <code class="highlighter-rouge">java -jar pdfbox-app-x.y.z.jar Decrypt [OPTIONS] &lt;inputfile&gt; [outputfile]</code></p>
+
+<table>
+  <thead>
+    <tr>
+      <th>Command Line Parameter</th>
+      <th>Description</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td>-password</td>
+      <td>Password to the PDF or certificate in keystore.</td>
+    </tr>
+    <tr>
+      <td>-keyStore</td>
+      <td>Path to keystore that holds certificate to decrypt the document. This is only required if the document is encrypted with a certificate, otherwise only the password is required.</td>
+    </tr>
+    <tr>
+      <td>-alias</td>
+      <td>The alias to the certificate in the keystore.</td>
+    </tr>
+    <tr>
+      <td>inputfile</td>
+      <td>The PDF file to decrypt.</td>
+    </tr>
+    <tr>
+      <td>outputfile</td>
+      <td>The file to save the decrypted document to. If left blank then it will be the same as the input file.</td>
+    </tr>
+  </tbody>
+</table>
 
 <h2 id="encrypt">Encrypt</h2>
 
 <p>This application will encrypt a PDF document.</p>
 
-<p>usage: <code>java -jar pdfbox-app-x.y.z.jar Encrypt [OPTIONS] &lt;password&gt; &lt;inputfile&gt;</code></p>
-
-<table><thead>
-<tr>
-<th>Command Line Parameter</th>
-<th>Default</th>
-<th>Description</th>
-</tr>
-</thead><tbody>
-<tr>
-<td>-O</td>
-<td></td>
-<td>The owner password to the PDF, ignored if -certFile is specified.</td>
-</tr>
-<tr>
-<td>-U</td>
-<td></td>
-<td>The user password to the PDF, ignored if -certFile is specified.</td>
-</tr>
-<tr>
-<td>-certFile</td>
-<td></td>
-<td>Path to X.509 cert file.</td>
-</tr>
-<tr>
-<td>-canAssemble</td>
-<td>true</td>
-<td>Set the assemble permission.</td>
-</tr>
-<tr>
-<td>-canExtractContent</td>
-<td>true</td>
-<td>Set the extraction permission.</td>
-</tr>
-<tr>
-<td>-canExtractForAccessibility</td>
-<td>true</td>
-<td>Set the extraction permission.</td>
-</tr>
-<tr>
-<td>-canFillInForm</td>
-<td>true</td>
-<td>Set the fill in form permission.</td>
-</tr>
-<tr>
-<td>-canModify</td>
-<td>true</td>
-<td>Set the modify permission.</td>
-</tr>
-<tr>
-<td>-canModifyAnnotations</td>
-<td>true</td>
-<td>Set the modify annots permission.</td>
-</tr>
-<tr>
-<td>-canPrint</td>
-<td>true</td>
-<td>Set the print permission.</td>
-</tr>
-<tr>
-<td>-canPrintDegraded</td>
-<td>true</td>
-<td>Set the print degraded permission.</td>
-</tr>
-<tr>
-<td>-keyLength</td>
-<td>40 or 128</td>
-<td>The number of bits for the encryption key. For 128 bits <a href="http://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html">Java Cryptography Extension (JCE) Unlimited Strength Jurisdiction Policy Files</a> must be installed.</td>
-</tr>
-<tr>
-<td>inputfile</td>
-<td></td>
-<td>The PDF file to encrypt.</td>
-</tr>
-<tr>
-<td>outputfile</td>
-<td></td>
-<td>The file to save the encrypted document to. If left blank then it will be the same as the input file.</td>
-</tr>
-</tbody></table>
+<p>usage: <code class="highlighter-rouge">java -jar pdfbox-app-x.y.z.jar Encrypt [OPTIONS] &lt;password&gt; &lt;inputfile&gt;</code></p>
+
+<table>
+  <thead>
+    <tr>
+      <th>Command Line Parameter</th>
+      <th>Default</th>
+      <th>Description</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td>-O</td>
+      <td>�</td>
+      <td>The owner password to the PDF, ignored if -certFile is specified.</td>
+    </tr>
+    <tr>
+      <td>-U</td>
+      <td>�</td>
+      <td>The user password to the PDF, ignored if -certFile is specified.</td>
+    </tr>
+    <tr>
+      <td>-certFile</td>
+      <td>�</td>
+      <td>Path to X.509 cert file.</td>
+    </tr>
+    <tr>
+      <td>-canAssemble</td>
+      <td>true</td>
+      <td>Set the assemble permission.</td>
+    </tr>
+    <tr>
+      <td>-canExtractContent</td>
+      <td>true</td>
+      <td>Set the extraction permission.</td>
+    </tr>
+    <tr>
+      <td>-canExtractForAccessibility</td>
+      <td>true</td>
+      <td>Set the extraction permission.</td>
+    </tr>
+    <tr>
+      <td>-canFillInForm</td>
+      <td>true</td>
+      <td>Set the fill in form permission.</td>
+    </tr>
+    <tr>
+      <td>-canModify</td>
+      <td>true</td>
+      <td>Set the modify permission.</td>
+    </tr>
+    <tr>
+      <td>-canModifyAnnotations</td>
+      <td>true</td>
+      <td>Set the modify annots permission.</td>
+    </tr>
+    <tr>
+      <td>-canPrint</td>
+      <td>true</td>
+      <td>Set the print permission.</td>
+    </tr>
+    <tr>
+      <td>-canPrintDegraded</td>
+      <td>true</td>
+      <td>Set the print degraded permission.</td>
+    </tr>
+    <tr>
+      <td>-keyLength</td>
+      <td>40 or 128</td>
+      <td>The number of bits for the encryption key. For 128 bits <a href="http://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html">Java Cryptography Extension (JCE) Unlimited Strength Jurisdiction Policy Files</a> must be installed.</td>
+    </tr>
+    <tr>
+      <td>inputfile</td>
+      <td>�</td>
+      <td>The PDF file to encrypt.</td>
+    </tr>
+    <tr>
+      <td>outputfile</td>
+      <td>�</td>
+      <td>The file to save the encrypted document to. If left blank then it will be the same as the input file.</td>
+    </tr>
+  </tbody>
+</table>
 
 <h2 id="extractimages">ExtractImages</h2>
 
 <p>This application will extract all images from the given PDF document.</p>
 
-<p>usage: <code>java -jar pdfbox-app-x.y.z.jar ExtractImages [OPTIONS] &lt;inputfile&gt;</code></p>
-
-<table><thead>
-<tr>
-<th>Command Line Parameter</th>
-<th>Default</th>
-<th>Description</th>
-</tr>
-</thead><tbody>
-<tr>
-<td>-password</td>
-<td></td>
-<td>The password to the PDF document.</td>
-</tr>
-<tr>
-<td>-prefix</td>
-<td>PDF name</td>
-<td>Image prefix to use.</td>
-</tr>
-<tr>
-<td>-directJPEG</td>
-<td>false</td>
-<td>Forces the direct extraction of JPEG images regardless of colorspace.</td>
-</tr>
-</tbody></table>
+<p>usage: <code class="highlighter-rouge">java -jar pdfbox-app-x.y.z.jar ExtractImages [OPTIONS] &lt;inputfile&gt;</code></p>
+
+<table>
+  <thead>
+    <tr>
+      <th>Command Line Parameter</th>
+      <th>Default</th>
+      <th>Description</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td>-password</td>
+      <td>�</td>
+      <td>The password to the PDF document.</td>
+    </tr>
+    <tr>
+      <td>-prefix</td>
+      <td>PDF name</td>
+      <td>Image prefix to use.</td>
+    </tr>
+    <tr>
+      <td>-directJPEG</td>
+      <td>false</td>
+      <td>Forces the direct extraction of JPEG images regardless of colorspace.</td>
+    </tr>
+  </tbody>
+</table>
 
 <h2 id="extracttext">ExtractText</h2>
 
 <p>This application will extract all text from the given PDF document.</p>
 
-<p>usage: <code>java -jar pdfbox-app-x.y.z.jar ExtractText [OPTIONS] &lt;inputfile&gt; [Text file]</code></p>
-
-<table><thead>
-<tr>
-<th>Command Line Parameter</th>
-<th>Default</th>
-<th>Description</th>
-</tr>
-</thead><tbody>
-<tr>
-<td>-password</td>
-<td></td>
-<td>The password to the PDF document.</td>
-</tr>
-<tr>
-<td>-encoding</td>
-<td>default encoding</td>
-<td>The encoding type of the text file, e.g. ISO-8859-1, UTF-8, UTF-16BE.</td>
-</tr>
-<tr>
-<td>-console</td>
-<td>false</td>
-<td>Send text to console instead of file.</td>
-</tr>
-<tr>
-<td>-html</td>
-<td>false</td>
-<td>Output in HTML format instead of raw text.</td>
-</tr>
-<tr>
-<td>-sort</td>
-<td>false</td>
-<td>Sort the text before writing.</td>
-</tr>
-<tr>
-<td>-ignoreBeads</td>
-<td>false</td>
-<td>Disables the separation by beads.</td>
-</tr>
-<tr>
-<td>-force</td>
-<td>false</td>
-<td>Enables pdfbox to ignore corrupt objects.</td>
-</tr>
-<tr>
-<td>-debug</td>
-<td>false</td>
-<td>Enables debug output about the time consumption of every stage.</td>
-</tr>
-<tr>
-<td>-startPage</td>
-<td>1</td>
-<td>The first page to extract, one based.</td>
-</tr>
-<tr>
-<td>-endPage</td>
-<td>Integer.MAX_INT</td>
-<td>The last page to extract, one based.</td>
-</tr>
-<tr>
-<td>-nonSeq</td>
-<td>false</td>
-<td>Use the new non sequential parser.</td>
-</tr>
-</tbody></table>
+<p>usage: <code class="highlighter-rouge">java -jar pdfbox-app-x.y.z.jar ExtractText [OPTIONS] &lt;inputfile&gt; [Text file]</code></p>
+
+<table>
+  <thead>
+    <tr>
+      <th>Command Line Parameter</th>
+      <th>Default</th>
+      <th>Description</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td>-password</td>
+      <td>�</td>
+      <td>The password to the PDF document.</td>
+    </tr>
+    <tr>
+      <td>-encoding</td>
+      <td>default encoding</td>
+      <td>The encoding type of the text file, e.g. ISO-8859-1, UTF-8, UTF-16BE.</td>
+    </tr>
+    <tr>
+      <td>-console</td>
+      <td>false</td>
+      <td>Send text to console instead of file.</td>
+    </tr>
+    <tr>
+      <td>-html</td>
+      <td>false</td>
+      <td>Output in HTML format instead of raw text.</td>
+    </tr>
+    <tr>
+      <td>-sort</td>
+      <td>false</td>
+      <td>Sort the text before writing.</td>
+    </tr>
+    <tr>
+      <td>-ignoreBeads</td>
+      <td>false</td>
+      <td>Disables the separation by beads.</td>
+    </tr>
+    <tr>
+      <td>-force</td>
+      <td>false</td>
+      <td>Enables pdfbox to ignore corrupt objects.</td>
+    </tr>
+    <tr>
+      <td>-debug</td>
+      <td>false</td>
+      <td>Enables debug output about the time consumption of every stage.</td>
+    </tr>
+    <tr>
+      <td>-startPage</td>
+      <td>1</td>
+      <td>The first page to extract, one based.</td>
+    </tr>
+    <tr>
+      <td>-endPage</td>
+      <td>Integer.MAX_INT</td>
+      <td>The last page to extract, one based.</td>
+    </tr>
+    <tr>
+      <td>-nonSeq</td>
+      <td>false</td>
+      <td>Use the new non sequential parser.</td>
+    </tr>
+  </tbody>
+</table>
 
 <h2 id="overlaypdf">OverlayPDF</h2>
 
 <p>This application will overlay one document with the content of another document</p>
 
-<p>usage: <code>java -jar pdfbox-app-x.y.z.jar OverlayPDF &lt;input.pdf&gt; [OPTIONS] &lt;output.pdf&gt;</code></p>
-
-<table><thead>
-<tr>
-<th>Command Line Parameter</th>
-<th>Default</th>
-<th>Description</th>
-</tr>
-</thead><tbody>
-<tr>
-<td>inputfile</td>
-<td></td>
-<td>The PDF file to be overlayed.</td>
-</tr>
-<tr>
-<td>defaultOverlay.pdf</td>
-<td></td>
-<td>Default overlay file.</td>
-</tr>
-<tr>
-<td>-odd oddPageOverlay.pdf</td>
-<td></td>
-<td>Overlay file used for odd pages.</td>
-</tr>
-<tr>
-<td>-even evenPageOverlay.pdf</td>
-<td></td>
-<td>Overlay file used for even pages.</td>
-</tr>
-<tr>
-<td>-first firstPageOverlay.pdf</td>
-<td></td>
-<td>Overlay file used for the first page.</td>
-</tr>
-<tr>
-<td>-last lastPageOverlay.pdf</td>
-<td></td>
-<td>Overlay file used for the last pages.</td>
-</tr>
-<tr>
-<td>-page pageNumber specificPageOverlay.pdf</td>
-<td></td>
-<td>overlay file used for the given page number, may occur more than once.</td>
-</tr>
-<tr>
-<td>-position</td>
-<td>background</td>
-<td>Where to put the overlay, foreground or background.</td>
-</tr>
-<tr>
-<td>-nonSeq</td>
-<td>false</td>
-<td>Use the new non sequential parser.</td>
-</tr>
-<tr>
-<td>outputfile</td>
-<td></td>
-<td>The resulting pdf file.</td>
-</tr>
-</tbody></table>
+<p>usage: <code class="highlighter-rouge">java -jar pdfbox-app-x.y.z.jar OverlayPDF &lt;input.pdf&gt; [OPTIONS] &lt;output.pdf&gt;</code></p>
+
+<table>
+  <thead>
+    <tr>
+      <th>Command Line Parameter</th>
+      <th>Default</th>
+      <th>Description</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td>inputfile</td>
+      <td>�</td>
+      <td>The PDF file to be overlayed.</td>
+    </tr>
+    <tr>
+      <td>defaultOverlay.pdf</td>
+      <td>�</td>
+      <td>Default overlay file.</td>
+    </tr>
+    <tr>
+      <td>-odd oddPageOverlay.pdf</td>
+      <td>�</td>
+      <td>Overlay file used for odd pages.</td>
+    </tr>
+    <tr>
+      <td>-even evenPageOverlay.pdf</td>
+      <td>�</td>
+      <td>Overlay file used for even pages.</td>
+    </tr>
+    <tr>
+      <td>-first firstPageOverlay.pdf</td>
+      <td>�</td>
+      <td>Overlay file used for the first page.</td>
+    </tr>
+    <tr>
+      <td>-last lastPageOverlay.pdf</td>
+      <td>�</td>
+      <td>Overlay file used for the last pages.</td>
+    </tr>
+    <tr>
+      <td>-page pageNumber specificPageOverlay.pdf</td>
+      <td>�</td>
+      <td>overlay file used for the given page number, may occur more than once.</td>
+    </tr>
+    <tr>
+      <td>-position</td>
+      <td>background</td>
+      <td>Where to put the overlay, foreground or background.</td>
+    </tr>
+    <tr>
+      <td>-nonSeq</td>
+      <td>false</td>
+      <td>Use the new non sequential parser.</td>
+    </tr>
+    <tr>
+      <td>outputfile</td>
+      <td>�</td>
+      <td>The resulting pdf file.</td>
+    </tr>
+  </tbody>
+</table>
 
 <p>Examples:</p>
 
 <ul>
-<li>OverlayPDF input.pdf overlay.pdf -nonSeq output.pdf</li>
-<li>OverlayPDF input.pdf defaultOverlay.pdf -page 10 overlayForPage10.pdf -position foreground -nonSeq output.pdf</li>
-<li>OverlayPDF input.pdf -odd oddOverlay.pdf -even evenOverlay.pdf -nonSeq output.pdf</li>
+  <li>OverlayPDF input.pdf overlay.pdf -nonSeq output.pdf</li>
+  <li>OverlayPDF input.pdf defaultOverlay.pdf -page 10 overlayForPage10.pdf -position foreground -nonSeq output.pdf</li>
+  <li>OverlayPDF input.pdf -odd oddOverlay.pdf -even evenOverlay.pdf -nonSeq output.pdf</li>
 </ul>
 
 <h2 id="printpdf">PrintPDF</h2>
@@ -452,271 +467,293 @@ PDFBox tools as Java applications.</p>
 
 <p class="alert alert-info">You must have the correct permissions to print the document!</p>
 
-<p>usage: <code>java -jar pdfbox-app-x.y.z.jar PrintPDF [OPTIONS] &lt;inputfile&gt;</code></p>
-
-<table><thead>
-<tr>
-<th>Command Line Parameter</th>
-<th>Description</th>
-</tr>
-</thead><tbody>
-<tr>
-<td>-password</td>
-<td>The password to decrypt the PDF.</td>
-</tr>
-<tr>
-<td>-silentPrint</td>
-<td>Print the PDF without prompting for a printer.</td>
-</tr>
-<tr>
-<td>inputfile</td>
-<td>The PDF file to print.</td>
-</tr>
-</tbody></table>
+<p>usage: <code class="highlighter-rouge">java -jar pdfbox-app-x.y.z.jar PrintPDF [OPTIONS] &lt;inputfile&gt;</code></p>
+
+<table>
+  <thead>
+    <tr>
+      <th>Command Line Parameter</th>
+      <th>Description</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td>-password</td>
+      <td>The password to decrypt the PDF.</td>
+    </tr>
+    <tr>
+      <td>-silentPrint</td>
+      <td>Print the PDF without prompting for a printer.</td>
+    </tr>
+    <tr>
+      <td>inputfile</td>
+      <td>The PDF file to print.</td>
+    </tr>
+  </tbody>
+</table>
 
 <h2 id="pdfdebugger">PDFDebugger</h2>
 
 <p>This application will take an existing PDF document and allows to analyze and inspect the internal structure</p>
 
-<p>usage: <code>java -jar pdfbox-app-x.y.z.jar PDFDebugger [inputfile]</code></p>
-
-<table><thead>
-<tr>
-<th>Command Line Parameter</th>
-<th>Default</th>
-<th>Description</th>
-</tr>
-</thead><tbody>
-<tr>
-<td>-password</td>
-<td></td>
-<td>The password to the PDF document.</td>
-</tr>
-<tr>
-<td>-nonSeq</td>
-<td>false</td>
-<td>Use the new non sequential parser.</td>
-</tr>
-<tr>
-<td>inputfile</td>
-<td></td>
-<td>the name of an optional PDF file to open.</td>
-</tr>
-</tbody></table>
+<p>usage: <code class="highlighter-rouge">java -jar pdfbox-app-x.y.z.jar PDFDebugger [inputfile]</code></p>
+
+<table>
+  <thead>
+    <tr>
+      <th>Command Line Parameter</th>
+      <th>Default</th>
+      <th>Description</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td>-password</td>
+      <td>�</td>
+      <td>The password to the PDF document.</td>
+    </tr>
+    <tr>
+      <td>-nonSeq</td>
+      <td>false</td>
+      <td>Use the new non sequential parser.</td>
+    </tr>
+    <tr>
+      <td>inputfile</td>
+      <td>�</td>
+      <td>the name of an optional PDF file to open.</td>
+    </tr>
+  </tbody>
+</table>
 
 <h2 id="pdfreader">PDFReader</h2>
 
 <p>An application to read PDF documents. This will provide Acrobat Reader like functionality.</p>
 
-<p>usage: <code>java -jar pdfbox-app-x.y.z.jar PDFReader [PDF file]</code></p>
-
-<table><thead>
-<tr>
-<th>Command Line Parameter</th>
-<th>Default</th>
-<th>Description</th>
-</tr>
-</thead><tbody>
-<tr>
-<td>-password</td>
-<td></td>
-<td>The password to the PDF document.</td>
-</tr>
-<tr>
-<td>-nonSeq</td>
-<td>false</td>
-<td>Use the new non sequential parser.</td>
-</tr>
-<tr>
-<td>PDF file</td>
-<td></td>
-<td>the name of an optional PDF file to open</td>
-</tr>
-</tbody></table>
+<p>usage: <code class="highlighter-rouge">java -jar pdfbox-app-x.y.z.jar PDFReader [PDF file]</code></p>
+
+<table>
+  <thead>
+    <tr>
+      <th>Command Line Parameter</th>
+      <th>Default</th>
+      <th>Description</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td>-password</td>
+      <td>�</td>
+      <td>The password to the PDF document.</td>
+    </tr>
+    <tr>
+      <td>-nonSeq</td>
+      <td>false</td>
+      <td>Use the new non sequential parser.</td>
+    </tr>
+    <tr>
+      <td>PDF file</td>
+      <td>�</td>
+      <td>the name of an optional PDF file to open</td>
+    </tr>
+  </tbody>
+</table>
 
 <h2 id="pdfmerger">PDFMerger</h2>
 
 <p>This application will take a list of pdf documents and merge them, saving the result in a new document.</p>
 
-<p>usage: <code>java -jar pdfbox-app-x.y.z.jar PDFMerger &lt;Source PDF files (2 ..n)&gt; &lt;Target PDF file&gt;</code></p>
+<p>usage: <code class="highlighter-rouge">java -jar pdfbox-app-x.y.z.jar PDFMerger &lt;Source PDF files (2 ..n)&gt; &lt;Target PDF file&gt;</code></p>
 
 <h2 id="pdfsplit">PDFSplit</h2>
 
 <p>This application will take an existing PDF document and split it into a number of other documents</p>
 
-<p>usage: <code>java -jar pdfbox-app-x.y.z.jar PDFSplit [OPTIONS] &lt;PDF file&gt;</code></p>
-
-<table><thead>
-<tr>
-<th>Command Line Parameter</th>
-<th>Default</th>
-<th>Description</th>
-</tr>
-</thead><tbody>
-<tr>
-<td>-password</td>
-<td></td>
-<td>The password to the PDF document.</td>
-</tr>
-<tr>
-<td>-split</td>
-<td></td>
-<td>Number of pages of every splitted part of the pdf.</td>
-</tr>
-<tr>
-<td>-startPage</td>
-<td></td>
-<td>The page to start at.</td>
-</tr>
-<tr>
-<td>-endPage</td>
-<td></td>
-<td>The page to stop at.</td>
-</tr>
-<tr>
-<td>-nonSeq</td>
-<td>false</td>
-<td>Use the new non sequential parser.</td>
-</tr>
-</tbody></table>
+<p>usage: <code class="highlighter-rouge">java -jar pdfbox-app-x.y.z.jar PDFSplit [OPTIONS] &lt;PDF file&gt;</code></p>
+
+<table>
+  <thead>
+    <tr>
+      <th>Command Line Parameter</th>
+      <th>Default</th>
+      <th>Description</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td>-password</td>
+      <td>�</td>
+      <td>The password to the PDF document.</td>
+    </tr>
+    <tr>
+      <td>-split</td>
+      <td>�</td>
+      <td>Number of pages of every splitted part of the pdf.</td>
+    </tr>
+    <tr>
+      <td>-startPage</td>
+      <td>�</td>
+      <td>The page to start at.</td>
+    </tr>
+    <tr>
+      <td>-endPage</td>
+      <td>�</td>
+      <td>The page to stop at.</td>
+    </tr>
+    <tr>
+      <td>-nonSeq</td>
+      <td>false</td>
+      <td>Use the new non sequential parser.</td>
+    </tr>
+  </tbody>
+</table>
 
 <p>Examples:</p>
 
 <ul>
-<li>PDFSplit -split 2 sample_with_13_pages.pdf will split the pdf in pieces of 2 pages each except the last which will contain 1 page only.</li>
-<li>PDFSplit -startPage 5 sample_with_13_pages.pdf will provide a pdf containing all pages of the source pdf starting at page 5</li>
-<li>PDFSplit -startPage 5 -endPage 10 sample_with_13_pages.pdf will provide a pdf containing all pages from 5 to 10 of the source pdf</li>
-<li>PDFSplit -split 2 -startPage 5 -endPage 10 sample_with_13_pages.pdf will provide 3 pdfs containing all pages from 5 to 10 of the source pdf 2 pages each</li>
+  <li>PDFSplit -split 2 sample_with_13_pages.pdf will split the pdf in pieces of 2 pages each except the last which will contain 1 page only.</li>
+  <li>PDFSplit -startPage 5 sample_with_13_pages.pdf will provide a pdf containing all pages of the source pdf starting at page 5</li>
+  <li>PDFSplit -startPage 5 -endPage 10 sample_with_13_pages.pdf will provide a pdf containing all pages from 5 to 10 of the source pdf</li>
+  <li>PDFSplit -split 2 -startPage 5 -endPage 10 sample_with_13_pages.pdf will provide 3 pdfs containing all pages from 5 to 10 of the source pdf 2 pages each</li>
 </ul>
 
 <h2 id="pdftoimage">PDFToImage</h2>
 
 <p>This application will create an image for every page in the PDF document.</p>
 
-<p>usage: <code>java -jar pdfbox-app-x.y.z.jar PDFToImage [OPTIONS] &lt;PDF file&gt;</code></p>
-
-<table><thead>
-<tr>
-<th>Command Line Parameter</th>
-<th>Default</th>
-<th>Description</th>
-</tr>
-</thead><tbody>
-<tr>
-<td>-password</td>
-<td></td>
-<td>The password to the PDF document.</td>
-</tr>
-<tr>
-<td>-imageType</td>
-<td>jpg</td>
-<td>The image type to write to. Currently only jpg or png.</td>
-</tr>
-<tr>
-<td>-outputPrefix</td>
-<td>Name of PDF document</td>
-<td>The prefix to the image file.</td>
-</tr>
-<tr>
-<td>-startPage</td>
-<td>1</td>
-<td>The first page to convert, one based.</td>
-</tr>
-<tr>
-<td>-endPage</td>
-<td>Integer.MAX_INT</td>
-<td>The last page to convert, one based.</td>
-</tr>
-<tr>
-<td>-nonSeq</td>
-<td>false</td>
-<td>Use the new non sequential parser.</td>
-</tr>
-</tbody></table>
+<p>usage: <code class="highlighter-rouge">java -jar pdfbox-app-x.y.z.jar PDFToImage [OPTIONS] &lt;PDF file&gt;</code></p>
+
+<table>
+  <thead>
+    <tr>
+      <th>Command Line Parameter</th>
+      <th>Default</th>
+      <th>Description</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td>-password</td>
+      <td>�</td>
+      <td>The password to the PDF document.</td>
+    </tr>
+    <tr>
+      <td>-imageType</td>
+      <td>jpg</td>
+      <td>The image type to write to. Currently only jpg or png.</td>
+    </tr>
+    <tr>
+      <td>-outputPrefix</td>
+      <td>Name of PDF document</td>
+      <td>The prefix to the image file.</td>
+    </tr>
+    <tr>
+      <td>-startPage</td>
+      <td>1</td>
+      <td>The first page to convert, one based.</td>
+    </tr>
+    <tr>
+      <td>-endPage</td>
+      <td>Integer.MAX_INT</td>
+      <td>The last page to convert, one based.</td>
+    </tr>
+    <tr>
+      <td>-nonSeq</td>
+      <td>false</td>
+      <td>Use the new non sequential parser.</td>
+    </tr>
+  </tbody>
+</table>
 
 <h2 id="texttopdf">TextToPDF</h2>
 
 <p>This application will create a PDF document from a text file.</p>
 
-<p>usage: <code>java -jar pdfbox-app-x.y.z.jar TextToPDF [OPTIONS] &lt;outputfile&gt; &lt;textfile&gt;</code></p>
-
-<table><thead>
-<tr>
-<th>Command Line Parameter</th>
-<th>Default</th>
-<th>Description</th>
-</tr>
-</thead><tbody>
-<tr>
-<td>-standardFont</td>
-<td>Helvetica</td>
-<td>The font to use for the text. Either this or -ttf should be specified but not both.</td>
-</tr>
-<tr>
-<td>-ttf</td>
-<td></td>
-<td>The TTF font to use for the text. Either this or -standardFont should be specified but not both.</td>
-</tr>
-<tr>
-<td>-fontSize</td>
-<td>10</td>
-<td>The size of the font to use.</td>
-</tr>
-</tbody></table>
-
-<p>The following font names can be used for the parameter <code>standardFont</code>:</p>
+<p>usage: <code class="highlighter-rouge">java -jar pdfbox-app-x.y.z.jar TextToPDF [OPTIONS] &lt;outputfile&gt; &lt;textfile&gt;</code></p>
+
+<table>
+  <thead>
+    <tr>
+      <th>Command Line Parameter</th>
+      <th>Default</th>
+      <th>Description</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td>-standardFont</td>
+      <td>Helvetica</td>
+      <td>The font to use for the text. Either this or -ttf should be specified but not both.</td>
+    </tr>
+    <tr>
+      <td>-ttf</td>
+      <td>�</td>
+      <td>The TTF font to use for the text. Either this or -standardFont should be specified but not both.</td>
+    </tr>
+    <tr>
+      <td>-fontSize</td>
+      <td>10</td>
+      <td>The size of the font to use.</td>
+    </tr>
+  </tbody>
+</table>
+
+<p>The following font names can be used for the parameter <code class="highlighter-rouge">standardFont</code>:</p>
 
 <ul>
-<li>Courier</li>
-<li>Courier-Bold</li>
-<li>Courier-Oblique</li>
-<li>Courier-BoldOblique</li>
-<li>Helvetica</li>
-<li>Helvetica-Bold</li>
-<li>Helvetica-Oblique</li>
-<li>Helvetica-BoldOblique</li>
-<li>Symbol</li>
-<li>Times-Bold</li>
-<li>Times-Roman</li>
-<li>Times-Italic</li>
-<li>Times-BoldItalic</li>
-<li>ZapfDingbats</li>
+  <li>Courier</li>
+  <li>Courier-Bold</li>
+  <li>Courier-Oblique</li>
+  <li>Courier-BoldOblique</li>
+  <li>Helvetica</li>
+  <li>Helvetica-Bold</li>
+  <li>Helvetica-Oblique</li>
+  <li>Helvetica-BoldOblique</li>
+  <li>Symbol</li>
+  <li>Times-Bold</li>
+  <li>Times-Roman</li>
+  <li>Times-Italic</li>
+  <li>Times-BoldItalic</li>
+  <li>ZapfDingbats</li>
 </ul>
 
 <h2 id="writedecodeddoc">WriteDecodedDoc</h2>
 
 <p>An application to decompress PDF documents.</p>
 
-<p>usage: <code>java -jar pdfbox-app-x.y.z.jar WriteDecodedDoc &lt;input-file&gt; &lt;output-file&gt;</code></p>
-
-<table><thead>
-<tr>
-<th>Command Line Parameter</th>
-<th>Default</th>
-<th>Description</th>
-</tr>
-</thead><tbody>
-<tr>
-<td>-password</td>
-<td></td>
-<td>The password to the PDF document.</td>
-</tr>
-<tr>
-<td>-nonSeq</td>
-<td>false</td>
-<td>Use the new non sequential parser.</td>
-</tr>
-<tr>
-<td><input-file></td>
-<td></td>
-<td>The PDF file to decompress</td>
-</tr>
-<tr>
-<td><output-file></td>
-<td></td>
-<td>The destination PDF file</td>
-</tr>
-</tbody></table>
+<p>usage: <code class="highlighter-rouge">java -jar pdfbox-app-x.y.z.jar WriteDecodedDoc &lt;input-file&gt; &lt;output-file&gt;</code></p>
+
+<table>
+  <thead>
+    <tr>
+      <th>Command Line Parameter</th>
+      <th>Default</th>
+      <th>Description</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td>-password</td>
+      <td>�</td>
+      <td>The password to the PDF document.</td>
+    </tr>
+    <tr>
+      <td>-nonSeq</td>
+      <td>false</td>
+      <td>Use the new non sequential parser.</td>
+    </tr>
+    <tr>
+      <td><input-file></input-file></td>
+      <td>�</td>
+      <td>The PDF file to decompress</td>
+    </tr>
+    <tr>
+      <td><output-file></output-file></td>
+      <td>�</td>
+      <td>The destination PDF file</td>
+    </tr>
+  </tbody>
+</table>
+
 
             </div>
         </div>

http://git-wip-us.apache.org/repos/asf/pdfbox-docs/blob/799b1d78/content/1.8/cookbook/documentcreation.html
----------------------------------------------------------------------
diff --git a/content/1.8/cookbook/documentcreation.html b/content/1.8/cookbook/documentcreation.html
index 793efbf..0e2a902 100644
--- a/content/1.8/cookbook/documentcreation.html
+++ b/content/1.8/cookbook/documentcreation.html
@@ -135,7 +135,8 @@
 <h2 id="create-a-blank-pdf">Create a blank PDF</h2>
 
 <p>This small sample shows how to create a new PDF document using PDFBox.</p>
-<div class="highlight"><pre><code class="language-java" data-lang="java"><span class="c1">// Create a new empty document</span>
+
+<div class="highlighter-rouge"><pre class="highlight"><code><span class="c1">// Create a new empty document</span>
 <span class="n">PDDocument</span> <span class="n">document</span> <span class="o">=</span> <span class="k">new</span> <span class="n">PDDocument</span><span class="o">();</span>
 
 <span class="c1">// Create a new blank page and add it to the document</span>
@@ -148,11 +149,14 @@
 <span class="c1">// finally make sure that the document is properly</span>
 <span class="c1">// closed.</span>
 <span class="n">document</span><span class="o">.</span><span class="na">close</span><span class="o">();</span>
-</code></pre></div>
+</code></pre>
+</div>
+
 <h2 id="hello-world-using-a-pdf-base-font">Hello World using a PDF base font</h2>
 
-<p>This small sample shows how to create a new document and print the text &quot;Hello World&quot; using one of the PDF base fonts.</p>
-<div class="highlight"><pre><code class="language-java" data-lang="java"><span class="c1">// Create a document and add a page to it</span>
+<p>This small sample shows how to create a new document and print the text \u201cHello World\u201d using one of the PDF base fonts.</p>
+
+<div class="highlighter-rouge"><pre class="highlight"><code><span class="c1">// Create a document and add a page to it</span>
 <span class="n">PDDocument</span> <span class="n">document</span> <span class="o">=</span> <span class="k">new</span> <span class="n">PDDocument</span><span class="o">();</span>
 <span class="n">PDPage</span> <span class="n">page</span> <span class="o">=</span> <span class="k">new</span> <span class="n">PDPage</span><span class="o">();</span>
 <span class="n">document</span><span class="o">.</span><span class="na">addPage</span><span class="o">(</span> <span class="n">page</span> <span class="o">);</span>
@@ -176,7 +180,9 @@
 <span class="c1">// Save the results and ensure that the document is properly closed:</span>
 <span class="n">document</span><span class="o">.</span><span class="na">save</span><span class="o">(</span> <span class="s">"Hello World.pdf"</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>
+</code></pre>
+</div>
+
             </div>
         </div>
     </div>

http://git-wip-us.apache.org/repos/asf/pdfbox-docs/blob/799b1d78/content/1.8/cookbook/encryption.html
----------------------------------------------------------------------
diff --git a/content/1.8/cookbook/encryption.html b/content/1.8/cookbook/encryption.html
index 1965231..e81b680 100644
--- a/content/1.8/cookbook/encryption.html
+++ b/content/1.8/cookbook/encryption.html
@@ -132,12 +132,13 @@
             <div class="col-xs-12 col-sm-9">
                 <h1 id="encrypting-a-file">Encrypting a file</h1>
 
-<p>PDF encryption requires two passwords: the &quot;user password&quot; to open and view the file with restricted permissions, the &quot;owner password&quot; to access the file with all permission.</p>
+<p>PDF encryption requires two passwords: the \u201cuser password\u201d to open and view the file with restricted permissions, the \u201cowner password\u201d to access the file with all permission.</p>
 
 <h2 id="load-and-save-encrypted">Load and save encrypted</h2>
 
 <p>This small sample shows how to encrypt a file so that it can be viewed, but not printed..</p>
-<div class="highlight"><pre><code class="language-java" data-lang="java"><span class="n">PDDocument</span> <span class="n">doc</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="s">"filename.pdf"</span><span class="o">);</span>
+
+<div class="highlighter-rouge"><pre class="highlight"><code><span class="n">PDDocument</span> <span class="n">doc</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="s">"filename.pdf"</span><span class="o">);</span>
 
 <span class="c1">// Define the length of the encryption key.</span>
 <span class="c1">// Possible values are 40 or 128 (256 will be available in PDFBox 2.0).</span>
@@ -157,7 +158,9 @@
 
 <span class="n">doc</span><span class="o">.</span><span class="na">save</span><span class="o">(</span><span class="s">"filename-encrypted.pdf"</span><span class="o">);</span>
 <span class="n">doc</span><span class="o">.</span><span class="na">close</span><span class="o">();</span>
-</code></pre></div>
+</code></pre>
+</div>
+
             </div>
         </div>
     </div>

http://git-wip-us.apache.org/repos/asf/pdfbox-docs/blob/799b1d78/content/1.8/cookbook/fill-form-field.html
----------------------------------------------------------------------
diff --git a/content/1.8/cookbook/fill-form-field.html b/content/1.8/cookbook/fill-form-field.html
index 807d389..aade0df 100644
--- a/content/1.8/cookbook/fill-form-field.html
+++ b/content/1.8/cookbook/fill-form-field.html
@@ -132,45 +132,61 @@
             <div class="col-xs-12 col-sm-9">
                 <h1 id="fill-a-form-field">Fill a Form Field</h1>
 
-<p>Form fields within a PDF are defined as part of the AcroForm entry within the PDF&#39;s document catalog.
+<p>Form fields within a PDF are defined as part of the AcroForm entry within the PDF\u2019s document catalog.
 Form there individual fields can be accessed. Fields might be organized in a tree structure so it might
 be neccessary to walk through the tree to get an individual field.</p>
 
 <p>Load the PDF document.</p>
-<div class="highlight"><pre><code class="language-" data-lang="">:::java
+
+<div class="highlighter-rouge"><pre class="highlight"><code>:::java
 // load the document
 PDDocument pdfDocument = PDDocument.loadNonSeq(new File(... ), null);
-</code></pre></div>
+</code></pre>
+</div>
+
 <p>Get the docoument catalog and the AcroForm which might be contained within.</p>
-<div class="highlight"><pre><code class="language-" data-lang="">:::java
+
+<div class="highlighter-rouge"><pre class="highlight"><code>:::java
 // get the document catalog
 PDDocumentCatalog docCatalog = pdfDocument.getDocumentCatalog();
 PDAcroForm acroForm = docCatalog.getAcroForm();
-</code></pre></div>
+</code></pre>
+</div>
+
 <p>Retrieve an individual field and set its value.</p>
-<div class="highlight"><pre><code class="language-" data-lang="">:::java
+
+<div class="highlighter-rouge"><pre class="highlight"><code>:::java
 // as there might not be an AcroForm entry a null check is necessary
 if (acroForm != null)
 {
     PDField field = (PDField) acroForm.getField( "fieldName" );
     field.setValue("new field value");
 }
-</code></pre></div>
+</code></pre>
+</div>
+
 <p>If a field is nested within the form tree a fully qualified name might be provided
 to access the field.</p>
-<div class="highlight"><pre><code class="language-" data-lang="">:::java
+
+<div class="highlighter-rouge"><pre class="highlight"><code>:::java
 // as there might not be an AcroForm entry a null check is neccessary
 if (acroForm != null)
 {
     PDField field = (PDField) acroForm.getField( "fieldsParentName.fieldName" );
     field.setValue("new field value");
 }
-</code></pre></div>
+</code></pre>
+</div>
+
 <p>Save and close the filled out form.</p>
-<div class="highlight"><pre><code class="language-" data-lang="">:::java
+
+<div class="highlighter-rouge"><pre class="highlight"><code>:::java
 doc.save(filledForm);
 doc.close();
-</code></pre></div>
+</code></pre>
+</div>
+
+
             </div>
         </div>
     </div>

http://git-wip-us.apache.org/repos/asf/pdfbox-docs/blob/799b1d78/content/1.8/cookbook/pdfacreation.html
----------------------------------------------------------------------
diff --git a/content/1.8/cookbook/pdfacreation.html b/content/1.8/cookbook/pdfacreation.html
index db9a06b..a5aecf0 100644
--- a/content/1.8/cookbook/pdfacreation.html
+++ b/content/1.8/cookbook/pdfacreation.html
@@ -130,7 +130,7 @@
                 </ul>
             </div>
             <div class="col-xs-12 col-sm-9">
-                <h1 id="pdf-a-creation">PDF/A Creation</h1>
+                <h1 id="pdfa-creation">PDF/A Creation</h1>
 
 <p>The Apache PDFBox API can be used to create a PDF/A File. PDF/A is a PDF file with some constraints to ensure its 
 long time conservation. These constraints are described in ISO 19005.</p>
@@ -142,27 +142,33 @@ document. The current example creates a valid PDF/A-1b document.</p>
 
 <p>The PDF/A specification enforces that the fonts used in the document are present in the PDF File. You
 have to load them. As an example:</p>
-<div class="highlight"><pre><code class="language-java" data-lang="java"><span class="n">InputStream</span> <span class="n">fontStream</span> <span class="o">=</span> <span class="n">CreatePDFA</span><span class="o">.</span><span class="na">class</span><span class="o">.</span><span class="na">getResourceAsStream</span><span class="o">(</span><span class="s">"/org/apache/pdfbox/resources/ttf/ArialMT.ttf"</span><span class="o">);</span>
+
+<div class="highlighter-rouge"><pre class="highlight"><code><span class="n">InputStream</span> <span class="n">fontStream</span> <span class="o">=</span> <span class="n">CreatePDFA</span><span class="o">.</span><span class="na">class</span><span class="o">.</span><span class="na">getResourceAsStream</span><span class="o">(</span><span class="s">"/org/apache/pdfbox/resources/ttf/ArialMT.ttf"</span><span class="o">);</span>
 <span class="n">PDFont</span> <span class="n">font</span> <span class="o">=</span> <span class="n">PDTrueTypeFont</span><span class="o">.</span><span class="na">loadTTF</span><span class="o">(</span><span class="n">doc</span><span class="o">,</span> <span class="n">fontStream</span><span class="o">);</span>
-</code></pre></div>
-<h2 id="including-xmp-metadata-block">Including XMP metadata block</h2>
+</code></pre>
+</div>
+<p>## Including XMP metadata block</p>
 
 <p>It is imposed to have xmp metadata defined in the PDF. At least, the PDFA Schema (giving details on the version
 of PDF/A specification reached by the document) must be present. These lines create the xmp metadata for a
 PDF/A-1b document:</p>
-<div class="highlight"><pre><code class="language-java" data-lang="java"><span class="n">XMPMetadata</span> <span class="n">xmp</span> <span class="o">=</span> <span class="k">new</span> <span class="n">XMPMetadata</span><span class="o">();</span>
+
+<div class="highlighter-rouge"><pre class="highlight"><code><span class="n">XMPMetadata</span> <span class="n">xmp</span> <span class="o">=</span> <span class="k">new</span> <span class="n">XMPMetadata</span><span class="o">();</span>
 <span class="n">XMPSchemaPDFAId</span> <span class="n">pdfaid</span> <span class="o">=</span> <span class="k">new</span> <span class="n">XMPSchemaPDFAId</span><span class="o">(</span><span class="n">xmp</span><span class="o">);</span>
 <span class="n">xmp</span><span class="o">.</span><span class="na">addSchema</span><span class="o">(</span><span class="n">pdfaid</span><span class="o">);</span>
 <span class="n">pdfaid</span><span class="o">.</span><span class="na">setConformance</span><span class="o">(</span><span class="s">"B"</span><span class="o">);</span>
 <span class="n">pdfaid</span><span class="o">.</span><span class="na">setPart</span><span class="o">(</span><span class="mi">1</span><span class="o">);</span>
 <span class="n">pdfaid</span><span class="o">.</span><span class="na">setAbout</span><span class="o">(</span><span class="s">""</span><span class="o">);</span>
 <span class="n">metadata</span><span class="o">.</span><span class="na">importXMPMetadata</span><span class="o">(</span><span class="n">xmp</span><span class="o">);</span>
-</code></pre></div>
+</code></pre>
+</div>
+
 <h2 id="including-color-profile">Including color profile</h2>
 
 <p>It is mandatory to include the color profile used by the document. Different profiles can be used. This 
 example takes one present in pdfbox:</p>
-<div class="highlight"><pre><code class="language-java" data-lang="java"><span class="c1">// create output intent</span>
+
+<div class="highlighter-rouge"><pre class="highlight"><code><span class="c1">// create output intent</span>
 <span class="n">InputStream</span> <span class="n">colorProfile</span> <span class="o">=</span> <span class="n">CreatePDFA</span><span class="o">.</span><span class="na">class</span><span class="o">.</span><span class="na">getResourceAsStream</span><span class="o">(</span><span class="s">"/org/apache/pdfbox/resources/pdfa/sRGB Color Space Profile.icm"</span><span class="o">);</span>
 <span class="n">PDOutputIntent</span> <span class="n">oi</span> <span class="o">=</span> <span class="k">new</span> <span class="n">PDOutputIntent</span><span class="o">(</span><span class="n">doc</span><span class="o">,</span> <span class="n">colorProfile</span><span class="o">);</span> 
 <span class="n">oi</span><span class="o">.</span><span class="na">setInfo</span><span class="o">(</span><span class="s">"sRGB IEC61966-2.1"</span><span class="o">);</span> 
@@ -170,12 +176,18 @@ example takes one present in pdfbox:</p>
 <span class="n">oi</span><span class="o">.</span><span class="na">setOutputConditionIdentifier</span><span class="o">(</span><span class="s">"sRGB IEC61966-2.1"</span><span class="o">);</span> 
 <span class="n">oi</span><span class="o">.</span><span class="na">setRegistryName</span><span class="o">(</span><span class="s">"http://www.color.org"</span><span class="o">);</span> 
 <span class="n">cat</span><span class="o">.</span><span class="na">addOutputIntent</span><span class="o">(</span><span class="n">oi</span><span class="o">);</span>
-</code></pre></div>
+</code></pre>
+</div>
+
 <h2 id="complete-example">Complete example</h2>
 
 <p>The complete example can be found in pdfbox-example. The source file is</p>
-<div class="highlight"><pre><code class="language-" data-lang="">src/main/java/org/apache/pdfbox/examples/pdfa/CreatePDFA.java
-</code></pre></div>
+
+<div class="highlighter-rouge"><pre class="highlight"><code>src/main/java/org/apache/pdfbox/examples/pdfa/CreatePDFA.java
+</code></pre>
+</div>
+
+
             </div>
         </div>
     </div>

http://git-wip-us.apache.org/repos/asf/pdfbox-docs/blob/799b1d78/content/1.8/cookbook/pdfavalidation.html
----------------------------------------------------------------------
diff --git a/content/1.8/cookbook/pdfavalidation.html b/content/1.8/cookbook/pdfavalidation.html
index 43026e6..d27adbe 100644
--- a/content/1.8/cookbook/pdfavalidation.html
+++ b/content/1.8/cookbook/pdfavalidation.html
@@ -130,13 +130,14 @@
                 </ul>
             </div>
             <div class="col-xs-12 col-sm-9">
-                <h1 id="pdf-a-validation">PDF/A Validation</h1>
+                <h1 id="pdfa-validation">PDF/A Validation</h1>
 
 <p>The Apache Preflight library is a Java tool that implements a parser compliant with the ISO-19005 specification (aka PDF/A-1).
 Check Compliance with PDF/A-1b</p>
 
 <p>This small sample shows how to check the compliance of a file with the PDF/A-1b specification.</p>
-<div class="highlight"><pre><code class="language-java" data-lang="java"><span class="n">ValidationResult</span> <span class="n">result</span> <span class="o">=</span> <span class="kc">null</span><span class="o">;</span>
+
+<div class="highlighter-rouge"><pre class="highlight"><code><span class="n">ValidationResult</span> <span class="n">result</span> <span class="o">=</span> <span class="kc">null</span><span class="o">;</span>
 
 <span class="n">PreflightParser</span> <span class="n">parser</span> <span class="o">=</span> <span class="k">new</span> <span class="n">PreflightParser</span><span class="o">(</span><span class="n">args</span><span class="o">[</span><span class="mi">0</span><span class="o">]);</span>
 <span class="k">try</span>
@@ -183,57 +184,62 @@ Check Compliance with PDF/A-1b</p>
         <span class="n">System</span><span class="o">.</span><span class="na">out</span><span class="o">.</span><span class="na">println</span><span class="o">(</span><span class="n">error</span><span class="o">.</span><span class="na">getErrorCode</span><span class="o">()</span> <span class="o">+</span> <span class="s">" : "</span> <span class="o">+</span> <span class="n">error</span><span class="o">.</span><span class="na">getDetails</span><span class="o">());</span>
     <span class="o">}</span>
 <span class="o">}</span>
-</code></pre></div>
+</code></pre>
+</div>
+
 <h2 id="categories-of-validation-error">Categories of Validation Error</h2>
 
 <p>If a validation fails, the ValidationResult object contains all causes of the failure.
 In order to help in the failure understanding, all error codes have the following form X[.Y[.Z]] where :</p>
 
 <ul>
-<li>&#39;X&#39; is the category (ex : Font validation error...)</li>
-<li>&#39;Y&#39; represent a subsection of the category (ex : &quot;Font with Glyph error&quot;)</li>
-<li>&#39;Z&#39; represent the cause of the error (ex : &quot;Font with a missing Glyph&quot;)</li>
+  <li>\u2018X\u2019 is the category (ex : Font validation error\u2026)</li>
+  <li>\u2018Y\u2019 represent a subsection of the category (ex : \u201cFont with Glyph error\u201d)</li>
+  <li>\u2018Z\u2019 represent the cause of the error (ex : \u201cFont with a missing Glyph\u201d)</li>
 </ul>
 
-<p>Category (&#39;Y&#39;) and cause (&#39;Z&#39;) may be missing according to the difficulty to identify the error detail.</p>
+<p>Category (\u2018Y\u2019) and cause (\u2018Z\u2019) may be missing according to the difficulty to identify the error detail.</p>
 
-<p>Here after, you can find all Categories (for detailed cause, see constants in the <code>PreflightConstants</code> interface) :</p>
+<p>Here after, you can find all Categories (for detailed cause, see constants in the <code class="highlighter-rouge">PreflightConstants</code> interface) :</p>
 
-<table><thead>
-<tr>
-<th>Category</th>
-<th>Description</th>
-</tr>
-</thead><tbody>
-<tr>
-<td>1[.y[.z]]</td>
-<td>Syntax Error</td>
-</tr>
-<tr>
-<td>2[.y[.z]]</td>
-<td>Graphic Error</td>
-</tr>
-<tr>
-<td>3[.y[.z]]</td>
-<td>Font Error</td>
-</tr>
-<tr>
-<td>4[.y[.z]]</td>
-<td>Transparency Error</td>
-</tr>
-<tr>
-<td>5[.y[.z]]</td>
-<td>Annotation Error</td>
-</tr>
-<tr>
-<td>6[.y[.z]]</td>
-<td>Action Error</td>
-</tr>
-<tr>
-<td>7[.y[.z]]</td>
-<td>Metadata Error</td>
-</tr>
-</tbody></table>
+<table>
+  <thead>
+    <tr>
+      <th>Category</th>
+      <th>Description</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td>1[.y[.z]]</td>
+      <td>Syntax Error</td>
+    </tr>
+    <tr>
+      <td>2[.y[.z]]</td>
+      <td>Graphic Error</td>
+    </tr>
+    <tr>
+      <td>3[.y[.z]]</td>
+      <td>Font Error</td>
+    </tr>
+    <tr>
+      <td>4[.y[.z]]</td>
+      <td>Transparency Error</td>
+    </tr>
+    <tr>
+      <td>5[.y[.z]]</td>
+      <td>Annotation Error</td>
+    </tr>
+    <tr>
+      <td>6[.y[.z]]</td>
+      <td>Action Error</td>
+    </tr>
+    <tr>
+      <td>7[.y[.z]]</td>
+      <td>Metadata Error</td>
+    </tr>
+  </tbody>
+</table>
 
             </div>
         </div>

http://git-wip-us.apache.org/repos/asf/pdfbox-docs/blob/799b1d78/content/1.8/cookbook/rendering.html
----------------------------------------------------------------------
diff --git a/content/1.8/cookbook/rendering.html b/content/1.8/cookbook/rendering.html
index e48b261..6c7cbae 100644
--- a/content/1.8/cookbook/rendering.html
+++ b/content/1.8/cookbook/rendering.html
@@ -135,7 +135,8 @@
 <h2 id="convert-a-document-to-images">Convert a document to images</h2>
 
 <p>This small sample shows how to render (convert to images) a PDF document using PDFBox.</p>
-<div class="highlight"><pre><code class="language-" data-lang="">:::java
+
+<div class="highlighter-rouge"><pre class="highlight"><code>:::java
     String filename = "YOURFILENAMEHERE.pdf";
 
     // open the document
@@ -147,7 +148,7 @@
     {
         // RGB image with 300 dpi
         BufferedImage bim = pages.get(p).convertToImage(BufferedImage.TYPE_INT_RGB, 300);
-
+        
         // save as PNG with default metadata
         b = ImageIO.write(bim, "png", new File("rgbpage" + (p+1) + ".png"));
         if (!b)
@@ -157,7 +158,7 @@
 
         // B/W image with 300 dpi
         bim = pages.get(p).convertToImage(BufferedImage.TYPE_BYTE_BINARY, 300);
-
+        
         // save as TIF with dpi in the metadata
         // PDFBox will choose the best compression for you - here: CCITT G4
         // you need to add jai_imageio.jar to your classpath for this to work
@@ -169,7 +170,9 @@
     }
 
     doc.close();
-</code></pre></div>
+</code></pre>
+</div>
+
             </div>
         </div>
     </div>

http://git-wip-us.apache.org/repos/asf/pdfbox-docs/blob/799b1d78/content/1.8/cookbook/textextraction.html
----------------------------------------------------------------------
diff --git a/content/1.8/cookbook/textextraction.html b/content/1.8/cookbook/textextraction.html
index 6446167..c2ab7e5 100644
--- a/content/1.8/cookbook/textextraction.html
+++ b/content/1.8/cookbook/textextraction.html
@@ -134,9 +134,9 @@
 
 <h2 id="extracting-text">Extracting Text</h2>
 
-<p>See class:org.apache.pdfbox.util.PDFTextStripper<br>
-See class:org.apache.pdfbox.searchengine.lucene.LucenePDFDocument<br>
-See command line app:ExtractText  </p>
+<p>See class:org.apache.pdfbox.util.PDFTextStripper<br />
+See class:org.apache.pdfbox.searchengine.lucene.LucenePDFDocument<br />
+See command line app:ExtractText</p>
 
 <p>One of the main features of PDFBox is its ability to quickly and accurately extract text 
 from a variety of PDF documents. This functionality is encapsulated in the 
@@ -148,8 +148,11 @@ org.apache.pdfbox.ExtractText.</p>
 <p>Lucene is an open source text search library from the Apache Jakarta Project. In order for
 Lucene to be able to index a PDF document it must first be converted to text. PDFBox provides 
 a simple approach for adding PDF documents into a Lucene index.</p>
-<div class="highlight"><pre><code class="language-java" data-lang="java"><span class="n">Document</span> <span class="n">luceneDocument</span> <span class="o">=</span> <span class="n">LucenePDFDocument</span><span class="o">.</span><span class="na">getDocument</span><span class="o">(</span> <span class="o">...</span> <span class="o">);</span>
-</code></pre></div>
+
+<div class="highlighter-rouge"><pre class="highlight"><code><span class="n">Document</span> <span class="n">luceneDocument</span> <span class="o">=</span> <span class="n">LucenePDFDocument</span><span class="o">.</span><span class="na">getDocument</span><span class="o">(</span> <span class="o">...</span> <span class="o">);</span>
+</code></pre>
+</div>
+
 <p>Now that you hava a Lucene Document object, you can add it to the Lucene index just like 
 you would if it had been created from a text or HTML file. The LucenePDFDocument automatically 
 extracts a variety of metadata fields from the PDF to be added to the index, the javadoc 
@@ -170,11 +173,14 @@ these requirements.</p>
 process. The simplest is to specify the range of pages that you want to be extracted. 
 For example, to only extract text from the second and third pages of the PDF document 
 you could do this:</p>
-<div class="highlight"><pre><code class="language-java" data-lang="java"><span class="n">PDFTextStripper</span> <span class="n">stripper</span> <span class="o">=</span> <span class="k">new</span> <span class="n">PDFTextStripper</span><span class="o">();</span>
+
+<div class="highlighter-rouge"><pre class="highlight"><code><span class="n">PDFTextStripper</span> <span class="n">stripper</span> <span class="o">=</span> <span class="k">new</span> <span class="n">PDFTextStripper</span><span class="o">();</span>
 <span class="n">stripper</span><span class="o">.</span><span class="na">setStartPage</span><span class="o">(</span> <span class="mi">2</span> <span class="o">);</span>
 <span class="n">stripper</span><span class="o">.</span><span class="na">setEndPage</span><span class="o">(</span> <span class="mi">3</span> <span class="o">);</span>
 <span class="n">stripper</span><span class="o">.</span><span class="na">writeText</span><span class="o">(</span> <span class="o">...</span> <span class="o">);</span>
-</code></pre></div>
+</code></pre>
+</div>
+
 <p>NOTE: The startPage and endPage properties of PDFTextStripper are 1 based and inclusive.</p>
 
 <p>If you wanted to start on page 2 and extract to the end of the document then you would just
@@ -184,62 +190,65 @@ set the startPage property. By default all pages in the pdf document are extract
 If you are not familiar with how to use bookmarks in PDFBox then you should review the 
 Bookmarks page. Similar to the startPage/endPage properties, PDFTextStripper also has 
 startBookmark/endBookmark properties. There are some caveats to be aware of when using this
-feature of the PDFTextStripper. Not all bookmarks point to a page in the current PDF document. </p>
+feature of the PDFTextStripper. Not all bookmarks point to a page in the current PDF document.</p>
 
 <p>The possible states of a bookmark are:</p>
 
 <ul>
-<li>null - The property was not set, this is the default.</li>
-<li>Points to page in the PDF - The property was set and points to a valid page in the PDF</li>
-<li>Bookmark does not point to anything - The property was set but the bookmark does not point to any page</li>
-<li>Bookmark points to external action - The property was set, but it points to a page in a different PDF or performs an action when activated</li>
+  <li>null - The property was not set, this is the default.</li>
+  <li>Points to page in the PDF - The property was set and points to a valid page in the PDF</li>
+  <li>Bookmark does not point to anything - The property was set but the bookmark does not point to any page</li>
+  <li>Bookmark points to external action - The property was set, but it points to a page in a different PDF or performs an action when activated</li>
 </ul>
 
 <p>The table below will describe how PDFBox behaves in the various scenarios:</p>
 
-<table><thead>
-<tr>
-<th>Start Bookmark</th>
-<th>End Bookmark</th>
-<th>Result</th>
-</tr>
-</thead><tbody>
-<tr>
-<td>null</td>
-<td>null</td>
-<td>This is the default, the properties have no effect on the text extraction.</td>
-</tr>
-<tr>
-<td>Points to a page in the PDF</td>
-<td>null</td>
-<td>Text extraction will begin on the page that this bookmark points to and go until the end of the document.</td>
-</tr>
-<tr>
-<td>null</td>
-<td>Points to a page in the PDF</td>
-<td>Text extraction will begin on the first page and stop at the end of the page that this bookmark points to.</td>
-</tr>
-<tr>
-<td>Bookmark does not point to anything</td>
-<td>null</td>
-<td>Because the PDFTextStripper cannot determine a start page based on the bookmark, it will start on the first page and go until the end of the document.</td>
-</tr>
-<tr>
-<td>null</td>
-<td>Bookmark does not point to anything</td>
-<td>Because the PDFTextStripper cannot determine a end page based on the bookmark, it will start on the first page and go until the end of the document.</td>
-</tr>
-<tr>
-<td>Bookmark does not point to anything</td>
-<td>Bookmark does not point to anything</td>
-<td>This is a special case! If the startBookmark and endBookmark are exactly the same then no text will be extracted. If they are different then it is not possible for the PDFTextStripper to determine that pages so it will include the entire document.</td>
-</tr>
-<tr>
-<td>Bookmark points to external action</td>
-<td>Bookmark points to external action</td>
-<td>If either the startBookmark or the endBookmark refer to an external page or execute an action then an OutlineNotLocalException will be thrown to indicate to the user that the bookmark is not valid.</td>
-</tr>
-</tbody></table>
+<table>
+  <thead>
+    <tr>
+      <th>Start Bookmark</th>
+      <th>End Bookmark</th>
+      <th>Result</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td>null</td>
+      <td>null</td>
+      <td>This is the default, the properties have no effect on the text extraction.</td>
+    </tr>
+    <tr>
+      <td>Points to a page in the PDF</td>
+      <td>null</td>
+      <td>Text extraction will begin on the page that this bookmark points to and go until the end of the document.</td>
+    </tr>
+    <tr>
+      <td>null</td>
+      <td>Points to a page in the PDF</td>
+      <td>Text extraction will begin on the first page and stop at the end of the page that this bookmark points to.</td>
+    </tr>
+    <tr>
+      <td>Bookmark does not point to anything</td>
+      <td>null</td>
+      <td>Because the PDFTextStripper cannot determine a start page based on the bookmark, it will start on the first page and go until the end of the document.</td>
+    </tr>
+    <tr>
+      <td>null</td>
+      <td>Bookmark does not point to anything</td>
+      <td>Because the PDFTextStripper cannot determine a end page based on the bookmark, it will start on the first page and go until the end of the document.</td>
+    </tr>
+    <tr>
+      <td>Bookmark does not point to anything</td>
+      <td>Bookmark does not point to anything</td>
+      <td>This is a special case! If the startBookmark and endBookmark are exactly the same then no text will be extracted. If they are different then it is not possible for the PDFTextStripper to determine that pages so it will include the entire document.</td>
+    </tr>
+    <tr>
+      <td>Bookmark points to external action</td>
+      <td>Bookmark points to external action</td>
+      <td>If either the startBookmark or the endBookmark refer to an external page or execute an action then an OutlineNotLocalException will be thrown to indicate to the user that the bookmark is not valid.</td>
+    </tr>
+  </tbody>
+</table>
 
 <p>NOTE: PDFTextStripper will check both the startPage/endPage and the startBookmark/endBookmark to determine if text should be extracted from the current page.</p>
 
@@ -247,7 +256,7 @@ feature of the PDFTextStripper. Not all bookmarks point to a page in the current
 
 <p>Some PDF files need to map between glyph names and Unicode values during text extraction. 
 PDFBox comes with an Adobe Glyph List, but you may encounter files with glyph names that 
-are not in that map. To use your own glyphlist file, supply the file name to the <code>glyphlist_ext</code> JVM property.</p>
+are not in that map. To use your own glyphlist file, supply the file name to the <code class="highlighter-rouge">glyphlist_ext</code> JVM property.</p>
 
 <h3 id="right-to-left-text">Right to Left Text</h3>
 

http://git-wip-us.apache.org/repos/asf/pdfbox-docs/blob/799b1d78/content/1.8/cookbook/workingwithattachments.html
----------------------------------------------------------------------
diff --git a/content/1.8/cookbook/workingwithattachments.html b/content/1.8/cookbook/workingwithattachments.html
index 6d6f3fd..82982d4 100644
--- a/content/1.8/cookbook/workingwithattachments.html
+++ b/content/1.8/cookbook/workingwithattachments.html
@@ -134,28 +134,29 @@
 
 <h2 id="the-pdf-file-specification">The PDF File Specification</h2>
 
-<p>See package:org.apache.pdfbox.pdmodel.common.filespecification<br>
-See example:EmbeddedFiles  </p>
+<p>See package:org.apache.pdfbox.pdmodel.common.filespecification<br />
+See example:EmbeddedFiles</p>
 
 <p>A PDF can contain references to external files via the file system or a URL to a remote 
 location. It is also possible to embed a binary file into a PDF document.</p>
 
-<p>There are two classes that can be used when referencing a file. <code>PDSimpleFileSpecification</code>
-is a simple string reference to a file(e.g. &quot;./movies/BigMovie.avi&quot;). The simple file 
-specification does not allow for any parameters to be set. </p>
+<p>There are two classes that can be used when referencing a file. <code class="highlighter-rouge">PDSimpleFileSpecification</code>
+is a simple string reference to a file(e.g. \u201c./movies/BigMovie.avi\u201d). The simple file 
+specification does not allow for any parameters to be set.</p>
 
-<p>The <code>PDComplexFileSpecification</code> is more feature rich and allows for advanced settings on 
+<p>The <code class="highlighter-rouge">PDComplexFileSpecification</code> is more feature rich and allows for advanced settings on 
 the file reference.</p>
 
 <p>It is also possible to embed a file directly into a PDF. Instead of setting the file 
-attribute of the <code>PDComplexFileSpecification</code>, the <code>EmbeddedFile</code> attribute can be used instead.</p>
+attribute of the <code class="highlighter-rouge">PDComplexFileSpecification</code>, the <code class="highlighter-rouge">EmbeddedFile</code> attribute can be used instead.</p>
 
 <h2 id="adding-a-file-attachment">Adding a File Attachment</h2>
 
 <p>PDF documents can contain file attachments that are accessed from the Document-&gt;File Attachments 
 menu. PDFBox allows attachments to be added to and extracted from PDF documents. 
 Attachments are part of the named tree that is attached to the document catalog.</p>
-<div class="highlight"><pre><code class="language-java" data-lang="java"><span class="n">PDEmbeddedFilesNameTreeNode</span> <span class="n">efTree</span> <span class="o">=</span> <span class="k">new</span> <span class="n">PDEmbeddedFilesNameTreeNode</span><span class="o">();</span>
+
+<div class="highlighter-rouge"><pre class="highlight"><code><span class="n">PDEmbeddedFilesNameTreeNode</span> <span class="n">efTree</span> <span class="o">=</span> <span class="k">new</span> <span class="n">PDEmbeddedFilesNameTreeNode</span><span class="o">();</span>
 
 <span class="c1">//first create the file specification, which holds the embedded file</span>
 <span class="n">PDComplexFileSpecification</span> <span class="n">fs</span> <span class="o">=</span> <span class="k">new</span> <span class="n">PDComplexFileSpecification</span><span class="o">();</span>
@@ -176,7 +177,9 @@ Attachments are part of the named tree that is attached to the document catalog.
 <span class="n">PDDocumentNameDictionary</span> <span class="n">names</span> <span class="o">=</span> <span class="k">new</span> <span class="n">PDDocumentNameDictionary</span><span class="o">(</span> <span class="n">doc</span><span class="o">.</span><span class="na">getDocumentCatalog</span><span class="o">()</span> <span class="o">);</span>
 <span class="n">names</span><span class="o">.</span><span class="na">setEmbeddedFiles</span><span class="o">(</span> <span class="n">efTree</span> <span class="o">);</span>
 <span class="n">doc</span><span class="o">.</span><span class="na">getDocumentCatalog</span><span class="o">().</span><span class="na">setNames</span><span class="o">(</span> <span class="n">names</span> <span class="o">);</span>
-</code></pre></div>
+</code></pre>
+</div>
+
             </div>
         </div>
     </div>

http://git-wip-us.apache.org/repos/asf/pdfbox-docs/blob/799b1d78/content/1.8/cookbook/workingwithfonts.html
----------------------------------------------------------------------
diff --git a/content/1.8/cookbook/workingwithfonts.html b/content/1.8/cookbook/workingwithfonts.html
index 5508494..eb55790 100644
--- a/content/1.8/cookbook/workingwithfonts.html
+++ b/content/1.8/cookbook/workingwithfonts.html
@@ -136,74 +136,78 @@
 
 <p>The PDF specification states that a standard set of 14 fonts will always be available when consuming PDF documents. In PDFBox these are defined as constants in the PDType1Font class.</p>
 
-<table><thead>
-<tr>
-<th>Standard Font</th>
-<th>Description</th>
-</tr>
-</thead><tbody>
-<tr>
-<td>PDType1Font.TIMES_ROMAN</td>
-<td>Times regular</td>
-</tr>
-<tr>
-<td>PDType1Font.TIMES_BOLD</td>
-<td>Times bold</td>
-</tr>
-<tr>
-<td>PDType1Font.TIMES_ITALIC</td>
-<td>Times italic</td>
-</tr>
-<tr>
-<td>PDType1Font.TIMES_BOLD_ITALIC</td>
-<td>Times bold italic</td>
-</tr>
-<tr>
-<td>PDType1Font.HELVETICA</td>
-<td>Helvetica regular</td>
-</tr>
-<tr>
-<td>PDType1Font.HELVETICA_BOLD</td>
-<td>Helvetica bold</td>
-</tr>
-<tr>
-<td>PDType1Font.HELVETICA_OBLIQUE</td>
-<td>Helvetica italic</td>
-</tr>
-<tr>
-<td>PDType1Font.HELVETICA_BOLD_OBLIQUE</td>
-<td>Helvetica bold italic</td>
-</tr>
-<tr>
-<td>PDType1Font.COURIER</td>
-<td>Courier</td>
-</tr>
-<tr>
-<td>PDType1Font.COURIER_BOLD</td>
-<td>Courier bold</td>
-</tr>
-<tr>
-<td>PDType1Font.COURIER_OBLIQUE</td>
-<td>Courier italic</td>
-</tr>
-<tr>
-<td>PDType1Font.COURIER_BOLD_OBLIQUE</td>
-<td>Courier bold italic</td>
-</tr>
-<tr>
-<td>PDType1Font.SYMBOL</td>
-<td>Symbol Set</td>
-</tr>
-<tr>
-<td>PDType1Font.ZAPF_DINGBATS</td>
-<td>Dingbat Typeface</td>
-</tr>
-</tbody></table>
+<table>
+  <thead>
+    <tr>
+      <th>Standard Font</th>
+      <th>Description</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td>PDType1Font.TIMES_ROMAN</td>
+      <td>Times regular</td>
+    </tr>
+    <tr>
+      <td>PDType1Font.TIMES_BOLD</td>
+      <td>Times bold</td>
+    </tr>
+    <tr>
+      <td>PDType1Font.TIMES_ITALIC</td>
+      <td>Times italic</td>
+    </tr>
+    <tr>
+      <td>PDType1Font.TIMES_BOLD_ITALIC</td>
+      <td>Times bold italic</td>
+    </tr>
+    <tr>
+      <td>PDType1Font.HELVETICA</td>
+      <td>Helvetica regular</td>
+    </tr>
+    <tr>
+      <td>PDType1Font.HELVETICA_BOLD</td>
+      <td>Helvetica bold</td>
+    </tr>
+    <tr>
+      <td>PDType1Font.HELVETICA_OBLIQUE</td>
+      <td>Helvetica italic</td>
+    </tr>
+    <tr>
+      <td>PDType1Font.HELVETICA_BOLD_OBLIQUE</td>
+      <td>Helvetica bold italic</td>
+    </tr>
+    <tr>
+      <td>PDType1Font.COURIER</td>
+      <td>Courier</td>
+    </tr>
+    <tr>
+      <td>PDType1Font.COURIER_BOLD</td>
+      <td>Courier bold</td>
+    </tr>
+    <tr>
+      <td>PDType1Font.COURIER_OBLIQUE</td>
+      <td>Courier italic</td>
+    </tr>
+    <tr>
+      <td>PDType1Font.COURIER_BOLD_OBLIQUE</td>
+      <td>Courier bold italic</td>
+    </tr>
+    <tr>
+      <td>PDType1Font.SYMBOL</td>
+      <td>Symbol Set</td>
+    </tr>
+    <tr>
+      <td>PDType1Font.ZAPF_DINGBATS</td>
+      <td>Dingbat Typeface</td>
+    </tr>
+  </tbody>
+</table>
 
 <h2 id="hello-world-using-a-pdf-base-font">Hello World using a PDF base font</h2>
 
-<p>This small sample shows how to create a new document and print the text &quot;Hello World&quot; using one of the PDF base fonts.</p>
-<div class="highlight"><pre><code class="language-java" data-lang="java"><span class="c1">// Create a document and add a page to it</span>
+<p>This small sample shows how to create a new document and print the text \u201cHello World\u201d using one of the PDF base fonts.</p>
+
+<div class="highlighter-rouge"><pre class="highlight"><code><span class="c1">// Create a document and add a page to it</span>
 <span class="n">PDDocument</span> <span class="n">document</span> <span class="o">=</span> <span class="k">new</span> <span class="n">PDDocument</span><span class="o">();</span>
 <span class="n">PDPage</span> <span class="n">page</span> <span class="o">=</span> <span class="k">new</span> <span class="n">PDPage</span><span class="o">();</span>
 <span class="n">document</span><span class="o">.</span><span class="na">addPage</span><span class="o">(</span> <span class="n">page</span> <span class="o">);</span>
@@ -227,11 +231,14 @@
 <span class="c1">// Save the results and ensure that the document is properly closed:</span>
 <span class="n">document</span><span class="o">.</span><span class="na">save</span><span class="o">(</span> <span class="s">"Hello World.pdf"</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>
+</code></pre>
+</div>
+
 <h2 id="hello-world-using-a-truetype-font">Hello World using a TrueType font</h2>
 
-<p>This small sample shows how to create a new document and print the text &quot;Hello World&quot; using a TrueType font.</p>
-<div class="highlight"><pre><code class="language-java" data-lang="java"><span class="c1">// Create a document and add a page to it</span>
+<p>This small sample shows how to create a new document and print the text \u201cHello World\u201d using a TrueType font.</p>
+
+<div class="highlighter-rouge"><pre class="highlight"><code><span class="c1">// Create a document and add a page to it</span>
 <span class="n">PDDocument</span> <span class="n">document</span> <span class="o">=</span> <span class="k">new</span> <span class="n">PDDocument</span><span class="o">();</span>
 <span class="n">PDPage</span> <span class="n">page</span> <span class="o">=</span> <span class="k">new</span> <span class="n">PDPage</span><span class="o">();</span>
 <span class="n">document</span><span class="o">.</span><span class="na">addPage</span><span class="o">(</span> <span class="n">page</span> <span class="o">);</span>
@@ -255,19 +262,22 @@
 <span class="c1">// Save the results and ensure that the document is properly closed:</span>
 <span class="n">document</span><span class="o">.</span><span class="na">save</span><span class="o">(</span> <span class="s">"Hello World.pdf"</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>
+</code></pre>
+</div>
+
 <p>While it is recommended to embed all fonts for greatest portability not all PDF producer 
 applications will do this. When displaying a PDF it is necessary to find an external font to use. 
 PDFBox will look for a mapping file to use when substituting fonts.</p>
 
 <p>PDFBox will load Resources/PDFBox_External_Fonts.properties off of the classpath to map font
 names to TTF font files. The UNKNOWN_FONT property in that file will tell PDFBox which font to 
-use when no mapping exists. </p>
+use when no mapping exists.</p>
 
 <h2 id="hello-world-using-a-postscript-type1-font">Hello World using a Postscript Type1 font</h2>
 
-<p>This small sample shows how to create a new document and print the text &quot;Hello World&quot; using a Postscript Type1 font.</p>
-<div class="highlight"><pre><code class="language-java" data-lang="java"><span class="c1">// Create a document and add a page to it</span>
+<p>This small sample shows how to create a new document and print the text \u201cHello World\u201d using a Postscript Type1 font.</p>
+
+<div class="highlighter-rouge"><pre class="highlight"><code><span class="c1">// Create a document and add a page to it</span>
 <span class="n">PDDocument</span> <span class="n">document</span> <span class="o">=</span> <span class="k">new</span> <span class="n">PDDocument</span><span class="o">();</span>
 <span class="n">PDPage</span> <span class="n">page</span> <span class="o">=</span> <span class="k">new</span> <span class="n">PDPage</span><span class="o">();</span>
 <span class="n">document</span><span class="o">.</span><span class="na">addPage</span><span class="o">(</span> <span class="n">page</span> <span class="o">);</span>
@@ -291,7 +301,9 @@ use when no mapping exists. </p>
 <span class="c1">// Save the results and ensure that the document is properly closed:</span>
 <span class="n">document</span><span class="o">.</span><span class="na">save</span><span class="o">(</span> <span class="s">"Hello World.pdf"</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>
+</code></pre>
+</div>
+
             </div>
         </div>
     </div>


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

Posted by ms...@apache.org.
http://git-wip-us.apache.org/repos/asf/pdfbox-docs/blob/799b1d78/content/1.8/cookbook/workingwithmetadata.html
----------------------------------------------------------------------
diff --git a/content/1.8/cookbook/workingwithmetadata.html b/content/1.8/cookbook/workingwithmetadata.html
index e188065..720b8b8 100644
--- a/content/1.8/cookbook/workingwithmetadata.html
+++ b/content/1.8/cookbook/workingwithmetadata.html
@@ -135,7 +135,7 @@
 <h2 id="introduction">Introduction</h2>
 
 <p>PDF documents can contain information describing the document itself or certain objects 
-within the document such as the author of the document or it&#39;s creation date. 
+within the document such as the author of the document or it\u2019s creation date. 
 Basic information can be set and retrieved using the PDDocumentInformation object.</p>
 
 <p>In addition to that more metadata can be retrieved using the XML metadata as decribed below.
@@ -143,7 +143,8 @@ Getting basic Metadata</p>
 
 <p>To set or retrieve basic information about the document the PDDocumentInformation object 
 provides a high level API to that information:</p>
-<div class="highlight"><pre><code class="language-java" data-lang="java"><span class="n">PDDocumentInformation</span> <span class="n">info</span> <span class="o">=</span> <span class="n">document</span><span class="o">.</span><span class="na">getDocumentInformation</span><span class="o">();</span>
+
+<div class="highlighter-rouge"><pre class="highlight"><code><span class="n">PDDocumentInformation</span> <span class="n">info</span> <span class="o">=</span> <span class="n">document</span><span class="o">.</span><span class="na">getDocumentInformation</span><span class="o">();</span>
 <span class="n">System</span><span class="o">.</span><span class="na">out</span><span class="o">.</span><span class="na">println</span><span class="o">(</span> <span class="s">"Page Count="</span> <span class="o">+</span> <span class="n">document</span><span class="o">.</span><span class="na">getNumberOfPages</span><span class="o">()</span> <span class="o">);</span>
 <span class="n">System</span><span class="o">.</span><span class="na">out</span><span class="o">.</span><span class="na">println</span><span class="o">(</span> <span class="s">"Title="</span> <span class="o">+</span> <span class="n">info</span><span class="o">.</span><span class="na">getTitle</span><span class="o">()</span> <span class="o">);</span>
 <span class="n">System</span><span class="o">.</span><span class="na">out</span><span class="o">.</span><span class="na">println</span><span class="o">(</span> <span class="s">"Author="</span> <span class="o">+</span> <span class="n">info</span><span class="o">.</span><span class="na">getAuthor</span><span class="o">()</span> <span class="o">);</span>
@@ -154,26 +155,32 @@ provides a high level API to that information:</p>
 <span class="n">System</span><span class="o">.</span><span class="na">out</span><span class="o">.</span><span class="na">println</span><span class="o">(</span> <span class="s">"Creation Date="</span> <span class="o">+</span> <span class="n">info</span><span class="o">.</span><span class="na">getCreationDate</span><span class="o">()</span> <span class="o">);</span>
 <span class="n">System</span><span class="o">.</span><span class="na">out</span><span class="o">.</span><span class="na">println</span><span class="o">(</span> <span class="s">"Modification Date="</span> <span class="o">+</span> <span class="n">info</span><span class="o">.</span><span class="na">getModificationDate</span><span class="o">());</span>
 <span class="n">System</span><span class="o">.</span><span class="na">out</span><span class="o">.</span><span class="na">println</span><span class="o">(</span> <span class="s">"Trapped="</span> <span class="o">+</span> <span class="n">info</span><span class="o">.</span><span class="na">getTrapped</span><span class="o">()</span> <span class="o">);</span>      
-</code></pre></div>
+</code></pre>
+</div>
+
 <h2 id="accessing-pdf-metadata">Accessing PDF Metadata</h2>
 
-<p>See class:org.apache.pdfbox.pdmodel.common.PDMetadata<br>
-See example:AddMetadataFromDocInfo<br>
-See Adobe Documentation:XMP Specification  </p>
+<p>See class:org.apache.pdfbox.pdmodel.common.PDMetadata<br />
+See example:AddMetadataFromDocInfo<br />
+See Adobe Documentation:XMP Specification</p>
 
 <p>PDF documents can have XML metadata associated with certain objects within a PDF document.
 For example, the following PD Model objects have the ability to contain metadata:</p>
-<div class="highlight"><pre><code class="language-" data-lang="">PDDocumentCatalog
+
+<div class="highlighter-rouge"><pre class="highlight"><code>PDDocumentCatalog
 PDPage
 PDXObject
 PDICCBased
 PDStream
-</code></pre></div>
+</code></pre>
+</div>
+
 <p>The metadata that is stored in PDF objects conforms to the XMP specification, it is 
 recommended that you review that specification. Currently there is no high level API for 
 managing the XML metadata, PDFBox uses standard java InputStream/OutputStream to retrieve 
 or set the XML metadata.</p>
-<div class="highlight"><pre><code class="language-java" data-lang="java"><span class="n">PDDocument</span> <span class="n">doc</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="o">...</span> <span class="o">);</span>
+
+<div class="highlighter-rouge"><pre class="highlight"><code><span class="n">PDDocument</span> <span class="n">doc</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="o">...</span> <span class="o">);</span>
 <span class="n">PDDocumentCatalog</span> <span class="n">catalog</span> <span class="o">=</span> <span class="n">doc</span><span class="o">.</span><span class="na">getDocumentCatalog</span><span class="o">();</span>
 <span class="n">PDMetadata</span> <span class="n">metadata</span> <span class="o">=</span> <span class="n">catalog</span><span class="o">.</span><span class="na">getMetadata</span><span class="o">();</span>
 
@@ -184,7 +191,9 @@ or set the XML metadata.</p>
 <span class="n">InputStream</span> <span class="n">newXMPData</span> <span class="o">=</span> <span class="o">...;</span>
 <span class="n">PDMetadata</span> <span class="n">newMetadata</span> <span class="o">=</span> <span class="k">new</span> <span class="n">PDMetadata</span><span class="o">(</span><span class="n">doc</span><span class="o">,</span> <span class="n">newXMLData</span><span class="o">,</span> <span class="kc">false</span> <span class="o">);</span>
 <span class="n">catalog</span><span class="o">.</span><span class="na">setMetadata</span><span class="o">(</span> <span class="n">newMetadata</span> <span class="o">);</span>
-</code></pre></div>
+</code></pre>
+</div>
+
             </div>
         </div>
     </div>

http://git-wip-us.apache.org/repos/asf/pdfbox-docs/blob/799b1d78/content/1.8/dependencies.html
----------------------------------------------------------------------
diff --git a/content/1.8/dependencies.html b/content/1.8/dependencies.html
index d4de865..4e6f649 100644
--- a/content/1.8/dependencies.html
+++ b/content/1.8/dependencies.html
@@ -138,38 +138,39 @@
 
 <p class="alert alert-info">These components are needed during runtime, development and testing dependent on the details below.</p>
 
-<p>The three PDFBox components are named <code>pdfbox</code>, <code>fontbox</code> and <code>jempbox</code>. The Maven groupId of all PDFBox components is org.apache.pdfbox.</p>
+<p>The three PDFBox components are named <code class="highlighter-rouge">pdfbox</code>, <code class="highlighter-rouge">fontbox</code> and <code class="highlighter-rouge">jempbox</code>. The Maven groupId of all PDFBox components is org.apache.pdfbox.</p>
 
 <h3 id="minimum-requirement">Minimum Requirement</h3>
 
 <ul>
-<li>Java 1.5</li>
-<li><a href="http://commons.apache.org/logging/">commons-logging</a></li>
+  <li>Java 1.5</li>
+  <li><a href="http://commons.apache.org/logging/">commons-logging</a></li>
 </ul>
 
 <p>The main PDFBox component, pdfbox, has a hard dependency on the <a href="http://commons.apache.org/logging/">commons-logging</a> library.
-Commons Logging is a generic wrapper around different logging frameworks, so you&#39;ll either need to also use a logging library like <a href="http://logging.apache.org/log4j/">log4j</a>
+Commons Logging is a generic wrapper around different logging frameworks, so you\u2019ll either need to also use a logging library like <a href="http://logging.apache.org/log4j/">log4j</a>
 or let commons-logging fall back to the standard <a href="http://java.sun.com/j2se/1.4.2/docs/guide/util/logging/overview.html">java.util.logging API</a>
 included in the Java platform.</p>
 
 <p>For <strong>PDFBox Preflight only</strong> <a href="https://commons.apache.org/proper/commons-io/">commons-io 1.4</a> is needed.</p>
 
 <h3 id="font-handling">Font Handling</h3>
-
 <p>For font handling the fontbox component is needed.</p>
 
 <h3 id="xmp-metadata">XMP Metadata</h3>
-
 <p>To support XMP metadata the jembox component is needed.</p>
 
 <p>To add the pdfbox, fontbox, jempbox and commons-logging jars to your application, the easiest thing is to declare the Maven dependency shown below. This gives you the main
 pdfbox library directly and the other required jars as transitive dependencies.</p>
-<div class="highlight"><pre><code class="language-" data-lang="">&lt;dependency&gt;
+
+<div class="highlighter-rouge"><pre class="highlight"><code>&lt;dependency&gt;
   &lt;groupId&gt;org.apache.pdfbox&lt;/groupId&gt;
   &lt;artifactId&gt;pdfbox&lt;/artifactId&gt;
   &lt;version&gt;...&lt;/version&gt;
 &lt;/dependency&gt;
-</code></pre></div>
+</code></pre>
+</div>
+
 <p>Set the version field to the latest stable PDFBox version.</p>
 
 <h2 id="optional-dependencies">Optional dependencies</h2>
@@ -178,20 +179,20 @@ pdfbox library directly and the other required jars as transitive dependencies.<
 
 <h3 id="extented-image-format-support">Extented Image Format Support</h3>
 
-<p>To support JBIG2 and writing TIFF images additional libraries are needed. </p>
+<p>To support JBIG2 and writing TIFF images additional libraries are needed.</p>
 
 <p class="alert alert-warning">The image plugins described below are not part of the PDFBox distribution because of incompatible licensing terms. Please make sure to check if the licensing terms are compatible to your usage.</p>
 
 <p>For <strong>JBIG2</strong> support a Java ImageIO Plugin such as the <a href="https://github.com/levigo/jbig2-imageio">Levigo Plugin</a> or <a href="https://github.com/Borisvl/JBIG2-Image-Decoder">JBIG2-Image-Decoder
-</a> will be needed. </p>
+</a> will be needed.</p>
 
-<p>To write <strong>TIFF</strong> images a JAI ImageIO Core library will be needed. </p>
+<p>To write <strong>TIFF</strong> images a JAI ImageIO Core library will be needed.</p>
 
 <h4 id="pdf-encryption-and-signing">PDF Encryption and Signing</h4>
-
 <p>The most notable such optional feature is support for PDF encryption. Instead of implementing its own encryption algorithms, PDFBox uses libraries from the 
 <a href="http://www.bouncycastle.org/">Legion of the Bouncy Castle</a>. Both the bcprov and bcmail libraries are needed and can be included using the Maven dependencies shown below.</p>
-<div class="highlight"><pre><code class="language-" data-lang="">&lt;dependency&gt;
+
+<div class="highlighter-rouge"><pre class="highlight"><code>&lt;dependency&gt;
   &lt;groupId&gt;org.bouncycastle&lt;/groupId&gt;
   &lt;artifactId&gt;bcprov-jdk15&lt;/artifactId&gt;
   &lt;version&gt;1.44&lt;/version&gt;
@@ -201,30 +202,34 @@ pdfbox library directly and the other required jars as transitive dependencies.<
   &lt;artifactId&gt;bcmail-jdk15&lt;/artifactId&gt;
   &lt;version&gt;1.44&lt;/version&gt;
 &lt;/dependency&gt;
-</code></pre></div>
-<p><br/></p>
+</code></pre>
+</div>
 
-<h4 id="support-for-bidirectional-languages">Support for bidirectional languages</h4>
+<p><br /></p>
 
+<h4 id="support-for-bidirectional-languages">Support for bidirectional languages</h4>
 <p>Another important optional feature is support for bidirectional languages like Arabic. PDFBox uses the ICU4J library from the 
 <a href="http://site.icu-project.org/">International Components for Unicode</a> (ICU) project to support such languages in PDF documents. To add the ICU4J jar to your project, 
 use the following Maven dependency.</p>
-<div class="highlight"><pre><code class="language-" data-lang="">&lt;dependency&gt;
+
+<div class="highlighter-rouge"><pre class="highlight"><code>&lt;dependency&gt;
   &lt;groupId&gt;com.ibm.icu&lt;/groupId&gt;
   &lt;artifactId&gt;icu4j&lt;/artifactId&gt;
   &lt;version&gt;3.8&lt;/version&gt;
 &lt;/dependency&gt;
-</code></pre></div>
+</code></pre>
+</div>
+
 <p>PDFBox also contains extra support for use with the <a href="http://lucene.apache.org/">Lucene</a> and <a href="http://ant.apache.org/">Ant</a> projects. Since in these cases PDFBox is just an
 add-on feature to these projects, you should first set up your application to use Lucene or Ant and then add PDFBox support as described on this page.</p>
 
 <h2 id="dependencies-for-ant-builds">Dependencies for Ant builds</h2>
 
-<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/1.8/faq.html
----------------------------------------------------------------------
diff --git a/content/1.8/faq.html b/content/1.8/faq.html
index 7442c5c..aafc4bd 100644
--- a/content/1.8/faq.html
+++ b/content/1.8/faq.html
@@ -135,54 +135,61 @@
 <h3 id="general-questions">General Questions</h3>
 
 <ul>
-<li><a href="#log4j">I am getting the below Log4J warning message, how do I remove it?</a></li>
-<li><a href="#threadsafe">Is PDFBox thread safe?</a></li>
-<li><a href="#notclosed">Why do I get a &quot;Warning: You did not close the PDF Document&quot;?</a></li>
+  <li><a href="#log4j">I am getting the below Log4J warning message, how do I remove it?</a></li>
+  <li><a href="#threadsafe">Is PDFBox thread safe?</a></li>
+  <li><a href="#notclosed">Why do I get a \u201cWarning: You did not close the PDF Document\u201d?</a></li>
 </ul>
 
 <h3 id="text-extraction">Text Extraction</h3>
 
 <ul>
-<li><a href="#notext">How come I am not getting any text from the PDF document?</a></li>
-<li><a href="#gibberish">How come I am getting gibberish(G38G43G36G51G5) when extracting text?</a></li>
-<li><a href="#fontwidth">What does &quot;java.io.IOException: Can&#39;t handle font width&quot; mean?</a></li>
-<li><a href="#permission">Why do I get &quot;You do not have permission to extract text&quot; on some documents?</a></li>
-<li><a href="#partially">Can&#39;t we just extract the text without parsing the whole document or extract text as it is parsed?</a></li>
+  <li><a href="#notext">How come I am not getting any text from the PDF document?</a></li>
+  <li><a href="#gibberish">How come I am getting gibberish(G38G43G36G51G5) when extracting text?</a></li>
+  <li><a href="#fontwidth">What does \u201cjava.io.IOException: Can\u2019t handle font width\u201d mean?</a></li>
+  <li><a href="#permission">Why do I get \u201cYou do not have permission to extract text\u201d on some documents?</a></li>
+  <li><a href="#partially">Can\u2019t we just extract the text without parsing the whole document or extract text as it is parsed?</a></li>
 </ul>
 
-<h2 id="general-questions">General Questions</h2>
+<h2 id="general-questions-1">General Questions</h2>
 
-<p><a name="log4j"></a></p>
+<p><a name="log4j"></a>
+### I am getting the below Log4J warning message, how do I remove it? ###</p>
 
-<h3 id="i-am-getting-the-below-log4j-warning-message-how-do-i-remove-it">I am getting the below Log4J warning message, how do I remove it?</h3>
-<div class="highlight"><pre><code class="language-java" data-lang="java"><span class="nl">log4j:</span><span class="n">WARN</span> <span class="n">No</span> <span class="n">appenders</span> <span class="n">could</span> <span class="n">be</span> <span class="n">found</span> <span class="k">for</span> <span class="n">logger</span> <span class="o">(</span><span class="n">org</span><span class="o">.</span><span class="na">apache</span><span class="o">.</span><span class="na">pdfbox</span><span class="o">.</span><span class="na">util</span><span class="o">.</span><span class="na">ResourceLoader</span><span class="o">).</span>
+<div class="highlighter-rouge"><pre class="highlight"><code><span class="nl">log4j:</span><span class="n">WARN</span> <span class="n">No</span> <span class="n">appenders</span> <span class="n">could</span> <span class="n">be</span> <span class="n">found</span> <span class="k">for</span> <span class="n">logger</span> <span class="o">(</span><span class="n">org</span><span class="o">.</span><span class="na">apache</span><span class="o">.</span><span class="na">pdfbox</span><span class="o">.</span><span class="na">util</span><span class="o">.</span><span class="na">ResourceLoader</span><span class="o">).</span>
 <span class="nl">log4j:</span><span class="n">WARN</span> <span class="n">Please</span> <span class="n">initialize</span> <span class="n">the</span> <span class="n">log4j</span> <span class="n">system</span> <span class="n">properly</span><span class="o">.</span>
-</code></pre></div>
+</code></pre>
+</div>
+
 <p>This message means that you need to configure the log4j logging system.
 See the <a href="http://logging.apache.org/log4j/1.2/manual.html">log4j documentation</a> for more information.</p>
 
 <p>PDFBox comes with a sample log4j configuration file.  To use it you set a system property like this</p>
-<div class="highlight"><pre><code class="language-java" data-lang="java"><span class="n">java</span> <span class="o">-</span><span class="n">Dlog4j</span><span class="o">.</span><span class="na">configuration</span><span class="o">=</span><span class="n">log4j</span><span class="o">.</span><span class="na">xml</span> <span class="n">org</span><span class="o">.</span><span class="na">apache</span><span class="o">.</span><span class="na">pdfbox</span><span class="o">.</span><span class="na">ExtractText</span> <span class="o">&lt;</span><span class="n">PDF</span><span class="o">-</span><span class="n">file</span><span class="o">&gt;</span> <span class="o">&lt;</span><span class="n">output</span><span class="o">-</span><span class="n">text</span><span class="o">-</span><span class="n">file</span><span class="o">&gt;</span>
-</code></pre></div>
+
+<div class="highlighter-rouge"><pre class="highlight"><code><span class="n">java</span> <span class="o">-</span><span class="n">Dlog4j</span><span class="o">.</span><span class="na">configuration</span><span class="o">=</span><span class="n">log4j</span><span class="o">.</span><span class="na">xml</span> <span class="n">org</span><span class="o">.</span><span class="na">apache</span><span class="o">.</span><span class="na">pdfbox</span><span class="o">.</span><span class="na">ExtractText</span> <span class="o">&lt;</span><span class="n">PDF</span><span class="o">-</span><span class="n">file</span><span class="o">&gt;</span> <span class="o">&lt;</span><span class="n">output</span><span class="o">-</span><span class="n">text</span><span class="o">-</span><span class="n">file</span><span class="o">&gt;</span>
+</code></pre>
+</div>
+
 <p>If this is not working for you then you may have to specify the log4j config file using a URL path, like this:</p>
-<div class="highlight"><pre><code class="language-java" data-lang="java"><span class="n">log4j</span><span class="o">.</span><span class="na">configuration</span><span class="o">=</span><span class="nl">file:</span><span class="c1">///&lt;path to config file&gt;</span>
-</code></pre></div>
-<p><a name="threadsafe"></a></p>
 
-<h3 id="is-pdfbox-thread-safe">Is PDFBox thread safe?</h3>
+<div class="highlighter-rouge"><pre class="highlight"><code><span class="n">log4j</span><span class="o">.</span><span class="na">configuration</span><span class="o">=</span><span class="nl">file:</span><span class="c1">///&lt;path to config file&gt;</span>
+</code></pre>
+</div>
+
+<p><a name="threadsafe"></a>
+### Is PDFBox thread safe? ###</p>
 
 <p>No! Only one thread may access a single document at a time. You can have multiple threads
 each accessing their own PDDocument object.</p>
 
-<p><a name="notclosed"></a></p>
-
-<h3 id="why-do-i-get-a-quot-warning-you-did-not-close-the-pdf-document-quot">Why do I get a &quot;Warning: You did not close the PDF Document&quot;?</h3>
+<p><a name="notclosed"></a>
+### Why do I get a \u201cWarning: You did not close the PDF Document\u201d? ###</p>
 
 <p>You need to call close() on the PDDocument inside the finally block, if you
-don&#39;t then the document will not be closed properly.  Also, you must close all
+don\u2019t then the document will not be closed properly.  Also, you must close all
 PDDocument objects that get created.  The following code creates <strong>two</strong>
-PDDocument objects; one from the &quot;new PDDocument()&quot; and the second by the load method.</p>
-<div class="highlight"><pre><code class="language-java" data-lang="java"><span class="n">PDDocument</span> <span class="n">doc</span> <span class="o">=</span> <span class="k">new</span> <span class="n">PDDocument</span><span class="o">();</span>
+PDDocument objects; one from the \u201cnew PDDocument()\u201d and the second by the load method.</p>
+
+<div class="highlighter-rouge"><pre class="highlight"><code><span class="n">PDDocument</span> <span class="n">doc</span> <span class="o">=</span> <span class="k">new</span> <span class="n">PDDocument</span><span class="o">();</span>
 <span class="k">try</span>
 <span class="o">{</span>
    <span class="n">doc</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="s">"my.pdf"</span> <span class="o">);</span>
@@ -194,27 +201,27 @@ PDDocument objects; one from the &quot;new PDDocument()&quot; and the second by
       <span class="n">doc</span><span class="o">.</span><span class="na">close</span><span class="o">();</span>
    <span class="o">}</span>
 <span class="o">}</span>
-</code></pre></div>
-<h2 id="text-extraction">Text Extraction</h2>
+</code></pre>
+</div>
 
-<p><a name="notext"></a></p>
+<h2 id="text-extraction-1">Text Extraction</h2>
 
-<h3 id="how-come-i-am-not-getting-any-text-from-the-pdf-document">How come I am not getting any text from the PDF document?</h3>
+<p><a name="notext"></a>
+### How come I am not getting any text from the PDF document? ###</p>
 
 <p>Text extraction from a pdf document is a complicated task and there are many factors
 involved that effect the possibility and accuracy of text extraction.  It would be helpful
 to the PDFBox team if you could try a couple things.</p>
 
 <ul>
-<li>Open the PDF in Acrobat and try to extract text from there.  If Acrobat can extract text then PDFBox 
-should be able to as well and it is a bug if it cannot.  If Acrobat cannot extract text then PDFBox &#39;probably&#39; cannot either.</li>
-<li>It might really be an image instead of text.  Some PDF documents are just images that have been scanned in.
-You can tell by using the selection tool in Acrobat, if you can&#39;t select any text then it is probably an image.</li>
+  <li>Open the PDF in Acrobat and try to extract text from there.  If Acrobat can extract text then PDFBox 
+should be able to as well and it is a bug if it cannot.  If Acrobat cannot extract text then PDFBox \u2018probably\u2019 cannot either.</li>
+  <li>It might really be an image instead of text.  Some PDF documents are just images that have been scanned in.
+You can tell by using the selection tool in Acrobat, if you can\u2019t select any text then it is probably an image.</li>
 </ul>
 
-<p><a name="gibberish"></a></p>
-
-<h3 id="how-come-i-am-getting-gibberish-g38g43g36g51g5-when-extracting-text">How come I am getting gibberish(G38G43G36G51G5) when extracting text?</h3>
+<p><a name="gibberish"></a>
+### How come I am getting gibberish(G38G43G36G51G5) when extracting text? ###</p>
 
 <p>This is because the characters in a PDF document can use a custom encoding
 instead of unicode or ASCII.  When you see gibberish text then it
@@ -222,36 +229,33 @@ probably means that a meaningless internal encoding is being used.  The
 only way to access the text is to use OCR.  This may be a future
 enhancement.</p>
 
-<p><a name="fontwidth"></a></p>
-
-<h3 id="what-does-quot-java-io-ioexception-can-39-t-handle-font-width-quot-mean">What does &quot;java.io.IOException: Can&#39;t handle font width&quot; mean?</h3>
+<p><a name="fontwidth"></a>
+### What does \u201cjava.io.IOException: Can\u2019t handle font width\u201d mean? ###</p>
 
-<p>This probably means that the &quot;Resources&quot; directory is not in your classpath. The
+<p>This probably means that the \u201cResources\u201d directory is not in your classpath. The
 Resources directory is included in the PDFBox jar so this is only a problem if you
 are building PDFBox yourself and not using the binary.</p>
 
-<p><a name="permission"></a></p>
-
-<h3 id="why-do-i-get-quot-you-do-not-have-permission-to-extract-text-quot-on-some-documents">Why do I get &quot;You do not have permission to extract text&quot; on some documents?</h3>
+<p><a name="permission"></a>
+### Why do I get \u201cYou do not have permission to extract text\u201d on some documents? ###</p>
 
 <p>PDF documents have certain security permissions that can be applied to them and two 
-passwords associated with them, a user password and a master password. If the &quot;cannot extract text&quot;
+passwords associated with them, a user password and a master password. If the \u201ccannot extract text\u201d
 permission bit is set then you need to decrypt the document with the master password in order
 to extract the text.</p>
 
-<p><a name="partially"></a></p>
-
-<h3 id="can-39-t-we-just-extract-the-text-without-parsing-the-whole-document-or-extract-text-as-it-is-parsed">Can&#39;t we just extract the text without parsing the whole document or extract text as it is parsed?</h3>
+<p><a name="partially"></a>
+### Can\u2019t we just extract the text without parsing the whole document or extract text as it is parsed? ###</p>
 
 <p>Not really, for a couple reasons.</p>
 
 <ul>
-<li>If the document is encrypted then you need to parse at least until the encryption dictionary before 
+  <li>If the document is encrypted then you need to parse at least until the encryption dictionary before 
 you can decrypt.</li>
-<li>Sometimes the PDFont contains vital information needed for text extraction.</li>
-<li>Text on a page does not have to be drawn in reading order. For example: if the page said &quot;Hello World&quot;,
-the pdf could have been written such that &quot;World&quot; gets drawn and then the cursor moves to the left and 
-the word &quot;Hello&quot; is drawn.</li>
+  <li>Sometimes the PDFont contains vital information needed for text extraction.</li>
+  <li>Text on a page does not have to be drawn in reading order. For example: if the page said \u201cHello World\u201d,
+the pdf could have been written such that \u201cWorld\u201d gets drawn and then the cursor moves to the left and 
+the word \u201cHello\u201d is drawn.</li>
 </ul>
 
             </div>

http://git-wip-us.apache.org/repos/asf/pdfbox-docs/blob/799b1d78/content/2.0/commandline.html
----------------------------------------------------------------------
diff --git a/content/2.0/commandline.html b/content/2.0/commandline.html
index 0965aed..24d07b8 100644
--- a/content/2.0/commandline.html
+++ b/content/2.0/commandline.html
@@ -137,7 +137,7 @@
 <p>See the <a href="/2.0/dependencies.html">Dependencies</a> page for instructions on how to set your classpath in order to run 
 PDFBox tools as Java applications.</p>
 
-<p><strong>Table of Contents</strong><br>
+<p><strong>Table of Contents</strong><br />
 <a href="#decrypt">Decrypt</a>
 <a href="#encrypt">Encrypt</a>
 <a href="#extractimages">ExtractImages</a>
@@ -157,282 +157,297 @@ PDFBox tools as Java applications.</p>
 
 <p>NOTE: You must have the owner password to decrypt the document!</p>
 
-<p>usage: <code>java -jar pdfbox-app-2.y.z.jar Decrypt [OPTIONS] &lt;inputfile&gt; [outputfile]</code></p>
-
-<table><thead>
-<tr>
-<th>Command Line Parameter</th>
-<th>Description</th>
-</tr>
-</thead><tbody>
-<tr>
-<td>-password</td>
-<td>Password to the PDF or certificate in keystore.</td>
-</tr>
-<tr>
-<td>-keyStore</td>
-<td>Path to keystore that holds certificate to decrypt the document. This is only required if the document is encrypted with a certificate, otherwise only the password is required.</td>
-</tr>
-<tr>
-<td>-alias</td>
-<td>The alias to the certificate in the keystore.</td>
-</tr>
-<tr>
-<td>inputfile</td>
-<td>The PDF file to decrypt.</td>
-</tr>
-<tr>
-<td>outputfile</td>
-<td>The file to save the decrypted document to. If left blank then it will be the same as the input file.</td>
-</tr>
-</tbody></table>
+<p>usage: <code class="highlighter-rouge">java -jar pdfbox-app-2.y.z.jar Decrypt [OPTIONS] &lt;inputfile&gt; [outputfile]</code></p>
+
+<table>
+  <thead>
+    <tr>
+      <th>Command Line Parameter</th>
+      <th>Description</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td>-password</td>
+      <td>Password to the PDF or certificate in keystore.</td>
+    </tr>
+    <tr>
+      <td>-keyStore</td>
+      <td>Path to keystore that holds certificate to decrypt the document. This is only required if the document is encrypted with a certificate, otherwise only the password is required.</td>
+    </tr>
+    <tr>
+      <td>-alias</td>
+      <td>The alias to the certificate in the keystore.</td>
+    </tr>
+    <tr>
+      <td>inputfile</td>
+      <td>The PDF file to decrypt.</td>
+    </tr>
+    <tr>
+      <td>outputfile</td>
+      <td>The file to save the decrypted document to. If left blank then it will be the same as the input file.</td>
+    </tr>
+  </tbody>
+</table>
 
 <h2 id="encrypt">Encrypt</h2>
 
 <p>This application will encrypt a PDF document.</p>
 
-<p>usage: <code>java -jar pdfbox-app-2.y.z.jar Encrypt [OPTIONS] &lt;password&gt; &lt;inputfile&gt;</code></p>
-
-<table><thead>
-<tr>
-<th>Command Line Parameter</th>
-<th>Default</th>
-<th>Description</th>
-</tr>
-</thead><tbody>
-<tr>
-<td>-O</td>
-<td></td>
-<td>The owner password to the PDF, ignored if -certFile is specified.</td>
-</tr>
-<tr>
-<td>-U</td>
-<td></td>
-<td>The user password to the PDF, ignored if -certFile is specified.</td>
-</tr>
-<tr>
-<td>-certFile</td>
-<td></td>
-<td>Path to X.509 cert file.</td>
-</tr>
-<tr>
-<td>-canAssemble</td>
-<td>true</td>
-<td>Set the assemble permission.</td>
-</tr>
-<tr>
-<td>-canExtractContent</td>
-<td>true</td>
-<td>Set the extraction permission.</td>
-</tr>
-<tr>
-<td>-canExtractForAccessibility</td>
-<td>true</td>
-<td>Set the extraction permission.</td>
-</tr>
-<tr>
-<td>-canFillInForm</td>
-<td>true</td>
-<td>Set the fill in form permission.</td>
-</tr>
-<tr>
-<td>-canModify</td>
-<td>true</td>
-<td>Set the modify permission.</td>
-</tr>
-<tr>
-<td>-canModifyAnnotations</td>
-<td>true</td>
-<td>Set the modify annots permission.</td>
-</tr>
-<tr>
-<td>-canPrint</td>
-<td>true</td>
-<td>Set the print permission.</td>
-</tr>
-<tr>
-<td>-canPrintDegraded</td>
-<td>true</td>
-<td>Set the print degraded permission.</td>
-</tr>
-<tr>
-<td>-keyLength</td>
-<td>40, 128 or 256</td>
-<td>The number of bits for the encryption key. For 128 and above bits <a href="http://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html">Java Cryptography Extension (JCE) Unlimited Strength Jurisdiction Policy Files</a> must be installed.</td>
-</tr>
-<tr>
-<td>inputfile</td>
-<td></td>
-<td>The PDF file to encrypt.</td>
-</tr>
-<tr>
-<td>outputfile</td>
-<td></td>
-<td>The file to save the encrypted document to. If left blank then it will be the same as the input file.</td>
-</tr>
-</tbody></table>
+<p>usage: <code class="highlighter-rouge">java -jar pdfbox-app-2.y.z.jar Encrypt [OPTIONS] &lt;password&gt; &lt;inputfile&gt;</code></p>
+
+<table>
+  <thead>
+    <tr>
+      <th>Command Line Parameter</th>
+      <th>Default</th>
+      <th>Description</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td>-O</td>
+      <td>�</td>
+      <td>The owner password to the PDF, ignored if -certFile is specified.</td>
+    </tr>
+    <tr>
+      <td>-U</td>
+      <td>�</td>
+      <td>The user password to the PDF, ignored if -certFile is specified.</td>
+    </tr>
+    <tr>
+      <td>-certFile</td>
+      <td>�</td>
+      <td>Path to X.509 cert file.</td>
+    </tr>
+    <tr>
+      <td>-canAssemble</td>
+      <td>true</td>
+      <td>Set the assemble permission.</td>
+    </tr>
+    <tr>
+      <td>-canExtractContent</td>
+      <td>true</td>
+      <td>Set the extraction permission.</td>
+    </tr>
+    <tr>
+      <td>-canExtractForAccessibility</td>
+      <td>true</td>
+      <td>Set the extraction permission.</td>
+    </tr>
+    <tr>
+      <td>-canFillInForm</td>
+      <td>true</td>
+      <td>Set the fill in form permission.</td>
+    </tr>
+    <tr>
+      <td>-canModify</td>
+      <td>true</td>
+      <td>Set the modify permission.</td>
+    </tr>
+    <tr>
+      <td>-canModifyAnnotations</td>
+      <td>true</td>
+      <td>Set the modify annots permission.</td>
+    </tr>
+    <tr>
+      <td>-canPrint</td>
+      <td>true</td>
+      <td>Set the print permission.</td>
+    </tr>
+    <tr>
+      <td>-canPrintDegraded</td>
+      <td>true</td>
+      <td>Set the print degraded permission.</td>
+    </tr>
+    <tr>
+      <td>-keyLength</td>
+      <td>40, 128 or 256</td>
+      <td>The number of bits for the encryption key. For 128 and above bits <a href="http://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html">Java Cryptography Extension (JCE) Unlimited Strength Jurisdiction Policy Files</a> must be installed.</td>
+    </tr>
+    <tr>
+      <td>inputfile</td>
+      <td>�</td>
+      <td>The PDF file to encrypt.</td>
+    </tr>
+    <tr>
+      <td>outputfile</td>
+      <td>�</td>
+      <td>The file to save the encrypted document to. If left blank then it will be the same as the input file.</td>
+    </tr>
+  </tbody>
+</table>
 
 <h2 id="extractimages">ExtractImages</h2>
 
 <p>This application will extract all images from the given PDF document.</p>
 
-<p>usage: <code>java -jar pdfbox-app-2.y.z.jar ExtractImages [OPTIONS] &lt;inputfile&gt;</code></p>
-
-<table><thead>
-<tr>
-<th>Command Line Parameter</th>
-<th>Default</th>
-<th>Description</th>
-</tr>
-</thead><tbody>
-<tr>
-<td>-password</td>
-<td></td>
-<td>The password to the PDF document.</td>
-</tr>
-<tr>
-<td>-prefix</td>
-<td>PDF name</td>
-<td>Image prefix to use.</td>
-</tr>
-<tr>
-<td>-directJPEG</td>
-<td>false</td>
-<td>Forces the direct extraction of JPEG images regardless of colorspace.</td>
-</tr>
-</tbody></table>
+<p>usage: <code class="highlighter-rouge">java -jar pdfbox-app-2.y.z.jar ExtractImages [OPTIONS] &lt;inputfile&gt;</code></p>
+
+<table>
+  <thead>
+    <tr>
+      <th>Command Line Parameter</th>
+      <th>Default</th>
+      <th>Description</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td>-password</td>
+      <td>�</td>
+      <td>The password to the PDF document.</td>
+    </tr>
+    <tr>
+      <td>-prefix</td>
+      <td>PDF name</td>
+      <td>Image prefix to use.</td>
+    </tr>
+    <tr>
+      <td>-directJPEG</td>
+      <td>false</td>
+      <td>Forces the direct extraction of JPEG images regardless of colorspace.</td>
+    </tr>
+  </tbody>
+</table>
 
 <h2 id="extracttext">ExtractText</h2>
 
 <p>This application will extract all text from the given PDF document.</p>
 
-<p>usage: <code>java -jar pdfbox-app-2.y.z.jar ExtractText [OPTIONS] &lt;inputfile&gt; [Text file]</code></p>
-
-<table><thead>
-<tr>
-<th>Command Line Parameter</th>
-<th>Default</th>
-<th>Description</th>
-</tr>
-</thead><tbody>
-<tr>
-<td>-password</td>
-<td></td>
-<td>The password to the PDF document.</td>
-</tr>
-<tr>
-<td>-encoding</td>
-<td>default encoding</td>
-<td>The encoding type of the text file, e.g. ISO-8859-1, UTF-8, UTF-16BE.</td>
-</tr>
-<tr>
-<td>-console</td>
-<td>false</td>
-<td>Send text to console instead of file.</td>
-</tr>
-<tr>
-<td>-html</td>
-<td>false</td>
-<td>Output in HTML format instead of raw text.</td>
-</tr>
-<tr>
-<td>-sort</td>
-<td>false</td>
-<td>Sort the text before writing.</td>
-</tr>
-<tr>
-<td>-ignoreBeads</td>
-<td>false</td>
-<td>Disables the separation by beads.</td>
-</tr>
-<tr>
-<td>-force</td>
-<td>false</td>
-<td>Enables pdfbox to ignore corrupt objects.</td>
-</tr>
-<tr>
-<td>-debug</td>
-<td>false</td>
-<td>Enables debug output about the time consumption of every stage.</td>
-</tr>
-<tr>
-<td>-startPage</td>
-<td>1</td>
-<td>The first page to extract, one based.</td>
-</tr>
-<tr>
-<td>-endPage</td>
-<td>Integer.MAX_INT</td>
-<td>The last page to extract, one based.</td>
-</tr>
-</tbody></table>
+<p>usage: <code class="highlighter-rouge">java -jar pdfbox-app-2.y.z.jar ExtractText [OPTIONS] &lt;inputfile&gt; [Text file]</code></p>
+
+<table>
+  <thead>
+    <tr>
+      <th>Command Line Parameter</th>
+      <th>Default</th>
+      <th>Description</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td>-password</td>
+      <td>�</td>
+      <td>The password to the PDF document.</td>
+    </tr>
+    <tr>
+      <td>-encoding</td>
+      <td>default encoding</td>
+      <td>The encoding type of the text file, e.g. ISO-8859-1, UTF-8, UTF-16BE.</td>
+    </tr>
+    <tr>
+      <td>-console</td>
+      <td>false</td>
+      <td>Send text to console instead of file.</td>
+    </tr>
+    <tr>
+      <td>-html</td>
+      <td>false</td>
+      <td>Output in HTML format instead of raw text.</td>
+    </tr>
+    <tr>
+      <td>-sort</td>
+      <td>false</td>
+      <td>Sort the text before writing.</td>
+    </tr>
+    <tr>
+      <td>-ignoreBeads</td>
+      <td>false</td>
+      <td>Disables the separation by beads.</td>
+    </tr>
+    <tr>
+      <td>-force</td>
+      <td>false</td>
+      <td>Enables pdfbox to ignore corrupt objects.</td>
+    </tr>
+    <tr>
+      <td>-debug</td>
+      <td>false</td>
+      <td>Enables debug output about the time consumption of every stage.</td>
+    </tr>
+    <tr>
+      <td>-startPage</td>
+      <td>1</td>
+      <td>The first page to extract, one based.</td>
+    </tr>
+    <tr>
+      <td>-endPage</td>
+      <td>Integer.MAX_INT</td>
+      <td>The last page to extract, one based.</td>
+    </tr>
+  </tbody>
+</table>
 
 <h2 id="overlaypdf">OverlayPDF</h2>
 
 <p>This application will overlay one document with the content of another document</p>
 
-<p>usage: <code>java -jar pdfbox-app-2.y.z.jar OverlayPDF &lt;input.pdf&gt; [OPTIONS] &lt;output.pdf&gt;</code></p>
-
-<table><thead>
-<tr>
-<th>Command Line Parameter</th>
-<th>Default</th>
-<th>Description</th>
-</tr>
-</thead><tbody>
-<tr>
-<td>inputfile</td>
-<td></td>
-<td>The PDF file to be overlayed.</td>
-</tr>
-<tr>
-<td>defaultOverlay.pdf</td>
-<td></td>
-<td>Default overlay file.</td>
-</tr>
-<tr>
-<td>-odd oddPageOverlay.pdf</td>
-<td></td>
-<td>Overlay file used for odd pages.</td>
-</tr>
-<tr>
-<td>-even evenPageOverlay.pdf</td>
-<td></td>
-<td>Overlay file used for even pages.</td>
-</tr>
-<tr>
-<td>-first firstPageOverlay.pdf</td>
-<td></td>
-<td>Overlay file used for the first page.</td>
-</tr>
-<tr>
-<td>-last lastPageOverlay.pdf</td>
-<td></td>
-<td>Overlay file used for the last pages.</td>
-</tr>
-<tr>
-<td>-page pageNumber specificPageOverlay.pdf</td>
-<td></td>
-<td>overlay file used for the given page number, may occur more than once.</td>
-</tr>
-<tr>
-<td>-position</td>
-<td>background</td>
-<td>Where to put the overlay, foreground or background.</td>
-</tr>
-<tr>
-<td>outputfile</td>
-<td></td>
-<td>The resulting pdf file.</td>
-</tr>
-</tbody></table>
+<p>usage: <code class="highlighter-rouge">java -jar pdfbox-app-2.y.z.jar OverlayPDF &lt;input.pdf&gt; [OPTIONS] &lt;output.pdf&gt;</code></p>
+
+<table>
+  <thead>
+    <tr>
+      <th>Command Line Parameter</th>
+      <th>Default</th>
+      <th>Description</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td>inputfile</td>
+      <td>�</td>
+      <td>The PDF file to be overlayed.</td>
+    </tr>
+    <tr>
+      <td>defaultOverlay.pdf</td>
+      <td>�</td>
+      <td>Default overlay file.</td>
+    </tr>
+    <tr>
+      <td>-odd oddPageOverlay.pdf</td>
+      <td>�</td>
+      <td>Overlay file used for odd pages.</td>
+    </tr>
+    <tr>
+      <td>-even evenPageOverlay.pdf</td>
+      <td>�</td>
+      <td>Overlay file used for even pages.</td>
+    </tr>
+    <tr>
+      <td>-first firstPageOverlay.pdf</td>
+      <td>�</td>
+      <td>Overlay file used for the first page.</td>
+    </tr>
+    <tr>
+      <td>-last lastPageOverlay.pdf</td>
+      <td>�</td>
+      <td>Overlay file used for the last pages.</td>
+    </tr>
+    <tr>
+      <td>-page pageNumber specificPageOverlay.pdf</td>
+      <td>�</td>
+      <td>overlay file used for the given page number, may occur more than once.</td>
+    </tr>
+    <tr>
+      <td>-position</td>
+      <td>background</td>
+      <td>Where to put the overlay, foreground or background.</td>
+    </tr>
+    <tr>
+      <td>outputfile</td>
+      <td>�</td>
+      <td>The resulting pdf file.</td>
+    </tr>
+  </tbody>
+</table>
 
 <p>Examples:</p>
 
 <ul>
-<li>OverlayPDF input.pdf overlay.pdf output.pdf</li>
-<li>OverlayPDF input.pdf defaultOverlay.pdf -page 10 overlayForPage10.pdf -position foreground output.pdf</li>
-<li>OverlayPDF input.pdf -odd oddOverlay.pdf -even evenOverlay.pdf output.pdf</li>
+  <li>OverlayPDF input.pdf overlay.pdf output.pdf</li>
+  <li>OverlayPDF input.pdf defaultOverlay.pdf -page 10 overlayForPage10.pdf -position foreground output.pdf</li>
+  <li>OverlayPDF input.pdf -odd oddOverlay.pdf -even evenOverlay.pdf output.pdf</li>
 </ul>
 
 <h2 id="pdfdebugger">PDFDebugger</h2>
@@ -440,121 +455,130 @@ PDFBox tools as Java applications.</p>
 <p>This application will take an existing PDF document and allows to analyze and inspect the internal structure.
 It is used as replacement for the PDFReader which was removed in 2.0.0.</p>
 
-<p>usage: <code>java -jar pdfbox-app-2.y.z.jar PDFDebugger [inputfile]</code></p>
-
-<table><thead>
-<tr>
-<th>Command Line Parameter</th>
-<th>Default</th>
-<th>Description</th>
-</tr>
-</thead><tbody>
-<tr>
-<td>-password</td>
-<td></td>
-<td>The password to the PDF document.</td>
-</tr>
-<tr>
-<td>-viewstructure</td>
-<td></td>
-<td>Activates the &quot;view structure&quot; view on startup.</td>
-</tr>
-<tr>
-<td>inputfile</td>
-<td></td>
-<td>the name of an optional PDF file to open.</td>
-</tr>
-</tbody></table>
+<p>usage: <code class="highlighter-rouge">java -jar pdfbox-app-2.y.z.jar PDFDebugger [inputfile]</code></p>
+
+<table>
+  <thead>
+    <tr>
+      <th>Command Line Parameter</th>
+      <th>Default</th>
+      <th>Description</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td>-password</td>
+      <td>�</td>
+      <td>The password to the PDF document.</td>
+    </tr>
+    <tr>
+      <td>-viewstructure</td>
+      <td>�</td>
+      <td>Activates the \u201cview structure\u201d view on startup.</td>
+    </tr>
+    <tr>
+      <td>inputfile</td>
+      <td>�</td>
+      <td>the name of an optional PDF file to open.</td>
+    </tr>
+  </tbody>
+</table>
 
 <h2 id="pdfmerger">PDFMerger</h2>
 
 <p>This application will take a list of pdf documents and merge them, saving the result in a new document.</p>
 
-<p>usage: <code>java -jar pdfbox-app-2.y.z.jar PDFMerger &lt;Source PDF files (2 ..n)&gt; &lt;Target PDF file&gt;</code></p>
+<p>usage: <code class="highlighter-rouge">java -jar pdfbox-app-2.y.z.jar PDFMerger &lt;Source PDF files (2 ..n)&gt; &lt;Target PDF file&gt;</code></p>
 
 <h2 id="pdfsplit">PDFSplit</h2>
 
 <p>This application will take an existing PDF document and split it into a number of other documents</p>
 
-<p>usage: <code>java -jar pdfbox-app-2.y.z.jar PDFSplit [OPTIONS] &lt;PDF file&gt;</code></p>
-
-<table><thead>
-<tr>
-<th>Command Line Parameter</th>
-<th>Default</th>
-<th>Description</th>
-</tr>
-</thead><tbody>
-<tr>
-<td>-password</td>
-<td></td>
-<td>The password to the PDF document.</td>
-</tr>
-<tr>
-<td>-split</td>
-<td></td>
-<td>Number of pages of every splitted part of the pdf.</td>
-</tr>
-<tr>
-<td>-startPage</td>
-<td></td>
-<td>The page to start at.</td>
-</tr>
-<tr>
-<td>-endPage</td>
-<td></td>
-<td>The page to stop at.</td>
-</tr>
-</tbody></table>
+<p>usage: <code class="highlighter-rouge">java -jar pdfbox-app-2.y.z.jar PDFSplit [OPTIONS] &lt;PDF file&gt;</code></p>
+
+<table>
+  <thead>
+    <tr>
+      <th>Command Line Parameter</th>
+      <th>Default</th>
+      <th>Description</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td>-password</td>
+      <td>�</td>
+      <td>The password to the PDF document.</td>
+    </tr>
+    <tr>
+      <td>-split</td>
+      <td>�</td>
+      <td>Number of pages of every splitted part of the pdf.</td>
+    </tr>
+    <tr>
+      <td>-startPage</td>
+      <td>�</td>
+      <td>The page to start at.</td>
+    </tr>
+    <tr>
+      <td>-endPage</td>
+      <td>�</td>
+      <td>The page to stop at.</td>
+    </tr>
+  </tbody>
+</table>
 
 <p>Examples:</p>
 
 <ul>
-<li>PDFSplit -split 2 sample_with_13_pages.pdf will split the pdf in pieces of 2 pages each except the last which will contain 1 page only.</li>
-<li>PDFSplit -startPage 5 sample_with_13_pages.pdf will provide a pdf containing all pages of the source pdf starting at page 5</li>
-<li>PDFSplit -startPage 5 -endPage 10 sample_with_13_pages.pdf will provide a pdf containing all pages from 5 to 10 of the source pdf</li>
-<li>PDFSplit -split 2 -startPage 5 -endPage 10 sample_with_13_pages.pdf will provide 3 pdfs containing all pages from 5 to 10 of the source pdf 2 pages each</li>
+  <li>PDFSplit -split 2 sample_with_13_pages.pdf will split the pdf in pieces of 2 pages each except the last which will contain 1 page only.</li>
+  <li>PDFSplit -startPage 5 sample_with_13_pages.pdf will provide a pdf containing all pages of the source pdf starting at page 5</li>
+  <li>PDFSplit -startPage 5 -endPage 10 sample_with_13_pages.pdf will provide a pdf containing all pages from 5 to 10 of the source pdf</li>
+  <li>PDFSplit -split 2 -startPage 5 -endPage 10 sample_with_13_pages.pdf will provide 3 pdfs containing all pages from 5 to 10 of the source pdf 2 pages each</li>
 </ul>
 
 <h2 id="pdftoimage">PDFToImage</h2>
 
 <p>This application will create an image for every page in the PDF document.</p>
 
-<p>usage: <code>java -jar pdfbox-app-2.y.z.jar PDFToImage [OPTIONS] &lt;PDF file&gt;</code></p>
-
-<table><thead>
-<tr>
-<th>Command Line Parameter</th>
-<th>Default</th>
-<th>Description</th>
-</tr>
-</thead><tbody>
-<tr>
-<td>-password</td>
-<td></td>
-<td>The password to the PDF document.</td>
-</tr>
-<tr>
-<td>-imageType</td>
-<td>jpg</td>
-<td>The image type to write to. Currently only jpg or png.</td>
-</tr>
-<tr>
-<td>-outputPrefix</td>
-<td>Name of PDF document</td>
-<td>The prefix to the image file.</td>
-</tr>
-<tr>
-<td>-startPage</td>
-<td>1</td>
-<td>The first page to convert, one based.</td>
-</tr>
-<tr>
-<td>-endPage</td>
-<td>Integer.MAX_INT</td>
-<td>The last page to convert, one based.</td>
-</tr>
-</tbody></table>
+<p>usage: <code class="highlighter-rouge">java -jar pdfbox-app-2.y.z.jar PDFToImage [OPTIONS] &lt;PDF file&gt;</code></p>
+
+<table>
+  <thead>
+    <tr>
+      <th>Command Line Parameter</th>
+      <th>Default</th>
+      <th>Description</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td>-password</td>
+      <td>�</td>
+      <td>The password to the PDF document.</td>
+    </tr>
+    <tr>
+      <td>-imageType</td>
+      <td>jpg</td>
+      <td>The image type to write to. Currently only jpg or png.</td>
+    </tr>
+    <tr>
+      <td>-outputPrefix</td>
+      <td>Name of PDF document</td>
+      <td>The prefix to the image file.</td>
+    </tr>
+    <tr>
+      <td>-startPage</td>
+      <td>1</td>
+      <td>The first page to convert, one based.</td>
+    </tr>
+    <tr>
+      <td>-endPage</td>
+      <td>Integer.MAX_INT</td>
+      <td>The last page to convert, one based.</td>
+    </tr>
+  </tbody>
+</table>
 
 <h2 id="printpdf">PrintPDF</h2>
 
@@ -562,106 +586,116 @@ It is used as replacement for the PDFReader which was removed in 2.0.0.</p>
 
 <p class="alert alert-info">You must have the correct permissions to print the document!</p>
 
-<p>usage: <code>java -jar pdfbox-app-2.y.z.jar PrintPDF [OPTIONS] &lt;inputfile&gt;</code></p>
-
-<table><thead>
-<tr>
-<th>Command Line Parameter</th>
-<th>Description</th>
-</tr>
-</thead><tbody>
-<tr>
-<td>-password</td>
-<td>The password to decrypt the PDF.</td>
-</tr>
-<tr>
-<td>-silentPrint</td>
-<td>Print the PDF without prompting for a printer.</td>
-</tr>
-<tr>
-<td>inputfile</td>
-<td>The PDF file to print.</td>
-</tr>
-</tbody></table>
+<p>usage: <code class="highlighter-rouge">java -jar pdfbox-app-2.y.z.jar PrintPDF [OPTIONS] &lt;inputfile&gt;</code></p>
+
+<table>
+  <thead>
+    <tr>
+      <th>Command Line Parameter</th>
+      <th>Description</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td>-password</td>
+      <td>The password to decrypt the PDF.</td>
+    </tr>
+    <tr>
+      <td>-silentPrint</td>
+      <td>Print the PDF without prompting for a printer.</td>
+    </tr>
+    <tr>
+      <td>inputfile</td>
+      <td>The PDF file to print.</td>
+    </tr>
+  </tbody>
+</table>
 
 <h2 id="texttopdf">TextToPDF</h2>
 
 <p>This application will create a PDF document from a text file.</p>
 
-<p>usage: <code>java -jar pdfbox-app-2.y.z.jar TextToPDF [OPTIONS] &lt;outputfile&gt; &lt;textfile&gt;</code></p>
-
-<table><thead>
-<tr>
-<th>Command Line Parameter</th>
-<th>Default</th>
-<th>Description</th>
-</tr>
-</thead><tbody>
-<tr>
-<td>-standardFont</td>
-<td>Helvetica</td>
-<td>The font to use for the text. Either this or -ttf should be specified but not both.</td>
-</tr>
-<tr>
-<td>-ttf</td>
-<td></td>
-<td>The TTF font to use for the text. Either this or -standardFont should be specified but not both.</td>
-</tr>
-<tr>
-<td>-fontSize</td>
-<td>10</td>
-<td>The size of the font to use.</td>
-</tr>
-</tbody></table>
-
-<p>The following font names can be used for the parameter <code>standardFont</code>:</p>
+<p>usage: <code class="highlighter-rouge">java -jar pdfbox-app-2.y.z.jar TextToPDF [OPTIONS] &lt;outputfile&gt; &lt;textfile&gt;</code></p>
+
+<table>
+  <thead>
+    <tr>
+      <th>Command Line Parameter</th>
+      <th>Default</th>
+      <th>Description</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td>-standardFont</td>
+      <td>Helvetica</td>
+      <td>The font to use for the text. Either this or -ttf should be specified but not both.</td>
+    </tr>
+    <tr>
+      <td>-ttf</td>
+      <td>�</td>
+      <td>The TTF font to use for the text. Either this or -standardFont should be specified but not both.</td>
+    </tr>
+    <tr>
+      <td>-fontSize</td>
+      <td>10</td>
+      <td>The size of the font to use.</td>
+    </tr>
+  </tbody>
+</table>
+
+<p>The following font names can be used for the parameter <code class="highlighter-rouge">standardFont</code>:</p>
 
 <ul>
-<li>Courier</li>
-<li>Courier-Bold</li>
-<li>Courier-Oblique</li>
-<li>Courier-BoldOblique</li>
-<li>Helvetica</li>
-<li>Helvetica-Bold</li>
-<li>Helvetica-Oblique</li>
-<li>Helvetica-BoldOblique</li>
-<li>Symbol</li>
-<li>Times-Bold</li>
-<li>Times-Roman</li>
-<li>Times-Italic</li>
-<li>Times-BoldItalic</li>
-<li>ZapfDingbats</li>
+  <li>Courier</li>
+  <li>Courier-Bold</li>
+  <li>Courier-Oblique</li>
+  <li>Courier-BoldOblique</li>
+  <li>Helvetica</li>
+  <li>Helvetica-Bold</li>
+  <li>Helvetica-Oblique</li>
+  <li>Helvetica-BoldOblique</li>
+  <li>Symbol</li>
+  <li>Times-Bold</li>
+  <li>Times-Roman</li>
+  <li>Times-Italic</li>
+  <li>Times-BoldItalic</li>
+  <li>ZapfDingbats</li>
 </ul>
 
 <h2 id="writedecodeddoc">WriteDecodedDoc</h2>
 
 <p>An application to decompress PDF documents.</p>
 
-<p>usage: <code>java -jar pdfbox-app-2.y.z.jar WriteDecodedDoc &lt;input-file&gt; &lt;output-file&gt;</code></p>
-
-<table><thead>
-<tr>
-<th>Command Line Parameter</th>
-<th>Default</th>
-<th>Description</th>
-</tr>
-</thead><tbody>
-<tr>
-<td>-password</td>
-<td></td>
-<td>The password to the PDF document.</td>
-</tr>
-<tr>
-<td><input-file></td>
-<td></td>
-<td>The PDF file to decompress</td>
-</tr>
-<tr>
-<td><output-file></td>
-<td></td>
-<td>The destination PDF file</td>
-</tr>
-</tbody></table>
+<p>usage: <code class="highlighter-rouge">java -jar pdfbox-app-2.y.z.jar WriteDecodedDoc &lt;input-file&gt; &lt;output-file&gt;</code></p>
+
+<table>
+  <thead>
+    <tr>
+      <th>Command Line Parameter</th>
+      <th>Default</th>
+      <th>Description</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td>-password</td>
+      <td>�</td>
+      <td>The password to the PDF document.</td>
+    </tr>
+    <tr>
+      <td><input-file></input-file></td>
+      <td>�</td>
+      <td>The PDF file to decompress</td>
+    </tr>
+    <tr>
+      <td><output-file></output-file></td>
+      <td>�</td>
+      <td>The destination PDF file</td>
+    </tr>
+  </tbody>
+</table>
+
 
             </div>
         </div>

http://git-wip-us.apache.org/repos/asf/pdfbox-docs/blob/799b1d78/content/2.0/cookbook/encryption.html
----------------------------------------------------------------------
diff --git a/content/2.0/cookbook/encryption.html b/content/2.0/cookbook/encryption.html
index af0064b..d8978f2 100644
--- a/content/2.0/cookbook/encryption.html
+++ b/content/2.0/cookbook/encryption.html
@@ -132,32 +132,35 @@
             <div class="col-xs-12 col-sm-9">
                 <h1 id="encrypting-a-file">Encrypting a file</h1>
 
-<p>PDF encryption requires two passwords: the &quot;user password&quot; to open and view the file with restricted permissions, the &quot;owner password&quot; to access the file with all permission.</p>
+<p>PDF encryption requires two passwords: the \u201cuser password\u201d to open and view the file with restricted permissions, the \u201cowner password\u201d to access the file with all permission.</p>
 
 <h2 id="load-and-save-encrypted">Load and save encrypted</h2>
 
 <p>This small sample shows how to encrypt a file so that it can be viewed, but not printed..</p>
-<div class="highlight"><pre><code class="language-java" data-lang="java"><span class="n">PDDocument</span> <span class="n">doc</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="s">"filename.pdf"</span><span class="o">);</span>
+
+<div class="highlighter-rouge"><pre class="highlight"><code><span class="n">PDDocument</span> <span class="n">doc</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="s">"filename.pdf"</span><span class="o">);</span>
 
 <span class="c1">// Define the length of the encryption key.</span>
 <span class="c1">// Possible values are 40, 128 or 256.</span>
 <span class="kt">int</span> <span class="n">keyLength</span> <span class="o">=</span> <span class="mi">256</span><span class="o">;</span>
-
+    
 <span class="n">AccessPermission</span> <span class="n">ap</span> <span class="o">=</span> <span class="k">new</span> <span class="n">AccessPermission</span><span class="o">();</span>
-
+        
 <span class="c1">// disable printing, everything else is allowed</span>
 <span class="n">ap</span><span class="o">.</span><span class="na">setCanPrint</span><span class="o">(</span><span class="kc">false</span><span class="o">);</span>
-
+        
 <span class="c1">// owner password (to open the file with all permissions) is "12345"</span>
 <span class="c1">// user password (to open the file but with restricted permissions, is empty here) </span>
 <span class="n">StandardProtectionPolicy</span> <span class="n">spp</span> <span class="o">=</span> <span class="k">new</span> <span class="n">StandardProtectionPolicy</span><span class="o">(</span><span class="s">"12345"</span><span class="o">,</span> <span class="s">""</span><span class="o">,</span> <span class="n">ap</span><span class="o">);</span>
 <span class="n">spp</span><span class="o">.</span><span class="na">setEncryptionKeyLength</span><span class="o">(</span><span class="n">keyLength</span><span class="o">);</span>
 <span class="n">spp</span><span class="o">.</span><span class="na">setPermissions</span><span class="o">(</span><span class="n">ap</span><span class="o">);</span>
 <span class="n">doc</span><span class="o">.</span><span class="na">protect</span><span class="o">(</span><span class="n">spp</span><span class="o">);</span>
-
+        
 <span class="n">doc</span><span class="o">.</span><span class="na">save</span><span class="o">(</span><span class="s">"filename-encrypted.pdf"</span><span class="o">);</span>
 <span class="n">doc</span><span class="o">.</span><span class="na">close</span><span class="o">();</span>
-</code></pre></div>
+</code></pre>
+</div>
+
             </div>
         </div>
     </div>

http://git-wip-us.apache.org/repos/asf/pdfbox-docs/blob/799b1d78/content/2.0/dependencies.html
----------------------------------------------------------------------
diff --git a/content/2.0/dependencies.html b/content/2.0/dependencies.html
index 96a7d90..6c3f719 100644
--- a/content/2.0/dependencies.html
+++ b/content/2.0/dependencies.html
@@ -135,11 +135,11 @@
 <p>PDFBox has the following basic dependencies:</p>
 
 <ul>
-<li>Java 6</li>
-<li><a href="http://commons.apache.org/logging/">commons-logging</a></li>
+  <li>Java 6</li>
+  <li><a href="http://commons.apache.org/logging/">commons-logging</a></li>
 </ul>
 
-<p>Commons Logging is a generic wrapper around different logging frameworks, so you&#39;ll either need to also use a logging library like <a href="http://logging.apache.org/log4j/">log4j</a>
+<p>Commons Logging is a generic wrapper around different logging frameworks, so you\u2019ll either need to also use a logging library like <a href="http://logging.apache.org/log4j/">log4j</a>
 or let commons-logging fall back to the standard <a href="http://java.sun.com/j2se/1.4.2/docs/guide/util/logging/overview.html">java.util.logging API</a>
 included in the Java platform.</p>
 
@@ -149,15 +149,15 @@ included in the Java platform.</p>
 
 <p>PDFBox does not ship with all features enabled. Third party components are necessary to get full support for certain functionality.</p>
 
-<h3 id="jai-image-i-o">JAI Image I/O</h3>
+<h3 id="jai-image-io">JAI Image I/O</h3>
 
 <p>PDF supports embedded image files, however support for some formats require third party libraries which are distributed under terms incompatible with the Apache 2.0 license:</p>
 
 <ul>
-<li>Reading <strong>JBIG2</strong> images: <a href="https://github.com/levigo/jbig2-imageio">JBIG2 ImageIO</a> or <a href="https://github.com/Borisvl/JBIG2-Image-Decoder">JBIG2-Image-Decoder
+  <li>Reading <strong>JBIG2</strong> images: <a href="https://github.com/levigo/jbig2-imageio">JBIG2 ImageIO</a> or <a href="https://github.com/Borisvl/JBIG2-Image-Decoder">JBIG2-Image-Decoder
 </a></li>
-<li>Reading <strong>JPEG 2000 (JPX)</strong> images: <a href="https://java.net/projects/jai-imageio-core">JAI Image I/O Tools Core</a></li>
-<li>Writing <strong>TIFF</strong> images requires <em>JAI Image I/O Tools Core</em> also.</li>
+  <li>Reading <strong>JPEG 2000 (JPX)</strong> images: <a href="https://java.net/projects/jai-imageio-core">JAI Image I/O Tools Core</a></li>
+  <li>Writing <strong>TIFF</strong> images requires <em>JAI Image I/O Tools Core</em> also.</li>
 </ul>
 
 <p>These libraries are optional and will be loaded if present on the classpath, otherwise support for these image formats will be disabled and a warning will be logged when an unsupported image is encountered.</p>
@@ -167,7 +167,8 @@ included in the Java platform.</p>
 <h3 id="encryption-and-signing">Encryption and Signing</h3>
 
 <p>Encrypting and sigining PDFs requires the <em>bcprov</em>, <em>bcmail</em> and <em>bcpkix</em> libraries from the <a href="http://www.bouncycastle.org/">Legion of the Bouncy Castle</a>. These can be included in your Maven project using the following dependencies:</p>
-<div class="highlight"><pre><code class="language-" data-lang="">&lt;dependency&gt;
+
+<div class="highlighter-rouge"><pre class="highlight"><code>&lt;dependency&gt;
     &lt;groupId&gt;org.bouncycastle&lt;/groupId&gt;
     &lt;artifactId&gt;bcprov-jdk15on&lt;/artifactId&gt;
     &lt;version&gt;1.54&lt;/version&gt;
@@ -184,12 +185,17 @@ included in the Java platform.</p>
     &lt;artifactId&gt;bcpkix-jdk15on&lt;/artifactId&gt;
     &lt;version&gt;1.54&lt;/version&gt;
 &lt;/dependency&gt;
-</code></pre></div>
+</code></pre>
+</div>
+
 <h3 id="java-cryptography-extension-jce">Java Cryptography Extension (JCE)</h3>
 
-<p>256-bit AES encryption 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 throw an exception with the following message:</p>
-<div class="highlight"><pre><code class="language-" data-lang="">JCE unlimited strength jurisdiction policy files are not installed
-</code></pre></div>
+<p>256-bit AES encryption 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 throw an exception with the following message:</p>
+
+<div class="highlighter-rouge"><pre class="highlight"><code>JCE unlimited strength jurisdiction policy files are not installed
+</code></pre>
+</div>
+
             </div>
         </div>
     </div>

http://git-wip-us.apache.org/repos/asf/pdfbox-docs/blob/799b1d78/content/2.0/getting-started.html
----------------------------------------------------------------------
diff --git a/content/2.0/getting-started.html b/content/2.0/getting-started.html
index 1d580f8..84d5120 100644
--- a/content/2.0/getting-started.html
+++ b/content/2.0/getting-started.html
@@ -136,29 +136,31 @@
 
 <h2 id="maven">Maven</h2>
 
-<p>To use the latest 2.0 snapshot release from the SVN trunk, you&#39;ll need to add the following dependency:</p>
-<div class="highlight"><pre><code class="language-" data-lang="">&lt;dependency&gt;
+<p>To use the latest 2.0 snapshot release from the SVN trunk, you\u2019ll need to add the following dependency:</p>
+
+<div class="highlighter-rouge"><pre class="highlight"><code>&lt;dependency&gt;
   &lt;groupId&gt;org.apache.pdfbox&lt;/groupId&gt;
   &lt;artifactId&gt;pdfbox&lt;/artifactId&gt;
   &lt;version&gt;2.0.0&lt;/version&gt;
 &lt;/dependency&gt;
-</code></pre></div>
+</code></pre>
+</div>
+
 <h2 id="pdfbox-and-java-8">PDFBox and Java 8</h2>
 
 <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>
 
             </div>
         </div>