Author: pescetti
Date: Fri Dec 26 18:57:00 2014
New Revision: 1648010

URL: http://svn.apache.org/r1648010
Log:
#i125589# Backport some fixes over from the xx fixes.
Patch-by: Kadar Csaba <[email protected]>


Modified:
    openoffice/ooo-site/trunk/content/extensions/index.html
    openoffice/ooo-site/trunk/content/index.html
    openoffice/ooo-site/trunk/content/product/linux.mdtext
    openoffice/ooo-site/trunk/content/product/mac.mdtext
    openoffice/ooo-site/trunk/content/product/suite.mdtext
    openoffice/ooo-site/trunk/content/product/windows.mdtext
    openoffice/ooo-site/trunk/content/support/index.html
    openoffice/ooo-site/trunk/content/why/why_foss.mdtext
    openoffice/ooo-site/trunk/content/why/why_oem.mdtext
    openoffice/ooo-site/trunk/content/why/why_office2003-end-of-life.mdtext

Modified: openoffice/ooo-site/trunk/content/extensions/index.html
URL: 
http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/extensions/index.html?rev=1648010&r1=1648009&r2=1648010&view=diff
==============================================================================
--- openoffice/ooo-site/trunk/content/extensions/index.html (original)
+++ openoffice/ooo-site/trunk/content/extensions/index.html Fri Dec 26 18:57:00 
2014
@@ -1,41 +1,67 @@
 <html>
-  <head>
-    <title>Extensions : Enrich Apache OpenOffice</title>
-    <meta HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=utf-8">
-
+<head>
+  <title>Extensions : Enrich Apache OpenOffice</title>
+  <meta HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=utf-8">
 </head>
 
 <body>
-
-<h1>Extensions and Templates : From production to end-users</h1>
-<p>
-Apache OpenOffice offers a complete framework allowing it to be enriched. 
OpenOffice allows for both "extensions" and "templates". 
-An extension is a third party tool that brings OpenOffice new functions. This 
can be done through addons, addins, deployed by UNO packages. 
-Templates are document setups designed for specific uses.<br/>
-<br/>
-The native-lang projects are welcomed helping translating all of these 
resources. The OpenOffice wiki can be used to provide translation of all the 
materials found here and now contains the majority of information.</p>
-<br/>
-<p>
-<a style="margin-left:6em;margin-bottom:5em;" 
href="http://extensions.openoffice.org";><img border=0 
src="OOoEx_Banner_60x234_02.png" alt="Get or submit extensions on the 
OpenOffice Extensions Website"></a>
-<br/>
-</p>
-Get or submit extensions on the <a 
href="http://extensions.openoffice.org";>OpenOffice Extensions Website</a>.
-<br/>
-Get or submit templates on the <a 
href="http://templates.openoffice.org";>OpenOffice Template Website</a>.
-<br/>
-
-<h1><a href="http://wiki.services.openoffice.org/wiki/Extensions";>Find out 
much more on the Extensions Area Wiki</a></h1>
-
-<p>
-Join the user mailing list if you're willing to share your extensions and need 
help: <a 
href="mailto:[email protected]";>[email protected]</a><br/>
-       <br/>   
-Join the api mailing list for any questions related to developing extensions: 
<a 
href="mailto:[email protected]";>[email protected]</a>
-<br/>
-       <br/>
-(See the <a href="http://openoffice.apache.org/mailing-lists.html";>Apache 
OpenOffice mailing list page</a> for mail subject tags and information on other 
useful mailing lists.)
-</p>
-
-
+  <h1>Extensions and Templates: From production to end-users</h1>
+  <p>
+    Apache OpenOffice offers a complete framework allowing it to be enriched. 
+    OpenOffice allows for both "extensions" and "templates". 
+    An extension is a third party tool that brings OpenOffice new functions. 
+    This can be done through addons, addins, deployed by UNO packages.
+    Templates are document setups designed for specific uses.
+    <br/>
+    <br/>
+    The native-lang projects are welcomed helping translating all of these 
resources.
+    The OpenOffice wiki can be used to provide translation of all the 
materials 
+    found here and now contains the majority of information.
+  </p>
+  <br/>
+  <p>
+    <a style="margin-left:6em;margin-bottom:5em;" 
+      href="http://extensions.openoffice.org"; target="_blank">
+      <img border=0 src="/extensions/OOoEx_Banner_60x234_02.png" 
+       alt="Get or submit extensions on the OpenOffice Extensions Website">
+    </a>
+    <br/>
+  </p>
+  <p>
+    Get or submit extensions on the
+    <a href="http://extensions.openoffice.org"; target="_blank">
+      OpenOffice Extensions Website</a>.
+    <br/>
+    Get or submit templates on the
+    <a href="http://templates.openoffice.org"; target="_blank">
+      OpenOffice Template Website</a>.
+    <br/>
+  </p>
+
+  <h1>
+    <a href="http://wiki.services.openoffice.org/wiki/Extensions"; 
target="_blank">
+      Find out much more on the Extensions Area Wiki
+    </a>
+  </h1>
+  <p>
+    Join the user mailing list if you're willing to share your extensions and 
need help:
+    <a href="mailto:[email protected]";>
+      [email protected]
+    </a>
+    <br/>
+    <br/>
+    Join the api mailing list for any questions related to developing 
extensions:
+    <a href="mailto:[email protected]";>
+      [email protected]
+    </a>
+    <br/>
+    <br/>
+    (See the
+    <a href="http://openoffice.apache.org/mailing-lists.html";>
+      Apache OpenOffice mailing list page
+    </a>
+    for mail subject tags and information on other useful mailing lists.)
+  </p>
 </body>
 </html>
 

