You are viewing a plain text version of this content. The canonical link for it is here.
Posted to odf-commits@incubator.apache.org by bu...@apache.org on 2017/04/11 11:07:07 UTC

svn commit: r1010223 [1/3] - in /websites/staging/odftoolkit/trunk/content: ./ odftoolkit/ odftoolkit/conformance/ odftoolkit/odfdom/

Author: buildbot
Date: Tue Apr 11 11:07:06 2017
New Revision: 1010223

Log:
Staging update by buildbot for odftoolkit

Modified:
    websites/staging/odftoolkit/trunk/content/   (props changed)
    websites/staging/odftoolkit/trunk/content/odftoolkit/conformance/ODFValidator.html
    websites/staging/odftoolkit/trunk/content/odftoolkit/contact.html
    websites/staging/odftoolkit/trunk/content/odftoolkit/downloads.html
    websites/staging/odftoolkit/trunk/content/odftoolkit/index.html
    websites/staging/odftoolkit/trunk/content/odftoolkit/mailing-lists.html
    websites/staging/odftoolkit/trunk/content/odftoolkit/odfdom/index.html
    websites/staging/odftoolkit/trunk/content/odftoolkit/odftoolkit-release-guide.html
    websites/staging/odftoolkit/trunk/content/odftoolkit/source.html

Propchange: websites/staging/odftoolkit/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Tue Apr 11 11:07:06 2017
@@ -1 +1 @@
-1727638
+1790954

Modified: websites/staging/odftoolkit/trunk/content/odftoolkit/conformance/ODFValidator.html
==============================================================================
--- websites/staging/odftoolkit/trunk/content/odftoolkit/conformance/ODFValidator.html (original)
+++ websites/staging/odftoolkit/trunk/content/odftoolkit/conformance/ODFValidator.html Tue Apr 11 11:07:06 2017
@@ -50,7 +50,18 @@
   <div id="clear"></div>
   
   <div id="sidenav">
-    <h1 id="general">General</h1>
+    <style type="text/css">
+/* The following code is added by mdx_elementid.py
+   It was originally lifted from http://subversion.apache.org/style/site.css */
+/*
+ * Hide class="elementid-permalink", except when an enclosing heading
+ * has the :hover property.
+ */
+.headerlink, .elementid-permalink {
+  visibility: hidden;
+}
+h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover > .headerlink, h4:hover > .headerlink, h5:hover > .headerlink, dt:hover > .elementid-permalink { visibility: visible }</style>
+<h1 id="general">General<a class="headerlink" href="#general" title="Permanent link">&para;</a></h1>
 <ul>
 <li><a href="/odftoolkit/index.html">About</a></li>
 <li><a href="/odftoolkit/downloads.html">Downloads</a></li>
@@ -58,21 +69,21 @@
 <li><a href="/odftoolkit/license.html">License</a></li>
 <li><a href="/odftoolkit/privacy.html">Privacy Policy</a></li>
 </ul>
-<h1 id="components">Components</h1>
+<h1 id="components">Components<a class="headerlink" href="#components" title="Permanent link">&para;</a></h1>
 <ul>
 <li><a href="/odftoolkit/odfdom/index.html">ODFDOM</a></li>
 <li><a href="/odftoolkit/simple/index.html">Simple API</a></li>
 <li><a href="/odftoolkit/conformance/ODFValidator.html">ODF Validator</a></li>
 <li><a href="/odftoolkit/xsltrunner/ODFXSLTRunner.html">XSLT Runner</a></li>
 </ul>
-<h1 id="community">Community</h1>
+<h1 id="community">Community<a class="headerlink" href="#community" title="Permanent link">&para;</a></h1>
 <ul>
 <li><a href="/odftoolkit/get-involved.html">Get Involved</a></li>
 <li><a href="/odftoolkit/mailing-lists.html">Mailing Lists</a></li>
 <li><a href="/odftoolkit/people.html">People</a></li>
 <li><a href="/odftoolkit/community-faqs.html">Community FAQs</a></li>
 </ul>
-<h1 id="development">Development</h1>
+<h1 id="development">Development<a class="headerlink" href="#development" title="Permanent link">&para;</a></h1>
 <ul>
 <li><a href="/odftoolkit/source.html">Source Code</a></li>
 <li><a href="https://issues.apache.org/jira/browse/ODFTOOLKIT">Bug Tracker</a></li>
@@ -80,13 +91,12 @@
 <li><a href="/odftoolkit/website-local.html">Website</a></li>
 <li><a href="/odftoolkit/developer-faqs.html">Developer FAQs</a></li>
 </ul>
-<h1 id="ppmc">PPMC</h1>
+<h1 id="ppmc">PPMC<a class="headerlink" href="#ppmc" title="Permanent link">&para;</a></h1>
 <ul>
 <li><a href="/odftoolkit/ppmc-faqs.html">PPMC FAQs</a></li>
-<li><a href="/odftoolkit/odftoolkit-release-guide.html">Release Guide</a> <br />
-</li>
+<li><a href="/odftoolkit/odftoolkit-release-guide.html">Release Guide</a>   </li>
 </ul>
-<h1 id="asf">ASF</h1>
+<h1 id="asf">ASF<a class="headerlink" href="#asf" title="Permanent link">&para;</a></h1>
 <ul>
 <li><a href="http://www.apache.org">Apache Software Foundation</a></li>
 <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
@@ -96,11 +106,22 @@
   <div id="contenta">
   
     <h1 class="title">ODF Validator</h1>
-    <p><strong>ODF Validator</strong> is a tool that validates OpenDocument files and checks them for certain conformance criteria.</p>
-<p><strong>ODF Validator</strong> is available as Java library for command line or embedded use, 
+    <style type="text/css">
+/* The following code is added by mdx_elementid.py
+   It was originally lifted from http://subversion.apache.org/style/site.css */
+/*
+ * Hide class="elementid-permalink", except when an enclosing heading
+ * has the :hover property.
+ */
+.headerlink, .elementid-permalink {
+  visibility: hidden;
+}
+h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover > .headerlink, h4:hover > .headerlink, h5:hover > .headerlink, dt:hover > .elementid-permalink { visibility: visible }</style>
+<p><strong>ODF Validator</strong> is a tool that validates OpenDocument files and checks them for certain conformance criteria.</p>
+<p><strong>ODF Validator</strong> is available as Java library for command line or embedded use,
 as well as a servlet.  An instance of the servlet is <a href="http://odf-validator.rhcloud.com/">hosted online</a> courtesy of the
-<a href="http://www.opendocsociety.org/">OpenDoc Society</a>.  This page primarily describes the command line tool. </p>
-<h2 id="how-to-start">How to start</h2>
+<a href="http://www.opendocsociety.org/">OpenDoc Society</a>.  This page primarily describes the command line tool.</p>
+<h2 id="how-to-start">How to start<a class="headerlink" href="#how-to-start" title="Permanent link">&para;</a></h2>
 <p>To use the '''ODF Validator''', the following steps are required:</p>
 <ul>
 <li>Get the source code.</li>
@@ -108,42 +129,43 @@ as well as a servlet.  An instance of th
 <li>Get the ODF 1.0, 1,1 and 1.2 schemas, and add the directories where your local copies of the schemas are stored to the '''schema.user.properties''' file.</li>
 <li>Get the MathML 1.01 DTD and the MathML 2.0 schemas, and add the directories where you local copies of the schemas are stored to the '''schema.user.properties''' file.</li>
 <li>Build the project.</li>
+<li>You may deploy the WAR bundle from the target file into your application server of choice (e.g. Tomcat)</li>
 <li>Choose an arbitrary OpenDocument file &lt;odffile&gt;</li>
 <li>
-<p>If you are using JRE 1.5, call the '''ODF Validator''' with</p>
-<p>java -jar "<path>/odfvalidator.jar" &lt;odffile&gt;</p>
+<p>OR for command line usage and help, call the '''ODF Validator''' with</p>
+<p>java -jar "./target/odfvalidator-&lt;VERSION&gt;-incubating-jar-with-dependencies.jar" &lt;odffile&gt;</p>
 </li>
 <li>
-<p>If you are using JRE 1.6, call the ODF Validator with</p>
-<p>java 
+<p>You may call the ODF Validator with</p>
+<p>java
   -Djavax.xml.validation.SchemaFactory:http://relaxng.org/ns/structure/1.0=org.iso_relax.verifier.jaxp.validation.RELAXNGSchemaFactoryImpl
   -Dorg.iso_relax.verifier.VerifierFactoryLoader=com.sun.msv.verifier.jarv.FactoryLoaderImpl
-  -jar "<path>/odfvalidator.jar"  &lt;odffile&gt;</p>
+  -jar "&lt;PATH&gt;/odfvalidator-&lt;VERSION&gt;-incubating-jar-with-dependencies.jar"  &lt;odffile&gt;</p>
 </li>
 </ul>
-<h2 id="usage">Usage</h2>
-<h3 id="usage-summary">Usage Summary</h3>
-<p>In an Java 1.5 environment, <strong>ODF Validator</strong> is invoked by the following command:</p>
-<div class="codehilite"><pre> <span class="n">java</span> <span class="o">-</span><span class="n">jar</span> <span class="s">&quot;&lt;path&gt;/odfvalidator.jar&quot;</span>
+<h2 id="usage">Usage<a class="headerlink" href="#usage" title="Permanent link">&para;</a></h2>
+<h3 id="usage-summary">Usage Summary<a class="headerlink" href="#usage-summary" title="Permanent link">&para;</a></h3>
+<p>In a command-line environment, <strong>ODF Validator</strong> is invoked by the following command:</p>
+<div class="codehilite"><pre> <span class="n">java</span> <span class="o">-</span><span class="n">jar</span> &quot;<span class="o">&lt;</span><span class="n">path</span><span class="o">&gt;/</span><span class="n">odfvalidator</span><span class="o">-</span><span class="n">VERSION</span><span class="o">-</span><span class="n">incubating</span><span class="o">-</span><span class="n">jar</span><span class="o">-</span><span class="n">with</span><span class="o">-</span><span class="n">dependencies</span><span class="p">.</span><span class="n">jar</span>&quot;
 </pre></div>
 
 
-<p>In an Java 1.6 environment, the following command line has to be used:</p>
+<p>For instance, with the following parameters:</p>
 <div class="codehilite"><pre><span class="n">java</span>
