Author: buildbot
Date: Mon Nov  4 18:27:29 2013
New Revision: 885422

Log:
Staging update by buildbot for ooo-site

Modified:
    websites/staging/ooo-site/trunk/cgi-bin/   (props changed)
    websites/staging/ooo-site/trunk/content/   (props changed)
    websites/staging/ooo-site/trunk/content/de/doc/index.html
    websites/staging/ooo-site/trunk/content/development/releases/eol-nl.html
    
websites/staging/ooo-site/trunk/content/download/common/instructions_4.0.0.html
    websites/staging/ooo-site/trunk/content/stats/committers.txt

Propchange: websites/staging/ooo-site/trunk/cgi-bin/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Mon Nov  4 18:27:29 2013
@@ -1 +1 @@
-1538614
+1538704

Propchange: websites/staging/ooo-site/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Mon Nov  4 18:27:29 2013
@@ -1 +1 @@
-1538614
+1538704

Modified: websites/staging/ooo-site/trunk/content/de/doc/index.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/de/doc/index.html (original)
+++ websites/staging/ooo-site/trunk/content/de/doc/index.html Mon Nov  4 
18:27:29 2013
@@ -603,7 +603,7 @@
                                                                                
<span style="color: red; font-weight: bold">NEU:</span><br />
                                                                                
                                                                                
-                                                                               
<a href="http://openoffice-uni.org";>Einf&uuml;hrung f&uuml;r Studierende in die 
Techniken der Textverarbeitung</a>
+                                                                               
<a href="http://openoffice-uni.org";>Apache OpenOffice für die Uni</a>
                                                                                
                                                                        
                                                                        </div>
@@ -615,7 +615,7 @@
                                                                        
                                                                </td>
                                                                <td>
-                                                                       
10.04.2012
+                                                                       laufend 
aktualisiert
                                                                </td>
                                                                <td>
                                                                        ab 3.x

Modified: 
websites/staging/ooo-site/trunk/content/development/releases/eol-nl.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/development/releases/eol-nl.html 
(original)
+++ websites/staging/ooo-site/trunk/content/development/releases/eol-nl.html 
Mon Nov  4 18:27:29 2013
@@ -3,7 +3,7 @@
 <head>
 <link href="/css/ooo.css" rel="stylesheet" type="text/css">
 
-<title>End-of-Life for OpenOffice 3.3.0 and earlier</title>
+<title>Please upgrade to OpenOffice 4.0.1 - or help translate it into your 
language</title>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 
 
@@ -21,11 +21,11 @@
   
   <div id="content">
     
-    <h1 class="title">End-of-Life for OpenOffice 3.3.0 and earlier</h1>
+    <h1 class="title">Please upgrade to OpenOffice 4.0.1 - or help translate 
it into your language</h1>
     <p>With each new release of OpenOffice, users are strongly encouraged to 
upgrade, to benefit from new features, bug fixes and security improvements. 
After a new major release, 
-the Community supports legacy releases for a period of time to allow users to 
upgrade and migrate.  At a later time these legacy releases are declared to be 
-<a 
href="http://www.openoffice.org/development/releases/eol.html";>"End-of-Life"</a>
 and are no longer suported.</p>
-<p>We have detected that you are running an unsupported version of 
OpenOffice.org.  We recommend that you upgrade to the current version, 
+the OpenOffice Community supports legacy releases for a period of time to 
allow users to upgrade and migrate.  At a later time these legacy releases are 
declared to be 
+<a 
href="http://www.openoffice.org/development/releases/eol.html";>"End-of-Life"</a>
 and are no longer supported.</p>
+<p>We have detected that you are running an old, unsupported version of 
OpenOffice.org.  We recommend that you upgrade to the current version, 
 <a href="http://www.openoffice.org/download";>Apache OpenOffice 4.0.1</a>, 
which is available for download in <a 
href="http://www.openoffice.org/download/other.html";>many languages</a>.   </p>
 <p>If your preferred language is not yet available, the following options are 
available:</p>
 <ul>
@@ -36,7 +36,7 @@ the Community supports legacy releases f
 <li>(Not Recommended) Continue running an unsupported version of 
OpenOffice</li>
 </ul>
 <p>Apache OpenOffice relies on our community of volunteers to write code, 
test, support and translate OpenOffice.  We have many translations that are 
90%+ complete and require only
-a few days of volunteer effort to complete. If you can help, send an email to 
<a href="mailto:%[email protected]";>[email protected]</a> 
and tell us what language you can help with.</p>
+a few days of volunteer effort to complete. If you can help, send an email to 
<a href="mailto:%[email protected]";>[email protected]</a> 
and tell us what language you can help with.</p>
   </div>
 <!--#include virtual="/footer.html" -->
 </body>