Modified: openoffice/ooo-site/trunk/content/index.html
URL: 
http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/index.html?rev=1648010&r1=1648009&r2=1648010&view=diff
==============================================================================
--- openoffice/ooo-site/trunk/content/index.html (original)
+++ openoffice/ooo-site/trunk/content/index.html Fri Dec 26 18:57:00 2014
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml"; />
 <head>
     <meta name="description" content="The official home page of the Apache 
OpenOffice open source project, home of OpenOffice Writer, Calc, Impress, Draw 
and Base." />
-    <meta name="keywords" content="OpenOffice, Open Office, Apache OpenOffice, 
Apache Open Office, OpenOffice.org, Calc, Impress, Draw, Base, ODF, Open 
Document Format, free office editors" />
+    <meta name="keywords" content="OpenOffice, Open Office, Apache OpenOffice, 
Apache Open Office, OpenOffice.org, Writer, Calc, Impress, Draw, Base, ODF, 
Open Document Format, free office editors" />
     <meta name="google-site-verification" 
content="x1jl2cGum4kCvj0PgxjTy_pasCsLY_fBT7my88fpKD4" />
     <meta name="p:domain_verify" content="bd1ba1fb9d25b0eb3d64891f89e9195e" /> 
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
@@ -371,7 +371,7 @@
     <h2 style="display: inline;">Recent Blog Posts</h2>
 
     <p style="text-align:right">
-      <a href="http://blogs.apache.org/OOo/";>All Posts</a>
+      <a href="http://blogs.apache.org/OOo/"; target="_blank">All Posts</a>
     </p>
 
     <p>

Modified: openoffice/ooo-site/trunk/content/product/linux.mdtext
URL: 
http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/product/linux.mdtext?rev=1648010&r1=1648009&r2=1648010&view=diff
==============================================================================
--- openoffice/ooo-site/trunk/content/product/linux.mdtext (original)
+++ openoffice/ooo-site/trunk/content/product/linux.mdtext Fri Dec 26 18:57:00 
2014
@@ -18,34 +18,19 @@ Notice:    Licensed to the Apache Softwa
 
 ## Linux Distro/Version Support
 
-The current Apache OpenOffice supports the following Linux distros and 
versions...
-
-Specific distro notes:
-
-  - distro a:  notes...
-  - distro b:  notes...
-  - distro c:  notes...
+The current Apache OpenOffice supports most existing Linux
+distributions and versions.
 
 In general the following is needed:
 
 - Linux kernel version 2.6 or higher, glibc2 version 2.11.1 or higher
 
-
 ## Hardware Requirements
 
   - **Memory**: Minimum 256 Mbytes RAM (512 MB RAM recommended).
   - **Storage**: At least 400 Mbytes available disk space for a default 
install via download.
   - **Graphics**: X-Server with 1024 x 768 or higher resolution with at least 
256 colours.
 
