You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by bu...@apache.org on 2014/12/26 19:57:15 UTC

svn commit: r934076 - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/xx/ content/xx/download/ content/xx/extensions/ content/xx/participate/ content/xx/product/ content/xx/support/ content/xx/why/

Author: buildbot
Date: Fri Dec 26 18:57:14 2014
New Revision: 934076

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/xx/download/index.html
    websites/staging/ooo-site/trunk/content/xx/extensions/index.html
    websites/staging/ooo-site/trunk/content/xx/index.html
    websites/staging/ooo-site/trunk/content/xx/participate/index.html
    websites/staging/ooo-site/trunk/content/xx/product/base.html
    websites/staging/ooo-site/trunk/content/xx/product/calc.html
    websites/staging/ooo-site/trunk/content/xx/product/impress.html
    websites/staging/ooo-site/trunk/content/xx/product/linux.html
    websites/staging/ooo-site/trunk/content/xx/product/mac.html
    websites/staging/ooo-site/trunk/content/xx/product/math.html
    websites/staging/ooo-site/trunk/content/xx/product/suite.html
    websites/staging/ooo-site/trunk/content/xx/product/windows.html
    websites/staging/ooo-site/trunk/content/xx/product/writer.html
    websites/staging/ooo-site/trunk/content/xx/support/index.html
    websites/staging/ooo-site/trunk/content/xx/topnav.html
    websites/staging/ooo-site/trunk/content/xx/why/index.html
    websites/staging/ooo-site/trunk/content/xx/why/why_foss.html
    websites/staging/ooo-site/trunk/content/xx/why/why_oem.html
    websites/staging/ooo-site/trunk/content/xx/why/why_office2003-end-of-life.html

Propchange: websites/staging/ooo-site/trunk/cgi-bin/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Fri Dec 26 18:57:14 2014
@@ -1 +1 @@
-1647877
+1648009

Propchange: websites/staging/ooo-site/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Fri Dec 26 18:57:14 2014
@@ -1 +1 @@
-1647877
+1648009

Modified: websites/staging/ooo-site/trunk/content/xx/download/index.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/xx/download/index.html (original)
+++ websites/staging/ooo-site/trunk/content/xx/download/index.html Fri Dec 26 18:57:14 2014
@@ -62,111 +62,112 @@
     
     
 
-<div class="overall_optionset">
+  <div class="overall_optionset">
 
-  <div class="optionset">
+    <div class="optionset">
 
-    <!-- Text above the first colored box -->
-    <script type="text/javascript">
-    <!--
-    // The text in the H1 tag is intentionally shown as "display: none" (do not display).
-    // This is to please accessibility tools like a screen reader.
-    document.write( "<h1 style='display: none;'>" + l10n.dl_headline_text + "</h1>" );
-    //-->
-    </script>
-
-    <!-- Green: Stable release -->
-    <!-- Download via select boxes -->
-    <script type="text/javascript">
-    <!--
-
-    // Set a specific language ISO code to force to assemble a certain localized build as download link.
-    // Changed: The variable can now be found in the "msg_prop_l10n_<ISO_code>.js".
-
-    // Get the download box from a separate file.
-    DL.createDownloadBox();
-
-    // Fill the select boxes and wait for the user's choice.
-    DL.init( 1 );
-
-    entourage.initialize();
-
-    //-->
-    </script>
-
-    <!-- Green: Stable release: No JavaScript enabled -->
-    <noscript>
-    <div class="first button green-sel" id="optionitem2">
-      <div class="green-sel-icon"></div>
-      <h2>
-        <a style="cursor: pointer;" href="http://sourceforge.net/projects/openofficeorg.mirror/files/"
-          title="Select from all platforms, languages, language packs to download">
-          Apache OpenOffice Downloads - Official Site
-        </a>
-      </h2>
-      <p>
-        <a style="cursor: pointer;" href="http://sourceforge.net/projects/openofficeorg.mirror/files/"
-          title="Select from all platforms, languages and language packs to download">The browser seems to have JavaScript
-          disabled. This technique is used for showing the actual download link. If you want to download Apache
-          OpenOffice anyway, click this text to choose from the alternative download webpage. You will have to navigate to
-          the <em>version</em>/binaries/<em>language</em> subfolder and and download the file named
-          Apache_OpenOffice_<em>version</em>_<em>os</em>_<em>platform</em>_<em>package</em>_<em>language</em>.<em>ext</em>.
-          Our apologies for the inconvenience.
-        </a>
-      </p>
-    </div>
-    </noscript>
-
-
-    <!-- Light Blue: Share download with social networks -->
-    <script type="text/javascript">
-    <!--
-    // Get the share box from a separate file.
-    DL.createShareBox();
-    //-->
-    </script>
-
-    <!-- Blue: Extensions -->
-    <script type="text/javascript">
-    <!--
-    // Get the extensions box from a separate file.
-    DL.createExtensionsBox();
-    //-->
-    </script>
-
-    <!-- Blue: Templates -->
-    <script type="text/javascript">
-    <!--
-    // Get the templates box from a separate file.
-    DL.createTemplatesBox();
-    //-->
-    </script>
-
-  </div> <!-- class "optionset" -->
-
-  <div class="additionalinformation">
-
-    <!-- Navigation bar -->
-    <script type="text/javascript">
-    <!--
-    // Get the navigation bar from a separate file.
-    DL.createNavigationBar();
-    //-->
-    </script>
-
-    <br /><br />
-
-    <!-- Logo section -->
-    <script type="text/javascript">
-    <!--
-    // Get the logo section from a separate file.
-    DL.createLogoSection();
-    //-->
-    </script>
+      <!-- Text above the first colored box -->
+      <script type="text/javascript">
+	<!--
+	// The text in the H1 tag is intentionally shown as "display: none" (do not display).
+	// This is to please accessibility tools like a screen reader.
+	document.write( "<h1 style='display: none;'>" + l10n.dl_headline_text + "</h1>" );
+	//-->
+      </script>
+
+      <!-- Green: Stable release -->
+      <!-- Download via select boxes -->
+      <script type="text/javascript">
+	<!--
+
+	// Set a specific language ISO code to force to assemble a certain localized build as download link.
+	// Changed: The variable can now be found in the "msg_prop_l10n_<ISO_code>.js".
+
+	// Get the download box from a separate file.
+	DL.createDownloadBox();
+
+	// Fill the select boxes and wait for the user's choice.
+	DL.init( 1 );
+
+	entourage.initialize();
+
+	//-->
+      </script>
+
+      <!-- Green: Stable release: No JavaScript enabled -->
+      <noscript>
+	<div class="first button green-sel" id="optionitem2">
+	  <div class="green-sel-icon">
+	  </div>
+	  <h2>
+	    <a style="cursor: pointer;" href="http://sourceforge.net/projects/openofficeorg.mirror/files/"
+	      title="Select from all platforms, languages, language packs to download">
+	      Apache OpenOffice Downloads - Official Site
+	    </a>
+	  </h2>
+	  <p>
+	    <a style="cursor: pointer;" href="http://sourceforge.net/projects/openofficeorg.mirror/files/"
+	      title="Select from all platforms, languages and language packs to download">
+	      The browser seems to have JavaScript disabled. This technique is used for showing the actual 
+	      download link. If you want to download Apache OpenOffice anyway, click this text to choose 
+	      from the alternative download webpage. You will have to navigate to
+              the <em>version</em>/binaries/<em>language</em> subfolder and and download the file named
+              Apache_OpenOffice_<em>version</em>_<em>os</em>_<em>platform</em>_<em>package</em>_<em>language</em>.<em>ext</em>.
+              Our apologies for the inconvenience.
+	    </a>
+	  </p>
+	</div>
+      </noscript>
+
+      <!-- Light Blue: Share download with social networks -->
+      <script type="text/javascript">
+	<!--
+	// Get the share box from a separate file.
+	DL.createShareBox();
+	//-->
+      </script>
+
+      <!-- Blue: Extensions -->
+      <script type="text/javascript">
+	<!--
+	// Get the extensions box from a separate file.
+	DL.createExtensionsBox();
+	//-->
+      </script>
+
+      <!-- Blue: Templates -->
+      <script type="text/javascript">
+	<!--
+	// Get the templates box from a separate file.
+	DL.createTemplatesBox();
+	//-->
+      </script>
+
+    </div> <!-- class "optionset" -->
+
+    <div class="additionalinformation">
+
+      <!-- Navigation bar -->
+      <script type="text/javascript">
+	<!--
+	// Get the navigation bar from a separate file.
+	DL.createNavigationBar();
+	//-->
+      </script>
+
+      <br /><br />
+
+      <!-- Logo section -->
+      <script type="text/javascript">
+	<!--
+	// Get the logo section from a separate file.
+	DL.createLogoSection();
+	//-->
+      </script>
 
-  </div> <!-- class: additionalinformation -->
+    </div> <!-- class: additionalinformation -->
 
-</div> <!-- class: overall_optionset -->
+  </div> <!-- class: overall_optionset -->
 
 
   </div>

Modified: websites/staging/ooo-site/trunk/content/xx/extensions/index.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/xx/extensions/index.html (original)
+++ websites/staging/ooo-site/trunk/content/xx/extensions/index.html Fri Dec 26 18:57:14 2014
@@ -3,9 +3,8 @@
 <head>
 <link href="/css/ooo.css" rel="stylesheet" type="text/css">
 
