You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by ju...@apache.org on 2013/08/10 17:22:17 UTC

svn commit: r1512765 - in /jspwiki/trunk/jspwiki-site/src/site/trunk: content/jspwiki/community/ content/jspwiki/images/ content/jspwiki/ppmc/ templates/

Author: juanpablo
Date: Sat Aug 10 15:22:17 2013
New Revision: 1512765

URL: http://svn.apache.org/r1512765
Log:
Reflecting latest direct commmits to website's production URL (r874000 and r874007)

Added:
    jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/images/apache_software_foundation_logo.gif   (with props)
Modified:
    jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/community/people.mdtext
    jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/ppmc/incubator_reports.mdtext
    jspwiki/trunk/jspwiki-site/src/site/trunk/templates/sidenav.mdtext
    jspwiki/trunk/jspwiki-site/src/site/trunk/templates/skeleton.html

Modified: jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/community/people.mdtext
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/community/people.mdtext?rev=1512765&r1=1512764&r2=1512765&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/community/people.mdtext (original)
+++ jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/community/people.mdtext Sat Aug 10 15:22:17 2013
@@ -4,31 +4,28 @@ Title: People
 
 The current JSPWiki committer list:
 
+  * Murray Altheims
   * Dirk Frederickx
   * Florian Holeczek
   * Janne Jalkanen
   * Andrew Jaquith
   * <a href="http://www.jroller.com/gmazza/">Glen Mazza</a>
   * Harry Metske
+  * Craig Russell
   * Juan Pablo Santos
   * Christoph Sauer
   
-As esteemed mentors we have:
-
-  * Sam Ruby
-  * Craig Russell
-  * Siegfried Goeschl
   
 And, of course, all the fine people of the jspwiki-dev [mailing list]!
 
-## PPMC
+## PMC
 
-The Podling Project Management Committee consists of 
+The Project Management Committee consists of 
 
+  * Murray Altheims
   * Dirk Frederickx
   * Florian Holeczek
   * Andrew Jaquith
-  * Janne Jalkanen
   * Glen Mazza
   * Harry Metske
   * Craig Russell

Added: jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/images/apache_software_foundation_logo.gif
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/images/apache_software_foundation_logo.gif?rev=1512765&view=auto
==============================================================================
Binary file - no diff available.

Propchange: jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/images/apache_software_foundation_logo.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/ppmc/incubator_reports.mdtext
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/ppmc/incubator_reports.mdtext?rev=1512765&r1=1512764&r2=1512765&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/ppmc/incubator_reports.mdtext (original)
+++ jspwiki/trunk/jspwiki-site/src/site/trunk/content/jspwiki/ppmc/incubator_reports.mdtext Sat Aug 10 15:22:17 2013
@@ -1,4 +1,4 @@
-Title: Incubator reports
+Title: Board reports
 
-  * See <a href="http://svn.apache.org/repos/asf/incubator/jspwiki/board/" 
-class="external">http://svn.apache.org/repos/asf/incubator/jspwiki/board/</a>.
\ No newline at end of file
+  * See <a href="http://svn.apache.org/repos/asf/jspwiki/board/" 
+class="external">http://svn.apache.org/repos/asf/jspwiki/board/</a>.
\ No newline at end of file

Modified: jspwiki/trunk/jspwiki-site/src/site/trunk/templates/sidenav.mdtext
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-site/src/site/trunk/templates/sidenav.mdtext?rev=1512765&r1=1512764&r2=1512765&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-site/src/site/trunk/templates/sidenav.mdtext (original)
+++ jspwiki/trunk/jspwiki-site/src/site/trunk/templates/sidenav.mdtext Sat Aug 10 15:22:17 2013
@@ -28,10 +28,10 @@
   * [Edit Website](/jspwiki/development/edit_website.html)
   * <a href="http://svn.apache.org/viewvc/jspwiki/trunk/ChangeLog?view=co" class="external">Change Log</a>
 
-**PPMC**
+**PMC**
 
   * [How to Release](/jspwiki/ppmc/how_to_release.html)
-  * [Incubator Reports](/jspwiki/ppmc/incubator_reports.html)
+  * [Board Reports](/jspwiki/ppmc/incubator_reports.html)
 
 **ASF**
 

Modified: jspwiki/trunk/jspwiki-site/src/site/trunk/templates/skeleton.html
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-site/src/site/trunk/templates/skeleton.html?rev=1512765&r1=1512764&r2=1512765&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-site/src/site/trunk/templates/skeleton.html (original)
+++ jspwiki/trunk/jspwiki-site/src/site/trunk/templates/skeleton.html Sat Aug 10 15:22:17 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>
@@ -109,7 +109,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>