[SCM] live-studio branch, master, updated. 2e07a8d72153957bf6b1ae1eb949d3e29b94623f

[Chris Lamb]

The following commit has been merged in the master branch:
commit 2e07a8d72153957bf6b1ae1eb949d3e29b94623f
Author: Chris Lamb <lamby at debian.org>
Date:   Sun Aug 1 23:45:04 2010 -0400

    Fix typos in FAQ. Thanks to Tim Retout <diocles at debian.org>

diff --git a/templates/static/faq.html b/templates/static/faq.html
index cc0f2d8..7152b1f 100644
--- a/templates/static/faq.html
+++ b/templates/static/faq.html
@@ -14,7 +14,7 @@
 </ul> 
 
 <h2><a id="what">What is Debian Live Studio?</a></h2> 
-<p>Debian Live Studio is a web-based tool for building customised Debian images that do not require installation before they can be used. Live images can can book from various types of media, including CDs, USB sticks or via netbooting.</p>
+<p>Debian Live Studio is a web-based tool for building customised Debian images that do not require installation before they can be used. Live images can boot from various types of media, including CDs, USB sticks or via netbooting.</p>
 
 <h2><a id="bugs">How do I report bugs?</a></h2> 
 <p>Please email your bug report to <a href="debian-live at lists.debian.org">debian-live at lists.debian.org</a> or report it on the <tt>#debian-live</tt> IRC channel on <a href="http://oftc.net/">OFTC</a>.</p>

-- 
live-studio