[gnome3-web] Organised the FAQ into groups, update the text.

[Allan Day <allanday src gnome org>]

commit 06209dadfbd5cec33b56b181b47a961035bcbb60
Author: Allan Day <allanpday gmail com>
Date:   Mon Apr 25 12:15:24 2011 +0100

    Organised the FAQ into groups, update the text.

 css/text.css |    2 +-
 faq.html     |   46 ++++++++++++++++++++--------------------------
 2 files changed, 21 insertions(+), 27 deletions(-)
---
diff --git a/css/text.css b/css/text.css
index f37d174..a803455 100644
--- a/css/text.css
+++ b/css/text.css
@@ -1 +1 @@
-body{font:13px/1.5 'Helvetica Neue',Arial,'Liberation Sans',FreeSans,sans-serif}a:focus{outline:1px dotted}hr{border:0 #ccc solid;border-top-width:1px;clear:both;height:0}h1{font-size:25px}h2{font-size:23px}h3{font-size:21px}h4{font-size:19px}h5{font-size:17px}h6{font-size:15px}ol{list-style:decimal}ul{list-style:disc}li{margin-left:30px}p,dl,hr,h1,h2,h3,h4,h5,h6,ol,ul,pre,table,address,fieldset{margin-bottom:20px}
\ No newline at end of file
+body{font:13px/1.5 'Helvetica Neue',Arial,'Liberation Sans',FreeSans,sans-serif}a:focus{outline:1px dotted}hr{border:0 #ccc solid;border-top-width:1px;clear:both;height:0}h1{font-size:25px}h2{font-size:23px}h3{font-size:20px}h4{font-size:19px}h5{font-size:17px}h6{font-size:15px}ol{list-style:decimal}ul{list-style:disc}li{margin-left:30px}p,dl,hr,h1,h2,h3,h4,h5,h6,ol,ul,pre,table,address,fieldset{margin-bottom:20px}
diff --git a/faq.html b/faq.html
index 24b3756..eb46f9a 100644
--- a/faq.html
+++ b/faq.html
@@ -32,47 +32,41 @@
   </div>
 </div>
 
-
 <div class="container_12">
-  <div class="grid_6">
-    <h2>How do I get GNOME 3?</h2>
-
-    <p>GNOME 3 was released on 6th April 2011 and will be available via popular distributions after that time. See the <a href="tryit.html">Try It</a> page for more details and for links to live demos.</p>
-
-    <h2>What is the GNOME Project, anyway?</h2>
-
-    <p>The GNOME Project is an international community which comes together to make great software. GNOME software is <a href="http://www.gnu.org/philosophy/free-sw.html";>Free Software</a>: all our work is free to use, modify and redistribute. Everyone is welcome to participate in its development. See <a href="http://www.gnome.org/about/";>the GNOME About page</a> for more information.</p>
+  <div class="grid_12">
 
-    <h2>Will my computer be able to run GNOME 3?</h2>
+    <h2>The release</h2>
 
-    <p>Computers purchased in the last 4 or 5 years should be more than capable of running GNOME 3. The GNOME 3 desktop does require hardware accelerated graphics in order to provide a cutting-edge experience however, and the complete GNOME 3 experience will only be available on computers capable of this. Do not worry though: GNOME 3 will come complete with a fallback interface which will provide an excellent experience in the absence of hardware acceleration, and which incorporates many of the improvements that can be found in GNOME 3. Furthermore, the GNOME project and its partners are working hard to ensure that the complete GNOME 3 experience is available to as many people as possible, and aim to ensure that users who are initially unable to have this experience will be able to in the future.</p>
+    <h3>How do I get GNOME 3?</h3>
+    <p>GNOME 3 is available via popular distributions. See the <a href="tryit.html">Try It</a> page for more details and for links to live demos.</p>
 
-    <h2>Will I be able to use my favourite GNOME apps in GNOME 3?</h2>
+    <h3>Will my computer be able to run GNOME 3?</h3>
+    <p>Computers purchased in the last 4 or 5 years should be more than capable of running GNOME 3. The GNOME 3 desktop does require hardware accelerated graphics in order to provide a cutting-edge experience however, and the complete GNOME 3 experience will only be available on computers capable of this. Do not worry though: GNOME 3 comes complete with a fallback interface which will provide an excellent experience in the absence of hardware acceleration, and which incorporates many of the improvements that can be found in GNOME 3.</p>
+    <p>The GNOME project and its partners are working hard to ensure that the complete GNOME 3 experience is available to as many people as possible, and aim to ensure that users who are initially unable to have this experience will be able to in the future.</p>
 
+    <h3>Can I use my favourite GNOME apps in GNOME 3?</h3>
     <p>Yes! Existing GNOME applications will work just fine in GNOME 3. GNOME 3 does provide facilities to make applications even better though, so look out for new and improved GNOME 3 versions of those trusty apps you've learnt to love.</p>
 
+    <h3>What will happen to the old version of GNOME?</h3>
+    <p>GNOME 2 had a long life, and parts of it became difficult to maintain over that period. As a result, continued releases of the entire GNOME 2 desktop was never a practical option for the GNOME Project, and several parts of the old GNOME 2 desktop will not receive new releases after GNOME 3 is released. The traditional GNOME 2 desktop will not disappear overnight, however: releases of GNOME 2 will continue to be supported by distributions for years to come.</p>
 
-    <h2>What will happen to the old version of GNOME?</h2>
-
-    <p>The GNOME 2 desktop had a long life, and parts of it became difficult to maintain over that period. As a result, continued releases of the entire GNOME 2 desktop was never a practical option for the GNOME Project, and several parts of the old GNOME 2 desktop will not receive new releases after GNOME 3 is released. The traditional GNOME 2 desktop will not disappear overnight, however: releases of GNOME 2 will continue to be supported by distributions for years to come.</p>
-
-</div>
-<div class="grid_6">
-
-    <h2>Why is the GNOME 3 desktop designed the way it is?</h2>
-
+    <h3>Why was the GNOME 3 desktop designed the way it was?</h3>
     <p>A huge amount of work has gone into the design of GNOME 3, and each of the design decisions behind it has a carefully considered rationale. If you have a specific question about one of these design decisions, try reading our <a href="http://live.gnome.org/GnomeShell/Design/FAQ";>answers to common GNOME 3 design questions</a>. Alternatively, more extensive details about the design of the GNOME 3 desktop can be found on the <a href="http://live.gnome.org/GnomeShell/Design/";>GNOME 3 desktop design wiki page</a>.</p>
 
-    <h2>What are GNOME's plans after GNOME 3 is released?</h2>
+    <h2>The GNOME Project</h2>
 
-    <p>We are going to have a huge party to celebrate the release, and then we're going to get back to work improving our desktop, so that GNOME 3 will get better and better with subsequent releases. We have lots of plans for new features which will make GNOME even easier and more satisfying to use, such as document search and an exciting new desktop extensions framework.</p>
+    <h3>What is the GNOME Project, anyway?</h3>
+    <p>The GNOME Project is an international community which comes together to make great software. GNOME software is <a href="http://www.gnu.org/philosophy/free-sw.html";>Free Software</a>: all our work is free to use, modify and redistribute. Everyone is welcome to participate in its development. See <a href="http://www.gnome.org/about/";>the GNOME About page</a> for more information.</p>
 
-    <h2>How can I get involved or help with GNOME 3?</h2>
+    <h3>What are GNOME's plans after GNOME 3 is released?</h3>
+    <p>The GNOME Project is already working hard on the next release of GNOME 3, which will be completed in September/October 2011. This next release will include general improvements to GNOME 3, as well as major new features.</p>
 
+    <h3>How can I get involved or help with GNOME 3?</h3>
     <p>Spreading the word about GNOME 3 is a great way to help out. A positive tweet, dent, status update or post is always appreciated. You can also join our <a href="http://www.facebook.com/GNOMEDesktop";>Facebook group</a> or become a <a href="http://www.gnome.org/friends/";>Friend of GNOME</a>. Additionally, you can help out with one of the many varied tasks involved in producing GNOME. Just check out our <a href="http://live.gnome.org/JoinGnome";>contribution page</a> for more details.</p>
 
-    <h2>I want to write about GNOME 3. How do I get more information?</h2>
+    <h2>Press information</h2>
 
+    <h3>I want to write about GNOME 3. How do I get more information?</h3>
     <p>Further information about the release can be found on the <a href="http://live.gnome.org/ThreePointZero";>GNOME 3 wiki page</a>. Press queries should be sent to <a href="mailto:gnome-press-contact gnome org">gnome-press-contact gnome org</a>.</p>
 
     </div> <!-- grid_12 -->
@@ -82,7 +76,7 @@
     Free to share and remix: <a href="http://creativecommons.org/licenses/by/3.0/";>Creative Commons CC-BY</a><br/>
     Share on: <a href="http://www.facebook.com/sharer.php?u=http%3A%2F%2Fwww.gnome3.org%2F&amp;t=GNOME%203";>Facebook</a> | <a href="http://twitter.com/home?status=GNOME3%20-%20Introducing%20the%20next%20generation%20GNOME%20desktop%20http://www.gnome3.org";>Twitter</a><br/>
     â?§
-  </div><!-- grid_12 -->
+  </div><!-- grid_12 footer -->
 </div> <!-- container_12 -->
 
 </body>