Great you could get this done, JP. We still have two "site" folders in our SVN: jspwiki/site and jspwiki/trunk/jspwiki-site. Can we delete one of them now?

Thanks,
Glen

On 08/10/2013 11:10 AM, [email protected] wrote:
Author: juanpablo
Date: Sat Aug 10 15:10:37 2013
New Revision: 874000

Log:
General modifications:
  - incubator logo subsituted by asf logo
  - removed Incubator links on breadcrumb
  - PPMC text becoming PMC
  - Incubator Reports text becoming Board reports
  - 2.9.1-incubating-0 text becoming 2.10.0-svn-36
  - Copyright on 2013

Index: removed incubation disclaimer, added TLP graduation

News: added TLP graduation

ML: updated mailing lists

source and guide: updated svn location

incubator reports: updated svn link

Added:
     
websites/production/jspwiki/content/images/apache_software_foundation_logo.gif  
 (with props)
Modified:
     websites/production/jspwiki/content/community/get_involved.html
     websites/production/jspwiki/content/community/mailing_lists.html
     websites/production/jspwiki/content/community/people.html
     websites/production/jspwiki/content/development/edit_website.html
     websites/production/jspwiki/content/development/source_and_guide.html
     websites/production/jspwiki/content/general/downloads.html
     websites/production/jspwiki/content/general/news.html
     websites/production/jspwiki/content/index.html
     websites/production/jspwiki/content/ppmc/how_to_release.html
     websites/production/jspwiki/content/ppmc/incubator_reports.html
     websites/production/jspwiki/content/sitemap.html

Modified: websites/production/jspwiki/content/community/get_involved.html
==============================================================================
--- websites/production/jspwiki/content/community/get_involved.html (original)
+++ websites/production/jspwiki/content/community/get_involved.html Sat Aug 10 
15:10:37 2013
@@ -20,8 +20,8 @@
      <div class="companylogo"></div>
<div class="userbox">
-      <a href="http://incubator.apache.org"; alt="Apache Incubator">
-        <img src="/jspwiki/images/apache_incubator_logo.png" alt="Apache Incubator" 
id="asf-logo" style="width: 180px; height: 45px;">
+      <a href="http://www.apache.org"; alt="Apache Software Foundation">
+        <img src="/jspwiki/images/apache_software_foundation_logo.gif" alt="Apache Software 
Foundation" id="asf-logo" style="width: 180px; height: 45px;">
        </a>
        <div class="clearbox"></div>
      </div>
@@ -32,7 +32,7 @@
      </div>
- <div class="breadcrumbs"><a href="/">Incubator</a>&nbsp;&raquo&nbsp;<a href="/jspwiki/">Jspwiki</a>&nbsp;&raquo&nbsp;<a href="/jspwiki/community/">Community</a></div>
+    <div class="breadcrumbs"><a href="/">JSPWiki</a>&nbsp;&raquo&nbsp;<a 
href="/jspwiki/community/">Community</a></div>
    </div>
<div id="content">
@@ -147,11 +147,11 @@ can afford to put into helping us, there
  <li><a href="/jspwiki/development/edit_website.html">Edit Website</a></li>
  <li><a href="http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?view=co"; 
class="external">Change Log</a></li>
  </ul>
-<p><strong>PPMC</strong></p>
+<p><strong>PMC</strong></p>
  <ul>
-<li><a href="http://incubator.apache.org/projects/jspwiki.html"; 
class="external">Incubation Status</a></li>
+<!-- <li><a href="http://incubator.apache.org/projects/jspwiki.html"; 
class="external">Incubation Status</a></li> -->
  <li><a href="/jspwiki/ppmc/how_to_release.html">How to Release</a></li>
-<li><a href="/jspwiki/ppmc/incubator_reports.html">Incubator Reports</a></li>
+<li><a href="/jspwiki/ppmc/incubator_reports.html">Board Reports</a></li>
  </ul>
  <p><strong>ASF</strong></p>
  <ul>
@@ -165,7 +165,7 @@ can afford to put into helping us, there
          <br /><hr>
        </div>
        <div class="wikiversion">
-      <p>JSPWiki v2.9.1-incubating</p>
+      <p>JSPWiki v2.10.0-svn-36</p>
        </div>
      </div>
@@ -174,7 +174,7 @@ can afford to put into helping us, there <div id="footer">
      <div class="copyright">
-      Copyright &copy; 2012 The Apache Software Foundation, Licensed under
+      Copyright &copy; 2013 The Apache Software Foundation, Licensed under
        the <a href="http://www.apache.org/licenses/LICENSE-2.0"; 
class="external">Apache License, Version 2.0</a>.
        <br />Apache and the Apache feather logo are trademarks of The Apache 
Software Foundation.
      </div>

Modified: websites/production/jspwiki/content/community/mailing_lists.html
==============================================================================
--- websites/production/jspwiki/content/community/mailing_lists.html (original)
+++ websites/production/jspwiki/content/community/mailing_lists.html Sat Aug 10 
15:10:37 2013
@@ -20,8 +20,8 @@
      <div class="companylogo"></div>
<div class="userbox">
-      <a href="http://incubator.apache.org"; alt="Apache Incubator">
-        <img src="/jspwiki/images/apache_incubator_logo.png" alt="Apache Incubator" 
id="asf-logo" style="width: 180px; height: 45px;">
+      <a href="http://www.apache.org"; alt="Apache Software Foundation">
+        <img src="/jspwiki/images/apache_software_foundation_logo.gif" alt="Apache Software 
Foundation" id="asf-logo" style="width: 180px; height: 45px;">
        </a>
        <div class="clearbox"></div>
      </div>
@@ -32,7 +32,7 @@
      </div>
