svn commit: r801516 - in /websites/production/ooo-site: ./ content/contributing/index.html content/projects/incubator.html

[ks...@apache.org]

Author: kschenk
Date: Mon Jan  2 23:49:33 2012
New Revision: 801516

Log:
Publishing merge to ooo-site site by kschenk

Modified:
    websites/production/ooo-site/   (props changed)
    websites/production/ooo-site/content/contributing/index.html
    websites/production/ooo-site/content/projects/incubator.html

Propchange: websites/production/ooo-site/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan  2 23:49:33 2012
@@ -1 +1 @@
-/websites/staging/ooo-site/trunk:797592-801503
+/websites/staging/ooo-site/trunk:797592-801515

Modified: websites/production/ooo-site/content/contributing/index.html
==============================================================================
--- websites/production/ooo-site/content/contributing/index.html (original)
+++ websites/production/ooo-site/content/contributing/index.html Mon Jan  2 23:49:33 2012
@@ -86,7 +86,7 @@
     <td style="vertical-align:middle"><a href="native-lang.html"><strong>Language Communities </strong></a></td>
   </tr>
   </table>
-  <p>Before submitting your work, please read the '<a href="//dev_docs/guidelines.html">Guidelines for Participate in OpenOffice.org</a>'. It will enumerate to you how contributions will be used, and how the OpenOffice.org community organises its collaboration.</p>
+  <p>Before submitting your work, please read the '<a href="/dev_docs/guidelines.html">Guidelines for Participate in OpenOffice.org</a>'. It will enumerate to you how contributions will be used, and how the OpenOffice.org community organises its collaboration.</p>
   <p><!-- 
 Public Documentation License Notice
 

Modified: websites/production/ooo-site/content/projects/incubator.html
==============================================================================
--- websites/production/ooo-site/content/projects/incubator.html (original)
+++ websites/production/ooo-site/content/projects/incubator.html Mon Jan  2 23:49:33 2012
@@ -52,7 +52,7 @@
     <p><strong>Categories:</strong> <a href="accepted.html">Focus Areas</a>, <a href="incubator.html">Incubator Areas</a>, <a href="native-lang.html">Native-Lang Confederation</a></p>
     
     <h1>Incubator Areas of OpenOffice.org</h1>
-    <p><strong>Incubator Contact: <a href="mailto:louis@openoffice.org">Louis Suárez-Potts</a></strong></p>
+    <p><strong>Incubator Contact: <a href="mailto:louis@apache.org">Louis Suárez-Potts</a></strong></p>
     <p>The Incubator category exists to provide a space for community members to test ideas. These ideas can be coding or not. Any member of Apache OpenOfficeis entitled to propose a new Incubator area. All you need is the evident support of the community. 
     If you would like to propose a new Incubator project, please <a href="mailto: ooo-dev-subscribe@incubator.apache.org">subscribe to the Apache OpenOffice Development List</a>. </p>
     <table border="0" cellpadding="2">