-    <title>Extensions : Enrich Apache OpenOffice</title>
-    <meta HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=utf-8">
-
+  <title>Extensions : Enrich Apache OpenOffice</title>
+  <meta HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=utf-8">
 
 <!--#include virtual="/google-analytics.js" --> 
 <!--#include virtual="/scripts/entourage.js" -->
@@ -23,36 +22,63 @@
     
     
     
-
-<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="/extensions/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:users-subscribe@openoffice.apache.org">users-subscribe@openoffice.apache.org</a><br/>
-	<br/>	
-Join the api mailing list for any questions related to developing extensions: <a href="mailto:api-subscribe@openoffice.apache.org">api-subscribe@openoffice.apache.org</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:users-subscribe@openoffice.apache.org">
+      users-subscribe@openoffice.apache.org
+    </a>
+    <br/>
+    <br/>
+    Join the api mailing list for any questions related to developing extensions:
+    <a href="mailto:api-subscribe@openoffice.apache.org">
+      api-subscribe@openoffice.apache.org
+    </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>
 
   </div>
 <!--#include virtual="/footer.html" -->

Modified: websites/staging/ooo-site/trunk/content/xx/index.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/xx/index.html (original)
+++ websites/staging/ooo-site/trunk/content/xx/index.html Fri Dec 26 18:57:14 2014
@@ -4,7 +4,7 @@
 <link href="/css/ooo.css" rel="stylesheet" type="text/css">
 
     <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" />
@@ -12,45 +12,75 @@
     <title>Apache OpenOffice - The Free and Open Productivity Suite</title>
     <script type="text/javascript" src="../download/globalvars.js"></script>
     <script type="text/javascript" src="msg_prop_l10n_xx.js"></script>
+    <script type="text/javascript" src="download/languages.js"></script>
+    <script type="text/javascript" src="download/download.js"></script>
     <style type="text/css">
     /* <![CDATA[ */
     /*-------------------- Exceptions on standard css -----------------------*/
-    @import "../home.css";
-    @import "../styles.css";
-    @import "../exceptions.css";
+    @import "home.css";
+    @import "styles.css";
+    @import "exceptions.css";
     /* ]]> */
     </style>
     <script>
       function follow( platform ) {
-        _gaq.push( ['_trackEvent','social', 'followUs', platform] ); 
+        _gaq.push( ['_trackEvent', 'social', 'followUs', platform] ); 
 
-        if ( platform == 'ApacheBlog' )
+        if ( platform == 'ApacheBlog' ) {
           window.open( "https://blogs.apache.org/OOo/", "_blank" );
-        else if ( platform == 'Facebook' )
+        } else if ( platform == 'Facebook' ) {
           window.open( "https://www.facebook.com/ApacheOO", "_blank" );
-        else if ( platform == 'Twitter' )
+        } else if ( platform == 'Twitter' ) {
           window.open( "https://twitter.com/ApacheOO", "_blank" );
-        else if ( platform == 'GooglePlus' )
+        } else if ( platform == 'GooglePlus' ) {
           window.open( "https://plus.google.com/+openoffice", "_blank" );
+        }
+      }
+
+      function showEventBox() {
+	// The text is defined in "/msg_prop_l10n.js".
+
+	// Show the event box or not?
+	if( l10n.index_event_box_show ) {
+		// Show the banner logo and text with link and cursor as poiner.
+		document.write( "<div id='event_box' onclick='window.open( \"" + l10n.index_event_box_text_href
+			+ "\", \"_blank\" ); return false;'>"
+			+ "<ul>"
+			  + "<li>"
+			    // Event banner logo on the left hand side.
+			    + "<p style='float: left;'>"
+			      + "<a href='" + l10n.index_event_box_graphic_href
+				+ "' title='" + l10n.index_event_box_graphic_title + "' target='_blank'>"
+				  + "<img src='" + l10n.index_event_box_graphic_src + "'"
+				  + "alt='" + l10n.index_event_box_graphic_alt + "'"
+				  + "height='" + l10n.index_event_box_graphic_height + "'"
+				  + "width='" + l10n.index_event_box_graphic_width + "' />"
+			      + "</a>"
+			    + "</p>"
+
+			    // Event text on the right hand side.
+			    + "<p>"
+			      + "<a style='color: black; text-decoration: none;'"
+				+ "' title='" + l10n.index_event_box_text_title + "' target='_blank'>"
+				+ l10n.index_event_box_text_text
+			      + "</a>"
+			    + "</p>"
+			  + "</li>"
+			+ "</ul>"
+		+ "</div>" );
+	}
       }
 
       function showAlertBox() {
 	// The text is defined in "/msg_prop_l10n.js".
 
-	// Show alert box or not?
+	// Show the alert box or not?
 	if( l10n.index_alert_box_show ) {
-		// If no background color value was set then use the default value.
-		if( ! l10n.index_alert_box_background_color || l10n.index_alert_box_background_color === "" )
-			l10n.index_alert_box_background_color = "#FFD9A7";
-
-		// Show alert box with defined background color.
 		// Depending if link is available, make the whole DIV clickable or not.
 		if( l10n.index_alert_box_href ) {
 			// Show the text with link and cursor as poiner.
-			document.write( "<div id='alert_box' style='background: "
-			+ l10n.index_alert_box_background_color
-			+ "; ' onclick='window.open( \"" + l10n.index_alert_box_href
-			+ "\", \"_blank\" ); return false;'>" );
+			document.write( "<div id='alert_box' onclick='window.open( \"" + l10n.index_alert_box_href
+			+ "\", \"_blank\" ); return false;'><ul><li>" );
 
 			// Show headline.
 			document.write( "<h2 style='cursor: pointer;'>"
@@ -63,8 +93,7 @@
 			}
 		} else {
 			// Show the text without link and normal cursor.
-			document.write( "<div id='alert_box' style='background: "
-			+ l10n.index_alert_box_background_color + "'>" );
+			document.write( "<div id='alert_box'><ul><li>" );
 
 			// Show headline.
 			document.write( "<h2 style='cursor: default;'>"
@@ -76,9 +105,95 @@
 				+ l10n.index_alert_box_text_text + "</p>" );
 			}
 		}
-		document.write( "</div>" ); // Alert box
+		document.write( "</li></ul></div>" ); // Alert box.
 	}
       }
+
+      function setRedirect() {
+	// The text is defined in "/msg_prop_l10n.js".
+	DL.NL_LANG	= "";					// Set to empty as both variables ...
+	DL.LANG_SEL	= "";					// ... must not be used in following function.
+	var lang_iso	= DL.getLanguage();			// Get the language ISO code from browser guessed data.
+	var lang_mode	= "";					// Customized redirect mode.
+	var lang_text	= "";					// Customized message text that can be shown.
+	var link	= "";					// Override redirect mode.
+
+	// Add ECMA262-5 Array methods if not supported natively.
+	// To workaround that MSIE 8 and older do not support this function.
+	if( !( 'indexOf' in Array.prototype ) ) {
+		Array.prototype.indexOf= function( find, i ) {	// 'i' is an optional parameter.
+			if( i === undefined ) {
+				i = 0;
+			}
+			if( i < 0 ) {
+				i+= this.length;
+			}
+			if( i < 0 ) {
+				i = 0;
+			}
+			for( var n = this.length; i < n; i++ ) {
+				if( i in this && this[ i ] === find ) {
+					return i;
+				}
+			}
+			return -1;
+		};
+	}
+
+	// Fix for Portuguese (European) as they are named only "pt" without region code!
+	if( lang_iso === "pt-pt" || lang_iso === "pt-PT" ) {
+		lang_iso = "pt";
+	}
+
+	// Query if the browser language is one of the released languages.
+	// The array has 3 elements per language (defined in "/download/globalvars.js"
+	for( var i = 0, j = DL.SEL_LANG.length; i < j; i = i + 3 ) {
+	  // If the ISO code is found in the language array.
+	  if( DL.SEL_LANG[ i ] === lang_iso ) {
+	    // Query for the redirect method (defined in "/msg_prop_l10n.js", column 0).
+	    lang_mode	= l10n.index_redirect_text[ i / 3 * 2 ];
+	    lang_text	= l10n.index_redirect_text[ i / 3 * 2 + 1 ];
+	    break;
+	  }
+	}
+
+	// Convert the browser URL into a string.
+	link = String( document.location );
+
+	// Does the browser URL contain already a redirect mode?
+	// If yes, set the new redirect mode to override the customized mode.
+	if( link.indexOf( "hard" ) !== -1 ) {
+	    lang_mode = "hard";
+	} else if( link.indexOf( "soft" ) !== -1 ) {
+	    lang_mode = "soft";
+	} else if( link.indexOf( "none" ) !== -1 ) {
+	    lang_mode = "none";
+	}
+
+	switch( lang_mode ) {
+		case "hard":
+			// Do not show a message, just redirect. 
+			window.open( "http://www.openoffice.org/" + lang_iso , "_self" );
+			break;
+		case "soft":
+			// Show a message and redirect only on user's click.
+			// Assign the message text that is defined in:
+			// "/msg_prop_l10n.js", array "l10n.index_redirect_text", column 1),
+			document.write( "<div id='redirect_box'"
+			+ " onclick='window.open( \"http://www.openoffice.org/" + lang_iso + "\", \"_self\" );"
+			+ "return false;'>"
+			+ "<ul><li>"
+			+ "<p>" + lang_text + "</p>"
+			+ "</li></ul>"
+			+ "</div>" ); // Redirect box.
+			break;
+		case "none":
+		default:
+			// Do nothing and show nothing.
+	}
+
+	return;
+      }
     </script>
 
 <!--#include virtual="/google-analytics.js" --> 