-  <span class="o">-</span><span class="n">Djavax</span><span class="o">.</span><span class="n">xml</span><span class="o">.</span><span class="n">validation</span><span class="o">.</span><span class="n">SchemaFactory:http:</span><span class="sr">//</span><span class="n">relaxng</span><span class="o">.</span><span class="n">org</span><span class="sr">/ns/s</span><span class="n">tructure</span><span class="o">/</span><span class="mf">1.0</span><span class="o">=</span><span class="n">org</span><span class="o">.</span><span class="n">iso_relax</span><span class="o">.</span><span class="n">verifier</span><span class="o">.</span><span class="n">jaxp</span><span class="o">.</span><span class="n">validation</span><span class="o">.</span><span class="n">RELAXNGSchemaFactoryImpl</span>
-  <span class="o">-</span><span class="n">Dorg</span><span class="o">.</span><span class="n">iso_relax</span><span class="o">.</span><span class="n">verifier</span><span class="o">.</span><span class="n">VerifierFactoryLoader</span><span class="o">=</span><span class="n">com</span><span class="o">.</span><span class="n">sun</span><span class="o">.</span><span class="n">msv</span><span class="o">.</span><span class="n">verifier</span><span class="o">.</span><span class="n">jarv</span><span class="o">.</span><span class="n">FactoryLoaderImpl</span>
-  <span class="o">-</span><span class="n">jar</span> <span class="s">&quot;&lt;path&gt;/odfvalidator.jar&quot;</span>
+  <span class="o">-</span><span class="n">Djavax</span><span class="p">.</span><span class="n">xml</span><span class="p">.</span><span class="n">validation</span><span class="p">.</span><span class="n">SchemaFactory</span><span class="p">:</span><span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">relaxng</span><span class="p">.</span><span class="n">org</span><span class="o">/</span><span class="n">ns</span><span class="o">/</span><span class="n">structure</span><span class="o">/</span>1<span class="p">.</span>0<span class="p">=</span><span class="n">org</span><span class="p">.</span><span class="n">iso_relax</span><span class="p">.</span><span class="n">verifier</span><span class="p">.</span><span class="n">jaxp</span><span class="p">.</span><span class="n">validation</span><span class="p">.</span><span class="n">RELAXNGSchemaFactoryImpl</span>
+  <span class="o">-</span><span class="n">Dorg</span><span class="p">.</span><span class="n">iso_relax</span><span class="p">.</span><span class="n">verifier</span><span class="p">.</span><span class="n">VerifierFactoryLoader</span><span class="p">=</span><span class="n">com</span><span class="p">.</span><span class="n">sun</span><span class="p">.</span><span class="n">msv</span><span class="p">.</span><span class="n">verifier</span><span class="p">.</span><span class="n">jarv</span><span class="p">.</span><span class="n">FactoryLoaderImpl</span>
+  <span class="o">-</span><span class="n">jar</span> &quot;<span class="o">&lt;</span><span class="n">path</span><span class="o">&gt;/</span><span class="n">odfvalidator</span><span class="o">-&lt;</span><span class="n">VERSION</span><span class="o">&gt;-</span><span class="n">incubating</span><span class="o">-</span><span class="n">jar</span><span class="o">-</span><span class="n">with</span><span class="o">-</span><span class="n">dependencies</span><span class="p">.</span><span class="n">jar</span>&quot;
 </pre></div>
 
 
 <p>These command lines are abbreviated <em>odfvalidator</em> from now on.</p>
 <p>The <strong>ODF Validator</strong> may be called with the following options:</p>
-<div class="codehilite"><pre> <span class="n">odfvalidator</span> <span class="p">[</span><span class="o">-</span><span class="n">r</span><span class="p">]</span> <span class="p">[</span><span class="o">-</span><span class="n">c</span><span class="o">|-</span><span class="n">e</span><span class="o">|-</span><span class="n">s</span><span class="p">]</span> <span class="p">[</span><span class="o">-</span><span class="n">d</span><span class="p">]</span> <span class="p">[</span><span class="o">-</span><span class="n">v</span><span class="o">|-</span><span class="n">w</span><span class="p">]</span> <span class="p">[</span><span class="o">-</span><span class="n">x</span> <span class="o">&lt;</span><span class="n">expclude</span> <span class="n">pattern</span><span class="o">&gt;</span><span class="p">]</span> 
-              <span class="p">[</span><span class="o">-</span><span class="n">o</span> <span class="n">outputfile</span><span class="p">]</span> <span class="p">[</span><span class="o">-</span><span class="mf">1.0</span><span class="o">|-</span><span class="mf">1.1</span><span class="o">|-</span><span class="mf">1.2</span><span class="p">]</span> <span class="sr">&lt;odffiles&gt;</span>
+<div class="codehilite"><pre> <span class="n">odfvalidator</span> <span class="p">[</span><span class="o">-</span><span class="n">r</span><span class="p">]</span> <span class="p">[</span><span class="o">-</span><span class="n">c</span><span class="o">|-</span><span class="n">e</span><span class="o">|-</span><span class="n">s</span><span class="p">]</span> <span class="p">[</span><span class="o">-</span><span class="n">d</span><span class="p">]</span> <span class="p">[</span><span class="o">-</span><span class="n">v</span><span class="o">|-</span><span class="n">w</span><span class="p">]</span> <span class="p">[</span><span class="o">-</span><span class="n">x</span> <span class="o">&lt;</span><span class="n">expclude</span> <span class="n">pattern</span><span class="o">&gt;</span><span class="p">]</span>
+              <span class="p">[</span><span class="o">-</span><span class="n">o</span> <span class="n">outputfile</span><span class="p">]</span> <span class="p">[</span><span class="o">-</span>1<span class="p">.</span>0<span class="o">|-</span>1<span class="p">.</span>1<span class="o">|-</span>1<span class="p">.</span>2<span class="p">]</span> <span class="o">&lt;</span><span class="n">odffiles</span><span class="o">&gt;</span>
  <span class="n">odfvalidator</span> <span class="p">[</span><span class="o">-</span><span class="n">r</span><span class="p">]</span> <span class="p">[</span><span class="o">-</span><span class="n">c</span><span class="o">|-</span><span class="n">e</span><span class="o">|-</span><span class="n">s</span><span class="p">]</span> <span class="p">[</span><span class="o">-</span><span class="n">d</span><span class="p">]</span> <span class="p">[</span><span class="o">-</span><span class="n">v</span><span class="o">|-</span><span class="n">w</span><span class="p">]</span> <span class="p">[</span><span class="o">-</span><span class="n">x</span> <span class="o">&lt;</span><span class="n">expclude</span> <span class="n">pattern</span><span class="o">&gt;</span><span class="p">]</span>
-              <span class="p">[</span><span class="o">-</span><span class="n">o</span> <span class="n">outputfile</span><span class="p">]</span> <span class="o">-</span><span class="n">S</span> <span class="sr">&lt;schemafile&gt;</span> <span class="o">&amp;</span><span class="ow">lt</span><span class="p">;</span><span class="n">odffiles</span><span class="o">&gt;</span>
- <span class="n">odfvalidator</span> <span class="p">[</span><span class="o">-</span><span class="n">c</span><span class="o">|-</span><span class="n">s</span><span class="p">]</span> <span class="p">[</span><span class="o">-</span><span class="n">v</span><span class="o">|-</span><span class="n">w</span><span class="p">]</span> <span class="p">[</span><span class="o">-</span><span class="n">d</span><span class="p">]</span> <span class="p">[</span><span class="o">-</span><span class="n">o</span> <span class="n">outputfile</span><span class="p">]</span> <span class="o">-</span><span class="n">C</span> <span class="o">&amp;</span><span class="ow">lt</span><span class="p">;</span><span class="n">configfile</span><span class="o">&gt;</span>
- <span class="n">odfvalidator</span> <span class="o">-</span><span class="n">g</span> <span class="sr">&lt;odffiles&gt;</span>
+              <span class="p">[</span><span class="o">-</span><span class="n">o</span> <span class="n">outputfile</span><span class="p">]</span> <span class="o">-</span><span class="n">S</span> <span class="o">&lt;</span><span class="n">schemafile</span><span class="o">&gt;</span> <span class="o">&amp;</span><span class="n">lt</span><span class="p">;</span><span class="n">odffiles</span><span class="o">&gt;</span>
+ <span class="n">odfvalidator</span> <span class="p">[</span><span class="o">-</span><span class="n">c</span><span class="o">|-</span><span class="n">s</span><span class="p">]</span> <span class="p">[</span><span class="o">-</span><span class="n">v</span><span class="o">|-</span><span class="n">w</span><span class="p">]</span> <span class="p">[</span><span class="o">-</span><span class="n">d</span><span class="p">]</span> <span class="p">[</span><span class="o">-</span><span class="n">o</span> <span class="n">outputfile</span><span class="p">]</span> <span class="o">-</span><span class="n">C</span> <span class="o">&amp;</span><span class="n">lt</span><span class="p">;</span><span class="n">configfile</span><span class="o">&gt;</span>
+ <span class="n">odfvalidator</span> <span class="o">-</span><span class="n">g</span> <span class="o">&lt;</span><span class="n">odffiles</span><span class="o">&gt;</span>
  <span class="n">odfvalidator</span> <span class="o">-</span><span class="n">h</span>
  <span class="n">odfvalidator</span> <span class="o">-</span><span class="n">V</span>
 </pre></div>
@@ -161,81 +183,81 @@ as well as a servlet.  An instance of th
 <p><strong>-h</strong>: Print a short help.</p>
 <p><strong>-o</strong>: Print output into specified file rather than standard output.</p>
 <p><strong>-r</strong>: Process directories recursively.</p>
-<p><strong>-s</strong>: Use the strict schema for validation (ODF 1.0/1.1 documents only). </p>
+<p><strong>-s</strong>: Use the strict schema for validation (ODF 1.0/1.1 documents only).</p>
 <p><strong>-v</strong>: Verbose: print information like the generator or the documents that are processed.</p>
 <p><strong>-w</strong>: Print warnings.</p>
 <p><strong>-x</strong>: Exclude files that match the specified <a href="http://java.sun.com/j2se/1.5.0/docs/api/java/util/regex/Pattern.html#sum">regular expression</a> from validation.</p>
 <p><strong>-C</strong>: Validate using configuration file <strong>&lt;configfile&gt;</strong>.</p>
 <p><strong>-S</strong>: Use the specified <strong>&lt;schemafile&gt;</strong> for validation.</p>
 <p><strong>-V</strong>: Print version information.</p>
-<h3 id="validation-using-default-schemas">Validation using default schemas</h3>
-<p>The ODF 1.0, ODF 1.1, ODF 1.2 schemas as well as the MathML 1.01 DTD and 
-the MathML 2.0 schema are included in the <strong>ODFValidator.jar</strong> file. If 
+<h3 id="validation-using-default-schemas">Validation using default schemas<a class="headerlink" href="#validation-using-default-schemas" title="Permanent link">&para;</a></h3>
+<p>The ODF 1.0, ODF 1.1, ODF 1.2 schemas as well as the MathML 1.01 DTD and
+the MathML 2.0 schema are included in the <strong>ODFValidator.jar</strong> file. If
 the ODFValidator is called without the <strong>-S</strong> or <strong>-C</strong> options, these schemas are used for validation.</p>
 <div class="codehilite"><pre><span class="n">odfvalidator</span> <span class="p">[</span><span class="o">-</span><span class="n">r</span><span class="p">]</span> <span class="p">[</span><span class="o">-</span><span class="n">c</span><span class="o">|-</span><span class="n">e</span><span class="o">|-</span><span class="n">s</span><span class="p">]</span> <span class="p">[</span><span class="o">-</span><span class="n">d</span><span class="p">]</span> <span class="p">[</span><span class="o">-</span><span class="n">v</span><span class="o">|-</span><span class="n">w</span><span class="p">]</span> <span class="p">[</span><span class="o">-</span><span class="n">x</span> <span class="o">&lt;</span><span class="n">expclude</span> <span class="n">pattern</span><span class="o">&gt;</span><span class="p">]</span>
