[SCM] live-manual branch, debian-next, updated. debian/3.0_a15-1-7-gdf02c9b

[Ben Armstrong]

The following commit has been merged in the debian-next branch:
commit df02c9b83cb0777bf71c0031bfff4df8e18e11c9
Author: Ben Armstrong <synrg at debian.org>
Date:   Tue Aug 14 07:01:02 2012 -0300

    Updating: virtualbox, dropping -ose suffix; live-build install example version number.

diff --git a/manual/en/user_basics.ssi b/manual/en/user_basics.ssi
index a2cacfe..188d3a0 100644
--- a/manual/en/user_basics.ssi
+++ b/manual/en/user_basics.ssi
@@ -120,13 +120,13 @@ code{
 
 See the man pages for more details.
 
-3~testing-iso-with-virtualbox Testing an ISO image with virtualbox-ose
+3~testing-iso-with-virtualbox Testing an ISO image with virtualbox
 
-In order to test the ISO with /{virtualbox-ose}/:
+In order to test the ISO with /{virtualbox}/:
 
 code{
 
- # apt-get install virtualbox-ose virtualbox-ose-dkms
+ # apt-get install virtualbox virtualbox-dkms
 
  $ virtualbox
 
@@ -134,11 +134,11 @@ code{
 
 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.
+*{Note:}* For live systems containing X.org that you want to test with /{virtualbox}/, you may wish to include the VirtualBox X.org driver package, /{virtualbox-guest-x11}/, in your live-build configuration. Otherwise, the resolution is limited to 800x600.
 
 code{
 
- $ echo virtualbox-ose-guest-x11 >> config/package-lists/my.list.chroot
+ $ echo virtualbox-guest-x11 >> config/package-lists/my.list.chroot
 
 }code
 
diff --git a/manual/en/user_examples.ssi b/manual/en/user_examples.ssi
index b2d687c..f1e6bea 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}#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
 
diff --git a/manual/en/user_installation.ssi b/manual/en/user_installation.ssi
index c4aa502..64cbc8e 100644
--- a/manual/en/user_installation.ssi
+++ b/manual/en/user_installation.ssi
@@ -72,7 +72,7 @@ Now install whichever of the freshly built #{.deb}# files you were interested in
 
 code{
 
- # dpkg -i live-build_2.0.8-1_all.deb
+ # dpkg -i live-build_3.0-1_all.deb
 
 }code
 

-- 
live-manual