@@ -98,37 +213,49 @@
     
     
 
-<!-- The text in the H1 tag is intentionally shown as not displayable, just to please accessibility tools like a
-screen reader.
--->
+<!-- The text in the H1 tag is intentionally shown as "display: none" (do not display). -->
+<!-- This is to please accessibility tools like a screen reader. -->
 <h1 style="display: none;">Apache OpenOffice</h1>
 
 <div id="actionstatements">
 
   <script type="text/javascript">
   <!--
+  // Show event box.
+  // Show a banner logo and message of the event.
+  // In "/msg_prop_l10n.js": Change to 'true' to show the box that is defined in the variables.
+  showEventBox();
+
   // Show alert box.
-  // Change to 'true' if you want to show the text that is defined in the variables above.
+  // Show an important message or announcement.
+  // In "/msg_prop_l10n.js": Change to 'true' to show the box that is defined in the variables.
   showAlertBox();
+
+  // Show redirect box.
+  // Show a text how to redirect to the NL webpage.
+  // In "/msg_prop_l10n.js": Change the mode and text how a redirect to the respective NL webpage should be done.
+  setRedirect();
   //-->
   </script>
 
-  <ul>
-    <li>
-      <hr />
-    </li>
-    <li>
-      <div class="action-info">
-        <div class="action-text action-link">
-          <a href="why/index.html"><h2>I want to learn more about OpenOffice</h2>
-          <p>What is Apache OpenOffice? And why should I use it?</p></a>
-        </div>
+  <li>
+    <hr />
+  </li>
+
+  <li>
+    <div class="action-info">
+      <div class="action-text action-link">
+        <a href="why/index.html">
+          <h2>I want to learn more about OpenOffice</h2>
+          <p>What is Apache OpenOffice? And why should I use it?</p>
+        </a>
       </div>
-    </li>
-    <li>
-      <hr />
-    </li>
-  </ul>
+    </div>
+  </li>
+
+  <li>
+    <hr />
+  </li>
 
   <!-- Show the download link with currently available version number, loaded via JavaScript -->
   <script type="text/javascript">
@@ -171,8 +298,10 @@ screen reader.
     <li>
       <div class="action-help">
         <div class="action-text action-link">
-          <a href="support/index.html"><h2>I need help with my OpenOffice</h2>
-          <p>Help is at hand whenever you need it.</p></a>
+          <a href="support/index.html">
+            <h2>I need help with my OpenOffice</h2>
+            <p>Help is at hand whenever you need it.</p>
+          </a>
         </div>
       </div>
     </li>
@@ -182,8 +311,10 @@ screen reader.
     <li>
       <div class="action-extend">
         <div class="action-text action-link">
-          <a href="extensions/index.html"><h2>I want to do more with my OpenOffice</h2>
-          <p>Extend Apache OpenOffice with additional functionality, templates and clipart.</p></a>
+          <a href="extensions/index.html">
+            <h2>I want to do more with my OpenOffice</h2>
+            <p>Extend Apache OpenOffice with additional functionality, templates and clipart.</p>
+          </a>
         </div>
       </div>
     </li>
@@ -193,8 +324,10 @@ screen reader.
     <li>
       <div class="action-participate">
         <div class="action-text action-link">
-          <a href="http://openoffice.apache.org/get-involved.html"><h2>I want to participate in OpenOffice</h2>
-          <p>Apache OpenOffice is made with help from people all over the world. Feel free to contribute!</p></a>
+          <a href="http://openoffice.apache.org/get-involved.html">
+            <h2>I want to participate in OpenOffice</h2>
+            <p>Apache OpenOffice is made with help from people all over the world. Feel free to contribute!</p>
+          </a>
         </div>
       </div>
     </li>
@@ -202,30 +335,39 @@ screen reader.
       <hr />
     </li>
     <li>
-     <div class="action-social">
+      <div class="action-social">
         <div class="action-text action-link">
-          <a href="social/index.html" onclick="javascript:follow('SocialLink');">
-          <h2>I want to stay in touch with OpenOffice</h2>
-          <p>Follow the progress of OpenOffice via our announcement list, social media areas and blog.</p></a>
-            <div class="action-social-extra">
-              <p>
-                <span style="padding:0 5px;cursor: pointer;" onclick="javascript:follow('ApacheBlog');"
-                title="Blog of OpenOffice."><img src="../images/logo-rss-16.png" alt="Blog of OpenOffice" />
-                <a>Official Blog</a></span>
-                <span style="padding:0 5px;cursor: pointer;" onclick="javascript:follow('Facebook');"
-                title="Follow us on Facebook."><img src="../images/logo-facebook-16.png" alt="Follow us on Facebook." />
-                <a>Facebook</a></span>
-                <span style="padding:0 5px;cursor: pointer;" onclick="javascript:follow('Twitter');"
-                title="Follow us on Twitter."><img src="../images/logo-twitter-16.png" alt="Follow us on Twitter." />
-                <a>Twitter</a></span>
-                <span style="padding:0 5px;cursor: pointer;" onclick="javascript:follow('GooglePlus');"
-                title="Follow us on Google+."><img src="../images/logo-googleplus-16.png" alt="Follow us on Google+." />
-                <a>Google+</a></span>
-              </p>
-            </div>
+          <a href="social/index.html" onclick="javascript:follow( 'SocialLink' );">
+            <h2>I want to stay in touch with OpenOffice</h2>
+            <p>Follow the progress of OpenOffice via announce list, our blog or social media.</p>
+          </a>
+          <div class="action-social-extra">
+            <p>
+              <span style="padding: 0 5px; cursor: pointer;" onclick="javascript:follow( 'ApacheBlog' );"
+                title="Blog of OpenOffice.">
+                <img src="images/logo-rss-16.png" alt="Blog of OpenOffice" />
+                <a>Official Blog</a>
+              </span>
+              <span style="padding: 0 5px; cursor: pointer;" onclick="javascript:follow( 'Facebook' );"
+                title="Follow us on Facebook.">
+                <img src="images/logo-facebook-16.png" alt="Follow us on Facebook" />
+                <a>Facebook</a>
+              </span>
+              <span style="padding: 0 5px; cursor: pointer;" onclick="javascript:follow( 'Twitter' );"
+                title="Follow us on Twitter.">
+                <img src="images/logo-twitter-16.png" alt="Follow us on Twitter" />
+                <a>Twitter</a>
+              </span>
+              <span style="padding: 0 5px; cursor: pointer;" onclick="javascript:follow( 'GooglePlus' );"
+                title="Follow us on Google+.">
+                <img src="images/logo-googleplus-16.png" alt="Follow us on Google+" />
+                <a>Google+</a>
+              </span>
+            </p>
+          </div>
         </div>
       </div>
-     </li>
+    </li>
     <li>
       <hr />
     </li>
@@ -234,37 +376,42 @@ screen reader.
   <div id="SupportedAndSupporters">
     <a href="http://validator.w3.org/check?uri=referer"
     title="W3C Markup Validation Service - Check the markup (HTML, XHTML, ...) of Web documents">
-    <img src="http://www.w3.org/Icons/valid-xhtml10-blue.png"
-    alt="W3C Markup Validation Service - Check the markup (HTML, XHTML, ...) of Web documents"/></a>
+    <img src="images/valid-xhtml10-blue.png"
+    alt="W3C Validator" /></a>
   </div>
 </div>
 
-<div id="news" style="margin: 2% 3% 0 0; height: 520px;">
+<div id="news">
 
   <div class="campaign" style="height: 200px; float: right; overflow: auto;">
     <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>
-      <em>21 August:</em><br /><a href="https://blogs.apache.org/OOo/entry/announcing_apache_openoffice_4_1">
+      <em>21 August:</em>
+      <br />
+      <a href="https://blogs.apache.org/OOo/entry/announcing_apache_openoffice_4_1">
       Apache OpenOffice 4.1.1 released</a>
       <br />
-      <em>29 April:</em><br /><a href="https://blogs.apache.org/OOo/entry/the_apache_openoffice_project_announce">
+
+      <em>29 April:</em>
+      <br />
+      <a href="https://blogs.apache.org/OOo/entry/the_apache_openoffice_project_announce">
       Apache OpenOffice 4.1.0 released</a>
-      <br/>
-      <em>28 April:</em><br /><a href="https://blogs.apache.org/OOo/entry/apache_openoffice_weekly_news_2">
-      Apache OpenOffice Weekly News #2</a>
-      <br/>
-      <em>25 April:</em><br /><a href="https://blogs.apache.org/OOo/entry/apache_openoffice_weekly_news_1">
-      Apache OpenOffice Weekly News #1</a>
-      <br/>
-      <em>17 April:</em><br /><a href="https://blogs.apache.org/foundation/entry/the_apache_software_foundation_announces56">
+      <br />
+
+      <em>17 April:</em>
+      <br />
+      <a href="https://blogs.apache.org/foundation/entry/the_apache_software_foundation_announces56">
       100 Million downloads</a>