- <div class="breadcrumbs"><a href="/">Incubator</a>&nbsp;&raquo&nbsp;<a href="/jspwiki/">Jspwiki</a>&nbsp;&raquo&nbsp;<a href="/jspwiki/community/">Community</a></div>
+    <div class="breadcrumbs"><a href="/">JSPWiki</a>&nbsp;&raquo&nbsp;<a 
href="/jspwiki/community/">Community</a></div>
    </div>
<div id="content">
@@ -84,9 +84,9 @@
          <div id="pagecontent">
            <h2 id="jspwiki-user">JSPWiki-user</h2>
  <p>The jspwiki-user mailing list is hosted at Apache. You can join it by 
sending
-an e-mail to <a 
href="&#109;&#97;&#105;&#108;&#116;&#111;&#58;&#106;&#115;&#112;&#119;&#105;&#107;&#105;&#45;&#117;&#115;&#101;&#114;&#45;&#115;&#117;&#98;&#115;&#99;&#114;&#105;&#98;&#101;&#64;&#105;&#110;&#99;&#117;&#98;&#97;&#116;&#111;&#114;&#46;&#97;&#112;&#97;&#99;&#104;&#101;&#46;&#111;&#114;&#103;">&#106;&#115;&#112;&#119;&#105;&#107;&#105;&#45;&#117;&#115;&#101;&#114;&#45;&#115;&#117;&#98;&#115;&#99;&#114;&#105;&#98;&#101;&#64;&#105;&#110;&#99;&#117;&#98;&#97;&#116;&#111;&#114;&#46;&#97;&#112;&#97;&#99;&#104;&#101;&#46;&#111;&#114;&#103;</a>.
 You can also browse
+an e-mail to <a 
href="[email protected]">[email protected]</a>. 
You can also browse
  the list archives on either <a class="external"
-href="http://mail-archives.apache.org/mod_mbox/incubator-jspwiki-user/";>Apache
+href="http://mail-archives.apache.org/mod_mbox/jspwiki-user/";>Apache
  mail archives</a> or <a href="http://www.nabble.com/JspWiki---User-f2680.html"; 
class="external">
  Nabble</a>.</p>
  <h2 id="jspwiki-dev">JSPWiki-dev</h2>
@@ -94,20 +94,20 @@ Nabble</a>.</p>
  interested in the current state and development. For example, all bug reports
  and enhancement requests from JIRA are automatically sent here. The 
jspwiki-dev
  list is hosted at Apache, so you join by sending an email to
-<a 
href="&#109;&#97;&#105;&#108;&#116;&#111;&#58;&#106;&#115;&#112;&#119;&#105;&#107;&#105;&#45;&#100;&#101;&#118;&#45;&#115;&#117;&#98;&#115;&#99;&#114;&#105;&#98;&#101;&#64;&#105;&#110;&#99;&#117;&#98;&#97;&#116;&#111;&#114;&#46;&#97;&#112;&#97;&#99;&#104;&#101;&#46;&#111;&#114;&#103;">&#106;&#115;&#112;&#119;&#105;&#107;&#105;&#45;&#100;&#101;&#118;&#45;&#115;&#117;&#98;&#115;&#99;&#114;&#105;&#98;&#101;&#64;&#105;&#110;&#99;&#117;&#98;&#97;&#116;&#111;&#114;&#46;&#97;&#112;&#97;&#99;&#104;&#101;&#46;&#111;&#114;&#103;</a>.
 The
-<a href="http://mail-archives.apache.org/mod_mbox/incubator-jspwiki-dev/";
+<a 
href="[email protected]">[email protected]</a>. The
+<a href="http://mail-archives.apache.org/mod_mbox/jspwiki-dev/";
  class="external">list archives</a> are also browseable.</p>
  <h2 id="jspwiki-commits">JSPWiki-commits</h2>
  <p>If you subscribe to this list you will get emailed when (a committer) 
commits
  new or changed files to the SVN repository. The jspwiki-commits list is hosted
  at Apache, join it by sending an email to
-<a 
href="&#109;&#97;&#105;&#108;&#116;&#111;&#58;&#106;&#115;&#112;&#119;&#105;&#107;&#105;&#45;&#99;&#111;&#109;&#109;&#105;&#116;&#115;&#45;&#115;&#117;&#98;&#115;&#99;&#114;&#105;&#98;&#101;&#64;&#105;&#110;&#99;&#117;&#98;&#97;&#116;&#111;&#114;&#46;&#97;&#112;&#97;&#99;&#104;&#101;&#46;&#111;&#114;&#103;">&#106;&#115;&#112;&#119;&#105;&#107;&#105;&#45;&#99;&#111;&#109;&#109;&#105;&#116;&#115;&#45;&#115;&#117;&#98;&#115;&#99;&#114;&#105;&#98;&#101;&#64;&#105;&#110;&#99;&#117;&#98;&#97;&#116;&#111;&#114;&#46;&#97;&#112;&#97;&#99;&#104;&#101;&#46;&#111;&#114;&#103;</a>.
 Again, the
+<a 
href="[email protected]">[email protected]</a>.
 Again, the
  <a class="external"
-href="http://mail-archives.apache.org/mod_mbox/incubator-jspwiki-commits/";>list
+href="http://mail-archives.apache.org/mod_mbox/jspwiki-commits/";>list
  archives</a> are also browseable.</p>
  <h2 id="unsubscribing">Unsubscribing</h2>
  <p>Unsubscribing is equally easy: you can just send an email to
-jspwiki-&lt;user|dev|commits&gt;[email protected] from the same
+&lt;user|dev|commits&gt;[email protected] from the same
  email address that you originally subscribed from.</p>
  <h2 id="other-resources">Other resources</h2>
  <ul>
@@ -156,11 +156,11 @@ in European timezones, so be patient. </
  <li><a href="/jspwiki/development/edit_website.html">Edit Website</a></li>
  <li><a href="http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?view=co"; 
