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 18:48:16 UTC

svn commit: r1137697 - /incubator/ooo/site/trunk/content/openofficeorg/docs/edit-cms.mdtext

Author: marcus
Date: Mon Jun 20 16:48:16 2011
New Revision: 1137697

URL: http://svn.apache.org/viewvc?rev=1137697&view=rev
Log:
More content

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=1137697&r1=1137696&r2=1137697&view=diff
==============================================================================
--- incubator/ooo/site/trunk/content/openofficeorg/docs/edit-cms.mdtext (original)
+++ incubator/ooo/site/trunk/content/openofficeorg/docs/edit-cms.mdtext Mon Jun 20 16:48:16 2011
@@ -19,8 +19,8 @@ Notice:    Licensed to the Apache Softwa
 # How to edit the OpenOffice.org webpages
 
 This HowTo documentation will show the needed steps to edit the OpenOffice.org
-website. This includes (creation of new pages, modification, and deletion for files
-and sub-directories).
+website. This includes creation of new pages, modification, and deletion - for files
+and sub-directories.
 
 ## How it works in general
 
@@ -28,22 +28,35 @@ The website is hosted in a Content Manag
 HTML pages directly. The actual edit is splittup in 2 parts:
 
  1. First you edit the content which is provided as [Markdown text][3] (mdtext).
-    This will be committed into the staging section and automatically build HTML
-    files out of the the mdtext files.
-
- 2. Second you need to publish the staging part to the production section.
+    This will be committed into the staging section (see the SVN commit mail with
+    your log message) and automatically build HTML files out of the the mdtext files
+    (see the commit mail with "Staging update by buildbot" as log messge).
+
+ 2. Second you need to publish the staging part to the production section (see the
+    commit mail with "Publishing merge to openofficeorg site by <your ID>" as log
+    message).
 
 ## What do you prefer: Working via commandline or in the browser?
 
 ### Via commandline
 
-coming soon
+It is assumed that you have alsready checked out the code from the SVN repository
+(https://svn.apache.org/repos/asf/incubator/ooo).
+
+- edit the file via your favorite editor like vi
+- SVN ci -m"My log message" myfile.mdtext
+- execute "http://s.apache.org/cms-cli"
+
+  If this does not work on your local machine just login to people.apache.org and
+  try from here.
+
+More text coming soon
 
 ### Editing in the browser
 
 #### Prerequisites
 
-##### Link as browser bookmark
+##### Browser bookmark
 
 Normally you see the webpage in your browser. To update this page with an
 inline-editor and little preview you need to add a link as bookmark to your browser
@@ -55,22 +68,48 @@ inline-editor and little preview you nee
 
 Furthermore, you need an Apache ID to authenticate to the system.
 
+#### Starting
+
+Browse to the respective webpage or directory you would like to edit and click on
+the bookmark. Now click on the [Edit this directory] link on the top. The following
+is displayed as content from the CMS.
+
 #### Edit an existing wepage
 
-coming soon
+Click on the actions link [Edit] in the appropriate table cell for editing the
+favorite file. If the file is not in this directory but in a subdir, just click on
+the directory name (e.g., "docs/") to enter this directory.
+
+Now you should see a new webpage with a 4 fields:
+
+ 1. Upper left is the inline editor for text in markdown syntax.
+ 2. Upper right shows the written text as a permanent preview or as HTML source code.
+ 3. Below the editor you can enter a log message.
+ 4. 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
+commit message and click on [Submit].
 
 #### Create a new webpage
 
-coming soon
+When in th correct directory, at the top enter a name for the new text file (e.g.,
+"my-file.mdtext"). Now you enter your text (see topic above).
 
-#### Delete a webpage
+#### Create new subdirectory
 
-coming soon
+When in the correct directory, at the top enter a name for the new directory (e.g.,
+"my-dir/"). Make sure you entered a trailing "/"!
 
-#### Create new subdirectory
+#### Delete a webpage or subdirectory
+
+When in the corrext directory, click on the actions link [Delete] in the appropriate
+table cell and enter a commit message. Finally click on [Submit].
+
+### Links
 
-coming soon
+[CMS Documentation Reference][20]
 
-  [1]: https://cms.apache.org/#bookmark
-  [2]: javascript:void(location.href='https://cms.apache.org/redirect?uri='+escape(location.href))
-  [3]: http://en.wikipedia.org/wiki/Markdown
+  [1]:  https://cms.apache.org/#bookmark
+  [2]:  javascript:void(location.href='https://cms.apache.org/redirect?uri='+escape(location.href))
+  [3]:  http://en.wikipedia.org/wiki/Markdown
+  [20]: http://www.apache.org/dev/cmsref.html#add-resource