-      <br/>
-      <em>31 December:</em><br /><a href="https://blogs.apache.org/OOo/entry/apache_openoffice_in_2013_a">
+      <br />
+
+      <em>31 December:</em>
+      <br />
+      <a href="https://blogs.apache.org/OOo/entry/apache_openoffice_in_2013_a">
       Apache OpenOffice in 2013: a year in review</a>
       <br/>
     </p>
@@ -279,48 +426,68 @@ screen reader.
       </p>
       <p></p>
 
+
+      <h2>Udine moves to OpenOffice, will save 360,000 Euro</h2>
+       <p>
+        <em>16 September 2014:</em>
+        The City of Udine, in Italy, announced a process that will lead to the installation
+        of OpenOffice on 900 municipal desktops, saving the city 360,000 Euro.  
+        ZDNet's Raffaele Mastrolonardo has the <a href="http://www.zdnet.com/another-italian-city-announces-its-ditching-microsoft-windows-for-open-source-7000033682/">details</a>.
+    <p>
+
+
+
+
       <h2>Apache OpenOffice 4.1.1 released</h2>
 
-      <p><em>21 August 2014:</em>
-      The Apache OpenOffice project announces the   
-      <a href="https://blogs.apache.org/OOo/entry/announcing_apache_openoffice_4_1"
-      title="Offical blog post about Apache OpenOffice 4.1.1">official release of version 4.1.1</a>.
-      In the <a href="https://cwiki.apache.org/confluence/display/OOOUSERS/AOO+4.1.1+Release+Notes"
-      title="Release Notes for Apache OpenOffice 4.1.1">Release Notes</a> you can read about all new features, functions
-      and languages. <a href="https://www.openoffice.org/download/"
-      title="Download Apache OpenOffice 4.1.1">Don't miss to download</a> the new release and find out yourself.</p>
+      <p>
+        <em>21 August 2014:</em>
+        The Apache OpenOffice project announces the   
+        <a href="https://blogs.apache.org/OOo/entry/announcing_apache_openoffice_4_1"
+        title="Offical blog post about Apache OpenOffice 4.1.1">official release of version 4.1.1</a>.
+        In the <a href="https://cwiki.apache.org/confluence/display/OOOUSERS/AOO+4.1.1+Release+Notes"
+        title="Release Notes for Apache OpenOffice 4.1.1">Release Notes</a> you can read about all new features,
+        functions and languages. <a href="https://www.openoffice.org/download/"
+        title="Download Apache OpenOffice 4.1.1">Don't miss to download</a> the new release and find out yourself.
+      </p>
     </div>
 
     <div class="campaign">
       <h2>Apache OpenOffice 4.1.0 released</h2>
 
-      <p><em>29 April 2014:</em>
-      The Apache OpenOffice project announces the   
-      <a href="https://blogs.apache.org/OOo/entry/the_apache_openoffice_project_announce"
-      title="Offical blog post about Apache OpenOffice 4.1.0">official release of version 4.1.0</a>.
-      In the <a href="https://cwiki.apache.org/confluence/display/OOOUSERS/AOO+4.1+Release+Notes"
-      title="Release Notes for Apache OpenOffice 4.1.0">Release Notes</a> you can read about all new features, functions
-      and languages. <a href="https://www.openoffice.org/download/"
-      title="Download Apache OpenOffice 4.1.0">Don't miss to download</a> the new release and find out yourself.</p>
+      <p>
+        <em>29 April 2014:</em>
+        The Apache OpenOffice project announces the   
+        <a href="https://blogs.apache.org/OOo/entry/the_apache_openoffice_project_announce"
+        title="Offical blog post about Apache OpenOffice 4.1.0">official release of version 4.1.0</a>.
+        In the <a href="https://cwiki.apache.org/confluence/display/OOOUSERS/AOO+4.1+Release+Notes"
+        title="Release Notes for Apache OpenOffice 4.1.0">Release Notes</a> you can read about all new features,
+        functions and languages. <a href="https://www.openoffice.org/download/"
+        title="Download Apache OpenOffice 4.1.0">Don't miss to download</a> the new release and find out yourself.
+      </p>
     </div>
 
     <div class="campaign">
       <h2>100 Million downloads</h2>
 
-      <p><em>17 April 2014:</em>
-      The Apache OpenOffice project is proud to tell you that our software was   
-      <a href="https://blogs.apache.org/foundation/entry/the_apache_software_foundation_announces56"
-      title="Apache OpenOffice was downloaded 100 million times">downloaded over 100 million times</a>. Join us in
-      celebrating this big achievement!</p>
+      <p>
+        <em>17 April 2014:</em>
+        The Apache OpenOffice project is proud to tell you that our software was   
+        <a href="https://blogs.apache.org/foundation/entry/the_apache_software_foundation_announces56"
+        title="Apache OpenOffice was downloaded 100 million times">downloaded over 100 million times</a>. Join us in
+        celebrating this big achievement!
+      </p>
     </div>
 
     <div class="campaign">
       <h2>Italian region adopts OpenOffice, saves 2 Million Euro</h2>
 
-      <p><em>10 October 2013:</em>
-      The Italian administrative region of Emilia-Romagna announced plans to move to OpenOffice,
-      <a href="https://joinup.ec.europa.eu/community/osor/news/openoffice-italian-emilia-romagna-save-2-million">
-      saving 2 million euro</a>.</p>
+      <p>
+        <em>10 October 2013:</em>
+        The Italian administrative region of Emilia-Romagna announced plans to move to OpenOffice,
+        <a href="https://joinup.ec.europa.eu/community/osor/news/openoffice-italian-emilia-romagna-save-2-million">
+        saving 2 million euro</a>.
+      </p>
     </div>
 
     <div class="campaign">
@@ -338,9 +505,7 @@ screen reader.
         volunteers, be any good?<br /></strong><a href="why/why_volunteers.html">Read on for an answer...</a>
       </p>
     </div>
-
   </div>
-
 </div>
 
 <!-- Every new element and text that is defined below the previous DIV will be actually dislayed wrapped below this DIV

Modified: websites/staging/ooo-site/trunk/content/xx/participate/index.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/xx/participate/index.html (original)
+++ websites/staging/ooo-site/trunk/content/xx/participate/index.html Fri Dec 26 18:57:14 2014
@@ -24,7 +24,7 @@
     <h1 class="title">Get Involved</h1>
     <h2 id="why-get-involved-with-the-openoffice-project">Why get involved with the OpenOffice project?</h2>
 <p>There are many motivations for why volunteers participate in an open source project
-like OpenOffice.  Some of the more common ones include:</p>
+like OpenOffice. Some of the more common ones include:</p>
 <ul>
 <li>To help reduce the "digital divide" by ensuring continued access to free 
 high-quality free productivity applications world-wide.</li>
@@ -61,19 +61,24 @@ the community. We welcome and encourage
 as easy as possible for people to get involved. </p>
 <h2 id="how-to-get-started">How to get started</h2>
 <p>OpenOffice is a large, complex open source project, with a culture developed over 
-many years as an independent project, combined with our experience at Apache.  </p>
+many years as an independent project, combined with our experience at Apache.</p>
 <p>If you are familiar with Apache-style open source 
-development then you might just jump in.  Subscribe to a relevant project <a href="http://openoffice.apache.org/mailing-lists.html">mailing list</a>
-and introduce yourself.  We'll help you get started. </p>
-<p>If, however, you are new to Apache, or want a more methodical approach to getting started, then we have a set 
-of graduated <a href="http://openoffice.apache.org/orientation/index.html">New Volunteer Orientation Modules</a> designed 
-for new volunteers that takes you through a number of background topics related to Apache OpenOffice and how 
-we do things.</p>
-<p>Which path you take is up to you and is a matter of personal preference.  You can even do both.</p>
+development then you might just jump in. Subscribe to a relevant project 
+<a href="http://openoffice.apache.org/mailing-lists.html">mailing list</a>
+and introduce yourself. We'll help you get started. </p>
+<p>If, however, you are new to Apache, or want a more methodical approach to getting started, 
+then we have a set of graduated 
+<a href="http://openoffice.apache.org/orientation/index.html">New Volunteer Orientation Modules</a> 
+designed for new volunteers that takes you through a number of background topics related 
+to Apache OpenOffice and how we do things.</p>
+<p>Which path you take is up to you and is a matter of personal preference. You can even do both.</p>
 <p>We also maintain a list of specific areas where we need volunteers on our 
-<a href="https://cwiki.apache.org/confluence/display/OOOUSERS/Help+Wanted">Help Wanted</a> page of the wiki.</p>
-<p>If you are a student, looking to contribute to the project as part of your school work, please also see
-our <a href="/students.html">Advice for Students</a> page.</p>
+<a href="https://cwiki.apache.org/confluence/display/OOOUSERS/Help+Wanted">Help Wanted</a> 
+page of the wiki.</p>
+<p>If you are a student, looking to contribute to the project as part of your school work, 
+please also see our 
+<a href="/students.html">Advice for Students</a> 
+page.</p>
   </div>
 <!--#include virtual="/footer.html" -->
 </body>