class="external">Change Log</a></li>
  </ul>
-<p><strong>PPMC</strong></p>
+<p><strong>PMC</strong></p>
  <ul>
-<li><a href="http://incubator.apache.org/projects/jspwiki.html"; 
class="external">Incubation Status</a></li>
+<!-- <li><a href="http://incubator.apache.org/projects/jspwiki.html"; 
class="external">Incubation Status</a></li> -->
  <li><a href="/jspwiki/ppmc/how_to_release.html">How to Release</a></li>
-<li><a href="/jspwiki/ppmc/incubator_reports.html">Incubator Reports</a></li>
+<li><a href="/jspwiki/ppmc/incubator_reports.html">Board Reports</a></li>
  </ul>
  <p><strong>ASF</strong></p>
  <ul>
@@ -174,7 +174,7 @@ in European timezones, so be patient. </
          <br /><hr>
        </div>
        <div class="wikiversion">
-      <p>JSPWiki v2.9.1-incubating</p>
+      <p>JSPWiki v2.10.0-svn-36</p>
        </div>
      </div>
@@ -183,7 +183,7 @@ in European timezones, so be patient. </ <div id="footer">
      <div class="copyright">
-      Copyright &copy; 2012 The Apache Software Foundation, Licensed under
+      Copyright &copy; 2013 The Apache Software Foundation, Licensed under
        the <a href="http://www.apache.org/licenses/LICENSE-2.0"; 
class="external">Apache License, Version 2.0</a>.
        <br />Apache and the Apache feather logo are trademarks of The Apache 
Software Foundation.
      </div>

Modified: websites/production/jspwiki/content/community/people.html
==============================================================================
--- websites/production/jspwiki/content/community/people.html (original)
+++ websites/production/jspwiki/content/community/people.html Sat Aug 10 
15:10:37 2013
@@ -20,8 +20,8 @@
      <div class="companylogo"></div>
<div class="userbox">
-      <a href="http://incubator.apache.org"; alt="Apache Incubator">
-        <img src="/jspwiki/images/apache_incubator_logo.png" alt="Apache Incubator" 
id="asf-logo" style="width: 180px; height: 45px;">
+      <a href="http://www.apache.org"; alt="Apache Software Foundation">
+        <img src="/jspwiki/images/apache_software_foundation_logo.gif" alt="Apache Software 
Foundation" id="asf-logo" style="width: 180px; height: 45px;">
        </a>
        <div class="clearbox"></div>
      </div>
@@ -32,7 +32,7 @@
      </div>
- <div class="breadcrumbs"><a href="/">Incubator</a>&nbsp;&raquo&nbsp;<a href="/jspwiki/">Jspwiki</a>&nbsp;&raquo&nbsp;<a href="/jspwiki/community/">Community</a></div>
+    <div class="breadcrumbs"><a href="/">JSPWiki</a>&nbsp;&raquo&nbsp;<a 
href="/jspwiki/community/">Community</a></div>
    </div>
<div id="content">
@@ -154,11 +154,11 @@
  <li><a href="/jspwiki/development/edit_website.html">Edit Website</a></li>
  <li><a href="http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?view=co"; 
class="external">Change Log</a></li>
  </ul>
-<p><strong>PPMC</strong></p>
+<p><strong>PMC</strong></p>
  <ul>
-<li><a href="http://incubator.apache.org/projects/jspwiki.html"; 
class="external">Incubation Status</a></li>
+<!-- <li><a href="http://incubator.apache.org/projects/jspwiki.html"; 
class="external">Incubation Status</a></li> -->
  <li><a href="/jspwiki/ppmc/how_to_release.html">How to Release</a></li>
-<li><a href="/jspwiki/ppmc/incubator_reports.html">Incubator Reports</a></li>
+<li><a href="/jspwiki/ppmc/incubator_reports.html">Board Reports</a></li>
  </ul>
  <p><strong>ASF</strong></p>
  <ul>
@@ -172,7 +172,7 @@
          <br /><hr>
        </div>
        <div class="wikiversion">
-      <p>JSPWiki v2.9.1-incubating</p>
+      <p>JSPWiki v2.10.0-svn-36</p>
        </div>
      </div>
@@ -181,7 +181,7 @@ <div id="footer">
      <div class="copyright">
-      Copyright &copy; 2012 The Apache Software Foundation, Licensed under
+      Copyright &copy; 2013 The Apache Software Foundation, Licensed under
        the <a href="http://www.apache.org/licenses/LICENSE-2.0"; 
class="external">Apache License, Version 2.0</a>.
        <br />Apache and the Apache feather logo are trademarks of The Apache 
Software Foundation.
      </div>

Modified: websites/production/jspwiki/content/development/edit_website.html
==============================================================================
--- websites/production/jspwiki/content/development/edit_website.html (original)
+++ websites/production/jspwiki/content/development/edit_website.html Sat Aug 
10 15:10:37 2013
@@ -20,8 +20,8 @@
      <div class="companylogo"></div>
<div class="userbox">
-      <a href="http://incubator.apache.org"; alt="Apache Incubator">
-        <img src="/jspwiki/images/apache_incubator_logo.png" alt="Apache Incubator" 
id="asf-logo" style="width: 180px; height: 45px;">
+      <a href="http://www.apache.org"; alt="Apache Software Foundation">
+        <img src="/jspwiki/images/apache_software_foundation_logo.gif" alt="Apache Software 
Foundation" id="asf-logo" style="width: 180px; height: 45px;">
        </a>
        <div class="clearbox"></div>
      </div>
@@ -32,7 +32,7 @@
      </div>
