[SCM] live-manual branch, debian-next, updated. debian/3.0_a11-1-71-g7b40b77

[chals]

The following commit has been merged in the debian-next branch:
commit bd19896b794371dedd3e403f1f84f5e5f0d13146
Author: chals <chals at altorricon.com>
Date:   Sun Jun 3 18:53:46 2012 +0200

    Renaming binary-hybrid.iso to binary.hybrid.iso.

diff --git a/manual/en/user_basics.ssi b/manual/en/user_basics.ssi
index e3c6b9d..3ff6ab0 100644
--- a/manual/en/user_basics.ssi
+++ b/manual/en/user_basics.ssi
@@ -44,7 +44,7 @@ code{
 
 }code
 
-This process can take a while, depending on the speed of your network connection. When it is complete, there should be a #{binary-hybrid.iso}# image file, ready to use, in the current directory.
+This process can take a while, depending on the speed of your network connection. When it is complete, there should be a #{binary.hybrid.iso}# image file, ready to use, in the current directory.
 
 2~using-iso-hybrid Using an ISO hybrid live image
 
@@ -58,7 +58,7 @@ code{
 
  # apt-get install wodim
 
- $ wodim binary-hybrid.iso
+ $ wodim binary.hybrid.iso
 
 }code
 
@@ -71,7 +71,7 @@ Once you are certain you have the correct device name, use the #{dd}# command to
 
 code{
 
- $ dd if=binary-hybrid.iso of=${USBSTICK}
+ $ dd if=binary.hybrid.iso of=${USBSTICK}
 
 }code
 
@@ -114,7 +114,7 @@ Booting an ISO image is simple:
 
 code{
 
- $ kvm -cdrom binary-hybrid.iso
+ $ kvm -cdrom binary.hybrid.iso
 
 }code
 
@@ -132,7 +132,7 @@ code{
 
 }code
 
-Create a new virtual machine, change the storage settings to use #{binary-hybrid.iso}# as the CD/DVD device, and start the machine.
+Create a new virtual machine, change the storage settings to use #{binary.hybrid.iso}# as the CD/DVD device, and start the machine.
 
 *{Note:}* For live systems containing X.org that you want to test with /{virtualbox-ose}/, you may wish to include the VirtualBox X.org driver package, /{virtualbox-ose-guest-x11}/, in your live-build configuration. Otherwise, the resolution is limited to 800x600.
 
@@ -174,7 +174,7 @@ When the build finishes, a #{binary.img}# file should be present in the current
 
 2~using-hdd-image Using an HDD image
 
-The generated binary image contains a VFAT partition and the syslinux bootloader, ready to be directly written on a USB stick. Since using an HDD image is just like using an ISO hybrid image on USB, follow the instructions in {Using an ISO hybrid live image}#using-iso-hybrid, except use the filename #{binary.img}# instead of #{binary-hybrid.iso}#.
+The generated binary image contains a VFAT partition and the syslinux bootloader, ready to be directly written on a USB stick. Since using an HDD image is just like using an ISO hybrid image on USB, follow the instructions in {Using an ISO hybrid live image}#using-iso-hybrid, except use the filename #{binary.img}# instead of #{binary.hybrid.iso}#.
 
 3~testing-hdd-with-qemu Testing an HDD image with Qemu
 
diff --git a/manual/en/user_examples.ssi b/manual/en/user_examples.ssi
index 3aadc00..c063620 100644
--- a/manual/en/user_examples.ssi
+++ b/manual/en/user_examples.ssi
@@ -42,7 +42,7 @@ code{
 
 }code
 
-Assuming all goes well, after a while, the current directory will contain #{binary-hybrid.iso}#. This ISO hybrid image can be booted directly in a virtual machine as described in {Testing an ISO image with Qemu}#testing-iso-with-qemu and {Testing an ISO image with virtualbox-ose}#testing-iso-with-virtualbox, or else imaged onto optical media or a USB flash device as described in {Burning an ISO image to a physical medium}#burning-iso-image and {Copying an ISO hybrid image to a USB stick}#copying-iso-hybrid-to-usb, respectively.
+Assuming all goes well, after a while, the current directory will contain #{binary.hybrid.iso}#. This ISO hybrid image can be booted directly in a virtual machine as described in {Testing an ISO image with Qemu}#testing-iso-with-qemu and {Testing an ISO image with virtualbox-ose}#testing-iso-with-virtualbox, or else imaged onto optical media or a USB flash device as described in {Burning an ISO image to a physical medium}#burning-iso-image and {Copying an ISO hybrid image to a USB stick}#copying-iso-hybrid-to-usb, respectively.
 
 2~tutorial-2 Tutorial 2: A web browser utility
 

-- 
live-manual