[SCM] live-manual branch, debian, updated. debian/2.0_a9-1-8-gd1b553a

[Ben Armstrong]

The following commit has been merged in the debian branch:
commit bb02ba98560e8a0a747d806fd669cef4d29f2f92
Author: Ben Armstrong <synrg at debian.org>
Date:   Wed Oct 27 21:25:52 2010 -0300

    Making consistent: "foo time" instead of hyphenated alternative.

diff --git a/manual/en/project_bugs.ssi b/manual/en/project_bugs.ssi
index a5ab90c..b19451d 100644
--- a/manual/en/project_bugs.ssi
+++ b/manual/en/project_bugs.ssi
@@ -82,11 +82,11 @@ If this is the case, this is not a bug in Debian Live, but rather in Debian - pl
 
 Also, if you are using a local mirror and/or any of sort of proxy and you are experiencing a problem, please always reproduce it first by bootstrapping from an official mirror.
 
-3~ At boot-time
+3~ At boot time
 
 If your image does not boot, please report it to the mailing list together with the information requested in {Collect information}#collect-information. Do not forget to mention, how/when the image failed, in Qemu, VMWare or real hardware. If you are using a virtualization technology of any kind, please always run it on real hardware before reporting a bug. Providing a screenshot of the failure is also very helpful.
 
-3~ At run-time
+3~ At run time
 
 If a package was successfully installed, but fails while actually running the Live system, this is probably a bug in Debian Live. However,
 
diff --git a/manual/en/user_basics.ssi b/manual/en/user_basics.ssi
index 4590f82..c80f2bb 100644
--- a/manual/en/user_basics.ssi
+++ b/manual/en/user_basics.ssi
@@ -249,7 +249,7 @@ subnet 192.168.1.0 netmask 255.255.255.0 {   # 192.168.1.0/24
 
 3~ TFTP server
 
-This serves the kernel and initial ramdisk to the system at run-time.
+This serves the kernel and initial ramdisk to the system at run time.
 
 You should install the tftpd-hpa package. It can serve all files contained inside a root directory, usually /srv/tftp. To let it serve files inside /srv/debian-live/tftpboot, run as root the following command:
 

-- 
live-manual