- <div class="breadcrumbs"><a href="/">Incubator</a>&nbsp;&raquo&nbsp;<a href="/jspwiki/">Jspwiki</a>&nbsp;&raquo&nbsp;<a href="/jspwiki/development/">Development</a></div>
+    <div class="breadcrumbs"><a href="/">JSPWiki</a>&nbsp;&raquo&nbsp;<a 
href="/jspwiki/development/">Development</a></div>
    </div>
<div id="content">
@@ -175,11 +175,11 @@ numbers to have to get updated</li>
  <li><a href="/jspwiki/development/edit_website.html">Edit Website</a></li>
  <li><a href="http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?view=co"; 
class="external">Change Log</a></li>
  </ul>
-<p><strong>PPMC</strong></p>
+<p><strong>PMC</strong></p>
  <ul>
-<li><a href="http://incubator.apache.org/projects/jspwiki.html"; 
class="external">Incubation Status</a></li>
+<!-- <li><a href="http://incubator.apache.org/projects/jspwiki.html"; 
class="external">Incubation Status</a></li> -->
  <li><a href="/jspwiki/ppmc/how_to_release.html">How to Release</a></li>
-<li><a href="/jspwiki/ppmc/incubator_reports.html">Incubator Reports</a></li>
+<li><a href="/jspwiki/ppmc/incubator_reports.html">Board Reports</a></li>
  </ul>
  <p><strong>ASF</strong></p>
  <ul>
@@ -193,7 +193,7 @@ numbers to have to get updated</li>
          <br /><hr>
        </div>
        <div class="wikiversion">
-      <p>JSPWiki v2.9.1-incubating</p>
+      <p>JSPWiki v2.10.0-svn-36</p>
        </div>
      </div>
@@ -202,7 +202,7 @@ numbers to have to get updated</li> <div id="footer">
      <div class="copyright">
-      Copyright &copy; 2012 The Apache Software Foundation, Licensed under
+      Copyright &copy; 2013 The Apache Software Foundation, Licensed under
        the <a href="http://www.apache.org/licenses/LICENSE-2.0"; 
class="external">Apache License, Version 2.0</a>.
        <br />Apache and the Apache feather logo are trademarks of The Apache 
Software Foundation.
      </div>

Modified: websites/production/jspwiki/content/development/source_and_guide.html
==============================================================================
--- websites/production/jspwiki/content/development/source_and_guide.html 
(original)
+++ websites/production/jspwiki/content/development/source_and_guide.html Sat 
Aug 10 15:10:37 2013
@@ -20,8 +20,8 @@
      <div class="companylogo"></div>
<div class="userbox">
-      <a href="http://incubator.apache.org"; alt="Apache Incubator">
-        <img src="/jspwiki/images/apache_incubator_logo.png" alt="Apache Incubator" 
id="asf-logo" style="width: 180px; height: 45px;">
+      <a href="http://www.apache.org"; alt="Apache Software Foundation">
+        <img src="/jspwiki/images/apache_software_foundation_logo.gif" alt="Apache Software 
Foundation" id="asf-logo" style="width: 180px; height: 45px;">
        </a>
        <div class="clearbox"></div>
      </div>
@@ -32,7 +32,7 @@
      </div>
- <div class="breadcrumbs"><a href="/">Incubator</a>&nbsp;&raquo&nbsp;<a href="/jspwiki/">Jspwiki</a>&nbsp;&raquo&nbsp;<a href="/jspwiki/development/">Development</a></div>
+    <div class="breadcrumbs"><a href="/">JSPWiki</a>&nbsp;&raquo&nbsp;<a 
href="/jspwiki/development/">Development</a></div>
    </div>
<div id="content">
@@ -86,12 +86,12 @@
  <p>JSPWiki source code (<a class="external" 
href="http://svn.apache.org/viewvc/incubator/jspwiki/";>
  browse</a>) is maintained using Apache Subversion.</p>
  <p>Checkout the code using:</p>
-<div class="codehilite"><pre><span class="n">svn</span> <span class="n">co</span> <span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">svn</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">org</span><span 
class="o">/</span><span class="n">repos</span><span class="o">/</span><span class="n">asf</span><span class="o">/</span><span class="n">incubator</span><span class="o">/</span><span class="n">jspwiki</span><span class="o">/</span><span class="n">trunk</span> <span class="n">jspwiki</span>
+<div class="codehilite"><pre><span class="n">svn</span> <span class="n">co</span> <span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">svn</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span 
class="n">org</span><span class="o">/</span><span class="n">repos</span><span class="o">/</span><span class="n">asf</span><span class="o">/</span><span class="n">jspwiki</span><span class="o">/</span><span class="n">trunk</span> <span class="n">jspwiki</span>
  </pre></div>
<p>There is also a European mirror, so you can alternatively use:</p>
-<div class="codehilite"><pre><span class="n">svn</span> <span class="n">co</span> <span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">svn</span><span class="p">.</span><span class="n">eu</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span 
class="n">org</span><span class="o">/</span><span class="n">repos</span><span class="o">/</span><span class="n">asf</span><span class="o">/</span><span class="n">incubator</span><span class="o">/</span><span class="n">jspwiki</span><span class="o">/</span><span class="n">trunk</span> <span class="n">jspwiki</span>
+<div class="codehilite"><pre><span class="n">svn</span> <span class="n">co</span> <span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">svn</span><span class="p">.</span><span class="n">eu</span><span class="p">.</span><span class="n">apache</span><span 
class="p">.</span><span class="n">org</span><span class="o">/</span><span class="n">repos</span><span class="o">/</span><span class="n">asf</span><span class="o">/</span><span class="n">jspwiki</span><span class="o">/</span><span class="n">trunk</span> <span class="n">jspwiki</span>
  </pre></div>
@@ -157,11 +157,11 @@ planned release version as this is used
  <li><a href="/jspwiki/development/edit_website.html">Edit Website</a></li>
  <li><a href="http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?view=co"; 