Modified: 
websites/staging/ooo-site/trunk/content/download/common/instructions_4.0.0.html
==============================================================================
--- 
websites/staging/ooo-site/trunk/content/download/common/instructions_4.0.0.html 
(original)
+++ 
websites/staging/ooo-site/trunk/content/download/common/instructions_4.0.0.html 
Mon Nov  4 18:27:29 2013
@@ -24,9 +24,9 @@
     
 
 <h2>Instructions for Downloading and Installing<br />
-Apache OpenOffice 4.0.0</h2>
+Apache OpenOffice 4.0 Versions</h2>
 
-<p>Last updated: 2013-07-21</p>
+<p>Last updated: 2013-11-04</p>
 
 
 <p><em>As of release 3.4, a JRE (Jave Runtime Environment) is no longer 
packaged with OpenOffice.
@@ -34,7 +34,7 @@ However, you may still need a JRE for fu
 Java and Apache OpenOffice</a>). Please ensure that your system has at least 
Java 1.6 installed for full
 functionality.</em></p>
 
-<p><em>Apache OpenOffice 4.0 has significant changes to your OpenOffice 
directory setup which effect your older OpenOffice profile.</em>
+<p><em>Apache OpenOffice 4.0 versions have significant changes to your 
OpenOffice directory setup which effect your older OpenOffice profile.</em>
 The <a 
href="https://cwiki.apache.org/confluence/display/OOOUSERS/AOO+4.0+Release+Notes";>Apache
 OpenOffice 4.0 Release Notes</a> provide an explanation of these changes. 
However,you should have the opportunity to
 migrate your old profile settings to the new profile area.</p>
 
@@ -65,10 +65,10 @@ migrate your old profile settings to the
 
 <hr />
 
-<h2 id="win">Windows XP/2003/Vista/ 7 / 8 Quick-Start Guide for Apache 
OpenOffice 4.0</h2>
+<h2 id="win">Windows XP/2003/Vista/ 7 / 8 Quick-Start Guide for Apache 
OpenOffice 4.0 Versions</h2>
 
 <p>Welcome to Apache OpenOffice Quick-Start Guide for Windows environments. 
Below you will find step-by-step instructions
-to download and install Apache OpenOffice version 4.0.0 on your system. You 
may want to print this instruction sheet for
+to download and install Apache OpenOffice 4.0 versions on your system. You may 
want to print this instruction sheet for
 reference before beginning to download and install Apache OpenOffice.</p>
 
 <p>If you are experienced with the Windows operating system, you can use the 
instructions provided in the next section.
@@ -94,10 +94,10 @@ to return to this page.</p>
   <li>Review the <a 
href="http://www.openoffice.org/dev_docs/source/sys_reqs_aoo40.html";>System 
Requirements</a> for
   Apache OpenOffice use.</li>
   <li>Download and install <a href="http://www.java.com/";>Java JRE</a> if you 
need the features that are Java dependent.</li>
-  <li><a href="http://www.openoffice.org/download/";>Download Apache OpenOffice 
4.0.0</a>.</li>
+  <li><a href="http://www.openoffice.org/download/";>Download Apache OpenOffice 
4.0.x</a>.</li>
   <li>Login as administrator (if required).</li>
-  <li>Unpack and install the downloaded Apache OpenOffice 4.0.0 files.</li>
-  <li>Run Apache OpenOffice 4.0.0 to ensure that the installation was 
successful.</li>
+  <li>Unpack and install the downloaded Apache OpenOffice 4.0.x files.</li>
+  <li>Run Apache OpenOffice 4.0.x to ensure that the installation was 
successful.</li>
 </ol>
 
 <h3 id="comprehensive">Comprehensive Installation Instructions</h3>
@@ -114,7 +114,7 @@ Log in as an administrator if your compu
 
 <h3>Review the System Requirements</h3>
 
-<p>Your computer needs these resources as a minimum to run Apache OpenOffice 
4.0.0:</p>
+<p>Your computer needs these resources as a minimum to run Apache OpenOffice 
4.0 versions:</p>
 
 <ul>
   <li>Windows XP, Windows 2003, Windows Vista, Windows 7, Windows 8</li>
@@ -124,7 +124,7 @@ Log in as an administrator if your compu
   <li>1024 x 768 or higher resolution with at least 256 colours</li>
 </ul>
 
-<h3 id="download">Download Apache OpenOffice 4.0.0</h3>
+<h3 id="download">Download Apache OpenOffice 4.0.x </h3>
 
 <p>To download Apache OpenOffice from our website, you do not need to login. 
Also, it does not cost anything other than what
 your costs are to connect to the internet and download a large file.</p>
@@ -161,7 +161,7 @@ enables you to pause/resume the download
 <a 
href="https://cwiki.apache.org/confluence/display/OOOUSERS/Win-en-x86-Setup";>
 Win 86 Setup Guide, secton 4. Installer Setup </a> from the developer 
wiki.</b></p>
 
-<h3>Unpack and install the downloaded Apache OpenOffice 4.0.0 files</h3>
+<h3>Unpack and install the downloaded Apache OpenOffice 4.0.x files</h3>
 
 <ol>
   <li>Either using Windows Explorer or Mozilla/Netscape's Download Manager, 