Modified: websites/staging/ooo-site/trunk/content/xx/product/base.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/xx/product/base.html (original)
+++ websites/staging/ooo-site/trunk/content/xx/product/base.html Fri Dec 26 18:57:14 2014
@@ -24,35 +24,32 @@
     <h1 class="title">Apache OpenOffice Base</h1>
     <p class="rfloatimg"><a href="/product/pix/base-big.png" title="Click for bigger version"><img alt="Screendump of Apache OpenOffice Base" src="/product/pix/base.png" /></a></p>
 <p><strong>Base</strong> is a fully featured desktop database management system, designed to
-meet the needs of a broad array of users, from</p>
-<ul>
-<li>just tracking your personal CD collection, to</li>
-<li>producing a corporate monthly departmental sales report.</li>
-</ul>
-<p><strong>Base</strong> offers wizards to help users new to database design (or just new to
-<strong>Base</strong>) to create Tables, Queries, Forms and Reports, along with a set of
+meet the needs of a broad array of users, from tracking a personal CD collections, 
+to producing a corporate monthly departmental sales reports.</p>
+<p>Base offers wizards to help users new to database design (or Base) 
+to create Tables, Queries, Forms and Reports, along with a set of
 predefined table definitions for tracking Assets, Customers, Sales Orders,
 Invoices and much more.</p>
-<p>When a personal use database is all you need, <strong>Base</strong> offers the full HSQL
+<p>When a personal use database is all you need, Base offers the full HSQL
 relational database engine, configured for single user, with the data stored
-right in the <strong>Base</strong> file, as well as native support for dBase flat files.</p>
-<p>For power users in the enterprise, <strong>Base</strong> delivers native support drivers for
+right in the Base file, as well as native support for dBase flat files.</p>
+<p>For power users in the enterprise, Base delivers native support drivers for
 a variety of multi-user database engines: MySQL, Adabas D, MS Access and
 PostgreSQL. In addition, support for JDBC and ODBC standard drivers allows you
-to connect to virtually any existing database.</p>
-<p><strong>Base</strong> integrates seamlessly into the rest of the Apache OpenOffice suite
+to connect to virtually any database.</p>
+<p>Base integrates seamlessly into the rest of the Apache OpenOffice suite
 applications, for example:</p>
 <ul>
-<li>supplying address book data for mail merge in WRITER using the industry
+<li>Supplying address book data for mail merge in Writer using the industry
     standard LDAP protocol, or common address book formats such as Microsoft
     Outlook, Microsoft Windows and Mozilla; </li>
-<li>creating linked data ranges in CALC files for data pilot analysis or as the 
+<li>Creating linked data ranges in Calc files for data pilot analysis or as the 
     basis for charts.</li>
 </ul>
-<p>For more information on working with <strong>Base</strong>, please see the 
+<p>For more information on working with Base, please see the 
 <a href="http://wiki.services.openoffice.org/wiki/database">Apache OpenOffice Wiki Database</a> pages.</p>
-<p>For technical information, or to help make <strong>Base</strong> even better, stop by the 
-<a href="http://dba.openoffice.org/"><strong>Base</strong> project page</a>.</p>
+<p>For technical information, or to help make Base even better, stop by the 
+<a href="http://dba.openoffice.org/">Base project page</a>.</p>
   </div>
 <!--#include virtual="/footer.html" -->
 </body>

Modified: websites/staging/ooo-site/trunk/content/xx/product/calc.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/xx/product/calc.html (original)
+++ websites/staging/ooo-site/trunk/content/xx/product/calc.html Fri Dec 26 18:57:14 2014
@@ -23,18 +23,18 @@
     
     <h1 class="title">Apache OpenOffice Calc</h1>
     <p class="rfloatimg"><a href="/product/pix/calc-big.png" title="Click for bigger version"><img alt="Screendump of Apache OpenOffice Calc" src="/product/pix/calc.png" /></a></p>
-<p><em>The all-purpose spreadsheet</em></p>
-<p><strong>Calc</strong> is the spreadsheet program you've always wanted. Newcomers find it
+<p><em>The solution to storing all your numbers and lists!</em></p>
+<p><strong>Calc</strong> is the spreadsheet application you've always wanted. Newcomers find it
 intuitive and easy to learn; professional data miners and number crunchers will
 appreciate the comprehensive range of advanced functions.</p>
-<p>Advanced <em>DataPilot</em> technology makes it easy to pull in raw data from corporate
+<p><em>DataPilot</em> is an advanced technology that makes it easy to pull in raw data from corporate
 databases; cross-tabulate, summarize, and convert it into meaningful information.</p>
 <p><em>Natural language formulas</em> let you create formulas using words (e.g. "sales -
 costs").</p>
-<p>The <em>Intelligent Sum Button</em> inserts a sum function or a subtotal automatically,
+<p><em>Intelligent Sum Button</em> inserts a sum function or a subtotal automatically,
 depending on context.</p>
 <p><em>Wizards</em> guides you through choosing and using a comprehensive range of
-advanced spreadsheet functions, or <a href="http://templates.openoffice.org" title="Download Apache OpenOffice Templates">download templates</a> from our  Extensions
+advanced spreadsheet functions, or <a href="http://extensions.openoffice.org/templates" title="Download Apache OpenOffice Templates">download templates</a> from our Templates
 repository for ready-made spreadsheet solutions.</p>
 <p><em>Styles and Formatting</em> makes it easy to apply flexible cell formatting options,
 including freely rotating contents, templates, backgrounds, borders, and many
@@ -42,23 +42,23 @@ more. You can be your own spreadsheet ex
 functions, allowing you to concentrate on your real work.</p>
 <p><em>Scenario Manager</em> allows "what if ..." analysis at the touch of a button - e.g.
 compare profitability for high / medium / low sales forecasts.</p>
-<p><strong>Calc</strong>'s <em>solver</em> component allows solving optimization problems where the
+<p>Calc's <em>solver</em> component allows solving optimization problems where the
 optimum value of a particular spreadsheet cell has to be calculated based on
 constraints provided in other cells.</p>
-<p>Encourage collaborative working on spreadsheets with <strong>Calc</strong>'s multiple users
-support. By sharing a spreadsheet other users can easily add their data to the
+<p><em>Multiple users support</em> - Encourage collaborative work on spreadsheets. 
+By sharing a spreadsheet, other users can easily add their data to the
 spreadsheet. The spreadsheet owner can then easily integrate the new data with a
 few clicks. This collaboration feature helps avoid editing conflicts.</p>
 <p>Save your spreadsheets in OpenDocument format, the new international standard
 for office documents. This XML based format means you're not tied in to
-<strong>Calc</strong>. You can access your spreadsheets from any OpenDocument compliant
+Calc. You can access your spreadsheets from any OpenDocument compliant
 software.</p>
-<p>Of course, you are free to use your old Microsoft Excel spreadsheets, or save
-your work in Excel format for sending to people who are still locked into
-Microsoft products. If all they want to see is your results, then use Portable
-Document Format (.pdf) - no need to buy any extra software. Since version 3.0,
-<strong>Calc</strong> has been able to read .xlsx files created with Microsoft Office 2007 or
+<p>You are free to import your old Microsoft Excel spreadsheets, or save
+your work in Excel format for sending to people who are using Microsoft products.
+Calc is able to read .xlsx files created with Microsoft Office 2007 or
 Microsoft Office 2008 for Mac OS X.</p>
+<p>If you want to send your results to someone who doesn't have a spreadsheet application installed, 
+then use Portable Document Format (.pdf) - no need to buy or install any extra software. </p>
   </div>
 <!--#include virtual="/footer.html" -->
 </body>

Modified: websites/staging/ooo-site/trunk/content/xx/product/impress.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/xx/product/impress.html (original)
+++ websites/staging/ooo-site/trunk/content/xx/product/impress.html Fri Dec 26 18:57:14 2014
@@ -23,34 +23,30 @@
     
     <h1 class="title">Apache OpenOffice Impress</h1>
     <p class="rfloatimg"><a href="/product/pix/impress-big.png" title="Click for bigger version"><img alt="Screendump of Apache OpenOffice Impress" src="/product/pix/impress.png" /></a></p>
-<p><em>More power to your presentations</em></p>
+<p><em>Impress your audience with your presentations!</em></p>
 <p><strong>Impress</strong> is a truly outstanding tool for creating effective multimedia
 presentations. Your presentations will stand out with 2D and 3D clip art,
 special effects, animation, and high-impact drawing tools.</p>
 <p><em>Master Pages</em> simplify the task of preparing your materials. Save even more
-time by <a href="http://templates.openoffice.org" title="Download Apache OpenOffice Templates">downloading templates</a> from our Extensions repository.</p>
-<p>A <em>complete range of Views</em> are supported: Slides / Outline / Notes /
-Handouts to meet all the needs of presenters and audiences, plus an optional
+time by <a href="http://extensions.openoffice.org/templates" title="Download Apache OpenOffice Templates">downloading templates</a> from our Templates repository.</p>
+<p><em>Complete range of Views</em> are supported: Slides / Outline / Notes / Handouts
+to meet all the needs of presenters and audiences, plus an optional
 multi-pane view to put all the tools at your fingertips.</p>
-<p><strong>Impress</strong> supports multiple monitors, so that presenters can look at something
-else while presenting their slides on a projector. Make the most of this With
-the free <a href="http://extensions.openoffice.org/project/presenter-screen" title="Download the Presenter Console Extension">Presenter Console Extension</a>, which lets you see your next slides
+<p><em>Multiple monitors support</em> so that presenters can have additional materials or notes while presenting their slides on a projector. 
+Make the most of this with the free <a href="http://extensions.openoffice.org/project/presenter-screen" title="Download the Presenter Console Extension">Presenter Console Extension</a>, which lets you see your next slides
 as well as the time and the speaker notes.</p>
-<p><strong>Impress</strong> has a complete range of <em>easy-to-use drawing and diagramming tools</em>
-to spice up your presentation.</p>
-<p>'Park' your most commonly used drawing tools around your screen ready for
+<p><em>Easy-to-use drawing and diagramming tools</em> - a complete range to spice up your presentation. 'Park' your most commonly used drawing tools around your screen ready for
 single-click access.</p>
 <p><em>Slide show Animation and Effects</em> bring your presentation to life. Fontworks
 provides stunning 2D and 3D images from text. Create lifelike 3D images with
 astounding speed and response.</p>
-<p>Save your presentations in OpenDocument format, the new international standard
-for office documents. This XML based format means you're not tied in to
-<strong>Impress</strong>. You can access your presentations from any OpenDocument compliant
+<p><em>.odp Standard</em> - Save your presentations in OpenDocument format, the new international standard
+for office documents. This XML based format means you're not tied up with using
+Impress. You can access your presentations from any OpenDocument compliant
 software.</p>
-<p>Of course, you are free to use your old Microsoft PowerPoint presentations, or
-save your work in PowerPoint format for sending to people who are still locked
-into Microsoft products. Alternatively, use <strong>Impress</strong>'s built-in ability to
-create Flash (.swf) versions of your presentations.</p>
+<p><em>.ppt &amp; .pptx support</em> - Of course, you are free to import your old Microsoft PowerPoint presentations, or
+save your work in PowerPoint format for sending to people who are still using Microsoft products. </p>
+<p><em>Flash .swf Support</em> Alternatively, use Impress's built-in ability to create Flash versions of your presentations.</p>
   </div>
 <!--#include virtual="/footer.html" -->
 </body>

Modified: websites/staging/ooo-site/trunk/content/xx/product/linux.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/xx/product/linux.html (original)
+++ websites/staging/ooo-site/trunk/content/xx/product/linux.html Fri Dec 26 18:57:14 2014
@@ -23,13 +23,8 @@
     
     <h1 class="title">Apache OpenOffice for Linux</h1>
     <h2 id="linux-distroversion-support">Linux Distro/Version Support</h2>
-<p>The current Apache OpenOffice supports the following Linux distros and versions...</p>
-<p>Specific distro notes:</p>
-<ul>
-<li>distro a:  notes...</li>
-<li>distro b:  notes...</li>
-<li>distro c:  notes...</li>
-</ul>
+<p>The current Apache OpenOffice supports most existing Linux
+distributions and versions.</p>
 <p>In general the following is needed:</p>
 <ul>
 <li>Linux kernel version 2.6 or higher, glibc2 version 2.11.1 or higher</li>
@@ -40,13 +35,6 @@
 <li><strong>Storage</strong>: At least 400 Mbytes available disk space for a default install via download.</li>
 <li><strong>Graphics</strong>: X-Server with 1024 x 768 or higher resolution with at least 256 colours.</li>
 </ul>
-<h2 id="linux-specific-features">Linux-specific Features</h2>
-<p>Apache OpenOffice has the following special features on Linux:</p>
-<ul>
-<li>feature 1</li>
-<li>feature 2</li>
-<li>feature 3</li>
-</ul>
 <h2 id="additional-resources">Additional Resources</h2>
 <ul>
 <li>Click here to <a href="http://www.openoffice.org/download/">download</a></li>

Modified: websites/staging/ooo-site/trunk/content/xx/product/mac.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/xx/product/mac.html (original)
+++ websites/staging/ooo-site/trunk/content/xx/product/mac.html Fri Dec 26 18:57:14 2014
@@ -23,14 +23,10 @@
     
     <h1 class="title">Apache OpenOffice for MacOS X</h1>
     <h2 id="macos-x-version-support">MacOS X Version Support</h2>
-<p>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)</p>
-<p>Specific platform version notes:</p>
-<ul>
-<li>version a:  notes...</li>
-<li>version b:  notes...</li>
-<li>version c:  notes...</li>
-</ul>
+<p>The current Apache OpenOffice supports Apple MacOS X version
+10.7 (Lion), 10.8 (Mountain Lion), 10.9 (Mavericks), 10.10 (Yosemite).</p>
+<p>The last OpenOffice version supporting the old MacOS X 10.4 (Tiger),
+10.5 (Leopard), 10.6 (Snow Leopard) is OpenOffice 4.0.1.</p>
 <h2 id="hardware-requirements">Hardware Requirements</h2>
 <ul>
 <li><strong>CPU</strong>: Intel Processor</li>
