Index: xdocs/legal/resolved.xml
===================================================================
--- xdocs/legal/resolved.xml	(revision 767463)
+++ xdocs/legal/resolved.xml	(working copy)
@@ -62,6 +62,7 @@
    <li><a href="http://creativecommons.org/licenses/by/2.5/">Creative Commons Attribution (CC-A)</a></li>
    <li><a href="http://www.opensource.org/licenses/PythonSoftFoundation.php">Python Software Foundation License</a></li>
    <li><a href="http://www.adobe.com/devnet/font/#pcfi">Adobe Postcript(R) AFM files</a></li>
+   <li><a href='http://www.php.net/license/3_01.txt'>The PHP License, version 3.01</a></li>
  </ul>
 
  <p>Many of these licenses have specific attribution terms that need to be adhered to, for example CC-A, often by adding 
Index: xdocs/dev/sitemap.xml
===================================================================
--- xdocs/dev/sitemap.xml	(revision 767463)
+++ xdocs/dev/sitemap.xml	(working copy)
@@ -30,7 +30,6 @@
 
 <section><title>Documentation Index</title>
 <ul>
-
 <li>
 <a href="apply-license.html">Applying the Apache License, Version 2.0</a>
 <ul>
@@ -98,8 +97,7 @@
 </ul>
 </li>
 </ul>
-</li>
-<li>
+</li><li>
 <a href="builds.html">Build Services</a>
 <ul>
 <li>Build Services</li>
@@ -119,8 +117,7 @@
 <a href="builds.html#more">More Information</a>
 </li>
 </ul>
-</li>
-<li>
+</li><li>
 <a href="committers.html">Committers' FAQ</a>
 <ul>
 <li>Committers' FAQ<ul>
@@ -238,8 +235,7 @@
 </ul>
 </li>
 </ul>
-</li>
-<li>
+</li><li>
 <a href="contrib-email-tips.html">Tips for email contributors</a>
 <ul>
 <li>Contents</li>
@@ -250,8 +246,7 @@
 <a href="contrib-email-tips.html#other">Other email guidelines</a>
 </li>
 </ul>
-</li>
-<li>
+</li><li>
 <a href="contributors.html">Contributors Tech Guide</a>
 <ul>
 <li>Contributors Tech Guide<ul>
@@ -297,8 +292,7 @@
 <a href="contributors.html#patches">Sending in Patches</a>
 </li>
 </ul>
-</li>
-<li>
+</li><li>
 <a href="crypto.html">Handling Cryptography within an ASF Release</a>
 <ul>
 <li>
@@ -411,8 +405,7 @@
 </ul>
 </li>
 </ul>
-</li>
-<li>
+</li><li>
 <a href="cvs2svn.html">Converting from CVS to Subversion at the ASF</a>
 <ul>
 <li>Contents</li>
@@ -427,8 +420,7 @@
 <a href="cvs2svn.html#infra-guide">Performing a migration</a>
 </li>
 </ul>
-</li>
-<li>
+</li><li>
 <a href="hardware-wish-list.html">ASF Hardware Wish-List</a>
 <ul>
 <li>ASF Hardware Wish-List</li>
@@ -445,8 +437,7 @@
 <a href="hardware-wish-list.html#STORAGE">One Dell PowerVault 220S w/ 14 300GB disks</a>
 </li>
 </ul>
-</li>
-<li>
+</li><li>
 <a href="infra-mail.html">ASF Infrastructure mailing lists</a>
 <ul>
 <li>Contents</li>
@@ -460,8 +451,7 @@
 <a href="infra-mail.html#lists">The lists</a>
 </li>
 </ul>
-</li>
-<li>
+</li><li>
 <a href="infra-site.html">Updating the Infrastructure web site</a>
 <ul>
 <li>Contents</li>
@@ -475,8 +465,7 @@
 <a href="infra-site.html#progress">Progress</a>
 </li>
 </ul>
-</li>
-<li>
+</li><li>
 <a href="infra-volunteer.html">How to be an ASF Infrastructure volunteer</a>
 <ul>
 <li>How to be an ASF Infrastructure volunteer</li>
@@ -519,8 +508,7 @@
 </ul>
 </li>
 </ul>
-</li>
-<li>
+</li><li>
 <a href="machines.html">Machines List</a>
 <ul>
 <li>Machines List<ul>
@@ -596,8 +584,7 @@
 </ul>
 </li>
 </ul>
