Author: curcuru
Date: Fri May 18 16:22:25 2012
New Revision: 1340153
URL: http://svn.apache.org/viewvc?rev=1340153&view=rev
Log:
Tweak for clarifications especially for non-committers
Modified:
incubator/ooo/site/trunk/content/openofficeorg/website-local.mdtext
Modified: incubator/ooo/site/trunk/content/openofficeorg/website-local.mdtext
URL:
http://svn.apache.org/viewvc/incubator/ooo/site/trunk/content/openofficeorg/website-local.mdtext?rev=1340153&r1=1340152&r2=1340153&view=diff
==============================================================================
--- incubator/ooo/site/trunk/content/openofficeorg/website-local.mdtext
(original)
+++ incubator/ooo/site/trunk/content/openofficeorg/website-local.mdtext Fri May
18 16:22:25 2012
@@ -16,33 +16,39 @@ Notice: Licensed to the Apache Softwa
specific language governing permissions and limitations
under the License.
+Making updates to the Apache OpenOffice project's websites is simple. It's
even easy
+for non-committers (new contributors - like you) to create a patch to request
that
+pages are updated by the project community.
+
+[TOC]
+
## Two Websites
The Apache OpenOffice project maintains two websites:
-* The [project website](http://incubator.apache.org/openofficeorg/) (from
which you are viewing this page)
-* The user portal, [www.openoffice.org](http://www.openoffice.org)
+* The [project website](http://incubator.apache.org/openofficeorg/), primarily
for development and technical information (which you're viewing now)
+* The user portal, [www.openoffice.org](http://www.openoffice.org), primarily
for end user information and support
-Both of these sites use the [Apache Content Management
System](http://www.apache.org/dev/cms.html) (CMS).
+Both of these sites use the [Apache Content Management
System](http://www.apache.org/dev/cms.html) (CMS) to manage editing, submitting
changes, and updating the live websites.
In essence, regardless of how you make changes to either web area, the changes
first go
-the staging sites for these areas, respectively --
+the staging sites for these areas, respectively (below), and then are copied
to the production websites.
* The [project staging site](http://openofficeorg.staging.apache.org/)
* The [user portal staging site](http://ooo-site.staging.apache.org/)
-Additionally, the project website uses
[Markdown](http://daringfireball.net/projects/markdown/) for page contents.
+Additionally, the project website uses
[Markdown](http://daringfireball.net/projects/markdown/) syntax for page
contents.
The "legacy" OpenOffice.org site uses html.
## Version Control
We use [Apache Subversion][1] for version control. You can [browse the project
-repository][2] or [browse the user portal repository][9] in your web browser.
+repository][2] or [browse the user portal repository][9] source files directly
in your web browser.
-## Making Changes to the Sites
+## How To Make or Request Changes to the Websites
-### Using SVN
+### Using SVN Directly (for technical users)
You can make changes to either site using svn (subversion). This typically
involves
doing an svn checkout, making changes to files and then either committing your
changes
if you are an "Apache committer", or submitting a "patch" (an svn "diff" file)
if you are a contributor but
@@ -53,15 +59,15 @@ patches. (See also, the [SVN Book](http:
SVN commits will commit your changes to the "staging area". you will need to
"publish" your changes to make them active on the "production" site.
-### Using the Apache CMS Bookmarklet
+### Using the Apache CMS Bookmarklet (simpler method)
Quick editing of the site is available for committers and contributors using
the Apache CMS
-[from your browser.][6] If you are a commtter and use the bookmarklet, you
should use
+[from your browser.][6] If you are a committer and use the bookmarklet in your
web browser, you should use
your Apache credentials to log in, make changes and submit them to staging.
-If you are a contributor, and not a committer, you can still use the
bookmarklet.
-See additional details in the [Apache CMS
Reference](http://www.apache.org/dev/cmsref.html#non-committer).
+If you are not a committer, you can still use the bookmarklet by signing in to
the bookmarklet as *anonymous*.
+See detailed how-to steps in the [Apache CMS
Reference](http://www.apache.org/dev/cmsref.html#non-committer) for
non-committers.
-## Publishing Changes
+## Publishing Changes to the Production Websites
### For Committers
As previously noted, changes you make, either through an svn commit or using
the CMS GUI tool,
@@ -83,9 +89,9 @@ section, you will likely be running **pu
If you are not a committer, you will need
to follow the procedures for "contributors" in the
[Developer
FAQ](http://incubator.apache.org/openofficeorg/developer-faqs.html#im_not_a_committer)
-for getting your changes published by a committer of the project.
+for getting your changes published by a committer of the project, after you
submit a patch.
-## Preparations for Complete Local Development
+## How To Do Website Development Locally (for technical users)
The following information provides instructions on doing website development
on your local computer.
These instructions assume you have setup a webserver in your local
environment. Details are
