incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j...@apache.org
Subject svn commit: r792158 - in /websites/production/openofficeorg: ./ content/openofficeorg/docs/edit-cms.html
Date Mon, 04 Jul 2011 14:20:38 GMT
Author: joes
Date: Mon Jul  4 14:20:38 2011
New Revision: 792158

Log:
Publishing merge to openofficeorg site by joes

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

Propchange: websites/production/openofficeorg/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jul  4 14:20:38 2011
@@ -1 +1 @@
-/websites/staging/openofficeorg/trunk:791146-792154
+/websites/staging/openofficeorg/trunk:791146-792157

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 Jul  4
14:20:38 2011
@@ -85,13 +85,14 @@ there are potentially four different ver
 <ol>
 <li>You check out the latest version of the web page's source.</li>
 <li>You edit the page source using <a href="http://daringfireball.net/projects/markdown/syntax">Markdown
text syntax</a> (mdtext).</li>
-<li>You commit the source into the repository.  You will see the SVN commit mail with
-    your log message</li>
+<li>You commit the source into the repository.  (You will see the SVN commit mail with
+    your log message.)</li>
 <li>The commit automatically triggers a build that converts the markdown files 
-into HTML files in the staging directory.  You will see a commit mail with "Staging update
by buildbot" as log message).</li>
+    into HTML files in the staging directory.  (You will see a commit mail with "Staging
+    update by buildbot" as log message.)</li>
 <li>You verify that the staged webpage is correct and then tell the CMS to publish

-the changes to the production directory.  (You will see a commit mail with "Publishing merge
to openofficeorg site by <your Apache ID>"
-    as log message.)</li>
+    the changes to the production directory.  (You will see a commit mail with "Publishing
+    merge to openofficeorg site by <your Apache ID>" as log message.)</li>
 </ol>
 <p>The intent of this workflow is to allow committers flexibility in changing 
 webpages and testing changes on a staging website, before moving these changes to



Mime
View raw message