[SCM] live-manual branch, debian, updated. debian/2.0_a5-1-9-g32852d3

Daniel Baumann daniel at debian.org
Tue Sep 7 12:57:34 UTC 2010


The following commit has been merged in the debian branch:
commit 542aeebd422a22048104c1fdc25b592a5193a1cb
Author: Daniel Baumann <daniel at debian.org>
Date:   Tue Sep 7 14:54:29 2010 +0200

    Regenerating po files.

diff --git a/manual/de/about_manual.ssi b/manual/de/about_manual.ssi
index 9225a94..001ca6f 100644
--- a/manual/de/about_manual.ssi
+++ b/manual/de/about_manual.ssi
@@ -22,42 +22,48 @@ file(s) already installed on the computer hard drive unless instructed to do
 so. Live systems are typically booted from media such as CDs/DVDs or USB
 sticks, some may also boot over the network.
 
-_* *{Debian Live}*: The Debian sub-project which maintains the live-helper,
-live-boot and live-config packages.
+_* *{Debian Live}*: The Debian sub-project which maintains the live-boot,
+live-build, live-config, and live-manual packages.
 
 _* *{Debian Live system}*: A live system that uses software from the Debian
 operating system that may be booted from CDs, DVDs, USB sticks, over the
 network (via netboot images), and over the internet (via boot parameter
 #{fetch=URL}#).
 
-_* *{Build system/host system}*: The environment used to create the live
-system.
+_* *{Host system}*: The environment used to create the live system.
 
-_* *{live-helper}*: A collection of scripts used to build customised Debian
-Live systems. live-helper was formerly know as live-package.
+_* *{Target system}*: The environment used to run the live system.
 
 _* *{live-boot}*: A collection of scripts used to boot live
 systems. live-boot was formerly a part of live-initramfs.
 
+_* *{live-build}*: A collection of scripts used to build customised Debian
+Live systems. live-build was formerly know as live-helper, and even earlier
+know as live-package.
+
 _* *{live-config}*: A collection of scripts used to configure a live systems
 during the boot process. live-config was formerly a part of live-initramfs.
 
+_* *{live-manual}*: This document is maintained in a package called
+live-manual.
+
 _* *{Debian Installer/(d-i)}*: The official installation system for the
 Debian distribution.
 
-_* *{Cheat codes}*: FIXME
+_* *{Boot parameters}*: Parameters that can be entered at the bootloader
+prompt to influence the kernel or live-config.
 
 _* *{chroot}*: The chroot program, chroot(8), enables us to run different
 instances of the GNU/Linux environment on a single system simultaneously
 without rebooting.
 
-_* *{binary image}*: On a live system, binary image refers to the binary
+_* *{Binary image}*: On a live system, binary image refers to the binary
 filesystem and the respective extension, such as binary.iso or binary.img.
 
 _* *{Target distribution}*: The distribution upon which your live system
 will be based. This can differ from the distribution of your Build System.
 
-_* *{lenny/squeeze/sid stable/testing/unstable}*: The stable distribution
+_* *{squeeze/wheezy/sid stable/testing/unstable}*: The stable distribution
 contains the latest officially released distribution of Debian. The testing
 distribution is the staging area for the next stable release. A major
 advantage of using this distribution is that it has more recent versions of
@@ -65,7 +71,7 @@ software relative to the stable release. The unstable distribution is where
 active development of Debian occurs. Generally, this distribution is run by
 developers and those who like to live on the edge.
 
-At the time of writing, lenny is the current stable release and squeeze is
+At the time of writing, squeeze is the current stable release and wheezy is
 the current testing release. sid will always be a synonym for the unstable
 release.
 
@@ -124,8 +130,7 @@ installed by executing:
 
 code{
 
-# apt-get install dblatex docbook2odf docbook-xml docbook-xsl libxml2-utils
-make po4a w3m
+# apt-get install sisu-complete
 
 }code
 
diff --git a/manual/de/about_project.ssi b/manual/de/about_project.ssi
index 46a38e4..557f567 100644
--- a/manual/de/about_project.ssi
+++ b/manual/de/about_project.ssi
@@ -59,7 +59,7 @@ used at all for official live system images.
 We will not change any packages. Whenever we need to change something, we
 will do that in coordination with its package maintainer in Debian.
 
-As an exception, our own packages such as live-helper, live-boot or
+As an exception, our own packages such as live-boot, live-build or
 live-config may temporarily be used from our own repository for development
 reasons (e.g. to create development snapshots). They will be uploaded to
 Debian on a regular basis.
diff --git a/manual/de/live-manual.ssm b/manual/de/live-manual.ssm
index 74b31ec..32e0380 100644
--- a/manual/de/live-manual.ssm
+++ b/manual/de/live-manual.ssm
@@ -14,8 +14,8 @@
 @publisher: Debian Live Project <debian-live at lists.debian.org>
 
 @make:
- :bold: /etch|oldstable|lenny|stable|squeeze|testing|sid|unstable/
- :italics: /live-helper|live-package|live-boot|live-config|live-initramfs|casper|live-magic|live-manual|live-installer/
+ :bold: /lenny|stable|squeeze|testing|sid|unstable/
+ :italics: /live-boot|live-build|live-config|live-magic|live-manual|live-installer|debian-installer-launcher/
  :num_top: 1
  :skin: skin_debian-live
 
@@ -29,16 +29,14 @@
 
 :B~ User ~#
 
+<< user_installation.ssi << user_basics.ssi
+
 :B~ Development ~#
 
 :B~ Project ~#
 
 :B~ Other ~#
 
-<< other_installation.ssi
-
-<< other_basics.ssi
-
 << other_overview.ssi
 
 << other_customization-packages.ssi
diff --git a/manual/de/other_installation.ssi b/manual/de/other_installation.ssi
deleted file mode 100644
index 07f09a9..0000000
--- a/manual/de/other_installation.ssi
+++ /dev/null
@@ -1,186 +0,0 @@
-:B~ Installation
-
-1~ Installation
-
-2~ Requirements
-
-Building Debian Live images has very few system requirements:
-
-_* Super user (root) access
-
-_* An up-to-date version of live-helper
-
-_* A POSIX-compliant shell, such as /{bash}/ or /{dash}/.
-
-_* /{debootstrap}/ or /{cdebootstrap}/
-
-_* Linux 2.6.x
-
-Note that using Debian or a Debian-derived distribution is not required -
-live-helper will run on almost any operating system with the above
-requirements.
-
-2~ Installing live-helper
-
-You can install live-helper in a number of different ways:
-
-_* From the Debian repository
-
-_* From source
-
-_* From snapshots
-
-_* From backports.org
-
-If you are using lenny or sid the recommended way is to install live-helper
-via the Debian repository.
-
-3~ From the Debian repository
-
-Simply install live-helper like any other package:
-
-code{
-
-# apt-get install live-helper
-
-}code
-
-or
-
-code{
-
-# aptitude install live-helper
-
-}code
-
-3~ From source
-
-live-helper is developed using the Git version control system. On Debian
-systems, this is provided by the /{git-core}/ package. To check out the
-latest code, execute:
-
-code{
-
-$ git clone git://live.debian.net/git/live-helper.git
-
-}code
-
-You can build and install your own Debian package by executing:
-
-code{
-
-$ cd live-helper $ dpkg-buildpackage -rfakeroot -b -uc -us $ cd ..
-
-# dpkg -i live-helper*.deb
-
-}code
-
-You can also use a local version of live-helper without installation:
-
-code{
-
-# live-helper/helpers/lh_local
-
-}code
-
-Subsequent calls to #{lh_}# prefixed helpers in that shell environment will
-then use the version located in the directory you executed #{lh_local}#
-from.
-
-You can also install live-helper directly to your system by executing:
-
-code{
-
-# make install
-
-}code
-
-3~ From 'snapshots'
-
-If you do not wish to build or install live-helper from source, you can use
-snapshots. These are built automatically from the latest version in Git and
-are available on http://live.debian.net/debian/.
-
-2~ live-initramfs
-
-N.B. You do not need to install live-initramfs on your system to create
-customised Debian Live systems. However, doing so will do no harm.
-
-3~ Using a customised live-initramfs
-
-To modify the code you can follow the process below. Please ensure you are
-familiar with the terms mentioned in terms.  % FIXME: <xref
-linkend="terms"/>
-
-_* Checkout the live-initramfs source
-
-code{
-
-$ git clone git://live.debian.net/git/live-initramfs.git
-
-}code
-
-_* Make changes to your local copy
-
-And beware that if you want to add your pre-init script in live-bottom, you
-should name it without dashes '-', e.g: call it "81new_feature" and not
-"81new-feature".
-
-_* Build a live-initramfs .deb
-
-You must build either on your target distribution or in a chroot containing
-your target platform: this means if your target is lenny then you should
-build against lenny. You can use a personal builder such as /{pbuilder}/ to
-automate building packages in chroot. To build directly on the target
-platform, use #{dpkg-buildpackage}# (provided by the /{dpkg-dev}/ package):
-
-code{
-
-$ cd live-initramfs $ dpkg-buildpackage -rfakeroot -b -uc -us
-
-}code
-
-_* Use the generated live-initramfs .deb
-
-As live-initramfs is installed by the build system, installing the package
-in the host system is not sufficient: you should treat the generated .deb
-like another custom package. Please see custom-packages for more
-information. You should pay particular attention to custom-packages-apt.  %
-FIXME: <xref linkend="custom-packages"/> <xref
-linkend="custom-packages-apt"/>
-
-3~ Using live-initramfs snapshots
-
-You can let live-helper automatically use the latest snapshot of
-live-initramfs by configuring a third-party repository in your live-system
-configuration. Assuming you have already created a configuration tree with
-#{lh config}#:
-
-_* Create a sources.list entry for the chroot stage:
-
-code{
-
-echo "deb http://live.debian.net/ sid-snapshots main contrib non-free" >
-config/chroot_sources/debian-live_sid-snapshots.chroot
-
-}code
-
-_* Create a sources.list entry for the binary stage:
-
-code{
-
-cp config/chroot_sources/debian-live_sid-snapshots.chroot
-config/chroot_sources/debian-live_sid-snapshots.binary
-
-}code
-
-_* Fetch the archive signing key:
-
-code{
-
-$ wget http://live.debian.net/debian/project/openpgp/archive-key.asc -O
-config/chroot_sources/debian-live_sid-snapshots.chroot.gpg $ cp
-config/chroot_sources/debian-live_sid-snapshots.chroot.gpg
-config/chroot_sources/debian-live_sid-snapshots.binary.gpg
-
-}code
diff --git a/manual/de/other_basics.ssi b/manual/de/user_basics.ssi
similarity index 54%
rename from manual/de/other_basics.ssi
rename to manual/de/user_basics.ssi
index e109caa..b962177 100644
--- a/manual/de/other_basics.ssi
+++ b/manual/de/user_basics.ssi
@@ -7,14 +7,14 @@ containing instructions on how to boot the various binary image types.
 
 2~ What is a live system?
 
-A live system usually means an OS booted on a computer from a removable
-medium (such as CD-ROM, USB stick, or network), ready to use without any
-installation on the usual drive(s), with an auto-configuration done at
-runtime (see terms).  % FIXME: <xref linkend="terms"/>
+A live system usually means an operating system booted on a computer from a
+removable medium (such as CD-ROM, USB stick, or network), ready to use
+without any installation on the usual drive(s), with an auto-configuration
+done at runtime (see terms).  % FIXME: <xref linkend="terms"/>
 
-With Debian Live, it's a Debian GNU/Linux OS, built for one of the supported
-architectures (currently amd64, i386, powerpc and sparc). It is made from
-following parts:
+With Debian Live, it's a Debian GNU/Linux operating system, built for one of
+the supported architectures (currently amd64, i386, powerpc and sparc). It
+is made from following parts:
 
 _* Linux kernel
 
@@ -24,12 +24,12 @@ _* *{Initial RAM disk image (initrd)}*: RAM disk setup for the Linux boot,
 containing modules possibly needed to mount the filesystem's image and some
 scripts to do it.
 
-_* *{System image}*: The OS filesystem image. Debian Live uses SquashFS, a
-compressed filesystem, to minimize its image size. Note that it's
-read-only. So, during boot the Debian Live system will use a RAM disk and
-'union' mechanism to enable writing files within the running
+_* *{System image}*: The operating systems filesystem image. Debian Live
+uses SquashFS, a compressed filesystem, to minimize its image size. Note
+that it's read-only. So, during boot the Debian Live system will use a RAM
+disk and 'union' mechanism to enable writing files within the running
 system. However, all modifications will be lost upon shutdown unless
-optional persistence partition(s) are used. (See persistence.)  % FIXME:
+optional persistence partition(s) are used (see persistence).  % FIXME:
 <xref linkend="persistence"/>
 
 _* *{Bootloader}*: A small piece of code, crafted to boot up from the chosen
@@ -38,43 +38,43 @@ options/configuration. It then loads the Linux kernel and its initrd to run
 with an associated filesystem image. Different solutions can be used
 depending on the target media and format of the filesystem containing the
 previous components: Isolinux to boot from a CD or DVD in ISO9660 format,
-syslinux for HDD or USB drive booting from a VFAT partition, GRUB for ext2/3
-partition, pxelinux for PXE netboot, etc.
+syslinux for HDD or USB drive booting from a VFAT partition, extlinux for
+ext2/3/4 and btrfs partitions, pxelinux for PXE netboot, GRUB for ext2/3/4
+partition, etc.
 
-_* The Debian Live tools will build the system image from your
-specifications, setup a Linux kernel and its initrd, a bootloader to run
-them, all in one media-dependant format(ISO9660 image, disk image, etc.)
+_* live-build will build the system image from your specifications, setup a
+Linux kernel and its initrd, a bootloader to run them, all in one
+media-dependant format (ISO9660 image, disk image, etc.)
 
 2~ First steps: building an ISO image
 
-The following sequence of helper commands, provided by live-helper, will
-create a basic ISO image containing just the Debian standard system without
-X.org. It is suitable for burning to CD or DVD media.
+The following sequence of commands, provided by live-build, will create a
+basic ISO image containing just the Debian standard system without X.org. It
+is suitable for burning to CD or DVD media.
 
-First, we run the lh config helper command which will create a "config/"
-hierarchy in the current directory for use by other helper commands:
+First, we run the #{lb config}# command which will create a "config/"
+hierarchy in the current directory for use by other commands:
 
 code{
 
-$ lh config
+$ lb config
 
 }code
 
-By passing no parameters to lh config we indicated that we wish to use the
-defaults. This will create an image of type binary (see lh-config).  %
-FIXME: <xref linkend="lh-config"/>
+By passing no parameters to #{lb config}# we indicated that we wish to use
+the defaults (see lb-config).  % FIXME: <xref linkend="lb-config"/>
 
-Now that we have a "config/" hierarchy, we may build the image with the lh
-build helper command:
+Now that we have a "config/" hierarchy, we may build the image with the lb
+build command:
 
 code{
 
-# lh build
+# lb build
 
 }code
 
 This process can take a while, depending on the speed of your network
-connection (see lh-build).  % FIXME: <xref linkend="lh-build"/>
+connection (see lb-build).  % FIXME: <xref linkend="lb-build"/>
 
 3~ Testing an ISO image with Qemu
 
@@ -82,7 +82,9 @@ Testing an ISO is simple:
 
 code{
 
-# apt-get install qemu $ qemu -cdrom binary.iso
+# apt-get install qemu
+
+$ qemu -cdrom binary.iso
 
 }code
 
@@ -96,38 +98,11 @@ code{
 
 }code
 
-and either install
-
-_* the modules package for a stock kernel eg
-virtualbox-ose-modules-2.6.26-1-486 or
-
-_* the modules package compiled for your kernel using module-assistant from
-the package virtualbox-ose-source
-
-Run Virtualbox:
-
-For example, in Gnome Applications -> System Tools -> VirtualBox OSE
-
-Create a virtual machine from your Live ISO
-
-To create a virtual machine "mylive" from A CDROM ISO "binary.iso" in
-VirtualBox:
-
-Machine -> New
+and either install #{virtualbox-ose-source}# or #{virtualbox-ose-dkms}# to
+build the required kernel modules to run virtualbox-ose.
 
-In the Wizard: FIXME
-
-3~ Testing an ISO image with VMware Workstation
-
-In order to test the ISO with VMware Workstation:
-
-Run VMware Workstation:
-
-Click on Edit virtual machine settings in the VM summary page
-
-Then, click on the CD-ROM device and select Use ISO image. Remeber to
-connect the CD-ROM device at power on and remeber to adjust the boot order
-in the bios.
+After successful installation, virtualbox can be e.g. found in the GNOME
+menu under 'Applications/System Tools/VirtualBox OSE'.
 
 3~ Burning an ISO image to a physical medium
 
@@ -135,41 +110,43 @@ Burning an ISO image is easy:
 
 code{
 
-# apt-get install wodim $ wodim binary.iso
+# apt-get install wodim
+
+$ wodim binary.iso
 
 }code
 
 2~ Building an USB/HDD image
 
-The following sequence of helper commands will create a basic USB/HDD image
+The following sequence of commands will create a basic USB/HDD image
 containing just the Debian standard system without X.org. It is suitable for
 booting from USB sticks, USB hard drives, and various other portable storage
 devices.
 
 Note if you created an iso image with the previous example, you will need to
-clean up your working directory with the lh clean helper command (see
-lh-clean): % FIXME: <xref linkend="lh-clean"/>
+clean up your working directory with the #{lb clean} command (see lb-clean):
+% FIXME: <xref linkend="lb-clean"/>
 
 code{
 
-$ lh clean --binary
+$ lb clean --binary
 
 }code
 
-Run the lh config helper command with the parameters to configure the
-"config/" hierarchy to create a USB/HDD image type:
+Run the #{lb config}# command with the parameters to configure the "config/"
+hierarchy to create a USB/HDD image type:
 
 code{
 
-$ lh config -b usb-hdd
+$ lb config -b usb-hdd
 
 }code
 
-Now build the image with the lh build helper command:
+Now build the image with the #{lb build} command:
 
 code{
 
-# lh build
+# lb build
 
 }code
 
@@ -195,26 +172,18 @@ looking in #{dmesg}#'s output after plugging in the stick, for example.
 
 code{
 
-# apt-get install qemu $ qemu -hda binary.img
-
-}code
+# apt-get install qemu
 
-3~ Testing an USB/HDD image with VMware Workstation
+$ qemu -hda binary.img
 
-In order to test the USB/HDD image with VMware Workstation:
-
-Run VMware Workstation:
-
-Write the image to an usb stick. In VMware, click on Edit virtual machine
-settings in VM summary page. Then, add a new physical harddisk device and
-enter the device node of your usb stick.
+}code
 
 3~ Using the space left on a USB stick
 
 If you want to use the remaining free space after you have installed the