-</li>
-<li>
+</li><li>
 <a href="mirror-step-by-step.html">Step-By-Step Guide To Mirroring Releases</a>
 <ul>
 <li>Contents</li>
@@ -614,8 +601,7 @@
 <a href="mirror-step-by-step.html#archiving-unmirrored">Step By Step Guide To Archiving Unmirrored Releases</a>
 </li>
 </ul>
-</li>
-<li>
+</li><li>
 <a href="mirrors.html">Apache Mirroring Information</a>
 <ul>
 <li>Contents</li>
@@ -635,8 +621,7 @@
 <a href="mirrors.html#questions">Questions?</a>
 </li>
 </ul>
-</li>
-<li>
+</li><li>
 <a href="new-committers-guide.html">Guide for new committers</a>
 <ul>
 <li>
@@ -703,8 +688,7 @@
 <a href="new-committers-guide.html#help-wanted">Improve this guide</a>
 </li>
 </ul>
-</li>
-<li>
+</li><li>
 <a href="pmc.html">Project Management Committee Guide</a>
 <ul>
 <li>Project Management Committee Guide<ul>
@@ -761,8 +745,7 @@
 </ul>
 </li>
 </ul>
-</li>
-<li>
+</li><li>
 <a href="project-creation-tasks.html">Tasks for Creating a Project</a>
 <ul>
 <li>Contents</li>
@@ -776,8 +759,7 @@
 <a href="project-creation-tasks.html#project">Items that the project PMC can do</a>
 </li>
 </ul>
-</li>
-<li>
+</li><li>
 <a href="project-creation.html">Procedures for Creating a Project</a>
 <ul>
 <li>Procedures for Creating an ASF Top-Level Project</li>
@@ -785,8 +767,7 @@
 <a href="project-creation.html#PMC">Things that the PMC should do after infrastructure is done</a>
 </li>
 </ul>
-</li>
-<li>
+</li><li>
 <a href="project-mailing-lists.html">Notes On Project Mailing Lists (DRAFT)</a>
 <ul>
 <li>
@@ -810,16 +791,14 @@
 </ul>
 </li>
 </ul>
-</li>
-<li>
+</li><li>
 <a href="project-names.html">Choosing names for ASF projects</a>
 <ul>
 <li>
 <a href="project-names.html#intro">Choosing names for ASF projects</a>
 </li>
 </ul>
-</li>
-<li>
+</li><li>
 <a href="project-site.html">Manage your project web site</a>
 <ul>
 <li>Contents</li>
@@ -836,8 +815,7 @@
 <a href="project-site.html#logging">How does logging work?</a>
 </li>
 </ul>
-</li>
-<li>
+</li><li>
 <a href="proposed-machines.html">Prospective Machines List</a>
 <ul>
 <li>Contents</li>
@@ -860,8 +838,7 @@
 <a href="proposed-machines.html#CA">Certificate Server</a>
 </li>
 </ul>
-</li>
-<li>
+</li><li>
 <a href="release-download-pages.html">Release Download Pages (DRAFT)</a>
 <ul>
 <li>
@@ -907,8 +884,7 @@
 </ul>
 </li>
 </ul>
-</li>
-<li>
+</li><li>
 <a href="release-publishing.html">Publishing Releases (DRAFT)</a>
 <ul>
 <li>Contents</li>
@@ -960,8 +936,7 @@
 <a href="release-publishing.html#repository-descriptor">Creating a repository descriptor for your project</a>
 </li>
 </ul>
-</li>
-<li>
+</li><li>
 <a href="release-signing.html">Signing Releases</a>
 <ul>
 <li>Signing Releases<ul>
@@ -1153,8 +1128,7 @@
 </ul>
 </li>
 </ul>
-</li>
-<li>
+</li><li>
 <a href="release-stats.html">Release Statistics (DRAFT)</a>
 <ul>
 <li>Contents</li>
@@ -1175,8 +1149,7 @@
 </ul>
 </li>
 </ul>
-</li>
-<li>
+</li><li>
 <a href="release.html">Releases FAQ</a>
 <ul>
 <li>
@@ -1252,8 +1225,7 @@
 </ul>
 </li>
 </ul>
-</li>
-<li>
+</li><li>
 <a href="reporting-issues.html">Reporting issues and requesting project resources</a>
 <ul>
 <li>Contents</li>
@@ -1341,8 +1313,7 @@
 </ul>
 </li>
 </ul>
