Author: buildbot
Date: Fri May 18 16:22:29 2012
New Revision: 818194

Log:
Staging update by buildbot for openofficeorg

Modified:
    websites/staging/openofficeorg/trunk/content/   (props changed)
    
websites/staging/openofficeorg/trunk/content/openofficeorg/website-local.html

Propchange: websites/staging/openofficeorg/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Fri May 18 16:22:29 2012
@@ -1 +1 @@
-1340103
+1340153

Modified: 
websites/staging/openofficeorg/trunk/content/openofficeorg/website-local.html
==============================================================================
--- 
websites/staging/openofficeorg/trunk/content/openofficeorg/website-local.html 
(original)
+++ 
websites/staging/openofficeorg/trunk/content/openofficeorg/website-local.html 
Fri May 18 16:22:29 2012
@@ -95,26 +95,79 @@
   <div id="contenta">
   
     <h1 class="title">Website Development</h1>
-    <h2 id="two-websites">Two Websites</h2>
+    <p>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.</p>
+<div class="toc">
+<ul>
+<li><a href="#two-websites">Two Websites</a></li>
+<li><a href="#version-control">Version Control</a></li>
+<li><a href="#how-to-make-or-request-changes-to-the-websites">How To Make or 
Request Changes to the Websites</a><ul>
+<li><a href="#using-svn-directly-for-technical-users">Using SVN Directly (for 
technical users)</a></li>
+<li><a href="#using-the-apache-cms-bookmarklet-simpler-method">Using the 
Apache CMS Bookmarklet (simpler method)</a></li>
+</ul>
+</li>
+<li><a href="#publishing-changes-to-the-production-websites">Publishing 
Changes to the Production Websites</a><ul>
+<li><a href="#for-committers">For Committers</a></li>
+<li><a href="#for-contributors-non-committers">For Contributors -- 
non-committers</a></li>
+</ul>
+</li>
+<li><a href="#how-to-do-website-development-locally-for-technical-users">How 
To Do Website Development Locally (for technical users)</a><ul>
+<li><a href="#setup">Setup</a><ul>
+<li><a 
href="#create-a-directory-on-your-computer-for-the-apache-cms-work-with-both-the-podlings">Create
 a directory on your computer for the Apache CMS work with both the 
podling's</a></li>
+<li><a href="#download-the-svn-repos-for-the-aooo-site">Download the svn repos 
for the AOOo site.</a></li>
+<li><a 
href="#download-the-svn-repos-for-the-migrated-openofficeorg-website">Download 
the svn repos for the migrated OpenOffice.org website.</a></li>
+<li><a href="#download-the-svn-repos-for-the-apache-cms">Download the svn 
repos for the Apache CMS.</a></li>
+<li><a href="#install-python-dependencies">Install Python 
dependencies.</a></li>
+<li><a href="#check-your-version-of-python">Check your version of 
Python</a></li>
+<li><a href="#follow-the-installation-instructions-for-setuptools">Follow the 
installation instructions for setuptools.</a></li>
+<li><a href="#install-dependencies">Install dependencies</a></li>
+</ul>
+</li>
+<li><a href="#directory-layout">Directory Layout</a><ul>
+<li><a href="#content-directories">Content directories</a></li>
+<li><a href="#templates-directory">Templates directory</a></li>
+<li><a href="#lib-directory">Lib directory</a></li>
+<li><a href="#build-tools">Build tools</a></li>
+</ul>
+</li>
+<li><a href="#local-development">Local Development</a><ul>
+<li><a href="#edit-the-site">Edit the site</a></li>
+<li><a href="#python-markdown-daemon">Python Markdown Daemon</a></li>
+<li><a href="#build-the-sites">Build the sites.</a></li>
+<li><a href="#copy-the-site-to-your-computers-web-server">Copy the site to 
your computer's web server.</a></li>
+</ul>
+</li>
+<li><a href="#submitting-your-results">Submitting your results.</a><ul>
+<li><a href="#committer">Committer</a></li>
+<li><a href="#contributor">Contributor</a></li>
+</ul>
+</li>
+</ul>
+</li>
+<li><a href="#google-analytics">Google Analytics</a></li>
+</ul>
+</div>
+<h2 id="two-websites">Two Websites</h2>
 <p>The Apache OpenOffice project maintains two websites:</p>
 <ul>
