From f0394722ffaa55b115f325c5a1e2236bf1a420cc Mon Sep 17 00:00:00 2001
From: Romain d'Alverny <rda@mageia.org>
Date: Mon, 30 May 2011 17:55:34 +0000
Subject: update

---
 en/1/index.php | 41 ++++++++++++++++++++---------------------
 en/index.php   | 19 +++++++++++--------
 2 files changed, 31 insertions(+), 29 deletions(-)

diff --git a/en/1/index.php b/en/1/index.php
index fe56799d5..8e4cc132d 100644
--- a/en/1/index.php
+++ b/en/1/index.php
@@ -18,7 +18,7 @@
         <div id="bd" role="main">
             <div class="yui-g bb1">
                 <div class="para">
-                    <img src="/g/1/screenshots/mageia.png" alt="Mageia 1 KDE Desktop" class="rel-desktop-home" style="float: left;  margin: 0 2em 2em 0; width: 450px;">
+                    <img src="/g/1/screenshots/opt-mageia-450.jpg" alt="Mageia 1 KDE Desktop" class="rel-desktop-home" style="float: left;  margin: 0 2em 2em 0; width: 450px;">
 
                     <h2 class="download-btn"><a href="/downloads/">Download it</a></h2>
 
@@ -29,26 +29,6 @@
 
                     <div class="clear"></div>
                     
-                    <h3>Mageia in context</h3>
-
-                    <p>Mageia started as a fork of Mandriva Linux in September 2010.
-                        It is supported by a <a href="/en/about/">not-for-profit organisation</a>,
-                        <a href="http://mageia.org/wiki/doku.php?id=org">governed by</a>
-                        a body of recognized and elected contributors</a>,
-                        and made by 100+ people around the world.</p>
-
-                    <p>Our work adds to the excellent work of the wider Linux 
-                        and Free Software community. We aim to bring one of the best,
-                        most stable, reliable and enjoyable experience and platform we can make;
-                        for a regular <a href="">user</a>,
-                        a <a href="">developer</a>,
-                        or a <a href="">business</a>.</p>
-
-                    <p>And, on your own time or through your professional activity,
-                        <a href="/en/contribute/">you can be part of it</a>.</p>
-                        
-                    <hr>
-                    <h3>Vanity figures</h3>
                     <p><a href="/en/about/2010-sept-announcement.html">9&nbsp;months</a>.</p>
                     <p><a href="">100+&nbsp;contributors</a> in <a href="/wiki/doku.php?id#teams">10+ teams</a>.
                         <a href="/en/thank-you/">160+&nbsp;generous donators</a> for
@@ -69,7 +49,26 @@
                     <p>How many users? Time will tell.</p>
                     
                     <p>But more important than vanity figures: <a href="/en/1/next/">what will it do for you?</a></p>
+                    
+                    <hr>
+                
+                    <h3>Mageia in context</h3>
+
+                    <p>Mageia started as a fork of Mandriva Linux in September 2010.
+                        It is supported by a <a href="/en/about/">not-for-profit organisation</a>,
+                        <a href="http://mageia.org/wiki/doku.php?id=org">governed by</a>
+                        a body of recognized and elected contributors</a>,
+                        and made by 100+ people around the world.</p>
 
+                    <p>Our work adds to the excellent work of the wider Linux 
+                        and Free Software community. We aim to bring one of the best,
+                        most stable, reliable and enjoyable experience and platform we can make;
+                        for a regular <a href="">user</a>,
+                        a <a href="">developer</a>,
+                        or a <a href="">business</a>.</p>
+
+                    <p>And, on your own time or through your professional activity,
+                        <a href="/en/contribute/">you can be part of it</a>.</p>
                 </div>
             </div>
             <div class="yui-g bb1">
diff --git a/en/index.php b/en/index.php
index 9da7d972e..d782d3a4a 100644
--- a/en/index.php
+++ b/en/index.php
@@ -1,21 +1,24 @@
-<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE html>
 <html dir="ltr" lang="en">
 <head>
-    <meta charset="utf-8" />
+    <meta charset="utf-8">
     <title>Mageia - A New Linux Distribution</title>
-    <meta name="description" content="Mageia is new community-based Linux distribution." />
-    <meta name="keywords" content="mageia, linux, mandriva, free software" />
-    <link rel="stylesheet" type="text/css" href="/g/style/all.css" />
-    <link rel="alternate" type="application/rss+xml" title="Mageia Blog (English)" href="http://blog.mageia.org/en/?feed=rss" />
+    <meta name="description" content="Mageia is new community-based Linux distribution.">
+    <meta name="keywords" content="mageia, linux, mandriva, free software">
+    <link rel="stylesheet" type="text/css" href="/g/style/all.css">
+    <link type="text/plain" rel="author" href="/humans.txt">
+    <link rel="alternate" type="application/rss+xml" title="Mageia Blog (English)" href="http://blog.mageia.org/en/?feed=rss">
     <?php include '../analytics.php'; ?>
 </head>
-<body>
+<body class="release">
     <?php include '../langs.php'; ?>
     <div id="doc" class="yui-t7">
         <div id="hd" role="banner"><h1><a id="logo" href="/"><span>Mageia</span></a> <span class="lsep">|</span> <span class="subh">A New Linux Distribution</span></h1></div>
+        <?php include '../release_counter.php'; ?>
+        <a href="/en/1/" title="Mageia 1"><img src="/g/1/screenshots/opt-mageia.jpg" alt="Mageia 1 Desktop" class="rel-desktop-home"></a>
 
         <div id="bd" role="main">
+            <?php /*
             <div class="yui-g bb1">
                 <div class="para"><p>Mageia is a fork of Mandriva Linux,
                     supported by a not-for-profit organisation of
@@ -26,7 +29,6 @@
                         (<a href="/en/about/2010-sept-announcement.html">check original announcement</a>).</p>
                 </div>
             </div>
-            <?php include '../release_counter.php'; ?>
             <div class="yui-g bb1">
                 <div class="yui-u first rb1">
                     <div class="para" id="news">
@@ -71,6 +73,7 @@
                     </div>
                 </div>
             </div>
+        */ ?>
         </div>
     </div>
 </body>
-- 
cgit v1.2.1