navigate to the Apache OpenOffice file you
@@ -169,7 +169,7 @@ Win 86 Setup Guide, secton 4. Installer 
   <p>Windows Explorer users will want to find the file and double-click to 
launch the unpacking and installation program.
   Alternately, Mozilla/Netscape users will want to open the Download Manager, 
highlight the file, and click Launch File.
   In either case, the unpacking program will start.</p>
-  <p>The Welcome window is displayed to note that you have downloaded Apache 
OpenOffice 4.0.0. Click Next to continue.</p></li>
+  <p>The Welcome window is displayed to note that you have downloaded Apache 
OpenOffice 4.0.x. Click Next to continue.</p></li>
   <li>The Select Folder window is displayed. Accept the folder name displayed 
in the text box or enter the name of the
   folder in which to save the unpacked files, and click Unpack.
 
@@ -179,8 +179,8 @@ Win 86 Setup Guide, secton 4. Installer 
   -->
 
   </li>
-  <li>Once the files are unpacked, the Apache OpenOffice 4.0.0 Installation 
Wizard is displayed. Click Next to continue
-  installing Apache OpenOffice 4.0.0. Follow the prompts, and Apache 
OpenOffice will be installed on your system, ready for
+  <li>Once the files are unpacked, the Apache OpenOffice 4.0.x Installation 
Wizard is displayed. Click Next to continue
+  installing Apache OpenOffice 4.0.x. Follow the prompts, and Apache 
OpenOffice will be installed on your system, ready for
   use.</li>
   <li>Read the information in the Welcome window and then click Next.
   <p>The License Agreement window appears.</p>
@@ -266,7 +266,7 @@ from any web page.</p>
 <h2 id="apple">Installation Instructions for Apple Macintosh</h2>
 
 <h3 id="gatekeeper">OS X and Gatekeeper</h3>
-<p>Apache OpenOffice 4.0.0 will be flagged by the new Gatekeeper facility in 
OS X Mountain Lion. This is a new feature to help guard against malware on Mac 
systems. There is a procedure laid out at the following link to allow 
applications not installed from the Mac App store to run. See the article at 
Mac support at <a 
href="http://support.apple.com/kb/HT5290";>http://support.apple.com/kb/HT5290</a>.</p>
+<p>Apache OpenOffice 4.0 versions will be flagged by the new Gatekeeper 
facility in OS X Mountain Lion. This is a new feature to help guard against 
malware on Mac systems. There is a procedure laid out at the following link to 
allow applications not installed from the Mac App store to run. See the article 
at Mac support at <a 
href="http://support.apple.com/kb/HT5290";>http://support.apple.com/kb/HT5290</a>.</p>
 
 <h3 id="mac-general">Macintosh Installation Resources</h3>
 <p><a 
href="http://www.openoffice.org/porting/mac/faq/installing/ooo.html";>Installing 
Apache OpenOffice on MacOS X</a></p>
@@ -289,8 +289,7 @@ exists, on your system.</p>
   If this is symlinked to libreoffice, remove the symlink. (see your favorite 
reference for how to do this)<br /><br />
   This will NOT remove LibreOffice, this will only disallow LibreOffice to 
redirect the normal OpenOffice binary --
   typically <code>/usr/bin/soffice</code> -- to libreoffice instead.<br /></li>
-  <li>Due to directory structure changes in Apache OpenOffice 4.0, your older 
Openoffice 3.x should  be deleted entirely
-   by a new install or update process. This is normal. If you experience 
problems
+  <li>Due to directory structure changes in Apache OpenOffice 4.0 versions, 
your older Openoffice 3.x should  be deleted entirely    by a new install or 
update process. This is normal. If you experience problems
   using the "update" process, please remove the old OpenOffice 3.x packages 
manually.
   </li>
   <li>If you have been testing one of the older developer snapshots, not the 
released version, revision 150370, 
@@ -301,7 +300,7 @@ exists, on your system.</p>
 <hr />
 
 
-<h3 id="linux-general">Installation Steps --RPM or DEB: Download to 
Installation Directory, Unpack</h3>
+<h3 id="linux-general">Installation Steps -- RPM or DEB: Download to 
Installation Directory, Unpack</h3>
 
 <ol>
 <li>Review the <a 
href="http://www.openoffice.org/dev_docs/source/sys_reqs_aoo40.html";>System 
Requirements</a></li>

Modified: websites/staging/ooo-site/trunk/content/stats/committers.txt
==============================================================================
--- websites/staging/ooo-site/trunk/content/stats/committers.txt (original)
+++ websites/staging/ooo-site/trunk/content/stats/committers.txt Mon Nov  4 
18:27:29 2013
@@ -28,4 +28,5 @@
 2013-08-12,130
 2013-10-04,130
 2013-10-22,132
-2013-10-31,133
\ No newline at end of file
+2013-10-31,133
+2013-11-04,134


Reply via email to