-<li>The <a href="http://incubator.apache.org/openofficeorg/";>project 
website</a> (from which you are viewing this page)</li>
-<li>The user portal, <a 
href="http://www.openoffice.org";>www.openoffice.org</a></li>
+<li>The <a href="http://incubator.apache.org/openofficeorg/";>project 
website</a>, primarily for development and technical information (which you're 
viewing now)</li>
+<li>The user portal, <a 
href="http://www.openoffice.org";>www.openoffice.org</a>, primarily for end user 
information and support</li>
 </ul>
-<p>Both of these sites use the <a 
href="http://www.apache.org/dev/cms.html";>Apache Content Management System</a> 
(CMS).
+<p>Both of these sites use the <a 
href="http://www.apache.org/dev/cms.html";>Apache Content Management System</a> 
(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 --</p>
+the staging sites for these areas, respectively (below), and then are copied 
to the production websites.</p>
 <ul>
 <li>The <a href="http://openofficeorg.staging.apache.org/";>project staging 
site</a></li>
 <li>The <a href="http://ooo-site.staging.apache.org/";>user portal staging 
site</a></li>
 </ul>
-<p>Additionally, the project website uses <a 
href="http://daringfireball.net/projects/markdown/";>Markdown</a> for page 
contents. 
+<p>Additionally, the project website uses <a 
href="http://daringfireball.net/projects/markdown/";>Markdown</a> syntax for 
page contents. 
 The "legacy" OpenOffice.org site uses html.</p>
 <h2 id="version-control">Version Control</h2>
 <p>We use <a href="http://subversion.apache.org";>Apache Subversion</a> for 
version control. You can <a 
href="http://svn.apache.org/viewvc/incubator/ooo/site/trunk";>browse the project 
-repository</a> or <a 
href="https://svn.apache.org/repos/asf/incubator/ooo/ooo-site/trunk/";>browse 
the user portal repository</a> in your web browser.</p>
-<h2 id="making-changes-to-the-sites">Making Changes to the Sites</h2>
-<h3 id="using-svn">Using SVN</h3>
+repository</a> or <a 
href="https://svn.apache.org/repos/asf/incubator/ooo/ooo-site/trunk/";>browse 
the user portal repository</a> source files directly in your web browser.</p>
+<h2 id="how-to-make-or-request-changes-to-the-websites">How To Make or Request 
Changes to the Websites</h2>
+<h3 id="using-svn-directly-for-technical-users">Using SVN Directly (for 
technical users)</h3>
 <p>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
@@ -123,13 +176,13 @@ patches. (See also, the <a href="http://
 <a href="mailto:[email protected]";>Apache OpenOffice developer</a> 
list.</p>
 <p>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.</p>
-<h3 id="using-the-apache-cms-bookmarklet">Using the Apache CMS Bookmarklet</h3>
+<h3 id="using-the-apache-cms-bookmarklet-simpler-method">Using the Apache CMS 
Bookmarklet (simpler method)</h3>
 <p>Quick editing of the site is available for committers and contributors 
using the Apache CMS
-<a href="https://cms.apache.org/#bookmark";>from your browser.</a> If you are a 
commtter and use the bookmarklet, you should use
+<a href="https://cms.apache.org/#bookmark";>from your browser.</a> 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 <a 
href="http://www.apache.org/dev/cmsref.html#non-committer";>Apache CMS 
Reference</a>.</p>
-<h2 id="publishing-changes">Publishing Changes</h2>
+If you are not a committer, you can still use the bookmarklet by signing in to 
the bookmarklet as <em>anonymous</em>.
+See detailed how-to steps in the <a 
href="http://www.apache.org/dev/cmsref.html#non-committer";>Apache CMS 
Reference</a> for non-committers.</p>
+<h2 id="publishing-changes-to-the-production-websites">Publishing Changes to 
the Production Websites</h2>
 <h3 id="for-committers">For Committers</h3>
 <p>As previously noted, changes you make, either through an svn commit or 
using the CMS GUI tool, 
 are enacted on the staging sites. Once you review your changes on the staging 
site,
@@ -149,8 +202,8 @@ section, you will likely be running <str
 <p>If you are not a committer, you will need
 to follow the procedures for "contributors" in the
 <a 
href="http://incubator.apache.org/openofficeorg/developer-faqs.html#im_not_a_committer";>Developer
 FAQ</a>
-for getting your changes published by a committer of the project.</p>
-<h2 id="preparations-for-complete-local-development">Preparations for Complete 
Local Development</h2>
+for getting your changes published by a committer of the project, after you 
submit a patch.</p>
+<h2 id="how-to-do-website-development-locally-for-technical-users">How To Do 
Website Development Locally (for technical users)</h2>
 <p>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
 provided on setting up the resources needed to process "Markdown" on your 
local server


Reply via email to