jspwiki-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From build...@apache.org
Subject svn commit: r834989 - in /websites/staging/jspwiki/trunk/content: ./ jspwiki/ jspwiki/community/ jspwiki/development/ jspwiki/documentation/ jspwiki/general/ jspwiki/ppmc/
Date Sat, 13 Oct 2012 07:59:08 GMT
Author: buildbot
Date: Sat Oct 13 07:59:07 2012
New Revision: 834989

Log:
Staging update by buildbot for jspwiki

Added:
    websites/staging/jspwiki/trunk/content/jspwiki/general/news.html
Removed:
    websites/staging/jspwiki/trunk/content/jspwiki/general/history.html
Modified:
    websites/staging/jspwiki/trunk/content/   (props changed)
    websites/staging/jspwiki/trunk/content/jspwiki/community/get_involved.html
    websites/staging/jspwiki/trunk/content/jspwiki/community/mailing_lists.html
    websites/staging/jspwiki/trunk/content/jspwiki/community/people.html
    websites/staging/jspwiki/trunk/content/jspwiki/development/building.html
    websites/staging/jspwiki/trunk/content/jspwiki/development/edit_website.html
    websites/staging/jspwiki/trunk/content/jspwiki/development/source_and_guide.html
    websites/staging/jspwiki/trunk/content/jspwiki/documentation/javadoc.html
    websites/staging/jspwiki/trunk/content/jspwiki/general/downloads.html
    websites/staging/jspwiki/trunk/content/jspwiki/index.html
    websites/staging/jspwiki/trunk/content/jspwiki/ppmc/how_to_release.html
    websites/staging/jspwiki/trunk/content/jspwiki/ppmc/incubator_reports.html
    websites/staging/jspwiki/trunk/content/jspwiki/sitemap.html

Propchange: websites/staging/jspwiki/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Sat Oct 13 07:59:07 2012
@@ -1 +1 @@
-1396340
+1397801

Modified: websites/staging/jspwiki/trunk/content/jspwiki/community/get_involved.html
==============================================================================
--- websites/staging/jspwiki/trunk/content/jspwiki/community/get_involved.html (original)
+++ websites/staging/jspwiki/trunk/content/jspwiki/community/get_involved.html Sat Oct 13
07:59:07 2012
@@ -90,9 +90,9 @@ ideas on how you could improve us are:</
 new plugin or a filter.</li>
 <li>Contribute to the web design - we all like the software to look better and 
 be more logical</li>
-<li>Help maintain the documentation wiki - we need people who fight against 
-spammers and keep the documentation in a logical order. Even a few edits a 
-week will be of a big help!</li>
+<li>Help improve the Apache JSPWiki website - We use the Apache CMS for our
+website, [patches][] welcome.<br />
+</li>
 <li>File bugs - despite our best efforts, we are not perfect.</li>
 <li>Contribute hard code into the trunk - just take a moment to familiarize 
 yourself with the the coding guidelines and you'll be fine.</li>
@@ -102,9 +102,7 @@ in a large project like this. Our JIRA i
 triaging, and clarification and all that stuff.</li>
 </ul>
 <p>The point really is that despite your skill levels at coding or the time you 
-can afford to put into helping us, there's something you can always do! Five 
-minutes per week of deleting wikispam is five minutes for someone else to spend 
-in improving the software.</p>
+can afford to put into helping us, there's always something you can do!</p>
         </div>
         <div style="clear:both;"></div>
       </div>
@@ -120,7 +118,7 @@ in improving the software.</p>
 <ul>
 <li><a href="/jspwiki/index.html">Home</a></li>
 <li><a href="/jspwiki/general/downloads.html">Downloads</a></li>
-<li><a href="/jspwiki/general/history.html">History</a></li>
+<li><a href="/jspwiki/general/news.html">News</a></li>
 <li><a href="http://www.apache.org/licenses/" class="external">License</a></li>
 </ul>
 <p><strong>Documentation</strong></p>
@@ -133,7 +131,7 @@ in improving the software.</p>
 <li><a href="/jspwiki/community/get_involved.html">Get Involved</a></li>
 <li><a href="/jspwiki/community/mailing_lists.html">Mailing Lists</a></li>
 <li><a href="https://issues.apache.org/jira/browse/JSPWIKI" class="external">Issues</a></li>
-<li><a href="http://www.jspwiki.org" class="external">Main Wiki</a></li>
+<li><a href="http://www.jspwiki.org" class="external">Legacy Site</a></li>
 <li><a href="http://sandbox.jspwiki.org" class="external">Sandbox Wiki</a></li>
 <li><a href="/jspwiki/community/people.html">People</a></li>
 </ul>

