Modified: poi/site/src/documentation/content/xdocs/index.xml
URL: 
http://svn.apache.org/viewvc/poi/site/src/documentation/content/xdocs/index.xml?rev=1836243&r1=1836242&r2=1836243&view=diff
==============================================================================
--- poi/site/src/documentation/content/xdocs/index.xml (original)
+++ poi/site/src/documentation/content/xdocs/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>
@@ -38,9 +38,9 @@
       <p>The Apache POI team is pleased to announce the release of XMLBeans 
3.0.0.
          Featured are a handful of bug fixes. The Apache POI team have taken 
over XMLBeans and intend to maintain it, due to its importance in the poi-ooxml 
codebase.</p>
       <p>A summary of changes is available in the 
-        <link 
href="https://svn.apache.org/viewvc/xmlbeans/trunk/CHANGES.txt?view=markup";>Release
 Notes</link>.
-        People interested should also follow the <link 
href="mailinglists.html">POI dev list</link> to track progress.</p>
-       <p>The XMLBeans <link 
href="https://issues.apache.org/jira/projects/XMLBEANS";>JIRA project</link> has 
been reopened and feel free to open issues.</p>
+        <a 
href="https://svn.apache.org/viewvc/xmlbeans/trunk/CHANGES.txt?view=markup";>Release
 Notes</a>.
+        People interested should also follow the <a 
href="site:mailinglists">POI dev list</a> to track progress.</p>
+       <p>The XMLBeans <a 
href="https://issues.apache.org/jira/projects/XMLBEANS";>JIRA project</a> has 
been reopened and feel free to open issues.</p>
        <p>The upcoming POI 4.0.0 release will use XMLBeans 3.0.0.</p>
        <p>XMLBeans 3.0.0 requires Java 6 or newer.</p>
       </section>
@@ -50,10 +50,10 @@
       <p>The Apache POI team is pleased to announce the release of 3.17. 
          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/release/RELEASE-NOTES.txt";>Release
 Notes</link>.
-        A full list of changes is available in the <link 
href="changes.html#3.17">change log</link>. 
-        People interested should also follow the <link 
href="mailinglists.html">dev list</link> to track progress.</p>
-       <p>See the <link href="download.html#POI-3.17">downloads</link> page 
for more details.</p>
+        <a 
href="https://www.apache.org/dyn/closer.lua/poi/release/RELEASE-NOTES.txt";>Release
 Notes</a>.
+        A full list of changes is available in the <a 
href="changes.html#3.17">change log</a>. 
+        People interested should also follow the <a 
href="site:mailinglists">dev list</a> to track progress.</p>
+       <p>See the <a href="download.html#POI-3.17">downloads</a> page for more 
details.</p>
        <p>POI 3.17 is the last release to support Java 6. The next 
feature-release will be 4.0.0 and will require Java 8 or newer.</p>
       </section>
 
@@ -61,7 +61,7 @@
         <p>We did some work to verify that compilation with Java 9 is working 
and
           that all unit-tests pass.
         </p>
-        <p>See the details in the <link href="faq.html#faq-N102B0">FAQ 
entry</link>.</p>
+        <p>See the details in the <a href="help/index.html#faq-N102B0">FAQ 
entry</a>.</p>
       </section>
 
       <!-- latest beta release, if newer than latest final release -->
@@ -72,10 +72,10 @@
          and support for Binary RC4 / CryptoAPI de-/encryption in HWPF.
       </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#3.17-beta1">change log</link>. 
-        People interested should also follow the <link 
href="mailinglists.html">dev list</link> to track progress.</p>
-       <p>See the <link href="download.html#POI-3.17-beta1">downloads</link> 
page for more details.</p>
+        <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#3.17-beta1">change log</a>. 
+        People interested should also follow the <a 
href="site:mailinglists">dev list</a> to track progress.</p>
+       <p>See the <a href="download.html#POI-3.17-beta1">downloads</a> page 
for more details.</p>
       </section>
        -->
 
@@ -103,43 +103,43 @@
       </p>
       <p>
       OLE2 files include most Microsoft Office files such as XLS, DOC, and PPT 
as well as MFC serialization API based file formats.
-      The project provides APIs for the <link href="poifs/index.html">OLE2 
Filesystem (POIFS)</link> and
-      <link href="hpsf/index.html">OLE2 Document Properties (HPSF)</link>.
+      The project provides APIs for the <a href="site:poifs">OLE2 Filesystem 
(POIFS)</a> and
+      <a href="site:hpsf">OLE2 Document Properties (HPSF)</a>.
       </p>
       <p>
       Office OpenXML Format is the new standards based XML file format found 
in Microsoft Office 2007 and 2008.
       This includes XLSX, DOCX and PPTX. The project provides a low level API 
to support the Open Packaging Conventions
-      using <link href="oxml4j/index.html">openxml4j</link>.
+      using <a href="site:oxml4j">openxml4j</a>.
       </p>
       <p>
        For each MS Office application there exists a component module that 
attempts to provide a common high level Java api to both OLE2 and OOXML
-       document formats. This is most developed for <link 
href="spreadsheet/index.html">Excel workbooks (SS=HSSF+XSSF)</link>.
-       Work is progressing for <link href="document/index.html">Word documents 
(WP=HWPF+XWPF)</link> and
-       <link href="slideshow/index.html">PowerPoint presentations 
(SL=HSLF+XSLF)</link>.
+       document formats. This is most developed for <a 
href="site:spreadsheet">Excel workbooks (SS=HSSF+XSSF)</a>.
+       Work is progressing for <a href="site:document">Word documents 
(WP=HWPF+XWPF)</a> and
+       <a href="site:slideshow">PowerPoint presentations (SL=HSLF+XSLF)</a>.
       </p>
       <p>
-       The project has some support for <link href="hsmf/index.html">Outlook 
(HSMF)</link>. Microsoft opened the specifications
+       The project has some support for <a href="site:hsmf">Outlook 
(HSMF)</a>. Microsoft opened the specifications
        to this format in October 2007. We would welcome contributions.
       </p>
       <p>
         There are also projects for 
-        <link href="diagram/index.html">Visio (HDGF and XDGF)</link>,
-        <link href="hmef/index.html">TNEF (HMEF)</link>,
-        and <link href="hpbf/index.html">Publisher (HPBF)</link>.
+        <a href="site:diagram">Visio (HDGF and XDGF)</a>,
+        <a href="site:hmef">TNEF (HMEF)</a>,
+        and <a href="site:hpbf">Publisher (HPBF)</a>.
       </p>
       <p>
          As a general policy we collaborate as much as possible with other 
projects to
-         provide this functionality.  Examples include: <link 
href="https://xml.apache.org/cocoon";>Cocoon</link> for
+         provide this functionality.  Examples include: <a 
href="https://xml.apache.org/cocoon";>Cocoon</a> for
          which there are serializers for HSSF;
-         <link href="https://www.openoffice.org";>Open Office.org</link> with 
whom we collaborate in documenting the
-         XLS format; and <link href="https://tika.apache.org/";>Tika</link> / 
-         <link href="https://lucene.apache.org";>Lucene</link>,
+         <a href="https://www.openoffice.org";>Open Office.org</a> with whom we 
collaborate in documenting the
+         XLS format; and <a href="https://tika.apache.org/";>Tika</a> / 
+         <a href="https://lucene.apache.org";>Lucene</a>,
          for which we provide format interpretors.  When practical, we donate
          components directly to those projects for POI-enabling them. 
       </p>
       <section><title>Why should I use Apache POI?</title>
       <p>
-       A major use of the Apache POI api is for <link 
href="text-extraction.html">Text Extraction</link> applications
+       A major use of the Apache POI api is for <a 
href="text-extraction.html">Text Extraction</a> applications
        such as web spiders, index builders, and content management systems.
       </p>
         <p>
@@ -162,7 +162,7 @@
       <section><title>Components</title>
        <p>
          The Apache POI Project provides several component modules some of 
which may not be of interest to you.
-         Use the information on our <link 
href="overview.html#components">Components</link> page to determine which
+         Use the information on our <a href="site:components">Components</a> 
page to determine which
          jar files to include in your classpath.
        </p>
       </section>
@@ -174,16 +174,16 @@
         hard-working, talented folks to help us on the project, no matter your
         background. So if you're motivated, ready, and have the time: Download 
the 
         source from the
-        <link href="subversion.html">Subversion Repository</link>, 
-        <link href="howtobuild.html">build the code</link>, join the 
-        <link href="mailinglists.html">mailing lists</link>, and we'll be 
happy to 
+        <a href="site:subversion">Subversion Repository</a>, 
+        <a href="site:howtobuild">build the code</a>, join the 
+        <a href="site:mailinglists">mailing lists</a>, and we'll be happy to 
         help you get started on the project!
       </p>
-      <helpwanted/>
+      <p id="helpwanted"/>
       <p>
-        Please read our <link href="guidelines.html">Contribution 
Guidelines</link>. 
+        Please read our <a href="site:guidelines">Contribution Guidelines</a>. 
         When your contribution is ready submit a patch to our 
-        <link 
href="https://bz.apache.org/bugzilla/buglist.cgi?product=POI";>Bug 
Database</link>.
+        <a href="https://bz.apache.org/bugzilla/buglist.cgi?product=POI";>Bug 
Database</a>.
       </p>
     </section>
   </body>

Modified: poi/site/src/documentation/content/xdocs/legal.xml
URL: 
http://svn.apache.org/viewvc/poi/site/src/documentation/content/xdocs/legal.xml?rev=1836243&r1=1836242&r2=1836243&view=diff
==============================================================================
--- poi/site/src/documentation/content/xdocs/legal.xml (original)
+++ poi/site/src/documentation/content/xdocs/legal.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>
@@ -31,9 +31,9 @@
   <body>
     <section><title>License and Notice</title>
 <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. Release artifacts are available
-  from the <link href="download.html">Download</link> page.
+  from the <a href="site:download">Download</a> page.
 </p>
 </section>
     <section><title>Copyrights and Trademarks</title>