-              <span class="p">[</span><span class="o">-</span><span class="n">o</span> <span class="n">outputfile</span><span class="p">]</span> <span class="p">[</span><span class="o">-</span><span class="mf">1.0</span><span class="o">|-</span><span class="mf">1.1</span><span class="o">|-</span><span class="mf">1.2</span><span class="p">]</span> <span class="sr">&lt;odffiles&gt;</span>
+              <span class="p">[</span><span class="o">-</span><span class="n">o</span> <span class="n">outputfile</span><span class="p">]</span> <span class="p">[</span><span class="o">-</span>1<span class="p">.</span>0<span class="o">|-</span>1<span class="p">.</span>1<span class="o">|-</span>1<span class="p">.</span>2<span class="p">]</span> <span class="o">&lt;</span><span class="n">odffiles</span><span class="o">&gt;</span>
 </pre></div>
 
 
-<p><strong>&lt;odffiles&gt;</strong> is the list of files and directories that should be 
-validated. If a directory is specified, all files that have an OpenDocument 
-extension (like <strong>odt</strong>, <strong>ods</strong> or <strong>ott</strong>) are validated. If <strong>-r</strong> is 
+<p><strong>&lt;odffiles&gt;</strong> is the list of files and directories that should be
+validated. If a directory is specified, all files that have an OpenDocument
+extension (like <strong>odt</strong>, <strong>ods</strong> or <strong>ott</strong>) are validated. If <strong>-r</strong> is
 specified additionally, all directories are processed recursively.</p>
-<p>By default, the <strong>ODF Validator</strong> detects the version of the files that 
-shall be validated and chooses the corresponding schema. The command line 
-options <strong>-1.0</strong>', <strong>-1.1</strong> and <strong>-1.2</strong> can be used to specify that the 
-schemas of a particular ODF version should be used for all files, 
+<p>By default, the <strong>ODF Validator</strong> detects the version of the files that
+shall be validated and chooses the corresponding schema. The command line
+options <strong>-1.0</strong>', <strong>-1.1</strong> and <strong>-1.2</strong> can be used to specify that the
+schemas of a particular ODF version should be used for all files,
 regardless of the version they specify themselves.</p>
-<p>The command line option <strong>-d</strong> specifies that the MathML 1.01 DTD should 
-be used for the validation of the <strong>content.xml</strong> of formula documents. 
+<p>The command line option <strong>-d</strong> specifies that the MathML 1.01 DTD should
+be used for the validation of the <strong>content.xml</strong> of formula documents.
 Default is to use the MathML 2.0 schema.</p>
-<p>If the <strong>-c</strong> command line option is specified and if the validated document 
-is an ODF 1.0 or ODF 1.1 document, unknown markup is ignored as specified 
-in the conformance rules for ODF 1.0/1.1.  If the <strong>-s</strong> command line 
-option is specified and if the validated document is an ODF 1.0 or ODF 1.1 
-document, the strict schema is used for validation. If the <strong>-e</strong> command 
-line option is specified and if the validated document is an ODF 1.2 
-document, unknown markup is ignored as specified in the extended conformance 
-class rules for ODF 1.2. If neither <strong>-c</strong> nor <strong>-e</strong>  nor <strong>-s</strong> 
-are specified, the regular ODF schemas are used and errors are reported 
-for unknown markup, unless it appears in styles or metadata of ODF 1.0/1.1 
+<p>If the <strong>-c</strong> command line option is specified and if the validated document
+is an ODF 1.0 or ODF 1.1 document, unknown markup is ignored as specified
+in the conformance rules for ODF 1.0/1.1.  If the <strong>-s</strong> command line
+option is specified and if the validated document is an ODF 1.0 or ODF 1.1
+document, the strict schema is used for validation. If the <strong>-e</strong> command
+line option is specified and if the validated document is an ODF 1.2
+document, unknown markup is ignored as specified in the extended conformance
+class rules for ODF 1.2. If neither <strong>-c</strong> nor <strong>-e</strong>  nor <strong>-s</strong>
+are specified, the regular ODF schemas are used and errors are reported
+for unknown markup, unless it appears in styles or metadata of ODF 1.0/1.1
 documents.</p>
-<p>The optional <strong>-x</strong> switch allows to exclude certain files or directories 
-from the validation. The files that shall be excluded are specified by a 
-<a href="http://java.sun.com/j2se/1.5.0/docs/api/java/util/regex/Pattern.html#sum">regular expression</a>. Please note that the full absolute path names of 
-directories and files are matched against this pattern. This means that the 
-regular expression either must include the absolute path of the files and 
-directories that shall be excluded, or must start with <strong>.</strong>*. 
-The <strong>-x</strong> option can be specified only once. If several paths shall 
-be excluded, these paths have to be specified in a single regular 
-expression using the <strong>|</strong> operator.</p>
+<p>The optional <strong>-x</strong> switch allows to exclude certain files or directories
+from the validation. The files that shall be excluded are specified by a
+<a href="http://java.sun.com/j2se/1.5.0/docs/api/java/util/regex/Pattern.html#sum">regular expression</a>. Please note that the full absolute path names of
+directories and files are matched against this pattern. This means that the
+regular expression either must include the absolute path of the files and
+directories that shall be excluded, or must start with <strong>.<strong><em>.
+The </em>*-x</strong> option can be specified only once. If several paths shall
+be excluded, these paths have to be specified in a single regular
+expression using the </strong>|** operator.</p>
 <p>If <strong>-w</strong> is specified additionally, not only validation errors are reported, but also warnings.</p>
 <p>If <strong>-v</strong> is specified additionally, not only validation errors and warnings are reported, but also the generator stored in the manifest, MIME types, the files that are processed, etc.</p>
 <p>If the <strong>-o</strong> option is present, all messages go into the specified file. Otherwise, they are printed to standard out.</p>
-<h3 id="validation-using-a-non-default-schema">Validation using a non-default schema</h3>
-<p>To specify the schema that is used for <strong>meta-xml</strong>, <strong>content.xml</strong>, 
-<strong>styles.xml</strong> and <strong>settings.xml</strong> on the command line, 
+<h3 id="validation-using-a-non-default-schema">Validation using a non-default schema<a class="headerlink" href="#validation-using-a-non-default-schema" title="Permanent link">&para;</a></h3>
+<p>To specify the schema that is used for <strong>meta-xml</strong>, <strong>content.xml</strong>,
+<strong>styles.xml</strong> and <strong>settings.xml</strong> on the command line,
 <strong>ODF Validator</strong> has to be called with the following parameters:</p>
-<div class="codehilite"><pre><span class="n">odfvalidator</span> <span class="p">[</span><span class="o">-</span><span class="n">r</span><span class="p">]</span> <span class="p">[</span><span class="o">-</span><span class="n">c</span><span class="o">|-</span><span class="n">e</span><span class="o">|-</span><span class="n">s</span><span class="p">]</span> <span class="p">[</span><span class="o">-</span><span class="n">d</span><span class="p">]</span> <span class="p">[</span><span class="o">-</span><span class="n">v</span><span class="o">|-</span><span class="n">w</span><span class="p">]</span> <span class="p">[</span><span class="o">-</span><span class="n">x</span> <span class="o">&amp;</span><span class="ow">lt</span><span class="p">;</span><span class="n">expclude</span> <span class="n">pattern</span><span class="o">&amp;</span><span class="ow">gt</span><span class="p">;]</span>
- <span class="p">[</span><span class="o">-</span><span class="n">o</span> <span class="n">outputfile</span><span class="p">]</span> <span class="o">-</span><span class="n">S</span> <span class="sr">&lt;schemafile&gt;</span> <span class="sr">&lt;odffiles&gt;</span>
+<div class="codehilite"><pre><span class="n">odfvalidator</span> <span class="p">[</span><span class="o">-</span><span class="n">r</span><span class="p">]</span> <span class="p">[</span><span class="o">-</span><span class="n">c</span><span class="o">|-</span><span class="n">e</span><span class="o">|-</span><span class="n">s</span><span class="p">]</span> <span class="p">[</span><span class="o">-</span><span class="n">d</span><span class="p">]</span> <span class="p">[</span><span class="o">-</span><span class="n">v</span><span class="o">|-</span><span class="n">w</span><span class="p">]</span> <span class="p">[</span><span class="o">-</span><span class="n">x</span> <span class="o">&amp;</span><span class="n">lt</span><span class="p">;</span><span class="n">expclude</span> <span class="n">pattern</span><span class="o">&amp;</span><span class="n">gt</span><span class="p">;]</span>
+ <span class="p">[</span><span class="o">-</span><span class="n">o</span> <span class="n">outputfile</span><span class="p">]</span> <span class="o">-</span><span class="n">S</span> <span class="o">&lt;</span><span class="n">schemafile</span><span class="o">&gt;</span> <span class="o">&lt;</span><span class="n">odffiles</span><span class="o">&gt;</span>
 </pre></div>
 
 
 <p><strong>&lt;schemafile&gt;</strong> is the schema that shall be used.</p>
 <p>All other command line option are as described in <em>Validation using default schemas</em>.</p>
-<h3 id="validation-using-a-configuration-file">Validation using a configuration file</h3>
-<p>The schemas and the files that should be validated can be specified in a 
-configuration file. A configuration file is a Java XML properties file as 
-described in the <a href="http://java.sun.com/j2se/1.5.0/docs/api/java/util/Properties.html">Java 2 API documentation</a>. The following properties 
+<h3 id="validation-using-a-configuration-file">Validation using a configuration file<a class="headerlink" href="#validation-using-a-configuration-file" title="Permanent link">&para;</a></h3>
+<p>The schemas and the files that should be validated can be specified in a
+configuration file. A configuration file is a Java XML properties file as
+described in the <a href="http://java.sun.com/j2se/1.5.0/docs/api/java/util/Properties.html">Java 2 API documentation</a>. The following properties
 are supported:</p>
 <ul>
 <li><strong>strict-schema</strong>: Specifies the strict schema to be used.</li>
 <li><strong>manifest-schema</strong>: Specifies the manifest schema to be used.</li>
 <li><strong>mathml-schema</strong>: Specifies the MathML 1.01 schema to be used.</li>
 <li><strong>mathml2-schema</strong>: Specifies the MathML 2 schema to be used.</li>
-<li><strong>path</strong>*: All properties whose names start with "path" are considered to be files or directories that shall be validated. </li>
+<li><strong>path</strong>*: All properties whose names start with "path" are considered to be files or directories that shall be validated.</li>
 <li><strong>recursive</strong>: This boolean property specifies whether directories are scanned recursively. It takes the values <strong>true</strong> and <strong>false</strong>.</li>
