highlight go-oo obsoletion on the front page and fix linksgo-oo

4 files changed, 31 insertions, 29 deletions

diff --git a/developers/mailarchive/index.html b/developers/mailarchive/index.html
index 3ea6189..b996dbc 100644
--- a/developers/mailarchive/index.html
+++ b/developers/mailarchive/index.html
@@ -23,7 +23,7 @@
 <li class="tabs-selected"><a href="http://www.libreoffice.org/developers/">Developers</a></li>
                 </ul>
                 <div id="tagline">
-                        <a href="http://www.go-oo.org">Better, Faster, Free-er</a>
+                        <a href="http://www.libreoffice.org">LibreOffice is now Better, Faster, Free-er</a>
                 </div>
 
                 <div class="container">
diff --git a/index.html b/index.html
index 96f76af..9748629 100644
--- a/index.html
+++ b/index.html
@@ -23,17 +23,29 @@
 <li class="tabs-container"><a href="http://www.libreoffice.org/developers/">Developers</a></li>
                 </ul>
                 <div id="tagline">
-                        <a href="http://www.go-oo.org">Better, Faster, Free-er</a>
+                        <a href="http://www.libreoffice.org">LibreOffice is now Better, Faster, Free-er</a>
                 </div>
 
                 <div class="container">
                     <div id="splash">
                         <h2>Your Office Suite</h2>
 			
+    <h1>Go-oo is obsoleted by LibreOffice</h1>
+    <div style="width: 20%; float: right;"><p><a href="http://documentfoundation.org"><img src="img/libreoffice-logo.png"></a></p></div>
+    <div style="width: 70%; float: left;">
+    <p>
+	The creation of <a href="http://documentfoundation.org">The Document
+	Foundation's</a> has provided the ideal home for the go-oo developers.
+	The go-oo project has been dis-continued in favour of <a
+	href="http://www.libreoffice.org">LibreOffice - the new home of the
+	open office suite</a>.
+    </p>
+    </div>
+    <hr/>
 	<div id="download">
-		<a href="/download/">
+		<a href="http://www.libreoffice.org/download/">
 	  <img id="home_oo_image" src="img/thumb_go-oox-pptx.png" /><br />
-		<a href="/download/">Download</a>
+		<a href="http://www.libreoffice.org/download/">Download</a>
 	</div>
     <h3>Better interoperability</h3>
     <p>
@@ -115,17 +127,6 @@
 	that's really excellent, but this is not our focus: there are no formal
 	roles in development to reflect this valuable work.
     </p>
-
-    <h3>Go-oo joins forces with LibreOffice</h3>
-    <div style="width: 70%; float: left;">
-    <p>
-	Go-oo shares much of its goals and philosophy with <a href="http://documentfoundation.org">The Document 
-    Foundation's</a> LibreOffice project, we're therefore supporting LibreOffice since it's inception, and are
-    in the process of merging most of our patches over, as well as migrating to Document Foundation infrastructure.
-    Going forward, the Go-oo project will be discontinued in favor of LibreOffice.
-    </p>
-    </div>
-    <div style="width: 20%; float: right;"><p><a href="http://documentfoundation.org"><img src="img/libreoffice-logo.png"></a></p></div>
                     </div>
                 </div>
 
diff --git a/index.php b/index.php
index 828a696..d29c9b4 100644
--- a/index.php
+++ b/index.php
@@ -3,10 +3,22 @@ require("template.php");
 
 $content = <<<EOT
 
+    <h1>Go-oo is obsoleted by LibreOffice</h1>
+    <div style="width: 20%; float: right;"><p><a href="http://documentfoundation.org"><img src="img/libreoffice-logo.png"></a></p></div>
+    <div style="width: 70%; float: left;">
+    <p>
+	The creation of <a href="http://documentfoundation.org">The Document
+	Foundation's</a> has provided the ideal home for the go-oo developers.
+	The go-oo project has been dis-continued in favour of <a
+	href="http://www.libreoffice.org">LibreOffice - the new home of the
+	open office suite</a>.
+    </p>
+    </div>
+    <hr/>
 	<div id="download">
-		<a href="/download/">
+		<a href="http://www.libreoffice.org/download/">
 	  <img id="home_oo_image" src="img/thumb_go-oox-pptx.png" /><br />
-		<a href="/download/">Download</a>
+		<a href="http://www.libreoffice.org/download/">Download</a>
 	</div>
     <h3>Better interoperability</h3>
     <p>
@@ -88,17 +100,6 @@ $content = <<<EOT
 	that's really excellent, but this is not our focus: there are no formal
 	roles in development to reflect this valuable work.
     </p>
-
-    <h3>Go-oo joins forces with LibreOffice</h3>
-    <div style="width: 70%; float: left;">
-    <p>
-	Go-oo shares much of its goals and philosophy with <a href="http://documentfoundation.org">The Document 
-    Foundation's</a> LibreOffice project, we're therefore supporting LibreOffice since it's inception, and are
-    in the process of merging most of our patches over, as well as migrating to Document Foundation infrastructure.
-    Going forward, the Go-oo project will be discontinued in favor of LibreOffice.
-    </p>
-    </div>
-    <div style="width: 20%; float: right;"><p><a href="http://documentfoundation.org"><img src="img/libreoffice-logo.png"></a></p></div>
 EOT;
 
 print_page("Go-OO!", array("summary"),
diff --git a/template.php b/template.php
index d5373e5..f116fa0 100644
--- a/template.php
+++ b/template.php
@@ -60,7 +60,7 @@ function print_page($title, $context, $heading, $content, $subtabs = array())
 		?>
                 </ul>
                 <div id="tagline">
-                        <a href="http://www.go-oo.org">Better, Faster, Free-er</a>
+                        <a href="http://www.libreoffice.org">LibreOffice is now Better, Faster, Free-er</a>
                 </div>
 <?php
 		if (count ($subtabs) > 0) {