class="external">Change Log</a></li>
  </ul>
-<p><strong>PPMC</strong></p>
+<p><strong>PMC</strong></p>
  <ul>
-<li><a href="http://incubator.apache.org/projects/jspwiki.html"; 
class="external">Incubation Status</a></li>
+<!-- <li><a href="http://incubator.apache.org/projects/jspwiki.html"; 
class="external">Incubation Status</a></li> -->
  <li><a href="/jspwiki/ppmc/how_to_release.html">How to Release</a></li>
-<li><a href="/jspwiki/ppmc/incubator_reports.html">Incubator Reports</a></li>
+<li><a href="/jspwiki/ppmc/incubator_reports.html">Board Reports</a></li>
  </ul>
  <p><strong>ASF</strong></p>
  <ul>
@@ -175,7 +175,7 @@ planned release version as this is used
          <br /><hr>
        </div>
        <div class="wikiversion">
-      <p>JSPWiki v2.9.1-incubating</p>
+      <p>JSPWiki v2.10.0-svn-36</p>
        </div>
      </div>
@@ -184,7 +184,7 @@ planned release version as this is used <div id="footer">
      <div class="copyright">
-      Copyright &copy; 2012 The Apache Software Foundation, Licensed under
+      Copyright &copy; 2013 The Apache Software Foundation, Licensed under
        the <a href="http://www.apache.org/licenses/LICENSE-2.0"; 
class="external">Apache License, Version 2.0</a>.
        <br />Apache and the Apache feather logo are trademarks of The Apache 
Software Foundation.
      </div>

Modified: websites/production/jspwiki/content/general/downloads.html
==============================================================================
--- websites/production/jspwiki/content/general/downloads.html (original)
+++ websites/production/jspwiki/content/general/downloads.html Sat Aug 10 
15:10:37 2013
@@ -20,8 +20,8 @@
      <div class="companylogo"></div>
<div class="userbox">
-      <a href="http://incubator.apache.org"; alt="Apache Incubator">
-        <img src="/jspwiki/images/apache_incubator_logo.png" alt="Apache Incubator" 
id="asf-logo" style="width: 180px; height: 45px;">
+      <a href="http://www.apache.org"; alt="Apache Software Foundation">
+        <img src="/jspwiki/images/apache_software_foundation_logo.gif" alt="Apache Software 
Foundation" id="asf-logo" style="width: 180px; height: 45px;">
        </a>
        <div class="clearbox"></div>
      </div>
@@ -32,7 +32,7 @@
      </div>
- <div class="breadcrumbs"><a href="/">Incubator</a>&nbsp;&raquo&nbsp;<a href="/jspwiki/">Jspwiki</a>&nbsp;&raquo&nbsp;<a href="/jspwiki/general/">General</a></div>
+    <div class="breadcrumbs"><a href="/">JSPWiki</a>&nbsp;&raquo&nbsp;<a 
href="/jspwiki/general/">General</a></div>
    </div>
<div id="content">
@@ -143,11 +143,11 @@ Apache archives</a>.</p>
  <li><a href="/jspwiki/development/edit_website.html">Edit Website</a></li>
  <li><a href="http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?view=co"; 
class="external">Change Log</a></li>
  </ul>
-<p><strong>PPMC</strong></p>
+<p><strong>PMC</strong></p>
  <ul>
-<li><a href="http://incubator.apache.org/projects/jspwiki.html"; 
class="external">Incubation Status</a></li>
+<!-- <li><a href="http://incubator.apache.org/projects/jspwiki.html"; 
class="external">Incubation Status</a></li> -->
  <li><a href="/jspwiki/ppmc/how_to_release.html">How to Release</a></li>
-<li><a href="/jspwiki/ppmc/incubator_reports.html">Incubator Reports</a></li>
+<li><a href="/jspwiki/ppmc/incubator_reports.html">Board Reports</a></li>
  </ul>
  <p><strong>ASF</strong></p>
  <ul>
@@ -161,7 +161,7 @@ Apache archives</a>.</p>
          <br /><hr>
        </div>
        <div class="wikiversion">
-      <p>JSPWiki v2.9.1-incubating</p>
+      <p>JSPWiki v2.10.0-svn-36</p>
        </div>
      </div>
@@ -170,7 +170,7 @@ Apache archives</a>.</p> <div id="footer">
      <div class="copyright">
-      Copyright &copy; 2012 The Apache Software Foundation, Licensed under
+      Copyright &copy; 2013 The Apache Software Foundation, Licensed under
        the <a href="http://www.apache.org/licenses/LICENSE-2.0"; 
class="external">Apache License, Version 2.0</a>.
        <br />Apache and the Apache feather logo are trademarks of The Apache 
Software Foundation.
      </div>

Modified: websites/production/jspwiki/content/general/news.html
==============================================================================
--- websites/production/jspwiki/content/general/news.html (original)
+++ websites/production/jspwiki/content/general/news.html Sat Aug 10 15:10:37 
2013
@@ -20,8 +20,8 @@
      <div class="companylogo"></div>
<div class="userbox">
-      <a href="http://incubator.apache.org"; alt="Apache Incubator">
-        <img src="/jspwiki/images/apache_incubator_logo.png" alt="Apache Incubator" 
id="asf-logo" style="width: 180px; height: 45px;">
+      <a href="http://www.apache.org"; alt="Apache Software Foundation">
+        <img src="/jspwiki/images/apache_software_foundation_logo.gif" alt="Apache Software 
Foundation" id="asf-logo" style="width: 180px; height: 45px;">
        </a>
        <div class="clearbox"></div>
      </div>
@@ -32,7 +32,7 @@
      </div>