-</li>
-<li>
+</li><li>
 <a href="repository-faq.html">ASF Jar Repositories</a>
 <ul>
 <li>Disclaimer</li>
@@ -1388,8 +1359,7 @@
 </ul>
 </li>
 </ul>
-</li>
-<li>
+</li><li>
 <a href="services.html">Services List</a>
 <ul>
 <li>Services List<ul>
@@ -1424,8 +1394,7 @@
 </ul>
 </li>
 </ul>
-</li>
-<li>
+</li><li>
 <a href="solaris-zones.html">Zones for ASF projects</a>
 <ul>
 <li>Contents</li>
@@ -1487,8 +1456,7 @@
 </ul>
 </li>
 </ul>
-</li>
-<li>
+</li><li>
 <a href="styleguide.html">Apache Developers' C Language Style Guide</a>
 <ul>
 <li>Apache Developers' C Language Style Guide<ul>
@@ -1505,14 +1473,12 @@
 <a href="styleguide.html#examples">Details and Examples</a>
 </li>
 </ul>
-</li>
-<li>
+</li><li>
 <a href="template.html">Apache Development Information</a>
 <ul>
 <li>Apache Developer Resources -- </li>
 </ul>
-</li>
-<li>
+</li><li>
 <a href="user-email.html">Committer email configuration</a>
 <ul>
 <li>Contents</li>
@@ -1526,8 +1492,7 @@
 <a href="user-email.html#send">Sending email from your apache.org address</a>
 </li>
 </ul>
-</li>
-<li>
+</li><li>
 <a href="user-ssh-windows.html">Committer SSH Configuration on Windows</a>
 <ul>
 <li>Contents</li>
@@ -1558,8 +1523,7 @@
 <a href="user-ssh-windows.html#links">Relevent Links</a>
 </li>
 </ul>
-</li>
-<li>
+</li><li>
 <a href="user-ssh.html">Committer SSH Access (DRAFT)</a>
 <ul>
 <li>Committer SSH Access (DRAFT)<ul>
@@ -1632,8 +1596,7 @@
 </ul>
 </li>
 </ul>
-</li>
-<li>
+</li><li>
 <a href="version-control.html">Source Code Repository</a>
 <ul>
 <li>Contents</li>
Index: docs/legal/resolved.html
===================================================================
--- docs/legal/resolved.html	(revision 767463)
+++ docs/legal/resolved.html	(working copy)
@@ -114,6 +114,7 @@
    <li><a href="http://creativecommons.org/licenses/by/2.5/">Creative Commons Attribution (CC-A)</a></li>
    <li><a href="http://www.opensource.org/licenses/PythonSoftFoundation.php">Python Software Foundation License</a></li>
    <li><a href="http://www.adobe.com/devnet/font/#pcfi">Adobe Postcript(R) AFM files</a></li>
+   <li><a href="http://www.php.net/license/3_01.txt">The PHP License, version 3.01</a></li>
  </ul>
 <p>Many of these licenses have specific attribution terms that need to be adhered to, for example CC-A, often by adding 
     them to the NOTICE file. Ensure you are doing this when including these works. Note, this list is colloquially known 
Index: docs/dev/sitemap.html
===================================================================
--- docs/dev/sitemap.html	(revision 767463)
+++ docs/dev/sitemap.html	(working copy)
@@ -70,7 +70,6 @@
                             
 <div class="section-content">
 <ul>
-
 <li>
 <a href="apply-license.html">Applying the Apache License, Version 2.0</a>
 <ul>
@@ -138,8 +137,7 @@
 </ul>
 </li>
 </ul>
-</li>
-<li>
+</li><li>
 <a href="builds.html">Build Services</a>
 <ul>
 <li>Build Services</li>
@@ -159,8 +157,7 @@
 <a href="builds.html#more">More Information</a>
 </li>
 </ul>
-</li>
-<li>
+</li><li>
 <a href="committers.html">Committers' FAQ</a>
 <ul>
 <li>Committers' FAQ<ul>
@@ -278,8 +275,7 @@
 </ul>
 </li>
 </ul>
-</li>
-<li>
+</li><li>
 <a href="contrib-email-tips.html">Tips for email contributors</a>
 <ul>
 <li>Contents</li>
@@ -290,8 +286,7 @@
 <a href="contrib-email-tips.html#other">Other email guidelines</a>
 </li>
 </ul>
-</li>
-<li>
+</li><li>
 <a href="contributors.html">Contributors Tech Guide</a>
 <ul>
 <li>Contributors Tech Guide<ul>