-<li><strong>exclude</strong>: Specifies files and directories that shall be excluded as 
+<li><strong>exclude</strong>: Specifies files and directories that shall be excluded as
 a <a href="http://java.sun.com/j2se/1.5.0/docs/api/java/util/regex/Pattern.html#sum">regular expression</a>. See description of <strong>-x</strong> option.</li>
 </ul>
 <p>A sample configuration file looks like this:</p>
@@ -251,7 +273,7 @@ a <a href="http://java.sun.com/j2se/1.5.
 </pre></div>
 
 
-<h2 id="what-is-checked">What is checked?</h2>
+<h2 id="what-is-checked">What is checked?<a class="headerlink" href="#what-is-checked" title="Permanent link">&para;</a></h2>
 <p>The following items are checked:</p>
 <ul>
 <li>OpenDocument v1.2 documents:<ul>
@@ -260,7 +282,7 @@ a <a href="http://java.sun.com/j2se/1.5.
 </ul>
 </li>
 <li>OpenDocument v1.1/1.0 documents:<ul>
-<li>If the test type is <strong>conformance test</strong> (<strong>-c</strong> is provided), 
+<li>If the test type is <strong>conformance test</strong> (<strong>-c</strong> is provided),
 and if the file is not a formula file, then the sub files <em>content.xml</em>, <em>styles.xml</em>, <em>meta.xml</em> and <em>settings.xml</em> are pre-processed as described in section 1.5 of the <a href="http://docs.oasis-open.org/office/v1.1/OS/OpenDocument-v1.1.odt">OpenDocument specification</a> (that is <em>foreign elements and attributes</em> are removed), and are then validated with respect to the schema of the selected OpenDocument version.</li>
 <li>If the test type is <strong>validation</strong> (default), and if the file is not a formula file, then the sub files <em>content.xml</em>, <em>styles.xml</em>, <em>meta.xml</em> and <em>settings.xml</em> are validated with respect to the schema of the selected OpenDocument version. Pre-processing of <em>foreign elements and attributes</em> is not applied.</li>
 <li>If the test type is <strong>strict validation</strong> (<strong>-s</strong> is provided), and if the file is not a formula file, then the sub files <em>content.xml</em>, <em>styles.xml</em>, <em>meta.xml</em> and <em>settings.xml</em> are validated with respect to the strict schema of the selected OpenDocument version. Pre-processing of <em>foreign elements and attributes</em> is not applied.</li>
@@ -312,35 +334,35 @@ and if the file is not a formula file, t
     2.x database documents, because database documents are included in OpenDocument since version 1.2 only. Changing them enables the
     validation of  OpenOffice.org 2.x database documents.</li>
 </ul>
-<h2 id="where-do-i-get-the-schemas">Where do I get the schemas?</h2>
-<p>The OpenDocument schemas are available on the <a href="http://www.oasis-open.org/committees/tc_home.php?wg_abbrev=office">OASIS OpenDocument Technical 
-Committee</a> page. The ODF 1.0 and 1.1 schemas can be downloaded directly 
-from that page]. A zip file containing the most recent ODF 1.2 schemas is 
+<h2 id="where-do-i-get-the-schemas">Where do I get the schemas?<a class="headerlink" href="#where-do-i-get-the-schemas" title="Permanent link">&para;</a></h2>
+<p>The OpenDocument schemas are available on the <a href="http://www.oasis-open.org/committees/tc_home.php?wg_abbrev=office">OASIS OpenDocument Technical
+Committee</a> page. The ODF 1.0 and 1.1 schemas can be downloaded directly
+from that page]. A zip file containing the most recent ODF 1.2 schemas is
 available in the document section.</p>
-<p>The MathML DTD that is included in the ODF Validator us the one that is 
-included in the <strong>/share/dtd/math/1_01/</strong> folder of each 
+<p>The MathML DTD that is included in the ODF Validator us the one that is
+included in the <strong>/share/dtd/math/1_01/</strong> folder of each
 OpenOffice.org/Oracle Open Office installation.</p>
-<h2 id="requirements">Requirements</h2>
+<h2 id="requirements">Requirements<a class="headerlink" href="#requirements" title="Permanent link">&para;</a></h2>
 <p><strong>ODF Validator</strong> requires J2RE 1.5 or J2RE 1.6. For J2RE 1.6, the following options have to be included into the <strong>java</strong> command line:</p>
-<div class="codehilite"><pre> <span class="o">-</span><span class="n">Djavax</span><span class="o">.</span><span class="n">xml</span><span class="o">.</span><span class="n">validation</span><span class="o">.</span><span class="n">SchemaFactory:http:</span><span class="sr">//</span><span class="n">relaxng</span><span class="o">.</span><span class="n">org</span><span class="sr">/ns/s</span><span class="n">tructure</span><span class="o">/</span><span class="mf">1.0</span><span class="o">=</span><span class="n">org</span><span class="o">.</span><span class="n">iso_relax</span><span class="o">.</span><span class="n">verifier</span><span class="o">.</span><span class="n">jaxp</span><span class="o">.</span><span class="n">validation</span><span class="o">.</span><span class="n">RELAXNGSchemaFactoryImpl</span>  
- <span class="o">-</span><span class="n">Dorg</span><span class="o">.</span><span class="n">iso_relax</span><span class="o">.</span><span class="n">verifier</span><span class="o">.</span><span class="n">VerifierFactoryLoader</span><span class="o">=</span><span class="n">com</span><span class="o">.</span><span class="n">sun</span><span class="o">.</span><span class="n">msv</span><span class="o">.</span><span class="n">verifier</span><span class="o">.</span><span class="n">jarv</span><span class="o">.</span><span class="n">FactoryLoaderImpl</span>
+<div class="codehilite"><pre> <span class="o">-</span><span class="n">Djavax</span><span class="p">.</span><span class="n">xml</span><span class="p">.</span><span class="n">validation</span><span class="p">.</span><span class="n">SchemaFactory</span><span class="p">:</span><span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">relaxng</span><span class="p">.</span><span class="n">org</span><span class="o">/</span><span class="n">ns</span><span class="o">/</span><span class="n">structure</span><span class="o">/</span>1<span class="p">.</span>0<span class="p">=</span><span class="n">org</span><span class="p">.</span><span class="n">iso_relax</span><span class="p">.</span><span class="n">verifier</span><span class="p">.</span><span class="n">jaxp</span><span class="p">.</span><span class="n">validation</span><span class="p">.</span><span class="n">RELAXNGSchemaFactoryImpl</span>
+ <span class="o">-</span><span class="n">Dorg</span><span class="p">.</span><span class="n">iso_relax</span><span class="p">.</span><span class="n">verifier</span><span class="p">.</span><span class="n">VerifierFactoryLoader</span><span class="p">=</span><span class="n">com</span><span class="p">.</span><span class="n">sun</span><span class="p">.</span><span class="n">msv</span><span class="p">.</span><span class="n">verifier</span><span class="p">.</span><span class="n">jarv</span><span class="p">.</span><span class="n">FactoryLoaderImpl</span>
 </pre></div>
 
 
 <p><strong>ODF Validator</strong> further requires the following packages:</p>
 <ul>
-<li><a href="https://msv.dev.java.net/">MSV</a>. <strong>msv.jar</strong>, <strong>isorelax.jar</strong>, <strong>relaxngDatatype.jar</strong> and <strong>xsdlib.jar</strong> included in the MSV distribution must be added to the project's libraries and must be in the classpath or a folder called <strong>lib</strong> that is next to the <strong>odfvalidator.jar</strong> at runtime. </li>
-<li><a href="https://isorelax-jaxp-bridge.dev.java.net">ISORELAX JARV -&gt; JAXP 1.3 Xml Validation Engine Adaptor</a>.  <strong>isorelax-jaxp-bridge-1.0.jar</strong> must be added to the project's libraries and must be in the classpath or a folder called <strong>lib</strong> that is next to the <strong>odfvalidator.jar</strong>  at runtime. </li>
-<li><strong>odfdom.jar</strong> from the ODFDOM component must be added to the project's libraries and must be in the classpath or a folder called <strong>lib</strong> that is next to the <strong>odfvalidator.jar</strong>  at runtime. </li>
+<li><a href="https://msv.dev.java.net/">MSV</a>. <strong>msv.jar</strong>, <strong>isorelax.jar</strong>, <strong>relaxngDatatype.jar</strong> and <strong>xsdlib.jar</strong> included in the MSV distribution must be added to the project's libraries and must be in the classpath or a folder called <strong>lib</strong> that is next to the <strong>odfvalidator.jar</strong> at runtime.</li>
+<li><a href="https://isorelax-jaxp-bridge.dev.java.net">ISORELAX JARV -&gt; JAXP 1.3 Xml Validation Engine Adaptor</a>.  <strong>isorelax-jaxp-bridge-1.0.jar</strong> must be added to the project's libraries and must be in the classpath or a folder called <strong>lib</strong> that is next to the <strong>odfvalidator.jar</strong>  at runtime.</li>
+<li><strong>odfdom.jar</strong> from the ODFDOM component must be added to the project's libraries and must be in the classpath or a folder called <strong>lib</strong> that is next to the <strong>odfvalidator.jar</strong>  at runtime.</li>
 </ul>
 <p>The NetBeans project is pre-configured to build ODFDOM while building <strong>ODF Validator</strong>. This requires that the ODFDOM sources are located in a folder <strong>odfdom</strong> next to the folder of the <strong>ODF Validator</strong> project.</p>
 <p>Alternatively, the reference to the ODFDOM project in the compile time classpath of the <strong>ODF Validator</strong> project may be replaced with a reference to an already compiled <strong>odfdom.jar</strong>.</p>
-<p>The references to all other jar files must be updated manually before 
+<p>The references to all other jar files must be updated manually before
 building <strong>ODF Validator</strong>.</p>
 <p><strong>Note:</strong> ODFDOM requires <a href="http://xml.apache.org/dist/xerces-j/">Apache Xerces</a>. The jar file <strong>xercesImpl.jar</strong> also must exist in a folder <strong>lib</strong> next to <strong>odvalidator.jar</strong> file, or it must be in the classpath. The <strong>ODF Validator</strong> NetBeans projects includes a reference to <strong>xersesImpl.jar</strong> in the runtime classpath which has to be adapted after checking out the project.</p>
-<p><strong>Note:</strong> ODFDOM requires at least Xerces 2.8.0. Please note that MSV distribution contains an xercesImpl.jar which is older. </p>
-<h2 id="source-code">Source Code</h2>
-<p>The <strong>ODF Validator</strong> source code is located <a href="http://odftoolkit.org/projects/conformancetools/sources/odf-validator-src/show">here</a>. <strong>ODF Validator</strong> uses Mercurial for source control. Please check the 
+<p><strong>Note:</strong> ODFDOM requires at least Xerces 2.8.0. Please note that MSV distribution contains an xercesImpl.jar which is older.</p>
+<h2 id="source-code">Source Code<a class="headerlink" href="#source-code" title="Permanent link">&para;</a></h2>
+<p>The <strong>ODF Validator</strong> source code is located <a href="http://odftoolkit.org/projects/conformancetools/sources/odf-validator-src/show">here</a>. <strong>ODF Validator</strong> uses Mercurial for source control. Please check the
 help for instruction how to use Mercurial.</p>
   </div>
 