@@ -38,13 +34,6 @@
 <li><strong>Storage</strong>: At least 400 Mbytes available disk space for a default install via download.</li>
 <li><strong>Graphics</strong>: 1024 x 768 or higher resolution with 16.7 million colours.</li>
 </ul>
-<h2 id="mac-specific-features">Mac-specific Features</h2>
-<p>Apache OpenOffice has the following special features on MacOS X:</p>
-<ul>
-<li>feature 1</li>
-<li>feature 2</li>
-<li>feature 3</li>
-</ul>
 <h2 id="additional-resources">Additional Resources</h2>
 <ul>
 <li>Click here to <a href="http://www.openoffice.org/download/">download</a></li>

Modified: websites/staging/ooo-site/trunk/content/xx/product/math.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/xx/product/math.html (original)
+++ websites/staging/ooo-site/trunk/content/xx/product/math.html Fri Dec 26 18:57:14 2014
@@ -23,18 +23,18 @@
     
     <h1 class="title">Apache OpenOffice Math</h1>
     <p class="rfloatimg"><a href="/product/pix/math-big.png" title="Click for bigger version"><img alt="Screendump of Apache OpenOffice Math" src="/product/pix/math.png" /></a></p>
-<p><em>Create equations and formulae for your documents</em></p>
-<p><strong>Math</strong> is Apache OpenOffice's component for mathematical equations. It is most
+<p><em>Simple to create equations and formulae for your documents!</em></p>
+<p>Math is Apache OpenOffice's component for mathematical equations. It is most
 commonly used as an equation editor for text documents, but it can also be used
-with other types of documents or stand-alone. When used inside <strong>Writer</strong>, the
+with other types of documents or stand-alone. When used inside Writer, the
 equation is treated as an object inside the text document. Similarly, one can
 also insert these into other Apache OpenOffice programs like <a href="calc.html" title="Apache OpenOffice Calc">Calc</a> and
 <a href="impress.html" title="Apache OpenOffice Impress">Impress</a>.</p>
-<p>Using <strong>Math</strong>, there are three main ways of entering a formula:</p>
+<p>Using Math, there are three main ways of entering a formula:</p>
 <ul>
 <li>Type markup in the equation editor.</li>
 <li>Right-click on the equation editor and select the symbol from the context menu.</li>
-<li>Select a symbol from the <em>Selection</em> toolbox.</li>
+<li>Select a symbol from the <em>Elements</em> toolbox.</li>
 </ul>
   </div>
 <!--#include virtual="/footer.html" -->

Modified: websites/staging/ooo-site/trunk/content/xx/product/suite.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/xx/product/suite.html (original)
+++ websites/staging/ooo-site/trunk/content/xx/product/suite.html Fri Dec 26 18:57:14 2014
@@ -53,7 +53,7 @@ office package.</p>
 <p>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.</p>
+  data from any OpenDocument compliant software.</p>
 </li>
 <li>
 <p>All the packages are installed in one single operation, using the installation
@@ -64,7 +64,8 @@ office package.</p>
   no hidden charges now or in the future.</p>
 </li>
 </ul>
-<p>Everything you need in an office productivity suite - <a href="/download/" title="Download Apache OpenOffice">get it today</a>!</p>
+<p>Everything you need in an office productivity suite - 
+<a href="/download/" title="Download Apache OpenOffice">get it today</a>!</p>
   </div>
 <!--#include virtual="/footer.html" -->
 </body>

Modified: websites/staging/ooo-site/trunk/content/xx/product/windows.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/xx/product/windows.html (original)
+++ websites/staging/ooo-site/trunk/content/xx/product/windows.html Fri Dec 26 18:57:14 2014
@@ -30,11 +30,13 @@
 <li><strong>Windows XP</strong>: Tested, stable, no platform-specific problems known.</li>
 <li><strong>Windows Vista</strong>: Tested, stable, no platform-specific problems known.</li>
 <li><strong>Windows 7</strong>: Tested, stable.</li>
-<li><strong>Windows 8</strong>: 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.</li>
+<li><strong>Windows 8</strong>: 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.</li>
 </ul>