-binary.img, you can use a partitioning tool such as gparted or parted to
-create a new partition on the stick. The first partition will be used by the
-Debian Live system.
+binary.img, you can use a partitioning tool such as #{gparted}# or
+#{parted}# to create a new partition on the stick. The first partition will
+be used by the Debian Live system.
 
 code{
 
@@ -223,12 +192,11 @@ code{
 }code
 
 Ater the creation of the partition you have to create a filsystem on it. One
-possible choice would be ext2 (ext3 isn't recommended because the journaling
-causes too many writes to the stick).
+possible choice would be ext4.
 
 code{
 
-# mkfs.ext2 ${USBSTICK}
+# mkfs.ext4 ${USBSTICK}
 
 }code
 
@@ -242,30 +210,27 @@ code{
 
 *{Remember: Every time you install a new binary.img on the stick, all your data will be lost because the image includes a complete partition table.}*
 
-FIXME: Describe installing Debian Live to a partition (e.g. /dev/sdc1) AND
-using a bootloader to boot this.
-
 2~ Building a netboot image
 
-The following sequence of helper commands will create a basic netboot image
+The following sequence of commands will create a basic netboot image
 containing the Debian standard system without X.org. It is suitable for
 booting over the network.
 
 Note if you performed any previous examples, you will need to clean up your
-working directory with the lh clean helper command:
+working directory with the #{lb clean}# command:
 
 code{
 
-$ lh clean --binary
+$ lb clean --binary
 
 }code
 
-Run the lh config helper command with the parameters to configure the
-"config/" hierarchy to create our netboot image:
+Run the #{lb config}# command with the parameters to configure the "config/"
+hierarchy to create our netboot image:
 
 code{
 
-$ lh config -b net --net-root-path "/srv/debian-live" --net-root-server
+$ lb config -b net --net-root-path "/srv/debian-live" --net-root-server
 "192.168.0.1"
 
 }code
@@ -276,11 +241,11 @@ NFS. The net-root-path and net-root-server options specify the location and
 server, respectively, of the NFS server where the filesytem image will be
 located at boot-time.
 
-Now build the image with the lh build helper command:
+Now build the image with the #{lb build}# command:
 
 code{
 
-# lh build
+# lb build
 
 }code
 
@@ -288,15 +253,15 @@ In a network boot the client runs a small piece of software, which usually
 resides on the EPROM of the Ethernet card. This program sends a DHCP request
 to get an IP address and information about what to do next. Typically the
 next step is getting a higher level boot loader via the TFTP protocol. That
-could be Grub, PXELINUX, or even boot directly to an operating system like
+could be PXELINUX, Grub or even boot directly to an operating system like
 Linux.
 
 For example, if you unpack the generated binary-net.tar.gz archive in the
 /srv/debian-live directory, you'll find the filesystem image in
-live/filesystem.squashfs and the kernel, initrd and PXE Linux bootloader
-in tftpboot/debian-live/i386.
+live/filesystem.squashfs and the kernel, initrd and PXELINUX bootloader in
+tftpboot/debian-live/i386.
 
-We must now configure three services on the server to enable netboot:
+We must now configure three services on the server to enable netboot.
 
 3~ DHCP server
 
@@ -304,17 +269,10 @@ We must configure our network's DHCP server to be sure to give an IP address
 to the computer netbooting, and to advertise the location of the PXE
 bootloader.
 
-Here is an example for inspiration, written for the ISC DHCP server (package
-dhcp3-server) in the /etc/dhcp3/dhcpd.conf configuration file;
-
-code{
-# Options DHCP spécifiques à Pxelinux:
-option space pxelinux;
-option pxelinux.magic      code 208 = string;
-option pxelinux.configfile code 209 = text;
-option pxelinux.pathprefix code 210 = text;
-option pxelinux.reboottime code 211 = unsigned integer 32;
+Here is an example for inspiration, written for the ISC DHCP server
+#{isc-dhcp-server}# in the /etc/dhcp/dhcpd.conf configuration file;
 
+% FIXME code{
 
 subnet 192.168.1.0 netmask 255.255.255.0 {   # 192.168.1.0/24
 
@@ -332,49 +290,30 @@ subnet 192.168.1.0 netmask 255.255.255.0 {   # 192.168.1.0/24
   # net boot configuration for guests with a PXE client :
   if substring (option vendor-class-identifier, 0, 9) = "PXEClient" {
     # Note : all files for PXE are relatives to the TFTP server's root
-    # path, as usually defined in /etc/inetd.conf.
 
     # PXE boot loader (first program to be loaded, by TFTP)
     filename "pxelinux.0";
 
-    # describe some specific pxelinux's options through DHCP options :
-    site-option-space "pxelinux";
-    option pxelinux.magic f1:00:74:7e;
-    if exists dhcp-parameter-request-list {
-      # Always send the PXELINUX options (specified in hexadecimal)
-      option dhcp-parameter-request-list = concat(option dhcp-parameter-request-list,d0,d1,d2,d3);
-    }
-
-    # For a PXE boot menu, different versions are available : simple
-    # text, text with curses, graphic (VESA)
-    #option pxelinux.configfile "pxelinux/config_simple";
-    #option pxelinux.configfile "pxelinux/config_curses";
-    option pxelinux.configfile "pxelinux/config_vesa";
-
-    # automatically reboot after 10 minutes of no activity
-    option pxelinux.reboottime 600;
   }
 }
 
 }code
 
-3~ TFTPd server
+3~ TFTP server
 
 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 /var/lib/tftpboot/, as defined with its -s
-option. To let it serve files inside /srv/debian-live/tftpboot, modify its
-start definition in /etc/inetd.conf with:
+inside a root directory, usually /srv/tftp. To let it serve files inside
+/srv/debian-live/tftpboot, run as root the following command:
 
 code{
 
-tftp dgram udp wait root /usr/sbin/in.tftpd /usr/sbin/in.tftpd -s
-/srv/debian-live/tftpboot -r blksize -v -v
+dpkg-reconfigure -plow tftpd-hpa
 
-}code
+code}
 
-and reload the super server with /etc/init.d/openbsd-inetd reload.
+and fill in the new tftp server directory when being asked about it.
 
 3~ NFS server
 
@@ -382,15 +321,14 @@ Once the guest computer has downloaded and booted a Linux kernel and loaded
 its initrd, it will try to mount the Live filesystem image through a NFS
 server.
 
-You should install the nfs-kernel-server package -- nfs-user-server does not
-function correctly with netboot.
+You need to install the nfs-kernel-server package.
 
 Then, make the filesystem image available through NFS by adding a line like
 the following to /etc/exports:
 
 code{
 
-/srv/debian-live *(ro,async,subtree_check,no_root_squash)
+/srv/debian-live *(ro,async,no_root_squash,no_subtree_check)
 
 }code
 
@@ -410,11 +348,30 @@ process is very similar.
 
 3~ Netboot testing HowTo
 
-Netboot image creation is made easy with live-helper magic, but testing the
+Netboot image creation is made easy with live-build magic, but testing the
 images on physical machines can be really time consuming.
 
 To make our life easier, we can use virtualization. There are two solutions.
 
+3~ Qemu
+
+_* Install qemu, bridge-utils, sudo.
+
+Edit /etc/qemu-ifup:
+
+code{
+
+#!/bin/sh sudo -p "Password for $0:" /sbin/ifconfig $1 172.20.0.1 echo
+"Executing /etc/qemu-ifup" echo "Bringing up $1 for bridged mode..." sudo
+/sbin/ifconfig $1 0.0.0.0 promisc up echo "Adding $1 to br0..." sudo
+/usr/sbin/brctl addif br0 $1 sleep 2
+
+}code
+
+Get, or build a grub-floppy-netboot (in the svn).
+
+Launch qemu with "-net nic,vlan=0 -net tap,vlan=0,ifname=tun0"
+
 3~ VMWare Player
 
 _* Install VMWare Player ("free as in beer" edition)
@@ -448,22 +405,3 @@ _* You can play with this configuration file (i.e. change memory limit to
 _* Double click on this file (or run VMWare player and selecet this file).
 
 _* When running just press space if that strange question comes up...
-
-3~ Qemu
-
-_* Install qemu, bridge-utils, sudo.
-
-Edit /etc/qemu-ifup:
-
-code{
-
-#!/bin/sh sudo -p "Password for $0:" /sbin/ifconfig $1 172.20.0.1 echo
-"Executing /etc/qemu-ifup" echo "Bringing up $1 for bridged mode..." sudo
-/sbin/ifconfig $1 0.0.0.0 promisc up echo "Adding $1 to br0..." sudo
-/usr/sbin/brctl addif br0 $1 sleep 2
-
-}code
-
-Get, or build a grub-floppy-netboot (in the svn).
-
-Launch qemu with "-net nic,vlan=0 -net tap,vlan=0,ifname=tun0"
diff --git a/manual/en/user_installation.ssi b/manual/de/user_installation.ssi
similarity index 57%
copy from manual/en/user_installation.ssi
copy to manual/de/user_installation.ssi
index 88e763f..8ef8d9a 100644
--- a/manual/en/user_installation.ssi
+++ b/manual/de/user_installation.ssi
@@ -16,7 +16,8 @@ _* /{debootstrap}/ or /{cdebootstrap}/
 
 _* Linux 2.6.x
 
-Note that using Debian or a Debian-derived distribution is not required - live-build will run on almost any distribution with the above requirements.
+Note that using Debian or a Debian-derived distribution is not required -
+live-build will run on almost any distribution with the above requirements.
 
 2~ Installing live-build
 
@@ -28,7 +29,8 @@ _* From source
 
 _* From snapshots
 
-If you are using Debian, the recommended way is to install live-build via the Debian repository.
+If you are using Debian, the recommended way is to install live-build via
+the Debian repository.
 
 3~ From the Debian repository
 
@@ -50,7 +52,9 @@ code{
 
 3~ From source
 
-live-build is developed using the Git version control system. On Debian systems, this is provided by the /{git}/ package. To check out the latest code, execute:
+live-build is developed using the Git version control system. On Debian
+systems, this is provided by the /{git}/ package. To check out the latest
+code, execute:
 
 code{
 
@@ -62,9 +66,7 @@ You can build and install your own Debian package by executing:
 
 code{
 
-$ cd live-build
-$ dpkg-buildpackage -rfakeroot -b -uc -us
-$ cd ..
+$ cd live-build $ dpkg-buildpackage -rfakeroot -b -uc -us $ cd ..
 
 # dpkg -i live-build*.deb
 
@@ -82,12 +84,13 @@ and uninstall it with:
 
 code{
 
-# make uninstall
-}code
+# make uninstall }code
 
 3~ From 'snapshots'
 
-If you do not wish to build or install live-build from source, you can use snapshots. These are built automatically from the latest version in Git and are available on http://live.debian.net/debian/.
+If you do not wish to build or install live-build from source, you can use
+snapshots. These are built automatically from the latest version in Git and
+are available on http://live.debian.net/debian/.
 
 2~ live-boot
 
@@ -95,8 +98,9 @@ If you do not wish to build or install live-build from source, you can use snaps
 
 3~ Using a customised live-boot
 
-To modify the code you can follow the process below. Please ensure you are familiar with the terms mentioned in terms.
-% FIXME: <xref linkend="terms"/>
+To modify the code you can follow the process below. Please ensure you are
+familiar with the terms mentioned in terms.  % FIXME: <xref
+linkend="terms"/>
 
 _* Checkout the live-boot source
 
@@ -108,27 +112,39 @@ $ git clone git://live.debian.net/git/live-boot.git
 
 _* Make changes to your local copy
 
-And beware that if you want to add your pre-init script in live-bottom, you should name it without dashes '-', e.g: call it "99new_feature" and not "99new-feature".
+And beware that if you want to add your pre-init script in live-bottom, you
+should name it without dashes '-', e.g: call it "99new_feature" and not
+"99new-feature".
 
 _* Build a live-boot .deb
 
-You must build either on your target distribution or in a chroot containing your target platform: this means if your target is squeeze then you should build against squeeze. You can use a personal builder such as /{pbuilder}/ or /{sbuild}/ to automate building packages in chroot. To build directly on the target platform, use #{dpkg-buildpackage}# (provided by the /{dpkg-dev}/ package):
+You must build either on your target distribution or in a chroot containing
+your target platform: this means if your target is squeeze then you should
+build against squeeze. You can use a personal builder such as /{pbuilder}/
+or /{sbuild}/ to automate building packages in chroot. To build directly on
+the target platform, use #{dpkg-buildpackage}# (provided by the /{dpkg-dev}/
+package):
 
 code{
 
-$ cd live-boot
-$ dpkg-buildpackage -rfakeroot -b -uc -us
+$ cd live-boot $ dpkg-buildpackage -rfakeroot -b -uc -us
 
 }code
 
 _* Use the generated live-boot .deb
 
-As live-boot is installed by live-build system, installing the package in the host system is not sufficient: you should treat the generated .deb like another custom package. Please see custom-packages for more information. You should pay particular attention to custom-packages-apt.
-% FIXME: <xref linkend="custom-packages"/> <xref linkend="custom-packages-apt"/>
+As live-boot is installed by live-build system, installing the package in
+the host system is not sufficient: you should treat the generated .deb like
+another custom package. Please see custom-packages for more information. You
+should pay particular attention to custom-packages-apt.  % FIXME: <xref
+linkend="custom-packages"/> <xref linkend="custom-packages-apt"/>
 
 3~ Using live-boot snapshots
 
-You can let live-build automatically use the latest snapshot of live-boot by configuring a third-party repository in your live-build configuration directory. Assuming you have already created a configuration tree with #{lb config}#:
+You can let live-build automatically use the latest snapshot of live-boot by
+configuring a third-party repository in your live-build configuration
+directory. Assuming you have already created a configuration tree with #{lb
+config}#:
 
 code{
 
diff --git a/manual/en/live-manual.ssm b/manual/en/live-manual.ssm
index 0535836..a13ec4b 100644
--- a/manual/en/live-manual.ssm
+++ b/manual/en/live-manual.ssm
@@ -38,7 +38,6 @@
 
 :B~ Other ~#
 
-
 << other_overview.ssi
 
 << other_customization-packages.ssi
diff --git a/manual/po/de/about_manual.ssi.po b/manual/po/de/about_manual.ssi.po
index b0b0bfb..5d1d185 100644
--- a/manual/po/de/about_manual.ssi.po
+++ b/manual/po/de/about_manual.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-08-14 21:32+0300\n"
+"POT-Creation-Date: 2010-09-07 14:53+0300\n"
 "PO-Revision-Date: 2010-08-14 21:32+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -64,8 +64,8 @@ msgstr ""
 #. type: Plain text
 #: en/about_manual.ssi:14
 msgid ""
-"_* *{Debian Live}*: The Debian sub-project which maintains the live-helper, "
-"live-boot and live-config packages."
+"_* *{Debian Live}*: The Debian sub-project which maintains the live-boot, "
+"live-build, live-config, and live-manual packages."
 msgstr ""
 
 #. type: Plain text
@@ -79,16 +79,12 @@ msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:18
-msgid ""
-"_* *{Build system/host system}*: The environment used to create the live "
-"system."
+msgid "_* *{Host system}*: The environment used to create the live system."
 msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:20
-msgid ""
-"_* *{live-helper}*: A collection of scripts used to build customised Debian "
-"Live systems. live-helper was formerly know as live-package."
+msgid "_* *{Target system}*: The environment used to run the live system."
 msgstr ""
 
 #. type: Plain text
@@ -101,24 +97,41 @@ msgstr ""
 #. type: Plain text
 #: en/about_manual.ssi:24
 msgid ""
+"_* *{live-build}*: A collection of scripts used to build customised Debian "
+"Live systems. live-build was formerly know as live-helper, and even earlier "
+"know as live-package."
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:26
+msgid ""
 "_* *{live-config}*: A collection of scripts used to configure a live systems "
 "during the boot process. live-config was formerly a part of live-initramfs."
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:26
+#: en/about_manual.ssi:28
+msgid ""
+"_* *{live-manual}*: This document is maintained in a package called live-"
+"manual."
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:30
 msgid ""
 "_* *{Debian Installer/(d-i)}*: The official installation system for the "
 "Debian distribution."
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:28
-msgid "_* *{Cheat codes}*: FIXME"
+#: en/about_manual.ssi:32
+msgid ""
+"_* *{Boot parameters}*: Parameters that can be entered at the bootloader "
+"prompt to influence the kernel or live-config."
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:30
+#: en/about_manual.ssi:34
 msgid ""
 "_* *{chroot}*: The chroot program, chroot(8), enables us to run different "
 "instances of the GNU/Linux environment on a single system simultaneously "
@@ -126,23 +139,23 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:32
+#: en/about_manual.ssi:36
 msgid ""
-"_* *{binary image}*: On a live system, binary image refers to the binary "
+"_* *{Binary image}*: On a live system, binary image refers to the binary "
 "filesystem and the respective extension, such as binary.iso or binary.img."
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:34
+#: en/about_manual.ssi:38
 msgid ""
 "_* *{Target distribution}*: The distribution upon which your live system "
 "will be based. This can differ from the distribution of your Build System."
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:36
+#: en/about_manual.ssi:40
 msgid ""
-"_* *{lenny/squeeze/sid stable/testing/unstable}*: The stable distribution "
+"_* *{squeeze/wheezy/sid stable/testing/unstable}*: The stable distribution "
 "contains the latest officially released distribution of Debian. The testing "
 "distribution is the staging area for the next stable release. A major "
 "advantage of using this distribution is that it has more recent versions of "
@@ -152,90 +165,90 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:38
+#: en/about_manual.ssi:42
 msgid ""
-"At the time of writing, lenny is the current stable release and squeeze is "
+"At the time of writing, squeeze is the current stable release and wheezy is "
 "the current testing release. sid will always be a synonym for the unstable "
 "release."
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:40
+#: en/about_manual.ssi:44
 msgid "2~ Authors"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:42
+#: en/about_manual.ssi:46
 msgid "A list of authors (in alphabetical order):"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:44
+#: en/about_manual.ssi:48
 msgid "_* Ben Armstrong"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:46
+#: en/about_manual.ssi:50
 msgid "_* Brendan Sleight"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:48
+#: en/about_manual.ssi:52
 msgid "_* Chris Lamb"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:50
+#: en/about_manual.ssi:54
 msgid "_* Daniel Baumann"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:52
+#: en/about_manual.ssi:56
 msgid "_* Franklin Piat"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:54
+#: en/about_manual.ssi:58
 msgid "_* Jonas Stein"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:56
+#: en/about_manual.ssi:60
 msgid "_* Kai Hendry"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:58
+#: en/about_manual.ssi:62
 msgid "_* Marco Amadori"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:60
+#: en/about_manual.ssi:64
 msgid "_* Mathieu Geli"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:62
+#: en/about_manual.ssi:66
 msgid "_* Matthias Kirschner"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:64
+#: en/about_manual.ssi:68
 msgid "_* Richard Nelson"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:66
+#: en/about_manual.ssi:70
 msgid "_* Trent W. Buck"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:68
+#: en/about_manual.ssi:72
 msgid "2~ Contributing to this document"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:71
+#: en/about_manual.ssi:75
 msgid ""
 "This manual is intended as a community project and all proposals for "
 "improvements and contributions are extremely welcome. The preferred way to "
@@ -244,7 +257,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:73
+#: en/about_manual.ssi:77
 msgid ""
 "When submitting a contribution please clearly identify its copyright holder "
 "and include the licensing statement. Note that to be accepted the "
@@ -253,23 +266,16 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:75
+#: en/about_manual.ssi:79
 msgid ""
 "The sources for this manual are maintained using the Git version control "
 "system. You can checkout the latest copy by executing:"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:77 en/about_manual.ssi:85 en/about_manual.ssi:93
-#: en/about_manual.ssi:105 en/about_manual.ssi:116 en/about_manual.ssi:129
-#: en/about_manual.ssi:137 en/about_manual.ssi:145 en/about_manual.ssi:153
-#: en/other_basics.ssi:34 en/other_basics.ssi:45 en/other_basics.ssi:58
-#: en/other_basics.ssi:68 en/other_basics.ssi:106 en/other_basics.ssi:120
-#: en/other_basics.ssi:128 en/other_basics.ssi:136 en/other_basics.ssi:146
-#: en/other_basics.ssi:158 en/other_basics.ssi:176 en/other_basics.ssi:184
-#: en/other_basics.ssi:192 en/other_basics.ssi:208 en/other_basics.ssi:216
-#: en/other_basics.ssi:226 en/other_basics.ssi:301 en/other_basics.ssi:317
-#: en/other_basics.ssi:325 en/other_basics.ssi:347 en/other_basics.ssi:386
+#: en/about_manual.ssi:81 en/about_manual.ssi:89 en/about_manual.ssi:97
+#: en/about_manual.ssi:109 en/about_manual.ssi:120 en/about_manual.ssi:133
+#: en/about_manual.ssi:141 en/about_manual.ssi:149 en/about_manual.ssi:157
 #: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
 #: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
 #: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
@@ -300,47 +306,45 @@ msgstr ""
 #: en/other_faq.ssi:299 en/other_faq.ssi:314 en/other_faq.ssi:333
 #: en/other_faq.ssi:345 en/other_faq.ssi:353 en/other_faq.ssi:364
 #: en/other_faq.ssi:374 en/other_howtos.ssi:16 en/other_howtos.ssi:43
-#: en/other_installation.ssi:40 en/other_installation.ssi:48
-#: en/other_installation.ssi:58 en/other_installation.ssi:66
-#: en/other_installation.ssi:78 en/other_installation.ssi:88
-#: en/other_installation.ssi:109 en/other_installation.ssi:123
-#: en/other_installation.ssi:141 en/other_installation.ssi:149
-#: en/other_installation.ssi:157 en/other_live-environment.ssi:14
-#: en/other_live-environment.ssi:30 en/other_live-environment.ssi:51
-#: en/other_live-environment.ssi:61 en/other_live-environment.ssi:69
-#: en/other_live-environment.ssi:77 en/other_live-environment.ssi:85
-#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
-#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
-#: en/other_overview.ssi:54 en/other_overview.ssi:94 en/other_overview.ssi:102
+#: en/other_live-environment.ssi:14 en/other_live-environment.ssi:30
+#: en/other_live-environment.ssi:51 en/other_live-environment.ssi:61
+#: en/other_live-environment.ssi:69 en/other_live-environment.ssi:77
+#: en/other_live-environment.ssi:85 en/other_live-environment.ssi:93
+#: en/other_live-environment.ssi:116 en/other_live-environment.ssi:124
+#: en/other_live-environment.ssi:133 en/other_overview.ssi:54
+#: en/other_overview.ssi:94 en/other_overview.ssi:102
 #: en/other_procedures.ssi:12 en/other_procedures.ssi:46
 #: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
 #: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
-#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111
+#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111 en/user_basics.ssi:34
+#: en/user_basics.ssi:45 en/user_basics.ssi:58 en/user_basics.ssi:70
+#: en/user_basics.ssi:84 en/user_basics.ssi:99 en/user_basics.ssi:107
+#: en/user_basics.ssi:115 en/user_basics.ssi:125 en/user_basics.ssi:137
+#: en/user_basics.ssi:149 en/user_basics.ssi:157 en/user_basics.ssi:165
+#: en/user_basics.ssi:179 en/user_basics.ssi:187 en/user_basics.ssi:197
+#: en/user_basics.ssi:249 en/user_basics.ssi:265 en/user_basics.ssi:273
+#: en/user_basics.ssi:293 en/user_basics.ssi:318 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:76
+#: en/user_installation.ssi:84 en/user_installation.ssi:104
+#: en/user_installation.ssi:118 en/user_installation.ssi:134
 msgid "code{"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:79
+#: en/about_manual.ssi:83
 msgid "$ git clone git://live.debian.net/git/live-manual.git"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:81 en/about_manual.ssi:89 en/about_manual.ssi:97
-#: en/about_manual.ssi:112 en/about_manual.ssi:125 en/about_manual.ssi:133
-#: en/about_manual.ssi:141 en/about_manual.ssi:149 en/about_manual.ssi:156
-#: en/other_basics.ssi:38 en/other_basics.ssi:49 en/other_basics.ssi:62
-#: en/other_basics.ssi:72 en/other_basics.ssi:111 en/other_basics.ssi:124
-#: en/other_basics.ssi:132 en/other_basics.ssi:140 en/other_basics.ssi:150
-#: en/other_basics.ssi:162 en/other_basics.ssi:180 en/other_basics.ssi:188
-#: en/other_basics.ssi:196 en/other_basics.ssi:212 en/other_basics.ssi:220
-#: en/other_basics.ssi:230 en/other_basics.ssi:293 en/other_basics.ssi:305
-#: en/other_basics.ssi:321 en/other_basics.ssi:329 en/other_basics.ssi:372
-#: en/other_basics.ssi:397 en/other_coding-style.ssi:34
-#: en/other_coding-style.ssi:45 en/other_coding-style.ssi:57
-#: en/other_coding-style.ssi:68 en/other_coding-style.ssi:92
-#: en/other_coding-style.ssi:100 en/other_coding-style.ssi:113
-#: en/other_coding-style.ssi:124 en/other_common-tasks.ssi:36
-#: en/other_customization-backports.ssi:16
+#: en/about_manual.ssi:85 en/about_manual.ssi:93 en/about_manual.ssi:101
+#: en/about_manual.ssi:116 en/about_manual.ssi:129 en/about_manual.ssi:137
+#: en/about_manual.ssi:145 en/about_manual.ssi:153 en/about_manual.ssi:160
+#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
+#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
+#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
+#: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
+#: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
 #: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
 #: en/other_customization-contents.ssi:35
 #: en/other_customization-contents.ssi:50
@@ -365,12 +369,7 @@ msgstr ""
 #: en/other_faq.ssi:256 en/other_faq.ssi:292 en/other_faq.ssi:307
 #: en/other_faq.ssi:319 en/other_faq.ssi:337 en/other_faq.ssi:349
 #: en/other_faq.ssi:358 en/other_faq.ssi:370 en/other_faq.ssi:381
-#: en/other_howtos.ssi:20 en/other_howtos.ssi:47 en/other_installation.ssi:44
-#: en/other_installation.ssi:52 en/other_installation.ssi:62
-#: en/other_installation.ssi:74 en/other_installation.ssi:82
-#: en/other_installation.ssi:92 en/other_installation.ssi:113
-#: en/other_installation.ssi:128 en/other_installation.ssi:145
-#: en/other_installation.ssi:153 en/other_installation.ssi:161
+#: en/other_howtos.ssi:20 en/other_howtos.ssi:47
 #: en/other_live-environment.ssi:18 en/other_live-environment.ssi:34
 #: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
 #: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
@@ -381,12 +380,23 @@ msgstr ""
 #: en/other_procedures.ssi:16 en/other_procedures.ssi:54
 #: en/other_procedures.ssi:131 en/other_use-cases.ssi:33
 #: en/other_use-cases.ssi:69 en/other_use-cases.ssi:97
-#: en/other_use-cases.ssi:107 en/other_use-cases.ssi:137
+#: en/other_use-cases.ssi:107 en/other_use-cases.ssi:137 en/user_basics.ssi:38
+#: en/user_basics.ssi:49 en/user_basics.ssi:64 en/user_basics.ssi:74
+#: en/user_basics.ssi:90 en/user_basics.ssi:103 en/user_basics.ssi:111
+#: en/user_basics.ssi:119 en/user_basics.ssi:129 en/user_basics.ssi:143
+#: en/user_basics.ssi:153 en/user_basics.ssi:161 en/user_basics.ssi:169
+#: en/user_basics.ssi:183 en/user_basics.ssi:191 en/user_basics.ssi:201
+#: en/user_basics.ssi:241 en/user_basics.ssi:269 en/user_basics.ssi:277
+#: en/user_basics.ssi:304 en/user_basics.ssi:343 en/user_installation.ssi:42
+#: en/user_installation.ssi:50 en/user_installation.ssi:60
+#: en/user_installation.ssi:72 en/user_installation.ssi:80
+#: en/user_installation.ssi:108 en/user_installation.ssi:123
+#: en/user_installation.ssi:137
 msgid "}code"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:83
+#: en/about_manual.ssi:87
 msgid ""
 "Prior to submission of your contribution, please preview your work. To "
 "preview the live-manual, ensure the packages needed for building are "
@@ -394,31 +404,29 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:87
-msgid ""
-"# apt-get install dblatex docbook2odf docbook-xml docbook-xsl libxml2-utils "
-"make po4a w3m"
+#: en/about_manual.ssi:91
+msgid "# apt-get install sisu-complete"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:91
+#: en/about_manual.ssi:95
 msgid ""
 "You may build the live-manual from the top level directory of your git "
 "checkout by executing:"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:95
+#: en/about_manual.ssi:99
 msgid "$ make build"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:99
+#: en/about_manual.ssi:103
 msgid "3~ Applying patches"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:101
+#: en/about_manual.ssi:105
 msgid ""
 "Directly commiting to the repository is possible by anyone. However, we ask "
 "you to send bigger changes to the mailinglist to discuss them first. In "
@@ -426,12 +434,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:103
+#: en/about_manual.ssi:107
 msgid "_* Fetch the public commit key:"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:110
+#: en/about_manual.ssi:114
 msgid ""
 "$ mkdir -p ~/.ssh/identity.d $ wget http://live.debian.net/other/openssh/"
 "repository-public-commit-key-current/live-manual at debian-live -O ~/.ssh/"
@@ -442,12 +450,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:114
+#: en/about_manual.ssi:118
 msgid "_* Add the following section to your openssh-client config:"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:123
+#: en/about_manual.ssi:127
 #, no-wrap
 msgid ""
 "$ cat >> ~/.ssh/config << EOF\n"
@@ -459,17 +467,17 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:127
+#: en/about_manual.ssi:131
 msgid "_* Checkout a clone of the manual through ssh:"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:131
+#: en/about_manual.ssi:135
 msgid "$ git clone gitosis at live.debian.net:/live-manual.git"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:135
+#: en/about_manual.ssi:139
 msgid ""
 "_* After editing the files in manual/en/, please call the 'commit' target in "
 "the toplevel directory to sanitize the files and update the translation "
@@ -477,12 +485,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:139
+#: en/about_manual.ssi:143
 msgid "$ make commit"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:143
+#: en/about_manual.ssi:147
 msgid ""
 "_* After sanitizing commit the changes. Write commit messages, that consist "
 "of full useful sentences, starting with a capital letter and ending with a "
@@ -491,16 +499,16 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:147
+#: en/about_manual.ssi:151
 msgid "$ git commit -a"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:151
+#: en/about_manual.ssi:155
 msgid "_* Push the commit to the server:"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:155
+#: en/about_manual.ssi:159
 msgid "$ git push"
 msgstr ""
diff --git a/manual/po/de/about_project.ssi.po b/manual/po/de/about_project.ssi.po
index d497cbe..be0ae9c 100644
--- a/manual/po/de/about_project.ssi.po
+++ b/manual/po/de/about_project.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-08-14 21:32+0300\n"
+"POT-Creation-Date: 2010-09-07 14:53+0300\n"
 "PO-Revision-Date: 2010-08-14 21:32+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -163,7 +163,7 @@ msgstr ""
 #. type: Plain text
 #: en/about_project.ssi:52
 msgid ""
-"As an exception, our own packages such as live-helper, live-boot or live-"
+"As an exception, our own packages such as live-boot, live-build or live-"
 "config may temporarily be used from our own repository for development "
 "reasons (e.g. to create development snapshots). They will be uploaded to "
 "Debian on a regular basis."
diff --git a/manual/po/de/live-manual.ssm.po b/manual/po/de/live-manual.ssm.po
index 1644074..cfa9f2e 100644
--- a/manual/po/de/live-manual.ssm.po
+++ b/manual/po/de/live-manual.ssm.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-09-07 10:55+0300\n"
+"POT-Creation-Date: 2010-09-07 14:53+0300\n"
 "PO-Revision-Date: 2010-08-14 21:32+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -58,8 +58,8 @@ msgstr ""
 #, no-wrap
 msgid ""
 "@make:\n"
-" :bold: /etch|oldstable|lenny|stable|squeeze|testing|sid|unstable/\n"
-" :italics: /live-helper|live-package|live-boot|live-config|live-initramfs|casper|live-magic|live-manual|live-installer/\n"
+" :bold: /lenny|stable|squeeze|testing|sid|unstable/\n"
+" :italics: /live-boot|live-build|live-config|live-magic|live-manual|live-installer|debian-installer-launcher/\n"
 " :num_top: 1\n"
 " :skin: skin_debian-live\n"
 msgstr ""
@@ -90,126 +90,121 @@ msgid ":B~ User ~#"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:33
-msgid ":B~ Development ~#"
-msgstr ""
-
-#. type: Plain text
-#: en/live-manual.ssm:35
-msgid ":B~ Project ~#"
+#: en/live-manual.ssm:34
+msgid "<< user_installation.ssi << user_basics.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:37
-msgid ":B~ Other ~#"
+#: en/live-manual.ssm:36
+msgid ":B~ Development ~#"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:39
-msgid "<< other_installation.ssi"
+#: en/live-manual.ssm:38
+msgid ":B~ Project ~#"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:41
-msgid "<< other_basics.ssi"
+#: en/live-manual.ssm:40
+msgid ":B~ Other ~#"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:43
+#: en/live-manual.ssm:42
 msgid "<< other_overview.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:45
+#: en/live-manual.ssm:44
 msgid "<< other_customization-packages.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:47
+#: en/live-manual.ssm:46
 msgid "<< other_customization-contents.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:49
+#: en/live-manual.ssm:48
 msgid "<< other_customization-internationalization.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:51
+#: en/live-manual.ssm:50
 msgid "<< other_customization-bootup.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:53
+#: en/live-manual.ssm:52
 msgid "<< other_customization-binary.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:55
+#: en/live-manual.ssm:54
 msgid "<< other_customization-backports.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:57
+#: en/live-manual.ssm:56
 msgid "<< other_common-tasks.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:59
+#: en/live-manual.ssm:58
 msgid "<< other_live-environment.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:61
+#: en/live-manual.ssm:60
 msgid "<< other_faq.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:63
+#: en/live-manual.ssm:62
 msgid "<< other_reporting-bugs.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:65
+#: en/live-manual.ssm:64
 msgid "<< other_howtos.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:67
+#: en/live-manual.ssm:66
 msgid "<< other_coding-style.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:69
+#: en/live-manual.ssm:68
 msgid "<< other_procedures.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:71
+#: en/live-manual.ssm:70
 msgid "<< other_resources.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:73
+#: en/live-manual.ssm:72
 msgid "<< other_use-cases.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:75
+#: en/live-manual.ssm:74
 msgid "<< other_success-stories.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:77
+#: en/live-manual.ssm:76
 msgid "<< other_troubleshooting.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:79
+#: en/live-manual.ssm:78
 msgid "<< other_configuration-layout.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:80
+#: en/live-manual.ssm:79
 msgid "<< other_configuration-files.ssi"
 msgstr ""
diff --git a/manual/po/de/other_installation.ssi.po b/manual/po/de/other_installation.ssi.po
deleted file mode 100644
index 153187e..0000000
--- a/manual/po/de/other_installation.ssi.po
+++ /dev/null
@@ -1,463 +0,0 @@
-# German translations for live-manual package
-# Copyright (C) 2010 Free Software Foundation, Inc.
-# This file is distributed under the same license as the live-manual package.
-# Automatically generated, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-08-14 21:32+0300\n"
-"PO-Revision-Date: 2010-08-14 21:32+0300\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
-"Language: de\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#. type: Plain text
-#: en/about_manual.ssi:77 en/about_manual.ssi:85 en/about_manual.ssi:93
-#: en/about_manual.ssi:105 en/about_manual.ssi:116 en/about_manual.ssi:129
-#: en/about_manual.ssi:137 en/about_manual.ssi:145 en/about_manual.ssi:153
-#: en/other_basics.ssi:34 en/other_basics.ssi:45 en/other_basics.ssi:58
-#: en/other_basics.ssi:68 en/other_basics.ssi:106 en/other_basics.ssi:120
-#: en/other_basics.ssi:128 en/other_basics.ssi:136 en/other_basics.ssi:146
-#: en/other_basics.ssi:158 en/other_basics.ssi:176 en/other_basics.ssi:184
-#: en/other_basics.ssi:192 en/other_basics.ssi:208 en/other_basics.ssi:216
-#: en/other_basics.ssi:226 en/other_basics.ssi:301 en/other_basics.ssi:317
-#: en/other_basics.ssi:325 en/other_basics.ssi:347 en/other_basics.ssi:386
-#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
-#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
-#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
-#: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
-#: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
-#: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: en/other_customization-contents.ssi:30
-#: en/other_customization-contents.ssi:39
-#: en/other_customization-internationalization.ssi:10
-#: en/other_customization-internationalization.ssi:18
-#: en/other_customization-internationalization.ssi:26
-#: en/other_customization-internationalization.ssi:34
-#: en/other_customization-internationalization.ssi:46
-#: en/other_customization-packages.ssi:16
-#: en/other_customization-packages.ssi:24
-#: en/other_customization-packages.ssi:34
-#: en/other_customization-packages.ssi:42
-#: en/other_customization-packages.ssi:55
-#: en/other_customization-packages.ssi:91
-#: en/other_customization-packages.ssi:99
-#: en/other_customization-packages.ssi:146
-#: en/other_customization-packages.ssi:156
-#: en/other_customization-packages.ssi:166
-#: en/other_customization-packages.ssi:176 en/other_faq.ssi:41
-#: en/other_faq.ssi:83 en/other_faq.ssi:103 en/other_faq.ssi:117
-#: en/other_faq.ssi:137 en/other_faq.ssi:151 en/other_faq.ssi:198
-#: en/other_faq.ssi:245 en/other_faq.ssi:261 en/other_faq.ssi:287
-#: en/other_faq.ssi:299 en/other_faq.ssi:314 en/other_faq.ssi:333
-#: en/other_faq.ssi:345 en/other_faq.ssi:353 en/other_faq.ssi:364
-#: en/other_faq.ssi:374 en/other_howtos.ssi:16 en/other_howtos.ssi:43
-#: en/other_installation.ssi:40 en/other_installation.ssi:48
-#: en/other_installation.ssi:58 en/other_installation.ssi:66
-#: en/other_installation.ssi:78 en/other_installation.ssi:88
-#: en/other_installation.ssi:109 en/other_installation.ssi:123
-#: en/other_installation.ssi:141 en/other_installation.ssi:149
-#: en/other_installation.ssi:157 en/other_live-environment.ssi:14
-#: en/other_live-environment.ssi:30 en/other_live-environment.ssi:51
-#: en/other_live-environment.ssi:61 en/other_live-environment.ssi:69
-#: en/other_live-environment.ssi:77 en/other_live-environment.ssi:85
-#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
-#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
-#: en/other_overview.ssi:54 en/other_overview.ssi:94 en/other_overview.ssi:102
-#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
-#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
-#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
-#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111
-msgid "code{"
-msgstr ""
-
-#. type: Plain text
-#: en/about_manual.ssi:81 en/about_manual.ssi:89 en/about_manual.ssi:97
-#: en/about_manual.ssi:112 en/about_manual.ssi:125 en/about_manual.ssi:133
-#: en/about_manual.ssi:141 en/about_manual.ssi:149 en/about_manual.ssi:156
-#: en/other_basics.ssi:38 en/other_basics.ssi:49 en/other_basics.ssi:62
-#: en/other_basics.ssi:72 en/other_basics.ssi:111 en/other_basics.ssi:124
-#: en/other_basics.ssi:132 en/other_basics.ssi:140 en/other_basics.ssi:150
-#: en/other_basics.ssi:162 en/other_basics.ssi:180 en/other_basics.ssi:188
-#: en/other_basics.ssi:196 en/other_basics.ssi:212 en/other_basics.ssi:220
-#: en/other_basics.ssi:230 en/other_basics.ssi:293 en/other_basics.ssi:305
-#: en/other_basics.ssi:321 en/other_basics.ssi:329 en/other_basics.ssi:372
-#: en/other_basics.ssi:397 en/other_coding-style.ssi:34
-#: en/other_coding-style.ssi:45 en/other_coding-style.ssi:57
-#: en/other_coding-style.ssi:68 en/other_coding-style.ssi:92
-#: en/other_coding-style.ssi:100 en/other_coding-style.ssi:113
-#: en/other_coding-style.ssi:124 en/other_common-tasks.ssi:36
-#: en/other_customization-backports.ssi:16
-#: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: en/other_customization-contents.ssi:35
-#: en/other_customization-contents.ssi:50
-#: en/other_customization-internationalization.ssi:14
-#: en/other_customization-internationalization.ssi:22
-#: en/other_customization-internationalization.ssi:30
-#: en/other_customization-internationalization.ssi:38
-#: en/other_customization-internationalization.ssi:50
-#: en/other_customization-packages.ssi:20
-#: en/other_customization-packages.ssi:28
-#: en/other_customization-packages.ssi:38
-#: en/other_customization-packages.ssi:47
-#: en/other_customization-packages.ssi:59
-#: en/other_customization-packages.ssi:95
-#: en/other_customization-packages.ssi:103
-#: en/other_customization-packages.ssi:152
-#: en/other_customization-packages.ssi:162
-#: en/other_customization-packages.ssi:172
-#: en/other_customization-packages.ssi:182 en/other_faq.ssi:37
-#: en/other_faq.ssi:46 en/other_faq.ssi:92 en/other_faq.ssi:108
-#: en/other_faq.ssi:141 en/other_faq.ssi:155 en/other_faq.ssi:207
-#: en/other_faq.ssi:256 en/other_faq.ssi:292 en/other_faq.ssi:307
-#: en/other_faq.ssi:319 en/other_faq.ssi:337 en/other_faq.ssi:349
-#: en/other_faq.ssi:358 en/other_faq.ssi:370 en/other_faq.ssi:381
-#: en/other_howtos.ssi:20 en/other_howtos.ssi:47 en/other_installation.ssi:44
-#: en/other_installation.ssi:52 en/other_installation.ssi:62
-#: en/other_installation.ssi:74 en/other_installation.ssi:82
-#: en/other_installation.ssi:92 en/other_installation.ssi:113
-#: en/other_installation.ssi:128 en/other_installation.ssi:145
-#: en/other_installation.ssi:153 en/other_installation.ssi:161
-#: en/other_live-environment.ssi:18 en/other_live-environment.ssi:34
-#: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
-#: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
-#: en/other_live-environment.ssi:89 en/other_live-environment.ssi:97
-#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
-#: en/other_live-environment.ssi:138 en/other_overview.ssi:88
-#: en/other_overview.ssi:98 en/other_overview.ssi:106
-#: en/other_procedures.ssi:16 en/other_procedures.ssi:54
-#: en/other_procedures.ssi:131 en/other_use-cases.ssi:33
-#: en/other_use-cases.ssi:69 en/other_use-cases.ssi:97
-#: en/other_use-cases.ssi:107 en/other_use-cases.ssi:137
-msgid "}code"
-msgstr ""
-
-#. type: Plain text
-#: en/other_customization-internationalization.ssi:32
-#: en/other_installation.ssi:46
-msgid "or"
-msgstr ""
-
-#. type: Plain text
-#: en/other_installation.ssi:2
-msgid ":B~ Installation"
-msgstr ""
-
-#. type: Plain text
-#: en/other_installation.ssi:4
-msgid "1~ Installation"
-msgstr ""
-
-#. type: Plain text
-#: en/other_installation.ssi:6
-msgid "2~ Requirements"
-msgstr ""
-
-#. type: Plain text
-#: en/other_installation.ssi:8
-msgid "Building Debian Live images has very few system requirements:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_installation.ssi:10
-msgid "_* Super user (root) access"
-msgstr ""
-
-#. type: Plain text
-#: en/other_installation.ssi:12
-msgid "_* An up-to-date version of live-helper"
-msgstr ""
-
-#. type: Plain text
-#: en/other_installation.ssi:14
-msgid "_* A POSIX-compliant shell, such as /{bash}/ or /{dash}/."
-msgstr ""
-
-#. type: Plain text
-#: en/other_installation.ssi:16
-msgid "_* /{debootstrap}/ or /{cdebootstrap}/"
-msgstr ""
-
-#. type: Plain text
-#: en/other_installation.ssi:18
-msgid "_* Linux 2.6.x"
-msgstr ""
-
-#. type: Plain text
-#: en/other_installation.ssi:20
-msgid ""
-"Note that using Debian or a Debian-derived distribution is not required - "
-"live-helper will run on almost any operating system with the above "
-"requirements."
-msgstr ""
-
-#. type: Plain text
-#: en/other_installation.ssi:22
-msgid "2~ Installing live-helper"
-msgstr ""
-
-#. type: Plain text
-#: en/other_installation.ssi:24
-msgid "You can install live-helper in a number of different ways:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_installation.ssi:26
-msgid "_* From the Debian repository"
-msgstr ""
-
-#. type: Plain text
-#: en/other_installation.ssi:28
-msgid "_* From source"
-msgstr ""
-
-#. type: Plain text
-#: en/other_installation.ssi:30
-msgid "_* From snapshots"
-msgstr ""
-
-#. type: Plain text
-#: en/other_installation.ssi:32
-msgid "_* From backports.org"
-msgstr ""
-
-#. type: Plain text
-#: en/other_installation.ssi:34
-msgid ""
-"If you are using lenny or sid the recommended way is to install live-helper "
-"via the Debian repository."
-msgstr ""
-
-#. type: Plain text
-#: en/other_installation.ssi:36
-msgid "3~ From the Debian repository"
-msgstr ""
-
-#. type: Plain text
-#: en/other_installation.ssi:38
-msgid "Simply install live-helper like any other package:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_installation.ssi:42
-msgid "# apt-get install live-helper"
-msgstr ""
-
-#. type: Plain text
-#: en/other_installation.ssi:50
-msgid "# aptitude install live-helper"
-msgstr ""
-
-#. type: Plain text
-#: en/other_installation.ssi:54
-msgid "3~ From source"
-msgstr ""
-
-#. type: Plain text
-#: en/other_installation.ssi:56
-msgid ""
-"live-helper is developed using the Git version control system. On Debian "
-"systems, this is provided by the /{git-core}/ package. To check out the "
-"latest code, execute:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_installation.ssi:60
-msgid "$ git clone git://live.debian.net/git/live-helper.git"
-msgstr ""
-
-#. type: Plain text
-#: en/other_installation.ssi:64
-msgid "You can build and install your own Debian package by executing:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_installation.ssi:70
-msgid "$ cd live-helper $ dpkg-buildpackage -rfakeroot -b -uc -us $ cd .."
-msgstr ""
-
-#. type: Plain text
-#: en/other_installation.ssi:72
-msgid "# dpkg -i live-helper*.deb"
-msgstr ""
-
-#. type: Plain text
-#: en/other_installation.ssi:76
-msgid "You can also use a local version of live-helper without installation:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_installation.ssi:80
-msgid "# live-helper/helpers/lh_local"
-msgstr ""
-
-#. type: Plain text
-#: en/other_installation.ssi:84
-msgid ""
-"Subsequent calls to #{lh_}# prefixed helpers in that shell environment will "
-"then use the version located in the directory you executed #{lh_local}# from."
-msgstr ""
-
-#. type: Plain text
-#: en/other_installation.ssi:86
-msgid "You can also install live-helper directly to your system by executing:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_installation.ssi:90
-msgid "# make install"
-msgstr ""
-
-#. type: Plain text
-#: en/other_installation.ssi:94
-msgid "3~ From 'snapshots'"
-msgstr ""
-
-#. type: Plain text
-#: en/other_installation.ssi:96
-msgid ""
-"If you do not wish to build or install live-helper from source, you can use "
-"snapshots. These are built automatically from the latest version in Git and "
-"are available on http://live.debian.net/debian/."
-msgstr ""
-
-#. type: Plain text
-#: en/other_installation.ssi:98
-msgid "2~ live-initramfs"
-msgstr ""
-
-#. type: Plain text
-#: en/other_installation.ssi:100
-msgid ""
-"N.B. You do not need to install live-initramfs on your system to create "
-"customised Debian Live systems. However, doing so will do no harm."
-msgstr ""
-
-#. type: Plain text
-#: en/other_installation.ssi:102
-msgid "3~ Using a customised live-initramfs"
-msgstr ""
-
-#. type: Plain text
-#: en/other_installation.ssi:105
-msgid ""
-"To modify the code you can follow the process below. Please ensure you are "
-"familiar with the terms mentioned in terms.  % FIXME: <xref linkend=\"terms"
-"\"/>"
-msgstr ""
-
-#. type: Plain text
-#: en/other_installation.ssi:107
-msgid "_* Checkout the live-initramfs source"
-msgstr ""
-
-#. type: Plain text
-#: en/other_installation.ssi:111
-msgid "$ git clone git://live.debian.net/git/live-initramfs.git"
-msgstr ""
-
-#. type: Plain text
-#: en/other_installation.ssi:115
-msgid "_* Make changes to your local copy"
-msgstr ""
-
-#. type: Plain text
-#: en/other_installation.ssi:117
-msgid ""
-"And beware that if you want to add your pre-init script in live-bottom, you "
-"should name it without dashes '-', e.g: call it \"81new_feature\" and not "
-"\"81new-feature\"."
-msgstr ""
-
-#. type: Plain text
-#: en/other_installation.ssi:119
-msgid "_* Build a live-initramfs .deb"
-msgstr ""
-
-#. type: Plain text
-#: en/other_installation.ssi:121
-msgid ""
-"You must build either on your target distribution or in a chroot containing "
-"your target platform: this means if your target is lenny then you should "
-"build against lenny. You can use a personal builder such as /{pbuilder}/ to "
-"automate building packages in chroot. To build directly on the target "
-"platform, use #{dpkg-buildpackage}# (provided by the /{dpkg-dev}/ package):"
-msgstr ""
-
-#. type: Plain text
-#: en/other_installation.ssi:126
-msgid "$ cd live-initramfs $ dpkg-buildpackage -rfakeroot -b -uc -us"
-msgstr ""
-
-#. type: Plain text
-#: en/other_installation.ssi:130
-msgid "_* Use the generated live-initramfs .deb"
-msgstr ""
-
-#. type: Plain text
-#: en/other_installation.ssi:133
-msgid ""
-"As live-initramfs is installed by the build system, installing the package "
-"in the host system is not sufficient: you should treat the generated .deb "
-"like another custom package. Please see custom-packages for more "
-"information. You should pay particular attention to custom-packages-apt.  % "
-"FIXME: <xref linkend=\"custom-packages\"/> <xref linkend=\"custom-packages-"
-"apt\"/>"
-msgstr ""
-
-#. type: Plain text
-#: en/other_installation.ssi:135
-msgid "3~ Using live-initramfs snapshots"
-msgstr ""
-
-#. type: Plain text
-#: en/other_installation.ssi:137
-msgid ""
-"You can let live-helper automatically use the latest snapshot of live-"
-"initramfs by configuring a third-party repository in your live-system "
-"configuration. Assuming you have already created a configuration tree with #"
-"{lh config}#:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_installation.ssi:139
-msgid "_* Create a sources.list entry for the chroot stage:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_installation.ssi:143
-msgid ""
-"echo \"deb http://live.debian.net/ sid-snapshots main contrib non-free\" > "
-"config/chroot_sources/debian-live_sid-snapshots.chroot"
-msgstr ""
-
-#. type: Plain text
-#: en/other_installation.ssi:147
-msgid "_* Create a sources.list entry for the binary stage:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_installation.ssi:151
-msgid ""
-"cp config/chroot_sources/debian-live_sid-snapshots.chroot config/"
-"chroot_sources/debian-live_sid-snapshots.binary"
-msgstr ""
-
-#. type: Plain text
-#: en/other_installation.ssi:155
-msgid "_* Fetch the archive signing key:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_installation.ssi:160
-msgid ""
-"$ wget http://live.debian.net/debian/project/openpgp/archive-key.asc -O "
-"config/chroot_sources/debian-live_sid-snapshots.chroot.gpg $ cp config/"
-"chroot_sources/debian-live_sid-snapshots.chroot.gpg config/chroot_sources/"
-"debian-live_sid-snapshots.binary.gpg"
-msgstr ""
diff --git a/manual/po/de/other_basics.ssi.po b/manual/po/de/user_basics.ssi.po
similarity index 53%
rename from manual/po/de/other_basics.ssi.po
rename to manual/po/de/user_basics.ssi.po
index f8f2ece..3ade27e 100644
--- a/manual/po/de/other_basics.ssi.po
+++ b/manual/po/de/user_basics.ssi.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-08-14 21:32+0300\n"
-"PO-Revision-Date: 2010-08-14 21:32+0300\n"
+"POT-Creation-Date: 2010-09-07 14:53+0300\n"
+"PO-Revision-Date: 2010-09-07 14:53+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "Language: de\n"
@@ -17,16 +17,9 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. type: Plain text
-#: en/about_manual.ssi:77 en/about_manual.ssi:85 en/about_manual.ssi:93
-#: en/about_manual.ssi:105 en/about_manual.ssi:116 en/about_manual.ssi:129
-#: en/about_manual.ssi:137 en/about_manual.ssi:145 en/about_manual.ssi:153
-#: en/other_basics.ssi:34 en/other_basics.ssi:45 en/other_basics.ssi:58
-#: en/other_basics.ssi:68 en/other_basics.ssi:106 en/other_basics.ssi:120
-#: en/other_basics.ssi:128 en/other_basics.ssi:136 en/other_basics.ssi:146
-#: en/other_basics.ssi:158 en/other_basics.ssi:176 en/other_basics.ssi:184
-#: en/other_basics.ssi:192 en/other_basics.ssi:208 en/other_basics.ssi:216
-#: en/other_basics.ssi:226 en/other_basics.ssi:301 en/other_basics.ssi:317
-#: en/other_basics.ssi:325 en/other_basics.ssi:347 en/other_basics.ssi:386
+#: en/about_manual.ssi:81 en/about_manual.ssi:89 en/about_manual.ssi:97
+#: en/about_manual.ssi:109 en/about_manual.ssi:120 en/about_manual.ssi:133
+#: en/about_manual.ssi:141 en/about_manual.ssi:149 en/about_manual.ssi:157
 #: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
 #: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
 #: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
@@ -57,42 +50,40 @@ msgstr ""
 #: en/other_faq.ssi:299 en/other_faq.ssi:314 en/other_faq.ssi:333
 #: en/other_faq.ssi:345 en/other_faq.ssi:353 en/other_faq.ssi:364
 #: en/other_faq.ssi:374 en/other_howtos.ssi:16 en/other_howtos.ssi:43
-#: en/other_installation.ssi:40 en/other_installation.ssi:48
-#: en/other_installation.ssi:58 en/other_installation.ssi:66
-#: en/other_installation.ssi:78 en/other_installation.ssi:88
-#: en/other_installation.ssi:109 en/other_installation.ssi:123
-#: en/other_installation.ssi:141 en/other_installation.ssi:149
-#: en/other_installation.ssi:157 en/other_live-environment.ssi:14
-#: en/other_live-environment.ssi:30 en/other_live-environment.ssi:51
-#: en/other_live-environment.ssi:61 en/other_live-environment.ssi:69
-#: en/other_live-environment.ssi:77 en/other_live-environment.ssi:85
-#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
-#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
-#: en/other_overview.ssi:54 en/other_overview.ssi:94 en/other_overview.ssi:102
+#: en/other_live-environment.ssi:14 en/other_live-environment.ssi:30
+#: en/other_live-environment.ssi:51 en/other_live-environment.ssi:61
+#: en/other_live-environment.ssi:69 en/other_live-environment.ssi:77
+#: en/other_live-environment.ssi:85 en/other_live-environment.ssi:93
+#: en/other_live-environment.ssi:116 en/other_live-environment.ssi:124
+#: en/other_live-environment.ssi:133 en/other_overview.ssi:54
+#: en/other_overview.ssi:94 en/other_overview.ssi:102
 #: en/other_procedures.ssi:12 en/other_procedures.ssi:46
 #: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
 #: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
-#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111
+#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111 en/user_basics.ssi:34
+#: en/user_basics.ssi:45 en/user_basics.ssi:58 en/user_basics.ssi:70
+#: en/user_basics.ssi:84 en/user_basics.ssi:99 en/user_basics.ssi:107
+#: en/user_basics.ssi:115 en/user_basics.ssi:125 en/user_basics.ssi:137
+#: en/user_basics.ssi:149 en/user_basics.ssi:157 en/user_basics.ssi:165
+#: en/user_basics.ssi:179 en/user_basics.ssi:187 en/user_basics.ssi:197
+#: en/user_basics.ssi:249 en/user_basics.ssi:265 en/user_basics.ssi:273
+#: en/user_basics.ssi:293 en/user_basics.ssi:318 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:76
+#: en/user_installation.ssi:84 en/user_installation.ssi:104
+#: en/user_installation.ssi:118 en/user_installation.ssi:134
 msgid "code{"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:81 en/about_manual.ssi:89 en/about_manual.ssi:97
-#: en/about_manual.ssi:112 en/about_manual.ssi:125 en/about_manual.ssi:133
-#: en/about_manual.ssi:141 en/about_manual.ssi:149 en/about_manual.ssi:156
-#: en/other_basics.ssi:38 en/other_basics.ssi:49 en/other_basics.ssi:62
-#: en/other_basics.ssi:72 en/other_basics.ssi:111 en/other_basics.ssi:124
-#: en/other_basics.ssi:132 en/other_basics.ssi:140 en/other_basics.ssi:150
-#: en/other_basics.ssi:162 en/other_basics.ssi:180 en/other_basics.ssi:188
-#: en/other_basics.ssi:196 en/other_basics.ssi:212 en/other_basics.ssi:220
-#: en/other_basics.ssi:230 en/other_basics.ssi:293 en/other_basics.ssi:305
-#: en/other_basics.ssi:321 en/other_basics.ssi:329 en/other_basics.ssi:372
-#: en/other_basics.ssi:397 en/other_coding-style.ssi:34
-#: en/other_coding-style.ssi:45 en/other_coding-style.ssi:57
-#: en/other_coding-style.ssi:68 en/other_coding-style.ssi:92
-#: en/other_coding-style.ssi:100 en/other_coding-style.ssi:113
-#: en/other_coding-style.ssi:124 en/other_common-tasks.ssi:36
-#: en/other_customization-backports.ssi:16
+#: en/about_manual.ssi:85 en/about_manual.ssi:93 en/about_manual.ssi:101
+#: en/about_manual.ssi:116 en/about_manual.ssi:129 en/about_manual.ssi:137
+#: en/about_manual.ssi:145 en/about_manual.ssi:153 en/about_manual.ssi:160
+#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
+#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
+#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
+#: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
+#: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
 #: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
 #: en/other_customization-contents.ssi:35
 #: en/other_customization-contents.ssi:50
@@ -117,12 +108,7 @@ msgstr ""
 #: en/other_faq.ssi:256 en/other_faq.ssi:292 en/other_faq.ssi:307
 #: en/other_faq.ssi:319 en/other_faq.ssi:337 en/other_faq.ssi:349
 #: en/other_faq.ssi:358 en/other_faq.ssi:370 en/other_faq.ssi:381
-#: en/other_howtos.ssi:20 en/other_howtos.ssi:47 en/other_installation.ssi:44
-#: en/other_installation.ssi:52 en/other_installation.ssi:62
-#: en/other_installation.ssi:74 en/other_installation.ssi:82
-#: en/other_installation.ssi:92 en/other_installation.ssi:113
-#: en/other_installation.ssi:128 en/other_installation.ssi:145
-#: en/other_installation.ssi:153 en/other_installation.ssi:161
+#: en/other_howtos.ssi:20 en/other_howtos.ssi:47
 #: en/other_live-environment.ssi:18 en/other_live-environment.ssi:34
 #: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
 #: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
@@ -133,61 +119,72 @@ msgstr ""
 #: en/other_procedures.ssi:16 en/other_procedures.ssi:54
 #: en/other_procedures.ssi:131 en/other_use-cases.ssi:33
 #: en/other_use-cases.ssi:69 en/other_use-cases.ssi:97
-#: en/other_use-cases.ssi:107 en/other_use-cases.ssi:137
+#: en/other_use-cases.ssi:107 en/other_use-cases.ssi:137 en/user_basics.ssi:38
+#: en/user_basics.ssi:49 en/user_basics.ssi:64 en/user_basics.ssi:74
+#: en/user_basics.ssi:90 en/user_basics.ssi:103 en/user_basics.ssi:111
+#: en/user_basics.ssi:119 en/user_basics.ssi:129 en/user_basics.ssi:143
+#: en/user_basics.ssi:153 en/user_basics.ssi:161 en/user_basics.ssi:169
+#: en/user_basics.ssi:183 en/user_basics.ssi:191 en/user_basics.ssi:201
+#: en/user_basics.ssi:241 en/user_basics.ssi:269 en/user_basics.ssi:277
+#: en/user_basics.ssi:304 en/user_basics.ssi:343 en/user_installation.ssi:42
+#: en/user_installation.ssi:50 en/user_installation.ssi:60
+#: en/user_installation.ssi:72 en/user_installation.ssi:80
+#: en/user_installation.ssi:108 en/user_installation.ssi:123
+#: en/user_installation.ssi:137
 msgid "}code"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:2
+#: en/user_basics.ssi:2
 msgid ":B~ The basics"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:4
+#: en/user_basics.ssi:4
 msgid "1~ The basics"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:6
+#: en/user_basics.ssi:6
 msgid ""
 "This chapter contains a brief overview of the build process as well as "
 "containing instructions on how to boot the various binary image types."
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:8
+#: en/user_basics.ssi:8
 msgid "2~ What is a live system?"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:11
+#: en/user_basics.ssi:11
 msgid ""
-"A live system usually means an OS booted on a computer from a removable "
-"medium (such as CD-ROM, USB stick, or network), ready to use without any "
-"installation on the usual drive(s), with an auto-configuration done at "
-"runtime (see terms).  % FIXME: <xref linkend=\"terms\"/>"
+"A live system usually means an operating system booted on a computer from a "
+"removable medium (such as CD-ROM, USB stick, or network), ready to use "
+"without any installation on the usual drive(s), with an auto-configuration "
+"done at runtime (see terms).  % FIXME: <xref linkend=\"terms\"/>"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:13
+#: en/user_basics.ssi:13
 msgid ""
-"With Debian Live, it's a Debian GNU/Linux OS, built for one of the supported "
-"architectures (currently amd64, i386, powerpc and sparc). It is made from "
-"following parts:"
+"With Debian Live, it's a Debian GNU/Linux operating system, built for one of "
+"the supported architectures (currently amd64, i386, powerpc and sparc). It "
+"is made from following parts:"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:15
+#: en/user_basics.ssi:15
 msgid "_* Linux kernel"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:17
+#: en/user_basics.ssi:17
 msgid "_* The Linux image, usually named #{vmlinuz*}#"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:19
+#: en/user_basics.ssi:19
 msgid ""
 "_* *{Initial RAM disk image (initrd)}*: RAM disk setup for the Linux boot, "
 "containing modules possibly needed to mount the filesystem's image and some "
@@ -195,19 +192,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:22
+#: en/user_basics.ssi:22
 msgid ""
-"_* *{System image}*: The OS filesystem image. Debian Live uses SquashFS, a "
-"compressed filesystem, to minimize its image size. Note that it's read-only. "
-"So, during boot the Debian Live system will use a RAM disk and 'union' "
-"mechanism to enable writing files within the running system. However, all "
-"modifications will be lost upon shutdown unless optional persistence "
-"partition(s) are used. (See persistence.)  % FIXME: <xref linkend="
-"\"persistence\"/>"
+"_* *{System image}*: The operating systems filesystem image. Debian Live "
+"uses SquashFS, a compressed filesystem, to minimize its image size. Note "
+"that it's read-only. So, during boot the Debian Live system will use a RAM "
+"disk and 'union' mechanism to enable writing files within the running "
+"system. However, all modifications will be lost upon shutdown unless "
+"optional persistence partition(s) are used (see persistence).  % FIXME: "
+"<xref linkend=\"persistence\"/>"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:24
+#: en/user_basics.ssi:24
 msgid ""
 "_* *{Bootloader}*: A small piece of code, crafted to boot up from the chosen "
 "media, possibly presenting a prompt or menu to allow selection of options/"
@@ -215,245 +212,190 @@ msgid ""
 "associated filesystem image. Different solutions can be used depending on "
 "the target media and format of the filesystem containing the previous "
 "components: Isolinux to boot from a CD or DVD in ISO9660 format, syslinux "
-"for HDD or USB drive booting from a VFAT partition, GRUB for ext2/3 "
-"partition, pxelinux for PXE netboot, etc."
+"for HDD or USB drive booting from a VFAT partition, extlinux for ext2/3/4 "
+"and btrfs partitions, pxelinux for PXE netboot, GRUB for ext2/3/4 partition, "
+"etc."
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:26
+#: en/user_basics.ssi:26
 msgid ""
-"_* The Debian Live tools will build the system image from your "
-"specifications, setup a Linux kernel and its initrd, a bootloader to run "
-"them, all in one media-dependant format(ISO9660 image, disk image, etc.)"
+"_* live-build will build the system image from your specifications, setup a "
+"Linux kernel and its initrd, a bootloader to run them, all in one media-"
+"dependant format (ISO9660 image, disk image, etc.)"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:28
+#: en/user_basics.ssi:28
 msgid "2~ First steps: building an ISO image"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:30
+#: en/user_basics.ssi:30
 msgid ""
-"The following sequence of helper commands, provided by live-helper, will "
-"create a basic ISO image containing just the Debian standard system without "
-"X.org. It is suitable for burning to CD or DVD media."
+"The following sequence of commands, provided by live-build, will create a "
+"basic ISO image containing just the Debian standard system without X.org. It "
+"is suitable for burning to CD or DVD media."
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:32
+#: en/user_basics.ssi:32
 msgid ""
-"First, we run the lh config helper command which will create a \"config/\" "
-"hierarchy in the current directory for use by other helper commands:"
+"First, we run the #{lb config}# command which will create a \"config/\" "
+"hierarchy in the current directory for use by other commands:"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:36
-msgid "$ lh config"
+#: en/user_basics.ssi:36
+msgid "$ lb config"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:41
+#: en/user_basics.ssi:41
 msgid ""
-"By passing no parameters to lh config we indicated that we wish to use the "
-"defaults. This will create an image of type binary (see lh-config).  % "
-"FIXME: <xref linkend=\"lh-config\"/>"
+"By passing no parameters to #{lb config}# we indicated that we wish to use "
+"the defaults (see lb-config).  % FIXME: <xref linkend=\"lb-config\"/>"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:43
+#: en/user_basics.ssi:43
 msgid ""
-"Now that we have a \"config/\" hierarchy, we may build the image with the lh "
-"build helper command:"
+"Now that we have a \"config/\" hierarchy, we may build the image with the lb "
+"build command:"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:47 en/other_basics.ssi:138 en/other_basics.ssi:228
-msgid "# lh build"
+#: en/user_basics.ssi:47 en/user_basics.ssi:117 en/user_basics.ssi:199
+msgid "# lb build"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:52
+#: en/user_basics.ssi:52
 msgid ""
 "This process can take a while, depending on the speed of your network "
-"connection (see lh-build).  % FIXME: <xref linkend=\"lh-build\"/>"
+"connection (see lb-build).  % FIXME: <xref linkend=\"lb-build\"/>"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:54
+#: en/user_basics.ssi:54
 msgid "3~ Testing an ISO image with Qemu"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:56
+#: en/user_basics.ssi:56
 msgid "Testing an ISO is simple:"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:60
-msgid "# apt-get install qemu $ qemu -cdrom binary.iso"
+#: en/user_basics.ssi:60 en/user_basics.ssi:139
+msgid "# apt-get install qemu"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:64
-msgid "3~ Testing an ISO image with virtualbox-ose"
+#: en/user_basics.ssi:62
+msgid "$ qemu -cdrom binary.iso"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:66
-msgid "In order to test the ISO with virtualbox-ose:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_basics.ssi:70
-msgid "# apt-get install virtualbox-ose"
+#: en/user_basics.ssi:66
+msgid "3~ Testing an ISO image with virtualbox-ose"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:74
-msgid "and either install"
+#: en/user_basics.ssi:68
+msgid "In order to test the ISO with virtualbox-ose:"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:76
-msgid ""
-"_* the modules package for a stock kernel eg virtualbox-ose-"
-"modules-2.6.26-1-486 or"
+#: en/user_basics.ssi:72
+msgid "# apt-get install virtualbox-ose"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:78
+#: en/user_basics.ssi:76
 msgid ""
-"_* the modules package compiled for your kernel using module-assistant from "
-"the package virtualbox-ose-source"
-msgstr ""
-
-#. type: Plain text
-#: en/other_basics.ssi:80
-msgid "Run Virtualbox:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_basics.ssi:82
-msgid "For example, in Gnome Applications -> System Tools -> VirtualBox OSE"
+"and either install #{virtualbox-ose-source}# or #{virtualbox-ose-dkms}# to "
+"build the required kernel modules to run virtualbox-ose."
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:84
-msgid "Create a virtual machine from your Live ISO"
-msgstr ""
-
-#. type: Plain text
-#: en/other_basics.ssi:86
+#: en/user_basics.ssi:78
 msgid ""
-"To create a virtual machine \"mylive\" from A CDROM ISO \"binary.iso\" in "
-"VirtualBox:"
+"After successful installation, virtualbox can be e.g. found in the GNOME "
+"menu under 'Applications/System Tools/VirtualBox OSE'."
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:88
-msgid "Machine -> New"
-msgstr ""
-
-#. type: Plain text
-#: en/other_basics.ssi:90
-msgid "In the Wizard: FIXME"
-msgstr ""
-
-#. type: Plain text
-#: en/other_basics.ssi:92
-msgid "3~ Testing an ISO image with VMware Workstation"
-msgstr ""
-
-#. type: Plain text
-#: en/other_basics.ssi:94
-msgid "In order to test the ISO with VMware Workstation:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_basics.ssi:96 en/other_basics.ssi:168
-msgid "Run VMware Workstation:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_basics.ssi:98
-msgid "Click on Edit virtual machine settings in the VM summary page"
+#: en/user_basics.ssi:80
+msgid "3~ Burning an ISO image to a physical medium"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:100
-msgid ""
-"Then, click on the CD-ROM device and select Use ISO image. Remeber to "
-"connect the CD-ROM device at power on and remeber to adjust the boot order "
-"in the bios."
+#: en/user_basics.ssi:82
+msgid "Burning an ISO image is easy:"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:102
-msgid "3~ Burning an ISO image to a physical medium"
+#: en/user_basics.ssi:86
+msgid "# apt-get install wodim"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:104
-msgid "Burning an ISO image is easy:"
+#: en/user_basics.ssi:88
+msgid "$ wodim binary.iso"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:109
-msgid "# apt-get install wodim $ wodim binary.iso"
-msgstr ""
-
-#. type: Plain text
-#: en/other_basics.ssi:113
+#: en/user_basics.ssi:92
 msgid "2~ Building an USB/HDD image"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:115
+#: en/user_basics.ssi:94
 msgid ""
-"The following sequence of helper commands will create a basic USB/HDD image "
+"The following sequence of commands will create a basic USB/HDD image "
 "containing just the Debian standard system without X.org. It is suitable for "
 "booting from USB sticks, USB hard drives, and various other portable storage "
 "devices."
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:118
+#: en/user_basics.ssi:97
 msgid ""
 "Note if you created an iso image with the previous example, you will need to "
-"clean up your working directory with the lh clean helper command (see lh-"
-"clean): % FIXME: <xref linkend=\"lh-clean\"/>"
+"clean up your working directory with the #{lb clean} command (see lb-clean): "
+"% FIXME: <xref linkend=\"lb-clean\"/>"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:122 en/other_basics.ssi:210
-msgid "$ lh clean --binary"
+#: en/user_basics.ssi:101 en/user_basics.ssi:181
+msgid "$ lb clean --binary"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:126
+#: en/user_basics.ssi:105
 msgid ""
-"Run the lh config helper command with the parameters to configure the "
-"\"config/\" hierarchy to create a USB/HDD image type:"
+"Run the #{lb config}# command with the parameters to configure the \"config/"
+"\" hierarchy to create a USB/HDD image type:"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:130
-msgid "$ lh config -b usb-hdd"
+#: en/user_basics.ssi:109
+msgid "$ lb config -b usb-hdd"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:134 en/other_basics.ssi:224
-msgid "Now build the image with the lh build helper command:"
+#: en/user_basics.ssi:113
+msgid "Now build the image with the #{lb build} command:"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:142
+#: en/user_basics.ssi:121
 msgid "3~ Copying USB/HDD image to a USB stick"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:144
+#: en/user_basics.ssi:123
 msgid ""
 "The generated binary image contains a VFAT partition and the syslinux "
 "bootloader, ready to be directly written on an USB stick. Plug in an USB "
@@ -461,12 +403,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:148
+#: en/user_basics.ssi:127
 msgid "$ dd if=binary.img of=${USBSTICK}"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:152
+#: en/user_basics.ssi:131
 msgid ""
 "where #{${USBSTICK}}# is the device file of your key, like #{/dev/sdb}# (not "
 "a partition like #{/dev/sdb1}#!); you can find the right device name by "
@@ -474,130 +416,104 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:154
+#: en/user_basics.ssi:133
 #, no-wrap
 msgid "*{This will definitely overwrite any previous contents on your stick!}*\n"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:156
+#: en/user_basics.ssi:135
 msgid "3~ Testing a USB/HDD image with Qemu"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:160
-msgid "# apt-get install qemu $ qemu -hda binary.img"
-msgstr ""
-
-#. type: Plain text
-#: en/other_basics.ssi:164
-msgid "3~ Testing an USB/HDD image with VMware Workstation"
+#: en/user_basics.ssi:141
+msgid "$ qemu -hda binary.img"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:166
-msgid "In order to test the USB/HDD image with VMware Workstation:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_basics.ssi:170
-msgid ""
-"Write the image to an usb stick. In VMware, click on Edit virtual machine "
-"settings in VM summary page. Then, add a new physical harddisk device and "
-"enter the device node of your usb stick."
-msgstr ""
-
-#. type: Plain text
-#: en/other_basics.ssi:172
+#: en/user_basics.ssi:145
 msgid "3~ Using the space left on a USB stick"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:174
+#: en/user_basics.ssi:147
 msgid ""
 "If you want to use the remaining free space after you have installed the "
-"binary.img, you can use a partitioning tool such as gparted or parted to "
-"create a new partition on the stick. The first partition will be used by the "
-"Debian Live system."
+"binary.img, you can use a partitioning tool such as #{gparted}# or #{parted}"
+"# to create a new partition on the stick. The first partition will be used "
+"by the Debian Live system."
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:178
+#: en/user_basics.ssi:151
 msgid "# gparted ${USBSTICK}"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:182
+#: en/user_basics.ssi:155
 msgid ""
 "Ater the creation of the partition you have to create a filsystem on it. One "
-"possible choice would be ext2 (ext3 isn't recommended because the journaling "
-"causes too many writes to the stick)."
+"possible choice would be ext4."
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:186
-msgid "# mkfs.ext2 ${USBSTICK}"
+#: en/user_basics.ssi:159
+msgid "# mkfs.ext4 ${USBSTICK}"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:190
+#: en/user_basics.ssi:163
 msgid "If you want to use this data partition with Windows, use FAT32."
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:194
+#: en/user_basics.ssi:167
 msgid "# mkfs.vfat -F 32"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:198
+#: en/user_basics.ssi:171
 #, no-wrap
 msgid "*{Remember: Every time you install a new binary.img on the stick, all your data will be lost because the image includes a complete partition table.}*\n"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:200
-msgid ""
-"FIXME: Describe installing Debian Live to a partition (e.g. /dev/sdc1) AND "
-"using a bootloader to boot this."
-msgstr ""
-
-#. type: Plain text
-#: en/other_basics.ssi:202
+#: en/user_basics.ssi:173
 msgid "2~ Building a netboot image"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:204
+#: en/user_basics.ssi:175
 msgid ""
-"The following sequence of helper commands will create a basic netboot image "
+"The following sequence of commands will create a basic netboot image "
 "containing the Debian standard system without X.org. It is suitable for "
 "booting over the network."
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:206
+#: en/user_basics.ssi:177
 msgid ""
 "Note if you performed any previous examples, you will need to clean up your "
-"working directory with the lh clean helper command:"
+"working directory with the #{lb clean}# command:"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:214
+#: en/user_basics.ssi:185
 msgid ""
-"Run the lh config helper command with the parameters to configure the "
-"\"config/\" hierarchy to create our netboot image:"
+"Run the #{lb config}# command with the parameters to configure the \"config/"
+"\" hierarchy to create our netboot image:"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:218
+#: en/user_basics.ssi:189
 msgid ""
-"$ lh config -b net --net-root-path \"/srv/debian-live\" --net-root-server "
+"$ lb config -b net --net-root-path \"/srv/debian-live\" --net-root-server "
 "\"192.168.0.1\""
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:222
+#: en/user_basics.ssi:193
 msgid ""
 "In contrast with the ISO and USB hdd images, netbooting does not support "
 "serving a filesystem image with the client so the files must be served via "
@@ -607,37 +523,42 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:232
+#: en/user_basics.ssi:195
+msgid "Now build the image with the #{lb build}# command:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:203
 msgid ""
 "In a network boot the client runs a small piece of software, which usually "
 "resides on the EPROM of the Ethernet card. This program sends a DHCP request "
 "to get an IP address and information about what to do next. Typically the "
 "next step is getting a higher level boot loader via the TFTP protocol. That "
-"could be Grub, PXELINUX, or even boot directly to an operating system like "
+"could be PXELINUX, Grub or even boot directly to an operating system like "
 "Linux."
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:234
+#: en/user_basics.ssi:205
 msgid ""
 "For example, if you unpack the generated binary-net.tar.gz archive in the /"
 "srv/debian-live directory, you'll find the filesystem image in live/"
-"filesystem.squashfs and the kernel, initrd and PXE Linux bootloader in "
+"filesystem.squashfs and the kernel, initrd and PXELINUX bootloader in "
 "tftpboot/debian-live/i386."
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:236
-msgid "We must now configure three services on the server to enable netboot:"
+#: en/user_basics.ssi:207
+msgid "We must now configure three services on the server to enable netboot."
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:238
+#: en/user_basics.ssi:209
 msgid "3~ DHCP server"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:240
+#: en/user_basics.ssi:211
 msgid ""
 "We must configure our network's DHCP server to be sure to give an IP address "
 "to the computer netbooting, and to advertise the location of the PXE "
@@ -645,33 +566,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:242
+#: en/user_basics.ssi:213
 msgid ""
-"Here is an example for inspiration, written for the ISC DHCP server (package "
-"dhcp3-server) in the /etc/dhcp3/dhcpd.conf configuration file;"
+"Here is an example for inspiration, written for the ISC DHCP server #{isc-"
+"dhcp-server}# in the /etc/dhcp/dhcpd.conf configuration file;"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:250
-#, no-wrap
-msgid ""
-"code{\n"
-"# Options DHCP spécifiques à Pxelinux:\n"
-"option space pxelinux;\n"
-"option pxelinux.magic      code 208 = string;\n"
-"option pxelinux.configfile code 209 = text;\n"
-"option pxelinux.pathprefix code 210 = text;\n"
-"option pxelinux.reboottime code 211 = unsigned integer 32;\n"
+#: en/user_basics.ssi:216
+msgid "% FIXME code{"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:253
+#: en/user_basics.ssi:218
 #, no-wrap
 msgid "subnet 192.168.1.0 netmask 255.255.255.0 {   # 192.168.1.0/24\n"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:256
+#: en/user_basics.ssi:221
 #, no-wrap
 msgid ""
 "  # IP addresses available for guests\n"
@@ -679,7 +592,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:259
+#: en/user_basics.ssi:224
 #, no-wrap
 msgid ""
 "  # allow booting from the net\n"
@@ -687,7 +600,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:264
+#: en/user_basics.ssi:229
 #, no-wrap
 msgid ""
 "  # for net booting, server where the first file to be loaded (by TFTP\n"
@@ -697,17 +610,16 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:269
+#: en/user_basics.ssi:233
 #, no-wrap
 msgid ""
 "  # net boot configuration for guests with a PXE client :\n"
 "  if substring (option vendor-class-identifier, 0, 9) = \"PXEClient\" {\n"
 "    # Note : all files for PXE are relatives to the TFTP server's root\n"
-"    # path, as usually defined in /etc/inetd.conf.\n"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:272
+#: en/user_basics.ssi:236
 #, no-wrap
 msgid ""
 "    # PXE boot loader (first program to be loaded, by TFTP)\n"
@@ -715,77 +627,53 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:280
-#, no-wrap
-msgid ""
-"    # describe some specific pxelinux's options through DHCP options :\n"
-"    site-option-space \"pxelinux\";\n"
-"    option pxelinux.magic f1:00:74:7e;\n"
-"    if exists dhcp-parameter-request-list {\n"
-"      # Always send the PXELINUX options (specified in hexadecimal)\n"
-"      option dhcp-parameter-request-list = concat(option dhcp-parameter-request-list,d0,d1,d2,d3);\n"
-"    }\n"
-msgstr ""
-
-#. type: Plain text
-#: en/other_basics.ssi:286
+#: en/user_basics.ssi:239
 #, no-wrap
 msgid ""
-"    # For a PXE boot menu, different versions are available : simple\n"
-"    # text, text with curses, graphic (VESA)\n"
-"    #option pxelinux.configfile \"pxelinux/config_simple\";\n"
-"    #option pxelinux.configfile \"pxelinux/config_curses\";\n"
-"    option pxelinux.configfile \"pxelinux/config_vesa\";\n"
-msgstr ""
-
-#. type: Plain text
-#: en/other_basics.ssi:291
-#, no-wrap
-msgid ""
-"    # automatically reboot after 10 minutes of no activity\n"
-"    option pxelinux.reboottime 600;\n"
 "  }\n"
 "}\n"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:295
-msgid "3~ TFTPd server"
+#: en/user_basics.ssi:243
+msgid "3~ TFTP server"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:297
+#: en/user_basics.ssi:245
 msgid "This serves the kernel and initial ramdisk to the system at run-time."
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:299
+#: en/user_basics.ssi:247
 msgid ""
 "You should install the tftpd-hpa package. It can serve all files contained "
-"inside a root directory, usually /var/lib/tftpboot/, as defined with its -s "
-"option. To let it serve files inside /srv/debian-live/tftpboot, modify its "
-"start definition in /etc/inetd.conf with:"
+"inside a root directory, usually /srv/tftp. To let it serve files inside /"
+"srv/debian-live/tftpboot, run as root the following command:"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:303
-msgid ""
-"tftp dgram udp wait root /usr/sbin/in.tftpd /usr/sbin/in.tftpd -s /srv/"
-"debian-live/tftpboot -r blksize -v -v"
+#: en/user_basics.ssi:251
+msgid "dpkg-reconfigure -plow tftpd-hpa"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:307
-msgid "and reload the super server with /etc/init.d/openbsd-inetd reload."
+#: en/user_basics.ssi:253
+msgid "code}"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:309
+#: en/user_basics.ssi:255
+msgid "and fill in the new tftp server directory when being asked about it."
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:257
 msgid "3~ NFS server"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:311
+#: en/user_basics.ssi:259
 msgid ""
 "Once the guest computer has downloaded and booted a Linux kernel and loaded "
 "its initrd, it will try to mount the Live filesystem image through a NFS "
@@ -793,37 +681,35 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:313
-msgid ""
-"You should install the nfs-kernel-server package -- nfs-user-server does not "
-"function correctly with netboot."
+#: en/user_basics.ssi:261
+msgid "You need to install the nfs-kernel-server package."
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:315
+#: en/user_basics.ssi:263
 msgid ""
 "Then, make the filesystem image available through NFS by adding a line like "
 "the following to /etc/exports:"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:319
-msgid "/srv/debian-live *(ro,async,subtree_check,no_root_squash)"
+#: en/user_basics.ssi:267
+msgid "/srv/debian-live *(ro,async,no_root_squash,no_subtree_check)"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:323
+#: en/user_basics.ssi:271
 msgid ""
 "and tell the NFS server about this new export with the following command:"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:327
+#: en/user_basics.ssi:275
 msgid "# exportfs -rv"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:331
+#: en/user_basics.ssi:279
 msgid ""
 "Setting up these three services can be a little tricky. You might need some "
 "patience to get all of them working together. The Debian Installer Manual's "
@@ -832,70 +718,104 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:333
+#: en/user_basics.ssi:281
 msgid "3~ Netboot testing HowTo"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:335
+#: en/user_basics.ssi:283
 msgid ""
-"Netboot image creation is made easy with live-helper magic, but testing the "
+"Netboot image creation is made easy with live-build magic, but testing the "
 "images on physical machines can be really time consuming."
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:337
+#: en/user_basics.ssi:285
 msgid ""
 "To make our life easier, we can use virtualization. There are two solutions."
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:339
+#: en/user_basics.ssi:287
+msgid "3~ Qemu"
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:289
+msgid "_* Install qemu, bridge-utils, sudo."
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:291
+msgid "Edit /etc/qemu-ifup:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:302
+msgid ""
+"#!/bin/sh sudo -p \"Password for $0:\" /sbin/ifconfig $1 172.20.0.1 echo "
+"\"Executing /etc/qemu-ifup\" echo \"Bringing up $1 for bridged mode...\" "
+"sudo /sbin/ifconfig $1 0.0.0.0 promisc up echo \"Adding $1 to br0...\" sudo /"
+"usr/sbin/brctl addif br0 $1 sleep 2"
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:306
+msgid "Get, or build a grub-floppy-netboot (in the svn)."
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:308
+msgid "Launch qemu with \"-net nic,vlan=0 -net tap,vlan=0,ifname=tun0\""
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:310
 msgid "3~ VMWare Player"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:341
+#: en/user_basics.ssi:312
 msgid "_* Install VMWare Player (\"free as in beer\" edition)"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:343
+#: en/user_basics.ssi:314
 msgid ""
 "_* Create a PXETester directory, and create a text file called pxe.vwx inside"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:345
+#: en/user_basics.ssi:316
 msgid "_* Paste this text inside:"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:353
+#: en/user_basics.ssi:324
 msgid ""
 "#!/usr/bin/vmware config.version = \"8\" virtualHW.version = \"4\" memsize = "
 "\"512\" MemAllowAutoScaleDown = \"FALSE\""
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:359
+#: en/user_basics.ssi:330
 msgid ""
 "ide0:0.present = \"FALSE\" ide1:0.present = \"FALSE\" floppy0.present = "
 "\"FALSE\" sound.present = \"FALSE\" tools.remindInstall = \"FALSE\""
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:362
+#: en/user_basics.ssi:333
 msgid "ethernet0.present = \"TRUE\" ethernet0.addressType = \"generated\""
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:365
+#: en/user_basics.ssi:336
 msgid "displayName = \"Test Boot PXE\" guestOS = \"other\""
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:370
+#: en/user_basics.ssi:341
 msgid ""
 "ethernet0.generatedAddress = \"00:0c:29:8d:71:3b\" uuid.location = \"56 4d "
 "83 72 5c c4 de 3f-ae 9e 07 91 1d 8d 71 3b\" uuid.bios = \"56 4d 83 72 5c c4 "
@@ -903,53 +823,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:374
+#: en/user_basics.ssi:345
 msgid ""
 "_* You can play with this configuration file (i.e. change memory limit to "
 "256)"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:376
+#: en/user_basics.ssi:347
 msgid ""
 "_* Double click on this file (or run VMWare player and selecet this file)."
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:378
+#: en/user_basics.ssi:348
 msgid "_* When running just press space if that strange question comes up..."
 msgstr ""
-
-#. type: Plain text
-#: en/other_basics.ssi:380
-msgid "3~ Qemu"
-msgstr ""
-
-#. type: Plain text
-#: en/other_basics.ssi:382
-msgid "_* Install qemu, bridge-utils, sudo."
-msgstr ""
-
-#. type: Plain text
-#: en/other_basics.ssi:384
-msgid "Edit /etc/qemu-ifup:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_basics.ssi:395
-msgid ""
-"#!/bin/sh sudo -p \"Password for $0:\" /sbin/ifconfig $1 172.20.0.1 echo "
-"\"Executing /etc/qemu-ifup\" echo \"Bringing up $1 for bridged mode...\" "
-"sudo /sbin/ifconfig $1 0.0.0.0 promisc up echo \"Adding $1 to br0...\" sudo /"
-"usr/sbin/brctl addif br0 $1 sleep 2"
-msgstr ""
-
-#. type: Plain text
-#: en/other_basics.ssi:399
-msgid "Get, or build a grub-floppy-netboot (in the svn)."
-msgstr ""
-
-#. type: Plain text
-#: en/other_basics.ssi:400
-msgid "Launch qemu with \"-net nic,vlan=0 -net tap,vlan=0,ifname=tun0\""
-msgstr ""
diff --git a/manual/po/de/user_installation.ssi.po b/manual/po/de/user_installation.ssi.po
new file mode 100644
index 0000000..7cf8d67
--- /dev/null
+++ b/manual/po/de/user_installation.ssi.po
@@ -0,0 +1,413 @@
+# German translations for live-manual package
+# Copyright (C) 2010 Free Software Foundation, Inc.
+# This file is distributed under the same license as the live-manual package.
+# Automatically generated, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: live-manual VERSION\n"
+"POT-Creation-Date: 2010-09-07 14:53+0300\n"
+"PO-Revision-Date: 2010-09-07 14:53+0300\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: de\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. type: Plain text
+#: en/about_manual.ssi:81 en/about_manual.ssi:89 en/about_manual.ssi:97
+#: en/about_manual.ssi:109 en/about_manual.ssi:120 en/about_manual.ssi:133
+#: en/about_manual.ssi:141 en/about_manual.ssi:149 en/about_manual.ssi:157
+#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
+#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
+#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
+#: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
+#: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
+#: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
+#: en/other_customization-contents.ssi:30
+#: en/other_customization-contents.ssi:39
+#: en/other_customization-internationalization.ssi:10
+#: en/other_customization-internationalization.ssi:18
+#: en/other_customization-internationalization.ssi:26
+#: en/other_customization-internationalization.ssi:34
+#: en/other_customization-internationalization.ssi:46
+#: en/other_customization-packages.ssi:16
+#: en/other_customization-packages.ssi:24
+#: en/other_customization-packages.ssi:34
+#: en/other_customization-packages.ssi:42
+#: en/other_customization-packages.ssi:55
+#: en/other_customization-packages.ssi:91
+#: en/other_customization-packages.ssi:99
+#: en/other_customization-packages.ssi:146
+#: en/other_customization-packages.ssi:156
+#: en/other_customization-packages.ssi:166
+#: en/other_customization-packages.ssi:176 en/other_faq.ssi:41
+#: en/other_faq.ssi:83 en/other_faq.ssi:103 en/other_faq.ssi:117
+#: en/other_faq.ssi:137 en/other_faq.ssi:151 en/other_faq.ssi:198
+#: en/other_faq.ssi:245 en/other_faq.ssi:261 en/other_faq.ssi:287
+#: en/other_faq.ssi:299 en/other_faq.ssi:314 en/other_faq.ssi:333
+#: en/other_faq.ssi:345 en/other_faq.ssi:353 en/other_faq.ssi:364
+#: en/other_faq.ssi:374 en/other_howtos.ssi:16 en/other_howtos.ssi:43
+#: en/other_live-environment.ssi:14 en/other_live-environment.ssi:30
+#: en/other_live-environment.ssi:51 en/other_live-environment.ssi:61
+#: en/other_live-environment.ssi:69 en/other_live-environment.ssi:77
+#: en/other_live-environment.ssi:85 en/other_live-environment.ssi:93
+#: en/other_live-environment.ssi:116 en/other_live-environment.ssi:124
+#: en/other_live-environment.ssi:133 en/other_overview.ssi:54
+#: en/other_overview.ssi:94 en/other_overview.ssi:102
+#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
+#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
+#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
+#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111 en/user_basics.ssi:34
+#: en/user_basics.ssi:45 en/user_basics.ssi:58 en/user_basics.ssi:70
+#: en/user_basics.ssi:84 en/user_basics.ssi:99 en/user_basics.ssi:107
+#: en/user_basics.ssi:115 en/user_basics.ssi:125 en/user_basics.ssi:137
+#: en/user_basics.ssi:149 en/user_basics.ssi:157 en/user_basics.ssi:165
+#: en/user_basics.ssi:179 en/user_basics.ssi:187 en/user_basics.ssi:197
+#: en/user_basics.ssi:249 en/user_basics.ssi:265 en/user_basics.ssi:273
+#: en/user_basics.ssi:293 en/user_basics.ssi:318 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:76
+#: en/user_installation.ssi:84 en/user_installation.ssi:104
+#: en/user_installation.ssi:118 en/user_installation.ssi:134
+msgid "code{"
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:85 en/about_manual.ssi:93 en/about_manual.ssi:101
+#: en/about_manual.ssi:116 en/about_manual.ssi:129 en/about_manual.ssi:137
+#: en/about_manual.ssi:145 en/about_manual.ssi:153 en/about_manual.ssi:160
+#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
+#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
+#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
+#: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
+#: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
+#: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
+#: en/other_customization-contents.ssi:35
+#: en/other_customization-contents.ssi:50
+#: en/other_customization-internationalization.ssi:14
+#: en/other_customization-internationalization.ssi:22
+#: en/other_customization-internationalization.ssi:30
+#: en/other_customization-internationalization.ssi:38
+#: en/other_customization-internationalization.ssi:50
+#: en/other_customization-packages.ssi:20
+#: en/other_customization-packages.ssi:28
+#: en/other_customization-packages.ssi:38
+#: en/other_customization-packages.ssi:47
+#: en/other_customization-packages.ssi:59
+#: en/other_customization-packages.ssi:95
+#: en/other_customization-packages.ssi:103
+#: en/other_customization-packages.ssi:152
+#: en/other_customization-packages.ssi:162
+#: en/other_customization-packages.ssi:172
+#: en/other_customization-packages.ssi:182 en/other_faq.ssi:37
+#: en/other_faq.ssi:46 en/other_faq.ssi:92 en/other_faq.ssi:108
+#: en/other_faq.ssi:141 en/other_faq.ssi:155 en/other_faq.ssi:207
+#: en/other_faq.ssi:256 en/other_faq.ssi:292 en/other_faq.ssi:307
+#: en/other_faq.ssi:319 en/other_faq.ssi:337 en/other_faq.ssi:349
+#: en/other_faq.ssi:358 en/other_faq.ssi:370 en/other_faq.ssi:381
+#: en/other_howtos.ssi:20 en/other_howtos.ssi:47
+#: en/other_live-environment.ssi:18 en/other_live-environment.ssi:34
+#: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
+#: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
+#: en/other_live-environment.ssi:89 en/other_live-environment.ssi:97
+#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
+#: en/other_live-environment.ssi:138 en/other_overview.ssi:88
+#: en/other_overview.ssi:98 en/other_overview.ssi:106
+#: en/other_procedures.ssi:16 en/other_procedures.ssi:54
+#: en/other_procedures.ssi:131 en/other_use-cases.ssi:33
+#: en/other_use-cases.ssi:69 en/other_use-cases.ssi:97
+#: en/other_use-cases.ssi:107 en/other_use-cases.ssi:137 en/user_basics.ssi:38
+#: en/user_basics.ssi:49 en/user_basics.ssi:64 en/user_basics.ssi:74
+#: en/user_basics.ssi:90 en/user_basics.ssi:103 en/user_basics.ssi:111
+#: en/user_basics.ssi:119 en/user_basics.ssi:129 en/user_basics.ssi:143
+#: en/user_basics.ssi:153 en/user_basics.ssi:161 en/user_basics.ssi:169
+#: en/user_basics.ssi:183 en/user_basics.ssi:191 en/user_basics.ssi:201
+#: en/user_basics.ssi:241 en/user_basics.ssi:269 en/user_basics.ssi:277
+#: en/user_basics.ssi:304 en/user_basics.ssi:343 en/user_installation.ssi:42
+#: en/user_installation.ssi:50 en/user_installation.ssi:60
+#: en/user_installation.ssi:72 en/user_installation.ssi:80
+#: en/user_installation.ssi:108 en/user_installation.ssi:123
+#: en/user_installation.ssi:137
+msgid "}code"
+msgstr ""
+
+#. type: Plain text
+#: en/other_customization-internationalization.ssi:32
+#: en/user_installation.ssi:44
+msgid "or"
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:2
+msgid ":B~ Installation"
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:4
+msgid "1~ Installation"
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:6
+msgid "2~ Requirements"
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:8
+msgid "Building Debian Live images has very few system requirements:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:10
+msgid "_* Super user (root) access"
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:12
+msgid "_* An up-to-date version of live-build"
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:14
+msgid "_* A POSIX-compliant shell, such as /{bash}/ or /{dash}/."
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:16
+msgid "_* /{debootstrap}/ or /{cdebootstrap}/"
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:18
+msgid "_* Linux 2.6.x"
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:20
+msgid ""
+"Note that using Debian or a Debian-derived distribution is not required - "
+"live-build will run on almost any distribution with the above requirements."
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:22
+msgid "2~ Installing live-build"
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:24
+msgid "You can install live-build in a number of different ways:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:26
+msgid "_* From the Debian repository"
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:28
+msgid "_* From source"
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:30
+msgid "_* From snapshots"
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:32
+msgid ""
+"If you are using Debian, the recommended way is to install live-build via "
+"the Debian repository."
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:34
+msgid "3~ From the Debian repository"
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:36
+msgid "Simply install live-build like any other package:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:40
+msgid "# apt-get install live-build"
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:48
+msgid "# aptitude install live-build"
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:52
+msgid "3~ From source"
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:54
+msgid ""
+"live-build is developed using the Git version control system. On Debian "
+"systems, this is provided by the /{git}/ package. To check out the latest "
+"code, execute:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:58
+msgid "$ git clone git://live.debian.net/git/live-build.git"
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:62
+msgid "You can build and install your own Debian package by executing:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:68
+msgid "$ cd live-build $ dpkg-buildpackage -rfakeroot -b -uc -us $ cd .."
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:70
+msgid "# dpkg -i live-build*.deb"
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:74
+msgid "You can also install live-build directly to your system by executing:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:78
+msgid "# make install"
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:82
+msgid "and uninstall it with:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:87
+msgid "# make uninstall }code"
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:89
+msgid "3~ From 'snapshots'"
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:91
+msgid ""
+"If you do not wish to build or install live-build from source, you can use "
+"snapshots. These are built automatically from the latest version in Git and "
+"are available on http://live.debian.net/debian/."
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:93
+msgid "2~ live-boot"
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:95
+#, no-wrap
+msgid "*{Note:}* You do not need to install live-boot on your system to create customised Debian Live systems. However, doing so will do no harm.\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:97
+msgid "3~ Using a customised live-boot"
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:100
+msgid ""
+"To modify the code you can follow the process below. Please ensure you are "
+"familiar with the terms mentioned in terms.  % FIXME: <xref linkend=\"terms"
+"\"/>"
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:102
+msgid "_* Checkout the live-boot source"
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:106
+msgid "$ git clone git://live.debian.net/git/live-boot.git"
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:110
+msgid "_* Make changes to your local copy"
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:112
+msgid ""
+"And beware that if you want to add your pre-init script in live-bottom, you "
+"should name it without dashes '-', e.g: call it \"99new_feature\" and not "
+"\"99new-feature\"."
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:114
+msgid "_* Build a live-boot .deb"
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:116
+msgid ""
+"You must build either on your target distribution or in a chroot containing "
+"your target platform: this means if your target is squeeze then you should "
+"build against squeeze. You can use a personal builder such as /{pbuilder}/ "
+"or /{sbuild}/ to automate building packages in chroot. To build directly on "
+"the target platform, use #{dpkg-buildpackage}# (provided by the /{dpkg-dev}/ "
+"package):"
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:121
+msgid "$ cd live-boot $ dpkg-buildpackage -rfakeroot -b -uc -us"
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:125
+msgid "_* Use the generated live-boot .deb"
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:128
+msgid ""
+"As live-boot is installed by live-build system, installing the package in "
+"the host system is not sufficient: you should treat the generated .deb like "
+"another custom package. Please see custom-packages for more information. You "
+"should pay particular attention to custom-packages-apt.  % FIXME: <xref "
+"linkend=\"custom-packages\"/> <xref linkend=\"custom-packages-apt\"/>"
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:130
+msgid "3~ Using live-boot snapshots"
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:132
+msgid ""
+"You can let live-build automatically use the latest snapshot of live-boot by "
+"configuring a third-party repository in your live-build configuration "
+"directory. Assuming you have already created a configuration tree with #{lb "
+"config}#:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:136
+msgid "lb config --repository live.debian.net"
+msgstr ""
diff --git a/manual/po4a.cfg b/manual/po4a.cfg
index deba6b3..91f322d 100644
--- a/manual/po4a.cfg
+++ b/manual/po4a.cfg
@@ -3,7 +3,6 @@
 [type: text] en/live-manual.ssm $lang:$lang/live-manual.ssm
 [type: text] en/about_manual.ssi $lang:$lang/about_manual.ssi
 [type: text] en/about_project.ssi $lang:$lang/about_project.ssi
-[type: text] en/other_basics.ssi $lang:$lang/other_basics.ssi
 [type: text] en/other_coding-style.ssi $lang:$lang/other_coding-style.ssi
 [type: text] en/other_common-tasks.ssi $lang:$lang/other_common-tasks.ssi
 [type: text] en/other_configuration-files.ssi $lang:$lang/other_configuration-files.ssi
@@ -16,7 +15,6 @@
 [type: text] en/other_customization-packages.ssi $lang:$lang/other_customization-packages.ssi
 [type: text] en/other_faq.ssi $lang:$lang/other_faq.ssi
 [type: text] en/other_howtos.ssi $lang:$lang/other_howtos.ssi
-[type: text] en/other_installation.ssi $lang:$lang/other_installation.ssi
 [type: text] en/other_live-environment.ssi $lang:$lang/other_live-environment.ssi
 [type: text] en/other_overview.ssi $lang:$lang/other_overview.ssi
 [type: text] en/other_procedures.ssi $lang:$lang/other_procedures.ssi
@@ -25,4 +23,6 @@
 [type: text] en/other_success-stories.ssi $lang:$lang/other_success-stories.ssi
 [type: text] en/other_troubleshooting.ssi $lang:$lang/other_troubleshooting.ssi
 [type: text] en/other_use-cases.ssi $lang:$lang/other_use-cases.ssi
+[type: text] en/user_basics.ssi $lang:$lang/user_basics.ssi
+[type: text] en/user_installation.ssi $lang:$lang/user_installation.ssi
 [type: xhtml] en/index.html.in $lang:$lang/index.html.in
diff --git a/manual/pot/about_manual.ssi.pot b/manual/pot/about_manual.ssi.pot
index cfaa2c5..80cd759 100644
--- a/manual/pot/about_manual.ssi.pot
+++ b/manual/pot/about_manual.ssi.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-09-07 10:55+0300\n"
+"POT-Creation-Date: 2010-09-07 14:53+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -64,8 +64,8 @@ msgstr ""
 #. type: Plain text
 #: en/about_manual.ssi:14
 msgid ""
-"_* *{Debian Live}*: The Debian sub-project which maintains the live-helper, "
-"live-boot and live-config packages."
+"_* *{Debian Live}*: The Debian sub-project which maintains the live-boot, "
+"live-build, live-config, and live-manual packages."
 msgstr ""
 
 #. type: Plain text
@@ -79,16 +79,12 @@ msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:18
-msgid ""
-"_* *{Build system/host system}*: The environment used to create the live "
-"system."
+msgid "_* *{Host system}*: The environment used to create the live system."
 msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:20
-msgid ""
-"_* *{live-helper}*: A collection of scripts used to build customised Debian "
-"Live systems. live-helper was formerly know as live-package."
+msgid "_* *{Target system}*: The environment used to run the live system."
 msgstr ""
 
 #. type: Plain text
@@ -101,24 +97,41 @@ msgstr ""
 #. type: Plain text
 #: en/about_manual.ssi:24
 msgid ""
+"_* *{live-build}*: A collection of scripts used to build customised Debian "
+"Live systems. live-build was formerly know as live-helper, and even earlier "
+"know as live-package."
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:26
+msgid ""
 "_* *{live-config}*: A collection of scripts used to configure a live systems "
 "during the boot process. live-config was formerly a part of live-initramfs."
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:26
+#: en/about_manual.ssi:28
+msgid ""
+"_* *{live-manual}*: This document is maintained in a package called live-"
+"manual."
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:30
 msgid ""
 "_* *{Debian Installer/(d-i)}*: The official installation system for the "
 "Debian distribution."
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:28
-msgid "_* *{Cheat codes}*: FIXME"
+#: en/about_manual.ssi:32
+msgid ""
+"_* *{Boot parameters}*: Parameters that can be entered at the bootloader "
+"prompt to influence the kernel or live-config."
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:30
+#: en/about_manual.ssi:34
 msgid ""
 "_* *{chroot}*: The chroot program, chroot(8), enables us to run different "
 "instances of the GNU/Linux environment on a single system simultaneously "
@@ -126,23 +139,23 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:32
+#: en/about_manual.ssi:36
 msgid ""
-"_* *{binary image}*: On a live system, binary image refers to the binary "
+"_* *{Binary image}*: On a live system, binary image refers to the binary "
 "filesystem and the respective extension, such as binary.iso or binary.img."
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:34
+#: en/about_manual.ssi:38
 msgid ""
 "_* *{Target distribution}*: The distribution upon which your live system "
 "will be based. This can differ from the distribution of your Build System."
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:36
+#: en/about_manual.ssi:40
 msgid ""
-"_* *{lenny/squeeze/sid stable/testing/unstable}*: The stable distribution "
+"_* *{squeeze/wheezy/sid stable/testing/unstable}*: The stable distribution "
 "contains the latest officially released distribution of Debian. The testing "
 "distribution is the staging area for the next stable release. A major "
 "advantage of using this distribution is that it has more recent versions of "
@@ -152,90 +165,90 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:38
+#: en/about_manual.ssi:42
 msgid ""
-"At the time of writing, lenny is the current stable release and squeeze is "
+"At the time of writing, squeeze is the current stable release and wheezy is "
 "the current testing release. sid will always be a synonym for the unstable "
 "release."
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:40
+#: en/about_manual.ssi:44
 msgid "2~ Authors"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:42
+#: en/about_manual.ssi:46
 msgid "A list of authors (in alphabetical order):"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:44
+#: en/about_manual.ssi:48
 msgid "_* Ben Armstrong"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:46
+#: en/about_manual.ssi:50
 msgid "_* Brendan Sleight"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:48
+#: en/about_manual.ssi:52
 msgid "_* Chris Lamb"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:50
+#: en/about_manual.ssi:54
 msgid "_* Daniel Baumann"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:52
+#: en/about_manual.ssi:56
 msgid "_* Franklin Piat"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:54
+#: en/about_manual.ssi:58
 msgid "_* Jonas Stein"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:56
+#: en/about_manual.ssi:60
 msgid "_* Kai Hendry"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:58
+#: en/about_manual.ssi:62
 msgid "_* Marco Amadori"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:60
+#: en/about_manual.ssi:64
 msgid "_* Mathieu Geli"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:62
+#: en/about_manual.ssi:66
 msgid "_* Matthias Kirschner"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:64
+#: en/about_manual.ssi:68
 msgid "_* Richard Nelson"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:66
+#: en/about_manual.ssi:70
 msgid "_* Trent W. Buck"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:68
+#: en/about_manual.ssi:72
 msgid "2~ Contributing to this document"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:71
+#: en/about_manual.ssi:75
 msgid ""
 "This manual is intended as a community project and all proposals for "
 "improvements and contributions are extremely welcome. The preferred way to "
@@ -244,7 +257,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:73
+#: en/about_manual.ssi:77
 msgid ""
 "When submitting a contribution please clearly identify its copyright holder "
 "and include the licensing statement. Note that to be accepted the "
@@ -253,23 +266,16 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:75
+#: en/about_manual.ssi:79
 msgid ""
 "The sources for this manual are maintained using the Git version control "
 "system. You can checkout the latest copy by executing:"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:77 en/about_manual.ssi:85 en/about_manual.ssi:93
-#: en/about_manual.ssi:105 en/about_manual.ssi:116 en/about_manual.ssi:129
-#: en/about_manual.ssi:137 en/about_manual.ssi:145 en/about_manual.ssi:153
-#: en/other_basics.ssi:34 en/other_basics.ssi:45 en/other_basics.ssi:58
-#: en/other_basics.ssi:68 en/other_basics.ssi:106 en/other_basics.ssi:120
-#: en/other_basics.ssi:128 en/other_basics.ssi:136 en/other_basics.ssi:146
-#: en/other_basics.ssi:158 en/other_basics.ssi:176 en/other_basics.ssi:184
-#: en/other_basics.ssi:192 en/other_basics.ssi:208 en/other_basics.ssi:216
-#: en/other_basics.ssi:226 en/other_basics.ssi:301 en/other_basics.ssi:317
-#: en/other_basics.ssi:325 en/other_basics.ssi:347 en/other_basics.ssi:386
+#: en/about_manual.ssi:81 en/about_manual.ssi:89 en/about_manual.ssi:97
+#: en/about_manual.ssi:109 en/about_manual.ssi:120 en/about_manual.ssi:133
+#: en/about_manual.ssi:141 en/about_manual.ssi:149 en/about_manual.ssi:157
 #: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
 #: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
 #: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
@@ -300,47 +306,45 @@ msgstr ""
 #: en/other_faq.ssi:299 en/other_faq.ssi:314 en/other_faq.ssi:333
 #: en/other_faq.ssi:345 en/other_faq.ssi:353 en/other_faq.ssi:364
 #: en/other_faq.ssi:374 en/other_howtos.ssi:16 en/other_howtos.ssi:43
-#: en/other_installation.ssi:40 en/other_installation.ssi:48
-#: en/other_installation.ssi:58 en/other_installation.ssi:66
-#: en/other_installation.ssi:78 en/other_installation.ssi:88
-#: en/other_installation.ssi:109 en/other_installation.ssi:123
-#: en/other_installation.ssi:141 en/other_installation.ssi:149
-#: en/other_installation.ssi:157 en/other_live-environment.ssi:14
-#: en/other_live-environment.ssi:30 en/other_live-environment.ssi:51
-#: en/other_live-environment.ssi:61 en/other_live-environment.ssi:69
-#: en/other_live-environment.ssi:77 en/other_live-environment.ssi:85
-#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
-#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
-#: en/other_overview.ssi:54 en/other_overview.ssi:94 en/other_overview.ssi:102
+#: en/other_live-environment.ssi:14 en/other_live-environment.ssi:30
+#: en/other_live-environment.ssi:51 en/other_live-environment.ssi:61
+#: en/other_live-environment.ssi:69 en/other_live-environment.ssi:77
+#: en/other_live-environment.ssi:85 en/other_live-environment.ssi:93
+#: en/other_live-environment.ssi:116 en/other_live-environment.ssi:124
+#: en/other_live-environment.ssi:133 en/other_overview.ssi:54
+#: en/other_overview.ssi:94 en/other_overview.ssi:102
 #: en/other_procedures.ssi:12 en/other_procedures.ssi:46
 #: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
 #: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
-#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111
+#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111 en/user_basics.ssi:34
+#: en/user_basics.ssi:45 en/user_basics.ssi:58 en/user_basics.ssi:70
+#: en/user_basics.ssi:84 en/user_basics.ssi:99 en/user_basics.ssi:107
+#: en/user_basics.ssi:115 en/user_basics.ssi:125 en/user_basics.ssi:137
+#: en/user_basics.ssi:149 en/user_basics.ssi:157 en/user_basics.ssi:165
+#: en/user_basics.ssi:179 en/user_basics.ssi:187 en/user_basics.ssi:197
+#: en/user_basics.ssi:249 en/user_basics.ssi:265 en/user_basics.ssi:273
+#: en/user_basics.ssi:293 en/user_basics.ssi:318 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:76
+#: en/user_installation.ssi:84 en/user_installation.ssi:104
+#: en/user_installation.ssi:118 en/user_installation.ssi:134
 msgid "code{"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:79
+#: en/about_manual.ssi:83
 msgid "$ git clone git://live.debian.net/git/live-manual.git"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:81 en/about_manual.ssi:89 en/about_manual.ssi:97
-#: en/about_manual.ssi:112 en/about_manual.ssi:125 en/about_manual.ssi:133
-#: en/about_manual.ssi:141 en/about_manual.ssi:149 en/about_manual.ssi:156
-#: en/other_basics.ssi:38 en/other_basics.ssi:49 en/other_basics.ssi:62
-#: en/other_basics.ssi:72 en/other_basics.ssi:111 en/other_basics.ssi:124
-#: en/other_basics.ssi:132 en/other_basics.ssi:140 en/other_basics.ssi:150
-#: en/other_basics.ssi:162 en/other_basics.ssi:180 en/other_basics.ssi:188
-#: en/other_basics.ssi:196 en/other_basics.ssi:212 en/other_basics.ssi:220
-#: en/other_basics.ssi:230 en/other_basics.ssi:293 en/other_basics.ssi:305
-#: en/other_basics.ssi:321 en/other_basics.ssi:329 en/other_basics.ssi:372
-#: en/other_basics.ssi:397 en/other_coding-style.ssi:34
-#: en/other_coding-style.ssi:45 en/other_coding-style.ssi:57
-#: en/other_coding-style.ssi:68 en/other_coding-style.ssi:92
-#: en/other_coding-style.ssi:100 en/other_coding-style.ssi:113
-#: en/other_coding-style.ssi:124 en/other_common-tasks.ssi:36
-#: en/other_customization-backports.ssi:16
+#: en/about_manual.ssi:85 en/about_manual.ssi:93 en/about_manual.ssi:101
+#: en/about_manual.ssi:116 en/about_manual.ssi:129 en/about_manual.ssi:137
+#: en/about_manual.ssi:145 en/about_manual.ssi:153 en/about_manual.ssi:160
+#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
+#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
+#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
+#: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
+#: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
 #: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
 #: en/other_customization-contents.ssi:35
 #: en/other_customization-contents.ssi:50
@@ -365,12 +369,7 @@ msgstr ""
 #: en/other_faq.ssi:256 en/other_faq.ssi:292 en/other_faq.ssi:307
 #: en/other_faq.ssi:319 en/other_faq.ssi:337 en/other_faq.ssi:349
 #: en/other_faq.ssi:358 en/other_faq.ssi:370 en/other_faq.ssi:381
-#: en/other_howtos.ssi:20 en/other_howtos.ssi:47 en/other_installation.ssi:44
-#: en/other_installation.ssi:52 en/other_installation.ssi:62
-#: en/other_installation.ssi:74 en/other_installation.ssi:82
-#: en/other_installation.ssi:92 en/other_installation.ssi:113
-#: en/other_installation.ssi:128 en/other_installation.ssi:145
-#: en/other_installation.ssi:153 en/other_installation.ssi:161
+#: en/other_howtos.ssi:20 en/other_howtos.ssi:47
 #: en/other_live-environment.ssi:18 en/other_live-environment.ssi:34
 #: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
 #: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
@@ -381,12 +380,23 @@ msgstr ""
 #: en/other_procedures.ssi:16 en/other_procedures.ssi:54
 #: en/other_procedures.ssi:131 en/other_use-cases.ssi:33
 #: en/other_use-cases.ssi:69 en/other_use-cases.ssi:97
-#: en/other_use-cases.ssi:107 en/other_use-cases.ssi:137
+#: en/other_use-cases.ssi:107 en/other_use-cases.ssi:137 en/user_basics.ssi:38
+#: en/user_basics.ssi:49 en/user_basics.ssi:64 en/user_basics.ssi:74
+#: en/user_basics.ssi:90 en/user_basics.ssi:103 en/user_basics.ssi:111
+#: en/user_basics.ssi:119 en/user_basics.ssi:129 en/user_basics.ssi:143
+#: en/user_basics.ssi:153 en/user_basics.ssi:161 en/user_basics.ssi:169
+#: en/user_basics.ssi:183 en/user_basics.ssi:191 en/user_basics.ssi:201
+#: en/user_basics.ssi:241 en/user_basics.ssi:269 en/user_basics.ssi:277
+#: en/user_basics.ssi:304 en/user_basics.ssi:343 en/user_installation.ssi:42
+#: en/user_installation.ssi:50 en/user_installation.ssi:60
+#: en/user_installation.ssi:72 en/user_installation.ssi:80
+#: en/user_installation.ssi:108 en/user_installation.ssi:123
+#: en/user_installation.ssi:137
 msgid "}code"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:83
+#: en/about_manual.ssi:87
 msgid ""
 "Prior to submission of your contribution, please preview your work. To "
 "preview the live-manual, ensure the packages needed for building are "
@@ -394,31 +404,29 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:87
-msgid ""
-"# apt-get install dblatex docbook2odf docbook-xml docbook-xsl libxml2-utils "
-"make po4a w3m"
+#: en/about_manual.ssi:91
+msgid "# apt-get install sisu-complete"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:91
+#: en/about_manual.ssi:95
 msgid ""
 "You may build the live-manual from the top level directory of your git "
 "checkout by executing:"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:95
+#: en/about_manual.ssi:99
 msgid "$ make build"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:99
+#: en/about_manual.ssi:103
 msgid "3~ Applying patches"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:101
+#: en/about_manual.ssi:105
 msgid ""
 "Directly commiting to the repository is possible by anyone. However, we ask "
 "you to send bigger changes to the mailinglist to discuss them first. In "
@@ -426,12 +434,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:103
+#: en/about_manual.ssi:107
 msgid "_* Fetch the public commit key:"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:110
+#: en/about_manual.ssi:114
 msgid ""
 "$ mkdir -p ~/.ssh/identity.d $ wget http://live.debian.net/other/openssh/"
 "repository-public-commit-key-current/live-manual at debian-live -O ~/.ssh/"
@@ -442,12 +450,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:114
+#: en/about_manual.ssi:118
 msgid "_* Add the following section to your openssh-client config:"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:123
+#: en/about_manual.ssi:127
 #, no-wrap
 msgid ""
 "$ cat >> ~/.ssh/config << EOF\n"
@@ -459,17 +467,17 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:127
+#: en/about_manual.ssi:131
 msgid "_* Checkout a clone of the manual through ssh:"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:131
+#: en/about_manual.ssi:135
 msgid "$ git clone gitosis at live.debian.net:/live-manual.git"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:135
+#: en/about_manual.ssi:139
 msgid ""
 "_* After editing the files in manual/en/, please call the 'commit' target in "
 "the toplevel directory to sanitize the files and update the translation "
@@ -477,12 +485,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:139
+#: en/about_manual.ssi:143
 msgid "$ make commit"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:143
+#: en/about_manual.ssi:147
 msgid ""
 "_* After sanitizing commit the changes. Write commit messages, that consist "
 "of full useful sentences, starting with a capital letter and ending with a "
@@ -491,16 +499,16 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:147
+#: en/about_manual.ssi:151
 msgid "$ git commit -a"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:151
+#: en/about_manual.ssi:155
 msgid "_* Push the commit to the server:"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:155
+#: en/about_manual.ssi:159
 msgid "$ git push"
 msgstr ""
diff --git a/manual/pot/about_project.ssi.pot b/manual/pot/about_project.ssi.pot
index 65cf725..80ce2fe 100644
--- a/manual/pot/about_project.ssi.pot
+++ b/manual/pot/about_project.ssi.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-09-07 10:55+0300\n"
+"POT-Creation-Date: 2010-09-07 14:53+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -163,7 +163,7 @@ msgstr ""
 #. type: Plain text
 #: en/about_project.ssi:52
 msgid ""
-"As an exception, our own packages such as live-helper, live-boot or live-"
+"As an exception, our own packages such as live-boot, live-build or live-"
 "config may temporarily be used from our own repository for development "
 "reasons (e.g. to create development snapshots). They will be uploaded to "
 "Debian on a regular basis."
diff --git a/manual/pot/live-manual.ssm.pot b/manual/pot/live-manual.ssm.pot
index 0d65fc0..455801a 100644
--- a/manual/pot/live-manual.ssm.pot
+++ b/manual/pot/live-manual.ssm.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-09-07 10:55+0300\n"
+"POT-Creation-Date: 2010-09-07 14:53+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -58,8 +58,8 @@ msgstr ""
 #, no-wrap
 msgid ""
 "@make:\n"
-" :bold: /etch|oldstable|lenny|stable|squeeze|testing|sid|unstable/\n"
-" :italics: /live-helper|live-package|live-boot|live-config|live-initramfs|casper|live-magic|live-manual|live-installer/\n"
+" :bold: /lenny|stable|squeeze|testing|sid|unstable/\n"
+" :italics: /live-boot|live-build|live-config|live-magic|live-manual|live-installer|debian-installer-launcher/\n"
 " :num_top: 1\n"
 " :skin: skin_debian-live\n"
 msgstr ""
@@ -90,126 +90,121 @@ msgid ":B~ User ~#"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:33
-msgid ":B~ Development ~#"
-msgstr ""
-
-#. type: Plain text
-#: en/live-manual.ssm:35
-msgid ":B~ Project ~#"
+#: en/live-manual.ssm:34
+msgid "<< user_installation.ssi << user_basics.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:37
-msgid ":B~ Other ~#"
+#: en/live-manual.ssm:36
+msgid ":B~ Development ~#"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:39
-msgid "<< other_installation.ssi"
+#: en/live-manual.ssm:38
+msgid ":B~ Project ~#"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:41
-msgid "<< other_basics.ssi"
+#: en/live-manual.ssm:40
+msgid ":B~ Other ~#"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:43
+#: en/live-manual.ssm:42
 msgid "<< other_overview.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:45
+#: en/live-manual.ssm:44
 msgid "<< other_customization-packages.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:47
+#: en/live-manual.ssm:46
 msgid "<< other_customization-contents.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:49
+#: en/live-manual.ssm:48
 msgid "<< other_customization-internationalization.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:51
+#: en/live-manual.ssm:50
 msgid "<< other_customization-bootup.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:53
+#: en/live-manual.ssm:52
 msgid "<< other_customization-binary.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:55
+#: en/live-manual.ssm:54
 msgid "<< other_customization-backports.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:57
+#: en/live-manual.ssm:56
 msgid "<< other_common-tasks.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:59
+#: en/live-manual.ssm:58
 msgid "<< other_live-environment.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:61
+#: en/live-manual.ssm:60
 msgid "<< other_faq.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:63
+#: en/live-manual.ssm:62
 msgid "<< other_reporting-bugs.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:65
+#: en/live-manual.ssm:64
 msgid "<< other_howtos.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:67
+#: en/live-manual.ssm:66
 msgid "<< other_coding-style.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:69
+#: en/live-manual.ssm:68
 msgid "<< other_procedures.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:71
+#: en/live-manual.ssm:70
 msgid "<< other_resources.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:73
+#: en/live-manual.ssm:72
 msgid "<< other_use-cases.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:75
+#: en/live-manual.ssm:74
 msgid "<< other_success-stories.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:77
+#: en/live-manual.ssm:76
 msgid "<< other_troubleshooting.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:79
+#: en/live-manual.ssm:78
 msgid "<< other_configuration-layout.ssi"
 msgstr ""
 
 #. type: Plain text
-#: en/live-manual.ssm:80
+#: en/live-manual.ssm:79
 msgid "<< other_configuration-files.ssi"
 msgstr ""
diff --git a/manual/pot/other_basics.ssi.pot b/manual/pot/user_basics.ssi.pot
similarity index 54%
copy from manual/pot/other_basics.ssi.pot
copy to manual/pot/user_basics.ssi.pot
index 8e5bb3f..9ab2688 100644
--- a/manual/pot/other_basics.ssi.pot
+++ b/manual/pot/user_basics.ssi.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-09-07 10:55+0300\n"
+"POT-Creation-Date: 2010-09-07 14:53+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -17,16 +17,9 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #. type: Plain text
-#: en/about_manual.ssi:77 en/about_manual.ssi:85 en/about_manual.ssi:93
-#: en/about_manual.ssi:105 en/about_manual.ssi:116 en/about_manual.ssi:129
-#: en/about_manual.ssi:137 en/about_manual.ssi:145 en/about_manual.ssi:153
-#: en/other_basics.ssi:34 en/other_basics.ssi:45 en/other_basics.ssi:58
-#: en/other_basics.ssi:68 en/other_basics.ssi:106 en/other_basics.ssi:120
-#: en/other_basics.ssi:128 en/other_basics.ssi:136 en/other_basics.ssi:146
-#: en/other_basics.ssi:158 en/other_basics.ssi:176 en/other_basics.ssi:184
-#: en/other_basics.ssi:192 en/other_basics.ssi:208 en/other_basics.ssi:216
-#: en/other_basics.ssi:226 en/other_basics.ssi:301 en/other_basics.ssi:317
-#: en/other_basics.ssi:325 en/other_basics.ssi:347 en/other_basics.ssi:386
+#: en/about_manual.ssi:81 en/about_manual.ssi:89 en/about_manual.ssi:97
+#: en/about_manual.ssi:109 en/about_manual.ssi:120 en/about_manual.ssi:133
+#: en/about_manual.ssi:141 en/about_manual.ssi:149 en/about_manual.ssi:157
 #: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
 #: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
 #: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
@@ -57,42 +50,40 @@ msgstr ""
 #: en/other_faq.ssi:299 en/other_faq.ssi:314 en/other_faq.ssi:333
 #: en/other_faq.ssi:345 en/other_faq.ssi:353 en/other_faq.ssi:364
 #: en/other_faq.ssi:374 en/other_howtos.ssi:16 en/other_howtos.ssi:43
-#: en/other_installation.ssi:40 en/other_installation.ssi:48
-#: en/other_installation.ssi:58 en/other_installation.ssi:66
-#: en/other_installation.ssi:78 en/other_installation.ssi:88
-#: en/other_installation.ssi:109 en/other_installation.ssi:123
-#: en/other_installation.ssi:141 en/other_installation.ssi:149
-#: en/other_installation.ssi:157 en/other_live-environment.ssi:14
-#: en/other_live-environment.ssi:30 en/other_live-environment.ssi:51
-#: en/other_live-environment.ssi:61 en/other_live-environment.ssi:69
-#: en/other_live-environment.ssi:77 en/other_live-environment.ssi:85
-#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
-#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
-#: en/other_overview.ssi:54 en/other_overview.ssi:94 en/other_overview.ssi:102
+#: en/other_live-environment.ssi:14 en/other_live-environment.ssi:30
+#: en/other_live-environment.ssi:51 en/other_live-environment.ssi:61
+#: en/other_live-environment.ssi:69 en/other_live-environment.ssi:77
+#: en/other_live-environment.ssi:85 en/other_live-environment.ssi:93
+#: en/other_live-environment.ssi:116 en/other_live-environment.ssi:124
+#: en/other_live-environment.ssi:133 en/other_overview.ssi:54
+#: en/other_overview.ssi:94 en/other_overview.ssi:102
 #: en/other_procedures.ssi:12 en/other_procedures.ssi:46
 #: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
 #: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
-#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111
+#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111 en/user_basics.ssi:34
+#: en/user_basics.ssi:45 en/user_basics.ssi:58 en/user_basics.ssi:70
+#: en/user_basics.ssi:84 en/user_basics.ssi:99 en/user_basics.ssi:107
+#: en/user_basics.ssi:115 en/user_basics.ssi:125 en/user_basics.ssi:137
+#: en/user_basics.ssi:149 en/user_basics.ssi:157 en/user_basics.ssi:165
+#: en/user_basics.ssi:179 en/user_basics.ssi:187 en/user_basics.ssi:197
+#: en/user_basics.ssi:249 en/user_basics.ssi:265 en/user_basics.ssi:273
+#: en/user_basics.ssi:293 en/user_basics.ssi:318 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:76
+#: en/user_installation.ssi:84 en/user_installation.ssi:104
+#: en/user_installation.ssi:118 en/user_installation.ssi:134
 msgid "code{"
 msgstr ""
 
 #. type: Plain text
-#: en/about_manual.ssi:81 en/about_manual.ssi:89 en/about_manual.ssi:97
-#: en/about_manual.ssi:112 en/about_manual.ssi:125 en/about_manual.ssi:133
-#: en/about_manual.ssi:141 en/about_manual.ssi:149 en/about_manual.ssi:156
-#: en/other_basics.ssi:38 en/other_basics.ssi:49 en/other_basics.ssi:62
-#: en/other_basics.ssi:72 en/other_basics.ssi:111 en/other_basics.ssi:124
-#: en/other_basics.ssi:132 en/other_basics.ssi:140 en/other_basics.ssi:150
-#: en/other_basics.ssi:162 en/other_basics.ssi:180 en/other_basics.ssi:188
-#: en/other_basics.ssi:196 en/other_basics.ssi:212 en/other_basics.ssi:220
-#: en/other_basics.ssi:230 en/other_basics.ssi:293 en/other_basics.ssi:305
-#: en/other_basics.ssi:321 en/other_basics.ssi:329 en/other_basics.ssi:372
-#: en/other_basics.ssi:397 en/other_coding-style.ssi:34
-#: en/other_coding-style.ssi:45 en/other_coding-style.ssi:57
-#: en/other_coding-style.ssi:68 en/other_coding-style.ssi:92
-#: en/other_coding-style.ssi:100 en/other_coding-style.ssi:113
-#: en/other_coding-style.ssi:124 en/other_common-tasks.ssi:36
-#: en/other_customization-backports.ssi:16
+#: en/about_manual.ssi:85 en/about_manual.ssi:93 en/about_manual.ssi:101
+#: en/about_manual.ssi:116 en/about_manual.ssi:129 en/about_manual.ssi:137
+#: en/about_manual.ssi:145 en/about_manual.ssi:153 en/about_manual.ssi:160
+#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
+#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
+#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
+#: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
+#: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
 #: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
 #: en/other_customization-contents.ssi:35
 #: en/other_customization-contents.ssi:50
@@ -117,12 +108,7 @@ msgstr ""
 #: en/other_faq.ssi:256 en/other_faq.ssi:292 en/other_faq.ssi:307
 #: en/other_faq.ssi:319 en/other_faq.ssi:337 en/other_faq.ssi:349
 #: en/other_faq.ssi:358 en/other_faq.ssi:370 en/other_faq.ssi:381
-#: en/other_howtos.ssi:20 en/other_howtos.ssi:47 en/other_installation.ssi:44
-#: en/other_installation.ssi:52 en/other_installation.ssi:62
-#: en/other_installation.ssi:74 en/other_installation.ssi:82
-#: en/other_installation.ssi:92 en/other_installation.ssi:113
-#: en/other_installation.ssi:128 en/other_installation.ssi:145
-#: en/other_installation.ssi:153 en/other_installation.ssi:161
+#: en/other_howtos.ssi:20 en/other_howtos.ssi:47
 #: en/other_live-environment.ssi:18 en/other_live-environment.ssi:34
 #: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
 #: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
@@ -133,61 +119,72 @@ msgstr ""
 #: en/other_procedures.ssi:16 en/other_procedures.ssi:54
 #: en/other_procedures.ssi:131 en/other_use-cases.ssi:33
 #: en/other_use-cases.ssi:69 en/other_use-cases.ssi:97
-#: en/other_use-cases.ssi:107 en/other_use-cases.ssi:137
+#: en/other_use-cases.ssi:107 en/other_use-cases.ssi:137 en/user_basics.ssi:38
+#: en/user_basics.ssi:49 en/user_basics.ssi:64 en/user_basics.ssi:74
+#: en/user_basics.ssi:90 en/user_basics.ssi:103 en/user_basics.ssi:111
+#: en/user_basics.ssi:119 en/user_basics.ssi:129 en/user_basics.ssi:143
+#: en/user_basics.ssi:153 en/user_basics.ssi:161 en/user_basics.ssi:169
+#: en/user_basics.ssi:183 en/user_basics.ssi:191 en/user_basics.ssi:201
+#: en/user_basics.ssi:241 en/user_basics.ssi:269 en/user_basics.ssi:277
+#: en/user_basics.ssi:304 en/user_basics.ssi:343 en/user_installation.ssi:42
+#: en/user_installation.ssi:50 en/user_installation.ssi:60
+#: en/user_installation.ssi:72 en/user_installation.ssi:80
+#: en/user_installation.ssi:108 en/user_installation.ssi:123
+#: en/user_installation.ssi:137
 msgid "}code"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:2
+#: en/user_basics.ssi:2
 msgid ":B~ The basics"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:4
+#: en/user_basics.ssi:4
 msgid "1~ The basics"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:6
+#: en/user_basics.ssi:6
 msgid ""
 "This chapter contains a brief overview of the build process as well as "
 "containing instructions on how to boot the various binary image types."
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:8
+#: en/user_basics.ssi:8
 msgid "2~ What is a live system?"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:11
+#: en/user_basics.ssi:11
 msgid ""
-"A live system usually means an OS booted on a computer from a removable "
-"medium (such as CD-ROM, USB stick, or network), ready to use without any "
-"installation on the usual drive(s), with an auto-configuration done at "
-"runtime (see terms).  % FIXME: <xref linkend=\"terms\"/>"
+"A live system usually means an operating system booted on a computer from a "
+"removable medium (such as CD-ROM, USB stick, or network), ready to use "
+"without any installation on the usual drive(s), with an auto-configuration "
+"done at runtime (see terms).  % FIXME: <xref linkend=\"terms\"/>"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:13
+#: en/user_basics.ssi:13
 msgid ""
-"With Debian Live, it's a Debian GNU/Linux OS, built for one of the supported "
-"architectures (currently amd64, i386, powerpc and sparc). It is made from "
-"following parts:"
+"With Debian Live, it's a Debian GNU/Linux operating system, built for one of "
+"the supported architectures (currently amd64, i386, powerpc and sparc). It "
+"is made from following parts:"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:15
+#: en/user_basics.ssi:15
 msgid "_* Linux kernel"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:17
+#: en/user_basics.ssi:17
 msgid "_* The Linux image, usually named #{vmlinuz*}#"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:19
+#: en/user_basics.ssi:19
 msgid ""
 "_* *{Initial RAM disk image (initrd)}*: RAM disk setup for the Linux boot, "
 "containing modules possibly needed to mount the filesystem's image and some "
@@ -195,19 +192,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:22
+#: en/user_basics.ssi:22
 msgid ""
-"_* *{System image}*: The OS filesystem image. Debian Live uses SquashFS, a "
-"compressed filesystem, to minimize its image size. Note that it's read-only. "
-"So, during boot the Debian Live system will use a RAM disk and 'union' "
-"mechanism to enable writing files within the running system. However, all "
-"modifications will be lost upon shutdown unless optional persistence "
-"partition(s) are used. (See persistence.)  % FIXME: <xref linkend="
-"\"persistence\"/>"
+"_* *{System image}*: The operating systems filesystem image. Debian Live "
+"uses SquashFS, a compressed filesystem, to minimize its image size. Note "
+"that it's read-only. So, during boot the Debian Live system will use a RAM "
+"disk and 'union' mechanism to enable writing files within the running "
+"system. However, all modifications will be lost upon shutdown unless "
+"optional persistence partition(s) are used (see persistence).  % FIXME: "
+"<xref linkend=\"persistence\"/>"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:24
+#: en/user_basics.ssi:24
 msgid ""
 "_* *{Bootloader}*: A small piece of code, crafted to boot up from the chosen "
 "media, possibly presenting a prompt or menu to allow selection of options/"
@@ -215,245 +212,190 @@ msgid ""
 "associated filesystem image. Different solutions can be used depending on "
 "the target media and format of the filesystem containing the previous "
 "components: Isolinux to boot from a CD or DVD in ISO9660 format, syslinux "
-"for HDD or USB drive booting from a VFAT partition, GRUB for ext2/3 "
-"partition, pxelinux for PXE netboot, etc."
+"for HDD or USB drive booting from a VFAT partition, extlinux for ext2/3/4 "
+"and btrfs partitions, pxelinux for PXE netboot, GRUB for ext2/3/4 partition, "
+"etc."
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:26
+#: en/user_basics.ssi:26
 msgid ""
-"_* The Debian Live tools will build the system image from your "
-"specifications, setup a Linux kernel and its initrd, a bootloader to run "
-"them, all in one media-dependant format(ISO9660 image, disk image, etc.)"
+"_* live-build will build the system image from your specifications, setup a "
+"Linux kernel and its initrd, a bootloader to run them, all in one media-"
+"dependant format (ISO9660 image, disk image, etc.)"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:28
+#: en/user_basics.ssi:28
 msgid "2~ First steps: building an ISO image"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:30
+#: en/user_basics.ssi:30
 msgid ""
-"The following sequence of helper commands, provided by live-helper, will "
-"create a basic ISO image containing just the Debian standard system without "
-"X.org. It is suitable for burning to CD or DVD media."
+"The following sequence of commands, provided by live-build, will create a "
+"basic ISO image containing just the Debian standard system without X.org. It "
+"is suitable for burning to CD or DVD media."
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:32
+#: en/user_basics.ssi:32
 msgid ""
-"First, we run the lh config helper command which will create a \"config/\" "
-"hierarchy in the current directory for use by other helper commands:"
+"First, we run the #{lb config}# command which will create a \"config/\" "
+"hierarchy in the current directory for use by other commands:"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:36
-msgid "$ lh config"
+#: en/user_basics.ssi:36
+msgid "$ lb config"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:41
+#: en/user_basics.ssi:41
 msgid ""
-"By passing no parameters to lh config we indicated that we wish to use the "
-"defaults. This will create an image of type binary (see lh-config).  % "
-"FIXME: <xref linkend=\"lh-config\"/>"
+"By passing no parameters to #{lb config}# we indicated that we wish to use "
+"the defaults (see lb-config).  % FIXME: <xref linkend=\"lb-config\"/>"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:43
+#: en/user_basics.ssi:43
 msgid ""
-"Now that we have a \"config/\" hierarchy, we may build the image with the lh "
-"build helper command:"
+"Now that we have a \"config/\" hierarchy, we may build the image with the lb "
+"build command:"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:47 en/other_basics.ssi:138 en/other_basics.ssi:228
-msgid "# lh build"
+#: en/user_basics.ssi:47 en/user_basics.ssi:117 en/user_basics.ssi:199
+msgid "# lb build"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:52
+#: en/user_basics.ssi:52
 msgid ""
 "This process can take a while, depending on the speed of your network "
-"connection (see lh-build).  % FIXME: <xref linkend=\"lh-build\"/>"
+"connection (see lb-build).  % FIXME: <xref linkend=\"lb-build\"/>"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:54
+#: en/user_basics.ssi:54
 msgid "3~ Testing an ISO image with Qemu"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:56
+#: en/user_basics.ssi:56
 msgid "Testing an ISO is simple:"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:60
-msgid "# apt-get install qemu $ qemu -cdrom binary.iso"
+#: en/user_basics.ssi:60 en/user_basics.ssi:139
+msgid "# apt-get install qemu"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:64
-msgid "3~ Testing an ISO image with virtualbox-ose"
+#: en/user_basics.ssi:62
+msgid "$ qemu -cdrom binary.iso"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:66
-msgid "In order to test the ISO with virtualbox-ose:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_basics.ssi:70
-msgid "# apt-get install virtualbox-ose"
+#: en/user_basics.ssi:66
+msgid "3~ Testing an ISO image with virtualbox-ose"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:74
-msgid "and either install"
+#: en/user_basics.ssi:68
+msgid "In order to test the ISO with virtualbox-ose:"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:76
-msgid ""
-"_* the modules package for a stock kernel eg virtualbox-ose-"
-"modules-2.6.26-1-486 or"
+#: en/user_basics.ssi:72
+msgid "# apt-get install virtualbox-ose"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:78
+#: en/user_basics.ssi:76
 msgid ""
-"_* the modules package compiled for your kernel using module-assistant from "
-"the package virtualbox-ose-source"
-msgstr ""
-
-#. type: Plain text
-#: en/other_basics.ssi:80
-msgid "Run Virtualbox:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_basics.ssi:82
-msgid "For example, in Gnome Applications -> System Tools -> VirtualBox OSE"
+"and either install #{virtualbox-ose-source}# or #{virtualbox-ose-dkms}# to "
+"build the required kernel modules to run virtualbox-ose."
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:84
-msgid "Create a virtual machine from your Live ISO"
-msgstr ""
-
-#. type: Plain text
-#: en/other_basics.ssi:86
+#: en/user_basics.ssi:78
 msgid ""
-"To create a virtual machine \"mylive\" from A CDROM ISO \"binary.iso\" in "
-"VirtualBox:"
+"After successful installation, virtualbox can be e.g. found in the GNOME "
+"menu under 'Applications/System Tools/VirtualBox OSE'."
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:88
-msgid "Machine -> New"
-msgstr ""
-
-#. type: Plain text
-#: en/other_basics.ssi:90
-msgid "In the Wizard: FIXME"
-msgstr ""
-
-#. type: Plain text
-#: en/other_basics.ssi:92
-msgid "3~ Testing an ISO image with VMware Workstation"
-msgstr ""
-
-#. type: Plain text
-#: en/other_basics.ssi:94
-msgid "In order to test the ISO with VMware Workstation:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_basics.ssi:96 en/other_basics.ssi:168
-msgid "Run VMware Workstation:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_basics.ssi:98
-msgid "Click on Edit virtual machine settings in the VM summary page"
+#: en/user_basics.ssi:80
+msgid "3~ Burning an ISO image to a physical medium"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:100
-msgid ""
-"Then, click on the CD-ROM device and select Use ISO image. Remeber to "
-"connect the CD-ROM device at power on and remeber to adjust the boot order "
-"in the bios."
+#: en/user_basics.ssi:82
+msgid "Burning an ISO image is easy:"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:102
-msgid "3~ Burning an ISO image to a physical medium"
+#: en/user_basics.ssi:86
+msgid "# apt-get install wodim"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:104
-msgid "Burning an ISO image is easy:"
+#: en/user_basics.ssi:88
+msgid "$ wodim binary.iso"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:109
-msgid "# apt-get install wodim $ wodim binary.iso"
-msgstr ""
-
-#. type: Plain text
-#: en/other_basics.ssi:113
+#: en/user_basics.ssi:92
 msgid "2~ Building an USB/HDD image"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:115
+#: en/user_basics.ssi:94
 msgid ""
-"The following sequence of helper commands will create a basic USB/HDD image "
+"The following sequence of commands will create a basic USB/HDD image "
 "containing just the Debian standard system without X.org. It is suitable for "
 "booting from USB sticks, USB hard drives, and various other portable storage "
 "devices."
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:118
+#: en/user_basics.ssi:97
 msgid ""
 "Note if you created an iso image with the previous example, you will need to "
-"clean up your working directory with the lh clean helper command (see lh-"
-"clean): % FIXME: <xref linkend=\"lh-clean\"/>"
+"clean up your working directory with the #{lb clean} command (see lb-clean): "
+"% FIXME: <xref linkend=\"lb-clean\"/>"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:122 en/other_basics.ssi:210
-msgid "$ lh clean --binary"
+#: en/user_basics.ssi:101 en/user_basics.ssi:181
+msgid "$ lb clean --binary"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:126
+#: en/user_basics.ssi:105
 msgid ""
-"Run the lh config helper command with the parameters to configure the "
-"\"config/\" hierarchy to create a USB/HDD image type:"
+"Run the #{lb config}# command with the parameters to configure the \"config/"
+"\" hierarchy to create a USB/HDD image type:"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:130
-msgid "$ lh config -b usb-hdd"
+#: en/user_basics.ssi:109
+msgid "$ lb config -b usb-hdd"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:134 en/other_basics.ssi:224
-msgid "Now build the image with the lh build helper command:"
+#: en/user_basics.ssi:113
+msgid "Now build the image with the #{lb build} command:"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:142
+#: en/user_basics.ssi:121
 msgid "3~ Copying USB/HDD image to a USB stick"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:144
+#: en/user_basics.ssi:123
 msgid ""
 "The generated binary image contains a VFAT partition and the syslinux "
 "bootloader, ready to be directly written on an USB stick. Plug in an USB "
@@ -461,12 +403,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:148
+#: en/user_basics.ssi:127
 msgid "$ dd if=binary.img of=${USBSTICK}"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:152
+#: en/user_basics.ssi:131
 msgid ""
 "where #{${USBSTICK}}# is the device file of your key, like #{/dev/sdb}# (not "
 "a partition like #{/dev/sdb1}#!); you can find the right device name by "
@@ -474,130 +416,104 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:154
+#: en/user_basics.ssi:133
 #, no-wrap
 msgid "*{This will definitely overwrite any previous contents on your stick!}*\n"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:156
+#: en/user_basics.ssi:135
 msgid "3~ Testing a USB/HDD image with Qemu"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:160
-msgid "# apt-get install qemu $ qemu -hda binary.img"
-msgstr ""
-
-#. type: Plain text
-#: en/other_basics.ssi:164
-msgid "3~ Testing an USB/HDD image with VMware Workstation"
+#: en/user_basics.ssi:141
+msgid "$ qemu -hda binary.img"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:166
-msgid "In order to test the USB/HDD image with VMware Workstation:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_basics.ssi:170
-msgid ""
-"Write the image to an usb stick. In VMware, click on Edit virtual machine "
-"settings in VM summary page. Then, add a new physical harddisk device and "
-"enter the device node of your usb stick."
-msgstr ""
-
-#. type: Plain text
-#: en/other_basics.ssi:172
+#: en/user_basics.ssi:145
 msgid "3~ Using the space left on a USB stick"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:174
+#: en/user_basics.ssi:147
 msgid ""
 "If you want to use the remaining free space after you have installed the "
-"binary.img, you can use a partitioning tool such as gparted or parted to "
-"create a new partition on the stick. The first partition will be used by the "
-"Debian Live system."
+"binary.img, you can use a partitioning tool such as #{gparted}# or #{parted}"
+"# to create a new partition on the stick. The first partition will be used "
+"by the Debian Live system."
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:178
+#: en/user_basics.ssi:151
 msgid "# gparted ${USBSTICK}"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:182
+#: en/user_basics.ssi:155
 msgid ""
 "Ater the creation of the partition you have to create a filsystem on it. One "
-"possible choice would be ext2 (ext3 isn't recommended because the journaling "
-"causes too many writes to the stick)."
+"possible choice would be ext4."
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:186
-msgid "# mkfs.ext2 ${USBSTICK}"
+#: en/user_basics.ssi:159
+msgid "# mkfs.ext4 ${USBSTICK}"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:190
+#: en/user_basics.ssi:163
 msgid "If you want to use this data partition with Windows, use FAT32."
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:194
+#: en/user_basics.ssi:167
 msgid "# mkfs.vfat -F 32"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:198
+#: en/user_basics.ssi:171
 #, no-wrap
 msgid "*{Remember: Every time you install a new binary.img on the stick, all your data will be lost because the image includes a complete partition table.}*\n"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:200
-msgid ""
-"FIXME: Describe installing Debian Live to a partition (e.g. /dev/sdc1) AND "
-"using a bootloader to boot this."
-msgstr ""
-
-#. type: Plain text
-#: en/other_basics.ssi:202
+#: en/user_basics.ssi:173
 msgid "2~ Building a netboot image"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:204
+#: en/user_basics.ssi:175
 msgid ""
-"The following sequence of helper commands will create a basic netboot image "
+"The following sequence of commands will create a basic netboot image "
 "containing the Debian standard system without X.org. It is suitable for "
 "booting over the network."
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:206
+#: en/user_basics.ssi:177
 msgid ""
 "Note if you performed any previous examples, you will need to clean up your "
-"working directory with the lh clean helper command:"
+"working directory with the #{lb clean}# command:"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:214
+#: en/user_basics.ssi:185
 msgid ""
-"Run the lh config helper command with the parameters to configure the "
-"\"config/\" hierarchy to create our netboot image:"
+"Run the #{lb config}# command with the parameters to configure the \"config/"
+"\" hierarchy to create our netboot image:"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:218
+#: en/user_basics.ssi:189
 msgid ""
-"$ lh config -b net --net-root-path \"/srv/debian-live\" --net-root-server "
+"$ lb config -b net --net-root-path \"/srv/debian-live\" --net-root-server "
 "\"192.168.0.1\""
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:222
+#: en/user_basics.ssi:193
 msgid ""
 "In contrast with the ISO and USB hdd images, netbooting does not support "
 "serving a filesystem image with the client so the files must be served via "
@@ -607,37 +523,42 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:232
+#: en/user_basics.ssi:195
+msgid "Now build the image with the #{lb build}# command:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:203
 msgid ""
 "In a network boot the client runs a small piece of software, which usually "
 "resides on the EPROM of the Ethernet card. This program sends a DHCP request "
 "to get an IP address and information about what to do next. Typically the "
 "next step is getting a higher level boot loader via the TFTP protocol. That "
-"could be Grub, PXELINUX, or even boot directly to an operating system like "
+"could be PXELINUX, Grub or even boot directly to an operating system like "
 "Linux."
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:234
+#: en/user_basics.ssi:205
 msgid ""
 "For example, if you unpack the generated binary-net.tar.gz archive in the /"
 "srv/debian-live directory, you'll find the filesystem image in live/"
-"filesystem.squashfs and the kernel, initrd and PXE Linux bootloader in "
+"filesystem.squashfs and the kernel, initrd and PXELINUX bootloader in "
 "tftpboot/debian-live/i386."
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:236
-msgid "We must now configure three services on the server to enable netboot:"
+#: en/user_basics.ssi:207
+msgid "We must now configure three services on the server to enable netboot."
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:238
+#: en/user_basics.ssi:209
 msgid "3~ DHCP server"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:240
+#: en/user_basics.ssi:211
 msgid ""
 "We must configure our network's DHCP server to be sure to give an IP address "
 "to the computer netbooting, and to advertise the location of the PXE "
@@ -645,33 +566,25 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:242
+#: en/user_basics.ssi:213
 msgid ""
-"Here is an example for inspiration, written for the ISC DHCP server (package "
-"dhcp3-server) in the /etc/dhcp3/dhcpd.conf configuration file;"
+"Here is an example for inspiration, written for the ISC DHCP server #{isc-"
+"dhcp-server}# in the /etc/dhcp/dhcpd.conf configuration file;"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:250
-#, no-wrap
-msgid ""
-"code{\n"
-"# Options DHCP spécifiques à Pxelinux:\n"
-"option space pxelinux;\n"
-"option pxelinux.magic      code 208 = string;\n"
-"option pxelinux.configfile code 209 = text;\n"
-"option pxelinux.pathprefix code 210 = text;\n"
-"option pxelinux.reboottime code 211 = unsigned integer 32;\n"
+#: en/user_basics.ssi:216
+msgid "% FIXME code{"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:253
+#: en/user_basics.ssi:218
 #, no-wrap
 msgid "subnet 192.168.1.0 netmask 255.255.255.0 {   # 192.168.1.0/24\n"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:256
+#: en/user_basics.ssi:221
 #, no-wrap
 msgid ""
 "  # IP addresses available for guests\n"
@@ -679,7 +592,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:259
+#: en/user_basics.ssi:224
 #, no-wrap
 msgid ""
 "  # allow booting from the net\n"
@@ -687,7 +600,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:264
+#: en/user_basics.ssi:229
 #, no-wrap
 msgid ""
 "  # for net booting, server where the first file to be loaded (by TFTP\n"
@@ -697,17 +610,16 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:269
+#: en/user_basics.ssi:233
 #, no-wrap
 msgid ""
 "  # net boot configuration for guests with a PXE client :\n"
 "  if substring (option vendor-class-identifier, 0, 9) = \"PXEClient\" {\n"
 "    # Note : all files for PXE are relatives to the TFTP server's root\n"
-"    # path, as usually defined in /etc/inetd.conf.\n"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:272
+#: en/user_basics.ssi:236
 #, no-wrap
 msgid ""
 "    # PXE boot loader (first program to be loaded, by TFTP)\n"
@@ -715,77 +627,53 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:280
-#, no-wrap
-msgid ""
-"    # describe some specific pxelinux's options through DHCP options :\n"
-"    site-option-space \"pxelinux\";\n"
-"    option pxelinux.magic f1:00:74:7e;\n"
-"    if exists dhcp-parameter-request-list {\n"
-"      # Always send the PXELINUX options (specified in hexadecimal)\n"
-"      option dhcp-parameter-request-list = concat(option dhcp-parameter-request-list,d0,d1,d2,d3);\n"
-"    }\n"
-msgstr ""
-
-#. type: Plain text
-#: en/other_basics.ssi:286
+#: en/user_basics.ssi:239
 #, no-wrap
 msgid ""
-"    # For a PXE boot menu, different versions are available : simple\n"
-"    # text, text with curses, graphic (VESA)\n"
-"    #option pxelinux.configfile \"pxelinux/config_simple\";\n"
-"    #option pxelinux.configfile \"pxelinux/config_curses\";\n"
-"    option pxelinux.configfile \"pxelinux/config_vesa\";\n"
-msgstr ""
-
-#. type: Plain text
-#: en/other_basics.ssi:291
-#, no-wrap
-msgid ""
-"    # automatically reboot after 10 minutes of no activity\n"
-"    option pxelinux.reboottime 600;\n"
 "  }\n"
 "}\n"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:295
-msgid "3~ TFTPd server"
+#: en/user_basics.ssi:243
+msgid "3~ TFTP server"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:297
+#: en/user_basics.ssi:245
 msgid "This serves the kernel and initial ramdisk to the system at run-time."
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:299
+#: en/user_basics.ssi:247
 msgid ""
 "You should install the tftpd-hpa package. It can serve all files contained "
-"inside a root directory, usually /var/lib/tftpboot/, as defined with its -s "
-"option. To let it serve files inside /srv/debian-live/tftpboot, modify its "
-"start definition in /etc/inetd.conf with:"
+"inside a root directory, usually /srv/tftp. To let it serve files inside /"
+"srv/debian-live/tftpboot, run as root the following command:"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:303
-msgid ""
-"tftp dgram udp wait root /usr/sbin/in.tftpd /usr/sbin/in.tftpd -s /srv/"
-"debian-live/tftpboot -r blksize -v -v"
+#: en/user_basics.ssi:251
+msgid "dpkg-reconfigure -plow tftpd-hpa"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:307
-msgid "and reload the super server with /etc/init.d/openbsd-inetd reload."
+#: en/user_basics.ssi:253
+msgid "code}"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:309
+#: en/user_basics.ssi:255
+msgid "and fill in the new tftp server directory when being asked about it."
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:257
 msgid "3~ NFS server"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:311
+#: en/user_basics.ssi:259
 msgid ""
 "Once the guest computer has downloaded and booted a Linux kernel and loaded "
 "its initrd, it will try to mount the Live filesystem image through a NFS "
@@ -793,37 +681,35 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:313
-msgid ""
-"You should install the nfs-kernel-server package -- nfs-user-server does not "
-"function correctly with netboot."
+#: en/user_basics.ssi:261
+msgid "You need to install the nfs-kernel-server package."
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:315
+#: en/user_basics.ssi:263
 msgid ""
 "Then, make the filesystem image available through NFS by adding a line like "
 "the following to /etc/exports:"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:319
-msgid "/srv/debian-live *(ro,async,subtree_check,no_root_squash)"
+#: en/user_basics.ssi:267
+msgid "/srv/debian-live *(ro,async,no_root_squash,no_subtree_check)"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:323
+#: en/user_basics.ssi:271
 msgid ""
 "and tell the NFS server about this new export with the following command:"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:327
+#: en/user_basics.ssi:275
 msgid "# exportfs -rv"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:331
+#: en/user_basics.ssi:279
 msgid ""
 "Setting up these three services can be a little tricky. You might need some "
 "patience to get all of them working together. The Debian Installer Manual's "
@@ -832,70 +718,104 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:333
+#: en/user_basics.ssi:281
 msgid "3~ Netboot testing HowTo"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:335
+#: en/user_basics.ssi:283
 msgid ""
-"Netboot image creation is made easy with live-helper magic, but testing the "
+"Netboot image creation is made easy with live-build magic, but testing the "
 "images on physical machines can be really time consuming."
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:337
+#: en/user_basics.ssi:285
 msgid ""
 "To make our life easier, we can use virtualization. There are two solutions."
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:339
+#: en/user_basics.ssi:287
+msgid "3~ Qemu"
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:289
+msgid "_* Install qemu, bridge-utils, sudo."
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:291
+msgid "Edit /etc/qemu-ifup:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:302
+msgid ""
+"#!/bin/sh sudo -p \"Password for $0:\" /sbin/ifconfig $1 172.20.0.1 echo "
+"\"Executing /etc/qemu-ifup\" echo \"Bringing up $1 for bridged mode...\" "
+"sudo /sbin/ifconfig $1 0.0.0.0 promisc up echo \"Adding $1 to br0...\" sudo /"
+"usr/sbin/brctl addif br0 $1 sleep 2"
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:306
+msgid "Get, or build a grub-floppy-netboot (in the svn)."
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:308
+msgid "Launch qemu with \"-net nic,vlan=0 -net tap,vlan=0,ifname=tun0\""
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:310
 msgid "3~ VMWare Player"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:341
+#: en/user_basics.ssi:312
 msgid "_* Install VMWare Player (\"free as in beer\" edition)"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:343
+#: en/user_basics.ssi:314
 msgid ""
 "_* Create a PXETester directory, and create a text file called pxe.vwx inside"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:345
+#: en/user_basics.ssi:316
 msgid "_* Paste this text inside:"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:353
+#: en/user_basics.ssi:324
 msgid ""
 "#!/usr/bin/vmware config.version = \"8\" virtualHW.version = \"4\" memsize = "
 "\"512\" MemAllowAutoScaleDown = \"FALSE\""
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:359
+#: en/user_basics.ssi:330
 msgid ""
 "ide0:0.present = \"FALSE\" ide1:0.present = \"FALSE\" floppy0.present = "
 "\"FALSE\" sound.present = \"FALSE\" tools.remindInstall = \"FALSE\""
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:362
+#: en/user_basics.ssi:333
 msgid "ethernet0.present = \"TRUE\" ethernet0.addressType = \"generated\""
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:365
+#: en/user_basics.ssi:336
 msgid "displayName = \"Test Boot PXE\" guestOS = \"other\""
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:370
+#: en/user_basics.ssi:341
 msgid ""
 "ethernet0.generatedAddress = \"00:0c:29:8d:71:3b\" uuid.location = \"56 4d "
 "83 72 5c c4 de 3f-ae 9e 07 91 1d 8d 71 3b\" uuid.bios = \"56 4d 83 72 5c c4 "
@@ -903,53 +823,19 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:374
+#: en/user_basics.ssi:345
 msgid ""
 "_* You can play with this configuration file (i.e. change memory limit to "
 "256)"
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:376
+#: en/user_basics.ssi:347
 msgid ""
 "_* Double click on this file (or run VMWare player and selecet this file)."
 msgstr ""
 
 #. type: Plain text
-#: en/other_basics.ssi:378
+#: en/user_basics.ssi:348
 msgid "_* When running just press space if that strange question comes up..."
 msgstr ""
-
-#. type: Plain text
-#: en/other_basics.ssi:380
-msgid "3~ Qemu"
-msgstr ""
-
-#. type: Plain text
-#: en/other_basics.ssi:382
-msgid "_* Install qemu, bridge-utils, sudo."
-msgstr ""
-
-#. type: Plain text
-#: en/other_basics.ssi:384
-msgid "Edit /etc/qemu-ifup:"
-msgstr ""
-
-#. type: Plain text
-#: en/other_basics.ssi:395
-msgid ""
-"#!/bin/sh sudo -p \"Password for $0:\" /sbin/ifconfig $1 172.20.0.1 echo "
-"\"Executing /etc/qemu-ifup\" echo \"Bringing up $1 for bridged mode...\" "
-"sudo /sbin/ifconfig $1 0.0.0.0 promisc up echo \"Adding $1 to br0...\" sudo /"
-"usr/sbin/brctl addif br0 $1 sleep 2"
-msgstr ""
-
-#. type: Plain text
-#: en/other_basics.ssi:399
-msgid "Get, or build a grub-floppy-netboot (in the svn)."
-msgstr ""
-
-#. type: Plain text
-#: en/other_basics.ssi:400
-msgid "Launch qemu with \"-net nic,vlan=0 -net tap,vlan=0,ifname=tun0\""
-msgstr ""
diff --git a/manual/pot/user_installation.ssi.pot b/manual/pot/user_installation.ssi.pot
new file mode 100644
index 0000000..27e064c
--- /dev/null
+++ b/manual/pot/user_installation.ssi.pot
@@ -0,0 +1,413 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the live-manual package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: live-manual VERSION\n"
+"POT-Creation-Date: 2010-09-07 14:53+0300\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Plain text
+#: en/about_manual.ssi:81 en/about_manual.ssi:89 en/about_manual.ssi:97
+#: en/about_manual.ssi:109 en/about_manual.ssi:120 en/about_manual.ssi:133
+#: en/about_manual.ssi:141 en/about_manual.ssi:149 en/about_manual.ssi:157
+#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
+#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
+#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
+#: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
+#: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
+#: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
+#: en/other_customization-contents.ssi:30
+#: en/other_customization-contents.ssi:39
+#: en/other_customization-internationalization.ssi:10
+#: en/other_customization-internationalization.ssi:18
+#: en/other_customization-internationalization.ssi:26
+#: en/other_customization-internationalization.ssi:34
+#: en/other_customization-internationalization.ssi:46
+#: en/other_customization-packages.ssi:16
+#: en/other_customization-packages.ssi:24
+#: en/other_customization-packages.ssi:34
+#: en/other_customization-packages.ssi:42
+#: en/other_customization-packages.ssi:55
+#: en/other_customization-packages.ssi:91
+#: en/other_customization-packages.ssi:99
+#: en/other_customization-packages.ssi:146
+#: en/other_customization-packages.ssi:156
+#: en/other_customization-packages.ssi:166
+#: en/other_customization-packages.ssi:176 en/other_faq.ssi:41
+#: en/other_faq.ssi:83 en/other_faq.ssi:103 en/other_faq.ssi:117
+#: en/other_faq.ssi:137 en/other_faq.ssi:151 en/other_faq.ssi:198
+#: en/other_faq.ssi:245 en/other_faq.ssi:261 en/other_faq.ssi:287
+#: en/other_faq.ssi:299 en/other_faq.ssi:314 en/other_faq.ssi:333
+#: en/other_faq.ssi:345 en/other_faq.ssi:353 en/other_faq.ssi:364
+#: en/other_faq.ssi:374 en/other_howtos.ssi:16 en/other_howtos.ssi:43
+#: en/other_live-environment.ssi:14 en/other_live-environment.ssi:30
+#: en/other_live-environment.ssi:51 en/other_live-environment.ssi:61
+#: en/other_live-environment.ssi:69 en/other_live-environment.ssi:77
+#: en/other_live-environment.ssi:85 en/other_live-environment.ssi:93
+#: en/other_live-environment.ssi:116 en/other_live-environment.ssi:124
+#: en/other_live-environment.ssi:133 en/other_overview.ssi:54
+#: en/other_overview.ssi:94 en/other_overview.ssi:102
+#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
+#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
+#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
+#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111 en/user_basics.ssi:34
+#: en/user_basics.ssi:45 en/user_basics.ssi:58 en/user_basics.ssi:70
+#: en/user_basics.ssi:84 en/user_basics.ssi:99 en/user_basics.ssi:107
+#: en/user_basics.ssi:115 en/user_basics.ssi:125 en/user_basics.ssi:137
+#: en/user_basics.ssi:149 en/user_basics.ssi:157 en/user_basics.ssi:165
+#: en/user_basics.ssi:179 en/user_basics.ssi:187 en/user_basics.ssi:197
+#: en/user_basics.ssi:249 en/user_basics.ssi:265 en/user_basics.ssi:273
+#: en/user_basics.ssi:293 en/user_basics.ssi:318 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:76
+#: en/user_installation.ssi:84 en/user_installation.ssi:104
+#: en/user_installation.ssi:118 en/user_installation.ssi:134
+msgid "code{"
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:85 en/about_manual.ssi:93 en/about_manual.ssi:101
+#: en/about_manual.ssi:116 en/about_manual.ssi:129 en/about_manual.ssi:137
+#: en/about_manual.ssi:145 en/about_manual.ssi:153 en/about_manual.ssi:160
+#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
+#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
+#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
+#: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
+#: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
+#: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
+#: en/other_customization-contents.ssi:35
+#: en/other_customization-contents.ssi:50
+#: en/other_customization-internationalization.ssi:14
+#: en/other_customization-internationalization.ssi:22
+#: en/other_customization-internationalization.ssi:30
+#: en/other_customization-internationalization.ssi:38
+#: en/other_customization-internationalization.ssi:50
+#: en/other_customization-packages.ssi:20
+#: en/other_customization-packages.ssi:28
+#: en/other_customization-packages.ssi:38
+#: en/other_customization-packages.ssi:47
+#: en/other_customization-packages.ssi:59
+#: en/other_customization-packages.ssi:95
+#: en/other_customization-packages.ssi:103
+#: en/other_customization-packages.ssi:152
+#: en/other_customization-packages.ssi:162
+#: en/other_customization-packages.ssi:172
+#: en/other_customization-packages.ssi:182 en/other_faq.ssi:37
+#: en/other_faq.ssi:46 en/other_faq.ssi:92 en/other_faq.ssi:108
+#: en/other_faq.ssi:141 en/other_faq.ssi:155 en/other_faq.ssi:207
+#: en/other_faq.ssi:256 en/other_faq.ssi:292 en/other_faq.ssi:307
+#: en/other_faq.ssi:319 en/other_faq.ssi:337 en/other_faq.ssi:349
+#: en/other_faq.ssi:358 en/other_faq.ssi:370 en/other_faq.ssi:381
+#: en/other_howtos.ssi:20 en/other_howtos.ssi:47
+#: en/other_live-environment.ssi:18 en/other_live-environment.ssi:34
+#: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
+#: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
+#: en/other_live-environment.ssi:89 en/other_live-environment.ssi:97
+#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
+#: en/other_live-environment.ssi:138 en/other_overview.ssi:88
+#: en/other_overview.ssi:98 en/other_overview.ssi:106
+#: en/other_procedures.ssi:16 en/other_procedures.ssi:54
+#: en/other_procedures.ssi:131 en/other_use-cases.ssi:33
+#: en/other_use-cases.ssi:69 en/other_use-cases.ssi:97
+#: en/other_use-cases.ssi:107 en/other_use-cases.ssi:137 en/user_basics.ssi:38
+#: en/user_basics.ssi:49 en/user_basics.ssi:64 en/user_basics.ssi:74
+#: en/user_basics.ssi:90 en/user_basics.ssi:103 en/user_basics.ssi:111
+#: en/user_basics.ssi:119 en/user_basics.ssi:129 en/user_basics.ssi:143
+#: en/user_basics.ssi:153 en/user_basics.ssi:161 en/user_basics.ssi:169
+#: en/user_basics.ssi:183 en/user_basics.ssi:191 en/user_basics.ssi:201
+#: en/user_basics.ssi:241 en/user_basics.ssi:269 en/user_basics.ssi:277
+#: en/user_basics.ssi:304 en/user_basics.ssi:343 en/user_installation.ssi:42
+#: en/user_installation.ssi:50 en/user_installation.ssi:60
+#: en/user_installation.ssi:72 en/user_installation.ssi:80
+#: en/user_installation.ssi:108 en/user_installation.ssi:123
+#: en/user_installation.ssi:137
+msgid "}code"
+msgstr ""
+
+#. type: Plain text
+#: en/other_customization-internationalization.ssi:32
+#: en/user_installation.ssi:44
+msgid "or"
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:2
+msgid ":B~ Installation"
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:4
+msgid "1~ Installation"
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:6
+msgid "2~ Requirements"
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:8
+msgid "Building Debian Live images has very few system requirements:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:10
+msgid "_* Super user (root) access"
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:12
+msgid "_* An up-to-date version of live-build"
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:14
+msgid "_* A POSIX-compliant shell, such as /{bash}/ or /{dash}/."
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:16
+msgid "_* /{debootstrap}/ or /{cdebootstrap}/"
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:18
+msgid "_* Linux 2.6.x"
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:20
+msgid ""
+"Note that using Debian or a Debian-derived distribution is not required - "
+"live-build will run on almost any distribution with the above requirements."
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:22
+msgid "2~ Installing live-build"
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:24
+msgid "You can install live-build in a number of different ways:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:26
+msgid "_* From the Debian repository"
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:28
+msgid "_* From source"
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:30
+msgid "_* From snapshots"
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:32
+msgid ""
+"If you are using Debian, the recommended way is to install live-build via "
+"the Debian repository."
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:34
+msgid "3~ From the Debian repository"
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:36
+msgid "Simply install live-build like any other package:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:40
+msgid "# apt-get install live-build"
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:48
+msgid "# aptitude install live-build"
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:52
+msgid "3~ From source"
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:54
+msgid ""
+"live-build is developed using the Git version control system. On Debian "
+"systems, this is provided by the /{git}/ package. To check out the latest "
+"code, execute:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:58
+msgid "$ git clone git://live.debian.net/git/live-build.git"
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:62
+msgid "You can build and install your own Debian package by executing:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:68
+msgid "$ cd live-build $ dpkg-buildpackage -rfakeroot -b -uc -us $ cd .."
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:70
+msgid "# dpkg -i live-build*.deb"
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:74
+msgid "You can also install live-build directly to your system by executing:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:78
+msgid "# make install"
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:82
+msgid "and uninstall it with:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:87
+msgid "# make uninstall }code"
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:89
+msgid "3~ From 'snapshots'"
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:91
+msgid ""
+"If you do not wish to build or install live-build from source, you can use "
+"snapshots. These are built automatically from the latest version in Git and "
+"are available on http://live.debian.net/debian/."
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:93
+msgid "2~ live-boot"
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:95
+#, no-wrap
+msgid "*{Note:}* You do not need to install live-boot on your system to create customised Debian Live systems. However, doing so will do no harm.\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:97
+msgid "3~ Using a customised live-boot"
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:100
+msgid ""
+"To modify the code you can follow the process below. Please ensure you are "
+"familiar with the terms mentioned in terms.  % FIXME: <xref linkend=\"terms"
+"\"/>"
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:102
+msgid "_* Checkout the live-boot source"
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:106
+msgid "$ git clone git://live.debian.net/git/live-boot.git"
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:110
+msgid "_* Make changes to your local copy"
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:112
+msgid ""
+"And beware that if you want to add your pre-init script in live-bottom, you "
+"should name it without dashes '-', e.g: call it \"99new_feature\" and not "
+"\"99new-feature\"."
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:114
+msgid "_* Build a live-boot .deb"
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:116
+msgid ""
+"You must build either on your target distribution or in a chroot containing "
+"your target platform: this means if your target is squeeze then you should "
+"build against squeeze. You can use a personal builder such as /{pbuilder}/ "
+"or /{sbuild}/ to automate building packages in chroot. To build directly on "
+"the target platform, use #{dpkg-buildpackage}# (provided by the /{dpkg-dev}/ "
+"package):"
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:121
+msgid "$ cd live-boot $ dpkg-buildpackage -rfakeroot -b -uc -us"
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:125
+msgid "_* Use the generated live-boot .deb"
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:128
+msgid ""
+"As live-boot is installed by live-build system, installing the package in "
+"the host system is not sufficient: you should treat the generated .deb like "
+"another custom package. Please see custom-packages for more information. You "
+"should pay particular attention to custom-packages-apt.  % FIXME: <xref "
+"linkend=\"custom-packages\"/> <xref linkend=\"custom-packages-apt\"/>"
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:130
+msgid "3~ Using live-boot snapshots"
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:132
+msgid ""
+"You can let live-build automatically use the latest snapshot of live-boot by "
+"configuring a third-party repository in your live-build configuration "
+"directory. Assuming you have already created a configuration tree with #{lb "
+"config}#:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_installation.ssi:136
+msgid "lb config --repository live.debian.net"
+msgstr ""

-- 
live-manual



More information about the debian-live-changes mailing list