You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ma...@apache.org on 2012/08/26 19:44:40 UTC

svn commit: r1377470 - in /incubator/ooo/ooo-site/trunk/content/download/test: globalvars_print.js other_print.html print_tables_aoo.js

Author: marcus
Date: Sun Aug 26 17:44:39 2012
New Revision: 1377470

URL: http://svn.apache.org/viewvc?rev=1377470&view=rev
Log:
Deleted some old 'OpenOffice.org' terms

Modified:
    incubator/ooo/ooo-site/trunk/content/download/test/globalvars_print.js
    incubator/ooo/ooo-site/trunk/content/download/test/other_print.html
    incubator/ooo/ooo-site/trunk/content/download/test/print_tables_aoo.js

Modified: incubator/ooo/ooo-site/trunk/content/download/test/globalvars_print.js
URL: http://svn.apache.org/viewvc/incubator/ooo/ooo-site/trunk/content/download/test/globalvars_print.js?rev=1377470&r1=1377469&r2=1377470&view=diff
==============================================================================
--- incubator/ooo/ooo-site/trunk/content/download/test/globalvars_print.js (original)
+++ incubator/ooo/ooo-site/trunk/content/download/test/globalvars_print.js Sun Aug 26 17:44:39 2012
@@ -5,9 +5,9 @@
    Example:
 
    Wrong:   "We are proud to announce the availability of our new
-             OpenOffice.org 3.0.0 release."
+             Apache OpenOffice 3.4.0 release."
    Correct: "We are proud to announce the availability of our new
-             OpenOffice.org " + VERSION + " release."
+             Apache OpenOffice " + VERSION + " release."
 
    VERSION: set the current release version, e.g., "3.4.0"
    MIRROR:  set default mirror site with "sourceforge", "apache" or "mirrorbrain"
@@ -92,7 +92,7 @@ var AOO_SCHEMA      = "aoo";
 //Data for the most recent Beta Release
 // var BETA_NAME      = "3.4 Beta ";
 // var BETA_BUILD     = "3.4beta";
-// var BETA_VERSION   = "OOO340m0";
+// var BETA_VERSION   = "r123456OOO340m0";
 // var BETA_NUMBER    = 1;
 // var BETA_ACTIVE    = 1;
 // var BETA_PPC       = 0;

Modified: incubator/ooo/ooo-site/trunk/content/download/test/other_print.html
URL: http://svn.apache.org/viewvc/incubator/ooo/ooo-site/trunk/content/download/test/other_print.html?rev=1377470&r1=1377469&r2=1377470&view=diff
==============================================================================
--- incubator/ooo/ooo-site/trunk/content/download/test/other_print.html (original)
+++ incubator/ooo/ooo-site/trunk/content/download/test/other_print.html Sun Aug 26 17:44:39 2012
@@ -73,7 +73,7 @@
 
 <h3 id='notes'>Important Notes:</h3>
 <ul>
-  <li>A <a href="http://wiki.services.openoffice.org/wiki/Languagepack" title="What is a language pack">language pack</a>
+  <li>A <a href="http://wiki.openoffice.org/wiki/Languagepack" title="What is a language pack">language pack</a>
   is not a release for its own and has to be installed over a stable release with the same version number and platform.
   It contains resource files for a specific language and platform to show, e.g., menus, dialogs, error messages in your
   language. It may contain translated Help content. Language packs are created if at least 80% of the user interface (UI)
@@ -129,7 +129,7 @@ Development mailing list</a>.&nbsp;<b>*)
 <ul>
   <li><a href="mailto:ooo-users%40incubator.apache.org"
   title="User's mailing list (to receive answers you need to be subscribed)">User's mailing list</a>&nbsp;<b>*)</b></li>
-  <li><a href="http://user.services.openoffice.org" title="User forums (different languages)">
+  <li><a href="http://user.openoffice.org" title="User forums (different languages)">
   User forums (different languages)</a></li>
   <li><a href="http://www.oooforum.org" title="Another user forums">Another user forums</a></li>
 </ul>

