Modified: poi/site/src/documentation/content/xdocs/download.xml
URL: 
http://svn.apache.org/viewvc/poi/site/src/documentation/content/xdocs/download.xml?rev=1836243&r1=1836242&r2=1836243&view=diff
==============================================================================
--- poi/site/src/documentation/content/xdocs/download.xml (original)
+++ poi/site/src/documentation/content/xdocs/download.xml Wed Jul 18 23:24:53 
2018
@@ -17,7 +17,7 @@
    limitations under the License.
    ====================================================================
 -->
-<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.3//EN" 
"./dtd/document-v13.dtd">
+<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" 
"document-v20.dtd">
 
 <document>
   <header>
@@ -32,17 +32,17 @@
         how stable your code should be.
       </p>
       <ul>
-          <!-- li><link href="download.html#POI-3.17-beta1">The latest beta 
release is Apache POI 3.17-beta1</link></li -->
-          <li><link href="download.html#POI-3.17">The latest stable release is 
Apache POI 3.17</link></li>
-          <li><link href="download.html#nightly">Nightly/CI builds are 
available as well</link></li>
-          <li><link href="download.html#archive">Archives of all prior 
releases</link></li>
+          <!-- li><a href="#POI-3.17-beta1">The latest beta release is Apache 
POI 3.17-beta1</a></li -->
+          <li><a href="#POI-3.17">The latest stable release is Apache POI 
3.17</a></li>
+          <li><a href="#nightly">Nightly/CI builds are available as 
well</a></li>
+          <li><a href="#archive">Archives of all prior releases</a></li>
       </ul>
       <p>
-        Apache POI releases are available under the <link 
href="https://www.apache.org/licenses/LICENSE-2.0";>Apache License, Version 
2.0.</link> 
+        Apache POI releases are available under the <a 
href="https://www.apache.org/licenses/LICENSE-2.0";>Apache License, Version 
2.0.</a> 
         See the NOTICE file contained in each release artifact for applicable 
copyright attribution notices. 
       </p>
       <p>
-        To ensure that you have downloaded the true release you should <link 
href="download.html#verify">verify the integrity</link> 
+        To ensure that you have downloaded the true release you should <a 
href="#verify">verify the integrity</a> 
         of the files using the signatures and checksums available from this 
page.
       </p>
     </section>
@@ -54,57 +54,57 @@
       <p>The Apache POI team is pleased to announce the release of 3.17-beta1.
          Featured are a handful of new areas of functionality and numerous bug 
fixes.</p>
       <p>A summary of changes is available in the
-        <link 
href="https://www.apache.org/dyn/closer.lua/poi/dev/RELEASE-NOTES-3.17-beta1.txt";>Release
 Notes</link>.
-        A full list of changes is available in the <link 
href="changes.html">change log</link>.
-        People interested should also follow the <link 
href="mailinglists.html">dev list</link>
+        <a 
href="https://www.apache.org/dyn/closer.lua/poi/dev/RELEASE-NOTES-3.17-beta1.txt";>Release
 Notes</a>.
+        A full list of changes is available in the <a 
href="changes.html">change log</a>.
+        People interested should also follow the <a 
href="site:mailinglists">dev list</a>
         to track progress.</p>
       <p>
         The POI source release as well as the pre-built binary deployment 
packages are listed below.
-        Pre-built versions of all <link href="overview.html#components">POI 
components</link>
+        Pre-built versions of all <a href="site:components">POI components</a>
         are available in the central Maven repository under Group ID 
"org.apache.poi" and Version
         "3.17-beta1".
       </p>
       <section id="POI-3.17-beta1-bin"><title>Binary Distribution</title>
       <ul>
-        <li><link 
href="https://www.apache.org/dyn/closer.lua/poi/dev/bin/poi-bin-3.17-beta1-20170701.tar.gz";>poi-bin-3.17-beta1-20170701.tar.gz</link>
-          (20.11 MB, <link 
href="https://www.apache.org/dist/poi/dev/bin/poi-bin-3.17-beta1-20170701.tar.gz.asc";>signature
 (.asc)</link>)
+        <li><a 
href="https://www.apache.org/dyn/closer.lua/poi/dev/bin/poi-bin-3.17-beta1-20170701.tar.gz";>poi-bin-3.17-beta1-20170701.tar.gz</a>
+          (20.11 MB, <a 
href="https://www.apache.org/dist/poi/dev/bin/poi-bin-3.17-beta1-20170701.tar.gz.asc";>signature
 (.asc)</a>)
           <br/>
-          MD5 checksum: <link 
href="https://www.apache.org/dist/poi/dev/bin/poi-bin-3.17-beta1-20170701.tar.gz.md5";>
-          b0c29f837c4fe411c76ac73899f6cef3</link>
+          MD5 checksum: <a 
href="https://www.apache.org/dist/poi/dev/bin/poi-bin-3.17-beta1-20170701.tar.gz.md5";>
+          b0c29f837c4fe411c76ac73899f6cef3</a>
           <br/>
-          SHA1 checksum: <link 
href="https://www.apache.org/dist/poi/dev/bin/poi-bin-3.17-beta1-20170701.tar.gz.sha1";>
-          5f9a85afa374209d885243051bd25b1f3524df35</link>
+          SHA1 checksum: <a 
href="https://www.apache.org/dist/poi/dev/bin/poi-bin-3.17-beta1-20170701.tar.gz.sha1";>
+          5f9a85afa374209d885243051bd25b1f3524df35</a>
         </li>
-        <li><link 
href="https://www.apache.org/dyn/closer.lua/poi/dev/bin/poi-bin-3.17-beta1-20170701.zip";>poi-bin-3.17-beta1-20170701.zip</link>
-          (28.69 MB, <link 
href="https://www.apache.org/dist/poi/dev/bin/poi-bin-3.17-beta1-20170701.zip.asc";>signature
 (.asc)</link>)
+        <li><a 
href="https://www.apache.org/dyn/closer.lua/poi/dev/bin/poi-bin-3.17-beta1-20170701.zip";>poi-bin-3.17-beta1-20170701.zip</a>
+          (28.69 MB, <a 
href="https://www.apache.org/dist/poi/dev/bin/poi-bin-3.17-beta1-20170701.zip.asc";>signature
 (.asc)</a>)
           <br/>
-          MD5 checksum: <link 
href="https://www.apache.org/dist/poi/dev/bin/poi-bin-3.17-beta1-20170701.zip.md5";>
-          01a851625c1e4f07e7c794a9a1ee34df</link>
+          MD5 checksum: <a 
href="https://www.apache.org/dist/poi/dev/bin/poi-bin-3.17-beta1-20170701.zip.md5";>
+          01a851625c1e4f07e7c794a9a1ee34df</a>
           <br/>
-          SHA1 checksum: <link 
href="https://www.apache.org/dist/poi/dev/bin/poi-bin-3.17-beta1-20170701.zip.sha1";>
-          3c5bc487c842c7f6f65384be3a6f82538103892d</link>
+          SHA1 checksum: <a 
href="https://www.apache.org/dist/poi/dev/bin/poi-bin-3.17-beta1-20170701.zip.sha1";>
+          3c5bc487c842c7f6f65384be3a6f82538103892d</a>
         </li>
       </ul>
       </section>
       <section id="POI-3.17-beta1-src"><title>Source Distribution</title>
       <ul>
-        <li><link 
href="https://www.apache.org/dyn/closer.lua/poi/dev/src/poi-src-3.17-beta1-20170701.tar.gz";>poi-src-3.17-beta1-20170701.tar.gz</link>
-          (82.73 MB, <link 
href="https://www.apache.org/dist/poi/dev/src/poi-src-3.17-beta1-20170701.tar.gz.asc";>signature
 (.asc)</link>)
+        <li><a 
href="https://www.apache.org/dyn/closer.lua/poi/dev/src/poi-src-3.17-beta1-20170701.tar.gz";>poi-src-3.17-beta1-20170701.tar.gz</a>
+          (82.73 MB, <a 
href="https://www.apache.org/dist/poi/dev/src/poi-src-3.17-beta1-20170701.tar.gz.asc";>signature
 (.asc)</a>)
           <br/>
-          MD5 checksum: <link 
href="https://www.apache.org/dist/poi/dev/src/poi-src-3.17-beta1-20170701.tar.gz.md5";>
-          e70a44b2fe7abc8770e43fc7a1c37b59</link>
+          MD5 checksum: <a 
href="https://www.apache.org/dist/poi/dev/src/poi-src-3.17-beta1-20170701.tar.gz.md5";>
+          e70a44b2fe7abc8770e43fc7a1c37b59</a>
           <br/>
-          SHA1 checksum: <link 
href="https://www.apache.org/dist/poi/dev/src/poi-src-3.17-beta1-20170701.tar.gz.sha1";>
-          fe9c808d38139fc7efe2de6c0a1a8d41283973cc</link>
+          SHA1 checksum: <a 
href="https://www.apache.org/dist/poi/dev/src/poi-src-3.17-beta1-20170701.tar.gz.sha1";>
+          fe9c808d38139fc7efe2de6c0a1a8d41283973cc</a>
         </li>
-        <li><link 
href="https://www.apache.org/dyn/closer.lua/poi/dev/src/poi-src-3.17-beta1-20170701.zip";>poi-src-3.17-beta1-20170701.zip</link>
-          (86.87 MB, <link 
href="https://www.apache.org/dist/poi/dev/src/poi-src-3.17-beta1-20170701.zip.asc";>signature
 (.asc)</link>)
+        <li><a 
href="https://www.apache.org/dyn/closer.lua/poi/dev/src/poi-src-3.17-beta1-20170701.zip";>poi-src-3.17-beta1-20170701.zip</a>
+          (86.87 MB, <a 
href="https://www.apache.org/dist/poi/dev/src/poi-src-3.17-beta1-20170701.zip.asc";>signature
 (.asc)</a>)
           <br/>
-          MD5 checksum: <link 
href="https://www.apache.org/dist/poi/dev/src/poi-src-3.17-beta1-20170701.zip.md5";>
-          5da06274e9a4ff9f22e1631408d68d5d</link>
+          MD5 checksum: <a 
href="https://www.apache.org/dist/poi/dev/src/poi-src-3.17-beta1-20170701.zip.md5";>
+          5da06274e9a4ff9f22e1631408d68d5d</a>
           <br/>
-          SHA1 checksum: <link 
href="https://www.apache.org/dist/poi/dev/src/poi-src-3.17-beta1-20170701.zip.sha1";>
-          89e49927dd598f1a8b63b7febd7db3b5cb8dfa26</link>
+          SHA1 checksum: <a 
href="https://www.apache.org/dist/poi/dev/src/poi-src-3.17-beta1-20170701.zip.sha1";>
+          89e49927dd598f1a8b63b7febd7db3b5cb8dfa26</a>
         </li>
       </ul>
       </section>
@@ -118,98 +118,98 @@
          Featured are a handful of new areas of functionality and numerous bug 
fixes.</p>
       <p>POI 3.17 is the last release to support Java 6. The next release will 
be 4.0.0 and supports min. Java 8.</p>
       <p>A summary of changes is available in the
-        <link 
href="https://www.apache.org/dyn/closer.lua/poi/dev/RELEASE-NOTES-3.17.txt";>Release
 Notes</link>.
-        A full list of changes is available in the <link 
href="changes.html">change log</link>.
-        People interested should also follow the <link 
href="mailinglists.html">dev list</link>
+        <a 
href="https://www.apache.org/dyn/closer.lua/poi/dev/RELEASE-NOTES-3.17.txt";>Release
 Notes</a>.
+        A full list of changes is available in the <a 
href="site:changes">change log</a>.
+        People interested should also follow the <a 
href="site:mailinglists">dev list</a>
         to track progress.</p>
       <p>
         The POI source release as well as the pre-built binary deployment 
packages are listed below.
-        Pre-built versions of all <link href="overview.html#components">POI 
components</link>
+        Pre-built versions of all <a href="site:components">POI components</a>
         are available in the central Maven repository under Group ID 
"org.apache.poi" and Version
         "3.17".
       </p>
       <section id="POI-3.17-bin"><title>Binary Distribution</title>
       <ul>
-        <li><link 
href="https://www.apache.org/dyn/closer.lua/poi/release/bin/poi-bin-3.17-20170915.tar.gz";>poi-bin-3.17-20170915.tar.gz</link>
-          (20.11 MB, <link 
href="https://www.apache.org/dist/poi/release/bin/poi-bin-3.17-20170915.tar.gz.asc";>signature
 (.asc)</link>)
+        <li><a 
href="https://www.apache.org/dyn/closer.lua/poi/release/bin/poi-bin-3.17-20170915.tar.gz";>poi-bin-3.17-20170915.tar.gz</a>
+          (20.11 MB, <a 
href="https://www.apache.org/dist/poi/release/bin/poi-bin-3.17-20170915.tar.gz.asc";>signature
 (.asc)</a>)
           <br/>
-          MD5 checksum: <link 
href="https://www.apache.org/dist/poi/release/bin/poi-bin-3.17-20170915.tar.gz.md5";>
-          00d75d263fa8aaf991b4d9f538fa3499</link>
+          MD5 checksum: <a 
href="https://www.apache.org/dist/poi/release/bin/poi-bin-3.17-20170915.tar.gz.md5";>
+          00d75d263fa8aaf991b4d9f538fa3499</a>
           <br/>
-          SHA1 checksum: <link 
href="https://www.apache.org/dist/poi/release/bin/poi-bin-3.17-20170915.tar.gz.sha1";>
-          30b4ddd491a1d016e48e10fbd92e0cc43a6cb196</link>
+          SHA1 checksum: <a 
href="https://www.apache.org/dist/poi/release/bin/poi-bin-3.17-20170915.tar.gz.sha1";>
+          30b4ddd491a1d016e48e10fbd92e0cc43a6cb196</a>
           <br/>