Modified: websites/staging/jspwiki/trunk/content/jspwiki/community/mailing_lists.html
==============================================================================
--- websites/staging/jspwiki/trunk/content/jspwiki/community/mailing_lists.html (original)
+++ websites/staging/jspwiki/trunk/content/jspwiki/community/mailing_lists.html Sat Oct 13
07:59:07 2012
@@ -85,12 +85,9 @@
           <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
-the <a class="external" 
-href="http://mail-archives.apache.org/mod_mbox/incubator-jspwiki-user/">list 
-archives</a>.</p>
-<p>The <a href="http://www.ecyrd.com/pipermail/jspwiki-users/" class="external">
-old list archives</a> are also available. There's also a secondary archive on 
-<a href="http://www.nabble.com/JspWiki---User-f2680.html" class="external">
+the list archives on either <a class="external" 
+href="http://mail-archives.apache.org/mod_mbox/incubator-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>
 <p>This is the list for JSPWiki developers and contributors, and anyone who is 
@@ -100,9 +97,6 @@ list is hosted at Apache, so you join by
 <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/" 
 class="external">list archives</a> are also browseable.</p>
-<p>The <a href="http://www.ecyrd.com/pipermail/jspwiki-dev/" class="external">old

-JSPWiki-dev archives</a> are also available, if you want to peruse some 
-interesting issues. </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 
@@ -120,8 +114,6 @@ email address that you originally subscr
 <li><a href="http://www.jspwiki.org/wiki/IrcChannel" class="external">IrcChannel</a>
-
 chat live with the developers! The channel is fairly quiet, and most people are 
 in European timezones, so be patient. </li>
-<li>JSPWiki <a href="http://blog.jspwiki.org" class="external">weblog</a>.</li>
-<li><a href="http://twitter.com/jspwiki" class="external">Twitter</a> page.
</li>
 </ul>
         </div>
         <div style="clear:both;"></div>
@@ -138,7 +130,7 @@ in European timezones, so be patient. </
 <ul>
 <li><a href="/jspwiki/index.html">Home</a></li>
 <li><a href="/jspwiki/general/downloads.html">Downloads</a></li>
-<li><a href="/jspwiki/general/history.html">History</a></li>
+<li><a href="/jspwiki/general/news.html">News</a></li>
 <li><a href="http://www.apache.org/licenses/" class="external">License</a></li>
 </ul>
 <p><strong>Documentation</strong></p>
@@ -151,7 +143,7 @@ in European timezones, so be patient. </
 <li><a href="/jspwiki/community/get_involved.html">Get Involved</a></li>
 <li><a href="/jspwiki/community/mailing_lists.html">Mailing Lists</a></li>
 <li><a href="https://issues.apache.org/jira/browse/JSPWIKI" class="external">Issues</a></li>
-<li><a href="http://www.jspwiki.org" class="external">Main Wiki</a></li>
+<li><a href="http://www.jspwiki.org" class="external">Legacy Site</a></li>
 <li><a href="http://sandbox.jspwiki.org" class="external">Sandbox Wiki</a></li>
 <li><a href="/jspwiki/community/people.html">People</a></li>
 </ul>

Modified: websites/staging/jspwiki/trunk/content/jspwiki/community/people.html
==============================================================================
--- websites/staging/jspwiki/trunk/content/jspwiki/community/people.html (original)
+++ websites/staging/jspwiki/trunk/content/jspwiki/community/people.html Sat Oct 13 07:59:07
2012
@@ -85,30 +85,33 @@
           <h2 id="jspwiki-contributors">JSPWiki contributors</h2>
 <p>The current JSPWiki committer list:</p>
 <ul>
+<li>Dirk Frederickx</li>
+<li>Florian Holeczek</li>
 <li>Janne Jalkanen</li>
 <li>Andrew Jaquith</li>
-<li>Dirk Frederickx</li>
 <li>Harry Metske</li>
-<li>Florian Holeczek</li>
 <li>Juan Pablo Santos</li>
 <li>Christoph Sauer</li>
 </ul>
 <p>As esteemed mentors we have:</p>
 <ul>
-<li>Craig Russell</li>
+<li>Dave Johnson</li>
 <li>Sam Ruby</li>
+<li>Craig Russell</li>
+<li>Henning Schmiedehausen<br />
+</li>
 </ul>
 <p>And, of course, all the fine people of the jspwiki-dev <a href="mailing_lists.html">mailing
list</a>!</p>
 <h2 id="ppmc">PPMC</h2>
 <p>The Podling Project Management Committee consists of </p>
 <ul>
-<li>Janne Jalkanen</li>
-<li>Andrew Jaquith</li>
 <li>Dirk Frederickx</li>
-<li>Harry Metske</li>
 <li>Florian Holeczek</li>