Modified: incubator/ooo/ooo-site/trunk/content/download/test/print_tables_aoo.js
URL: http://svn.apache.org/viewvc/incubator/ooo/ooo-site/trunk/content/download/test/print_tables_aoo.js?rev=1377470&r1=1377469&r2=1377470&view=diff
==============================================================================
--- incubator/ooo/ooo-site/trunk/content/download/test/print_tables_aoo.js (original)
+++ incubator/ooo/ooo-site/trunk/content/download/test/print_tables_aoo.js Sun Aug 26 17:44:39 2012
@@ -44,7 +44,7 @@ function write_table( REL_MODE ) {
 		var AOO		= "/Apache_OpenOffice_incubating_";
 		var AOO_SDK	= "/Apache_OpenOffice_incubating-SDK_";
 		var BUILD	= RC_BUILD;
-		var NAME	= "OpenOffice.org " + RC_NAME + RC_NUMBER + " - Full installation sets and language packs";
+		var NAME	= "Apache OpenOffice " + RC_NAME + RC_NUMBER + " - Full installation sets and language packs";
 		var DEV		= "";
 	} else if ( REL_MODE == "beta" ) {
 		var PLATFORM	= BETA_PLATFORM;
@@ -54,7 +54,7 @@ function write_table( REL_MODE ) {
 		var AOO		= "/Apache_OpenOffice_incubating-Dev_";
 		var AOO_SDK	= "/Apache_OpenOffice_incubating-Dev-SDK_";
 		var BUILD	= BETA_BUILD;
-		var NAME	= "OpenOffice.org " + BETA_NAME + BETA_NUMBER + " - Full installation sets and language packs";
+		var NAME	= "Apache OpenOffice " + BETA_NAME + BETA_NUMBER + " - Full installation sets and language packs";
 		var DEV		= "";
 	} else if ( REL_MODE == "dev1" ) {
 		var PLATFORM	= DEV1_PLATFORM;
@@ -64,7 +64,7 @@ function write_table( REL_MODE ) {
 		var AOO		= "/Apache_OpenOffice_incubating-Dev_";
 		var AOO_SDK	= "/Apache_OpenOffice_incubating-Dev-SDK_";
 		var BUILD	= DEV1_VERSION;
-		var NAME	= "OpenOffice.org - Builds from the release codeline " + DEV1_TEXT + " (milestone " + DEV1_VERSION + ")";
+		var NAME	= "Apache OpenOffice - Builds from the release codeline " + DEV1_TEXT + " (milestone " + DEV1_VERSION + ")";
 		var DEV		= "developer/";
 	} else if ( REL_MODE == "dev2" ) {
 		var PLATFORM	= DEV2_PLATFORM;
@@ -74,7 +74,7 @@ function write_table( REL_MODE ) {
 		var AOO		= "/Apache_OpenOffice_incubating-Dev_";
 		var AOO_SDK	= "/Apache_OpenOffice_incubating-Dev-SDK_";
 		var BUILD	= DEV2_VERSION;
-		var NAME	= "OpenOffice.org - Builds from the developer codeline " + DEV2_TEXT + " (milestone " + DEV2_VERSION + ")";
+		var NAME	= "Apache OpenOffice - Builds from the developer codeline " + DEV2_TEXT + " (milestone " + DEV2_VERSION + ")";
 		var DEV		= "developer/";
 	} else {
 		// Write a hint when the release mode is unknown to have a starting point for debugging
@@ -440,11 +440,11 @@ function write_sdk( REL_MODE, URL_SDK, U
 	document.write( "<tr class='a'><td>-</td><td>-</td><td><small>Other&nbsp;files</small></td>" );
 
 	if ( REL_MODE == "aoo" || REL_MODE == "rc" || REL_MODE == "beta" ) {
-		document.write( "<td style='text-align: center'><a href='http://development.openoffice.org/releases/" + BUILD + ".html'>         AOO<br />Release<br />Notes</a></td>" );
+		document.write( "<td style='text-align: center'><a href='http://www.openoffice.org/development/releases/" + BUILD + ".html'>         AOO<br />Release<br />Notes</a></td>" );
 		document.write( "<td>&nbsp;</td>" );
-		document.write( "<td style='text-align: center'><a href='http://development.openoffice.org/releases/" + BUILD + "_sdk.html'>     SDK<br />Release<br />Notes</a></td>" );
+		document.write( "<td style='text-align: center'><a href='http://www.openoffice.org/development/releases/" + BUILD + "_sdk.html'>     SDK<br />Release<br />Notes</a></td>" );
 	} else {
-		document.write( "<td style='text-align: center'><a href='http://development.openoffice.org/releases/" + BUILD + "_snapshot.html'>AOO<br />Release<br />Notes</a></td>" );
+		document.write( "<td style='text-align: center'><a href='http://www.openoffice.org/development/releases/" + BUILD + "_snapshot.html'>AOO<br />Release<br />Notes</a></td>" );
 		document.write( "<td>&nbsp;</td>" );
 		document.write( "<td>&nbsp;</td>" );
 	}