Author: buildbot
Date: Sun Sep 7 20:56:59 2014
New Revision: 921550
Log:
Staging update by buildbot for openoffice
Modified:
websites/staging/openoffice/trunk/content/ (props changed)
websites/staging/openoffice/trunk/content/website-local.html
Propchange: websites/staging/openoffice/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Sun Sep 7 20:56:59 2014
@@ -1 +1 @@
-1623226
+1623228
Modified: websites/staging/openoffice/trunk/content/website-local.html
==============================================================================
--- websites/staging/openoffice/trunk/content/website-local.html (original)
+++ websites/staging/openoffice/trunk/content/website-local.html Sun Sep 7
20:56:59 2014
@@ -155,8 +155,11 @@ pages are updated by the project communi
<h2 id="two-websites">Two Websites</h2>
<p>The Apache OpenOffice project maintains two websites:</p>
<ul>
-<li>The <a href="http://openoffice.apache.org/";>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>
+<li>The <a href="http://openoffice.apache.org/";>project website</a>, primarily
for development and technical information (which you're viewing now).
+ All content for this website uses <a
href="http://daringfireball.net/projects/markdown/";>Markdown</a> syntax
(.mdtext files).</li>
+<li>The user portal, <a
href="http://www.openoffice.org";>www.openoffice.org</a>, primarily for end user
information and support.
+ Content for the user portal primarily uses html, but some content is in
+ [Markdown] (http://daringfireball.net/projects/markdown/) syntax (.mdtext
files).</li>
</ul>
<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
@@ -165,8 +168,6 @@ the staging sites for these areas, respe
<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> 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="https://svn.apache.org/repos/asf/openoffice/site/trunk/";>browse the
project
repository</a> or <a
href="https://svn.apache.org/repos/asf/openoffice/ooo-site/trunk/";>browse the
user portal repository</a> source files directly in your web browser.</p>