@@ -337,8 +332,7 @@
 <a href="contributors.html#patches">Sending in Patches</a>
 </li>
 </ul>
-</li>
-<li>
+</li><li>
 <a href="crypto.html">Handling Cryptography within an ASF Release</a>
 <ul>
 <li>
@@ -451,8 +445,7 @@
 </ul>
 </li>
 </ul>
-</li>
-<li>
+</li><li>
 <a href="cvs2svn.html">Converting from CVS to Subversion at the ASF</a>
 <ul>
 <li>Contents</li>
@@ -467,8 +460,7 @@
 <a href="cvs2svn.html#infra-guide">Performing a migration</a>
 </li>
 </ul>
-</li>
-<li>
+</li><li>
 <a href="hardware-wish-list.html">ASF Hardware Wish-List</a>
 <ul>
 <li>ASF Hardware Wish-List</li>
@@ -485,8 +477,7 @@
 <a href="hardware-wish-list.html#STORAGE">One Dell PowerVault 220S w/ 14 300GB disks</a>
 </li>
 </ul>
-</li>
-<li>
+</li><li>
 <a href="infra-mail.html">ASF Infrastructure mailing lists</a>
 <ul>
 <li>Contents</li>
@@ -500,8 +491,7 @@
 <a href="infra-mail.html#lists">The lists</a>
 </li>
 </ul>
-</li>
-<li>
+</li><li>
 <a href="infra-site.html">Updating the Infrastructure web site</a>
 <ul>
 <li>Contents</li>
@@ -515,8 +505,7 @@
 <a href="infra-site.html#progress">Progress</a>
 </li>
 </ul>
-</li>
-<li>
+</li><li>
 <a href="infra-volunteer.html">How to be an ASF Infrastructure volunteer</a>
 <ul>
 <li>How to be an ASF Infrastructure volunteer</li>
@@ -559,8 +548,7 @@
 </ul>
 </li>
 </ul>
-</li>
-<li>
+</li><li>
 <a href="machines.html">Machines List</a>
 <ul>
 <li>Machines List<ul>
@@ -636,8 +624,7 @@
 </ul>
 </li>
 </ul>
-</li>
-<li>
+</li><li>
 <a href="mirror-step-by-step.html">Step-By-Step Guide To Mirroring Releases</a>
 <ul>
 <li>Contents</li>
@@ -654,8 +641,7 @@
 <a href="mirror-step-by-step.html#archiving-unmirrored">Step By Step Guide To Archiving Unmirrored Releases</a>
 </li>
 </ul>
-</li>
-<li>
+</li><li>
 <a href="mirrors.html">Apache Mirroring Information</a>
 <ul>
 <li>Contents</li>
@@ -675,8 +661,7 @@
 <a href="mirrors.html#questions">Questions?</a>
 </li>
 </ul>
-</li>
-<li>
+</li><li>
 <a href="new-committers-guide.html">Guide for new committers</a>
 <ul>
 <li>
@@ -743,8 +728,7 @@
 <a href="new-committers-guide.html#help-wanted">Improve this guide</a>
 </li>
 </ul>
-</li>
-<li>
+</li><li>
 <a href="pmc.html">Project Management Committee Guide</a>
 <ul>
 <li>Project Management Committee Guide<ul>
@@ -801,8 +785,7 @@
 </ul>
 </li>
 </ul>
-</li>
-<li>
+</li><li>
 <a href="project-creation-tasks.html">Tasks for Creating a Project</a>
 <ul>
 <li>Contents</li>
@@ -816,8 +799,7 @@
 <a href="project-creation-tasks.html#project">Items that the project PMC can do</a>
 </li>
 </ul>
-</li>
-<li>
+</li><li>
 <a href="project-creation.html">Procedures for Creating a Project</a>
 <ul>
 <li>Procedures for Creating an ASF Top-Level Project</li>
@@ -825,8 +807,7 @@
 <a href="project-creation.html#PMC">Things that the PMC should do after infrastructure is done</a>
 </li>
 </ul>
-</li>
-<li>
+</li><li>
 <a href="project-mailing-lists.html">Notes On Project Mailing Lists (DRAFT)</a>
 <ul>
 <li>
@@ -850,16 +831,14 @@
 </ul>
 </li>
 </ul>