- <div class="breadcrumbs"><a href="/">Incubator</a>&nbsp;&raquo&nbsp;<a href="/jspwiki/">Jspwiki</a>&nbsp;&raquo&nbsp;<a href="/jspwiki/general/">General</a></div>
+    <div class="breadcrumbs"><a href="/">JSPWiki</a>&nbsp;&raquo&nbsp;<a 
href="/jspwiki/general/">General</a></div>
    </div>
<div id="content">
@@ -84,6 +84,9 @@
          <div id="pagecontent">
            <h2 id="project-news">Project News</h2>
  <ul>
+<li>
+<p><strong>17-July-2013:</strong> Apache JSPWiki has graduated from the Incubator! 
It's now a top-level Apache project.</p>
+</li>
  <li>
  <p><strong>15-May-2013:</strong> Official <a href="downloads.html">Apache JSPWiki 
2.9.1-incubating release</a> is out!</p>
  </li>
@@ -162,11 +165,11 @@ us as a committer.</p>
  <li><a href="/jspwiki/development/edit_website.html">Edit Website</a></li>
  <li><a href="http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?view=co"; 
class="external">Change Log</a></li>
  </ul>
-<p><strong>PPMC</strong></p>
+<p><strong>PMC</strong></p>
  <ul>
-<li><a href="http://incubator.apache.org/projects/jspwiki.html"; 
class="external">Incubation Status</a></li>
+<!-- <li><a href="http://incubator.apache.org/projects/jspwiki.html"; 
class="external">Incubation Status</a></li> -->
  <li><a href="/jspwiki/ppmc/how_to_release.html">How to Release</a></li>
-<li><a href="/jspwiki/ppmc/incubator_reports.html">Incubator Reports</a></li>
+<li><a href="/jspwiki/ppmc/incubator_reports.html">Board Reports</a></li>
  </ul>
  <p><strong>ASF</strong></p>
  <ul>
@@ -180,7 +183,7 @@ us as a committer.</p>
          <br /><hr>
        </div>
        <div class="wikiversion">
-      <p>JSPWiki v2.9.1-incubating</p>
+      <p>JSPWiki v2.10.0-svn-36</p>
        </div>
      </div>
@@ -189,7 +192,7 @@ us as a committer.</p> <div id="footer">
      <div class="copyright">
-      Copyright &copy; 2012 The Apache Software Foundation, Licensed under
+      Copyright &copy; 2013 The Apache Software Foundation, Licensed under
        the <a href="http://www.apache.org/licenses/LICENSE-2.0"; 
class="external">Apache License, Version 2.0</a>.
        <br />Apache and the Apache feather logo are trademarks of The Apache 
Software Foundation.
      </div>

Added: 
websites/production/jspwiki/content/images/apache_software_foundation_logo.gif
==============================================================================
Binary file - no diff available.

Propchange: 
websites/production/jspwiki/content/images/apache_software_foundation_logo.gif
------------------------------------------------------------------------------
     svn:mime-type = application/octet-stream

Modified: websites/production/jspwiki/content/index.html
==============================================================================
--- websites/production/jspwiki/content/index.html (original)
+++ websites/production/jspwiki/content/index.html Sat Aug 10 15:10:37 2013
@@ -20,19 +20,19 @@
      <div class="companylogo"></div>
<div class="userbox">
-      <a href="http://incubator.apache.org"; alt="Apache Incubator">
-        <img src="/jspwiki/images/apache_incubator_logo.png" alt="Apache Incubator" 
id="asf-logo" style="width: 180px; height: 45px;">
+      <a href="http://www.apache.org"; alt="Apache Software Foundation">
+        <img src="/jspwiki/images/apache_software_foundation_logo.gif" alt="Apache Software 
Foundation" id="asf-logo" style="width: 180px; height: 45px;">
        </a>
        <div class="clearbox"></div>
      </div>
<div class="pagename">
-      Apache JSPWiki (Incubating)
+      Apache JSPWiki
      </div>
- <div class="breadcrumbs"><a href="/">Incubator</a>&nbsp;&raquo&nbsp;<a href="/jspwiki/">Jspwiki</a></div>
+    <div class="breadcrumbs"><a href="/">JSPWiki</a></div>
    </div>
<div id="content">
@@ -103,9 +103,12 @@ simple to configure</li>
  </ul>
  <h2 id="project-status">Project status</h2>
  <ul>
-<li>
-<p><strong>15-May-2013:</strong> Official <a href="general/downloads.html">Apache JSPWiki 
2.9.1-incubating release</a> is out!</p>
-</li>
+<li>
+<p><strong>17-July-2013:</strong> Apache JSPWiki has graduated from the Incubator! 
It's now a top-level Apache project.</p>
+</li>
+<li>
+<p><strong>15-May-2013:</strong> Official <a href="general/downloads.html">Apache JSPWiki 
2.9.1-incubating release</a> is out!</p>
+</li>
  <li>
  <p><strong>04-Jan-2013:</strong> new committer and PPMC member - Glen 
Mazza</p>
  </li>
@@ -126,13 +129,6 @@ but the traditional JSPWiki, the progres
  <a href="https://issues.apache.org/jira/browse/JSPWIKI";>JIRA</a> issue 
tracker.</p>
  </li>
  </ul>
-<h2 id="disclaimer">Disclaimer</h2>
-<p>Incubation is required of all newly accepted projects until a further review
-indicates that the infrastructure, communications, and decision making process
-have stabilized in a manner consistent with other successful ASF projects.
-While incubation status is not necessarily a reflection of the completeness or
-stability of the code, it does indicate that the project has yet to be fully
-endorsed by the ASF.</p>
          </div>
          <div style="clear:both;"></div>
        </div>
@@ -174,11 +170,11 @@ endorsed by the ASF.</p>
  <li><a href="/jspwiki/development/edit_website.html">Edit Website</a></li>
  <li><a href="http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?view=co"; 
