[SCM] live-studio branch, master, updated. 8bc4777e2834196c7e6943f12168359fef8e9e93

[Chris Lamb]

The following commit has been merged in the master branch:
commit edb0972e66d5c2eebe00ff04633d5fa18dce77ee
Author: Chris Lamb <lamby at debian.org>
Date:   Sun Aug 1 21:49:24 2010 -0400

    Make homepage nicer

diff --git a/templates/static/welcome.html b/templates/static/welcome.html
index 32cd41a..bf3f79e 100644
--- a/templates/static/welcome.html
+++ b/templates/static/welcome.html
@@ -10,14 +10,19 @@
 {% block content %}
 
 <div id="splash" style="text-align: center;">
-  <h1>Debian GNU/Linux</h1>
+  <h1>Debian Live Studio</h1>
 </div>
 
-<div id="intro">
-  <p>A <em>live</em> system is an operating system that does not require a classical installer to use it. It can can book from various types of media, including CDs, USB sticks or via netbooting.</p>
-</div>
+<h1>Welcome to Debian Live Studio!</h1>
+
+<ul>
+  <li>Build your own Debian Live with just a few mouse clicks</li>
+  <li>Choice of CD, DVD or USB image media types</li>
+  <li>Build and download image from anywhere</li>
+  <li>100% free software</li>
+</ul>
 
-<p><a href="{% url auth_login %}">Login</a> or <a href="{% url registration_register %}">register</a>
+<p><a href="{% url auth_login %}">Login</a>, <a href="{% url registration_register %}">register</a> or read some of our <a href="{% url static:faq %}">frequently asked questions</a>.</p>
 
 {% comment %}<p class="infobar"></p>{% endcomment %}
 

-- 
live-studio