@@ -65,7 +65,7 @@ web site are trademarks of their respect
    check your country's laws, regulations and policies concerning the
    import, possession, or use, and re-export of encryption software, to 
    see if this is permitted.  See 
-   <link href="http://www.wassenaar.org/";>http://www.wassenaar.org/</link>
+   <a href="http://www.wassenaar.org/";>http://www.wassenaar.org/</a>
    for more information.
   </p>
 

Modified: poi/site/src/documentation/content/xdocs/news.xml
URL: 
http://svn.apache.org/viewvc/poi/site/src/documentation/content/xdocs/news.xml?rev=1836243&r1=1836242&r2=1836243&view=diff
==============================================================================
--- poi/site/src/documentation/content/xdocs/news.xml (original)
+++ poi/site/src/documentation/content/xdocs/news.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>
@@ -44,47 +44,47 @@
     <section><title>English</title>
         <ul>
                 <li>
-                      <link 
href="http://archive.midrange.com/web400/200204/msg00023.html";>Discussion about 
using POI on AS/400s</link>
+                      <a 
href="http://archive.midrange.com/web400/200204/msg00023.html";>Discussion about 
using POI on AS/400s</a>
                 </li>
                 <li>
-                      <link 
href="http://www.somelist.com/mails/23819.html";>Discussion from back when we 
almost had POI as the filter for KOffice if politics and licenses hadn't killed 
iit</link>
+                      <a 
href="http://www.somelist.com/mails/23819.html";>Discussion from back when we 
almost had POI as the filter for KOffice if politics and licenses hadn't killed 
iit</a>
                 </li>
                 <li>
-                       <link 
href="http://www.oreillynet.com/pub/wlg/1552?page=last&amp;x-showcontent=text";>Java
 discussion on O'Reilly Network including discussion about POI</link> - 
O'Reilly.net
+                       <a 
href="http://www.oreillynet.com/pub/wlg/1552?page=last&amp;x-showcontent=text";>Java
 discussion on O'Reilly Network including discussion about POI</a> - 
O'Reilly.net
                 </li>
                 <li>
-                       <link 
href="http://www.rollerweblogger.org/page/roller/20020715";>Poor Obfuscation 
Implementation.</link> - Blog of David M. Johnson
+                       <a 
href="http://www.rollerweblogger.org/page/roller/20020715";>Poor Obfuscation 
Implementation.</a> - Blog of David M. Johnson
                 </li>
                 <li>
-                       <link href="http://www.jsurfer.org/article.php?sid=322";>
-                        POI 1.5-dev-rc2 released </link> - JSurfer
+                       <a href="http://www.jsurfer.org/article.php?sid=322";>
+                        POI 1.5-dev-rc2 released </a> - JSurfer
                 </li>
 
                 <li>
-                       <link 
href="http://directory.google.com/Top/Computers/Programming/Languages/Java/Class_Libraries/Data_Formats/Microsoft_Formats/";>
 Google says we're the most important in our category </link>
+                       <a 
href="http://directory.google.com/Top/Computers/Programming/Languages/Java/Class_Libraries/Data_Formats/Microsoft_Formats/";>
 Google says we're the most important in our category </a>
                 </li>
                 <li>
-                       <link 
href="http://www.javaworld.com/javaworld/javaqa/2002-05/01-qa-0503-excel3.html";>It's
 POI-fect</link> - Tony Sintes, Javaworld
+                       <a 
href="http://www.javaworld.com/javaworld/javaqa/2002-05/01-qa-0503-excel3.html";>It's
 POI-fect</a> - Tony Sintes, Javaworld
                 </li>
                 <li>
-                       <link 
href="http://www.need-a-cake.com/categories/cocoonWeblog/2002/03/07.html";>
+                       <a 
href="http://www.need-a-cake.com/categories/cocoonWeblog/2002/03/07.html";>
                        Nicola announces POI serialization code
-                       </link> - Matthew Langham's Radio Weblog
+                       </a> - Matthew Langham's Radio Weblog
                 </li>
                 <li>
-                        <link 
href="http://javalobby.org/discussionContext/showThreaded/frm/javalobby?folderId=20&amp;discussionContextId=11523";>
-                        Jakarta POI 1.4583 Released</link> - JavaLobby
+                        <a 
href="http://javalobby.org/discussionContext/showThreaded/frm/javalobby?folderId=20&amp;discussionContextId=11523";>
+                        Jakarta POI 1.4583 Released</a> - JavaLobby
                 </li>
                 <li>
-                        <link 
href="http://javalobby.org/discussionContext/showThreaded/frm/javalobby?discussionContextId=11442&amp;folderId=20";>
+                        <a 
href="http://javalobby.org/discussionContext/showThreaded/frm/javalobby?discussionContextId=11442&amp;folderId=20";>
                         POI project moves to Jakarta (OLE 2 CDF/Excel/Word in
-                        pure java)</link> - JavaLobby
+                        pure java)</a> - JavaLobby
                 </li>
                 <li>
-                        <link
+                        <a
                         
href="http://www.geocities.com/marcoschmidt.geo/java-image-coding.html";>
                         List of Java libraries to read and write image and 
document files
-                        </link> Marco Schmidt's homepage (normally we wouldn't
+                        </a> Marco Schmidt's homepage (normally we wouldn't
                         feature someone's homepage but its an extensive list of
                         information including "alternatives to POI" (for those
                         of you who are very wealthy).  But heck I think I'll
@@ -92,31 +92,31 @@
                         piece of info known to man linked or featured on it!
                 </li>
                 <li>
-                        <link href="http://radio.weblogs.com/0101350/";>
+                        <a href="http://radio.weblogs.com/0101350/";>
                         The Experiences of an Operator (M&#229;ns af Klercker)
-                        </link> - radio.weblogs.com
+                        </a> - radio.weblogs.com
                 </li>
                 <li>
-                        <link href="http://dataconv.org/apps_office.html";>
+                        <a href="http://dataconv.org/apps_office.html";>
                         DATACONV - Data Conversion Tools: Office
-                        </link> DATACONV
+                        </a> DATACONV
                 </li>
                 <li>
-                        <link href="http://chicago.sourceforge.net/devel/";>
+                        <a href="http://chicago.sourceforge.net/devel/";>
                         Chicago Developer Page
-                        </link>
+                        </a>
                 </li>
                 <li>
-                        <link href="http://www.onjava.com/pub/d/1157";>
+                        <a href="http://www.onjava.com/pub/d/1157";>
                         POI/POI Serialization Project
-                        </link> - Man you know you've hit the bigtime when
+                        </a> - Man you know you've hit the bigtime when
                         O'Reilly Likes you..  ;-)
                 </li>
                 <li>
-                        <link
+                        <a
                         href="http://www.javaworld.com/netnews/index.shtml";>
                         News Around the Net
-                        </link> - Java World
+                        </a> - Java World
                 </li>
 
         </ul>
@@ -124,86 +124,86 @@
     <section><title>Nederlandstalige (Dutch)</title>
         <ul>
                 <li>
-                        <link
+                        <a
                         href="http://www.ster.be/java/java9.html";>
                         Een Excel-werkboek maken vanuit Java - Lieven Smits
-                        </link>
+                        </a>
                 </li>
         </ul>
     </section>
     <section><title>Deutsch (German)</title>
         <ul>
-                <li> <link
-                      
href="http://www.entwickler.com/itr/news/show.php3?id=6132&amp;nodeid=82 
">Apache POI verffentlicht</link> - entwicker.com
+                <li> <a
+                      
href="http://www.entwickler.com/itr/news/show.php3?id=6132&amp;nodeid=82 
">Apache POI verffentlicht</a> - entwicker.com
                 </li>
                 <li>
-                       <link
+                       <a
                        href="http://www.jsp-develop.de/newsletter/10/";>
-                       Apache Jakarta-Projekt bringt Word und Excel in die 
Java-Welt </link> - jsp-develop.de  (for the misguided who use JSP ;-) )
+                       Apache Jakarta-Projekt bringt Word und Excel in die 
Java-Welt </a> - jsp-develop.de  (for the misguided who use JSP ;-) )
                 </li>
                 <li>
-                        <link
+                        <a
                         
href="http://www.entwickler.com/news/2002/02/5718/news.shtml";>
                         Neues Apache-Projekt bringt Word- und Excel nach Java
-                        </link> - entwickler.com
+                        </a> - entwickler.com
                 </li>
         </ul>
     </section>
     <section><title>Espa&#241;ol (Spanish)</title>
         <ul>
                 <li>
-                        <link 
href="http://www.javahispano.com/noticias/todas.jsp";>
+                        <a 
href="http://www.javahispano.com/noticias/todas.jsp";>
                         OLE2 desde Java nativo
-                        </link> - javaHispano
+                        </a> - javaHispano
                 </li>
                 <li>
-                      <link 
href="http://p2p.wrox.com/archive/java_espanol/2002-08/3.asp";>Spanish 
discussion about Excel and Java including POI from Wrox forums</link>
+                      <a 
href="http://p2p.wrox.com/archive/java_espanol/2002-08/3.asp";>Spanish 
discussion about Excel and Java including POI from Wrox forums</a>
                 </li>
         </ul>
     </section>
     <section><title>Fran&#231;ais (French)</title>
         <ul>
                <li>
-                       <link 
href="http://linuxfr.org/section/D%E9veloppeur,0,1,8,0.html";>
+                       <a 
href="http://linuxfr.org/section/D%E9veloppeur,0,1,8,0.html";>
                        Excel/OLE accessibles
-                        </link> - Da Linux French Page
+                        </a> - Da Linux French Page
                 </li>
                 <li>
-                        <link 
href="http://www.sogid.com/javalist/f2002/traiter_word_java.html";>Discussion on 
POI in French</link>
+                        <a 
href="http://www.sogid.com/javalist/f2002/traiter_word_java.html";>Discussion on 
POI in French</a>
                 </li>
         </ul>
     </section>
     <section><title>Nihongo (Japanese)</title>
         <ul>
                 <li>
-                        <link 
href="http://drpanda.freezope.org/Memo/docs/jakarta/poi/poi_sample";>100% 
PureJava...</link> - Dr. Panda Portal
+                        <a 
href="http://drpanda.freezope.org/Memo/docs/jakarta/poi/poi_sample";>100% 
PureJava...</a> - Dr. Panda Portal
                 </li>
                 <li>