-<li>Juan Pablo Santos</li>
+<li>Andrew Jaquith</li>
+<li>Janne Jalkanen</li>
+<li>Harry Metske</li>
 <li>Craig Russell</li>
+<li>Juan Pablo Santos</li>
 </ul>
         </div>
         <div style="clear:both;"></div>
@@ -125,7 +128,7 @@
 <ul>
 <li><a href="/jspwiki/index.html">Home</a></li>
 <li><a href="/jspwiki/general/downloads.html">Downloads</a></li>
-<li><a href="/jspwiki/general/history.html">History</a></li>
+<li><a href="/jspwiki/general/news.html">News</a></li>
 <li><a href="http://www.apache.org/licenses/" class="external">License</a></li>
 </ul>
 <p><strong>Documentation</strong></p>
@@ -138,7 +141,7 @@
 <li><a href="/jspwiki/community/get_involved.html">Get Involved</a></li>
 <li><a href="/jspwiki/community/mailing_lists.html">Mailing Lists</a></li>
 <li><a href="https://issues.apache.org/jira/browse/JSPWIKI" class="external">Issues</a></li>
-<li><a href="http://www.jspwiki.org" class="external">Main Wiki</a></li>
+<li><a href="http://www.jspwiki.org" class="external">Legacy Site</a></li>
 <li><a href="http://sandbox.jspwiki.org" class="external">Sandbox Wiki</a></li>
 <li><a href="/jspwiki/community/people.html">People</a></li>
 </ul>

Modified: websites/staging/jspwiki/trunk/content/jspwiki/development/building.html
==============================================================================
--- websites/staging/jspwiki/trunk/content/jspwiki/development/building.html (original)
+++ websites/staging/jspwiki/trunk/content/jspwiki/development/building.html Sat Oct 13 07:59:07
2012
@@ -164,7 +164,7 @@ They're automatically downloaded from <c
 <ul>
 <li><a href="/jspwiki/index.html">Home</a></li>
 <li><a href="/jspwiki/general/downloads.html">Downloads</a></li>
-<li><a href="/jspwiki/general/history.html">History</a></li>
+<li><a href="/jspwiki/general/news.html">News</a></li>
 <li><a href="http://www.apache.org/licenses/" class="external">License</a></li>
 </ul>
 <p><strong>Documentation</strong></p>
@@ -177,7 +177,7 @@ They're automatically downloaded from <c
 <li><a href="/jspwiki/community/get_involved.html">Get Involved</a></li>
 <li><a href="/jspwiki/community/mailing_lists.html">Mailing Lists</a></li>
 <li><a href="https://issues.apache.org/jira/browse/JSPWIKI" class="external">Issues</a></li>
-<li><a href="http://www.jspwiki.org" class="external">Main Wiki</a></li>
+<li><a href="http://www.jspwiki.org" class="external">Legacy Site</a></li>
 <li><a href="http://sandbox.jspwiki.org" class="external">Sandbox Wiki</a></li>
 <li><a href="/jspwiki/community/people.html">People</a></li>
 </ul>

Modified: websites/staging/jspwiki/trunk/content/jspwiki/development/edit_website.html
==============================================================================
--- websites/staging/jspwiki/trunk/content/jspwiki/development/edit_website.html (original)
+++ websites/staging/jspwiki/trunk/content/jspwiki/development/edit_website.html Sat Oct 13
07:59:07 2012
@@ -91,9 +91,9 @@ the Apache Infrastructure pages includin
 <ol>
 <li>
 <p>Commit a change to the website's source <a href="http://daringfireball.net/projects/markdown/syntax">Markdown</a>
files located in
-<a href="https://svn.apache.org/repos/asf/incubator/jspwiki/site/trunk" 
-class="external>https://svn.apache.org/repos/asf/incubator/jspwiki/site/trunk</a>.

-Before committing test that the site still builds locally by installing the
+<a href="https://svn.apache.org/repos/asf/incubator/jspwiki/site/trunk" class="external">
+https://svn.apache.org/repos/asf/incubator/jspwiki/site/trunk</a>. 
+Before committing, test that the site still builds locally by installing the
 <a href="http://apache.org/dev/cmsref.html#local-build">CMS build scripts</a>
and running:</p>
 <div class="codehilite"><pre><span class="n">buildsite</span><span
class="o">/</span><span class="n">build_site</span><span class="o">.</span><span
class="n">pl</span> <span class="o">--</span><span class="n">source</span><span
class="o">-</span><span class="n">base</span> <span class="n">jspwiki</span><span
class="o">-</span><span class="n">site</span> <span class="o">--</span><span
class="n">target</span><span class="o">-</span><span class="n">base</span>
<span class="n">jspwiki</span><span class="o">-</span><span class="n">website</span>
 </pre></div>