Modified: websites/staging/odftoolkit/trunk/content/odftoolkit/contact.html
==============================================================================
--- websites/staging/odftoolkit/trunk/content/odftoolkit/contact.html (original)
+++ websites/staging/odftoolkit/trunk/content/odftoolkit/contact.html Tue Apr 11 11:07:06 2017
@@ -50,7 +50,18 @@
   <div id="clear"></div>
   
   <div id="sidenav">
-    <h1 id="general">General</h1>
+    <style type="text/css">
+/* The following code is added by mdx_elementid.py
+   It was originally lifted from http://subversion.apache.org/style/site.css */
+/*
+ * Hide class="elementid-permalink", except when an enclosing heading
+ * has the :hover property.
+ */
+.headerlink, .elementid-permalink {
+  visibility: hidden;
+}
+h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover > .headerlink, h4:hover > .headerlink, h5:hover > .headerlink, dt:hover > .elementid-permalink { visibility: visible }</style>
+<h1 id="general">General<a class="headerlink" href="#general" title="Permanent link">&para;</a></h1>
 <ul>
 <li><a href="/odftoolkit/index.html">About</a></li>
 <li><a href="/odftoolkit/downloads.html">Downloads</a></li>
@@ -58,21 +69,21 @@
 <li><a href="/odftoolkit/license.html">License</a></li>
 <li><a href="/odftoolkit/privacy.html">Privacy Policy</a></li>
 </ul>
-<h1 id="components">Components</h1>
+<h1 id="components">Components<a class="headerlink" href="#components" title="Permanent link">&para;</a></h1>
 <ul>
 <li><a href="/odftoolkit/odfdom/index.html">ODFDOM</a></li>
 <li><a href="/odftoolkit/simple/index.html">Simple API</a></li>
 <li><a href="/odftoolkit/conformance/ODFValidator.html">ODF Validator</a></li>
 <li><a href="/odftoolkit/xsltrunner/ODFXSLTRunner.html">XSLT Runner</a></li>
 </ul>
-<h1 id="community">Community</h1>
+<h1 id="community">Community<a class="headerlink" href="#community" title="Permanent link">&para;</a></h1>
 <ul>
 <li><a href="/odftoolkit/get-involved.html">Get Involved</a></li>
 <li><a href="/odftoolkit/mailing-lists.html">Mailing Lists</a></li>
 <li><a href="/odftoolkit/people.html">People</a></li>
 <li><a href="/odftoolkit/community-faqs.html">Community FAQs</a></li>
 </ul>
-<h1 id="development">Development</h1>
+<h1 id="development">Development<a class="headerlink" href="#development" title="Permanent link">&para;</a></h1>
 <ul>
 <li><a href="/odftoolkit/source.html">Source Code</a></li>
 <li><a href="https://issues.apache.org/jira/browse/ODFTOOLKIT">Bug Tracker</a></li>
@@ -80,13 +91,12 @@
 <li><a href="/odftoolkit/website-local.html">Website</a></li>
 <li><a href="/odftoolkit/developer-faqs.html">Developer FAQs</a></li>
 </ul>
-<h1 id="ppmc">PPMC</h1>
+<h1 id="ppmc">PPMC<a class="headerlink" href="#ppmc" title="Permanent link">&para;</a></h1>
 <ul>
 <li><a href="/odftoolkit/ppmc-faqs.html">PPMC FAQs</a></li>
-<li><a href="/odftoolkit/odftoolkit-release-guide.html">Release Guide</a> <br />
-</li>
+<li><a href="/odftoolkit/odftoolkit-release-guide.html">Release Guide</a>   </li>
 </ul>
-<h1 id="asf">ASF</h1>
+<h1 id="asf">ASF<a class="headerlink" href="#asf" title="Permanent link">&para;</a></h1>
 <ul>
 <li><a href="http://www.apache.org">Apache Software Foundation</a></li>
 <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
@@ -96,13 +106,24 @@
   <div id="contenta">
   
     <h1 class="title">Contact Us</h1>
-    <p>For any questions, comments, or concerns about this project or website please contact the project on the developer mailing list:</p>
+    <style type="text/css">
+/* The following code is added by mdx_elementid.py
+   It was originally lifted from http://subversion.apache.org/style/site.css */
+/*
+ * Hide class="elementid-permalink", except when an enclosing heading
+ * has the :hover property.
+ */
+.headerlink, .elementid-permalink {
+  visibility: hidden;
+}
+h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover > .headerlink, h4:hover > .headerlink, h5:hover > .headerlink, dt:hover > .elementid-permalink { visibility: visible }</style>
+<p>For any questions, comments, or concerns about this project or website please contact the project on the developer mailing list:</p>
 <ul>
-<li><a href="mailto:ooo-dev@incubator.apache.org">odf-dev@incubator.apache.org</a>.</li>
+<li><a href="mailto:odf-dev@incubator.apache.org">odf-dev@incubator.apache.org</a>.</li>
 </ul>
 <p>For private or legal matters, please contact the Podling Project Management Committee (PPMC):</p>
 <ul>
-<li><a href="mailto:ooo-private@incubator.apache.org">odf-private@incubator.apache.org</a>.</li>
+<li><a href="mailto:odf-private@incubator.apache.org">odf-private@incubator.apache.org</a>.</li>
 </ul>
   </div>
 

Modified: websites/staging/odftoolkit/trunk/content/odftoolkit/downloads.html
==============================================================================
--- websites/staging/odftoolkit/trunk/content/odftoolkit/downloads.html (original)
+++ websites/staging/odftoolkit/trunk/content/odftoolkit/downloads.html Tue Apr 11 11:07:06 2017
@@ -50,7 +50,18 @@
   <div id="clear"></div>
   
   <div id="sidenav">
-    <h1 id="general">General</h1>
+    <style type="text/css">
+/* The following code is added by mdx_elementid.py
+   It was originally lifted from http://subversion.apache.org/style/site.css */
+/*
+ * Hide class="elementid-permalink", except when an enclosing heading
+ * has the :hover property.
+ */
+.headerlink, .elementid-permalink {
+  visibility: hidden;
+}
+h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover > .headerlink, h4:hover > .headerlink, h5:hover > .headerlink, dt:hover > .elementid-permalink { visibility: visible }</style>
+<h1 id="general">General<a class="headerlink" href="#general" title="Permanent link">&para;</a></h1>
 <ul>
 <li><a href="/odftoolkit/index.html">About</a></li>
 <li><a href="/odftoolkit/downloads.html">Downloads</a></li>
@@ -58,21 +69,21 @@
 <li><a href="/odftoolkit/license.html">License</a></li>
 <li><a href="/odftoolkit/privacy.html">Privacy Policy</a></li>
 </ul>
-<h1 id="components">Components</h1>
+<h1 id="components">Components<a class="headerlink" href="#components" title="Permanent link">&para;</a></h1>
 <ul>
 <li><a href="/odftoolkit/odfdom/index.html">ODFDOM</a></li>
 <li><a href="/odftoolkit/simple/index.html">Simple API</a></li>
 <li><a href="/odftoolkit/conformance/ODFValidator.html">ODF Validator</a></li>
 <li><a href="/odftoolkit/xsltrunner/ODFXSLTRunner.html">XSLT Runner</a></li>
 </ul>
-<h1 id="community">Community</h1>
+<h1 id="community">Community<a class="headerlink" href="#community" title="Permanent link">&para;</a></h1>
 <ul>
 <li><a href="/odftoolkit/get-involved.html">Get Involved</a></li>
 <li><a href="/odftoolkit/mailing-lists.html">Mailing Lists</a></li>
 <li><a href="/odftoolkit/people.html">People</a></li>
 <li><a href="/odftoolkit/community-faqs.html">Community FAQs</a></li>
 </ul>
-<h1 id="development">Development</h1>
+<h1 id="development">Development<a class="headerlink" href="#development" title="Permanent link">&para;</a></h1>
 <ul>
 <li><a href="/odftoolkit/source.html">Source Code</a></li>
 <li><a href="https://issues.apache.org/jira/browse/ODFTOOLKIT">Bug Tracker</a></li>
@@ -80,12 +91,12 @@
 <li><a href="/odftoolkit/website-local.html">Website</a></li>
 <li><a href="/odftoolkit/developer-faqs.html">Developer FAQs</a></li>
 </ul>
-<h1 id="ppmc">PPMC</h1>
+<h1 id="ppmc">PPMC<a class="headerlink" href="#ppmc" title="Permanent link">&para;</a></h1>
 <ul>
 <li><a href="/odftoolkit/ppmc-faqs.html">PPMC FAQs</a></li>
 <li><a href="/odftoolkit/odftoolkit-release-guide.html">Release Guide</a>   </li>
 </ul>
-<h1 id="asf">ASF</h1>
+<h1 id="asf">ASF<a class="headerlink" href="#asf" title="Permanent link">&para;</a></h1>
 <ul>
 <li><a href="http://www.apache.org">Apache Software Foundation</a></li>
 <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
@@ -95,92 +106,49 @@
   <div id="contenta">
   
     <h1 class="title">Downloads</h1>
-    <p><strong>Current Version</strong></p>
-<p>The Apache ODF Toolkit(incubating) team is pleased to announce the release of 0.6.1-incubating on June 2nd, 2014.</p>
-<p>A full list of changes is available in the <a href="http://www.apache.org/dist/incubator/odftoolkit/CHANGES-0.6.1-incubating.txt">change log</a>. People interested should also follow the <a href="http://incubator.apache.org/odftoolkit/mailing-lists.html">mailing list</a> to track progress.</p>
-<p>The ODF Toolkit source release as well as the pre-built binary deployment packages are listed below. </p>
+    <style type="text/css">
+/* The following code is added by mdx_elementid.py
+   It was originally lifted from http://subversion.apache.org/style/site.css */
+/*
+ * Hide class="elementid-permalink", except when an enclosing heading
+ * has the :hover property.
+ */
+.headerlink, .elementid-permalink {
+  visibility: hidden;
+}
+h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover > .headerlink, h4:hover > .headerlink, h5:hover > .headerlink, dt:hover > .elementid-permalink { visibility: visible }</style>
+<p><strong>Current Version</strong></p>
+<p>The Apache ODF Toolkit (incubating) team is pleased to announce
+the release of 0.6.2-incubating on April 10th, 2017.</p>
+<p>A full list of changes is available in the <a href="http://www.apache.org/dist/incubator/odftoolkit/CHANGES-0.6.2-incubating.txt">change log</a>. People interested should also follow the <a href="http://incubator.apache.org/odftoolkit/mailing-lists.html">mailing list</a> to track progress.</p>
+<p>The ODF Toolkit source release as well as the pre-built binary deployment packages are listed below.</p>
 <p>Below is a list of the downloads:</p>
 <ul>
