[SCM] live-studio branch, master, updated. be51da814fb12d25dce46a7f078a46f5c89bd777

[Chris Lamb]

The following commit has been merged in the master branch:
commit b16b57f097d27af4c4141b9032018983d96917b5
Author: Chris Lamb <lamby at debian.org>
Date:   Thu Jul 29 22:07:10 2010 -0400

    Add some text to the welcome page.
    
    Signed-off-by: Chris Lamb <lamby at debian.org>

diff --git a/templates/static/welcome.html b/templates/static/welcome.html
index 013f3a8..9f6ca98 100644
--- a/templates/static/welcome.html
+++ b/templates/static/welcome.html
@@ -6,4 +6,6 @@
 
 <p><a href="{% url auth_login %}">Login</a> or <a href="{% url registration_register %}">register</a>
 
+<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>
+
 {% endblock %}

-- 
live-studio