-                        <link
+                        <a
                         href="http://www.gimlay.org/~andoh/java/javanew.html";>
                         What's new with java?
-                        </link> - gimlay.org
+                        </a> - gimlay.org
                 </li>
-                <li><link href="http://taka-2.com/jclass/POI/";>Java de 
Excel</link> - How to use Japanese with POI</li>
-                <li><link 
href="http://www.tech-arts.co.jp/macosx/webobjects-jp/htdocs/3200/3218.html";>Various
 discussion in Japanese including on POI</link></li>
-                <li><link href="http://muimi.com/j/jakarta/";>Japanese 
resources on Jakarta projects including POI</link></li>
-                <li><link 
href="http://www.fk.urban.ne.jp/home/kishida/";>Kishida's site</link> -- Weekly 
Forte Lectures -- includes a snip about POI and Japanese.</li>
+                <li><a href="http://taka-2.com/jclass/POI/";>Java de Excel</a> 
- How to use Japanese with POI</li>
+                <li><a 
href="http://www.tech-arts.co.jp/macosx/webobjects-jp/htdocs/3200/3218.html";>Various
 discussion in Japanese including on POI</a></li>
+                <li><a href="http://muimi.com/j/jakarta/";>Japanese resources 
on Jakarta projects including POI</a></li>
+                <li><a 
href="http://www.fk.urban.ne.jp/home/kishida/";>Kishida's site</a> -- Weekly 
Forte Lectures -- includes a snip about POI and Japanese.</li>
 
         </ul>
     </section>
     <section><title>Russkii Yazyk (Russian)</title>
         <ul>
           <li>
-             <link href="http://www.nestor.minsk.by/kg/kg02/21/kg22108.html";>
+             <a href="http://www.nestor.minsk.by/kg/kg02/21/kg22108.html";>
              Probably a translation of the Javalobby announcement of 1.5-final