@@ -150,7 +150,7 @@ numbers to have to get updated</li>
 <ul>
 <li><a href="/jspwiki/index.html">Home</a></li>
 <li><a href="/jspwiki/general/downloads.html">Downloads</a></li>
-<li><a href="/jspwiki/general/history.html">History</a></li>
+<li><a href="/jspwiki/general/news.html">News</a></li>
 <li><a href="http://www.apache.org/licenses/" class="external">License</a></li>
 </ul>
 <p><strong>Documentation</strong></p>
@@ -163,7 +163,7 @@ numbers to have to get updated</li>
 <li><a href="/jspwiki/community/get_involved.html">Get Involved</a></li>
 <li><a href="/jspwiki/community/mailing_lists.html">Mailing Lists</a></li>
 <li><a href="https://issues.apache.org/jira/browse/JSPWIKI" class="external">Issues</a></li>
-<li><a href="http://www.jspwiki.org" class="external">Main Wiki</a></li>
+<li><a href="http://www.jspwiki.org" class="external">Legacy Site</a></li>
 <li><a href="http://sandbox.jspwiki.org" class="external">Sandbox Wiki</a></li>
 <li><a href="/jspwiki/community/people.html">People</a></li>
 </ul>

Modified: websites/staging/jspwiki/trunk/content/jspwiki/development/source_and_guide.html
==============================================================================
--- websites/staging/jspwiki/trunk/content/jspwiki/development/source_and_guide.html (original)
+++ websites/staging/jspwiki/trunk/content/jspwiki/development/source_and_guide.html Sat Oct
13 07:59:07 2012
@@ -89,12 +89,13 @@
 </pre></div>
 
 
-<p>There is also an european mirror, so you could also do:</p>
+<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="sr">//s</span><span
class="n">vn</span><span class="o">.</span><span class="n">eu</span><span
class="o">.</span><span class="n">apache</span><span class="o">.</span><span
class="n">org</span><span class="sr">/repos/</span><span class="n">asf</span><span
class="sr">/incubator/</span><span class="n">jspwiki</span><span class="o">/</span><span
class="n">trunk</span> <span class="n">jspwiki</span>
 </pre></div>
 
 
 <p>Change http to https if you are a developer intending to make commits</p>
+<p>See the <a href="edit_website.html">Edit Website</a> page for the website
sources.</p>
 <p><a class="external" href="http://svn.apache.org/viewvc/incubator/jspwiki/">
 Anonymous browser access</a> is also available.</p>
 <h2 id="developer-guide">Developer Guide</h2>
@@ -128,7 +129,7 @@ planned release version as this is used 
 <ul>
 <li><a href="/jspwiki/index.html">Home</a></li>
 <li><a href="/jspwiki/general/downloads.html">Downloads</a></li>
-<li><a href="/jspwiki/general/history.html">History</a></li>
+<li><a href="/jspwiki/general/news.html">News</a></li>
 <li><a href="http://www.apache.org/licenses/" class="external">License</a></li>
 </ul>
 <p><strong>Documentation</strong></p>
@@ -141,7 +142,7 @@ planned release version as this is used 
 <li><a href="/jspwiki/community/get_involved.html">Get Involved</a></li>
 <li><a href="/jspwiki/community/mailing_lists.html">Mailing Lists</a></li>
 <li><a href="https://issues.apache.org/jira/browse/JSPWIKI" class="external">Issues</a></li>
-<li><a href="http://www.jspwiki.org" class="external">Main Wiki</a></li>
+<li><a href="http://www.jspwiki.org" class="external">Legacy Site</a></li>
 <li><a href="http://sandbox.jspwiki.org" class="external">Sandbox Wiki</a></li>
 <li><a href="/jspwiki/community/people.html">People</a></li>
 </ul>

Modified: websites/staging/jspwiki/trunk/content/jspwiki/documentation/javadoc.html
==============================================================================
--- websites/staging/jspwiki/trunk/content/jspwiki/documentation/javadoc.html (original)
+++ websites/staging/jspwiki/trunk/content/jspwiki/documentation/javadoc.html Sat Oct 13 07:59:07
2012
@@ -98,7 +98,7 @@
 <ul>
 <li><a href="/jspwiki/index.html">Home</a></li>
 <li><a href="/jspwiki/general/downloads.html">Downloads</a></li>
-<li><a href="/jspwiki/general/history.html">History</a></li>
+<li><a href="/jspwiki/general/news.html">News</a></li>
 <li><a href="http://www.apache.org/licenses/" class="external">License</a></li>
 </ul>
 <p><strong>Documentation</strong></p>
@@ -111,7 +111,7 @@
 <li><a href="/jspwiki/community/get_involved.html">Get Involved</a></li>
 <li><a href="/jspwiki/community/mailing_lists.html">Mailing Lists</a></li>
 <li><a href="https://issues.apache.org/jira/browse/JSPWIKI" class="external">Issues</a></li>