-<li>Source: <ul>
-<li><a href="http://www.apache.org/dyn/closer.cgi/incubator/odftoolkit/sources/odftoolkit-0.6.1-incubating-src.zip">odftoolkit-0.6.1-incubating-src.zip </a>  [<a href="http://www.apache.org/dist/incubator/odftoolkit/sources/odftoolkit-0.6.1-incubating-src.zip.asc">asc</a>] [<a href="http://www.apache.org/dist/incubator/odftoolkit/sources/odftoolkit-0.6.1-incubating-src.zip.md5">md5</a>]
-[<a href="http://www.apache.org/dist/incubator/odftoolkit/sources/odftoolkit-0.6.1-incubating-src.zip.sha">sha</a>]</li>
+<li>Source:<ul>
+<li><a href="http://www.apache.org/dyn/closer.cgi/incubator/odftoolkit/sources/odftoolkit-0.6.2-incubating-source-release.zip">odftoolkit-0.6.2-incubating-source-release.zip </a>  [<a href="http://www.apache.org/dist/incubator/odftoolkit/sources/odftoolkit-0.6.2-incubating-source-release.zip.asc">asc</a>] [<a href="http://www.apache.org/dist/incubator/odftoolkit/sources/odftoolkit-0.6.2-incubating-source-release.zip.md5">md5</a>]
+[<a href="http://www.apache.org/dist/incubator/odftoolkit/sources/odftoolkit-0.6.2-incubating-source-release.zip.sha">sha</a>]</li>
 </ul>
 </li>
-<li>Binaries: <ul>
-<li><a href="http://www.apache.org/dyn/closer.cgi/incubator/odftoolkit/binaries/odftoolkit-0.6.1-incubating-bin.zip">odftoolkit-0.6.1-incubating-bin.zip </a>  [<a href="http://www.apache.org/dist/incubator/odftoolkit/binaries/odftoolkit-0.6.1-incubating-bin.zip.asc">asc</a>] [<a href="http://www.apache.org/dist/incubator/odftoolkit/binaries/odftoolkit-0.6.1-incubating-bin.zip.md5">md5</a>]
-[<a href="http://www.apache.org/dist/incubator/odftoolkit/binaries/odftoolkit-0.6-incubating-bin.zip.sha">sha</a>]</li>
+<li>Binaries:<ul>
+<li><a href="http://www.apache.org/dyn/closer.cgi/incubator/odftoolkit/binaries/odftoolkit-0.6.2-incubating-bin.zip">odftoolkit-0.6.2-incubating-bin.zip </a>  [<a href="http://www.apache.org/dist/incubator/odftoolkit/binaries/odftoolkit-0.6.2-incubating-bin.zip.asc">asc</a>] [<a href="http://www.apache.org/dist/incubator/odftoolkit/binaries/odftoolkit-0.6.2-incubating-bin.zip.md5">md5</a>]
+[<a href="http://www.apache.org/dist/incubator/odftoolkit/binaries/odftoolkit-0.6-2-incubating-bin.zip.sha">sha</a>]</li>
 </ul>
 </li>
-<li>Documentation: <ul>
-<li><a href="http://www.apache.org/dyn/closer.cgi/incubator/odftoolkit/docs/odftoolkit-0.6.1-incubating-doc.zip">odftoolkit-0.6.1-incubating-doc.zip </a>  [<a href="http://www.apache.org/dist/incubator/odftoolkit/docs/odftoolkit-0.6.1-incubating-doc.zip.asc">asc</a>] [<a href="http://www.apache.org/dist/incubator/odftoolkit/docs/odftoolkit-0.6.1-incubating-doc.zip.md5">md5</a>]
-[<a href="http://www.apache.org/dist/incubator/odftoolkit/docs/odftoolkit-0.6.1-incubating-doc.zip.sha">sha</a>]</li>
-</ul>
-</li>
-</ul>
-<p><strong>Older Versions</strong></p>
-<p><strong>0.6-incubating</strong></p>
-<p>The Apache ODF Toolkit(incubating) team is pleased to announce the release of 0.6.1-incubating on Jun 22, 2013.</p>
-<p>A full list of changes is available in the <a href="http://www.apache.org/dist/incubator/odftoolkit/CHANGES-0.6-incubating.txt">change log</a>. People interested should also follow the <a href="http://incubator.apache.org/odftoolkit/mailing-lists.html">mailing list</a> to track progress.</p>
-<p>The ODF Toolkit source release as well as the pre-built binary deployment packages are listed below. </p>
-<p>Below is a list of the downloads:</p>
-<ul>
-<li>Source: <ul>
-<li><a href="http://www.apache.org/dyn/closer.cgi/incubator/odftoolkit/sources/odftoolkit-0.6-incubating-src.zip">odftoolkit-0.6-incubating-src.zip </a>  [<a href="http://www.apache.org/dist/incubator/odftoolkit/sources/odftoolkit-0.6-incubating-src.zip.asc">asc</a>] [<a href="http://www.apache.org/dist/incubator/odftoolkit/sources/odftoolkit-0.6-incubating-src.zip.md5">md5</a>]
-[<a href="http://www.apache.org/dist/incubator/odftoolkit/odftoolkit-0.6-incubating-src.zip.sha">sha</a>]</li>
-</ul>
-</li>
-<li>Binaries: <ul>
-<li><a href="http://www.apache.org/dyn/closer.cgi/incubator/odftoolkit/binaries/odftoolkit-0.6-incubating-bin.zip">odftoolkit-0.6-incubating-bin.zip </a>  [<a href="http://www.apache.org/dist/incubator/odftoolkit/binaries/odftoolkit-0.6-incubating-bin.zip.asc">asc</a>] [<a href="http://www.apache.org/dist/incubator/odftoolkit/binaries/odftoolkit-0.6-incubating-bin.zip.md5">md5</a>]
-[<a href="http://www.apache.org/dist/incubator/odftoolkit/binaries/odftoolkit-0.6-incubating-bin.zip.sha">sha</a>]</li>
-</ul>
-</li>
-<li>Documentation: <ul>
-<li><a href="http://www.apache.org/dyn/closer.cgi/incubator/odftoolkit/docs/odftoolkit-0.6-incubating-doc.zip">odftoolkit-0.6-incubating-doc.zip </a>  [<a href="http://www.apache.org/dist/incubator/odftoolkit/docs/odftoolkit-0.6-incubating-doc.zip.asc">asc</a>] [<a href="http://www.apache.org/dist/incubator/odftoolkit/docs/odftoolkit-0.6-incubating-doc.zip.md5">md5</a>]
-[<a href="http://www.apache.org/dist/incubator/odftoolkit/docs/odftoolkit-0.6-incubating-doc.zip.sha">sha</a>]</li>
-</ul>
-</li>
-</ul>
-<p><strong>0.5-incubating</strong> </p>
-<p>The Apache ODF Toolkit(Incubating) team is pleased to announce the release of 0.5-incubating on Jan 14, 2012. This is our first Apache release.</p>
-<p>A full list of changes is available in the <a href="http://www.apache.org/dist/incubator/odftoolkit/CHANGES-0.5-incubating.txt">change log</a>. People interested should also follow the <a href="http://incubator.apache.org/odftoolkit/mailing-lists.html">mail list</a> to track progress.</p>
-<p>The ODF Toolkit source release as well as the pre-built binary deployment packages are listed below. Pre-built versions of all ODF Toolkit components are available in the central Maven repository under Group ID "org.apache.odftoolkit" and Version "0.5-incubating".</p>
-<p>Below is a list of the downloads:</p>
-<ul>
-<li>Source: <ul>
-<li><a href="http://www.apache.org/dyn/closer.cgi/incubator/odftoolkit/sources/odftoolkit-0.5-incubating-src.tar.gz">odftoolkit-0.5-incubating-src.tar.gz</a>  [<a href="http://www.apache.org/dist/incubator/odftoolkit/sources/odftoolkit-0.5-incubating-src.tar.gz.asc">asc</a>] [<a href="http://www.apache.org/dist/incubator/odftoolkit/sources/odftoolkit-0.5-incubating-src.tar.gz.md5">md5</a>]
-[<a href="http://www.apache.org/dist/incubator/odftoolkit/sources/odftoolkit-0.5-incubating-src.tar.gz.sha">sha</a>]</li>
-<li><a href="http://www.apache.org/dyn/closer.cgi/incubator/odftoolkit/sources/odftoolkit-0.5-incubating-src.tar.bz2">odftoolkit-0.5-incubating-src.tar.bz2</a>  [<a href="http://www.apache.org/dist/incubator/odftoolkit/sources/odftoolkit-0.5-incubating-src.tar.bz2.asc">asc</a>] [<a href="http://www.apache.org/dist/incubator/odftoolkit/sources/odftoolkit-0.5-incubating-src.tar.bz2.md5">md5</a>]
-[<a href="http://www.apache.org/dist/incubator/odftoolkit/sources/odftoolkit-0.5-incubating-src.tar.bz2.sha">sha</a>]</li>
-<li><a href="http://www.apache.org/dyn/closer.cgi/incubator/odftoolkit/sources/odftoolkit-0.5-incubating-src.zip">odftoolkit-0.5-incubating-src.zip </a>  [<a href="http://www.apache.org/dist/incubator/odftoolkit/sources/odftoolkit-0.5-incubating-src.zip.asc">asc</a>] [<a href="http://www.apache.org/dist/incubator/odftoolkit/sources/odftoolkit-0.5-incubating-src.zip.md5">md5</a>]
-[<a href="http://www.apache.org/dist/incubator/odftoolkit/sources/odftoolkit-0.5-incubating-src.zip.sha">sha</a>]</li>
-</ul>
-</li>
-<li>Binaries: <ul>
-<li><a href="http://www.apache.org/dyn/closer.cgi/incubator/odftoolkit/binaries/odftoolkit-0.5-incubating-bin.tar.gz">odftoolkit-0.5-incubating-bin.tar.gz</a>  [<a href="http://www.apache.org/dist/incubator/odftoolkit/binaries/odftoolkit-0.5-incubating-bin.tar.gz.asc">asc</a>] [<a href="http://www.apache.org/dist/incubator/odftoolkit/binaries/odftoolkit-0.5-incubating-bin.tar.gz.md5">md5</a>]
-[<a href="http://www.apache.org/dist/incubator/odftoolkit/binaries/odftoolkit-0.5-incubating-bin.tar.gz.sha">sha</a>]</li>
-<li><a href="http://www.apache.org/dyn/closer.cgi/incubator/odftoolkit/binaries/odftoolkit-0.5-incubating-bin.tar.bz2">odftoolkit-0.5-incubating-bin.tar.bz2</a>  [<a href="http://www.apache.org/dist/incubator/odftoolkit/binaries/odftoolkit-0.5-incubating-bin.tar.bz2.asc">asc</a>] [<a href="http://www.apache.org/dist/incubator/odftoolkit/binaries/odftoolkit-0.5-incubating-bin.tar.bz2.md5">md5</a>]
-[<a href="http://www.apache.org/dist/incubator/odftoolkit/binaries/odftoolkit-0.5-incubating-bin.tar.bz2.sha">sha</a>]</li>
-<li><a href="http://www.apache.org/dyn/closer.cgi/incubator/odftoolkit/binaries/odftoolkit-0.5-incubating-bin.zip">odftoolkit-0.5-incubating-bin.zip </a>  [<a href="http://www.apache.org/dist/incubator/odftoolkit/binaries/odftoolkit-0.5-incubating-bin.zip.asc">asc</a>] [<a href="http://www.apache.org/dist/incubator/odftoolkit/binaries/odftoolkit-0.5-incubating-bin.zip.md5">md5</a>]
-[<a href="http://www.apache.org/dist/incubator/odftoolkit/binaries/odftoolkit-0.5-incubating-bin.zip.sha">sha</a>]</li>
-</ul>
-</li>
-<li>Documentation: <ul>
-<li><a href="http://www.apache.org/dyn/closer.cgi/incubator/odftoolkit/docs/odftoolkit-0.5-incubating-doc.tar.gz">odftoolkit-0.5-incubating-doc.tar.gz</a>  [<a href="http://www.apache.org/dist/incubator/odftoolkit/docs/odftoolkit-0.5-incubating-doc.tar.gz.asc">asc</a>] [<a href="http://www.apache.org/dist/incubator/odftoolkit/docs/odftoolkit-0.5-incubating-doc.tar.gz.md5">md5</a>]
-[<a href="http://www.apache.org/dist/incubator/odftoolkit/docs/odftoolkit-0.5-incubating-doc.tar.gz.sha">sha</a>]</li>
-<li><a href="http://www.apache.org/dyn/closer.cgi/incubator/odftoolkit/docs/odftoolkit-0.5-incubating-doc.tar.bz2">odftoolkit-0.5-incubating-doc.tar.bz2</a>  [<a href="http://www.apache.org/dist/incubator/odftoolkit/docs/odftoolkit-0.5-incubating-doc.tar.bz2.asc">asc</a>] [<a href="http://www.apache.org/dist/incubator/odftoolkit/docs/odftoolkit-0.5-incubating-doc.tar.bz2.md5">md5</a>]
-[<a href="http://www.apache.org/dist/incubator/odftoolkit/docs/odftoolkit-0.5-incubating-doc.tar.bz2.sha">sha</a>]</li>
-<li><a href="http://www.apache.org/dyn/closer.cgi/incubator/odftoolkit/docs/odftoolkit-0.5-incubating-doc.zip">odftoolkit-0.5-incubating-doc.zip </a>  [<a href="http://www.apache.org/dist/incubator/odftoolkit/docs/odftoolkit-0.5-incubating-doc.zip.asc">asc</a>] [<a href="http://www.apache.org/dist/incubator/odftoolkit/docs/odftoolkit-0.5-incubating-doc.zip.md5">md5</a>]
-[<a href="http://www.apache.org/dist/incubator/odftoolkit/docs/odftoolkit-0.5-incubating-doc.zip.sha">sha</a>]</li>
+<li>Documentation:<ul>
+<li><a href="http://www.apache.org/dyn/closer.cgi/incubator/odftoolkit/docs/odftoolkit-0.6.2-incubating-doc.zip">odftoolkit-0.6.2-incubating-doc.zip </a>  [<a href="http://www.apache.org/dist/incubator/odftoolkit/docs/odftoolkit-0.6.2-incubating-doc.zip.asc">asc</a>] [<a href="http://www.apache.org/dist/incubator/odftoolkit/docs/odftoolkit-0.6.2-incubating-doc.zip.md5">md5</a>]
+[<a href="http://www.apache.org/dist/incubator/odftoolkit/docs/odftoolkit-0.6.2-incubating-doc.zip.sha">sha</a>]</li>
 </ul>
 </li>
 </ul>
 <p><em>Note</em>: All downloads can be verified using the Apache ODF Toolkit code signing <a href="http://www.apache.org/dist/incubator/odftoolkit/KEYS">KEYS</a>.