-          SHA512 checksum: <link 
href="https://www.apache.org/dist/poi/release/bin/poi-bin-3.17-20170915.tar.gz.sha512";>
-          
c1a760f4f051054e5cf17c512e837b22fd28484bd82b691db019e3309d1736942e39e3fb8c4195e72c474077d95e89ded0b40ec49c7c78dace8e6596d6c7e298</link>
+          SHA512 checksum: <a 
href="https://www.apache.org/dist/poi/release/bin/poi-bin-3.17-20170915.tar.gz.sha512";>
+          
c1a760f4f051054e5cf17c512e837b22fd28484bd82b691db019e3309d1736942e39e3fb8c4195e72c474077d95e89ded0b40ec49c7c78dace8e6596d6c7e298</a>
         </li>
-        <li><link 
href="https://www.apache.org/dyn/closer.lua/poi/release/bin/poi-bin-3.17-20170915.zip";>poi-bin-3.17-20170915.zip</link>
-          (28.65 MB, <link 
href="https://www.apache.org/dist/poi/release/bin/poi-bin-3.17-20170915.zip.asc";>signature
 (.asc)</link>)
+        <li><a 
href="https://www.apache.org/dyn/closer.lua/poi/release/bin/poi-bin-3.17-20170915.zip";>poi-bin-3.17-20170915.zip</a>
+          (28.65 MB, <a 
href="https://www.apache.org/dist/poi/release/bin/poi-bin-3.17-20170915.zip.asc";>signature
 (.asc)</a>)
           <br/>
-          MD5 checksum: <link 
href="https://www.apache.org/dist/poi/release/bin/poi-bin-3.17-20170915.zip.md5";>
-          d3f49331d4c3375f9729d864c1fa1164</link>
+          MD5 checksum: <a 
href="https://www.apache.org/dist/poi/release/bin/poi-bin-3.17-20170915.zip.md5";>
+          d3f49331d4c3375f9729d864c1fa1164</a>
           <br/>
-          SHA1 checksum: <link 
href="https://www.apache.org/dist/poi/release/bin/poi-bin-3.17-20170915.zip.sha1";>
-          517824614c6a90ea6f0843b8efdb0b7ad80f69ed</link>
+          SHA1 checksum: <a 
href="https://www.apache.org/dist/poi/release/bin/poi-bin-3.17-20170915.zip.sha1";>
+          517824614c6a90ea6f0843b8efdb0b7ad80f69ed</a>
           <br/>
-          SHA512 checksum: <link 
href="https://www.apache.org/dist/poi/release/bin/poi-bin-3.17-20170915.zip.sha512";>
-          
39f4a85f2cc8a0355c65c73e28df1ac91e5a24baa25ecc591bcd8b3701c29c5b6f7aba15199b4f1a88479ef634996f9b86c5a7b1164d57c2ba2059acfb30e448</link>
+          SHA512 checksum: <a 
href="https://www.apache.org/dist/poi/release/bin/poi-bin-3.17-20170915.zip.sha512";>
+          
39f4a85f2cc8a0355c65c73e28df1ac91e5a24baa25ecc591bcd8b3701c29c5b6f7aba15199b4f1a88479ef634996f9b86c5a7b1164d57c2ba2059acfb30e448</a>
         </li>
       </ul>
       </section>
       <section id="POI-3.17-src"><title>Source Distribution</title>
       <ul>
-        <li><link 
href="https://www.apache.org/dyn/closer.lua/poi/release/src/poi-src-3.17-20170915.tar.gz";>poi-src-3.17-20170915.tar.gz</link>
-          (88.14 MB, <link 
href="https://www.apache.org/dist/poi/release/src/poi-src-3.17-20170915.tar.gz.asc";>signature
 (.asc)</link>)
+        <li><a 
href="https://www.apache.org/dyn/closer.lua/poi/release/src/poi-src-3.17-20170915.tar.gz";>poi-src-3.17-20170915.tar.gz</a>
+          (88.14 MB, <a 
href="https://www.apache.org/dist/poi/release/src/poi-src-3.17-20170915.tar.gz.asc";>signature
 (.asc)</a>)
           <br/>
-          MD5 checksum: <link 
href="https://www.apache.org/dist/poi/release/src/poi-src-3.17-20170915.tar.gz.md5";>
-          c11eac47c8b870e1f9626bfba8d2dc56</link>
+          MD5 checksum: <a 
href="https://www.apache.org/dist/poi/release/src/poi-src-3.17-20170915.tar.gz.md5";>
+          c11eac47c8b870e1f9626bfba8d2dc56</a>
           <br/>
-          SHA1 checksum: <link 
href="https://www.apache.org/dist/poi/release/src/poi-src-3.17-20170915.tar.gz.sha1";>
-          3e71f7c7d973ab8b226e1b1cf87dbcf1aab9e717</link>
+          SHA1 checksum: <a 
href="https://www.apache.org/dist/poi/release/src/poi-src-3.17-20170915.tar.gz.sha1";>
+          3e71f7c7d973ab8b226e1b1cf87dbcf1aab9e717</a>
           <br/>
-          SHA512 checksum: <link 
href="https://www.apache.org/dist/poi/release/src/poi-src-3.17-20170915.tar.gz.sha512";>
-          
9008c47f1e3b15a0579d9cb518b8b3219e143e3100de9d7e1501ddd64e6fe439265a072ecabb85e6eecdb8621e20ac46fede26c382d98f11f0998c1a19b79ee9</link>
+          SHA512 checksum: <a 
href="https://www.apache.org/dist/poi/release/src/poi-src-3.17-20170915.tar.gz.sha512";>
+          
9008c47f1e3b15a0579d9cb518b8b3219e143e3100de9d7e1501ddd64e6fe439265a072ecabb85e6eecdb8621e20ac46fede26c382d98f11f0998c1a19b79ee9</a>
         </li>
-        <li><link 
href="https://www.apache.org/dyn/closer.lua/poi/release/src/poi-src-3.17-20170915.zip";>poi-src-3.17-20170915.zip</link>
-          (92.23 MB, <link 
href="https://www.apache.org/dist/poi/release/src/poi-src-3.17-20170915.zip.asc";>signature
 (.asc)</link>)
+        <li><a 
href="https://www.apache.org/dyn/closer.lua/poi/release/src/poi-src-3.17-20170915.zip";>poi-src-3.17-20170915.zip</a>
+          (92.23 MB, <a 
href="https://www.apache.org/dist/poi/release/src/poi-src-3.17-20170915.zip.asc";>signature
 (.asc)</a>)
           <br/>
-          MD5 checksum: <link 
href="https://www.apache.org/dist/poi/release/src/poi-src-3.17-20170915.zip.md5";>
-          68e181082793adfe571b03ec8a2bb927</link>
+          MD5 checksum: <a 
href="https://www.apache.org/dist/poi/release/src/poi-src-3.17-20170915.zip.md5";>
+          68e181082793adfe571b03ec8a2bb927</a>
           <br/>
-          SHA1 checksum: <link 
href="https://www.apache.org/dist/poi/release/src/poi-src-3.17-20170915.zip.sha1";>
-          83ad40c6ad762da0531677c977f3f9f1bad41734</link>
+          SHA1 checksum: <a 
href="https://www.apache.org/dist/poi/release/src/poi-src-3.17-20170915.zip.sha1";>
+          83ad40c6ad762da0531677c977f3f9f1bad41734</a>
           <br/>
-          SHA512 checksum: <link 
href="https://www.apache.org/dist/poi/release/src/poi-src-3.17-20170915.zip.sha512";>
-          
64a5103b5841a8e516d308de15ffb5d94f6b11f5d45f822b7645fad4b84d0af80abad690b7ed979c10009c21fd254c30fe416d4b034139e7be4e835967a36e2b</link>
+          SHA512 checksum: <a 
href="https://www.apache.org/dist/poi/release/src/poi-src-3.17-20170915.zip.sha512";>
+          
64a5103b5841a8e516d308de15ffb5d94f6b11f5d45f822b7645fad4b84d0af80abad690b7ed979c10009c21fd254c30fe416d4b034139e7be4e835967a36e2b</a>
         </li>
       </ul>
       </section>
     </section>
     
     <section id="nightly"><title>Nightly Builds</title>
-     <p>The POI nightly builds are run on the <link 
href="https://builds.apache.org/view/P/view/POI/";>Jenkins</link> continuous 
integration server.
+     <p>The POI nightly builds are run on the <a 
href="https://builds.apache.org/view/P/view/POI/";>Jenkins</a> continuous 
integration server.
      <br/>
      <strong>These builds should not be used in production</strong>: they are 
mostly intended for use by developers
      to help with resolving bugs and evaluating new features or users who want 
to try out the latest version.
      </p>
      <ul>
-      <li><link 
href="https://builds.apache.org/view/P/view/POI/job/POI-DSL-1.8/lastSuccessfulBuild/artifact/build/dist/";>
-        Last Successful Jenkins build for POI-trunk</link></li> 
+      <li><a 
href="https://builds.apache.org/view/P/view/POI/job/POI-DSL-1.8/lastSuccessfulBuild/artifact/build/dist/";>
+        Last Successful Jenkins build for POI-trunk</a></li> 
      </ul>
     </section>
 
     <section id="verify"><title>Verify</title>
       <p>
         It is essential that you verify the integrity of the downloaded files 
using the PGP and MD5 signatures. 
-        Please read <link 
href="https://httpd.apache.org/dev/verification.html";>Verifying Apache HTTP 
Server Releases</link>
+        Please read <a 
href="https://httpd.apache.org/dev/verification.html";>Verifying Apache HTTP 
Server Releases</a>
        for more information on why you should verify our releases. This page 
provides detailed instructions which you can use for POI artifacts.
       </p>
       <p>
         The PGP signatures can be verified using PGP or GPG. First
-        <link href="https://svn.apache.org/repos/asf/poi/trunk/KEYS";>download 
the KEYS file</link>
+        <a href="https://svn.apache.org/repos/asf/poi/trunk/KEYS";>download the 
KEYS file</a>
         as well as the .asc signature files  for the relevant release packages.
         Make sure you get these files from the main distribution directory, 
rather than from a mirror.
-        Then <link href="https://www.apache.org/info/verification.html";>verify 
the signatures</link>.
+        Then <a href="https://www.apache.org/info/verification.html";>verify 
the signatures</a>.
       </p>
       <p>  
         As an example:
@@ -255,16 +255,16 @@ sub   4096g/7B45A98A 2007-06-18 [expires
     <section id="archive"><title>Release Archives</title>
       <p>
        Apache POI became a top level project in June 2007 and POI 3.0 
artifacts were re-released.
-       Prior to that date POI was a sub-project of <link 
href="https://jakarta.apache.org/";>Apache Jakarta.</link>
+       Prior to that date POI was a sub-project of <a 
href="https://jakarta.apache.org/";>Apache Jakarta.</a>
       </p>
       <ul>
-          <li><link 
href="https://archive.apache.org/dist/poi/release/bin/";>Binary 
Artifacts</link></li>
-          <li><link 
href="https://archive.apache.org/dist/poi/release/src/";>Source 
Artifacts</link></li>
+          <li><a 
href="https://archive.apache.org/dist/poi/release/bin/";>Binary 
Artifacts</a></li>
+          <li><a 
href="https://archive.apache.org/dist/poi/release/src/";>Source 
Artifacts</a></li>
           <!-- We don't encourage using beta builds, but if someone needs a 
beta build because of an unfixed bug
                that was introduced between a beta release and a final release, 
beta releases are also archived.
                archived beta releases: 
https://archive.apache.org/dist/poi/dev/ -->
-          <li><link 
href="https://archive.apache.org/dist/poi/";>Keys</link></li>
-          <li><link 
href="https://archive.apache.org/dist/jakarta/poi/release/";>Artifacts from 
prior to 3.0</link></li>
+          <li><a href="https://archive.apache.org/dist/poi/";>Keys</a></li>
+          <li><a 
href="https://archive.apache.org/dist/jakarta/poi/release/";>Artifacts from 
prior to 3.0</a></li>
       </ul>
     </section>
   </body>

Modified: poi/site/src/documentation/content/xdocs/encryption.xml
URL: 
http://svn.apache.org/viewvc/poi/site/src/documentation/content/xdocs/encryption.xml?rev=1836243&r1=1836242&r2=1836243&view=diff
==============================================================================
--- poi/site/src/documentation/content/xdocs/encryption.xml (original)
+++ poi/site/src/documentation/content/xdocs/encryption.xml Wed Jul 18 23:24:53 
2018
@@ -17,7 +17,7 @@
    limitations under the License.
    ====================================================================
 -->
-<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.3//EN" 
"./dtd/document-v13.dtd">
+<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" 
"document-v20.dtd">
 
 
 <document>
@@ -35,8 +35,8 @@
     <ul>
         <li>Binary formats (.xls, .ppt, .doc, ...)<br/>
         encryption is format-dependent and needs to be implemented per format 
differently.<br/>
-        Use <link 
href="https://poi.apache.org/apidocs/org/apache/poi/hssf/record/crypto/Biff8EncryptionKey.html";>
-        Biff8EncryptionKey</link>.<link 
href="https://poi.apache.org/apidocs/org/apache/poi/hssf/record/crypto/Biff8EncryptionKey.html#setCurrentUserPassword(java.lang.String)">setCurrentUserPassword</link>(String
 password)
+        Use <a 
href="apidocs/org/apache/poi/hssf/record/crypto/Biff8EncryptionKey.html">
+        Biff8EncryptionKey</a>.<a 
href="apidocs/org/apache/poi/hssf/record/crypto/Biff8EncryptionKey.html#setCurrentUserPassword(java.lang.String)">setCurrentUserPassword</a>(String
 password)
         to specify the decryption password before opening the file or (where 
applicable) before saving.
         Setting a null password before saving removes the password 
protection.<br/>
         The password is set in a thread local variable. Do not forget to reset 
it to null after text extraction.
@@ -45,14 +45,14 @@
         use the same encryption logic over all formats. When encrypted, the 
zipped files will be
         stored within an OLE file in the EncryptedPackage stream.<br/>
         If you plan to use POI to actually generate encrypted documents, be 
aware not to use anything less than
-        agile encryption, because <link 
href="https://blogs.msdn.com/b/david_leblanc/archive/2010/04/16/don-t-use-office-rc4-encryption-really-just-don-t-do-it.aspx";>RC4
 is not really secure</link>.
+        agile encryption, because <a 
href="https://blogs.msdn.com/b/david_leblanc/archive/2010/04/16/don-t-use-office-rc4-encryption-really-just-don-t-do-it.aspx";>RC4
 is not really secure</a>.
         Of course you'll need to make sure, that your clients can read the 
documents,
         i.e. the various free Excel, Powerpoint, Word viewers have limitations 
in the cipher or hashing parameters.<br/>
         If you want to use high encryption parameters, you need to install the 
"Java Cryptography Extension (JCE) Unlimited
         Strength Jurisdiction Policy Files" for your JRE version
-        (Oracle <link 
href="http://www.oracle.com/technetwork/java/javase/downloads/jce-6-download-429243.html";>JDK6</link>,
-        <link 
href="http://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html";>JDK7</link>,
-        <link 
href="http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html";>JDK8</link>).
+        (Oracle <a 
href="http://www.oracle.com/technetwork/java/javase/downloads/jce-6-download-429243.html";>JDK6</a>,
+        <a 
href="http://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html";>JDK7</a>,
+        <a 
href="http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html";>JDK8</a>).
         </li>
     </ul>
 
@@ -61,7 +61,7 @@
 
     <section><title>Supported feature matrix</title>
 
-    <table>
+    <table class="autosize POITable">
         <tr>
             <th>Encryption</th>
             <th>HSSF</th>
@@ -69,19 +69,19 @@
             <th>HWPF</th>
         </tr>
         <tr>
-            <td><link 
href="https://msdn.microsoft.com/en-us/library/dd949802(v=office.12).aspx">XOR 
obfuscation *)</link></td>
+            <td><a 
href="https://msdn.microsoft.com/en-us/library/dd949802(v=office.12).aspx">XOR 
obfuscation *)</a></td>
             <td class="feature-yes">Yes (Writing since 3.16)</td>
             <td class="feature-na">N/A</td>
             <td class="feature-no">No</td>
         </tr>
         <tr>