-<li><a href="http://www.jspwiki.org" class="external">Main Wiki</a></li>
+<li><a href="http://www.jspwiki.org" class="external">Legacy Site</a></li>
 <li><a href="http://sandbox.jspwiki.org" class="external">Sandbox Wiki</a></li>
 <li><a href="/jspwiki/community/people.html">People</a></li>
 </ul>

Modified: websites/staging/jspwiki/trunk/content/jspwiki/general/downloads.html
==============================================================================
--- websites/staging/jspwiki/trunk/content/jspwiki/general/downloads.html (original)
+++ websites/staging/jspwiki/trunk/content/jspwiki/general/downloads.html Sat Oct 13 07:59:07
2012
@@ -85,8 +85,10 @@
           <p><span class="error">
 There are no Apache Releases yet (see 
 <a class="external" href="https://issues.apache.org/jira/browse/JSPWIKI-717">
-JSPWIKI-717</a>). However, we are on it.<br/><br />
-Once this JIRA is closed, the text from below will become true.
+JSPWIKI-717</a>). However, we are working on it.<br/><br />
+Once this JIRA is closed, the links below will become true.  In the meantime, 
+an Apache-licensed stable version of JSPWiki can be <a href="http://www.jspwiki.org/wiki/JSPWikiDownload">downloaded</a>
+from the legacy JSPWiki site, or check the <a href="../development/building.html">Building</a>
page to build from the Apache sources.<br />
 </span></p>
 <p>Current source and binary distributions are available through the
 <a class="external" href="http://www.apache.org/dyn/closer.cgi/incubator/jspwiki">
@@ -112,7 +114,7 @@ Nexus</a> repository with the groupId: o
 <ul>
 <li><a href="/jspwiki/index.html">Home</a></li>
 <li><a href="/jspwiki/general/downloads.html">Downloads</a></li>
-<li><a href="/jspwiki/general/history.html">History</a></li>
+<li><a href="/jspwiki/general/news.html">News</a></li>
 <li><a href="http://www.apache.org/licenses/" class="external">License</a></li>
 </ul>
 <p><strong>Documentation</strong></p>
@@ -125,7 +127,7 @@ Nexus</a> repository with the groupId: o
 <li><a href="/jspwiki/community/get_involved.html">Get Involved</a></li>
 <li><a href="/jspwiki/community/mailing_lists.html">Mailing Lists</a></li>
 <li><a href="https://issues.apache.org/jira/browse/JSPWIKI" class="external">Issues</a></li>
-<li><a href="http://www.jspwiki.org" class="external">Main Wiki</a></li>
+<li><a href="http://www.jspwiki.org" class="external">Legacy Site</a></li>
 <li><a href="http://sandbox.jspwiki.org" class="external">Sandbox Wiki</a></li>
 <li><a href="/jspwiki/community/people.html">People</a></li>
 </ul>

Added: websites/staging/jspwiki/trunk/content/jspwiki/general/news.html
==============================================================================
--- websites/staging/jspwiki/trunk/content/jspwiki/general/news.html (added)
+++ websites/staging/jspwiki/trunk/content/jspwiki/general/news.html Sat Oct 13 07:59:07 2012
@@ -0,0 +1,184 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html id="top" xmlns="http://www.w3.org/1999/xhtml" xmlns:jspwiki="http://www.jspwiki.org"><head>
+  <title>News
</title>
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+  <link rel="stylesheet" type="text/css" media="screen, projection, print" href="/jspwiki/css/jspwiki.css">
+  <link rel="stylesheet" type="text/css" media="print" href="/jspwiki/css/jspwiki_print.css">
+  <link rel="alternate stylesheet" type="text/css" href="/jspwiki/css/jspwiki_print.css"
title="Print friendly">
+  <link rel="alternate stylesheet" type="text/css" href="/jspwiki/css/jspwiki.css" title="Standard">
+  <link rel="shortcut icon" type="image/x-icon" href="/jspwiki/images/favicon.ico">
+  <link rel="icon" type="image/x-icon" href="/jspwiki/images/favicon.ico">
+</head>
+<body class="view">
+<div id="wikibody" class="fav-left">
+  <div id="header">
+    <!-- <div class="titlebox"></div> -->
+    <div class="applicationlogo"> 
+      <a href="">Main</a>
+    </div>
+
+    <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>
+      <div class="clearbox"></div>
+    </div>
+
+    
+    <div class="pagename">
+      News