-</li>
-<li>
+</li><li>
 <a href="project-names.html">Choosing names for ASF projects</a>
 <ul>
 <li>
 <a href="project-names.html#intro">Choosing names for ASF projects</a>
 </li>
 </ul>
-</li>
-<li>
+</li><li>
 <a href="project-site.html">Manage your project web site</a>
 <ul>
 <li>Contents</li>
@@ -876,8 +855,7 @@
 <a href="project-site.html#logging">How does logging work?</a>
 </li>
 </ul>
-</li>
-<li>
+</li><li>
 <a href="proposed-machines.html">Prospective Machines List</a>
 <ul>
 <li>Contents</li>
@@ -900,8 +878,7 @@
 <a href="proposed-machines.html#CA">Certificate Server</a>
 </li>
 </ul>
-</li>
-<li>
+</li><li>
 <a href="release-download-pages.html">Release Download Pages (DRAFT)</a>
 <ul>
 <li>
@@ -947,8 +924,7 @@
 </ul>
 </li>
 </ul>
-</li>
-<li>
+</li><li>
 <a href="release-publishing.html">Publishing Releases (DRAFT)</a>
 <ul>
 <li>Contents</li>
@@ -1000,8 +976,7 @@
 <a href="release-publishing.html#repository-descriptor">Creating a repository descriptor for your project</a>
 </li>
 </ul>
-</li>
-<li>
+</li><li>
 <a href="release-signing.html">Signing Releases</a>
 <ul>
 <li>Signing Releases<ul>
@@ -1193,8 +1168,7 @@
 </ul>
 </li>
 </ul>
-</li>
-<li>
+</li><li>
 <a href="release-stats.html">Release Statistics (DRAFT)</a>
 <ul>
 <li>Contents</li>
@@ -1215,8 +1189,7 @@
 </ul>
 </li>
 </ul>
-</li>
-<li>
+</li><li>
 <a href="release.html">Releases FAQ</a>
 <ul>
 <li>
@@ -1292,8 +1265,7 @@
 </ul>
 </li>
 </ul>
-</li>
-<li>
+</li><li>
 <a href="reporting-issues.html">Reporting issues and requesting project resources</a>
 <ul>
 <li>Contents</li>
@@ -1381,8 +1353,7 @@
 </ul>
 </li>
 </ul>
-</li>
-<li>
+</li><li>
 <a href="repository-faq.html">ASF Jar Repositories</a>
 <ul>
 <li>Disclaimer</li>
@@ -1428,8 +1399,7 @@
 </ul>
 </li>
 </ul>
-</li>
-<li>
+</li><li>
 <a href="services.html">Services List</a>
 <ul>
 <li>Services List<ul>
@@ -1464,8 +1434,7 @@
 </ul>
 </li>
 </ul>
-</li>
-<li>
+</li><li>
 <a href="solaris-zones.html">Zones for ASF projects</a>
 <ul>
 <li>Contents</li>
@@ -1527,8 +1496,7 @@
 </ul>
 </li>
 </ul>
-</li>
-<li>
+</li><li>
 <a href="styleguide.html">Apache Developers' C Language Style Guide</a>
 <ul>
 <li>Apache Developers' C Language Style Guide<ul>
@@ -1545,14 +1513,12 @@
 <a href="styleguide.html#examples">Details and Examples</a>
 </li>
 </ul>
-</li>
-<li>
+</li><li>
 <a href="template.html">Apache Development Information</a>
 <ul>
 <li>Apache Developer Resources -- </li>
 </ul>
-</li>
-<li>
+</li><li>
 <a href="user-email.html">Committer email configuration</a>
 <ul>
 <li>Contents</li>
@@ -1566,8 +1532,7 @@
 <a href="user-email.html#send">Sending email from your apache.org address</a>
 </li>
 </ul>
-</li>
-<li>
+</li><li>
 <a href="user-ssh-windows.html">Committer SSH Configuration on Windows</a>
 <ul>
 <li>Contents</li>
@@ -1598,8 +1563,7 @@
 <a href="user-ssh-windows.html#links">Relevent Links</a>
 </li>
 </ul>
-</li>
-<li>
+</li><li>
 <a href="user-ssh.html">Committer SSH Access (DRAFT)</a>
 <ul>
 <li>Committer SSH Access (DRAFT)<ul>
@@ -1672,8 +1636,7 @@
 </ul>
 </li>
 </ul>
-</li>
-<li>
+</li><li>
 <a href="version-control.html">Source Code Repository</a>
 <ul>
 <li>Contents</li>