-             </link> -- Computer News (What's New)
+             </a> -- Computer News (What's New)
           </li>
         </ul>
     </section>
     <section><title>Hangul (Korean)</title>
         <ul>
            <li>
-             <link 
href="http://www.javabrain.co.kr/AnswerView?questionId=1189&amp;categoryId=8";>Various
 discussion in Korean about Excel output/APIs including POI</link>
+             <a 
href="http://www.javabrain.co.kr/AnswerView?questionId=1189&amp;categoryId=8";>Various
 discussion in Korean about Excel output/APIs including POI</a>
            </li>
         </ul>
     </section>
@@ -214,10 +214,10 @@
         </p>
         <ul>
                 <li>
-                       <link
+                       <a
                        href="http://www.javacentrix.com/index.htm";>
                        If I had to guess, I'd say this is Thai, but
-                       maybe you actually know</link> - javacentrix.com
+                       maybe you actually know</a> - javacentrix.com
                 </li>
         </ul>
     </section>

Modified: poi/site/src/documentation/content/xdocs/related-projects.xml
URL: 
http://svn.apache.org/viewvc/poi/site/src/documentation/content/xdocs/related-projects.xml?rev=1836243&r1=1836242&r2=1836243&view=diff
==============================================================================
--- poi/site/src/documentation/content/xdocs/related-projects.xml (original)
+++ poi/site/src/documentation/content/xdocs/related-projects.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>
@@ -31,19 +31,19 @@
         <section>
             <title>Introduction</title>
             <p>
-                This page lists other projects that you might find interesting 
when working with documents of various types. Suggestions for additional links 
are welcome, however please note that we only list open source projects here. 
Commercial applications can provide <link href="casestudies.html">case 
studies</link> if they want to show their support for POI.
+                This page lists other projects that you might find interesting 
when working with documents of various types. Suggestions for additional links 
are welcome, however please note that we only list open source projects here. 
Commercial applications can provide <a href="casestudies.html">case studies</a> 
if they want to show their support for POI.
             </p>
         </section>
         <section>
             <title>Apache projects</title>
               <section><title>Apache Tika</title>
               <p>
-              <link href="https://tika.apache.org/";>Apache Tika</link> is a 
toolkit which detects and extracts metadata and text from over a thousand 
different file types.
+              <a href="https://tika.apache.org/";>Apache Tika</a> is a toolkit 
which detects and extracts metadata and text from over a thousand different 
file types.
               </p>
               </section>
               <section><title>Worksheet plugin for JSPWiki</title>
               <p>
-                  There is a <link 
href="https://jspwiki-wiki.apache.org/Wiki.jsp?page=WorksheetPlugin#top";>Worksheet
 plugin</link> for <link href="https://jspwiki.apache.org/";>JSPWiki</link> 
which allows to display contents of Excel files as a table in JSPWiki.
+                  There is a <a 
href="https://jspwiki-wiki.apache.org/Wiki.jsp?page=WorksheetPlugin#top";>Worksheet
 plugin</a> for <a href="https://jspwiki.apache.org/";>JSPWiki</a> which allows 
to display contents of Excel files as a table in JSPWiki.
               </p>
               </section>
                </section>
@@ -51,13 +51,13 @@
             <title>Apache incubating projects</title>
               <section><title>Apache ODF Toolkit (incubating)</title>
               <p>
-              <link href="https://incubator.apache.org/odftoolkit/";>Apache ODF 
Toolkit (incubating)</link> is a set of Java modules that allow programmatic 
creation, scanning and manipulation of OpenDocument Format (ISO/IEC 26300 == 
ODF) documents.
+              <a href="https://incubator.apache.org/odftoolkit/";>Apache ODF 
Toolkit (incubating)</a> is a set of Java modules that allow programmatic 
creation, scanning and manipulation of OpenDocument Format (ISO/IEC 26300 == 
ODF) documents.
               </p>
               </section>
               
               <section><title>Apache Corinthia (retired)</title>
               <p>
-              <link href="https://corinthia.incubator.apache.org/";>Apache 
Corinthia (incubating)</link> is a toolkit/application written in C++ for 
converting between and editing common office file formats, with an initial 
focus on word processing.
+              <a href="https://corinthia.incubator.apache.org/";>Apache 
Corinthia (incubating)</a> is a toolkit/application written in C++ for 
converting between and editing common office file formats, with an initial 
focus on word processing.
               </p>
               </section>
                </section>
@@ -65,19 +65,19 @@
             <title>Other projects</title>
               <section><title>Jackcess</title>
               <p>
-              <link href="http://jackcess.sourceforge.net/";>Jackcess</link> is 
a pure Java library for reading from and writing to MS Access databases 
available under Apache License 2.0.
+              <a href="http://jackcess.sourceforge.net/";>Jackcess</a> is a 
pure Java library for reading from and writing to MS Access databases available 
under Apache License 2.0.
               </p>
               </section>
               <section><title>poi-mail-merge</title>
               <p>
-              <link 
href="https://github.com/centic9/poi-mail-merge";>poi-mail-merge</link> is a 
small tool to automate mail-merges, i.e. replacing strings in a template 
Microsoft Word file multiple times with data from a list of replacements 
+              <a 
href="https://github.com/centic9/poi-mail-merge";>poi-mail-merge</a> is a small 
tool to automate mail-merges, i.e. replacing strings in a template Microsoft 
Word file multiple times with data from a list of replacements 
               provided as Excel/CSV data. Available under the BSD 2-Clause 
License. 
               </p>
               </section>
               <section><title>poi-visio</title>
               <p>Merged into POI as of version 3.14</p>
               <p>
-              <link href="https://github.com/BBN-D/poi-visio";>poi-visio</link> 
is a Java library that loads Visio OOXML (vsdx) files and creates an in-memory 
data structure that allows full access to the contents of the document. 
+              <a href="https://github.com/BBN-D/poi-visio";>poi-visio</a> is a 
Java library that loads Visio OOXML (vsdx) files and creates an in-memory data 
structure that allows full access to the contents of the document. 
               There is built-in support for easily traversing the content of 
the document in a structured way, and can render pages to simplified PNG files, 
or other backends supported by Java AWT. 
               Currently the library only operates in read-only mode, but its 
design does not exclude being able to modify existing documents or creating new 
documents.
               Available under the Apache License, Version 2.0.
@@ -85,7 +85,7 @@
               </section>
               <section><title>poi-visio-graph</title>
               <p>
-              <link 
href="https://github.com/BBN-D/poi-visio-graph";>poi-visio-graph</link> is a 
Java library that loads Visio OOXML (vsdx) files using the poi-visio library 
and creates an in-memory graph structure from the objects present on the page. 
+              <a 
href="https://github.com/BBN-D/poi-visio-graph";>poi-visio-graph</a> is a Java 
library that loads Visio OOXML (vsdx) files using the poi-visio library and 
creates an in-memory graph structure from the objects present on the page. 
               It utilizes user-specified connection points and also performs 
analysis to infer logical visual connection points between the objects on each 
page. 
               One possible use of this library is to create a network diagram 
from a Visio document.
               Available under the Apache License, Version 2.0.
@@ -93,56 +93,56 @@
               </section>
               <section><title>NPOI</title>
               <p>
-              <link href="https://npoi.codeplex.com/";>NPOI</link> is a .NET 
version of Apache POI available under Apache License 2.0.
+              <a href="https://npoi.codeplex.com/";>NPOI</a> is a .NET version 
of Apache POI available under Apache License 2.0.
               </p>
               </section>
               <section><title>Vaadin Spreadsheet</title>
               <p>
-              <link href="https://github.com/vaadin/spreadsheet";>Vaadin 
Spreadsheet</link> is a UI component add-on for Vaadin 7 which provides means 
to view and edit Excel spreadsheets in Vaadin applications.
+              <a href="https://github.com/vaadin/spreadsheet";>Vaadin 
Spreadsheet</a> is a UI component add-on for Vaadin 7 which provides means to 
view and edit Excel spreadsheets in Vaadin applications.
               Available under the Commercial Vaadin Add-on License version 3 
(CVALv3).
               </p>
               </section>
               <section><title>Excel module for Apache Isis</title>
               <p>
-              <link 
href="https://github.com/isisaddons/isis-module-excel";>Excel module for Apache 
Isis</link> is an add on for Apache Isis and provides a domain service so that 
a collection of (view model) 
+              <a href="https://github.com/isisaddons/isis-module-excel";>Excel 
module for Apache Isis</a> is an add on for Apache Isis and provides a domain 
service so that a collection of (view model) 
               object scan be exported to an Excel spreadsheet, or recreated by 
importing from Excel.
               Available under the Apache License, Version 2.0.
               </p>
               </section>
               <section><title>Excel Streaming Reader</title>
               <p>
-              <link 
href="https://github.com/monitorjbl/excel-streaming-reader";>Excel Streaming 
Reader</link> uses the POI Streaming API to provide Row/Cell like read-access 
to large Excel spreadsheets.
+              <a 
href="https://github.com/monitorjbl/excel-streaming-reader";>Excel Streaming 
Reader</a> uses the POI Streaming API to provide Row/Cell like read-access to 
large Excel spreadsheets.
               Available under the Apache License, Version 2.0.
               </p>
               </section>
             <section><title>XDocReport</title>
                 <p>
-                    <link 
href="https://github.com/opensagres/xdocreport";>XDocReport</link> is a Java API 
to merge XML document created with MS Office (docx) or OpenOffice (odt),
+                    <a 
href="https://github.com/opensagres/xdocreport";>XDocReport</a> is a Java API to 
merge XML document created with MS Office (docx) or OpenOffice (odt),
                     LibreOffice (odt) with a Java model to generate report and 
convert it if you need to another format (PDF, XHTML...).
                     XDocReport code is license under MIT license but the 
samples are licensed under LGPL license.
                 </p>
             </section>
             <section><title>Frosted Sheets</title>
                 <p>
-                    <link 
href="https://bitbucket.org/erosa/frostedsheets/overview";>Frosted Sheets</link> 
is a Groovy library which provides decorators for Apache POI spreadsheets, 
making it easier to work with spreadsheets
+                    <a 
href="https://bitbucket.org/erosa/frostedsheets/overview";>Frosted Sheets</a> is 
a Groovy library which provides decorators for Apache POI spreadsheets, making 
it easier to work with spreadsheets
                     in Groovy.
                     Frosted Sheets is license under the Apache License, 
Version 2.0.
                 </p>
             </section>
             <section><title>IEXL Software</title>
                 <p>
-                    <link href="http://www.iexlsoftware.com/";>iEXL</link> is a 
commercial product which allow to generate Excel spreadsheets on AS/400, 
iSeries, i5 or IBM i on Power systems.
+                    <a href="http://www.iexlsoftware.com/";>iEXL</a> is a 
commercial product which allow to generate Excel spreadsheets on AS/400, 
iSeries, i5 or IBM i on Power systems.
                     It uses Apache POI internally.
                 </p>
             </section>
             <section><title>jotlmsg</title>
                 <p>
-                    <link 
href="https://github.com/ctabin/jotlmsg";>jotlmsg</link> is a simple API (on top 
of POI) to easily generate Microsoft Outlook message files (.msg).
+                    <a href="https://github.com/ctabin/jotlmsg";>jotlmsg</a> is 
a simple API (on top of POI) to easily generate Microsoft Outlook message files 
(.msg).
                 </p>
             </section>
             <section><title>HadoopOffice</title>
                 <p>
-                    <link 
href="https://github.com/ZuInnoTe/hadoopoffice";>HadoopOffice</link> allows to 
read and write Office documents while using the Hadoop ecosystem.
+                    <a 
href="https://github.com/ZuInnoTe/hadoopoffice";>HadoopOffice</a> allows to read 
and write Office documents while using the Hadoop ecosystem.
                 </p>
             </section>
                </section>

Modified: poi/site/src/documentation/content/xdocs/site.xml
URL: 
http://svn.apache.org/viewvc/poi/site/src/documentation/content/xdocs/site.xml?rev=1836243&r1=1836242&r2=1836243&view=diff
==============================================================================
--- poi/site/src/documentation/content/xdocs/site.xml (original)
+++ poi/site/src/documentation/content/xdocs/site.xml Wed Jul 18 23:24:53 2018
@@ -17,35 +17,139 @@
    limitations under the License.
    ====================================================================
 -->
-
 <!--
 Forrest site.xml
 
 This file contains an outline of the site's information content.  It is used 
to:
 - Generate the website menus (though these can be overridden - see docs)
 - Provide semantic, location-independent aliases for internal 'site:' URIs, eg
-<link href="site:changes"> links to changes.html (or ../changes.html if in
+<a href="site:changes"> links to changes.html (or ../changes.html if in
   subdir).
-- Provide aliases for external URLs in the external-refs section.  Eg, <link
+- Provide aliases for external URLs in the external-refs section.  Eg, <a
   href="ext:cocoon"> links to http://xml.apache.org/cocoon/
 
 See http://xml.apache.org/forrest/linking.html for more info
 -->
-
-<site label="POI" href="" xmlns="http://apache.org/forrest/linkmap/1.0";>
+<site label="POI" xmlns="http://apache.org/forrest/linkmap/1.0";>
+    <home label="Overview" tab="home">
+        <index label="Home" href="index.html"/>
+        <download label="Download" href="download.html"/>
+        <changes label="Changelog" href="changes.html"/>
+        <javadocs label="Javadocs" href="ext:javadoc"/>
+        <extraction label="Text Extraction" href="text-extraction.html"/>
+        <encryption label="Encryption support" href="encryption.html"/>
+        <casestudies label="Case Studies" href="casestudies.html"/>
+        <related label="Related projects" href="related-projects.html"/>
+        <legal label="Legal" href="legal.html"/>
+    </home>
+    <apache label="Apache Wide" tab="home">
+        <asf label="Apache Software Foundation" 
href="https://www.apache.org/"/>
+        <license label="License" href="https://www.apache.org/licenses/"/>
+        <sponsor label="Sponsorship" 
href="https://www.apache.org/foundation/sponsorship.html"/>
+        <thanks label="Thanks" 
href="https://www.apache.org/foundation/thanks.html"/>
+        <security label="Security" href="https://www.apache.org/security/"/>
+    </apache>
+    <components label="Component APIs" href="components/" tab="components">
+        <index label="Overview" href="index.html"/>
+        <javadocs label="Javadocs" href="ext:javadoc"/>
+        <spreadsheet label="Excel (HSSF/XSSF)" href="spreadsheet/">
+            <index label="Overview" href="index.html"/>
+            <ssquickguide label="Quick Guide" href="quick-guide.html"/>
+            <sshowto label="HOWTO" href="how-to.html"/>
+            <sscommon label="HSSF to SS Converting" href="converting.html"/>
+            <formsupp label="Formula Support" href="formula.html"/>
+            <formeval label="Formula Evaluation" href="eval.html"/>
+            <evalguide label="Eval Dev Guide" href="eval-devguide.html"/>
+            <ssexamples label="Examples" href="examples.html"/>
+            <usecases label="Use Case" href="use-case.html"/>
+            <picdocs label="Pictorial Docs" href="diagrams.html"/>
+            <limits label="Limitations" href="limitations.html"/>
+            <udf label="User Defined Functions" 
href="user-defined-functions.html"/>
+            <excelant label="ExcelAnt Tests" href="excelant.html"/>
+            <hackhssf label="Hacking HSSF" href="hacking-hssf.html"/>
+            <recordgen label="Record Generator" href="record-generator.html"/>
+            <charts label="Charts" href="chart.html"/>
+        </spreadsheet>
+        <slideshow label="PowerPoint (HSLF/XSLF)" href="slideshow/">
+            <index label="Overview" href="index.html"/>
+            <slquickguide label="Quick Guide" href="quick-guide.html"/>
+            <hslfcook label="HSLF Cookbook" href="how-to-shapes.html"/>
+            <xslfcook label="XSLF Cookbook" href="xslf-cookbook.html"/>
+            <format label="PPT File Format" href="ppt-file-format.html"/>
+        </slideshow>
+        <document label="Word (HWPF/XWPF)" href="document/">
+            <index label="Overview" href="index.html"/>
+            <hwpfquick label="HWPF Quick Guide" href="quick-guide.html"/>
+            <xwpfquick label="XWPF Quick Guide" href="quick-guide-xwpf.html"/>
+            <docformat label="HWPF Format" href="docoverview.html"/>
+            <hwpfplan label="HWPF Project plan" href="projectplan.html"/>
+        </document>
+        <hsmf label="Outlook (HSMF)" href="hsmf/index.html"/>
+        <diagram label="Visio (HDGF+XDGF)" href="diagram/index.html"/>
+        <hpbf label="Publisher (HPBF)" href="hpbf/">
+            <index label="Overview" href="index.html"/>
+            <hpbformat label="File Format" href="file-format.html"/>
+        </hpbf>
+        <poifs label="OLE2 Filesystem (POIFS)" href="poifs/">
+            <index label="Overview" href="index.html"/>
+            <howto label="How To" href="how-to.html"/>
+            <embedded label="Embedded Documents" href="embeded.html"/>
+            <format label="File System Documentation" href="fileformat.html"/>
+            <usecases label="Use Cases" href="usecases.html"/>
+            <design label="Design" href="design.html"/>
+        </poifs>
+        <hpsf label="OLE2 Document Props (HPSF)" href="hpsf/">
+            <index label="Overview" href="index.html"/>
+            <howto label="How To" href="how-to.html"/>
+            <thumbnails label="Thumbnails" href="thumbnails.html"/>
+            <internals label="Internals" href="internals.html"/>
+            <todo label="To Do" href="todo.html"/>
+        </hpsf>
+        <hmef label="TNEF (HMEF) for winmail.dat" href="hmef/index.html"/>
+        <oxml4j label="OpenXML4J (OOXML)" href="oxml4j/index.html"/>
+        <log label="Logging framework" href="logging.html"/>
+    </components>
+    <help label="Help" tab="help" href="help/">
+        <mailinglists label="Mailing Lists" href="index.html"/>
+        <faq label="FAQ" href="faq.html"/>
+        <bugs label="Bug Database" 
href="https://bz.apache.org/bugzilla/buglist.cgi?product=POI"/>
+    </help>
+    <!-- can't use directory "community" because of forrest default rules in 
sitemap.xmap -> revisions -->
+    <community label="Getting Involved" href="devel/" tab="community">
+        <howtobuild label="How To Build" href="index.html"/>
+        <subversion label="Subversion Repository" href="subversion.html"/>
+        <guidelines label="Contribution Guidelines" href="guidelines.html"/>
+        <whoweare label="Who We Are" href="who.html"/>
+        <plan label="Planning Documents" href="plan/">
+            <planning label="Overview" href="index.html"/>
+            <vision10 label="1.0 Vision" href="vision10.html"/>
+            <vision20 label="2.0 Vision" href="vision20.html"/>
+        </plan>
+        <references label="References" href="references/">
+            <index label="Overview" href="index.html"/>
+            <logocontest label="Logo Submissions" href="logocontest.html"/>
+            <xlsspec label="XLS spec [PDF]" 
href="http://sc.openoffice.org/excelfileformat.pdf"/>
+            <cocoon label="Apache Cocoon" 
href="http://xml.apache.org/cocoon/"/>
+        </references>
+        <resolutions label="Resolutions" href="resolutions/">
+            <index label="Overview" href="index.html"/>
+            <res001 label="Minimal Coding Standards" href="res001.html"/>
+        </resolutions>
+        <history label="History" href="historyandfuture.html"/>
+    </community>
 
     <external-refs>
-        <xml.apache.org href="https://xml.apache.org/";>
-            <forrest href="forrest/">
-                <validation href="validation.html"/>
-                <webapp href="your-project.html#webapp"/>
-            </forrest>
-            <cocoon href="cocoon/"/>
-        </xml.apache.org>
+        <forrest href="http://forrest.apache.org/";>
+            <aing href="docs/linking.html"/>
+            <validation href="docs/validation.html"/>
+            <webapp href="docs/your-project.html#webapp"/>
+            <dtd-docs href="docs/dtd-docs.html"/>
+        </forrest>
+        <cocoon href="http://cocoon.apache.org/"/>
+        <xml.apache.org href="http://xml.apache.org/"/>
         <junit href="junit/index.html"/>
         <jdepend href="jdepend/index.html"/>
         <javadoc href="apidocs/index.html"/>
-           <download href="https://www.apache.org/dyn/closer.lua/poi/"/>
+        <download href="https://www.apache.org/dyn/closer.lua/poi/"/>
     </external-refs>
-
 </site>

Modified: poi/site/src/documentation/content/xdocs/tabs.xml
URL: 
http://svn.apache.org/viewvc/poi/site/src/documentation/content/xdocs/tabs.xml?rev=1836243&r1=1836242&r2=1836243&view=diff
==============================================================================
--- poi/site/src/documentation/content/xdocs/tabs.xml (original)
+++ poi/site/src/documentation/content/xdocs/tabs.xml Wed Jul 18 23:24:53 2018
@@ -17,12 +17,9 @@
    limitations under the License.
    ====================================================================
 -->
-<!DOCTYPE tabs PUBLIC "-//APACHE//DTD Cocoon Documentation Tab V1.0//EN" 
"./dtd/tab-cocoon-v10.dtd">
+<!DOCTYPE tabs PUBLIC "-//APACHE//DTD Cocoon Documentation Tab V1.1//EN" 
"http://forrest.apache.org/dtd/tab-cocoon-v11.dtd";>
 
-<tabs software="POI"
-  title="POI"
-  copyright="Apache Foundation"
-  xmlns:xlink="http://www.w3.org/1999/xlink";>
+<tabs software="POI" title="POI" copyright="The Apache Software Foundation">
 
   <!-- The rules are:
     @dir will always have /index.html added.
@@ -30,11 +27,9 @@
     directory (ends in '/'), in which case /index.html will be added
   -->
 
-
-  <tab label="Home" dir=""/>
-  <!-- Add new tabs here, eg:
-  <tab label="How-Tos" dir="community/howto/"/>
-  <tab label="XML Site" dir="xml-site/"/>
-  -->
+  <tab id="home" label="Home" dir=""/>
+  <tab id="help" label="Help" dir="help/"/>
+  <tab id="components" label="Component APIs" dir="components/"/>
+  <tab id="community" label="Getting Involved" dir="devel/"/>
 
 </tabs>

Modified: poi/site/src/documentation/content/xdocs/text-extraction.xml
URL: 
http://svn.apache.org/viewvc/poi/site/src/documentation/content/xdocs/text-extraction.xml?rev=1836243&r1=1836242&r2=1836243&view=diff
==============================================================================
--- poi/site/src/documentation/content/xdocs/text-extraction.xml (original)
+++ poi/site/src/documentation/content/xdocs/text-extraction.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>
@@ -37,11 +37,11 @@
       <p>For more advanced text extraction needs, including Rich Text
        extraction (such as formatting and styling), along with XML and
        HTML output, Apache POI works closely with 
-       <link href="https://tika.apache.org/";>Apache Tika</link> to deliver 
+       <a href="https://tika.apache.org/";>Apache Tika</a> to deliver 
        POI-powered Tika Parsers for all the project supported file formats.</p>
       <p>If you are after turn-key text extraction, including the latest
        support, styles etc, you are strongly advised to make use of 
-       <link href="https://tika.apache.org/";>Apache Tika</link>, which builds 
+       <a href="https://tika.apache.org/";>Apache Tika</a>, which builds 
        on top of POI to provide Text and Metadata extraction. If you wish
        to have something very simple and stand-alone, or you wish to make
        heavy modifications, then the POI provided text extractors documented
@@ -57,8 +57,8 @@
       these in some cases.</p>
      <p>All POIFS / OLE 2 based text extractors also extend from
       <em>org.apache.poi.extractor.POIOLE2TextExtractor</em>. This additionally
-      provides common methods to get at the <link href="hpfs/">HPFS
-      document metadata</link>.</p>
+      provides common methods to get at the <a href="hpfs/">HPFS
+      document metadata</a>.</p>
      <p>All OOXML based text extractors also extend from
       <em>org.apache.poi.POIOOXMLTextExtractor</em>. This additionally
       provides common methods to get at the OOXML metadata.</p>
@@ -73,7 +73,7 @@
       figures out the correct text extractor for you, and returns it.</p>
      <p>For complete detection and text extractor auto-selection, users
       are strongly encouraged to investigate
-      <link href="https://tika.apache.org/";>Apache Tika</link>.</p>
+      <a href="https://tika.apache.org/";>Apache Tika</a>.</p>
     </section>
 
     <section><title>Excel</title>

Added: poi/site/src/documentation/resources/schema/catalog.xcat
URL: 
http://svn.apache.org/viewvc/poi/site/src/documentation/resources/schema/catalog.xcat?rev=1836243&view=auto
==============================================================================
--- poi/site/src/documentation/resources/schema/catalog.xcat (added)
+++ poi/site/src/documentation/resources/schema/catalog.xcat Wed Jul 18 
23:24:53 2018
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN"
+"http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd";>
+
+<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog" prefer="public">
+  <public publicId="-//APACHE//DTD Changes POI//EN" uri="changes-poi.dtd"/>
+</catalog>
\ No newline at end of file

Copied: poi/site/src/documentation/resources/schema/changes-poi.dtd (from 
r1836242, poi/site/src/documentation/content/xdocs/dtd/changes-v11.dtd)
URL: 
http://svn.apache.org/viewvc/poi/site/src/documentation/resources/schema/changes-poi.dtd?p2=poi/site/src/documentation/resources/schema/changes-poi.dtd&p1=poi/site/src/documentation/content/xdocs/dtd/changes-v11.dtd&r1=1836242&r2=1836243&rev=1836243&view=diff
==============================================================================
--- poi/site/src/documentation/content/xdocs/dtd/changes-v11.dtd (original)
+++ poi/site/src/documentation/resources/schema/changes-poi.dtd Wed Jul 18 
23:24:53 2018
@@ -1,52 +1,42 @@
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
 <!-- ===================================================================
 
-     Apache Changes DTD (Version 1.1)
+     Apache Changes POI DTD
 
 PURPOSE:
   This DTD was developed to create a simple yet powerful document
   type for software development changes for use with the Apache projects.
-  It is an XML-compliant DTD and it's maintained by the Apache XML
+  It is an XML-compliant DTD and it's maintained by the Apache POI
   project.
 
 TYPICAL INVOCATION:
 
   <!DOCTYPE document PUBLIC
-       "-//APACHE//DTD Changes Vx.y//EN"
-       "changes-vxy.dtd">
-
-  where
-
-    x := major version
-    y := minor version
+       "-//APACHE//DTD Changes POI//EN"
+       "changes-poi.dtd">
 
 NOTES:
-  It is important, especially in open developed software projects, to keep
+  It is important, expecially in open developped software projects, to keep
   track of software changes both to give users indications of bugs that might
   have been resolved, as well, and not less important, to provide credits
   for the support given to the project. It is considered vital to provide
   adequate payback using recognition and credits to let users and developers
   feel part of the community, thus increasing development power.
-
-AUTHORS:
-  Stefano Mazzocchi <[email protected]>
-
-FIXME:
-
-CHANGE HISTORY:
-[Version 1.0]
-  19991129 Initial version. (SM)
-  20000316 Added bugfixing attribute. (SM)
-[Version 1.1]
-  20011212 Used public identifiers for external entities (SM)
-  
-COPYRIGHT:
-  Copyright (c) @year@ The Apache Software Foundation.
-
-  Permission to copy in any form is granted provided this notice is
-  included in all copies. Permission to redistribute is granted
-  provided this file is distributed untouched in all its parts and
-  included files.
-
 ==================================================================== -->
 
 <!-- =============================================================== -->
@@ -54,47 +44,27 @@ COPYRIGHT:
 <!-- =============================================================== -->
 
 <!ENTITY % document PUBLIC
-    "-//APACHE//DTD Documentation V1.1//EN"
-    "document-v11.dtd">
+    "-//APACHE//ENTITIES Documentation V2.0//EN"
+    "document-v20.mod">
 %document;
 
 <!-- =============================================================== -->
-<!-- Common entities -->
+<!-- Include the Common ISO Character Entity Sets -->
 <!-- =============================================================== -->
 
-<!ENTITY % types "add|remove|update|fix|unknown">
+<!ENTITY % common-charents PUBLIC
+    "-//APACHE//ENTITIES Common Character Entity Sets V1.0//EN"
+    "common-charents-v10.mod">
+%common-charents;
 
 <!-- =============================================================== -->
-<!-- Document Type Definition -->
+<!-- Include the Changes module -->
 <!-- =============================================================== -->
 
-<!ELEMENT changes (devs, release*)>
-<!ATTLIST changes %common.att;
-                  %title.att;>
-
-    <!ELEMENT devs (person+)>
-    <!ATTLIST devs %common.att;>
-
-    <!ELEMENT release (summary+,actions+)>
-    <!ATTLIST release %common.att;
-                      version  CDATA  #REQUIRED
-                      date     CDATA  #REQUIRED>
-        <!ELEMENT bug ()>
-        <!ATTLIST bug %common.att;
-                num  CDATA  #REQUIRED>
-        <!ELEMENT summary (summary-item+)>
-        <!ELEMENT summary-item (bug,%content.mix;)>
-
-        <!ELEMENT actions (action+)>
-        <!ELEMENT action (bug,%content.mix;)*>
-        <!ATTLIST action %common.att;
-                         dev  IDREF  #REQUIRED
-                         type (%types;)  #IMPLIED
-                         due-to CDATA #IMPLIED
-                         due-to-email CDATA #IMPLIED
-                         fixes-bug CDATA #IMPLIED
-                         breaks-compatibility (true|false) #IMPLIED
-                         module CDATA #IMPLIED>
+<!ENTITY % changes PUBLIC
+    "-//APACHE//ENTITIES Changes POI//EN"
+    "changes-poi.mod">
+%changes;
 
 <!-- =============================================================== -->
 <!-- End of DTD -->

Copied: poi/site/src/documentation/resources/schema/changes-poi.mod (from 
r1836242, poi/site/src/documentation/content/xdocs/dtd/changes-v11.mod)
URL: 
http://svn.apache.org/viewvc/poi/site/src/documentation/resources/schema/changes-poi.mod?p2=poi/site/src/documentation/resources/schema/changes-poi.mod&p1=poi/site/src/documentation/content/xdocs/dtd/changes-v11.mod&r1=1836242&r2=1836243&rev=1836243&view=diff
==============================================================================
--- poi/site/src/documentation/content/xdocs/dtd/changes-v11.mod (original)
+++ poi/site/src/documentation/resources/schema/changes-poi.mod Wed Jul 18 
23:24:53 2018
@@ -1,9 +1,10 @@
 <!--
-  Copyright 1999-2004 The Apache Software Foundation
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
 
       http://www.apache.org/licenses/LICENSE-2.0
 
@@ -14,57 +15,71 @@
   limitations under the License.
 -->
 <!-- ===================================================================
-
-     Apache Changes Module (Version 1.1)
-
+     Apache Changes POI Module
 PURPOSE:
   This DTD was developed to create a simple yet powerful document
   type for software development changes for use with the Apache projects.
   It is an XML-compliant DTD and it's maintained by the Apache XML
   project.
-
 TYPICAL INVOCATION:
-
   <!ENTITY % changes PUBLIC
-      "-//APACHE//ENTITIES Changes Vxy//EN"
-      "changes-vxy.mod">
+      "-//APACHE//ENTITIES Changes POI//EN"
+      "changes-poi.mod">
   %changes;
-
-  where
-
-    x := major version
-    y := minor version
-
 NOTES:
   It is important, expecially in open developped software projects, to keep
-  track of software changes both to give users indications of bugs that might
+  track of software changes both to give users indications of bugs that mig
   have been resolved, as well, and not less important, to provide credits
   for the support given to the project. It is considered vital to provide
-  adequate payback using recognition and credits to let users and developers
+  adequate payback using recognition and credits to let users and developer
   feel part of the community, thus increasing development power.
-
-FIXME:
-
-CHANGE HISTORY:
-[Version 1.0]
-  19991129 Initial version. (SM)
-  20000316 Added bugfixing attribute. (SM)
-[Version 1.1]
-  20011212 Used public identifiers for external entities (SM)
-
 ==================================================================== -->
 
 <!-- =============================================================== -->
 <!-- Document Type Definition -->
 <!-- =============================================================== -->
-
-<!ELEMENT changes (title?, devs?, release+)>
+<!ELEMENT changes (devs?, contexts, release+)>
 <!ATTLIST changes %common.att;>
 
-    <!ELEMENT release (action+)>
-    <!ATTLIST release %common.att;
-                      version  CDATA  #REQUIRED
-                      date     CDATA  #REQUIRED>
+<!ELEMENT devs (person+)>
+<!ATTLIST devs %common.att;>
+
+<!ELEMENT contexts (context+)>
+<!ELEMENT context EMPTY>
+<!ATTLIST context %common-idreq.att;
+        %title.att;>
+
+
+<!ELEMENT release (summary?,actions)>
+<!ATTLIST release %common.att;
+        version  CDATA  #REQUIRED
+        date     CDATA  #REQUIRED>
+
+<!ELEMENT summary (summary-item+)>
+<!ELEMENT summary-item (%content.mix;|bug)*>
+
+<!ELEMENT actions (action+)>
+<!ELEMENT action (%content.mix;|bug)*>
+
+<!ENTITY % types "add|remove|update|fix">
+<!ENTITY % importances 
"enhancement|trivial|minor|normal|major|critical|blocker">
+
+
+<!ATTLIST action
+        %common.att;
+        dev  IDREF  #REQUIRED
+        type (%types;)  #IMPLIED
+        context IDREFS #REQUIRED
+        importance (%importances;) "normal"
+        due-to CDATA #IMPLIED
+        due-to-email CDATA #IMPLIED
+        fixes-bug CDATA #IMPLIED
+        breaks-compatibility (true|false) #IMPLIED>
+
+<!ELEMENT bug EMPTY>
+<!ATTLIST bug %common.att;
+        num      CDATA  #REQUIRED>
+
 
 <!-- =============================================================== -->
 <!-- End of DTD -->

Modified: poi/site/src/documentation/resources/stylesheets/changes2document.xsl
URL: 
http://svn.apache.org/viewvc/poi/site/src/documentation/resources/stylesheets/changes2document.xsl?rev=1836243&r1=1836242&r2=1836243&view=diff
==============================================================================
--- poi/site/src/documentation/resources/stylesheets/changes2document.xsl 
(original)
+++ poi/site/src/documentation/resources/stylesheets/changes2document.xsl Wed 
Jul 18 23:24:53 2018
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <!--
    ====================================================================
    Licensed to the Apache Software Foundation (ASF) under one or more
@@ -19,177 +19,188 @@
 -->
 
 <xsl:stylesheet
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform";
-    version="1.0">
+        xmlns:xsl="http://www.w3.org/1999/XSL/Transform";
+        version="1.0">
 
- <xsl:param name="bugtracking-url"/>
- <!-- FIXME : Get the Github URL from properties -->
- <xsl:variable name="github-url" select="'https://github.com/apache/poi'"/>
-
- <xsl:variable name="bugdetails" select="concat($bugtracking-url, 
'show_bug.cgi?id=')"/>
- <xsl:variable name="buglist" select="concat($bugtracking-url, 
'buglist.cgi?bug_id=')"/>
-
- <xsl:template match="link">
-   <!-- FIXME! This doesn't work for href or name. Use the externally defined 
link->a transform if possible -->
-   <link href="{@href}"><xsl:apply-templates/></link>
- </xsl:template>
-
- <!-- usage: <bug num="12345"/> or <bug num="12345,12346"/> or <bug 
num="github-12"/> -->
- <xsl:template match="bug">
-    <xsl:choose>
-     <xsl:when test="contains(@num, ',')">
-      <link href="{$buglist}{translate(normalize-space(@num),' ','')}">
-       <xsl:text></xsl:text><xsl:value-of select="normalize-space( 
translate(@num, ',', ' ') )"/>
-      </link>
-     </xsl:when>
-     <xsl:otherwise>
-      <xsl:choose>
-       <xsl:when test="contains(@num, 'github-')">
-         <link href="{$github-url}/pull/{translate(@num,'github-','')}">
-         <xsl:text></xsl:text><xsl:value-of select="@num"/>
-         </link>
-       </xsl:when>
-       <xsl:otherwise>
-         <link href="{$bugdetails}{@num}">
-         <xsl:text></xsl:text><xsl:value-of select="@num"/>
-         </link>
-       </xsl:otherwise>
-      </xsl:choose>
-     </xsl:otherwise>
-    </xsl:choose>
- </xsl:template>
-
- <xsl:template match="devs"/>
- 
- <xsl:template match="changes">
-  <document>
-   <header>
-    <title>History of Changes</title>
-   </header>
-   <body>
-    <p><link href="changes.rss"><img src="images/rss.png" alt="RSS" 
title="RSS"/></link></p>    
-    <xsl:apply-templates/>
-   </body>
-  </document>
- </xsl:template>
-
- <xsl:template match="release">
-  <section id="{@version}">
-   <title>Version <xsl:value-of select="@version"/> (<xsl:value-of 
select="@date"/>)</title>
-    <xsl:apply-templates/>
-  </section>
- </xsl:template>
-
- <xsl:template match="summary">
-  <section>
-   <title>Summary</title>
-    <ul> <!-- create a new list for each noteable change in the summary -->
-     <xsl:apply-templates/> <!-- summary-item's -->
-    </ul>
-  </section>
- </xsl:template>
-
- <xsl:template match="summary-item">
-  <li>
-    <xsl:apply-templates/>
-  </li>
- </xsl:template>
-
- <xsl:template match="actions">
-   <section><title>Changes</title>
-     <table>
-       <thead>
-         <tr>
-           <th>Type</th>
-           <th>Bug</th>
-           <th style="min-width: 100px;">Module</th>
-           <th style="width: 100%;">Description</th>
-         </tr>
-       </thead>
-
-       <tbody>
-         <!-- TODO: sort actions by type -->
-         <xsl:apply-templates/> <!-- action's -->
-       </tbody>
-
-     </table>
-   </section>
- </xsl:template>
-
- <xsl:template match="action">
-  <tr>
-
-  <td style="text-align: center;">
-   <icon src="skin/images/{@type}.png" alt="{@type}" title="{@type}"/>
-  </td>
-
-  <td>
-   <!-- TODO: duplicate code. replace with the <xsl:template match="bug"/> 
defined above -->
-   <xsl:if test="@fixes-bug">
-    <xsl:choose>
-     <xsl:when test="contains(@fixes-bug, ',')">
-      <link href="{$buglist}{translate(normalize-space(@fixes-bug),' ','')}">
-       <xsl:text></xsl:text><xsl:value-of select="normalize-space( 
translate(@fixes-bug, ',', ' ') )"/>
-      </link>
-     </xsl:when>
-     <xsl:otherwise>
-      <xsl:choose>
-       <xsl:when test="contains(@fixes-bug, 'github-')">
-         <link href="{$github-url}/pull/{translate(@fixes-bug,'github-','')}">
-         <xsl:text></xsl:text><xsl:value-of select="@fixes-bug"/>
-         </link>
-       </xsl:when>
-       <xsl:otherwise>
-         <link href="{$bugdetails}{@fixes-bug}">
-         <xsl:text></xsl:text><xsl:value-of select="@fixes-bug"/>
-         </link>
-       </xsl:otherwise>
-      </xsl:choose>
-     </xsl:otherwise>
-    </xsl:choose>
-   </xsl:if>
-  </td>
-
-  <td>
-   <!-- FIXME: is there any way that the module can be fetched from bugzilla 
using each bug's component? -->
-   <xsl:if test="@module">
-    <xsl:value-of select="@module"/>
-   </xsl:if>
-  </td>
-
-  <td>
-
-   <!-- description: bold any backwards-breaking changes -->
-   <xsl:choose>
-    <xsl:when test="@breaks-compatibility">
-     <b>
-      <xsl:apply-templates/>
-      <xsl:text> (breaks backwards compatibility)</xsl:text>
-    </b>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:apply-templates/>
-    </xsl:otherwise>
-   </xsl:choose>
-
-   <!-- thanks -->
-   <xsl:if test="@due-to and @due-to!=''">
-    <xsl:text> Thanks to </xsl:text>
-    <xsl:choose>
-     <xsl:when test="@due-to-email and @due-to-email!=''">
-      <link href="mailto:{@due-to-email}";>
-       <xsl:value-of select="@due-to"/>
-      </link>
-     </xsl:when>
-     <xsl:otherwise>
-      <xsl:value-of select="@due-to"/>
-     </xsl:otherwise>
-    </xsl:choose>
-    <xsl:text>.</xsl:text>
-   </xsl:if>
-  </td>
+    <xsl:param 
name="bugtracking-url">https://bz.apache.org/bugzilla/</xsl:param>
+    <!-- FIXME : Get the Github URL from properties -->
+    <xsl:variable 
name="github-url">https://github.com/apache/poi</xsl:variable>
+
+    <xsl:variable name="bugdetails" select="concat($bugtracking-url, 
'show_bug.cgi?id=')"/>
+    <xsl:variable name="buglist" select="concat($bugtracking-url, 
'buglist.cgi?bug_id=')"/>
+
+    <xsl:template match="a">
+        <!-- FIXME! This doesn't work for href or name. Use the externally 
defined link->a transform if possible -->
+        <a href="{@href}">
+            <xsl:apply-templates/>
+        </a>
+    </xsl:template>
+
+    <!-- usage: <bug num="12345"/> or <bug num="12345,12346"/> or <bug 
num="github-12"/> -->
+    <xsl:template match="bug">
+        <xsl:choose>
+            <xsl:when test="contains(@num, ',')">
+                <a href="{$buglist}{translate(normalize-space(@num),' ','')}">
+                    <xsl:text></xsl:text><xsl:value-of 
select="normalize-space( translate(@num, ',', ' ') )"/>
+                </a>
+            </xsl:when>
+            <xsl:otherwise>
+                <xsl:choose>
+                    <xsl:when test="contains(@num, 'github-')">
+                        <a 
href="{$github-url}/pull/{translate(@num,'github-','')}">
+                            <xsl:text></xsl:text><xsl:value-of select="@num"/>
+                        </a>
+                    </xsl:when>
+                    <xsl:otherwise>
+                        <a href="{$bugdetails}{@num}">
+                            <xsl:text></xsl:text><xsl:value-of select="@num"/>
+                        </a>
+                    </xsl:otherwise>
+                </xsl:choose>
+            </xsl:otherwise>
+        </xsl:choose>
+    </xsl:template>
+
+    <xsl:template match="devs"/>
+
+    <xsl:template match="changes">
+        <document>
+            <header>
+                <title>History of Changes</title>
+            </header>
+            <body>
+                <xsl:apply-templates/>
+            </body>
+        </document>
+    </xsl:template>
+
+    <xsl:template match="release">
+        <section id="{@version}">
+            <title>Version
+                <xsl:value-of select="@version"/> (<xsl:value-of 
select="@date"/>)
+            </title>
+            <xsl:apply-templates/>
+        </section>
+    </xsl:template>
+
+    <xsl:template match="summary">
+        <section>
+            <title>Summary</title>
+            <ul> <!-- create a new list for each noteable change in the 
summary -->
+                <xsl:apply-templates/> <!-- summary-item's -->
+            </ul>
+        </section>
+    </xsl:template>
+
+    <xsl:template match="summary-item">
+        <li>
+            <xsl:apply-templates/>
+        </li>
+    </xsl:template>
+
+    <xsl:template match="actions">
+        <section>
+            <title>Changes</title>
+            <table class="POITable">
+                <colgroup>
+                    <col width="100"/>
+                    <col width="200"/>
+                    <col width="150"/>
+                    <col/>
+                </colgroup>
+                <thead>
+                    <tr>
+                        <th>Type</th>
+                        <th>Bug</th>
+                        <th>Module</th>
+                        <th>Description</th>
+                    </tr>
+                </thead>
+
+                <tbody>
+                    <!-- TODO: sort actions by type -->
+                    <xsl:apply-templates/> <!-- action's -->
+                </tbody>
+
+            </table>
+        </section>
+    </xsl:template>
+
+    <xsl:template match="action">
+        <tr>
+
+            <td style="text-align: center;">
+                <icon src="images/{@type}.png" alt="{@type}" title="{@type}"/>
+            </td>
+
+            <td>
+                <!-- TODO: duplicate code. replace with the <xsl:template 
match="bug"/> defined above -->
+                <xsl:if test="@fixes-bug">
+                    <xsl:choose>
+                        <xsl:when test="contains(@fixes-bug, ',')">
+                            <a 
href="{$buglist}{translate(normalize-space(@fixes-bug),' ','')}">
+                                <xsl:text></xsl:text><xsl:value-of
+                                    select="normalize-space( 
translate(@fixes-bug, ',', ' ') )"/>
+                            </a>
+                        </xsl:when>
+                        <xsl:otherwise>
+                            <xsl:choose>
+                                <xsl:when test="contains(@fixes-bug, 
'github-')">
+                                    <a 
href="{$github-url}/pull/{translate(@fixes-bug,'github-','')}">
+                                        <xsl:text></xsl:text><xsl:value-of 
select="@fixes-bug"/>
+                                    </a>
+                                </xsl:when>
+                                <xsl:otherwise>
+                                    <a href="{$bugdetails}{@fixes-bug}">
+                                        <xsl:text></xsl:text><xsl:value-of 
select="@fixes-bug"/>
+                                    </a>
+                                </xsl:otherwise>
+                            </xsl:choose>
+                        </xsl:otherwise>
+                    </xsl:choose>
+                </xsl:if>
+            </td>
+
+            <td>
+                <!-- FIXME: is there any way that the module can be fetched 
from bugzilla using each bug's component? -->
+                <xsl:if test="@context">
+                    <xsl:value-of select="@context"/>
+                </xsl:if>
+            </td>
+
+            <td>
+
+                <!-- description: bold any backwards-breaking changes -->
+                <xsl:choose>
+                    <xsl:when test="@breaks-compatibility">
+                        <b>
+                            <xsl:apply-templates/>
+                            <xsl:text> (breaks backwards 
compatibility)</xsl:text>
+                        </b>
+                    </xsl:when>
+                    <xsl:otherwise>
+                        <xsl:apply-templates/>
+                    </xsl:otherwise>
+                </xsl:choose>
+
+                <!-- thanks -->
+                <xsl:if test="@due-to and @due-to!=''">
+                    <xsl:text> Thanks to </xsl:text>
+                    <xsl:choose>
+                        <xsl:when test="@due-to-email and @due-to-email!=''">
+                            <a href="mailto:{@due-to-email}";>
+                                <xsl:value-of select="@due-to"/>
+                            </a>
+                        </xsl:when>
+                        <xsl:otherwise>
+                            <xsl:value-of select="@due-to"/>
+                        </xsl:otherwise>
+                    </xsl:choose>
+                    <xsl:text>.</xsl:text>
+                </xsl:if>
+            </td>
 
