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

[jo...@apache.org]

Author: joes
Date: Mon Jul  4 14:02:37 2011
New Revision: 792148

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:02:37 2011
@@ -1 +1 @@
-/websites/staging/openofficeorg/trunk:791146-792145
+/websites/staging/openofficeorg/trunk:791146-792147

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:02:37 2011
@@ -88,7 +88,7 @@ there are potentially four different ver
 <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 messge).</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>
@@ -139,7 +139,7 @@ the directory name (e.g., "docs/") to en
 <li>Below the editor you can enter a log message.</li>
 <li>Enter a general header text, e.g., the license of the entered text.</li>
 </ol>
-<p>When you have finished writing your text, check the "Log message" box, enter a
+<p>When you have finished writing your text, check the "Quick Commit" box, enter a
 commit message and click on [Submit].  This commits your changes to the Subversion 
 repository.</p>
 <h3 id="verifying_the_staged_web_site">Verifying the staged web site</h3>
@@ -166,7 +166,12 @@ live version of your changes.<br />
 "my-dir/"). Make sure you entered a trailing "/"!</p>
 <h3 id="delete_a_webpage_or_subdirectory">Delete a webpage or subdirectory</h3>
 <p>When in the correct directory, click on the actions link [Delete] in the appropriate
-table cell and enter a commit message. Finally click on [Submit].</p>
+table cell and enter a commit message. Finally click on [Submit].  Generally speaking
+it is always a good idea to use the CMS to delete files and directories over using
+the command-line svn interface, as the CMS will ensure everything gets deleted from
+the staging (and eventually production) repository on commit.  If you use the command-
+line interface instead, you will also need to manually delete the corresponding entities
+in the staging repository in order for those changes to propagate to the production site.</p>
 <h2 id="links">Links</h2>
 <p><a href="http://www.apache.org/dev/cmsref.html">CMS Documentation Reference</a></p>
   </div>