-
-## Linux-specific Features
-
-Apache OpenOffice has the following special features on Linux:
-
-  - feature 1
-  - feature 2
-  - feature 3
-
 ## Additional Resources
 
   - Click here to [download](http://www.openoffice.org/download/)

Modified: openoffice/ooo-site/trunk/content/product/mac.mdtext
URL: 
http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/product/mac.mdtext?rev=1648010&r1=1648009&r2=1648010&view=diff
==============================================================================
--- openoffice/ooo-site/trunk/content/product/mac.mdtext (original)
+++ openoffice/ooo-site/trunk/content/product/mac.mdtext Fri Dec 26 18:57:00 
2014
@@ -18,15 +18,11 @@ Notice:    Licensed to the Apache Softwa
 
 ## MacOS X Version Support
 
-The current Apache OpenOffice supports Apple MacOS X version 10.4 (Tiger), 
10.5 (Leopard),
-10.6 (Snow Leopard), 10.7 (Lion) and 10.8 (Mountain Lion)
-
-Specific platform version notes:
-
-  - version a:  notes...
-  - version b:  notes...
-  - version c:  notes...
+The current Apache OpenOffice supports Apple MacOS X version
+10.7 (Lion), 10.8 (Mountain Lion), 10.9 (Mavericks), 10.10 (Yosemite).
 
+The last OpenOffice version supporting the old MacOS X 10.4 (Tiger),
+10.5 (Leopard), 10.6 (Snow Leopard) is OpenOffice 4.0.1.
 
 ## Hardware Requirements
 
@@ -35,19 +31,9 @@ Specific platform version notes:
   - **Storage**: At least 400 Mbytes available disk space for a default 
install via download.
   - **Graphics**: 1024 x 768 or higher resolution with 16.7 million colours.
 
-
-## Mac-specific Features
-
-Apache OpenOffice has the following special features on MacOS X:
-
-  - feature 1
-  - feature 2
-  - feature 3
-
-
 ## Additional Resources
 
   - Click here to [download](http://www.openoffice.org/download/)
   - Click here to get [install instructions for OpenOffice on 
MacOSX](http://www.openoffice.org/download/common/instructions.html#apple)
   - Click here to get help and support in the [Community Support 
Forums](http://forum.openoffice.org/)
- 
\ No newline at end of file
+ 

Modified: openoffice/ooo-site/trunk/content/product/suite.mdtext
URL: 
http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/product/suite.mdtext?rev=1648010&r1=1648009&r2=1648010&view=diff
==============================================================================
--- openoffice/ooo-site/trunk/content/product/suite.mdtext (original)
+++ openoffice/ooo-site/trunk/content/product/suite.mdtext Fri Dec 26 18:57:00 
2014
@@ -1,18 +1,18 @@
 Title:  The Suite Advantage
 Notice:    Licensed to the Apache Software Foundation (ASF) under one
-           or more contributor license agreements.  See the NOTICE file
+           or more contributor license agreements. See the NOTICE file
            distributed with this work for additional information
-           regarding copyright ownership.  The ASF licenses this file
+           regarding copyright ownership. The ASF licenses this file
            to you under the Apache License, Version 2.0 (the
            "License"); you may not use this file except in compliance
-           with the License.  You may obtain a copy of the License at
+           with the License. You may obtain a copy of the License at
            .
              http://www.apache.org/licenses/LICENSE-2.0
            .
            Unless required by applicable law or agreed to in writing,
            software distributed under the License is distributed on an
            "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-           KIND, either express or implied.  See the License for the
+           KIND, either express or implied. See the License for the
            specific language governing permissions and limitations
            under the License.
 
@@ -42,7 +42,7 @@ office package.
 - All the components save in OpenDocument format, the new international 
standard
   for office documents. This XML based format offers substantial disk savings
   compared to common competitors' formats. It also means you can access your
-  data  from any OpenDocument compliant software.
+  data from any OpenDocument compliant software.
 
 - All the packages are installed in one single operation, using the 
installation
   process you are used to on your computer.
@@ -50,6 +50,7 @@ office package.
 - All the packages are released under the same open licensing model - there are
   no hidden charges now or in the future.
 
-Everything you need in an office productivity suite - [get it today][1]!
+Everything you need in an office productivity suite - 
+[get it today][1]!
 
 [1]: /download/ "Download Apache OpenOffice"

Modified: openoffice/ooo-site/trunk/content/product/windows.mdtext
URL: 
http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/product/windows.mdtext?rev=1648010&r1=1648009&r2=1648010&view=diff
==============================================================================
--- openoffice/ooo-site/trunk/content/product/windows.mdtext (original)
+++ openoffice/ooo-site/trunk/content/product/windows.mdtext Fri Dec 26 
18:57:00 2014
@@ -1,56 +1,62 @@
-Title:     Apache OpenOffice for Windows
-Notice:    Licensed to the Apache Software Foundation (ASF) under one
-           or more contributor license agreements.  See the NOTICE file
-           distributed with this work for additional information
-           regarding copyright ownership.  The ASF licenses this file
-           to you under the Apache License, Version 2.0 (the
-           "License"); you may not use this file except in compliance
-           with the License.  You may obtain a copy of the License at
-           .
-             http://www.apache.org/licenses/LICENSE-2.0
-           .
-           Unless required by applicable law or agreed to in writing,
-           software distributed under the License is distributed on an
-           "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-           KIND, either express or implied.  See the License for the
-           specific language governing permissions and limitations
-           under the License.
-
-## Windows Version Support
-
-The current Apache OpenOffice supports Microsoft Windows XP, Vista, Windows 7 
and Windows 8.
-
-Specific platform version notes:
-
-  - **Windows 2000**: OpenOffice may work on Windows 2000, but we don't test 
or recommend it.
-  - **Windows XP**: Tested, stable, no platform-specific problems known.
-  - **Windows Vista**: Tested, stable, no platform-specific problems known.
-  - **Windows 7**: Tested, stable.
-  - **Windows 8**: We run as a "desktop application", not a Metro "App". 
Requires x86 or 64-bit Windows. We do not support Windows RT, the ARM-based 
version, intended for tablets.
-
-**Pleae note**: Apache OpenOffice is distributed as a 32-bit application. It 
will run successfully in
-32-bit mode on 64-bit versions of Windows 7 and Windows 8. But in those cases 
a 32-bit JVM is required
-for some functionality. Details are 
[here](http://www.openoffice.org/download/common/java.html).
-
-
-## Hardware Requirements
-
-Hardware demands are quite modest and even older machines should be able to 
run OpenOffice:
-
-  - **Memory**: Minimum 256 Mbytes RAM (512 MB RAM recommended).
-  - **Storage**: At least 650 Mbytes available disk space for a default 
install via download. After installation and deletion of temporary installation 
files, Apache OpenOffice will use approximately 440 Mbytes disk space.
-  - **Graphics**: 1024 x 768 or higher resolution with at least 256 colours.
-
-
-## Windows-specific Features
-
-Apache OpenOffice has the following special features on Windows:
-
-  - Mail client integration via Messaging Application Programming Interface 
[(MAPI)](http://msdn.microsoft.com/en-us/library/exchange/aa142548%28v=exchg.65%29.aspx)
-
-
-## Additional Resources
-
-  - Click here to [download](http://www.openoffice.org/download/)
-  - Click here to get [Install intructions for OpenOffice on 
Windows](http://www.openoffice.org/download/common/instructions.html#win)
-  - Click here to get help and support in the [Community Support 
Forums](http://forum.openoffice.org/)
+Title:     Apache OpenOffice for Windows
+Notice:    Licensed to the Apache Software Foundation (ASF) under one
+           or more contributor license agreements. See the NOTICE file
+           distributed with this work for additional information
+           regarding copyright ownership. The ASF licenses this file
+           to you under the Apache License, Version 2.0 (the
+           "License"); you may not use this file except in compliance
+           with the License. You may obtain a copy of the License at
+           .
+             http://www.apache.org/licenses/LICENSE-2.0
+           .
+           Unless required by applicable law or agreed to in writing,
+           software distributed under the License is distributed on an
+           "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+           KIND, either express or implied. See the License for the
+           specific language governing permissions and limitations
+           under the License.
+
+## Windows Version Support
+
+The current Apache OpenOffice supports Microsoft Windows XP, Vista, Windows 7 
and Windows 8.
+
+Specific platform version notes:
+
+  - **Windows 2000**: OpenOffice may work on Windows 2000, but we don't test 
or recommend it.
+  - **Windows XP**: Tested, stable, no platform-specific problems known.
+  - **Windows Vista**: Tested, stable, no platform-specific problems known.
+  - **Windows 7**: Tested, stable.
+  - **Windows 8**: We run as a "desktop application", not a Metro "App". 
Requires x86 or 64-bit Windows. 
+    We do not support Windows RT, the ARM-based version, intended for tablets.
+
+**Please note**: Apache OpenOffice is distributed as a 32-bit application. It 
will run successfully in
+32-bit mode on 64-bit versions of Windows 7 and Windows 8. But in those cases 
a 32-bit JVM is required
+for some functionality. Details are 
+[here](http://www.openoffice.org/download/common/java.html).
+
+
+## Hardware Requirements
+
+Hardware demands are quite modest and even older machines should be able to 
run OpenOffice:
+
+  - **Memory**: Minimum 256 Mbytes RAM (512 MB RAM recommended).
+  - **Storage**: At least 650 Mbytes available disk space for a default 
install via download. After installation and deletion of temporary installation 
files, Apache OpenOffice will use approximately 440 Mbytes disk space.
+  - **Graphics**: 1024 x 768 or higher resolution with at least 256 colours.
+
+
+## Windows-specific Features
+
+Apache OpenOffice has the following special features on Windows:
+
+  - Mail client integration via Messaging Application Programming Interface 
+    
[(MAPI)](http://msdn.microsoft.com/en-us/library/exchange/aa142548%28v=exchg.65%29.aspx)
+
+
+## Additional Resources
+
+  - Click here to 
+    [download](http://www.openoffice.org/download/)
+  - Click here to get 
+    [Install intructions for OpenOffice on 
Windows](http://www.openoffice.org/download/common/instructions.html#win)
+  - Click here to get help and support in the 
+    [Community Support Forums](http://forum.openoffice.org/)

Modified: openoffice/ooo-site/trunk/content/support/index.html
URL: 
http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/support/index.html?rev=1648010&r1=1648009&r2=1648010&view=diff
==============================================================================
--- openoffice/ooo-site/trunk/content/support/index.html (original)
+++ openoffice/ooo-site/trunk/content/support/index.html Fri Dec 26 18:57:00 
2014
@@ -75,7 +75,7 @@ Welcome to the Apache OpenOffice Support
     <ul>
         <li>
             <span class='title'>
-            <a 
href="http://wiki.services.openoffice.org/wiki/Documentation";>OpenOffice Wiki: 
Documentation area</a>
+            <a href="http://wiki.openoffice.org/wiki/Documentation";>OpenOffice 
Wiki: Documentation area</a>
             </span>
             <br />
             FAQs, User Guides, How-To's, Tutorials, Installation, etc.  Highly 
recommended 
@@ -103,7 +103,7 @@ Welcome to the Apache OpenOffice Support
         <ul>
             <li>
                 <span class='title'>
-                <a rel="nofollow" href="http://www.oooforum.org/";>The 
(Unofficial) OpenOffice Forum - <em>currently offline</em></a>
+                <a rel="nofollow" href="http://www.oooforum.org/";>The 
(Unofficial) OpenOffice Forum - <em>currently unstable</em></a>
                 </span>
                 <br />
                 Discussion site for all things related OpenOffice 

Modified: openoffice/ooo-site/trunk/content/why/why_foss.mdtext
URL: 
http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/why/why_foss.mdtext?rev=1648010&r1=1648009&r2=1648010&view=diff
==============================================================================
--- openoffice/ooo-site/trunk/content/why/why_foss.mdtext (original)
+++ openoffice/ooo-site/trunk/content/why/why_foss.mdtext Fri Dec 26 18:57:00 
2014
@@ -1,4 +1,4 @@
-Title: Why OpenOffice.org: Free/Open-Source Software
+Title: Why Apache OpenOffice: Free/Open-Source Software
 Notice:    Licensed to the Apache Software Foundation (ASF) under one
            or more contributor license agreements.  See the NOTICE file
            distributed with this work for additional information

Modified: openoffice/ooo-site/trunk/content/why/why_oem.mdtext
URL: 
http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/why/why_oem.mdtext?rev=1648010&r1=1648009&r2=1648010&view=diff
==============================================================================
--- openoffice/ooo-site/trunk/content/why/why_oem.mdtext (original)
+++ openoffice/ooo-site/trunk/content/why/why_oem.mdtext Fri Dec 26 18:57:00 
2014
@@ -1,4 +1,4 @@
-Title: Why OpenOffice.org: IT business
+Title: Why Apache OpenOffice: IT business
 Notice:    Licensed to the Apache Software Foundation (ASF) under one
            or more contributor license agreements.  See the NOTICE file
            distributed with this work for additional information

Modified: 
openoffice/ooo-site/trunk/content/why/why_office2003-end-of-life.mdtext
URL: 
http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/why/why_office2003-end-of-life.mdtext?rev=1648010&r1=1648009&r2=1648010&view=diff
==============================================================================
--- openoffice/ooo-site/trunk/content/why/why_office2003-end-of-life.mdtext 
(original)
+++ openoffice/ooo-site/trunk/content/why/why_office2003-end-of-life.mdtext Fri 
Dec 26 18:57:00 2014
@@ -1,4 +1,4 @@
-Title:     Office 2003 End of Life
+Title:     Why Apache OpenOffice: Office 2003 End of Life
 Notice:    Licensed to the Apache Software Foundation (ASF) under one
            or more contributor license agreements.  See the NOTICE file
            distributed with this work for additional information


Reply via email to