You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ma...@apache.org on 2011/06/20 20:45:36 UTC

svn commit: r791302 - in /websites/production/openofficeorg: ./ content/openofficeorg/docs/edit-cms.html content/openofficeorg/people.html

Author: marcus
Date: Mon Jun 20 18:45:36 2011
New Revision: 791302

Log:
Publishing merge to openofficeorg site by marcus

Modified:
    websites/production/openofficeorg/   (props changed)
    websites/production/openofficeorg/content/openofficeorg/docs/edit-cms.html
    websites/production/openofficeorg/content/openofficeorg/people.html

Propchange: websites/production/openofficeorg/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 20 18:45:36 2011
@@ -1 +1 @@
-/websites/staging/openofficeorg/trunk:791146-791297
+/websites/staging/openofficeorg/trunk:791146-791301

Modified: websites/production/openofficeorg/content/openofficeorg/docs/edit-cms.html
==============================================================================
--- websites/production/openofficeorg/content/openofficeorg/docs/edit-cms.html (original)
+++ websites/production/openofficeorg/content/openofficeorg/docs/edit-cms.html Mon Jun 20 18:45:36 2011
@@ -141,7 +141,7 @@ table cell and enter a commit message. F
 modifications into production. For this please click on the link
 [Publish site] on the top of th webpage. Enter a commit message on click on [Submit].</p>
 <h3 id="links">Links</h3>
-<p>[CMS Documentation Reference][20]</p>
+<p><a href="http://www.apache.org/dev/cmsref.html">CMS Documentation Reference</a></p>
   </div>
 
   <div id="footer">

Modified: websites/production/openofficeorg/content/openofficeorg/people.html
==============================================================================
--- websites/production/openofficeorg/content/openofficeorg/people.html (original)
+++ websites/production/openofficeorg/content/openofficeorg/people.html Mon Jun 20 18:45:36 2011
@@ -67,6 +67,7 @@ to look at all contributors to our issue
 <li><a href="http://www.raphaelbircher.ch">Raphael Bircher</a></li>
 <li><a href="http://www.robweir.com/blog">Rob Weir</a></li>
 <li><a href="http://besbergmann.de/stephan">Stephan Bergmann</a></li>
+<li>David Fisher</li>
 </ul>
   </div>