+    </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>
+
+  <div id="content">
+    <div id="page">
+      <div id="actionsTop" class="pageactions"> 
+      <ul>
+        <li>
+          <a href="http://www.apache.org/foundation/" class="action edit" accesskey="f"
title="The Foundation [f]">
+            <span class="accesskey">F</span>oundation
+          </a>
+        </li>
+        <li>
+          <a href="http://projects.apache.org" class="action edit" accesskey="p" title="The
Projects [p]">
+            <span class="accesskey">P</span>rojects
+          </a>
+        </li>
+        <li>
+          <a href="http://people.apache.org" class="action edit" accesskey="e" title="The
People [e]">
+            P<span class="accesskey">e</span>ople
+          </a>
+        </li>
+        <li>
+          <a href="http://www.apache.org/foundation/getinvolved.html" class="action edit"
accesskey="i" title="Get Involved [i]">
+            Get <span class="accesskey">I</span>nvolved
+          </a>
+        </li>
+        <li>
+          <a title="Download [ d ]" class="action edit" accesskey="d" href="http://www.apache.org/dyn/closer.cgi">
+            <span class="accesskey">D</span>ownload
+          </a>
+        </li>
+        <li href="#" id="morebutton">
+          <a href="http://www.apache.org/foundation/sponsorship.html" accesskey="s" class="action
edit" title="Support Apache [ s ]">
+            <span class="accesskey">S</span>upport Apache&nbsp;
+          </a>
+        </li>
+      </ul>
+      </div>
+
+      <div class="tabmenu">
+        <a class="activetab" id="menu-pagecontent" accesskey="J" href="/jspwiki/index.html">
+          <span class="accesskey">J</span>SPWiki&nbsp;
+        </a>
+        <!-- <a id="menu-attach" accesskey="a"><span class="accesskey">A</span>ttach</a>
+        <a id="menu-info" href="http://www.jspwiki.org/PageInfo.jsp?page=Main" accesskey="i"><span
class="accesskey">I</span>nfo</a> -->
+      </div>
+      
+      <div class="tabs">
+        <div id="pagecontent">
+          <h2 id="project-news">Project News</h2>
+<ul>
+<li>
+<p><strong>01-May-2012:</strong> New, yet familiar, project website.</p>
+</li>
+<li>
+<p><strong>23-Jan-2012:</strong> The previous attempt to graduate to an
ASF top-level 
+project did not succeed for various reasons. A new effort is started to 
+graduate with a 2.9 codebase (based on 2.8), so no JCR backend and no Stripes, 
+but the traditional JSPWiki, the progress can still be followed at our 
+<a href="https://issues.apache.org/jira/browse/JSPWIKI" class="external">JIRA</a>

+ issue tracker.</p>
+</li>
+<li>
+<p><strong>24-May-2009:</strong> We started an effort to graduate to an
ASF top-level 
+project, the progress can be followed at our JIRA issue tracker.</p>
+</li>
+<li>
+<p><strong>24-Apr-2009:</strong> Well, it seems that it took a few more
weeks to actually 
+make the release - and we ain't there yet. But Harry Metske and Florian 
+Holeczek joined the PPMC, which is of course good news.</p>
+</li>
+<li>
+<p><strong>29-Jun-2008:</strong> JSPWiki trunk is now completely Apache-licensed,
and we're 
+looking to have an incubator release in a few weeks. Also, Harry Metske joins 
+us as a committer.</p>
+</li>
+</ul>
+        </div>
+        <div style="clear:both;"></div>
+      </div>
+      <div id="actionsBottom" class="pageactions"> 
+        <a href="#top" class="action quick2top" title="Ir al principio">«</a>
+      </div>
+
+    </div>
+
+    <div id="favorites">
+      <div class="leftmenu">
+      <p><strong>General</strong></p>
+<ul>
+<li><a href="/jspwiki/index.html">Home</a></li>
+<li><a href="/jspwiki/general/downloads.html">Downloads</a></li>
+<li><a href="/jspwiki/general/news.html">News</a></li>
+<li><a href="http://www.apache.org/licenses/" class="external">License</a></li>
+</ul>
+<p><strong>Documentation</strong></p>
+<ul>
+<li><a href="http://doc.jspwiki.org" class="external">Doc Wiki</a></li>
+<li><a href="/jspwiki/documentation/javadoc.html">Javadoc</a></li>
+</ul>
+<p><strong>Community</strong></p>
+<ul>
+<li><a href="/jspwiki/community/get_involved.html">Get Involved</a></li>
+<li><a href="/jspwiki/community/mailing_lists.html">Mailing Lists</a></li>
+<li><a href="https://issues.apache.org/jira/browse/JSPWIKI" class="external">Issues</a></li>
+<li><a href="http://www.jspwiki.org" class="external">Legacy Site</a></li>
+<li><a href="http://sandbox.jspwiki.org" class="external">Sandbox Wiki</a></li>
+<li><a href="/jspwiki/community/people.html">People</a></li>
+</ul>
+<p><strong>Development</strong></p>
+<ul>
+<li><a href="/jspwiki/development/source_and_guide.html">Source and Guide</a></li>
+<li><a href="/jspwiki/development/building.html">Building</a></li>
+<li><a href="https://issues.apache.org/jira/browse/JSPWIKI#selectedTab=com.atlassian.jira.plugin.system.project%3Aroadmap*panel"
class="external">Road Map</a></li>
+<li><a href="https://builds.apache.org/job/JSPWiki/" class="external">CI build</a></li>
+<li><a href="/jspwiki/development/edit_website.html">Edit Website</a></li>
+</ul>
+<p><strong>PPMC</strong></p>
+<ul>
+<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>
+</ul>
+<p><strong>ASF</strong></p>
+<ul>
+<li><a href="http://www.apache.org" class="external">Website</a></li>
+<li><a href="http://www.apache.org/foundation/contributing.html" class="external">Donations</a></li>
+<li><a href="http://www.apache.org/foundation/sponsorship.html" class="external">Sponsorship</a></li>
+<li><a href="http://www.apache.org/foundation/thanks.html" class="external">Thanks</a></li>
+</ul>
+      </div>
+      <div class="leftmenufooter">
+        <br /><hr>
+      </div>
+      <div class="wikiversion">JSPWiki v2.9.0-incubating-12</div>  
+    </div>
+
+	<div class="clearbox"></div>
+  </div>
+ 
+  <div id="footer">
+    <div class="copyright">
+      Copyright &copy; 2012 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>
+  </div>
+</div>
+</body></html>
\ No newline at end of file