-When downloading from a mirror please check the <a href="http://www.apache.org/dev/release-signing#md5">md5sum</a>
-and verify the <a href="http://www.apache.org/dev/release-signing#openpgp">OpenPGP</a> compatible
-signature from the main <a href="http://www.apache.org">Apache site</a>. Links are provided above (next to the release download link). This <a href="http://www.apache.org/dist/incubator/odftoolkit/KEYS">KEYS</a> file contains the public
-keys used for signing release. It is recommended that (when possible) a <a href="http://www.apache.org/dev/release-signing#web-of-trust">web of trust</a> is
-used to confirm the identity of these keys. For more information, please see the <a href="http://www.apache.org/dev/release.html">Apache Release FAQ</a>.</p>
-<p><strong>Release Archives</strong></p>
+  When downloading from a mirror please check the <a href="http://www.apache.org/dev/release-signing#md5">md5sum</a>
+  and verify the <a href="http://www.apache.org/dev/release-signing#openpgp">OpenPGP</a> compatible
+  signature from the main <a href="http://www.apache.org">Apache site</a>. Links are provided above (next to the release download link). This <a href="http://www.apache.org/dist/incubator/odftoolkit/KEYS">KEYS</a> file contains the public
+  keys used for signing release. It is recommended that (when possible) a <a href="http://www.apache.org/dev/release-signing#web-of-trust">web of trust</a> is
+  used to confirm the identity of these keys. For more information, please see the <a href="http://www.apache.org/dev/release.html">Apache Release FAQ</a>.</p>
+<p><strong>Older Apache Versions</strong></p>
+<p>Older versions can be found in the <a href="http://archive.apache.org/dist/incubator/odftoolkit/">Apache Archive</a>.</p>
+<p><strong>Prior Apache Releases</strong></p>
 <p>Apache ODF Toolkit became an incubator project in August 2011. Prior to that date the ODF Toolkit was a set of projects of <a href="http://odftoolkit.org/">ODF Toolkit Union</a>. Now, all of the legacy ODF Toolkit Union releases are archived at <a href="http://code.google.com/a/apache-extras.org/p/odftoolkit-extra/">apache-extras.org</a>.</p>
   </div>
 

Modified: websites/staging/odftoolkit/trunk/content/odftoolkit/index.html
==============================================================================
--- websites/staging/odftoolkit/trunk/content/odftoolkit/index.html (original)
+++ websites/staging/odftoolkit/trunk/content/odftoolkit/index.html Tue Apr 11 11:07:06 2017
@@ -50,7 +50,18 @@
   <div id="clear"></div>
   
   <div id="sidenav">
-    <h1 id="general">General</h1>
+    <style type="text/css">
+/* The following code is added by mdx_elementid.py
+   It was originally lifted from http://subversion.apache.org/style/site.css */
+/*
+ * Hide class="elementid-permalink", except when an enclosing heading
+ * has the :hover property.
+ */
+.headerlink, .elementid-permalink {
+  visibility: hidden;
+}
+h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover > .headerlink, h4:hover > .headerlink, h5:hover > .headerlink, dt:hover > .elementid-permalink { visibility: visible }</style>
+<h1 id="general">General<a class="headerlink" href="#general" title="Permanent link">&para;</a></h1>
 <ul>
 <li><a href="/odftoolkit/index.html">About</a></li>
 <li><a href="/odftoolkit/downloads.html">Downloads</a></li>
@@ -58,21 +69,21 @@
 <li><a href="/odftoolkit/license.html">License</a></li>
 <li><a href="/odftoolkit/privacy.html">Privacy Policy</a></li>
 </ul>
-<h1 id="components">Components</h1>
+<h1 id="components">Components<a class="headerlink" href="#components" title="Permanent link">&para;</a></h1>
 <ul>
 <li><a href="/odftoolkit/odfdom/index.html">ODFDOM</a></li>
 <li><a href="/odftoolkit/simple/index.html">Simple API</a></li>
 <li><a href="/odftoolkit/conformance/ODFValidator.html">ODF Validator</a></li>
 <li><a href="/odftoolkit/xsltrunner/ODFXSLTRunner.html">XSLT Runner</a></li>
 </ul>
-<h1 id="community">Community</h1>
+<h1 id="community">Community<a class="headerlink" href="#community" title="Permanent link">&para;</a></h1>
 <ul>
 <li><a href="/odftoolkit/get-involved.html">Get Involved</a></li>
 <li><a href="/odftoolkit/mailing-lists.html">Mailing Lists</a></li>
 <li><a href="/odftoolkit/people.html">People</a></li>
 <li><a href="/odftoolkit/community-faqs.html">Community FAQs</a></li>
 </ul>
-<h1 id="development">Development</h1>
+<h1 id="development">Development<a class="headerlink" href="#development" title="Permanent link">&para;</a></h1>
 <ul>
 <li><a href="/odftoolkit/source.html">Source Code</a></li>
 <li><a href="https://issues.apache.org/jira/browse/ODFTOOLKIT">Bug Tracker</a></li>
@@ -80,12 +91,12 @@
 <li><a href="/odftoolkit/website-local.html">Website</a></li>
 <li><a href="/odftoolkit/developer-faqs.html">Developer FAQs</a></li>
 </ul>
-<h1 id="ppmc">PPMC</h1>
+<h1 id="ppmc">PPMC<a class="headerlink" href="#ppmc" title="Permanent link">&para;</a></h1>
 <ul>
 <li><a href="/odftoolkit/ppmc-faqs.html">PPMC FAQs</a></li>
 <li><a href="/odftoolkit/odftoolkit-release-guide.html">Release Guide</a>   </li>
 </ul>
-<h1 id="asf">ASF</h1>
+<h1 id="asf">ASF<a class="headerlink" href="#asf" title="Permanent link">&para;</a></h1>
 <ul>
 <li><a href="http://www.apache.org">Apache Software Foundation</a></li>
 <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
@@ -95,16 +106,28 @@
   <div id="contenta">
   
     <h1 class="title">Apache ODF Toolkit (Incubating)</h1>
-    <p><strong>2014-06-02 - ODF Toolkit 0.6.1-incubating available</strong></p>
-<p>The Apache ODF Toolkit (Incubating) team is pleased to announce the release of 0.6.1-incubating. This is our third Apache release.</p>
-<p>A full list of changes is available in the <a href="http://www.apache.org/dist/incubator/odftoolkit/CHANGES-0.6.1-incubating.txt">change log</a>. People interested should also follow the <a href="mailing-lists.html">mail list</a> to track progress.</p>
+    <style type="text/css">
+/* The following code is added by mdx_elementid.py
+   It was originally lifted from http://subversion.apache.org/style/site.css */
+/*
+ * Hide class="elementid-permalink", except when an enclosing heading
+ * has the :hover property.
+ */
+.headerlink, .elementid-permalink {
+  visibility: hidden;
+}
+h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover > .headerlink, h4:hover > .headerlink, h5:hover > .headerlink, dt:hover > .elementid-permalink { visibility: visible }</style>
+<p><strong>2017-04-10 - ODF Toolkit 0.6.2-incubating available</strong></p>
+<p>The Apache ODF Toolkit (Incubating) team is pleased to announce the release of 0.6.2-incubating. This is our fourth Apache release.
+It will be the last release supporting JDK 6. The upcoming release will be based on JDK 8.</p>
+<p>A full list of changes is available in the <a href="http://www.apache.org/dist/incubator/odftoolkit/CHANGES-0.6.2-incubating.txt">change log</a>. People interested should also follow the <a href="mailing-lists.html">mail list</a> to track progress.</p>
 <p>See the <a href="downloads.html">downloads page</a> for more details.</p>
 <p><strong>Mission Statement</strong></p>