-<p><strong>Pleae note</strong>: Apache OpenOffice is distributed as a 32-bit application. It will run successfully in
+<p><strong>Please note</strong>: 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 <a href="http://www.openoffice.org/download/common/java.html">here</a>.</p>
+for some functionality. Details are 
+<a href="http://www.openoffice.org/download/common/java.html">here</a>.</p>
 <h2 id="hardware-requirements">Hardware Requirements</h2>
 <p>Hardware demands are quite modest and even older machines should be able to run OpenOffice:</p>
 <ul>
@@ -45,13 +47,17 @@ for some functionality. Details are <a h
 <h2 id="windows-specific-features">Windows-specific Features</h2>
 <p>Apache OpenOffice has the following special features on Windows:</p>
 <ul>
-<li>Mail client integration via Messaging Application Programming Interface <a href="http://msdn.microsoft.com/en-us/library/exchange/aa142548%28v=exchg.65%29.aspx">(MAPI)</a></li>
+<li>Mail client integration via Messaging Application Programming Interface 
+    <a href="http://msdn.microsoft.com/en-us/library/exchange/aa142548%28v=exchg.65%29.aspx">(MAPI)</a></li>
 </ul>
 <h2 id="additional-resources">Additional Resources</h2>
 <ul>
-<li>Click here to <a href="http://www.openoffice.org/download/">download</a></li>
-<li>Click here to get <a href="http://www.openoffice.org/download/common/instructions.html#win">Install intructions for OpenOffice on Windows</a></li>
-<li>Click here to get help and support in the <a href="http://forum.openoffice.org/">Community Support Forums</a></li>
+<li>Click here to 
+    <a href="http://www.openoffice.org/download/">download</a></li>
+<li>Click here to get 
+    <a href="http://www.openoffice.org/download/common/instructions.html#win">Install intructions for OpenOffice on Windows</a></li>
+<li>Click here to get help and support in the 
+    <a href="http://forum.openoffice.org/">Community Support Forums</a></li>
 </ul>
   </div>
 <!--#include virtual="/footer.html" -->

Modified: websites/staging/ooo-site/trunk/content/xx/product/writer.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/xx/product/writer.html (original)
+++ websites/staging/ooo-site/trunk/content/xx/product/writer.html Fri Dec 26 18:57:14 2014
@@ -23,47 +23,46 @@
     
     <h1 class="title">Apache OpenOffice Writer</h1>
     <p class="rfloatimg"><a href="/product/pix/writer-big.png" title="Click for bigger version"><img alt="Screendump of Apache OpenOffice Writer" src="/product/pix/writer.png" /></a></p>
-<p><em>For all your documents</em></p>
+<p><em>Letting you concentrate on writing your ideas</em></p>
 <p><strong>Writer</strong> has everything you would expect from a modern, fully equipped word
-processor or desktop publisher.</p>
-<p>It's simple enough for a quick memo, powerful enough to create complete books
+processor.</p>
+<p>It is simple enough for a quick memo, yet powerful enough to create complete books
 with contents, diagrams, indexes, etc. You're free to concentrate on your
-message - while <strong>Writer</strong> makes it look great.</p>
-<p>The <em>Wizards</em> takes all the hassle out of producing standard documents such as
+ideas while Writer makes them look great.</p>
+<p><em>Wizards</em> take all the hassle out of producing standard documents such as
 letters, faxes, agendas, minutes, or carrying out more complex tasks such as
-mail merges. You are of course free to create your own templates, or
-<a href="http://templates.openoffice.org" title="Download Apache OpenOffice Templates">download templates</a> from our Extensions repository.</p>
+mail merges. Of course, you are also free to create your own templates, or
+<a href="http://templates.openoffice.org" title="Download Apache OpenOffice Templates">download templates</a> from our Templates repository.</p>
 <p><em>Styles and Formatting</em> puts the power of style sheets into the hands of every
 user.</p>
-<p>Trap typing mistakes on the fly with the <em>AutoCorrect dictionary</em>, which can
-check your spelling as you type. If you need to use different languages in your
-document - <strong>Writer</strong> can handle that too.</p>
-<p>Reduce typing effort with <em>AutoComplete</em>, which suggests common words and
+<p><em>AutoCorrect dictionary</em> can trap typing mistakes on the fly, 
+checking your spelling as you type. Writer can handle the use of different languages in your
+document too.</p>
+<p><em>AutoComplete</em> reduces typing effort, it will suggest common words and
 phrases to complete what you are typing.</p>
 <p><em>Text frames</em> and <em>linking</em> give you the power to tackle desktop publishing
 tasks for newsletters, flyers, etc. laid out exactly the way you want them to
 be.</p>
-<p>Increase the usefulness of your long, complex documents by generating a table of
-contents or indexing terms, bibliographical references, illustrations, tables,
-and other objects.</p>
-<p><strong>Writer</strong> can also display multiple pages while you edit - ideal for complex
-documents, or if you have a large monitor (or multiple monitors).</p>
-<p>The advanced notes feature displays notes on the side of the document. This
+<p><em>Table of Contents &amp; References</em> - Increase the usefulness of your long, complex documents 
+by generating a table of contents or indexing terms, bibliographical references, illustrations, 
+tables, and other objects.</p>
+<p><em>Multi-page display</em> - Writer can also display multiple pages while you edit - ideal for complex
+documents. Works well with large and multiple monitors.</p>
+<p><em>Notes</em> - The notes feature displays notes and comments on the side of the document. This
 makes notes a lot easier to read. In addition, notes from different users are
 displayed in different colors together with the editing date and time.</p>
-<p>Make your documents freely available with <strong>Writer</strong>'s HTML export to the web,
+<p><em>HTML, PDF, MediaWiki formats</em> - Make your documents freely available with Writer's HTML export to the web,
 or export in MediaWiki format for publishing to wikis. Publish in Portable
 Document Format (.pdf) to guarantee that what you write is what your reader
 sees. The PDF export feature in Apache OpenOffice provides a huge set of formatting
 and security options; so that PDF files can be customized for many different
 scenarios, including ISO standard PDF/A files.</p>
-<p>Save your documents in OpenDocument format, the new international standard for
-office documents. This XML based format means you're not tied in to <strong>Writer</strong>.
+<p><em>.odt Standard</em> - Save your documents in OpenDocument format, the new international standard for
+office documents. This XML based format means you're not tied in to Writer.
 You can access your documents from any OpenDocument compliant software.</p>
-<p><strong>Writer</strong> can of course read all your old Microsoft Word documents, or save
-your work in Microsoft Word format for sending to people who are still locked
-into Microsoft products. From version 3.0 <strong>Writer</strong> can also open .docx files
-created with Microsoft Office 2007 or Microsoft Office 2008 for Mac OS X.</p>
+<p><em>.docx &amp; .doc support</em> - Writer can of course read all your older Microsoft Word documents, or save
+your work in Microsoft Word format for sending to people who are still using
+Microsoft products. Writer can also open .docx files created with Microsoft Office 2007 or Microsoft Office 2008 for Mac OS X.</p>
   </div>
 <!--#include virtual="/footer.html" -->
 </body>

Modified: websites/staging/ooo-site/trunk/content/xx/support/index.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/xx/support/index.html (original)
+++ websites/staging/ooo-site/trunk/content/xx/support/index.html Fri Dec 26 18:57:14 2014
@@ -31,10 +31,10 @@
 Welcome to the Apache OpenOffice Support area. Listed here are links to:
 <ul>
     <li>
-        <a href="#rtfm">Product documentation</a>
+        <a href="#community-support">Community support</a>
     </li>
     <li>
-        <a href="#community-support">Community support</a>
+        <a href="#rtfm">Product documentation</a>
     </li>
      <li>
         <a href="#professional-services">Professional services</a>
@@ -48,50 +48,26 @@ Welcome to the Apache OpenOffice Support
 </ul>
 </p>
 
-<a name="rtfm" id="rtfm"></a> 
-<span class="supporthead">OpenOffice Documentation</span>
-<div class="support">
-    <ul>
-        <li>
-            <span class='title'>
-            <a href="http://wiki.services.openoffice.org/wiki/Documentation">OpenOffice Wiki: Documentation area</a>
-            </span>
-            <br />
-            FAQs, User Guides, How-To's, Tutorials, Installation, etc.  Highly recommended 
-            as initial source of self-support for new users.
-        </li>
-
-        <li>
-            <span class='title'>
-            <a href="http://qa.openoffice.org/issue_handling/pre_submission.html">Issue Tracker (bug reporting and lookup)</a>
-            </span>
-            <br />
-            Good place to check to see if a bug is already known.  Anyone can search for 
-            bugs, but you must register to submit a new issue.
-        </li>
-    </ul>
-    
 
     <a name="community-support" id="community-support"></a> 
-    <span class="supporthead">OpenOffice Community Support</span>
+    <span class="supporthead">OpenOffice Community Support </span>
     <div class="support">
         <ul>
             <li>
                 <span class='title'>
-                <a href="http://user.services.openoffice.org/">The Apache OpenOffice Community Forum</a>
+                <a href="http://forum.openoffice.org/">The Apache OpenOffice Community Forum</a>
                 </span>
                 <br/>
-                The premier forum for OpenOffice users; immensely useful and recommended.  Free 
-                support from volunteers in the community.
+                The premier forum for OpenOffice users; immensely useful and recommended.  Get free help from volunteers in the community. The forum volunteers can help with everything from installation to "how tos" on advanced topics. 
             </li>
             <li>
                 <span class='title'>