class="external">Change Log</a></li>
  </ul>
-<p><strong>PPMC</strong></p>
+<p><strong>PMC</strong></p>
  <ul>
-<li><a href="http://incubator.apache.org/projects/jspwiki.html"; 
class="external">Incubation Status</a></li>
+<!-- <li><a href="http://incubator.apache.org/projects/jspwiki.html"; 
class="external">Incubation Status</a></li> -->
  <li><a href="/jspwiki/ppmc/how_to_release.html">How to Release</a></li>
-<li><a href="/jspwiki/ppmc/incubator_reports.html">Incubator Reports</a></li>
+<li><a href="/jspwiki/ppmc/incubator_reports.html">Board Reports</a></li>
  </ul>
  <p><strong>ASF</strong></p>
  <ul>
@@ -192,7 +188,7 @@ endorsed by the ASF.</p>
          <br /><hr>
        </div>
        <div class="wikiversion">
-      <p>JSPWiki v2.9.1-incubating</p>
+      <p>JSPWiki v2.10.0-svn-36</p>
        </div>
      </div>
@@ -201,7 +197,7 @@ endorsed by the ASF.</p> <div id="footer">
      <div class="copyright">
-      Copyright &copy; 2012 The Apache Software Foundation, Licensed under
+      Copyright &copy; 2013 The Apache Software Foundation, Licensed under
        the <a href="http://www.apache.org/licenses/LICENSE-2.0"; 
class="external">Apache License, Version 2.0</a>.
        <br />Apache and the Apache feather logo are trademarks of The Apache 
Software Foundation.
      </div>

Modified: websites/production/jspwiki/content/ppmc/how_to_release.html
==============================================================================
--- websites/production/jspwiki/content/ppmc/how_to_release.html (original)
+++ websites/production/jspwiki/content/ppmc/how_to_release.html Sat Aug 10 
15:10:37 2013
@@ -20,8 +20,8 @@
      <div class="companylogo"></div>
<div class="userbox">
-      <a href="http://incubator.apache.org"; alt="Apache Incubator">
-        <img src="/jspwiki/images/apache_incubator_logo.png" alt="Apache Incubator" 
id="asf-logo" style="width: 180px; height: 45px;">
+      <a href="http://www.apache.org"; alt="Apache Software Foundation">
+        <img src="/jspwiki/images/apache_software_foundation_logo.gif" alt="Apache Software 
Foundation" id="asf-logo" style="width: 180px; height: 45px;">
        </a>
        <div class="clearbox"></div>
      </div>
@@ -32,7 +32,7 @@
      </div>
- <div class="breadcrumbs"><a href="/">Incubator</a>&nbsp;&raquo&nbsp;<a href="/jspwiki/">Jspwiki</a>&nbsp;&raquo&nbsp;<a href="/jspwiki/ppmc/">Ppmc</a></div>
+    <div class="breadcrumbs"><a href="/">JSPWiki</a>&nbsp;&raquo&nbsp;<a 
href="/jspwiki/ppmc/">Ppmc</a></div>
    </div>
<div id="content">
@@ -403,11 +403,11 @@ [email protected], jspwi
  <li><a href="/jspwiki/development/edit_website.html">Edit Website</a></li>
  <li><a href="http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?view=co"; 
class="external">Change Log</a></li>
  </ul>
-<p><strong>PPMC</strong></p>
+<p><strong>PMC</strong></p>
  <ul>
-<li><a href="http://incubator.apache.org/projects/jspwiki.html"; 
class="external">Incubation Status</a></li>
+<!-- <li><a href="http://incubator.apache.org/projects/jspwiki.html"; 
class="external">Incubation Status</a></li> -->
  <li><a href="/jspwiki/ppmc/how_to_release.html">How to Release</a></li>
-<li><a href="/jspwiki/ppmc/incubator_reports.html">Incubator Reports</a></li>
+<li><a href="/jspwiki/ppmc/incubator_reports.html">Board Reports</a></li>
  </ul>
  <p><strong>ASF</strong></p>
  <ul>
@@ -421,7 +421,7 @@ [email protected], jspwi
          <br /><hr>
        </div>
        <div class="wikiversion">
-      <p>JSPWiki v2.9.1-incubating</p>
+      <p>JSPWiki v2.10.0-svn-36</p>
        </div>
      </div>
@@ -430,7 +430,7 @@ [email protected], jspwi <div id="footer">
      <div class="copyright">
-      Copyright &copy; 2012 The Apache Software Foundation, Licensed under
+      Copyright &copy; 2013 The Apache Software Foundation, Licensed under
        the <a href="http://www.apache.org/licenses/LICENSE-2.0"; 
class="external">Apache License, Version 2.0</a>.
        <br />Apache and the Apache feather logo are trademarks of The Apache 
Software Foundation.
      </div>

Modified: websites/production/jspwiki/content/ppmc/incubator_reports.html
==============================================================================
--- websites/production/jspwiki/content/ppmc/incubator_reports.html (original)
+++ websites/production/jspwiki/content/ppmc/incubator_reports.html Sat Aug 10 
15:10:37 2013
@@ -20,19 +20,19 @@
      <div class="companylogo"></div>
<div class="userbox">
-      <a href="http://incubator.apache.org"; alt="Apache Incubator">
-        <img src="/jspwiki/images/apache_incubator_logo.png" alt="Apache Incubator" 
id="asf-logo" style="width: 180px; height: 45px;">
+      <a href="http://www.apache.org"; alt="Apache Software Foundation">
+        <img src="/jspwiki/images/apache_software_foundation_logo.gif" alt="Apache Software 
Foundation" id="asf-logo" style="width: 180px; height: 45px;">
        </a>
        <div class="clearbox"></div>
      </div>
<div class="pagename">
-      Incubator reports

