incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j...@apache.org
Subject svn commit: r1142671 - /incubator/ooo/site/trunk/content/openofficeorg/docs/edit-cms.mdtext
Date Mon, 04 Jul 2011 14:01:28 GMT
Author: joes
Date: Mon Jul  4 14:01:28 2011
New Revision: 1142671

URL: http://svn.apache.org/viewvc?rev=1142671&view=rev
Log:
typo + deletion exposition

Modified:
    incubator/ooo/site/trunk/content/openofficeorg/docs/edit-cms.mdtext

Modified: incubator/ooo/site/trunk/content/openofficeorg/docs/edit-cms.mdtext
URL: http://svn.apache.org/viewvc/incubator/ooo/site/trunk/content/openofficeorg/docs/edit-cms.mdtext?rev=1142671&r1=1142670&r2=1142671&view=diff
==============================================================================
--- incubator/ooo/site/trunk/content/openofficeorg/docs/edit-cms.mdtext (original)
+++ incubator/ooo/site/trunk/content/openofficeorg/docs/edit-cms.mdtext Mon Jul  4 14:01:28
2011
@@ -38,7 +38,7 @@ The general flow for updating the websit
  1. You commit the source into the repository.  You will see the SVN commit mail with
     your log message
  1. 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).
+into HTML files in the staging directory.  You will see a commit mail with "Staging update
by buildbot" as log message).
  1. 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.)
@@ -99,7 +99,7 @@ Now you should see a new webpage with fo
  1. Below the editor you can enter a log message.
  1. Enter a general header text, e.g., the license of the entered text.
 
-When you have finished writing your text, check the "Log message" box, enter a
+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.
 
@@ -138,7 +138,12 @@ When in the correct directory, at the to
 ### Delete a webpage or subdirectory
 
 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].
+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.
 
 
 ## Links



Mime
View raw message