-                Users Mail List
+                <a href="http://openoffice.apache.org/mailing-lists.html#users-mailing-list-public">Users Mail List</a>
                 </span>
                 &nbsp;(<a href="mailto:users-subscribe@openoffice.apache.org?subject=subscribe%20users">Subscribe</a> 
-                / <a href="https://openoffice.apache.org/mailing-lists.html#users-mailing-list">Archives</a>)
+                / <a href="https://openoffice.apache.org/mailing-lists.html#users-mailing-list-public">Archives</a>)
                 <br>
-                Another community support option, via a public mailing list.  You must subscribe to the list if you want to view responses to your question.
+                Another community support option, via a public mailing list.  You must subscribe to the list if you want to view responses to your question. 
             </li>
             <li>
                 <span class='title'>
@@ -100,8 +76,31 @@ Welcome to the Apache OpenOffice Support
                 <br />
                 Mailing lists for several native languages.
             </li>
+             <li>
+            <span class='title'>
+            <a href="http://qa.openoffice.org/issue_handling/pre_submission.html">Issue Tracker (bug reporting and lookup)</a>
+            </span>
+            <br />
+            A good place to check to see if a bug is already known.  Anyone can search for bugs, but you must register to submit a new issue. <br /><em>Note:</em> This is not the way to get help for general problems. Please use the Forums or Users mailing list for these types of problems. 
+        </li>
+		</ul>
 
     </div>
+    
+<a name="rtfm" id="rtfm"></a> 
+<span class="supporthead">OpenOffice Documentation</span>
+<div class="support">
+    <ul>
+        <li>
+            <span class='title'>
+            <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 
+            as initial source of self-support for new users.
+        </li>
+    </ul>
+  </div>
 
  
    <a name="professional-services" id="professional-services"></a> 
@@ -113,7 +112,7 @@ Welcome to the Apache OpenOffice Support
     <a name="books" id="books"></a> 
     <span class='supporthead'>Books about OpenOffice</span>
     <div class="support">
-        <p>On our <a href="/support/books.html">Books page</a> you will find a listing of the many books written about OpenOffice topics, for general and specialized use.</p>
+        <p>On our <a href="books.html">Books page</a> you will find a listing of the many books written about OpenOffice topics, for general and specialized use.</p>
 
    <a name="online-resources" id="online-resources"></a> 
     <span class='supporthead'>Online Resources</span>
@@ -122,7 +121,7 @@ Welcome to the Apache OpenOffice Support
         <ul>
             <li>
                 <span class='title'>
-                <a rel="nofollow" href="http://www.oooforum.org/">The (Unofficial) OpenOffice Forum</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 
@@ -132,7 +131,7 @@ Welcome to the Apache OpenOffice Support
                 <a rel="nofollow" href="http://www.tutorialsforopenoffice.org/">Tutorials for OpenOffice</a>
                 </span>
                 <br />
-                Tutorials for anyone learning or teaching OpenOffice.org
+                Tutorials for anyone learning or teaching OpenOffice
             </li>
             <li>
                 <span class='title'>

Modified: websites/staging/ooo-site/trunk/content/xx/topnav.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/xx/topnav.html (original)
+++ websites/staging/ooo-site/trunk/content/xx/topnav.html Fri Dec 26 18:57:14 2014
@@ -2,7 +2,8 @@
 <li><a href="/xx/product/" title="Apache OpenOffice product description">Product</a></li>
 <li><a href="/xx/download/" title="Download Apache OpenOffice">Download</a></li>
 <li><a href="/xx/support/" title="Find Support for OpenOffice">Support</a></li>
-<li><a href="http://blogs.apache.org/ooo/" title="Apache OpenOffice Blog">Blog</a></li>
+<li><a href="http://blogs.apache.org/ooo/" title="Apache OpenOffice Blog">Blog (official)</a></li>
+<li><a href="http://openoffice.xx/" title="Apache OpenOffice blog in your own language">Blog (native)</a></li>
 <li><a href="/xx/extensions/" title="Extensions and Templates for OpenOffice">Extend</a></li>
 <li><a href="/xx/participate/" title="Get involved in Apache OpenOffice">Get Involved</a></li>
 </ul></div>

Modified: websites/staging/ooo-site/trunk/content/xx/why/index.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/xx/why/index.html (original)
+++ websites/staging/ooo-site/trunk/content/xx/why/index.html Fri Dec 26 18:57:14 2014
@@ -36,7 +36,7 @@
 </li>
 <li>
 <p><a href="why_free.html">and it's free</a></p>
-<p>Best of all, Apache OpenOffice can be downloaded and used entirely free of any license fees. Apache OpenOffice is released under the Apache 2.0 License. This means you may use it for any purpose - domestic, commercial, educational, public administration. You may install it on as many computers as you like. You may make copies and give them away to family, friends, students, employees - anyone you like.</p>
+<p>Best of all, Apache OpenOffice can be downloaded and used entirely <strong>free</strong> of any license fees. Like all Apache Software Foundation software, Apache OpenOffice is <a href="http://www.apache.org/free/">free to use</a>. Apache OpenOffice is released under the <a href="http://www.apache.org/licenses/LICENSE-2.0.html">Apache 2.0 License</a>. This means you may use it for any purpose - domestic, commercial, educational, public administration. You may install it on as many computers as you like. You may make copies and give them away to family, friends, students, employees - anyone you like.</p>
 </li>
 </ul>
 <h2 id="where-is-apache-openoffice-currently-used">Where is Apache OpenOffice currently used?</h2>

Modified: websites/staging/ooo-site/trunk/content/xx/why/why_foss.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/xx/why/why_foss.html (original)
+++ websites/staging/ooo-site/trunk/content/xx/why/why_foss.html Fri Dec 26 18:57:14 2014
@@ -3,7 +3,7 @@
 <head>
 <link href="/css/ooo.css" rel="stylesheet" type="text/css">
 
-<title>Why OpenOffice.org: Free/Open-Source Software</title>
+<title>Why Apache OpenOffice: Free/Open-Source Software</title>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 
 
@@ -21,7 +21,7 @@
   
   <div id="content">
     
-    <h1 class="title">Why OpenOffice.org: Free/Open-Source Software</h1>
+    <h1 class="title">Why Apache OpenOffice: Free/Open-Source Software</h1>
     <p class="rfloatimg"><img alt="Why Apache OpenOffice: Free/Open-Source Software" src="/why/images/why_foss.png" /></p>
 <p>Free/Open-Source Software (F/OSS) proponents are turning to Apache OpenOffice both as end-users and as contributors. With its <strong>flexible word processor</strong>, <strong>powerful spreadsheet</strong>, <strong>dynamic graphics</strong>, <strong>database access</strong> and more, OpenOffice is the office suite of choice of millions of users.</p>
 <p>OpenOffice is released under the OSI approved Apache License terms, with over 750 contributors and an international community approaching 400,000 individuals.</p>

Modified: websites/staging/ooo-site/trunk/content/xx/why/why_oem.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/xx/why/why_oem.html (original)
+++ websites/staging/ooo-site/trunk/content/xx/why/why_oem.html Fri Dec 26 18:57:14 2014
@@ -3,7 +3,7 @@
 <head>
 <link href="/css/ooo.css" rel="stylesheet" type="text/css">
 
-<title>Why OpenOffice.org: IT business</title>
+<title>Why Apache OpenOffice: IT business</title>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 
 
@@ -21,7 +21,7 @@
   
   <div id="content">
     
-    <h1 class="title">Why OpenOffice.org: IT business</h1>
+    <h1 class="title">Why Apache OpenOffice: IT business</h1>
     <p class="rfloatimg"><img alt="Why Apache OpenOffice: IT business" src="/why/images/why_oem.png" /></p>
 <p>Build your business around Apache OpenOffice. If you're in the IT business, OpenOffice can mean good business for you. The <strong>flexible word processor</strong>, <strong>powerful spreadsheet</strong>, <strong>dynamic graphics</strong>, <strong>database access</strong> and more meet all the requirements for an office software package.</p>
 <p>Use OpenOffice to add value for your clients, free of license costs and onerous licensing conditions.</p>

Modified: websites/staging/ooo-site/trunk/content/xx/why/why_office2003-end-of-life.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/xx/why/why_office2003-end-of-life.html (original)
+++ websites/staging/ooo-site/trunk/content/xx/why/why_office2003-end-of-life.html Fri Dec 26 18:57:14 2014
@@ -3,7 +3,7 @@
 <head>
 <link href="/css/ooo.css" rel="stylesheet" type="text/css">
 
-<title>Office 2003 End of Life</title>
+<title>Why Apache OpenOffice: Office 2003 End of Life</title>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 
 
@@ -21,7 +21,7 @@
   
   <div id="content">
     
-    <h1 class="title">Office 2003 End of Life</h1>
+    <h1 class="title">Why Apache OpenOffice: Office 2003 End of Life</h1>
     <h2 id="the-april-2014-deadline">The April 2014 deadline</h2>
 <p>Microsoft has <a href="http://www.microsoft.com/en-us/windows/endofsupport.aspx">announced</a> that they are ending support of Office 2003 and Windows XP on April 8th, 2014.  What does this mean?  As they describe,
 "After April 8, 2014, there will be no new security updates, non-security hotfixes, free or paid assisted support options or online technical content updates."  This,