-            <td><link 
href="https://msdn.microsoft.com/en-us/library/dd909583(v=office.12).aspx">40-bit
 RC4 encryption</link></td>
+            <td><a 
href="https://msdn.microsoft.com/en-us/library/dd909583(v=office.12).aspx">40-bit
 RC4 encryption</a></td>
             <td class="feature-yes">Yes (Writing since 3.16)</td>
             <td class="feature-na">N/A</td>
             <td class="feature-yes">Yes (since 3.17)</td>
         </tr>
         <tr>
-            <td><link 
href="https://msdn.microsoft.com/en-us/library/dd910113(v=office.12).aspx">Office
 Binary Document RC4 CryptoAPI Encryption</link></td>
+            <td><a 
href="https://msdn.microsoft.com/en-us/library/dd910113(v=office.12).aspx">Office
 Binary Document RC4 CryptoAPI Encryption</a></td>
             <td class="feature-yes">Yes (Since 3.16)</td>
             <td class="feature-yes">Yes</td>
             <td class="feature-yes">Yes (since 3.17)</td>
@@ -93,35 +93,35 @@
             <th>XWPF</th>
         </tr>
         <tr>
-            <td><link 
href="https://msdn.microsoft.com/en-us/library/dd907466(v=office.12).aspx">Office
 Binary Document RC4 Encryption **)</link></td>
+            <td><a 
href="https://msdn.microsoft.com/en-us/library/dd907466(v=office.12).aspx">Office
 Binary Document RC4 Encryption **)</a></td>
             <td class="feature-yes">Yes</td>
             <td class="feature-yes">Yes</td>
             <td class="feature-yes">Yes</td>
         </tr>
         <tr>
-            <td><link 
href="https://msdn.microsoft.com/en-us/library/dd906131(v=office.12).aspx">ECMA-376
 Standard Encryption</link></td>
+            <td><a 
href="https://msdn.microsoft.com/en-us/library/dd906131(v=office.12).aspx">ECMA-376
 Standard Encryption</a></td>
             <td class="feature-yes">Yes</td>
             <td class="feature-yes">Yes</td>
             <td class="feature-yes">Yes</td>
         </tr>
         <tr>
-            <td><link 
href="https://msdn.microsoft.com/en-us/library/dd906131(v=office.12).aspx">ECMA-376
 Agile Encryption</link></td>
+            <td><a 
href="https://msdn.microsoft.com/en-us/library/dd906131(v=office.12).aspx">ECMA-376
 Agile Encryption</a></td>
             <td class="feature-yes">Yes</td>
             <td class="feature-yes">Yes</td>
             <td class="feature-yes">Yes</td>
         </tr>
         <tr>
-            <td><link 
href="https://msdn.microsoft.com/en-us/library/ms757845(v=vs.85).aspx">ECMA-376 
XML Signature</link></td>
+            <td><a 
href="https://msdn.microsoft.com/en-us/library/ms757845(v=vs.85).aspx">ECMA-376 
XML Signature</a></td>
             <td class="feature-yes">Yes</td>
             <td class="feature-yes">Yes</td>
             <td class="feature-yes">Yes</td>
         </tr>
     </table>
 
-    <p>*) the xor encryption is flawed and works only for very small files - 
see <link 
href="https://bz.apache.org/bugzilla/show_bug.cgi?id=59857";>#59857</link>.
+    <p>*) the xor encryption is flawed and works only for very small files - 
see <a href="https://bz.apache.org/bugzilla/show_bug.cgi?id=59857";>#59857</a>.
     </p>
 
-    <p>**) the <link 
href="https://msdn.microsoft.com/en-us/library/cc313071(v=office.12).aspx">MS-OFFCRYPTO</link>
+    <p>**) the <a 
href="https://msdn.microsoft.com/en-us/library/cc313071(v=office.12).aspx">MS-OFFCRYPTO</a>
     documentation only mentions the RC4 (without CryptoAPI) encryption as a 
"in place" encryption, but
     apparently there's also a container based method with that key generation 
logic.
     </p>
@@ -129,8 +129,8 @@
 
     <section><title>Binary formats</title>
         <p>As mentioned above, use
-        <link 
href="https://poi.apache.org/apidocs/org/apache/poi/hssf/record/crypto/Biff8EncryptionKey.html";>
-        Biff8EncryptionKey</link>.<link 
href="https://poi.apache.org/apidocs/org/apache/poi/hssf/record/crypto/Biff8EncryptionKey.html#setCurrentUserPassword(java.lang.String)">setCurrentUserPassword</link>(String
 password)
+        <a 
href="apidocs/org/apache/poi/hssf/record/crypto/Biff8EncryptionKey.html">
+        Biff8EncryptionKey</a>.<a 
href="apidocs/org/apache/poi/hssf/record/crypto/Biff8EncryptionKey.html#setCurrentUserPassword(java.lang.String)">setCurrentUserPassword</a>(String
 password)
         to specify the password.</p>
 
         <source>