Modified: websites/staging/jspwiki/trunk/content/jspwiki/index.html
==============================================================================
--- websites/staging/jspwiki/trunk/content/jspwiki/index.html (original)
+++ websites/staging/jspwiki/trunk/content/jspwiki/index.html Sat Oct 13 07:59:07 2012
@@ -83,16 +83,15 @@
       <div class="tabs">
         <div id="pagecontent">
           <h2 id="welcome-to-apache-jspwiki">Welcome to Apache JSPWiki</h2>
-<p>Apache JSPWiki is the apachified version of JSPWiki, a leading open source 
-WikiWiki engine, feature-rich, built around the standard J2EE components (Java, 
-servlets, JSP). </p>
+<p>Apache JSPWiki is a leading open source WikiWiki engine, feature-rich 
+and built around standard J2EE components (Java, servlets, JSP). </p>
 <p>Some of its features include:</p>
 <ul>
 <li>WikiMarkup/Structured Text</li>
 <li>File attachments </li>
 <li>Templates support</li>
-<li>Data storage through 3 WikiPage Providers, with the capability to plug new 
-ones</li>
+<li>Data storage through your choice of three WikiPage Providers, with the 
+capability to create and plug in new ones</li>
 <li>Security: fine grained control over authorization and authentication, yet 
 simple to configure</li>
 <li>Easy plugin interface</li>
@@ -102,9 +101,6 @@ simple to configure</li>
 <li>Page locking to prevent editing conflicts</li>
 <li>Support for Multiple Wikis</li>
 </ul>
-<p>JSPWiki project also has an infrequently updated 
-<a href="http://blog.jspwiki.org" class="external">weblog</a> and a 
-<a href="http://twitter.com/jspwiki" class="external">Twitter</a> page. </p>
 <h2 id="project-status">Project status</h2>
 <ul>
 <li>
@@ -141,7 +137,7 @@ endorsed by the ASF.</p>
 <ul>
 <li><a href="/jspwiki/index.html">Home</a></li>
 <li><a href="/jspwiki/general/downloads.html">Downloads</a></li>
-<li><a href="/jspwiki/general/history.html">History</a></li>
+<li><a href="/jspwiki/general/news.html">News</a></li>
 <li><a href="http://www.apache.org/licenses/" class="external">License</a></li>
 </ul>
 <p><strong>Documentation</strong></p>
@@ -154,7 +150,7 @@ endorsed by the ASF.</p>
 <li><a href="/jspwiki/community/get_involved.html">Get Involved</a></li>
 <li><a href="/jspwiki/community/mailing_lists.html">Mailing Lists</a></li>
 <li><a href="https://issues.apache.org/jira/browse/JSPWIKI" class="external">Issues</a></li>
-<li><a href="http://www.jspwiki.org" class="external">Main Wiki</a></li>
+<li><a href="http://www.jspwiki.org" class="external">Legacy Site</a></li>
 <li><a href="http://sandbox.jspwiki.org" class="external">Sandbox Wiki</a></li>
 <li><a href="/jspwiki/community/people.html">People</a></li>
 </ul>