+      Board reports

      </div>
- <div class="breadcrumbs"><a href="/">Incubator</a>&nbsp;&raquo&nbsp;<a href="/jspwiki/">Jspwiki</a>&nbsp;&raquo&nbsp;<a href="/jspwiki/ppmc/">Ppmc</a></div>
+    <div class="breadcrumbs"><a href="/">JSPWiki</a>&nbsp;&raquo&nbsp;<a 
href="/jspwiki/ppmc/">Ppmc</a></div>
    </div>
<div id="content">
@@ -83,8 +83,8 @@
        <div class="tabs">
          <div id="pagecontent">
            <ul>
-<li>See <a href="http://svn.apache.org/repos/asf/incubator/jspwiki/board/";
-class="external">http://svn.apache.org/repos/asf/incubator/jspwiki/board/</a>.</li>
+<li>See <a href="http://svn.apache.org/repos/asf/jspwiki/board/";
+class="external">http://svn.apache.org/repos/asf/jspwiki/board/</a>.</li>
  </ul>
          </div>
          <div style="clear:both;"></div>
@@ -127,11 +127,11 @@ class="external">http://svn.apache.org/r
  <li><a href="/jspwiki/development/edit_website.html">Edit Website</a></li>
  <li><a href="http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?view=co"; 
class="external">Change Log</a></li>
  </ul>
-<p><strong>PPMC</strong></p>
+<p><strong>PMC</strong></p>
  <ul>
-<li><a href="http://incubator.apache.org/projects/jspwiki.html"; 
class="external">Incubation Status</a></li>
+<!-- <li><a href="http://incubator.apache.org/projects/jspwiki.html"; 
class="external">Incubation Status</a></li> -->
  <li><a href="/jspwiki/ppmc/how_to_release.html">How to Release</a></li>
-<li><a href="/jspwiki/ppmc/incubator_reports.html">Incubator Reports</a></li>
+<li><a href="/jspwiki/ppmc/incubator_reports.html">Board Reports</a></li>
  </ul>
  <p><strong>ASF</strong></p>
  <ul>
@@ -145,7 +145,7 @@ class="external">http://svn.apache.org/r
          <br /><hr>
        </div>
        <div class="wikiversion">
-      <p>JSPWiki v2.9.1-incubating</p>
+      <p>JSPWiki v2.10.0-svn-36</p>
        </div>
      </div>
@@ -154,7 +154,7 @@ class="external">http://svn.apache.org/r <div id="footer">
      <div class="copyright">
-      Copyright &copy; 2012 The Apache Software Foundation, Licensed under
+      Copyright &copy; 2013 The Apache Software Foundation, Licensed under
        the <a href="http://www.apache.org/licenses/LICENSE-2.0"; 
class="external">Apache License, Version 2.0</a>.
        <br />Apache and the Apache feather logo are trademarks of The Apache 
Software Foundation.
      </div>

Modified: websites/production/jspwiki/content/sitemap.html
==============================================================================
--- websites/production/jspwiki/content/sitemap.html (original)
+++ websites/production/jspwiki/content/sitemap.html Sat Aug 10 15:10:37 2013
@@ -20,8 +20,8 @@
      <div class="companylogo"></div>
<div class="userbox">
-      <a href="http://incubator.apache.org"; alt="Apache Incubator">
-        <img src="/jspwiki/images/apache_incubator_logo.png" alt="Apache Incubator" 
id="asf-logo" style="width: 180px; height: 45px;">
+      <a href="http://www.apache.org"; alt="Apache Software Foundation">
+        <img src="/jspwiki/images/apache_software_foundation_logo.gif" alt="Apache Software 
Foundation" id="asf-logo" style="width: 180px; height: 45px;">
        </a>
        <div class="clearbox"></div>
      </div>
@@ -32,7 +32,7 @@
      </div>
- <div class="breadcrumbs"><a href="/">Incubator</a>&nbsp;&raquo&nbsp;<a href="/jspwiki/">Jspwiki</a></div>
+    <div class="breadcrumbs"><a href="/">JSPWiki</a></div>
    </div>
<div id="content">
@@ -124,11 +124,11 @@
  <li><a href="/jspwiki/development/edit_website.html">Edit Website</a></li>
  <li><a href="http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?view=co"; 
class="external">Change Log</a></li>
  </ul>
-<p><strong>PPMC</strong></p>
+<p><strong>PMC</strong></p>
  <ul>
-<li><a href="http://incubator.apache.org/projects/jspwiki.html"; 
class="external">Incubation Status</a></li>
+<!-- <li><a href="http://incubator.apache.org/projects/jspwiki.html"; 
class="external">Incubation Status</a></li> -->
  <li><a href="/jspwiki/ppmc/how_to_release.html">How to Release</a></li>
-<li><a href="/jspwiki/ppmc/incubator_reports.html">Incubator Reports</a></li>
+<li><a href="/jspwiki/ppmc/incubator_reports.html">Board Reports</a></li>
  </ul>
  <p><strong>ASF</strong></p>
  <ul>
@@ -142,7 +142,7 @@
          <br /><hr>
        </div>
        <div class="wikiversion">
-      <p>JSPWiki v2.9.1-incubating</p>
+      <p>JSPWiki v2.10.0-svn-36</p>
        </div>
      </div>
@@ -151,7 +151,7 @@ <div id="footer">
      <div class="copyright">
-      Copyright &copy; 2012 The Apache Software Foundation, Licensed under
+      Copyright &copy; 2013 The Apache Software Foundation, Licensed under
        the <a href="http://www.apache.org/licenses/LICENSE-2.0"; 
class="external">Apache License, Version 2.0</a>.
        <br />Apache and the Apache feather logo are trademarks of The Apache 
Software Foundation.
      </div>



Reply via email to