-  </tr>
- </xsl:template>
+        </tr>
+    </xsl:template>
 
 </xsl:stylesheet>

Copied: poi/site/src/documentation/resources/stylesheets/snipplets2document.xsl 
(from r1836242, 
poi/site/src/documentation/skins/poi-site/xslt/html/document2html.xsl)
URL: 
http://svn.apache.org/viewvc/poi/site/src/documentation/resources/stylesheets/snipplets2document.xsl?p2=poi/site/src/documentation/resources/stylesheets/snipplets2document.xsl&p1=poi/site/src/documentation/skins/poi-site/xslt/html/document2html.xsl&r1=1836242&r2=1836243&rev=1836243&view=diff
==============================================================================
--- poi/site/src/documentation/skins/poi-site/xslt/html/document2html.xsl 
(original)
+++ poi/site/src/documentation/resources/stylesheets/snipplets2document.xsl Wed 
Jul 18 23:24:53 2018
@@ -17,301 +17,24 @@
    limitations under the License.
    ====================================================================
 -->
-<!--
-This stylesheet contains the majority of templates for converting documentv11
-to HTML.  It renders XML as HTML in this form:
 
-  <div class="content">
-   ...
-  </div>
-
-..which site2xhtml.xsl then combines with HTML from the index (book2menu.xsl)
-and tabs (tab2menu.xsl) to generate the final HTML.
-
--->
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform";>
-
-  <xsl:import href="../../../common/xslt/html/document2html.xsl"/>
-
-<xsl:template match="comment()">
-       <!-- comments are ignored -->
-</xsl:template>
-
-<!-- ====================================================================== -->
-<!-- document section -->
-<!-- ====================================================================== -->
-
- <xsl:template match="document">
-  <!-- checks if this is the included document to avoid neverending loop -->
-  <xsl:if test="not(book)">
-      <document>
-      <xsl:choose>
-      <xsl:when test="header/title">
-            <title><xsl:value-of select="header/title"/></title>
-      </xsl:when>
-      <xsl:otherwise>
-         <title>NO TITLE</title>
-      </xsl:otherwise>
-   </xsl:choose>
-      <body>
-        <xsl:apply-templates/>
-        <xsl:if test="header/authors">
-            <div align="right" id="authors">
-               <xsl:for-each select="header/authors/person">
-                     <xsl:choose>
-                        <xsl:when test="position()=1">by&#160;</xsl:when>
-
-                        <xsl:otherwise>,&#160;</xsl:otherwise>
-                     </xsl:choose>
-                     <!-- <a href="mailto:{@email}";> -->
-                      <xsl:value-of select="@name" />
-                     <!-- </a> -->
-                  </xsl:for-each>
-              </div>
-         </xsl:if>
-        <!--xsl:call-template name="pdflink"/-->
-      </body>
-      </document>
-   </xsl:if>
-
-
-
-   <xsl:if test="book">
-    <xsl:apply-templates/>
-   </xsl:if>
-  </xsl:template>
-
-   <xsl:template match="body">
-    <xsl:apply-templates/>
-  </xsl:template>
-
-
-<!-- ====================================================================== -->
-<!-- header section -->
-<!-- ====================================================================== -->
-
- <xsl:template match="header">
-  <!-- ignore on general document -->
- </xsl:template>
-
-<!-- ====================================================================== -->
-<!-- body section -->
-<!-- ====================================================================== -->
-
-   <xsl:template match="section">
-
-    <xsl:variable name = "level" select = "count(ancestor::section)+1" />
-    <xsl:apply-templates select="@id"/>
-    <xsl:choose>
-       <xsl:when test="$level=1">
-         <div class="h3"><h3>
-           <xsl:value-of select="title"/>
-           <a href="#{@id}" class="headerlink" title="Permanent 
link"><xsl:text>#</xsl:text></a>
-         </h3></div>
-         <xsl:apply-templates/>
-       </xsl:when>
-       <xsl:when test="$level=2">
-         <div class="h4"><h4>
-           <xsl:value-of select="title"/>
-           <a href="#{@id}" class="headerlink" title="Permanent 
link"><xsl:text>#</xsl:text></a>
-         </h4></div>
-         <xsl:apply-templates/>
-       </xsl:when>
-       <xsl:when test="$level=3">
-         <div class="h2"><h2>
-           <xsl:value-of select="title"/>
-           <a href="#{@id}" class="headerlink" title="Permanent 
link"><xsl:text>#</xsl:text></a>
-         </h2></div>
-         <xsl:apply-templates/>
-       </xsl:when>
-       <xsl:otherwise>
-         <div class="h5"><h5>
-           <xsl:value-of select="title"/>
-           <a href="#{@id}" class="headerlink" title="Permanent 
link"><xsl:text>#</xsl:text></a>
-         </h5></div>
-         <xsl:apply-templates/>
-       </xsl:otherwise>
-    </xsl:choose>
-
-   </xsl:template>
-
- <xsl:template match="title">
- </xsl:template>
-
-<!-- ====================================================================== -->
-<!-- footer section -->
-<!-- ====================================================================== -->
-
- <xsl:template match="footer">
-  <!-- ignore on general documents -->
- </xsl:template>
-
-<!-- ====================================================================== -->
-<!-- paragraph section -->
-<!-- ====================================================================== -->
-
-  <xsl:template match="p">
-    <xsl:apply-imports/>
-  </xsl:template>
-
-  <xsl:template match="note">
-    <xsl:apply-imports/>
-  </xsl:template>
-
-  <xsl:template match="source">
-    <xsl:apply-imports/>
-  </xsl:template>
-
-  <xsl:template match="//source/font">
-    <font color="{@color}"><xsl:apply-templates/></font>
-  </xsl:template>
-
-  <xsl:template match="fixme">
-    <xsl:apply-imports/>
-  </xsl:template>
-
-<!-- ====================================================================== -->
-<!-- list section -->
-<!-- ====================================================================== -->
-
- <xsl:template match="ul|ol|dl">
-    <xsl:apply-imports/>
- </xsl:template>
-
- <xsl:template match="li">
-    <xsl:apply-imports/>
- </xsl:template>
-
- <xsl:template match="sl">
-    <xsl:apply-imports/>
- </xsl:template>
-
- <xsl:template match="dt">
-    <xsl:apply-imports/>
- </xsl:template>
-
-<!-- ====================================================================== -->
-<!-- table section -->
-<!-- ====================================================================== -->
-
-  <xsl:template match="table">
-    <xsl:apply-imports/>
-  </xsl:template>
-
-  <xsl:template match="tr">
-    <xsl:variable name="index"><xsl:number/></xsl:variable>
-    <tr>
-       <xsl:choose>
-          <xsl:when test="($index mod 2) = 0">
-             <xsl:attribute name="class">a</xsl:attribute>
-          </xsl:when>
-          <xsl:otherwise>
-             <xsl:attribute name="class">b</xsl:attribute>
-          </xsl:otherwise>
-       </xsl:choose>
-
-       <xsl:apply-templates/>
-    </tr>
-  </xsl:template>
-
-  <xsl:template match="th">
-    <xsl:apply-imports/>
-  </xsl:template>
-
-  <xsl:template match="td">
-    <xsl:apply-imports/>
-  </xsl:template>
-
-  <xsl:template match="tn">
-    <xsl:apply-imports/>
-  </xsl:template>
-
-  <xsl:template match="caption">
-    <!-- ignore since already used -->
-  </xsl:template>
-
-<!-- ====================================================================== -->
-<!-- markup section -->
-<!-- ====================================================================== -->
-
- <xsl:template match="strong">
-    <xsl:apply-imports/>
- </xsl:template>
-
- <xsl:template match="em">
-    <xsl:apply-imports/>
- </xsl:template>
-
- <xsl:template match="code">
-    <xsl:apply-imports/>
- </xsl:template>
-
-<!-- ====================================================================== -->
-<!-- images section -->
-<!-- ====================================================================== -->
-
- <xsl:template match="figure">
-    <xsl:apply-imports/>
- </xsl:template>
-
- <xsl:template match="img">
-    <xsl:apply-imports/>
- </xsl:template>
-
- <xsl:template match="icon">
-    <xsl:apply-imports/>
- </xsl:template>
-
-<!-- ====================================================================== -->
-<!-- links section -->
-<!-- ====================================================================== -->
-
- <xsl:template match="link">
-    <xsl:apply-imports/>
- </xsl:template>
-
- <xsl:template match="connect">
-    <xsl:apply-imports/>
- </xsl:template>
-
- <xsl:template match="jump">
-    <xsl:apply-imports/>
- </xsl:template>
-
- <xsl:template match="fork">
-    <xsl:apply-imports/>
- </xsl:template>
-
- <xsl:template match="anchor">
-    <xsl:apply-imports/>
- </xsl:template>
-
-<!-- ====================================================================== -->
-<!-- specials section -->
-<!-- ====================================================================== -->
-
- <xsl:template match="br">
-    <xsl:apply-imports/>
- </xsl:template>
-
- <xsl:template match="helpwanted">
-    <div style="width: 80%;" type="helpwanted" project="poi" 
-         description="the Apache POI Project">
-      <!-- TODO Link to the POI-specific tasks -->
-      <em>To view the <a href="https://helpwanted.apache.org/";>"Help 
-          Wanted"</a> tasks, an internet connection is required.</em>
-    </div>
-    <script src="https://helpwanted.apache.org/widget.js"; 
type="text/javascript"></script>
- </xsl:template>
-
-  <!-- Generates the PDF link -->
-  <xsl:template name="pdflink">
-    <xsl:if test="not($config/disable-pdf-link) or $disable-pdf-link = 
'false'">
-      <div align="right" id="pdf"><a href="{$filename-noext}.pdf">
-          <img class="skin" src="{$skin-img-dir}/pdfdoc.gif" alt="PDF"/><br/>
-          PDF</a>
-      </div>
-    </xsl:if>
-  </xsl:template>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; version="1.0">
 
+    <xsl:template match="p[@id='helpwanted']">
+        <div style="width: 80%;" type="helpwanted" project="poi" 
description="the Apache POI Project">
+            <!-- TODO Link to the POI-specific tasks -->
+            <em>To view the <a href="https://helpwanted.apache.org/";>"Help 
Wanted"
+            </a> tasks, an internet connection is required.
+            </em>
+        </div>
+        <script src="https://helpwanted.apache.org/widget.js"; 
type="text/javascript"></script>
+    </xsl:template>
+
+    <!-- the obligatory copy-everything -->
+    <xsl:template match="node() | @*">
+        <xsl:copy>
+            <xsl:apply-templates select="@*"/>
+            <xsl:apply-templates/>
+        </xsl:copy>
+    </xsl:template>
 </xsl:stylesheet>



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

Reply via email to