Modified: websites/staging/jspwiki/trunk/content/jspwiki/ppmc/how_to_release.html
==============================================================================
--- websites/staging/jspwiki/trunk/content/jspwiki/ppmc/how_to_release.html (original)
+++ websites/staging/jspwiki/trunk/content/jspwiki/ppmc/how_to_release.html Sat Oct 13 07:59:07
2012
@@ -367,7 +367,7 @@ jspwiki-user@incubator.apache.org, jspwi
 <ul>
 <li><a href="/jspwiki/index.html">Home</a></li>
 <li><a href="/jspwiki/general/downloads.html">Downloads</a></li>
-<li><a href="/jspwiki/general/history.html">History</a></li>
+<li><a href="/jspwiki/general/news.html">News</a></li>
 <li><a href="http://www.apache.org/licenses/" class="external">License</a></li>
 </ul>
 <p><strong>Documentation</strong></p>
@@ -380,7 +380,7 @@ jspwiki-user@incubator.apache.org, jspwi
 <li><a href="/jspwiki/community/get_involved.html">Get Involved</a></li>
 <li><a href="/jspwiki/community/mailing_lists.html">Mailing Lists</a></li>
 <li><a href="https://issues.apache.org/jira/browse/JSPWIKI" class="external">Issues</a></li>
-<li><a href="http://www.jspwiki.org" class="external">Main Wiki</a></li>
+<li><a href="http://www.jspwiki.org" class="external">Legacy Site</a></li>
 <li><a href="http://sandbox.jspwiki.org" class="external">Sandbox Wiki</a></li>
 <li><a href="/jspwiki/community/people.html">People</a></li>
 </ul>

Modified: websites/staging/jspwiki/trunk/content/jspwiki/ppmc/incubator_reports.html
==============================================================================
--- websites/staging/jspwiki/trunk/content/jspwiki/ppmc/incubator_reports.html (original)
+++ websites/staging/jspwiki/trunk/content/jspwiki/ppmc/incubator_reports.html Sat Oct 13
07:59:07 2012
@@ -101,7 +101,7 @@ class="external">http://svn.apache.org/r
 <ul>
 <li><a href="/jspwiki/index.html">Home</a></li>
 <li><a href="/jspwiki/general/downloads.html">Downloads</a></li>
-<li><a href="/jspwiki/general/history.html">History</a></li>
+<li><a href="/jspwiki/general/news.html">News</a></li>
 <li><a href="http://www.apache.org/licenses/" class="external">License</a></li>
 </ul>
 <p><strong>Documentation</strong></p>
@@ -114,7 +114,7 @@ class="external">http://svn.apache.org/r
 <li><a href="/jspwiki/community/get_involved.html">Get Involved</a></li>
 <li><a href="/jspwiki/community/mailing_lists.html">Mailing Lists</a></li>
 <li><a href="https://issues.apache.org/jira/browse/JSPWIKI" class="external">Issues</a></li>
-<li><a href="http://www.jspwiki.org" class="external">Main Wiki</a></li>
+<li><a href="http://www.jspwiki.org" class="external">Legacy Site</a></li>
 <li><a href="http://sandbox.jspwiki.org" class="external">Sandbox Wiki</a></li>
 <li><a href="/jspwiki/community/people.html">People</a></li>
 </ul>

Modified: websites/staging/jspwiki/trunk/content/jspwiki/sitemap.html
==============================================================================
--- websites/staging/jspwiki/trunk/content/jspwiki/sitemap.html (original)
+++ websites/staging/jspwiki/trunk/content/jspwiki/sitemap.html Sat Oct 13 07:59:07 2012
@@ -98,7 +98,7 @@
 <ul>
 <li><a href="/jspwiki/index.html">Home</a></li>
 <li><a href="/jspwiki/general/downloads.html">Downloads</a></li>
-<li><a href="/jspwiki/general/history.html">History</a></li>
+<li><a href="/jspwiki/general/news.html">News</a></li>
 <li><a href="http://www.apache.org/licenses/" class="external">License</a></li>
 </ul>
 <p><strong>Documentation</strong></p>
@@ -111,7 +111,7 @@
 <li><a href="/jspwiki/community/get_involved.html">Get Involved</a></li>
 <li><a href="/jspwiki/community/mailing_lists.html">Mailing Lists</a></li>
 <li><a href="https://issues.apache.org/jira/browse/JSPWIKI" class="external">Issues</a></li>
-<li><a href="http://www.jspwiki.org" class="external">Main Wiki</a></li>
+<li><a href="http://www.jspwiki.org" class="external">Legacy Site</a></li>
 <li><a href="http://sandbox.jspwiki.org" class="external">Sandbox Wiki</a></li>
 <li><a href="/jspwiki/community/people.html">People</a></li>
 </ul>



Mime
View raw message