Author: buildbot
Date: Wed Nov 14 18:45:45 2012
New Revision: 838347
Log:
Staging update by buildbot for openofficeorg
Modified:
websites/staging/openofficeorg/trunk/content/ (props changed)
websites/staging/openofficeorg/trunk/content/openofficeorg/developer-faqs.html
websites/staging/openofficeorg/trunk/content/openofficeorg/docs/edit-cms.html
websites/staging/openofficeorg/trunk/content/openofficeorg/security.html
websites/staging/openofficeorg/trunk/content/openofficeorg/terms.html
Propchange: websites/staging/openofficeorg/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Wed Nov 14 18:45:45 2012
@@ -1 +1 @@
-1409253
+1409294
Modified:
websites/staging/openofficeorg/trunk/content/openofficeorg/developer-faqs.html
==============================================================================
---
websites/staging/openofficeorg/trunk/content/openofficeorg/developer-faqs.html
(original)
+++
websites/staging/openofficeorg/trunk/content/openofficeorg/developer-faqs.html
Wed Nov 14 18:45:45 2012
@@ -107,7 +107,7 @@
<li><a href="#where_can_i_download_developer_builds">Where can I download
developer builds?</a></li>
</ul>
<h2 id="wzxhzdk0how-do-i-edit-the-websiteswzxhzdk1"><a
name="how_do_i_edit_the_websites">How do I edit the websites?</a></h2>
-<p>The pages on this, the Apache OpenOffice.org "project", website are written
in <a
href="http://www.simpleeditions.com/59001/markdown-an-introduction";>markdown
syntax</a> and stored in SVN at
+<p>The pages on this, the Apache OpenOffice "project", website are written in
<a href="http://www.simpleeditions.com/59001/markdown-an-introduction";>markdown
syntax</a> and stored in SVN at
<a
href="https://svn.apache.org/repos/asf/incubator/ooo/site";>https://svn.apache.org/repos/asf/incubator/ooo/site</a>.</p>
<p>The migrated www.openoffice.org is stored in SVN at <a
href="https://svn.apache.org/repos/asf/incubator/ooo/ooo-site";>https://svn.apache.org/repos/asf/incubator/ooo/ooo-site</a>
and is primarily "html".</p>
<p>Via integration with the <a
href="http://www.apache.org/dev/cms.html";>Apache CMS</a>, it is possible to
edit, stage and publish
Modified:
websites/staging/openofficeorg/trunk/content/openofficeorg/docs/edit-cms.html
==============================================================================
---
websites/staging/openofficeorg/trunk/content/openofficeorg/docs/edit-cms.html
(original)
+++
websites/staging/openofficeorg/trunk/content/openofficeorg/docs/edit-cms.html
Wed Nov 14 18:45:45 2012
@@ -97,7 +97,7 @@
<div id="contenta">
<h1 class="title">How to edit the OpenOffice.org website</h1>
- <p>This documentation shows how to edit the Apache OpenOffice.org
+ <p>This documentation shows how to edit the Apache OpenOffice
website. This includes creation of new pages, modification, and deletion - for
files
and sub-directories.</p>
<h2 id="how-it-works-in-general">How it works in general</h2>
Modified:
websites/staging/openofficeorg/trunk/content/openofficeorg/security.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/security.html
(original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/security.html
Wed Nov 14 18:45:45 2012
@@ -97,12 +97,12 @@
<div id="contenta">
<h1 class="title">Security Reports</h1>
- <h2
id="reporting-new-security-problems-with-apache-openofficeorg">Reporting New
Security Problems with Apache OpenOffice.org</h2>
-<p>The Apache Software Foundation takes a very active stance in eliminating
security problems with Apache OpenOffice.org</p>
+ <h2 id="reporting-new-security-problems-with-apache-openoffice">Reporting
New Security Problems with Apache OpenOffice</h2>
+<p>The Apache Software Foundation takes a very active stance in eliminating
security problems with Apache OpenOffice</p>
<p>We strongly encourage folks to report such problems to our private security
mailing list first, before disclosing them in a public forum.</p>
-<p><strong>Please note that the security mailing list should only be used for
reporting undisclosed security vulnerabilities in Apache OpenOffice.org and
managing
+<p><strong>Please note that the security mailing list should only be used for
reporting undisclosed security vulnerabilities in Apache OpenOffice and
managing
the process of fixing such vulnerabilities. We cannot accept regular bug
reports or other queries at this address. All mail sent to this address that
-does not relate to an undisclosed security problem in Apache OpenOffice.org
will be ignored.</strong></p>
+does not relate to an undisclosed security problem in Apache OpenOffice will
be ignored.</strong></p>
<p>If you need to report a bug that isn't an undisclosed security
vulnerability, please use the bug reporting page.</p>
<p>Questions about:</p>
<ul>
@@ -121,7 +121,7 @@ it may take us a little longer to respon
<li>Rob Weir 5071 929F 6E89 24DB 3BE6 4B07 6140 A187 47CC BCC7 - <a
href="http://pgp.mit.edu:11371/pks/lookup?search=0x47CCBCC7&op=vindex&fingerprint=on";>pgp.mit.edu</a></li>
<li>Juergen Schmidt D09F B15F 1A24 768D DF1F A29C CFEE F316 51B5 FDE8 - <a
href="http://pgp.mit.edu:11371/pks/lookup?search=0x51B5FDE8&op=index&fingerprint=on";>pgp.mit.edu</a></li>
</ul>
-<p>Also note that security bulletins of the pre-Apache OpenOffice.org project
are archived <a href="http://www.openoffice.org/security/bulletin.html";>at that
site</a>.</p>
+<p>Also note that security bulletins of the pre-Apache OpenOffice project are
archived <a href="http://www.openoffice.org/security/bulletin.html";>at that
site</a>.</p>
</div>
<div id="footera">
Modified: websites/staging/openofficeorg/trunk/content/openofficeorg/terms.html
==============================================================================
--- websites/staging/openofficeorg/trunk/content/openofficeorg/terms.html
(original)
+++ websites/staging/openofficeorg/trunk/content/openofficeorg/terms.html Wed
Nov 14 18:45:45 2012
@@ -140,7 +140,7 @@
<p>In legalese: You hereby grant to the Host and all Users a royalty-free,
perpetual, irrevocable, worldwide, non-exclusive and fully sub-licensable right
and license under Your intellectual property rights to reproduce, modify,
adapt, publish, translate, create derivative works from, distribute, perform,
display and use Your Submissions (in whole or part) and to incorporate them in
other works in any form, media, or technology now known or later developed, all
subject to the obligation to retain any copyright notices included in Your
Submissions. All Users, the Host, and their sublicensees are responsible for
any modifications they make to the Submissions of others.</p>
<p>d. Private Projects. With respect to a Project that is designated as
"Private," the preceding license for "Other Submissions" is limited to Users
who have access to the Project, and such rights may only be sublicensed to
other Users with authorized access to the Project.</p>
<p>e. Other Licenses/Terms. Some Projects are governed by their own terms
regarding Submissions and may require You to sign agreements (such as an Apache
Software Foundation Individual Contributor License Agreement) licensing Your
rights in Your Submissions. In all such cases, and to the extent there is a
conflict, the terms of those Projects and agreements take precedence over these
Terms.</p>
-<p>f. Privacy. You consent to the collection, processing and storage by the
Host of any personal information provided by You in accordance with the terms
of AOO-PMC Privacy Policy, which is available at <a
href="http://openoffice.apache.org/privacy.html";>http://openoffice.apache.org/privacy.html</a>.
You agree to comply with all applicable laws and regulations, and the terms of
Apache OpenOffice.org Privacy Policy, with respect to any use by You of any
personal information in connection with this Site.</p>
+<p>f. Privacy. You consent to the collection, processing and storage by the
Host of any personal information provided by You in accordance with the terms
of AOO-PMC Privacy Policy, which is available at <a
href="http://openoffice.apache.org/privacy.html";>http://openoffice.apache.org/privacy.html</a>.
You agree to comply with all applicable laws and regulations, and the terms of
Apache OpenOffice Privacy Policy, with respect to any use by You of any
personal information in connection with this Site.</p>
</li>
<li>
<p>MISCELLANEOUS.</p>