@@ -192,7 +192,7 @@ try {
 
      <section><title>XML-based formats - Encryption</title>
      <p>Encrypting a file is similar to the above decryption process. 
Basically you'll need to choose between
-     <link 
href="https://poi.apache.org/apidocs/org/apache/poi/poifs/crypt/EncryptionMode.html";>binaryRC4,
 standard and agile encryption</link>,
+     <a 
href="apidocs/org/apache/poi/poifs/crypt/EncryptionMode.html">binaryRC4, 
standard and agile encryption</a>,
      the cryptoAPI mode is used internally and it's direct use would result in 
an incomplete file.
      Apart of the CipherMode, the EncryptionInfo class provides further 
parameters to specify the cipher and
      hashing algorithm to be used.</p>
@@ -218,31 +218,31 @@ fos.close();
      </section>
 
      <section><title>XML-based formats - Signing (XML Signature)</title>
-     <p>An Office document can be digital signed by a <link 
href="https://en.wikipedia.org/wiki/XML_Signature";>XML Signature</link>
+     <p>An Office document can be digital signed by a <a 
href="https://en.wikipedia.org/wiki/XML_Signature";>XML Signature</a>
      to protect it from unauthorized modifications, i.e. modifications without 
having the original certificate.
-     The current implementation is based on the <!--<link 
href="http://eid-applet.googlecode.com";>eID Applet</link>-->
-     <link href="https://github.com/e-Contract/eid-applet";>eID Applet</link> 
which
-     is dual-licensed to <!--<link 
href="https://code.google.com/p/eid-applet/source/browse/trunk/README.txt";>ASF/POI</link>-->
-     <link 
href="https://github.com/e-Contract/eid-applet/blob/master/README.md#7-license";>Apache
 License 2.0 and LGPL v3.0</link>.
-     Instead of using the internal <link 
href="http://www.jsourcecode.com/class.php?proj=jdk%5Copenjdk&amp;jar=openjdk-6-b14&amp;class=org.jcp.xml.dsig.internal.dom.DOMXMLSignatureFactory";>JDK
 API</link>
-     this version is based on <link href="https://santuario.apache.org";>Apache 
Santuario</link>.</p>
+     The current implementation is based on the <!--<a 
href="http://eid-applet.googlecode.com";>eID Applet</a>-->
+     <a href="https://github.com/e-Contract/eid-applet";>eID Applet</a> which
+     is dual-licensed to <!--<a 
href="https://code.google.com/p/eid-applet/source/browse/trunk/README.txt";>ASF/POI</a>-->
+     <a 
href="https://github.com/e-Contract/eid-applet/blob/master/README.md#7-license";>Apache
 License 2.0 and LGPL v3.0</a>.
+     Instead of using the internal <a 
href="http://www.jsourcecode.com/class.php?proj=jdk%5Copenjdk&amp;jar=openjdk-6-b14&amp;class=org.jcp.xml.dsig.internal.dom.DOMXMLSignatureFactory";>JDK
 API</a>
+     this version is based on <a href="https://santuario.apache.org";>Apache 
Santuario</a>.</p>
      <p>The classes have been tested against the following libraries, which 
need to be included additionally to the
-     <link href="overview.html#components">default dependencies</link>:</p>
+     <a href="site:components">default dependencies</a>:</p>
      <ul>
      <li>BouncyCastle bcpkix and bcprov (tested against 1.59)</li>
      <li>Apache Santuario "xmlsec" (tested against 2.1.0)</li>
      <li>and slf4j-api (tested against 1.7.25)</li>
      </ul>
-     <p>Depending on the <link 
href="https://poi.apache.org/apidocs/org/apache/poi/poifs/crypt/dsig/SignatureConfig.html";>configuration</link>
-     and the activated <link 
href="https://poi.apache.org/apidocs/org/apache/poi/poifs/crypt/dsig/facets/package-summary.html";>facets</link>
-     various <link href="https://en.wikipedia.org/wiki/XAdES";>XAdES 
levels</link> are supported - the support for higher levels (XAdES-T+)
+     <p>Depending on the <a 
href="apidocs/org/apache/poi/poifs/crypt/dsig/SignatureConfig.html">configuration</a>
+     and the activated <a 
href="apidocs/org/apache/poi/poifs/crypt/dsig/facets/package-summary.html">facets</a>
+     various <a href="https://en.wikipedia.org/wiki/XAdES";>XAdES levels</a> 
are supported - the support for higher levels (XAdES-T+)
      depend on supporting services and although the code is adopted, the 
integration is not well tested ... please support us on
      integration (testing) with timestamp and revocation (OCSP) services.
      </p>
-     <p>Further test examples can be found in the corresponding <link 
href="https://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestSignatureInfo.java?view=markup";>test
 class</link>.</p>
+     <p>Further test examples can be found in the corresponding <a 
href="https://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestSignatureInfo.java?view=markup";>test
 class</a>.</p>
      
      <p>If you want to use a hash algorithm with 64 bytes (currently only 
applies to SHA512),
-     <link href="https://bz.apache.org/bugzilla/show_bug.cgi?id=42061";>a 
base64 "feature"</link> in xmlsec
+     <a href="https://bz.apache.org/bugzilla/show_bug.cgi?id=42061";>a base64 
"feature"</a> in xmlsec
      leads to line breaks in the digest values, which won't be accepted by 
Office. To workaround this, you
      need to set the following system property:<br/>
      <strong>-Dorg.apache.xml.security.ignoreLineBreaks=true</strong></p>
@@ -339,8 +339,8 @@ pkg.close();
        to extract an OOXML spreadsheet zipped container and write the contents 
to disk using AES
        encryption.</p>
 
-       <p>See <link 
href="https://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/temp/SXSSFWorkbookWithCustomZipEntrySource.java?view=markup";>SXSSFWorkbookWithCustomZipEntrySource.java</link>
-       and other <link 
href="https://svn.apache.org/viewvc?view=revision&amp;revision=1768744";>files</link>
+       <p>See <a 
href="https://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/temp/SXSSFWorkbookWithCustomZipEntrySource.java?view=markup";>SXSSFWorkbookWithCustomZipEntrySource.java</a>
+       and other <a 
href="https://svn.apache.org/viewvc?view=revision&amp;revision=1768744";>files</a>
        that are needed for this example.</p>
      </section>
 
@@ -349,15 +349,15 @@ pkg.close();
        the hashing of the canonicalized form is more or less intransparent 
done in the background.</p>
 
        <!-- TODO: find original source -->
-       <p>One of the tripping hazards are <link 
href="https://stackoverflow.com/questions/36063375";>different
-       linebreaks in Windows/Unix</link>, therefore use the non-indent form of 
the xmls.</p>
+       <p>One of the tripping hazards are <a 
href="https://stackoverflow.com/questions/36063375";>different
+       linebreaks in Windows/Unix</a>, therefore use the non-indent form of 
the xmls.</p>
 
        <p>The next thing is to compare successful signed documents from Office 
vs. POIs generated signature,
        i.e. unzip both files and look for differences. Usually the package 
relations (*.rels) will be different,
        and the sig1.xml, core.xml and [Content_Types].xml due to different 
order of the references.</p>
 
        <p>The package relationsships (*.rels) will be specially handled, i.e. 
they will be filtered and only
-       a subset will be processed - see <link 
href="https://www.ecma-international.org/activities/Office%20Open%20XML%20Formats/Draft%20ECMA-376%203rd%20edition,%20March%202011/Office%20Open%20XML%20Part%202%20-%20Open%20Packaging%20Conventions.pdf";>13.2.4.24
 Relationships Transform Algorithm</link>.</p>
+       a subset will be processed - see <a 
href="https://www.ecma-international.org/activities/Office%20Open%20XML%20Formats/Draft%20ECMA-376%203rd%20edition,%20March%202011/Office%20Open%20XML%20Part%202%20-%20Open%20Packaging%20Conventions.pdf";>13.2.4.24
 Relationships Transform Algorithm</a>.</p>
 
        <p>To check the processed files in the canonicalized form, the below 
UnsyncBufferedOutputStream class needs
        to be injected/replaced. Put the .class file in separate directory and 
add the following JVM parameters:</p>

Copied: poi/site/src/documentation/content/xdocs/help/faq.xml (from r1836242, 
poi/site/src/documentation/content/xdocs/faq.xml)
URL: 
http://svn.apache.org/viewvc/poi/site/src/documentation/content/xdocs/help/faq.xml?p2=poi/site/src/documentation/content/xdocs/help/faq.xml&p1=poi/site/src/documentation/content/xdocs/faq.xml&r1=1836242&r2=1836243&rev=1836243&view=diff
==============================================================================
--- poi/site/src/documentation/content/xdocs/faq.xml (original)
+++ poi/site/src/documentation/content/xdocs/help/faq.xml Wed Jul 18 23:24:53 
2018
@@ -17,9 +17,10 @@
    limitations under the License.
    ====================================================================
 -->
-<!DOCTYPE faqs PUBLIC "-//APACHE//DTD FAQ V1.1//EN" "./dtd/faq-v11.dtd">
+<!DOCTYPE faqs PUBLIC "-//APACHE//DTD FAQ V2.0//EN" "faq-v20.dtd">
 
-<faqs title="Frequently Asked Questions">
+<faqs>
+  <title>Frequently Asked Questions</title>
   <faq>
     <question>
       My code uses some new feature, compiles fine but fails when live with a 
"MethodNotFoundException" or "IncompatibleClassChangeError"
@@ -70,11 +71,11 @@ System.out.println("POI Scratchpad came
     <answer>
       <p>To use the new OOXML file formats, POI requires a jar containing
        the file format XSDs, as compiled by 
-       <link href="https://xmlbeans.apache.org/";>XMLBeans</link>. These
+       <a href="https://xmlbeans.apache.org/";>XMLBeans</a>. These
        XSDs, once compiled into Java classes, live in the
        <em>org.openxmlformats.schemas</em> namespace.</p>
       <p>There are two jar files available, as described in
-       <link href="overview.html">the components overview section</link>.
+       <a href="site:components">the components overview section</a>.
        The <em>full jar of all of the schemas is ooxml-schemas-1.3.jar</em>, 
        and it is currently around 15mb. The <em>smaller poi-ooxml-schemas 
        jar</em> is only about 4mb. This latter jar file only contains the 
@@ -90,20 +91,20 @@ System.out.println("POI Scratchpad came
        include them.</p>
       <p>There are a number of ways to get the full ooxml-schemas-1.3.jar.
        If you are a maven user, see the 
-       <link href="overview.html">the components overview section</link>
+       <a href="site:components">the components overview section</a>
        for the artifact details to have maven download it for you.
        If you download the source release of POI, and/or checkout the
-       source code from <link href="subversion.html">subversion</link>,
+       source code from <a href="site:subversion">subversion</a>,
        then you can run the ant task "compile-ooxml-xsds" to have the
        OOXML schemas downloaded and compiled for you (This will also
        give you the XMLBeans generated source code, in case you wish to
        look at this). Finally, you can download the jar by hand from the
-       <link href="http://mirrors.ibiblio.org/apache/poi/";>POI
-       Maven Repository</link>.</p>
+       <a href="http://mirrors.ibiblio.org/apache/poi/";>POI
+       Maven Repository</a>.</p>
       <p>Note that historically, different versions of ooxml-schemas were
           used</p>
 
-        <table>
+        <table class="POITable autosize">
             <tr>
                 <th>Version of ooxml-schemas</th>
                 <th>Version of POI</th>
@@ -172,7 +173,7 @@ System.out.println("POI Scratchpad came
     <answer>
       <p>It's possible your spreadsheet contains a feature that is not 
currently supported by POI.
         If you encounter this then please create the simplest file that 
demonstrates the trouble and submit it to
-       <link 
href="https://issues.apache.org/bugzilla/buglist.cgi?product=POI";>Bugzilla.</link></p>
+       <a 
href="https://issues.apache.org/bugzilla/buglist.cgi?product=POI";>Bugzilla.</a></p>
     </answer>
   </faq>
   <faq>
@@ -241,7 +242,7 @@ System.out.println("POI Scratchpad came
         None of this is particular to Excel. The same problem arises when you 
try to
         generate any binary file dynamically to an IE client. For example, if 
you generate
         pdf files using
-        <link href="https://xml.apache.org/fop";>FOP</link>, you will come 
across many of the same issues.
+        <a href="https://xml.apache.org/fop";>FOP</a>, you will come across 
many of the same issues.
       </p>
       <!-- Thanks to Avik for the answer -->
     </answer>
@@ -252,7 +253,7 @@ System.out.println("POI Scratchpad came
     </question>
     <answer>
       <p>
-       Yes.  You first need to get a DataFormat object from the workbook and 
call getFormat with the desired format.  Some examples are <link 
href="spreadsheet/quick-guide.html#DataFormats">here</link>.
+       Yes.  You first need to get a DataFormat object from the workbook and 
call getFormat with the desired format.  Some examples are <a 
href="../components/spreadsheet/quick-guide.html#DataFormats">here</a>.
       </p>
     </answer>
   </faq>
@@ -373,8 +374,8 @@ System.out.println("POI Scratchpad came
      <p>Apache POI ships with a few programs and a few example programs,
      which can be used to do some basic performance checks. For testing
      file generation, the class to use is in the examples package,
-     <link 
href="https://svn.apache.org/repos/asf/poi/trunk/src/examples/src/org/apache/poi/ss/examples/SSPerformanceTest.java";>SSPerformanceTest</link>
-     (<link 
href="https://svn.apache.org/viewvc/poi/trunk/src/examples/src/org/apache/poi/ss/examples/SSPerformanceTest.java";>viewvc</link>).
+     <a 
href="https://svn.apache.org/repos/asf/poi/trunk/src/examples/src/org/apache/poi/ss/examples/SSPerformanceTest.java";>SSPerformanceTest</a>
+     (<a 
href="https://svn.apache.org/viewvc/poi/trunk/src/examples/src/org/apache/poi/ss/examples/SSPerformanceTest.java";>viewvc</a>).
      Run SSPerformanceTest with arguments of the writing type (HSSF, XSSF
      or SXSSF), the number rows, the number of columns, and if the file
      should be saved. If you can't run that with 50,000 rows and 50 columns
@@ -382,11 +383,11 @@ System.out.println("POI Scratchpad came
      (and ideally all 3 in less than that!), then the problem is with 
      your environment.</p>
      <p>Next, use the example program
-     <link 
href="https://svn.apache.org/repos/asf/poi/trunk/src/examples/src/org/apache/poi/ss/examples/ToCSV.java";>ToCSV</link>
-     (<link 
href="https://svn.apache.org/viewvc/poi/trunk/src/examples/src/org/apache/poi/ss/examples/ToCSV.java";>viewvc</link>)
+     <a 
href="https://svn.apache.org/repos/asf/poi/trunk/src/examples/src/org/apache/poi/ss/examples/ToCSV.java";>ToCSV</a>
+     (<a 
href="https://svn.apache.org/viewvc/poi/trunk/src/examples/src/org/apache/poi/ss/examples/ToCSV.java";>viewvc</a>)
      to try reading the file in with HSSF or XSSF. Related is
-     <link 
href="https://svn.apache.org/repos/asf/poi/trunk/src/examples/src/org/apache/poi/xssf/eventusermodel/XLSX2CSV.java";>XLSX2CSV</link>
-     (<link 
href="https://svn.apache.org/viewvc/poi/trunk/src/examples/src/org/apache/poi/xssf/eventusermodel/XLSX2CSV.java";>viewvc</link>),
+     <a 
href="https://svn.apache.org/repos/asf/poi/trunk/src/examples/src/org/apache/poi/xssf/eventusermodel/XLSX2CSV.java";>XLSX2CSV</a>
+     (<a 
href="https://svn.apache.org/viewvc/poi/trunk/src/examples/src/org/apache/poi/xssf/eventusermodel/XLSX2CSV.java";>viewvc</a>),
      which uses SAX parsing for .xlsx. Run this against both your problem file,
      and a simple one generated by SSPerformanceTest of the same size. If this 
is
      slow, then there could be an Apache POI problem with how the file is being
@@ -403,7 +404,7 @@ System.out.println("POI Scratchpad came
     <answer>
        <p>The OOXML support in Apache POI is built on top of the file format
          XML Schemas, as compiled into Java using 
-         <link href="https://xmlbeans.apache.org/";>XMLBeans</link>. Currently,
+         <a href="https://xmlbeans.apache.org/";>XMLBeans</a>. Currently,
          the compilation is done with XMLBeans 2.3, for maximum compatibility
          with installations. (You can use the resulting classes on the XMLBeans
          2.3 runtime, or any later version of XMLBeans. If you are currently 
using
@@ -429,14 +430,14 @@ System.out.println("POI Scratchpad came
     </question>
     <answer>
       <p>The first thing to try is running the 
-        <link 
href="https://blogs.msdn.com/b/officeinteroperability/archive/2011/07/12/microsoft-office-binary-file-format-validator-is-now-available.aspx";>Binary
 File Format Validator</link>
+        <a 
href="https://blogs.msdn.com/b/officeinteroperability/archive/2011/07/12/microsoft-office-binary-file-format-validator-is-now-available.aspx";>Binary
 File Format Validator</a>
         from Microsoft against the file, which will report if the file
         complies with the specification. If your input file doesn't, then this
         may well explain why POI isn't able to process it correctly. You 
         should probably in this case speak to whoever is generating the file,
         and have them fix it there. If your POI generated file is identified
         as having an issue, and you're on the 
-        <link href="howtobuild.html">latest codebase</link>, report a new
+        <a href="site:howtobuild">latest codebase</a>, report a new
         POI bug and include the details of the validation failure.</p>
       <p>Another thing to try, especially if the file is valid but POI isn't
         behaving as expected, are the POI Dev Tools for the component you're
@@ -504,9 +505,9 @@ System.out.println("POI Scratchpad came
         supported, and will fail to work in unpredictable ways.</p>
       <p>If you're not sure which POI jars you're using at runtime, and/or
         you suspect it might not be the one you intended, see 
-        <link href="#faq-N10006">this FAQ entry</link> for details on
+        <a href="#faq-N10006">this FAQ entry</a> for details on
         diagnosing it. If you aren't sure what POI jars you need, see the
-        <link href="overview.html#components">Components Overview</link>
+        <a href="site:components">Components Overview</a>
         for details</p>
     </answer>
   </faq>
@@ -522,7 +523,7 @@ System.out.println("POI Scratchpad came
                 thread safety, but any globally held object like global caches 
or other
                 data structures are guarded against multi threaded access 
accordingly.</p>
             <p>There have been
-                <link 
href="https://mail-archives.apache.org/mod_mbox/poi-user/201109.mbox/%[email protected]%3E";>discussions</link>
+                <a 
href="https://mail-archives.apache.org/mod_mbox/poi-user/201109.mbox/%[email protected]%3E";>discussions</a>
                 about accessing different Workbook-sheets
                 in different threads concurrently. While this may work to some 
degree, it may lead
                 to very hard to track errors as multi-threading issues 
typically only
@@ -539,9 +540,9 @@ System.out.println("POI Scratchpad came
     </question>
     <answer>
       <p>Across most of the UserModel classes (
-<link href="/apidocs/org/apache/poi/POIDocument.html">POIDocument</link>
+<a href="../apidocs/org/apache/poi/POIDocument.html">POIDocument</a>
 and
-<link 
href="/apidocs/org/apache/poi/POIXMLDocument.html">POIXMLDocument</link>),
+<a href="../apidocs/org/apache/poi/POIXMLDocument.html">POIXMLDocument</a>),
        you can open the document from a read-only <em>File</em>, a read-write 
<em>File</em>
        or an <em>InputStream</em>. You can always write out to an 
<em>OutputStream</em>,
        and increasing also to a <em>File</em>.
@@ -552,24 +553,24 @@ and
       <p>When writing, you can use an <em>OutputStream</em> to write to a new 
file, or
        overwrite an existing one (provided it isn't already open!). On slow 
links / disks,
        wrapping with a <em>BufferedOutputStream</em> is suggested. To write 
like this, use
-<link 
href="/apidocs/org/apache/poi/POIDocument.html#write(java.io.OutputStream)">write(OutputStream)</link>.
+<a 
href="../apidocs/org/apache/poi/POIDocument.html#write(java.io.OutputStream)">write(OutputStream)</a>.
       </p>
       <p>To write to the currently open file (an in-place write / replace), 
you need to
        have opened your document from a <em>File</em>, not an 
<em>InputStream</em>. In
        addition, you need to have opened from the <em>File</em> in read-write 
mode, not
        read-only mode. To write to the currently open file, on formats that 
support it
        (not all do), use
-<link href="/apidocs/org/apache/poi/POIDocument.html#write()">write()</link>.
+<a href="../apidocs/org/apache/poi/POIDocument.html#write()">write()</a>.
       </p>
       <p>You can also write out to a new <em>File</em>. This is available no 
matter how
        you opened the document, and will create/replace a new file. It is 
faster and lower
        memory than writing to an <em>OutputStream</em>. However, you can't use 
this to 
        replace the currently open file, only files not currently open. To 
write to a
        new / different file, use
-<link 
href="/apidocs/org/apache/poi/POIDocument.html#write(java.io.File)">write(File)</link>
+<a 
href="../apidocs/org/apache/poi/POIDocument.html#write(java.io.File)">write(File)</a>
       </p>
       <p>More information is also available in the 
-<link href="/spreadsheet/quick-guide.html#FileInputStream">HSSF and XSSF 
documentation</link>,
+<a href="../components/spreadsheet/quick-guide.html#FileInputStream">HSSF and 
XSSF documentation</a>,
        which largely applies to the other formats too.
       </p>
       <p>Note that currenly (POI 3.15 beta 3), not all of the write methods 
are available
@@ -655,7 +656,7 @@ and
             <p>Apache POI is not yet fully supported on Java 10 or newer. The 
binary formats (.xls, .doc, .ppt, ...)
                 should mostly work, but unfortunately reading the newer 
XML-based formats (.xlsx, .docx, pptx, ...)
                 is broken by a change to the ZIP file handling in Java 10, see
-                <link 
href="https://bz.apache.org/bugzilla/show_bug.cgi?id=62187";>bug 62187</link> 
for details and
+                <a 
href="https://bz.apache.org/bugzilla/show_bug.cgi?id=62187";>bug 62187</a> for 
details and
                 the latest state.
             </p>
         </answer>

Copied: poi/site/src/documentation/content/xdocs/help/index.xml (from r1836242, 
poi/site/src/documentation/content/xdocs/mailinglists.xml)
URL: 
http://svn.apache.org/viewvc/poi/site/src/documentation/content/xdocs/help/index.xml?p2=poi/site/src/documentation/content/xdocs/help/index.xml&p1=poi/site/src/documentation/content/xdocs/mailinglists.xml&r1=1836242&r2=1836243&rev=1836243&view=diff
==============================================================================
--- poi/site/src/documentation/content/xdocs/mailinglists.xml (original)
+++ poi/site/src/documentation/content/xdocs/help/index.xml Wed Jul 18 23:24:53 
2018
@@ -17,7 +17,7 @@
    limitations under the License.
    ====================================================================
 -->
-<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.3//EN" 
"./dtd/document-v13.dtd">
+<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" 
"document-v20.dtd">
 
 <document>
   <header>
@@ -35,17 +35,17 @@
         guidelines:</strong>
       </p>
       <ul>
-        <li><link 
href="https://www.apache.org/foundation/mailinglists.html";>ASF guide to Mailing 
Lists</link></li>
-        <li><link 
href="https://www.apache.org/dev/contrib-email-tips.html";>ASF Tips for email 
contributors</link></li>
-        <li><link href="https://jakarta.apache.org/site/mail.html";>The Jakarta 
guide to Mailing Lists</link></li>
+        <li><a href="https://www.apache.org/foundation/mailinglists.html";>ASF 
guide to Mailing Lists</a></li>
+        <li><a href="https://www.apache.org/dev/contrib-email-tips.html";>ASF 
Tips for email contributors</a></li>
+        <li><a href="https://jakarta.apache.org/site/mail.html";>The Jakarta 
guide to Mailing Lists</a></li>
       </ul>
     </section>
     <section><title>Lists</title>
       <section><title>The POI Developer List</title>
         <p>
           <strong>Medium Traffic</strong>
-          <link 
href="https://lists.apache.org/[email protected]";>View,
-           Participate and Subscribe to the Dev List</link>
+          <a 
href="https://lists.apache.org/[email protected]";>View,
+           Participate and Subscribe to the Dev List</a>
         </p>
         <p>
           This is the list where participating developers of the POI 
@@ -53,24 +53,24 @@
           Subscribers to this list also get notices of each and every 
           code change, build results, testing notices, etc. 
           <strong>Do not send mail to this list with usage questions or 
-          configuration problems. Use the <link href="#The+POI+User+List">POI 
User List</link> or community sites
-          such as <link href="#Stack+Overflow">Stack Overflow</link>, 
instead.</strong>
+          configuration problems. Use the <a href="#The+POI+User+List">POI 
User List</a> or community sites
+          such as <a href="#Stack+Overflow">Stack Overflow</a>, 
instead.</strong>
         </p> 
         <p>
           Alternate options:
-          <link href="mailto:[email protected]";>Subscribe</link>
-          <link href="mailto:[email protected]";>Unsubscribe</link>
-          <link href="https://mail-archives.apache.org/mod_mbox/poi-dev/";>Old 
Archive</link>
-          <link 
href="http://news.gmane.org/gmane.comp.jakarta.poi.devel";>gmane.org</link>
-          <link 
href="http://apache-poi.1045710.n5.nabble.com/POI-Dev-f2312866.html";>Nabble</link>
-          <link 
href="http://markmail.org/search/org.apache.poi.dev+list:org.apache.poi.dev";>MarkMail</link>
+          <a href="mailto:[email protected]";>Subscribe</a>
+          <a href="mailto:[email protected]";>Unsubscribe</a>
+          <a href="https://mail-archives.apache.org/mod_mbox/poi-dev/";>Old 
Archive</a>
+          <a 
href="http://news.gmane.org/gmane.comp.jakarta.poi.devel";>gmane.org</a>
+          <a 
href="http://apache-poi.1045710.n5.nabble.com/POI-Dev-f2312866.html";>Nabble</a>
+          <a 
href="http://markmail.org/search/org.apache.poi.dev+list:org.apache.poi.dev";>MarkMail</a>
         </p> 
       </section>
       <section><title>The POI User List</title>
         <p>
           <strong>Low Traffic</strong>
-          <link 
href="https://lists.apache.org/[email protected]";>View,
-           Participate and Subscribe to the User List</link>
+          <a 
href="https://lists.apache.org/[email protected]";>View,
+           Participate and Subscribe to the User List</a>
         </p>
         <p>
           This list is for users of POI to ask questions, share knowledge, 
@@ -79,19 +79,19 @@
         </p>
         <p>
           Alternate options:
-          <link href="mailto:[email protected]";>Subscribe</link>
-          <link 
href="mailto:[email protected]";>Unsubscribe</link>
-          <link href="https://mail-archives.apache.org/mod_mbox/poi-user/";>Old 
Archive</link>
-          <link 
href="http://news.gmane.org/thread.php?group=gmane.comp.jakarta.poi.user";>gmane.org</link>
-          <link 
href="http://apache-poi.1045710.n5.nabble.com/POI-User-f2280730.html";>Nabble</link>
-          <link 
href="http://markmail.org/search/org.apache.poi.user+list:org.apache.poi.user";>MarkMail</link>
+          <a href="mailto:[email protected]";>Subscribe</a>
+          <a href="mailto:[email protected]";>Unsubscribe</a>
+          <a href="https://mail-archives.apache.org/mod_mbox/poi-user/";>Old 
Archive</a>
+          <a 
href="http://news.gmane.org/thread.php?group=gmane.comp.jakarta.poi.user";>gmane.org</a>
+          <a 
href="http://apache-poi.1045710.n5.nabble.com/POI-User-f2280730.html";>Nabble</a>
+          <a 
href="http://markmail.org/search/org.apache.poi.user+list:org.apache.poi.user";>MarkMail</a>
         </p> 
       </section>
       <section><title>The POI General List</title>
         <p>
           <strong>Very Low Traffic</strong>
-          <link 
href="https://lists.apache.org/[email protected]";>View,
-           Participate and Subscribe to the General List</link>
+          <a 
href="https://lists.apache.org/[email protected]";>View,
+           Participate and Subscribe to the General List</a>
         </p>
         <p>
           This list exists for general discussions on POI, not specific to
@@ -101,14 +101,14 @@
         </p> 
         <p>
           Alternate options:
-          <link href="mailto:[email protected]";>Subscribe</link>
-          <link 
href="mailto:[email protected]";>Unsubscribe</link>
-          <link 
href="https://mail-archives.apache.org/mod_mbox/poi-general/";>Old Archive</link>
+          <a href="mailto:[email protected]";>Subscribe</a>
+          <a href="mailto:[email protected]";>Unsubscribe</a>
+          <a href="https://mail-archives.apache.org/mod_mbox/poi-general/";>Old 
Archive</a>
         </p> 
       </section>
     </section>
     <section><title>IRC</title>
-        <p>The #apache-poi channel on the <link 
href="https://webchat.freenode.net/?channels=#apache-poi";>irc.freenode.net</link>
+        <p>The #apache-poi channel on the <a 
href="https://webchat.freenode.net/?channels=#apache-poi";>irc.freenode.net</a>
         IRC network is a good place for quick questions. If your questions 
require a more in-depth answer,
         you will likely be encouraged to move the question to the mailing list.
         </p>
@@ -117,7 +117,7 @@
         <p>
            There are many POI users in the Stack Overflow community who have 
asked
            and answered questions that may be similar to the problem you are 
facing.
-           Search for the <link 
href="http://stackoverflow.com/questions/tagged/apache-poi";>apache-poi</link> 
+           Search for the <a 
href="http://stackoverflow.com/questions/tagged/apache-poi";>apache-poi</a> 
            tag on Stack Overflow.
         </p>
         <p>Regardless of which community you seek help from, remember to be 
courteous.
@@ -125,15 +125,15 @@
            the version of POI you are using, and genuine troubleshooting and 
research effort
            on your part go a long way towards getting a helpful answer.
         </p>
-        <p>Please read through the <link href="faq.html">FAQ</link>,
-           <link href="spreadsheet/quick-guide.html">Quick Guide</link>,
-           <link href="spreadsheet/how-to.html">How To</link> or
-           <link href="slideshow/xslf-cookbook.html">Cookbook</link>, and
-           <link href="spreadsheet/examples.html">Examples</link>
+        <p>Please read through the <a href="site:faq">FAQ</a>,
+           <a href="site:ssquickguide">Quick Guide</a>,
+           <a href="site:sshowto">How To</a> or
+           <a href="site:xslfcook">Cookbook</a>, and
+           <a href="site:ssexamples">Examples</a>
            of the POI module that you are trying to use before consulting 
help. You may also find your
-           question has already been answered on the POI <link 
href="#The+POI+Developer+List">dev</link>
-           or <link href="#The+POI+User+List">user</link> mailing lists,
-           <link 
href="https://bz.apache.org/bugzilla/describecomponents.cgi?product=POI";>bugzilla</link>,
+           question has already been answered on the POI <a 
href="#The+POI+Developer+List">dev</a>
+           or <a href="#The+POI+User+List">user</a> mailing lists,
+           <a 
href="https://bz.apache.org/bugzilla/describecomponents.cgi?product=POI";>bugzilla</a>,
         </p>
     </section>
   </body>

Copied: poi/site/src/documentation/content/xdocs/images/group-logo.png (from 
r1836242, poi/site/src/documentation/resources/images/asf_logo.png)
URL: 
http://svn.apache.org/viewvc/poi/site/src/documentation/content/xdocs/images/group-logo.png?p2=poi/site/src/documentation/content/xdocs/images/group-logo.png&p1=poi/site/src/documentation/resources/images/asf_logo.png&r1=1836242&r2=1836243&rev=1836243&view=diff
==============================================================================
Binary files - no diff available.

Added: poi/site/src/documentation/content/xdocs/images/group.svg
URL: 
http://svn.apache.org/viewvc/poi/site/src/documentation/content/xdocs/images/group.svg?rev=1836243&view=auto
==============================================================================
--- poi/site/src/documentation/content/xdocs/images/group.svg (added)
+++ poi/site/src/documentation/content/xdocs/images/group.svg Wed Jul 18 
23:24:53 2018
@@ -0,0 +1,506 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 
6.00 Build 0)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/";
+   xmlns:cc="http://creativecommons.org/ns#";
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+   xmlns:svg="http://www.w3.org/2000/svg";
+   xmlns="http://www.w3.org/2000/svg";
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+   version="1.1"
+   id="Layer_2"
+   x="0px"
+   y="0px"
+   viewBox="0 0 7127.6 2890"
+   enable-background="new 0 0 7127.6 2890"
+   xml:space="preserve"
+   sodipodi:docname="asf_logo.svg"
+   
inkscape:export-filename="/home/kiwiwings/project/xmlbeans/site/src/documentation/resources/images/asf_logo.png"
+   inkscape:export-xdpi="6.6435986"
+   inkscape:export-ydpi="6.6435986"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"><metadata
+   id="metadata5077"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage"; 
/></cc:Work></rdf:RDF></metadata><defs
+   id="defs5075" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="3770"
+   inkscape:window-height="2096"
+   id="namedview5073"
+   showgrid="false"
+   inkscape:zoom="0.41360345"
+   inkscape:cx="3563.8"
+   inkscape:cy="1445"
+   inkscape:window-x="70"
+   inkscape:window-y="27"
+   inkscape:window-maximized="1"
+   inkscape:current-layer="Layer_2" />
+<path
+   fill="#6D6E71"
+   
d="M7104.7,847.8c15.3,15.3,22.9,33.7,22.9,55.2c0,21.5-7.6,39.9-22.9,55.4c-15.3,15.4-33.8,23.1-55.6,23.1
  
c-21.8,0-40.2-7.6-55.4-22.9c-15.1-15.3-22.7-33.7-22.7-55.2c0-21.5,7.6-39.9,22.9-55.4c15.3-15.4,33.7-23.1,55.4-23.1
  C7070.9,824.9,7089.4,832.5,7104.7,847.8z 
M7098.1,951.9c13.3-13.6,20-29.8,20-48.7s-6.6-35-19.8-48.5  
c-13.2-13.4-29.4-20.1-48.6-20.1c-19.2,0-35.4,6.7-48.7,20.2c-13.3,13.5-19.9,29.7-19.9,48.7c0,19,6.6,35.2,19.7,48.6
  c13.1,13.4,29.3,20.1,48.5,20.1S7084.7,965.4,7098.1,951.9z 
M7087.1,888.1c0,14-6.1,22.8-18.4,26.4l22.5,30.5h-18.2l-20.3-28.3  
h-18.6v28.3h-14.7v-84.6h31.8c12.8,0,22,2.2,27.6,6.6C7084.4,871.4,7087.1,878.4,7087.1,888.1z
 M7068.2,900c3-2.4,4.4-6.5,4.4-12  
c0-5.5-1.5-9.4-4.5-11.6c-3-2.2-8.4-3.2-16-3.2h-18v30.5h17.5C7059.7,903.6,7065.3,902.4,7068.2,900z"
+   id="path4880" />
+<path
+   fill="#6D6E71"
+   d="M1803.6,499.8v155.4h-20V499.8h-56.8v-19.2h133.9v19.2H1803.6z"
+   id="path4882" />
+<path
+   fill="#6D6E71"
+   
d="M2082.2,655.2v-76.9h-105.2v76.9h-20V480.5h20v78.9h105.2v-78.9h20v174.7H2082.2z"
+   id="path4884" />
+<path
+   fill="#6D6E71"
+   
d="M2241.4,499.8v57.4h88.1v19.2h-88.1v59.8h101.8v19h-121.8V480.5H2340v19.2H2241.4z"
+   id="path4886" />
+<path
+   fill="#D22128"
+   
d="M1574.5,1852.4l417.3-997.6h80.1l417.3,997.6h-105.4l-129.3-311.9h-448.2l-127.9,311.9H1574.5z
 M2032.6,970  l-205.1,493.2h404.7L2032.6,970z"
+   id="path4888" />
+<path
+   fill="#D22128"
+   
d="M2596.9,1852.4V854.8H3010c171.4,0,295.1,158.8,295.1,313.3c0,163-115.2,316.1-286.6,316.1h-324.6v368.1
  H2596.9z 
M2693.9,1397.1h318.9c118,0,193.9-108.2,193.9-229c0-125.1-92.7-226.2-202.3-226.2h-310.5V1397.1z"
+   id="path4890" />
+<path
+   fill="#D22128"
+   
d="M3250.5,1852.4l417.3-997.6h80.1l417.3,997.6h-105.4l-129.3-311.9h-448.2l-127.9,311.9H3250.5z
 M3708.6,970  l-205.1,493.2h404.7L3708.6,970z"
+   id="path4892" />
+<path
+   fill="#D22128"
+   
d="M4637.3,849.1c177,0,306.3,89.9,368.1,217.8l-78.7,47.8c-63.2-132.1-186.9-177-295.1-177
  
c-238.9,0-369.5,213.6-369.5,414.5c0,220.6,161.6,420.1,373.7,420.1c112.4,0,244.5-56.2,307.7-185.5l81.5,42.1
  
c-64.6,148.9-241.7,231.8-394.8,231.8c-274,0-466.5-261.3-466.5-514.2C4163.8,1106.3,4336.6,849.1,4637.3,849.1z"
+   id="path4894" />
+<path
+   fill="#D22128"
+   
d="M5949.1,854.8v997.6h-98.4v-466.5h-591.5v466.5h-96.9V854.8h96.9v444h591.5v-444H5949.1z"
+   id="path4896" />
+<path
+   fill="#D22128"
+   
d="M6844.6,1765.2v87.1h-670.2V854.8H6832v87.1h-560.6v359.7h489v82.9h-489v380.8H6844.6z"
+   id="path4898" />
+<path
+   fill="#6D6E71"
+   
d="M1667.6,2063.6c11.8,3.5,22.2,8.3,31,14.2l-10.3,22.6c-9-6-18.6-10.4-28.9-13.4c-10.2-2.9-20-4.4-29.2-4.4
  
c-13.6,0-24.5,2.4-32.6,7.3c-8.1,4.9-12.2,11.8-12.2,20.7c0,7.6,2.3,14,6.8,19c4.5,5,10.2,8.9,17,11.7c6.8,2.8,16.1,6,28,9.6
  
c14.4,4.6,26,8.9,34.7,12.9c8.8,4,16.3,9.9,22.5,17.8c6.2,7.8,9.3,18.2,9.3,31c0,11.7-3.2,21.8-9.5,30.6
  
c-6.3,8.7-15.3,15.5-26.8,20.3c-11.6,4.8-24.9,7.2-40,7.2c-15.1,0-29.7-2.9-43.9-8.7c-14.2-5.8-26.4-13.6-36.6-23.4l10.7-21.6
  
c9.6,9.4,20.7,16.7,33.3,21.9c12.6,5.2,24.8,7.8,36.8,7.8c15.3,0,27.3-3,36.1-8.9c8.8-5.9,13.2-13.9,13.2-23.9
  
c0-7.8-2.3-14.3-6.9-19.4c-4.6-5.1-10.3-9-17.1-11.9c-6.8-2.8-16.1-6-28-9.6c-14.2-4.2-25.7-8.3-34.6-12.2
  
c-8.9-3.9-16.4-9.7-22.5-17.5c-6.1-7.7-9.2-17.9-9.2-30.6c0-10.9,3-20.4,9-28.6c6-8.2,14.6-14.6,25.6-19.1
  c11.1-4.5,23.8-6.8,38.2-6.8C1643.8,2058.3,1655.7,2060.1,1667.6,2063.6z"
+   id="path4900" />
+<path
+   fill="#6D6E71"
+   
d="M1980.1,2072.8c16.8,9.4,30.2,22.3,40,38.4c9.8,16.2,14.8,33.9,14.8,53.3c0,19.5-4.9,37.4-14.8,53.6
  
c-9.8,16.3-23.2,29.1-40,38.6c-16.8,9.5-35.3,14.3-55.2,14.3c-20.3,0-38.8-4.7-55.7-14.3c-16.8-9.5-30.2-22.4-40-38.6
  
c-9.8-16.3-14.8-34.1-14.8-53.6c0-19.5,4.9-37.3,14.8-53.5c9.8-16.2,23.2-29,40-38.3c16.8-9.4,35.4-14,55.7-14
  C1944.8,2058.6,1963.2,2063.3,1980.1,2072.8z 
M1881.9,2092.7c-13.1,7.4-23.6,17.5-31.4,30.1c-7.8,12.6-11.8,26.5-11.8,41.7  
c0,15.3,3.9,29.3,11.8,42c7.8,12.7,18.3,22.8,31.4,30.2c13.1,7.4,27.4,11.1,42.9,11.1c15.5,0,29.7-3.7,42.7-11.1
  
c13-7.4,23.3-17.4,31.1-30.2c7.7-12.7,11.6-26.7,11.6-42s-3.9-29.2-11.6-41.8c-7.7-12.6-18.1-22.6-31.1-30
  c-13-7.4-27.2-11.2-42.6-11.2C1909.4,2081.5,1895.1,2085.2,1881.9,2092.7z"
+   id="path4902" />
+<path
+   fill="#6D6E71"
+   d="M2186.5,2082.4v74h98.4v23.2h-98.4v90.2h-24.1v-210.6h133.8v23.2H2186.5z"
+   id="path4904" />
+<path
+   fill="#6D6E71"
+   d="M2491.6,2082.4v187.4h-24.1v-187.4h-68.4v-23.2h161.4v23.2H2491.6z"
+   id="path4906" />
+<path
+   fill="#6D6E71"
+   
d="M2871.8,2269.8l-56.8-177.4l-57.6,177.4h-24.5l-70.5-210.6h25.9l57.9,182.7l57.1-182.4l24.1-0.3l57.7,182.7
  l57.1-182.7h25l-70.6,210.6H2871.8z"
+   id="path4908" />
+<path
+   fill="#6D6E71"
+   
d="M3087.3,2216.6l-23.5,53.2h-25.6l94.4-210.6h25l94.1,210.6h-26.1l-23.5-53.2H3087.3z
 M3144.5,2086.6  l-46.9,106.8h94.4L3144.5,2086.6z"
+   id="path4910" />
+<path
+   fill="#6D6E71"
+   
d="M3461.1,2202.7c-6,0.4-10.7,0.6-14.1,0.6h-56v66.5H3367v-210.6h80c26.2,0,46.6,6.2,61.2,18.5
  
c14.5,12.3,21.8,29.8,21.8,52.3c0,17.2-4.1,31.7-12.2,43.3c-8.1,11.6-19.8,20-35,25l49.2,71.5h-27.3L3461.1,2202.7z
 M3491.3,2167.6  
c10.3-8.4,15.5-20.8,15.5-37c0-15.9-5.2-27.9-15.5-36c-10.3-8.1-25.1-12.2-44.3-12.2h-56v97.8h56
  C3466.2,2180.2,3481,2176,3491.3,2167.6z"
+   id="path4912" />
+<path
+   fill="#6D6E71"
+   
d="M3688.3,2082.4v69.2h106.2v23.2h-106.2v72.1h122.8v22.9h-146.9v-210.6h142.9v23.2H3688.3z"
+   id="path4914" />
+<path
+   fill="#6D6E71"
+   d="M4147,2082.4v74h98.4v23.2H4147v90.2h-24.1v-210.6h133.8v23.2H4147z"
+   id="path4916" />
+<path
+   fill="#6D6E71"
+   
d="M4523.3,2072.8c16.8,9.4,30.2,22.3,40,38.4c9.8,16.2,14.8,33.9,14.8,53.3c0,19.5-4.9,37.4-14.8,53.6
  
c-9.8,16.3-23.2,29.1-40,38.6c-16.8,9.5-35.3,14.3-55.2,14.3c-20.3,0-38.8-4.7-55.7-14.3c-16.8-9.5-30.2-22.4-40-38.6
  
c-9.8-16.3-14.8-34.1-14.8-53.6c0-19.5,4.9-37.3,14.8-53.5c9.8-16.2,23.2-29,40-38.3c16.8-9.4,35.4-14,55.7-14
  C4488.1,2058.6,4506.5,2063.3,4523.3,2072.8z 
M4425.2,2092.7c-13.1,7.4-23.6,17.5-31.4,30.1c-7.8,12.6-11.8,26.5-11.8,41.7  
c0,15.3,3.9,29.3,11.8,42c7.8,12.7,18.3,22.8,31.4,30.2c13.1,7.4,27.4,11.1,42.9,11.1c15.5,0,29.7-3.7,42.7-11.1
  
c13-7.4,23.3-17.4,31.1-30.2c7.7-12.7,11.6-26.7,11.6-42s-3.9-29.2-11.6-41.8c-7.7-12.6-18.1-22.6-31.1-30
  c-13-7.4-27.2-11.2-42.6-11.2C4452.6,2081.5,4438.3,2085.2,4425.2,2092.7z"
+   id="path4918" />
+<path
+   fill="#6D6E71"
+   
d="M4854.7,2247.7c-15.7,15.5-37.3,23.3-64.8,23.3c-27.7,0-49.4-7.8-65.1-23.3c-15.7-15.5-23.6-37-23.6-64.6
  
v-124h24.1v124c0,20.3,5.8,36.1,17.3,47.5c11.6,11.4,27.3,17.1,47.3,17.1c20.1,0,35.8-5.7,47.1-17c11.4-11.3,17-27.2,17-47.7v-124
  h24.1v124C4878.2,2210.7,4870.4,2232.2,4854.7,2247.7z"
+   id="path4920" />
+<path
+   fill="#6D6E71"
+   
d="M5169.5,2269.8l-126.3-169.1v169.1h-24.1v-210.6h25l126.3,169.3v-169.3h23.8v210.6H5169.5z"
+   id="path4922" />
+<path
+   fill="#6D6E71"
+   
d="M5478.4,2073.1c16.4,9.3,29.4,21.9,38.9,37.9c9.6,16,14.3,33.9,14.3,53.5s-4.8,37.6-14.3,53.6
  
c-9.5,16.1-22.6,28.7-39.3,37.9c-16.6,9.2-35.2,13.8-55.5,13.8h-84.3v-210.6h85.2C5443.7,2059.2,5462,2063.8,5478.4,2073.1z
   
M5362.3,2246.9h61.4c15.5,0,29.6-3.5,42.3-10.6c12.7-7.1,22.8-16.9,30.2-29.5c7.4-12.5,11.1-26.5,11.1-42
  
c0-15.5-3.8-29.4-11.3-41.9c-7.5-12.5-17.7-22.3-30.6-29.6c-12.8-7.2-27-10.9-42.6-10.9h-60.5V2246.9z"
+   id="path4924" />
+<path
+   fill="#6D6E71"
+   
d="M5668.6,2216.6l-23.5,53.2h-25.6l94.4-210.6h25l94.1,210.6H5807l-23.5-53.2H5668.6z
 M5725.8,2086.6  l-46.9,106.8h94.4L5725.8,2086.6z"
+   id="path4926" />
+<path
+   fill="#6D6E71"
+   d="M5991,2082.4v187.4H5967v-187.4h-68.4v-23.2h161.4v23.2H5991z"
+   id="path4928" />
+<path
+   fill="#6D6E71"
+   d="M6175.9,2269.8v-210.6h24.1v210.6H6175.9z"
+   id="path4930" />
+<path
+   fill="#6D6E71"
+   
d="M6493.7,2072.8c16.8,9.4,30.2,22.3,40,38.4c9.8,16.2,14.8,33.9,14.8,53.3c0,19.5-4.9,37.4-14.8,53.6
  
c-9.8,16.3-23.2,29.1-40,38.6c-16.8,9.5-35.3,14.3-55.2,14.3c-20.3,0-38.8-4.7-55.7-14.3c-16.8-9.5-30.2-22.4-40-38.6
  
c-9.8-16.3-14.8-34.1-14.8-53.6c0-19.5,4.9-37.3,14.8-53.5c9.8-16.2,23.2-29,40-38.3c16.8-9.4,35.4-14,55.7-14
  C6458.5,2058.6,6476.9,2063.3,6493.7,2072.8z 
M6395.6,2092.7c-13.1,7.4-23.6,17.5-31.4,30.1c-7.8,12.6-11.8,26.5-11.8,41.7  
c0,15.3,3.9,29.3,11.8,42c7.8,12.7,18.3,22.8,31.4,30.2c13.1,7.4,27.4,11.1,42.9,11.1c15.5,0,29.7-3.7,42.7-11.1
  
c13-7.4,23.3-17.4,31.1-30.2c7.7-12.7,11.6-26.7,11.6-42s-3.9-29.2-11.6-41.8c-7.7-12.6-18.1-22.6-31.1-30
  c-13-7.4-27.2-11.2-42.6-11.2C6423,2081.5,6408.8,2085.2,6395.6,2092.7z"
+   id="path4932" />
+<path
+   fill="#6D6E71"
+   
d="M6826.5,2269.8l-126.3-169.1v169.1h-24.1v-210.6h25l126.3,169.3v-169.3h23.8v210.6H6826.5z"
+   id="path4934" />
+<linearGradient
+   id="SVGID_1_"
+   gradientUnits="userSpaceOnUse"
+   x1="-4516.6152"
+   y1="-2338.7222"
+   x2="-4108.4111"
+   y2="-1861.3982"
+   gradientTransform="matrix(0.4226 -0.9063 0.9063 0.4226 5117.8774 
-2859.9343)">
+       <stop
+   offset="0"
+   style="stop-color:#F69923"
+   id="stop4936" />
+       <stop
+   offset="0.3123"
+   style="stop-color:#F79A23"
+   id="stop4938" />
+       <stop
+   offset="0.8383"
+   style="stop-color:#E97826"
+   id="stop4940" />
+</linearGradient>
+<path
+   fill="url(#SVGID_1_)"
+   
d="M1230.1,13.7c-45.3,26.8-120.6,102.5-210.5,212.3l82.6,155.9c58-82.9,116.9-157.5,176.3-221.2
  
c4.6-5.1,7-7.5,7-7.5c-2.3,2.5-4.6,5-7,7.5c-19.2,21.2-77.5,89.2-165.5,224.4c84.7-4.2,214.9-21.6,321.1-39.7
  c31.6-177-31-258-31-258S1323.4-41.4,1230.1,13.7z"
+   id="path4943" />
+<path
+   fill="none"
+   d="M1090.2,903.1c0.6-0.1,1.2-0.2,1.8-0.3l-11.9,1.3c-0.7,0.3-1.4,0.7-2.1,1  
C1082.1,904.4,1086.2,903.7,1090.2,903.1z"
+   id="path4945" />
+<path
+   fill="none"
+   
d="M1005.9,1182.3c-6.7,1.5-13.7,2.7-20.7,3.7C992.3,1185,999.2,1183.8,1005.9,1182.3z"
+   id="path4947" />
+<path
+   fill="none"
+   
d="M432.9,1808.8c0.9-2.3,1.8-4.7,2.6-7c18.2-48,36.2-94.7,54-140.1c20-51,39.8-100.4,59.3-148.3
  
c20.6-50.4,40.9-99.2,60.9-146.3c21-49.4,41.7-97,62-142.8c16.5-37.3,32.8-73.4,48.9-108.3c5.4-11.7,10.7-23.2,16-34.6
  
c10.5-22.7,21-44.8,31.3-66.5c9.5-20,19-39.6,28.3-58.8c3.1-6.4,6.2-12.8,9.3-19.1c0.5-1,1-2,1.5-3.1l-10.2,1.1l-8-15.9
  
c-0.8,1.6-1.6,3.1-2.4,4.6c-14.5,28.8-28.9,57.9-43.1,87.2c-8.2,16.9-16.4,34-24.6,51c-22.6,47.4-44.8,95.2-66.6,143.3
  
c-22.1,48.6-43.7,97.5-64.9,146.5c-20.8,48.1-41.3,96.2-61.2,144.2c-20,48-39.5,95.7-58.5,143.2c-19.9,49.5-39.2,98.7-58,147.2
  
c-4.2,10.9-8.5,21.9-12.7,32.8c-15,39.2-29.7,77.8-44,116l12.7,25.1l11.4-1.2c0.4-1.1,0.8-2.3,1.3-3.4
  C396.7,1905.4,414.9,1856.4,432.9,1808.8z"
+   id="path4949" />
+<path
+   fill="none"
+   
d="M980,1186.8L980,1186.8c0.1,0,0.1,0,0.1-0.1C980.1,1186.8,980.1,1186.8,980,1186.8z"
+   id="path4951" />
+<path
+   fill="#BE202E"
+   
d="M952.6,1323c-10.6,1.9-21.4,3.8-32.5,5.7c-0.1,0-0.1,0.1-0.2,0.1c5.6-0.8,11.2-1.7,16.6-2.6
  C942,1325.2,947.3,1324.1,952.6,1323z"
+   id="path4953" />
+<path
+   opacity="0.35"
+   fill="#BE202E"
+   
d="M952.6,1323c-10.6,1.9-21.4,3.8-32.5,5.7c-0.1,0-0.1,0.1-0.2,0.1c5.6-0.8,11.2-1.7,16.6-2.6
  C942,1325.2,947.3,1324.1,952.6,1323z"
+   id="path4955" />
+<path
+   fill="#BE202E"
+   
d="M980.3,1186.7C980.2,1186.7,980.2,1186.7,980.3,1186.7c-0.1,0.1-0.2,0.1-0.2,0.1c1.8-0.2,3.5-0.5,5.2-0.8
  
c7-1,13.9-2.2,20.7-3.7C997.5,1183.8,989,1185.2,980.3,1186.7L980.3,1186.7L980.3,1186.7z"
+   id="path4957" />
+<path
+   opacity="0.35"
+   fill="#BE202E"
+   
d="M980.3,1186.7C980.2,1186.7,980.2,1186.7,980.3,1186.7c-0.1,0.1-0.2,0.1-0.2,0.1
  
c1.8-0.2,3.5-0.5,5.2-0.8c7-1,13.9-2.2,20.7-3.7C997.5,1183.8,989,1185.2,980.3,1186.7L980.3,1186.7L980.3,1186.7z"
+   id="path4959" />
+<linearGradient
+   id="SVGID_2_"
+   gradientUnits="userSpaceOnUse"
+   x1="-7537.7339"
+   y1="-2391.4075"
+   x2="-4625.4141"
+   y2="-2391.4075"
+   gradientTransform="matrix(0.4226 -0.9063 0.9063 0.4226 5117.8774 
-2859.9343)">
+       <stop
+   offset="0.3233"
+   style="stop-color:#9E2064"
+   id="stop4961" />
+       <stop
+   offset="0.6302"
+   style="stop-color:#C92037"
+   id="stop4963" />
+       <stop
+   offset="0.7514"
+   style="stop-color:#CD2335"
+   id="stop4965" />
+       <stop
+   offset="1"
+   style="stop-color:#E97826"
+   id="stop4967" />
+</linearGradient>
+<path
+   fill="url(#SVGID_2_)"
+   
d="M858.6,784.7c25.1-46.9,50.5-92.8,76.2-137.4c26.7-46.4,53.7-91.3,80.9-134.7  
c1.6-2.6,3.2-5.2,4.8-7.7c27-42.7,54.2-83.7,81.6-122.9L1019.5,226c-6.2,7.6-12.5,15.3-18.8,23.2c-23.8,29.7-48.6,61.6-73.9,95.5
  
c-28.6,38.2-58,78.9-87.8,121.7c-27.6,39.5-55.5,80.9-83.5,123.7c-23.8,36.5-47.7,74-71.4,112.5c-0.9,1.4-1.8,2.9-2.6,4.3
  l107.5,212.3C811.8,873.6,835.1,828.7,858.6,784.7z"
+   id="path4970" />
+<linearGradient
+   id="SVGID_3_"
+   gradientUnits="userSpaceOnUse"
+   x1="-7186.1777"
+   y1="-2099.3059"
+   x2="-5450.7183"
+   y2="-2099.3059"
+   gradientTransform="matrix(0.4226 -0.9063 0.9063 0.4226 5117.8774 
-2859.9343)">
+       <stop
+   offset="0"
+   style="stop-color:#282662"
+   id="stop4972" />
+       <stop
+   offset="9.548390e-02"
+   style="stop-color:#662E8D"
+   id="stop4974" />
+       <stop
+   offset="0.7882"
+   style="stop-color:#9F2064"
+   id="stop4976" />
+       <stop
+   offset="0.9487"
+   style="stop-color:#CD2032"
+   id="stop4978" />
+</linearGradient>
+<path
+   fill="url(#SVGID_3_)"
+   
d="M369,1981c-14.2,39.1-28.5,78.9-42.9,119.6c-0.2,0.6-0.4,1.2-0.6,1.8c-2,5.7-4.1,11.5-6.1,17.2
  
c-9.7,27.4-18,52.1-37.3,108.2c31.7,14.5,57.1,52.5,81.1,95.6c-2.6-44.7-21-86.6-56.2-119.1c156.1,7,290.6-32.4,360.1-146.6
  
c6.2-10.2,11.9-20.9,17-32.2c-31.6,40.1-70.8,57.1-144.5,53c-0.2,0.1-0.3,0.1-0.5,0.2c0.2-0.1,0.3-0.1,0.5-0.2
  
c108.6-48.6,163.1-95.3,211.2-172.6c11.4-18.3,22.5-38.4,33.8-60.6c-94.9,97.5-205,125.3-320.9,104.2l-86.9,9.5
  C374.4,1966.3,371.7,1973.6,369,1981z"
+   id="path4981" />
+<linearGradient
+   id="SVGID_4_"
+   gradientUnits="userSpaceOnUse"
+   x1="-7374.1626"
+   y1="-2418.5454"
+   x2="-4461.8428"
+   y2="-2418.5454"
+   gradientTransform="matrix(0.4226 -0.9063 0.9063 0.4226 5117.8774 
-2859.9343)">
+       <stop
+   offset="0.3233"
+   style="stop-color:#9E2064"
+   id="stop4983" />
+       <stop
+   offset="0.6302"
+   style="stop-color:#C92037"
+   id="stop4985" />
+       <stop
+   offset="0.7514"
+   style="stop-color:#CD2335"
+   id="stop4987" />
+       <stop
+   offset="1"
+   style="stop-color:#E97826"
+   id="stop4989" />
+</linearGradient>
+<path
+   fill="url(#SVGID_4_)"
+   d="M409.6,1786.3c18.8-48.5,38.1-97.7,58-147.2c19-47.4,38.5-95.2,58.5-143.2  
c20-48,40.4-96.1,61.2-144.2c21.2-49,42.9-97.8,64.9-146.5c21.8-48.1,44-95.9,66.6-143.3c8.1-17.1,16.3-34.1,24.6-51
  
c14.2-29.3,28.6-58.4,43.1-87.2c0.8-1.6,1.6-3.1,2.4-4.6L681.4,706.8c-1.8,2.9-3.5,5.8-5.3,8.6c-25.1,40.9-50,82.7-74.4,125.4
  
c-24.7,43.1-49,87.1-72.7,131.7c-20,37.6-39.6,75.6-58.6,113.9c-3.8,7.8-7.6,15.5-11.3,23.2c-23.4,48.2-44.6,94.8-63.7,139.5
  
c-21.7,50.7-40.7,99.2-57.5,145.1c-11,30.2-21,59.4-30.1,87.4c-7.5,24-14.7,47.9-21.5,71.8c-16,56.3-29.9,112.4-41.2,168.3
  
L353,1935.1c14.3-38.1,28.9-76.8,44-116C401.1,1808.2,405.4,1797.3,409.6,1786.3z"
+   id="path4992" />
+<linearGradient
+   id="SVGID_5_"
+   gradientUnits="userSpaceOnUse"
+   x1="-7161.7642"
+   y1="-2379.1431"
+   x2="-5631.2524"
+   y2="-2379.1431"
+   gradientTransform="matrix(0.4226 -0.9063 0.9063 0.4226 5117.8774 
-2859.9343)">
+       <stop
+   offset="0"
+   style="stop-color:#282662"
+   id="stop4994" />
+       <stop
+   offset="9.548390e-02"
+   style="stop-color:#662E8D"
+   id="stop4996" />
+       <stop
+   offset="0.7882"
+   style="stop-color:#9F2064"
+   id="stop4998" />
+       <stop
+   offset="0.9487"
+   style="stop-color:#CD2032"
+   id="stop5000" />
+</linearGradient>
+<path
+   fill="url(#SVGID_5_)"
+   d="M243.5,1729.4c-13.6,68.2-23.2,136.2-28,203.8c-0.2,2.4-0.4,4.7-0.5,7.1  
c-33.7-54-124-106.8-123.8-106.2c64.6,93.7,113.7,186.7,120.9,278c-34.6,7.1-82-3.2-136.8-23.3c57.1,52.5,100,67,116.7,70.9
  
c-52.5,3.3-107.1,39.3-162.1,80.8c80.5-32.8,145.5-45.8,192.1-35.3C148.1,2414.2,74.1,2645,0,2890c22.7-6.7,36.2-21.9,43.9-42.6
  
c13.2-44.4,100.8-335.6,238-718.2c3.9-10.9,7.8-21.8,11.8-32.9c1.1-3,2.2-6.1,3.3-9.2c14.5-40.1,29.5-81.1,45.1-122.9
  
c3.5-9.5,7.1-19,10.7-28.6c0.1-0.2,0.1-0.4,0.2-0.6l-107.9-213.2C244.6,1724.4,244,1726.9,243.5,1729.4z"
+   id="path5003" />
+<linearGradient
+   id="SVGID_6_"
+   gradientUnits="userSpaceOnUse"
+   x1="-7374.1626"
+   y1="-2117.1309"
+   x2="-4461.8428"
+   y2="-2117.1309"
+   gradientTransform="matrix(0.4226 -0.9063 0.9063 0.4226 5117.8774 
-2859.9343)">
+       <stop
+   offset="0.3233"
+   style="stop-color:#9E2064"
+   id="stop5005" />
+       <stop
+   offset="0.6302"
+   style="stop-color:#C92037"
+   id="stop5007" />
+       <stop
+   offset="0.7514"
+   style="stop-color:#CD2335"
+   id="stop5009" />
+       <stop
+   offset="1"
+   style="stop-color:#E97826"
+   id="stop5011" />
+</linearGradient>
+<path
+   fill="url(#SVGID_6_)"
+   d="M805.6,937c-3.1,6.3-6.2,12.7-9.3,19.1c-9.3,19.2-18.8,38.8-28.3,58.8  
c-10.3,21.7-20.7,43.9-31.3,66.5c-5.3,11.4-10.6,22.9-16,34.6c-16.1,35-32.4,71.1-48.9,108.3c-20.3,45.8-41,93.4-62,142.8
  
c-20,47.1-40.3,95.9-60.9,146.3c-19.5,47.9-39.3,97.3-59.3,148.3c-17.8,45.4-35.9,92.1-54,140.1c-0.9,2.3-1.8,4.7-2.6,7
  
c-18,47.6-36.2,96.6-54.6,146.8c-0.4,1.1-0.8,2.3-1.3,3.4l86.9-9.5c-1.7-0.3-3.5-0.5-5.2-0.9c103.9-13,242.1-90.6,331.4-186.5
  
c41.1-44.2,78.5-96.3,113-157.3c25.7-45.4,49.8-95.8,72.8-151.5c20.1-48.7,39.4-101.4,58-158.6c-23.9,12.6-51.2,21.8-81.4,28.2
  
c-5.3,1.1-10.7,2.2-16.1,3.1c-5.5,1-11,1.8-16.6,2.6l0,0l0,0c0.1,0,0.1-0.1,0.2-0.1c96.9-37.3,158-109.2,202.4-197.4
  
c-25.5,17.4-66.9,40.1-116.6,51.1c-6.7,1.5-13.7,2.7-20.7,3.7c-1.7,0.3-3.5,0.6-5.2,0.8l0,0l0,0c0.1,0,0.1,0,0.1-0.1
  
c0,0,0.1,0,0.1,0l0,0c33.6-14.1,62-29.8,86.6-48.4c5.3-4,10.4-8.1,15.3-12.3c7.5-6.5,14.7-13.3,21.5-20.5c4.4-4.6,8.6-9.3,12.7-14.2
  
c9.6-11.5,18.7-23.9,27.1-37.3c2.6-4.1,5.1-8.3,7.6-12.6c3.2-6.2,6.3-12.3,9.3-18.3c1
 3.5-27.2,24.4-51.5,33-72.8  
c4.3-10.6,8.1-20.5,11.3-29.7c1.3-3.7,2.5-7.2,3.7-10.6c3.4-10.2,6.2-19.3,8.4-27.3c3.3-12,5.3-21.5,6.4-28.4l0,0l0,0
  
c-3.3,2.6-7.1,5.2-11.3,7.7c-29.3,17.5-79.5,33.4-119.9,40.8l79.8-8.8l-79.8,8.8c-0.6,0.1-1.2,0.2-1.8,0.3c-4,0.7-8.1,1.3-12.2,2
  c0.7-0.3,1.4-0.7,2.1-1l-273,29.9C806.6,935,806.1,936,805.6,937z"
+   id="path5014" />
+<linearGradient
+   id="SVGID_7_"
+   gradientUnits="userSpaceOnUse"
+   x1="-7554.8232"
+   y1="-2132.0981"
+   x2="-4642.5034"
+   y2="-2132.0981"
+   gradientTransform="matrix(0.4226 -0.9063 0.9063 0.4226 5117.8774 
-2859.9343)">
+       <stop
+   offset="0.3233"
+   style="stop-color:#9E2064"
+   id="stop5016" />
+       <stop
+   offset="0.6302"
+   style="stop-color:#C92037"
+   id="stop5018" />
+       <stop
+   offset="0.7514"
+   style="stop-color:#CD2335"
+   id="stop5020" />
+       <stop
+   offset="1"
+   style="stop-color:#E97826"
+   id="stop5022" />
+</linearGradient>
+<path
+   fill="url(#SVGID_7_)"
+   d="M1112.9,385.1c-24.3,37.3-50.8,79.6-79.4,127.5c-1.5,2.5-3,5.1-4.5,7.6  
c-24.6,41.5-50.8,87.1-78.3,137c-23.8,43.1-48.5,89.3-74.3,139c-22.4,43.3-45.6,89.2-69.4,137.8l273-29.9
  
c79.5-36.6,115.1-69.7,149.6-117.6c9.2-13.2,18.4-27,27.5-41.3c28-43.8,55.6-92,80.1-139.9c23.7-46.3,44.7-92.2,60.7-133.5
  
c10.2-26.3,18.4-50.8,24.1-72.3c5-19,8.9-36.9,11.9-54.1C1327.9,363.5,1197.6,380.9,1112.9,385.1z"
+   id="path5025" />
+<path
+   fill="#BE202E"
+   
d="M936.5,1326.1c-5.5,1-11,1.8-16.6,2.6l0,0C925.5,1328,931,1327.1,936.5,1326.1z"
+   id="path5027" />
+<path
+   opacity="0.35"
+   fill="#BE202E"
+   
d="M936.5,1326.1c-5.5,1-11,1.8-16.6,2.6l0,0C925.5,1328,931,1327.1,936.5,1326.1z"
+   id="path5029" />
+<linearGradient
+   id="SVGID_8_"
+   gradientUnits="userSpaceOnUse"
+   x1="-7374.1626"
+   y1="-2027.484"
+   x2="-4461.8433"
+   y2="-2027.484"
+   gradientTransform="matrix(0.4226 -0.9063 0.9063 0.4226 5117.8774 
-2859.9343)">
+       <stop
+   offset="0.3233"
+   style="stop-color:#9E2064"
+   id="stop5031" />
+       <stop
+   offset="0.6302"
+   style="stop-color:#C92037"
+   id="stop5033" />
+       <stop
+   offset="0.7514"
+   style="stop-color:#CD2335"
+   id="stop5035" />
+       <stop
+   offset="1"
+   style="stop-color:#E97826"
+   id="stop5037" />
+</linearGradient>
+<path
+   fill="url(#SVGID_8_)"
+   
d="M936.5,1326.1c-5.5,1-11,1.8-16.6,2.6l0,0C925.5,1328,931,1327.1,936.5,1326.1z"
+   id="path5040" />
+<path
+   fill="#BE202E"
+   
d="M980,1186.8c1.8-0.2,3.5-0.5,5.2-0.8C983.5,1186.3,981.8,1186.6,980,1186.8L980,1186.8z"
+   id="path5042" />
+<path
+   opacity="0.35"
+   fill="#BE202E"
+   
d="M980,1186.8c1.8-0.2,3.5-0.5,5.2-0.8C983.5,1186.3,981.8,1186.6,980,1186.8L980,1186.8z"
+   id="path5044" />
+<linearGradient
+   id="SVGID_9_"
+   gradientUnits="userSpaceOnUse"
+   x1="-7374.1626"
+   y1="-2037.7417"
+   x2="-4461.8433"
+   y2="-2037.7417"
+   gradientTransform="matrix(0.4226 -0.9063 0.9063 0.4226 5117.8774 
-2859.9343)">
+       <stop
+   offset="0.3233"
+   style="stop-color:#9E2064"
+   id="stop5046" />
+       <stop
+   offset="0.6302"
+   style="stop-color:#C92037"
+   id="stop5048" />
+       <stop
+   offset="0.7514"
+   style="stop-color:#CD2335"
+   id="stop5050" />
+       <stop
+   offset="1"
+   style="stop-color:#E97826"
+   id="stop5052" />
+</linearGradient>
+<path
+   fill="url(#SVGID_9_)"
+   
d="M980,1186.8c1.8-0.2,3.5-0.5,5.2-0.8C983.5,1186.3,981.8,1186.6,980,1186.8L980,1186.8z"
+   id="path5055" />
+<path
+   fill="#BE202E"
+   
d="M980.2,1186.7C980.2,1186.7,980.2,1186.7,980.2,1186.7L980.2,1186.7L980.2,1186.7L980.2,1186.7
  C980.2,1186.7,980.2,1186.7,980.2,1186.7z"
+   id="path5057" />
+<path
+   opacity="0.35"
+   fill="#BE202E"
+   
d="M980.2,1186.7C980.2,1186.7,980.2,1186.7,980.2,1186.7L980.2,1186.7L980.2,1186.7
  L980.2,1186.7C980.2,1186.7,980.2,1186.7,980.2,1186.7z"
+   id="path5059" />
+<linearGradient
+   id="SVGID_10_"
+   gradientUnits="userSpaceOnUse"
+   x1="-5738.0635"
+   y1="-2039.799"
+   x2="-5094.3457"
+   y2="-2039.799"
+   gradientTransform="matrix(0.4226 -0.9063 0.9063 0.4226 5117.8774 
-2859.9343)">
+       <stop
+   offset="0.3233"
+   style="stop-color:#9E2064"
+   id="stop5061" />
+       <stop
+   offset="0.6302"
+   style="stop-color:#C92037"
+   id="stop5063" />
+       <stop
+   offset="0.7514"
+   style="stop-color:#CD2335"
+   id="stop5065" />
+       <stop
+   offset="1"
+   style="stop-color:#E97826"
+   id="stop5067" />
+</linearGradient>
+<path
+   fill="url(#SVGID_10_)"
+   
d="M980.2,1186.7C980.2,1186.7,980.2,1186.7,980.2,1186.7L980.2,1186.7L980.2,1186.7L980.2,1186.7
  C980.2,1186.7,980.2,1186.7,980.2,1186.7z"
+   id="path5070" />
+</svg>
\ No newline at end of file

Added: poi/site/src/documentation/content/xdocs/images/icon.png
URL: 
http://svn.apache.org/viewvc/poi/site/src/documentation/content/xdocs/images/icon.png?rev=1836243&view=auto
==============================================================================
Binary file - no diff available.

Propchange: poi/site/src/documentation/content/xdocs/images/icon.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Copied: poi/site/src/documentation/content/xdocs/images/project-logo.png (from 
r1836242, poi/site/src/documentation/resources/images/pb-poi.png)
URL: 
http://svn.apache.org/viewvc/poi/site/src/documentation/content/xdocs/images/project-logo.png?p2=poi/site/src/documentation/content/xdocs/images/project-logo.png&p1=poi/site/src/documentation/resources/images/pb-poi.png&r1=1836242&r2=1836243&rev=1836243&view=diff
==============================================================================
Binary files - no diff available.

Added: poi/site/src/documentation/content/xdocs/images/usemap.gif
URL: 
http://svn.apache.org/viewvc/poi/site/src/documentation/content/xdocs/images/usemap.gif?rev=1836243&view=auto
==============================================================================
Binary file - no diff available.

Propchange: poi/site/src/documentation/content/xdocs/images/usemap.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream



---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to