-<p>The Apache ODF Toolkit is a set of Java modules that allow programmatic creation, 
-scanning and manipulation of <a href="http://opendocument.xml.org/">Open Document Format</a> (ISO/IEC 26300 == ODF) 
-documents. Unlike other approaches which rely on runtime manipulation 
-of heavy-weight editors via an automation interface, the ODF Toolkit 
-is lightweight and ideal for server use. </p>
+<p>The Apache ODF Toolkit is a set of Java modules that allow programmatic creation,
+scanning and manipulation of <a href="http://opendocument.xml.org/">Open Document Format</a> (ISO/IEC 26300 == ODF)
+documents. Unlike other approaches which rely on runtime manipulation
+of heavy-weight editors via an automation interface, the ODF Toolkit
+is lightweight and ideal for server use.</p>
 <p>Apache "ODF Toolkit" is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator.
 Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and
 decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is

Modified: websites/staging/odftoolkit/trunk/content/odftoolkit/mailing-lists.html
==============================================================================
--- websites/staging/odftoolkit/trunk/content/odftoolkit/mailing-lists.html (original)
+++ websites/staging/odftoolkit/trunk/content/odftoolkit/mailing-lists.html Tue Apr 11 11:07:06 2017
@@ -50,7 +50,18 @@
   <div id="clear"></div>
   
   <div id="sidenav">
-    <h1 id="general">General</h1>
+    <style type="text/css">
+/* The following code is added by mdx_elementid.py
+   It was originally lifted from http://subversion.apache.org/style/site.css */
+/*
+ * Hide class="elementid-permalink", except when an enclosing heading
+ * has the :hover property.
+ */
+.headerlink, .elementid-permalink {
+  visibility: hidden;
+}
+h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover > .headerlink, h4:hover > .headerlink, h5:hover > .headerlink, dt:hover > .elementid-permalink { visibility: visible }</style>
+<h1 id="general">General<a class="headerlink" href="#general" title="Permanent link">&para;</a></h1>
 <ul>
 <li><a href="/odftoolkit/index.html">About</a></li>
 <li><a href="/odftoolkit/downloads.html">Downloads</a></li>
@@ -58,21 +69,21 @@
 <li><a href="/odftoolkit/license.html">License</a></li>
 <li><a href="/odftoolkit/privacy.html">Privacy Policy</a></li>
 </ul>
-<h1 id="components">Components</h1>
+<h1 id="components">Components<a class="headerlink" href="#components" title="Permanent link">&para;</a></h1>
 <ul>
 <li><a href="/odftoolkit/odfdom/index.html">ODFDOM</a></li>
 <li><a href="/odftoolkit/simple/index.html">Simple API</a></li>
 <li><a href="/odftoolkit/conformance/ODFValidator.html">ODF Validator</a></li>
 <li><a href="/odftoolkit/xsltrunner/ODFXSLTRunner.html">XSLT Runner</a></li>
 </ul>
-<h1 id="community">Community</h1>
+<h1 id="community">Community<a class="headerlink" href="#community" title="Permanent link">&para;</a></h1>
 <ul>
 <li><a href="/odftoolkit/get-involved.html">Get Involved</a></li>
 <li><a href="/odftoolkit/mailing-lists.html">Mailing Lists</a></li>
 <li><a href="/odftoolkit/people.html">People</a></li>
 <li><a href="/odftoolkit/community-faqs.html">Community FAQs</a></li>
 </ul>
-<h1 id="development">Development</h1>
+<h1 id="development">Development<a class="headerlink" href="#development" title="Permanent link">&para;</a></h1>
 <ul>
 <li><a href="/odftoolkit/source.html">Source Code</a></li>
 <li><a href="https://issues.apache.org/jira/browse/ODFTOOLKIT">Bug Tracker</a></li>
@@ -80,13 +91,12 @@
 <li><a href="/odftoolkit/website-local.html">Website</a></li>
 <li><a href="/odftoolkit/developer-faqs.html">Developer FAQs</a></li>
 </ul>
-<h1 id="ppmc">PPMC</h1>
+<h1 id="ppmc">PPMC<a class="headerlink" href="#ppmc" title="Permanent link">&para;</a></h1>
 <ul>
 <li><a href="/odftoolkit/ppmc-faqs.html">PPMC FAQs</a></li>
-<li><a href="/odftoolkit/odftoolkit-release-guide.html">Release Guide</a> <br />
-</li>
+<li><a href="/odftoolkit/odftoolkit-release-guide.html">Release Guide</a>   </li>
 </ul>
-<h1 id="asf">ASF</h1>
+<h1 id="asf">ASF<a class="headerlink" href="#asf" title="Permanent link">&para;</a></h1>
 <ul>
 <li><a href="http://www.apache.org">Apache Software Foundation</a></li>
 <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a></li>
@@ -96,7 +106,18 @@
   <div id="contenta">
   
     <h1 class="title">Mailing Lists</h1>
-    <h2 id="odf-toolkit-mailing-lists">ODF Toolkit Mailing Lists</h2>
+    <style type="text/css">
+/* The following code is added by mdx_elementid.py
+   It was originally lifted from http://subversion.apache.org/style/site.css */
+/*
+ * Hide class="elementid-permalink", except when an enclosing heading
+ * has the :hover property.
+ */
+.headerlink, .elementid-permalink {
+  visibility: hidden;
+}
+h2:hover > .headerlink, h3:hover > .headerlink, h1:hover > .headerlink, h6:hover > .headerlink, h4:hover > .headerlink, h5:hover > .headerlink, dt:hover > .elementid-permalink { visibility: visible }</style>
+<h2 id="odf-toolkit-mailing-lists">ODF Toolkit Mailing Lists<a class="headerlink" href="#odf-toolkit-mailing-lists" title="Permanent link">&para;</a></h2>
 <p>We welcome you to join our mailing lists and let us know about your thoughts or
 ideas about Apache ODF Toolkit</p>
 <ul>
@@ -105,8 +126,8 @@ ideas about Apache ODF Toolkit</p>
 <li><a href="#commits_mailing_list">Commits Mailing List</a>.</li>
 <li><a href="#users_mailing_list">Users Mailing List</a>.</li>
 </ul>
-<h2 id="participation-guidelines">Participation Guidelines</h2>
-<p>We ask all mailing list participants to observe <a href="http://www.apache.org/dev/contrib-email-tips.html">these guidelines</a>. </p>
+<h2 id="participation-guidelines">Participation Guidelines<a class="headerlink" href="#participation-guidelines" title="Permanent link">&para;</a></h2>
+<p>We ask all mailing list participants to observe <a href="http://www.apache.org/dev/contrib-email-tips.html">these guidelines</a>.</p>
 <p>Specifically note the request "Use sensible and concise email subject headings".</p>
 <p>Some subject tags to consider include:</p>
 <ul>
@@ -125,7 +146,7 @@ ideas about Apache ODF Toolkit</p>
 <li>[PROPOSAL][Repo] Migration of legacy repository to SVN</li>
 <li>[DISCUSS][download] What are our options of mirroring legacy releases?</li>
 </ul>
-<h2 id="development-mailing-list">Development Mailing List</h2>
+<h2 id="development-mailing-list">Development Mailing List<a class="headerlink" href="#development-mailing-list" title="Permanent link">&para;</a></h2>
 <p>This is where the community hangs out. This list is used to coordinate
 activities and ensure we are all pulling in the same direction.  This is a high traffic list, with an average of 57 posts/day.</p>
 <ul>
@@ -133,30 +154,30 @@ activities and ensure we are all pulling
 <li>Post (after subscription): <a href="mailto:odf-dev@incubator.apache.org">odf-dev@incubator.apache.org</a></li>
 <li>Unsubscribe: <a href="mailto:odf-dev-unsubscribe@incubator.apache.org">odf-dev-unsubscribe@incubator.apache.org</a></li>
 <li>Archives<ul>
-<li><a href="http://markmail.org/search/+list:org.apache.incubator.odf-dev">Markmail</a></li>
+<li><a href="https://lists.apache.org/list.html?odf-dev@incubator.apache.org">Markmail</a></li>
 <li><a href="http://mail-archives.apache.org/mod_mbox/incubator-odf-dev/">Apache</a></li>
 </ul>
 </li>
 </ul>
-<h2 id="commits-mailing-list">Commits Mailing List</h2>
+<h2 id="commits-mailing-list">Commits Mailing List<a class="headerlink" href="#commits-mailing-list" title="Permanent link">&para;</a></h2>
 <p>This is where the community receives automated notifications of any changes to the
 ODF Toolkit code and documentation.  This is a moderate traffic list, with an average of 10 posts/day.</p>
 <ul>
 <li>Subscribe: <a href="mailto:odf-commits-subscribe@incubator.apache.org">odf-commits-subscribe@incubator.apache.org</a></li>
 <li>Unsubscribe: <a href="mailto:odf-commmits-unsubscribe@incubator.apache.org">odf-commmits-unsubscribe@incubator.apache.org</a></li>
 <li>Archives<ul>
-<li><a href="http://markmail.org/search/+list:org.apache.incubator.odf-commits">Markmail</a></li>
+<li><a href="https://lists.apache.org/list.html?odf-commits@incubator.apache.org">Markmail</a></li>
 <li><a href="http://mail-archives.apache.org/mod_mbox/incubator-odf-commits/">Apache</a></li>
 </ul>
 </li>
 </ul>
-<h2 id="users-mailing-list">Users Mailing List</h2>
+<h2 id="users-mailing-list">Users Mailing List<a class="headerlink" href="#users-mailing-list" title="Permanent link">&para;</a></h2>
 <p>This is where the users ask questions, suggest features, etc. This is a low traffic list.</p>
 <ul>
 <li>Subscribe: <a href="mailto:odf-users-subscribe@incubator.apache.org">odf-users-subscribe@incubator.apache.org</a></li>
 <li>Unsubscribe: <a href="mailto:odf-users-unsubscribe@incubator.apache.org">odf-users-unsubscribe@incubator.apache.org</a></li>
 <li>Archives<ul>
-<li><a href="http://markmail.org/search/+list:org.apache.incubator.odf-users">Markmail</a></li>
+<li><a href="https://lists.apache.org/list.html?odf-users@incubator.apache.org">Markmail</a></li>
 <li><a href="http://mail-archives.apache.org/mod_mbox/incubator-odf-users/">Apache</a></li>
 </ul>
 </li>