[SCM] live-manual branch, debian, updated. debian/3.0_a3-1
Ben Armstrong
synrg at debian.org
Wed May 18 16:58:44 UTC 2011
The following commit has been merged in the debian branch:
commit 66f5578aaeafd6fa292d3d6b37ef4a1c89d6168d
Author: Ben Armstrong <synrg at debian.org>
Date: Fri Mar 18 07:45:21 2011 -0300
Updating USB/HDD sections, integrating better with the rest of the chapter.
diff --git a/manual/de/live-manual.ssm b/manual/de/live-manual.ssm
index ca81b17..6426d04 100644
--- a/manual/de/live-manual.ssm
+++ b/manual/de/live-manual.ssm
@@ -9,7 +9,7 @@
:license: This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.<br><br>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.<br><br>You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/. <br><br>On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-3 file.
@date:
- :published: 2011-03-17
+ :published: 2011-03-18
@publisher: Debian Live Project <debian-live at lists.debian.org>
diff --git a/manual/de/user_basics.ssi b/manual/de/user_basics.ssi
index a097a47..cf93fac 100644
--- a/manual/de/user_basics.ssi
+++ b/manual/de/user_basics.ssi
@@ -14,7 +14,7 @@ netbooting, but is included here because once the setup is done, it is a
very convenient way to test and deploy images for booting on the local
network without the hassle of dealing with image media.
-2~ What is a live system?
+2~what-is-live What is a live system?
A live system usually means an operating system booted on a computer from a
removable medium, such as a CD-ROM or USB stick, or from a network, ready to
@@ -52,7 +52,7 @@ You can use live-build to build the system image from your specifications,
set up a Linux kernel, its initrd, and a bootloader to run them, all in one
media-dependant format (ISO9660 image, disk image, etc.).
-2~ First steps: building an ISO hybrid image
+2~building-iso-hybrid First steps: building an ISO hybrid image
Regardless of the image type, you will need to perform the same basic steps
to build an image each time. As a first example, execute the following
@@ -86,7 +86,7 @@ This process can take a while, depending on the speed of your network
connection. When it is complete, there should be a #{binary-hybrid.iso}#
image file, ready to use, in the current directory.
-2~ Using an ISO hybrid live image
+2~using-iso-hybrid Using an ISO hybrid live image
After either building or downloading an ISO hybrid image, which can be
obtained at http://www.debian.org/CD/live/, the usual next step is to
@@ -108,19 +108,18 @@ code{
3~copying-iso-hybrid-to-usb Copying an ISO hybrid image to a USB stick
ISO images prepared with the #{isohybrid}# command, like the images produced
-by live-build's default #{iso-hybrid}# binary image type, can be copied to a
-USB stick and directly booted without further steps. Plug in a USB stick
-with a size larger than that of #{binary-hybrid.iso}# and determine which
-device it is, which we hereafter refer to as #{${USBSTICK}}#. This is the
-device file of your key, such as #{/dev/sdb}#, not a partition, such as
+by the default #{iso-hybrid}# binary image type, can be simply copied to a
+USB stick with the #{dd}# program or an equivalent. Plug in a USB stick with
+a size larger than that of #{binary-hybrid.iso}# and determine which device
+it is, which we hereafter refer to as #{${USBSTICK}}#. This is the device
+file of your key, such as #{/dev/sdb}#, not a partition, such as
#{/dev/sdb1}#! You can find the right device name by looking in #{dmesg}#'s
output after plugging in the stick, or better yet, #{ls -l
/dev/disk/by-id}#.
-*{This will definitely overwrite any previous contents on your stick!}*
-
Once you are certain you have the correct device name, use the #{dd}#
-command to copy the image to the stick as follows:
+command to copy the image to the stick. *{This will definitely overwrite
+any previous contents on your stick!}*
code{
@@ -129,7 +128,7 @@ code{
}code
-3~ Booting the live media
+3~booting-live-media Booting the live media
The first time you boot your live media, whether CD, DVD, USB key, or PXE
boot, some setup in your computer's BIOS may be needed first. Since BIOSes
@@ -153,7 +152,7 @@ console-only image, such as #{standard}# or #{rescue}# flavour prebuilt
images, you should be automatically logged in on the console to the #{user}#
account and see a shell prompt, ready to use.
-2~ Using a virtual machine for testing
+2~using-virtual-machine Using a virtual machine for testing
It can be a great time-saver for the development of live images to run them
in a virtual machine (VM). This is not without its caveats:
@@ -226,19 +225,20 @@ code{
}code
-2~ Building a USB/HDD image
+2~building-usb-hdd Building a 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
+Building a USB/HDD image is similar to ISO hybrid in all respects except you
+specify #{--b usb-hdd}# and the resulting filename is #{binary.img}# which
+cannot be burnt to optical media. It is suitable for booting from USB
+sticks, USB hard drives, and various other portable storage
devices. Normally, an ISO hybrid image can be used for this purpose instead,
but if you have a BIOS which does not handle hybrid images properly, or want
-to use the remaining space on the media for a persistence partition, you
-need a USB/HDD image.
+to use the remaining space on the media for some purpose, such as a
+persistence partition, you need a USB/HDD image.
-Note: if you created an ISO image with the previous example, you will need
-to clean up your working directory with the #{lb clean}# command (see {The
-lb clean command}#lb-clean):
+Note: if you created an ISO hybrid image with the previous example, you will
+need to clean up your working directory with the #{lb clean}# command (see
+{The lb clean command}#lb-clean):
code{
@@ -246,8 +246,8 @@ code{
}code
-Run the #{lb config}# command with the parameters to configure the
-#{config/}# hierarchy to create a USB/HDD image type:
+Run the #{lb config}# command as before, except this time specifying the
+USB/HDD image type:
code{
@@ -263,47 +263,36 @@ code{
}code
-3~copying-usb-hdd-image Copying USB/HDD image to a USB stick
+When the build finishes, a #{binary.img}# file should be present in the
+current directory.
-% FIXME: eliminate duplication with ISO hybrid, as these are virtually the
-same instructions!
+2~using-usb-hdd-image Using a USB/HDD image
The generated binary image contains a VFAT partition and the syslinux
-bootloader, ready to be directly written on a USB stick. Plug in a USB stick
-with a size larger than that of binary.img and type:
-
-code{
-
- $ dd if=binary.img of=${USBSTICK}
-
-}code
-
-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
-looking in #{dmesg}#'s output after plugging in the stick, for example, or
-better yet, #{ls -l /dev/disk/by-id}#.
-
-*{This will definitely overwrite any previous contents on your stick!}*
-
-Note: As discussed earlier, this same process can be used for #{iso-hybrid}#
-type images (suffixed #{-hybrid.iso}#), but not #{iso}# type images.
+bootloader, ready to be directly written on a USB stick. Since using a
+USB/HDD image is just like using an ISO hybrid image on USB, follow the
+instructions in #{Using an ISO hybrid live image}#using-iso-hybrid, except
+use the filename #{binary.img}# instead of #{binary-hybrid.iso}#.
3~testing-usb-hdd-with-qemu Testing a USB/HDD image with Qemu
-code{
+First, install QEMU as described above in #{Testing an ISO image with
+QEMU}#testing-iso-with-qemu. Then run #{kvm}# or #{qemu}#, depending on
+which version your host system needs, specifying #{binary.img}# as the first
+hard drive.
- # apt-get install qemu
+code{
- $ qemu -hda binary.img
+ $ kvm -hda binary.img
}code
-3~ Using the space left on a USB stick
+3~using-usb-extra-space 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.
+To use the remaining free space after copying #{binary.img}# to a USB stick,
+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{
@@ -311,9 +300,9 @@ code{
}code
-After the creation of the partition, where #{${PARTITION}}# is the name of
-the partition, like #{/dev/sdb2}#, you have to create a filesystem on
-it. One possible choice would be ext4.
+After the partition is created, where #{${PARTITION}}# is the name of the
+partition, such as #{/dev/sdb2}#, you have to create a filesystem on it. One
+possible choice would be ext4.
code{
@@ -321,15 +310,12 @@ code{
}code
-If you want to use this data partition with Windows, use FAT32.
-
-code{
-
- # mkfs.vfat -F 32
-
-}code
+Note: If you want to use the extra space with Windows, apparently that OS
+cannot normally access any partitions but the first. Some solutions to this
+problem have been discussed on our #{mailing list}#contact, but it seems
+there are no easy answers.
-*{Remember: Every time you install a new binary.img on the stick, all data on the stick will be lost because the partition table is overwritten by the contents of the image.}*
+*{Remember: Every time you install a new binary.img on the stick, all data on the stick will be lost because the partition table is overwritten by the contents of the image, so back up your extra partition first to restore again after updating the live image.}*
2~building-netboot-image Building a netboot image
diff --git a/manual/de/user_examples.ssi b/manual/de/user_examples.ssi
index 5eaf0c1..5bb918a 100644
--- a/manual/de/user_examples.ssi
+++ b/manual/de/user_examples.ssi
@@ -64,8 +64,8 @@ virtual machine as described in {Testing an ISO image with
Qemu}#testing-iso-with-qemu and {Testing an ISO image with
virtualbox-ose}#testing-iso-with-virtualbox, or else imaged onto optical
media or a USB flash device as described in {Burning an ISO image to a
-physical medium}#burning-iso-image and {Copying USB/HDD image to a USB
-stick}#copying-usb-hdd-image, respectively.
+physical medium}#burning-iso-image and {Copying an ISO hybrid image to a USB
+stick}#copying-iso-hybrid-to-usb, respectively.
2~tutorial-2 Tutorial 2: A web browser utility
diff --git a/manual/en/live-manual.ssm b/manual/en/live-manual.ssm
index 4d25f00..5de4bbf 100644
--- a/manual/en/live-manual.ssm
+++ b/manual/en/live-manual.ssm
@@ -9,7 +9,7 @@
:license: This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.<br><br>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.<br><br>You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/. <br><br>On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-3 file.
@date:
- :published: 2011-03-17
+ :published: 2011-03-18
@publisher: Debian Live Project <debian-live at lists.debian.org>
diff --git a/manual/en/user_basics.ssi b/manual/en/user_basics.ssi
index ab6ce8a..5a63c90 100644
--- a/manual/en/user_basics.ssi
+++ b/manual/en/user_basics.ssi
@@ -4,7 +4,7 @@
This chapter contains a brief overview of the build process and instructions for using the three most commonly used image types. The most versatile image type, #{iso-hybrid}#, may be used on a virtual machine, optical media or USB portable storage device. In certain special cases, such as the use of persistence, #{usb-hdd}# may be more suitable for USB devices. The chapter finishes with instructions for building and using a #{net}# type image, which is a bit more involved due to the setup required on the server. This is a slightly advanced topic for anyone who is not familiar already with netbooting, but is included here because once the setup is done, it is a very convenient way to test and deploy images for booting on the local network without the hassle of dealing with image media.
-2~ What is a live system?
+2~what-is-live What is a live system?
A live system usually means an operating system booted on a computer from a removable medium, such as a CD-ROM or USB stick, or from a network, ready to use without any installation on the usual drive(s), with auto-configuration done at run time (see {Terms}#terms).
@@ -20,7 +20,7 @@ _* *{Bootloader}*: A small piece of code crafted to boot from the chosen media,
You can use live-build to build the system image from your specifications, set up a Linux kernel, its initrd, and a bootloader to run them, all in one media-dependant format (ISO9660 image, disk image, etc.).
-2~ First steps: building an ISO hybrid image
+2~building-iso-hybrid First steps: building an ISO hybrid image
Regardless of the image type, you will need to perform the same basic steps to build an image each time. As a first example, execute the following sequence of live-build commands to create a basic ISO hybrid image containing just the Debian standard system without X.org. It is suitable for burning to CD or DVD media, and also to copy onto a USB stick.
@@ -44,7 +44,7 @@ code{
This process can take a while, depending on the speed of your network connection. When it is complete, there should be a #{binary-hybrid.iso}# image file, ready to use, in the current directory.
-2~ Using an ISO hybrid live image
+2~using-iso-hybrid Using an ISO hybrid live image
After either building or downloading an ISO hybrid image, which can be obtained at http://www.debian.org/CD/live/, the usual next step is to prepare your media for booting, either CD-R(W) or DVD-R(W) optical media or a USB stick.
@@ -62,12 +62,11 @@ code{
3~copying-iso-hybrid-to-usb Copying an ISO hybrid image to a USB stick
-ISO images prepared with the #{isohybrid}# command, like the images produced by live-build's default #{iso-hybrid}# binary image type, can be copied to a USB stick and directly booted without further steps. Plug in a USB stick with a size larger than that of #{binary-hybrid.iso}# and determine which device it is, which we hereafter refer to as #{${USBSTICK}}#. This is the device file of your key, such as #{/dev/sdb}#, not a partition, such as #{/dev/sdb1}#! You can find the right device name by looking in #{dmesg}#'s output after plugging in the stick, or better yet, #{ls -l /dev/disk/by-id}#.
+ISO images prepared with the #{isohybrid}# command, like the images produced by the default #{iso-hybrid}# binary image type, can be simply copied to a USB stick with the #{dd}# program or an equivalent. Plug in a USB stick with a size larger than that of #{binary-hybrid.iso}# and determine which device it is, which we hereafter refer to as #{${USBSTICK}}#. This is the device file of your key, such as #{/dev/sdb}#, not a partition, such as #{/dev/sdb1}#! You can find the right device name by looking in #{dmesg}#'s output after plugging in the stick, or better yet, #{ls -l /dev/disk/by-id}#.
+Once you are certain you have the correct device name, use the #{dd}# command to copy the image to the stick.
*{This will definitely overwrite any previous contents on your stick!}*
-Once you are certain you have the correct device name, use the #{dd}# command to copy the image to the stick as follows:
-
code{
$ dd if=binary-hybrid.iso of=${USBSTICK}
@@ -75,7 +74,7 @@ code{
}code
-3~ Booting the live media
+3~booting-live-media Booting the live media
The first time you boot your live media, whether CD, DVD, USB key, or PXE boot, some setup in your computer's BIOS may be needed first. Since BIOSes vary greatly in features and key bindings, we cannot get into the topic in depth here. Some BIOSes provide a key to bring up a menu of boot devices at boot time, which is the easiest way if it is available on your system. Otherwise, you need to enter the BIOS configuration menu and change the boot order to place the boot device for the live system before your normal boot device.
@@ -83,7 +82,7 @@ Once you've booted the media, you are presented with a boot menu. If you just pr
Assuming you've selected #{Live}# and booted a default desktop live image, after the boot messages scroll by, you should be automatically logged into the #{user}# account and see a desktop, ready to use. If you've booted a console-only image, such as #{standard}# or #{rescue}# flavour prebuilt images, you should be automatically logged in on the console to the #{user}# account and see a shell prompt, ready to use.
-2~ Using a virtual machine for testing
+2~using-virtual-machine Using a virtual machine for testing
It can be a great time-saver for the development of live images to run them in a virtual machine (VM). This is not without its caveats:
@@ -141,11 +140,11 @@ code{
}code
-2~ Building a USB/HDD image
+2~building-usb-hdd Building a 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. Normally, an ISO hybrid image can be used for this purpose instead, but if you have a BIOS which does not handle hybrid images properly, or want to use the remaining space on the media for a persistence partition, you need a USB/HDD image.
+Building a USB/HDD image is similar to ISO hybrid in all respects except you specify #{--b usb-hdd}# and the resulting filename is #{binary.img}# which cannot be burnt to optical media. It is suitable for booting from USB sticks, USB hard drives, and various other portable storage devices. Normally, an ISO hybrid image can be used for this purpose instead, but if you have a BIOS which does not handle hybrid images properly, or want to use the remaining space on the media for some purpose, such as a persistence partition, you need a USB/HDD image.
-Note: if you created an ISO image with the previous example, you will need to clean up your working directory with the #{lb clean}# command (see {The lb clean command}#lb-clean):
+Note: if you created an ISO hybrid image with the previous example, you will need to clean up your working directory with the #{lb clean}# command (see {The lb clean command}#lb-clean):
code{
@@ -153,7 +152,7 @@ code{
}code
-Run the #{lb config}# command with the parameters to configure the #{config/}# hierarchy to create a USB/HDD image type:
+Run the #{lb config}# command as before, except this time specifying the USB/HDD image type:
code{
@@ -169,37 +168,25 @@ code{
}code
-3~copying-usb-hdd-image Copying USB/HDD image to a USB stick
-
-% FIXME: eliminate duplication with ISO hybrid, as these are virtually the same instructions!
-
-The generated binary image contains a VFAT partition and the syslinux bootloader, ready to be directly written on a USB stick. Plug in a USB stick with a size larger than that of binary.img and type:
-
-code{
+When the build finishes, a #{binary.img}# file should be present in the current directory.
- $ dd if=binary.img of=${USBSTICK}
+2~using-usb-hdd-image Using a USB/HDD image
-}code
-
-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 looking in #{dmesg}#'s output after plugging in the stick, for example, or better yet, #{ls -l /dev/disk/by-id}#.
-
-*{This will definitely overwrite any previous contents on your stick!}*
-
-Note: As discussed earlier, this same process can be used for #{iso-hybrid}# type images (suffixed #{-hybrid.iso}#), but not #{iso}# type images.
+The generated binary image contains a VFAT partition and the syslinux bootloader, ready to be directly written on a USB stick. Since using a USB/HDD image is just like using an ISO hybrid image on USB, follow the instructions in #{Using an ISO hybrid live image}#using-iso-hybrid, except use the filename #{binary.img}# instead of #{binary-hybrid.iso}#.
3~testing-usb-hdd-with-qemu Testing a USB/HDD image with Qemu
-code{
+First, install QEMU as described above in #{Testing an ISO image with QEMU}#testing-iso-with-qemu. Then run #{kvm}# or #{qemu}#, depending on which version your host system needs, specifying #{binary.img}# as the first hard drive.
- # apt-get install qemu
+code{
- $ qemu -hda binary.img
+ $ kvm -hda binary.img
}code
-3~ Using the space left on a USB stick
+3~using-usb-extra-space 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.
+To use the remaining free space after copying #{binary.img}# to a USB stick, 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{
@@ -207,7 +194,7 @@ code{
}code
-After the creation of the partition, where #{${PARTITION}}# is the name of the partition, like #{/dev/sdb2}#, you have to create a filesystem on it. One possible choice would be ext4.
+After the partition is created, where #{${PARTITION}}# is the name of the partition, such as #{/dev/sdb2}#, you have to create a filesystem on it. One possible choice would be ext4.
code{
@@ -215,15 +202,9 @@ code{
}code
-If you want to use this data partition with Windows, use FAT32.
-
-code{
-
- # mkfs.vfat -F 32
-
-}code
+Note: If you want to use the extra space with Windows, apparently that OS cannot normally access any partitions but the first. Some solutions to this problem have been discussed on our #{mailing list}#contact, but it seems there are no easy answers.
-*{Remember: Every time you install a new binary.img on the stick, all data on the stick will be lost because the partition table is overwritten by the contents of the image.}*
+*{Remember: Every time you install a new binary.img on the stick, all data on the stick will be lost because the partition table is overwritten by the contents of the image, so back up your extra partition first to restore again after updating the live image.}*
2~building-netboot-image Building a netboot image
diff --git a/manual/en/user_examples.ssi b/manual/en/user_examples.ssi
index 1379c1c..74aac53 100644
--- a/manual/en/user_examples.ssi
+++ b/manual/en/user_examples.ssi
@@ -42,7 +42,7 @@ code{
}code
-Assuming all goes well, after a while, the current directory will contain #{binary-hybrid.iso}#. This ISO hybrid image can be booted directly in a virtual machine as described in {Testing an ISO image with Qemu}#testing-iso-with-qemu and {Testing an ISO image with virtualbox-ose}#testing-iso-with-virtualbox, or else imaged onto optical media or a USB flash device as described in {Burning an ISO image to a physical medium}#burning-iso-image and {Copying USB/HDD image to a USB stick}#copying-usb-hdd-image, respectively.
+Assuming all goes well, after a while, the current directory will contain #{binary-hybrid.iso}#. This ISO hybrid image can be booted directly in a virtual machine as described in {Testing an ISO image with Qemu}#testing-iso-with-qemu and {Testing an ISO image with virtualbox-ose}#testing-iso-with-virtualbox, or else imaged onto optical media or a USB flash device as described in {Burning an ISO image to a physical medium}#burning-iso-image and {Copying an ISO hybrid image to a USB stick}#copying-iso-hybrid-to-usb, respectively.
2~tutorial-2 Tutorial 2: A web browser utility
diff --git a/manual/es/live-manual.ssm b/manual/es/live-manual.ssm
index d3d1ce7..c06b67d 100644
--- a/manual/es/live-manual.ssm
+++ b/manual/es/live-manual.ssm
@@ -9,7 +9,7 @@
:license: Este programa es software libre: puede ser redistribuido y / o modificado bajo los términos de la GNU General Public License publicada por la Free Software Foundation, bien de la versión 3 de la Licencia, o (a su elección) cualquier versión posterior. <br><br> Este programa se distribuye con la esperanza de que sea útil, pero SIN NINGUNA GARANTÍA, incluso sin la garantía implícita de COMERCIALIZACIÓN o IDONEIDAD PARA UN PROPÓSITO PARTICULAR. Consulte la GNU General Public License para más detalles. <br><br> Debería haber recibido una copia de la General Public License GNU junto con este programa. Si no, vea http://www.gnu.org/licenses/. <br><br> En los sistemas Debian, el texto completo de la GNU Licencia Pública General se pueden encontrar en / usr/share/common-licenses/GPL-3
@date:
- :published: 2011-03-17
+ :published: 2011-03-18
@publisher: Debian Live Project <debian-live at lists.debian.org>
diff --git a/manual/es/user_basics.ssi b/manual/es/user_basics.ssi
index 0679e29..1dc5708 100644
--- a/manual/es/user_basics.ssi
+++ b/manual/es/user_basics.ssi
@@ -14,7 +14,7 @@ netbooting, but is included here because once the setup is done, it is a
very convenient way to test and deploy images for booting on the local
network without the hassle of dealing with image media.
-2~ ¿Qué es un sistema en vivo?
+2~what-is-live What is a live system?
Por lo general, un sistema en vivo se refiere a un sistema operativo que
arranca en un equipo desde un medio extraíble, como un CD-ROM, dispositivo
@@ -59,7 +59,7 @@ de arranque para ponerlos en funcionamiento, todo ello en un formato que
depende del medio de almacenamiento elegido (imagen ISO9660, imagen de
disco, etc.)
-2~ First steps: building an ISO hybrid image
+2~building-iso-hybrid First steps: building an ISO hybrid image
Regardless of the image type, you will need to perform the same basic steps
to build an image each time. As a first example, execute the following
@@ -93,7 +93,7 @@ This process can take a while, depending on the speed of your network
connection. When it is complete, there should be a #{binary-hybrid.iso}#
image file, ready to use, in the current directory.
-2~ Using an ISO hybrid live image
+2~using-iso-hybrid Using an ISO hybrid live image
After either building or downloading an ISO hybrid image, which can be
obtained at http://www.debian.org/CD/live/, the usual next step is to
@@ -115,19 +115,18 @@ code{
3~copying-iso-hybrid-to-usb Copying an ISO hybrid image to a USB stick
ISO images prepared with the #{isohybrid}# command, like the images produced
-by live-build's default #{iso-hybrid}# binary image type, can be copied to a
-USB stick and directly booted without further steps. Plug in a USB stick
-with a size larger than that of #{binary-hybrid.iso}# and determine which
-device it is, which we hereafter refer to as #{${USBSTICK}}#. This is the
-device file of your key, such as #{/dev/sdb}#, not a partition, such as
+by the default #{iso-hybrid}# binary image type, can be simply copied to a
+USB stick with the #{dd}# program or an equivalent. Plug in a USB stick with
+a size larger than that of #{binary-hybrid.iso}# and determine which device
+it is, which we hereafter refer to as #{${USBSTICK}}#. This is the device
+file of your key, such as #{/dev/sdb}#, not a partition, such as
#{/dev/sdb1}#! You can find the right device name by looking in #{dmesg}#'s
output after plugging in the stick, or better yet, #{ls -l
/dev/disk/by-id}#.
-*{ATENCIÓN: Esto borrará definitivamente cualquier contenido anterior del dispositivo.}*
-
Once you are certain you have the correct device name, use the #{dd}#
-command to copy the image to the stick as follows:
+command to copy the image to the stick. *{This will definitely overwrite
+any previous contents on your stick!}*
code{
@@ -136,7 +135,7 @@ code{
}code
-3~ Booting the live media
+3~booting-live-media Booting the live media
The first time you boot your live media, whether CD, DVD, USB key, or PXE
boot, some setup in your computer's BIOS may be needed first. Since BIOSes
@@ -160,7 +159,7 @@ console-only image, such as #{standard}# or #{rescue}# flavour prebuilt
images, you should be automatically logged in on the console to the #{user}#
account and see a shell prompt, ready to use.
-2~ Using a virtual machine for testing
+2~using-virtual-machine Using a virtual machine for testing
It can be a great time-saver for the development of live images to run them
in a virtual machine (VM). This is not without its caveats:
@@ -233,20 +232,20 @@ code{
}code
-2~ Crear una imagen USB/HDD
+2~building-usb-hdd Building a USB/HDD image
-La siguiente secuencia de comandos creará una imagen USB/HDD básica que
-contendrá sólo el sistema estándar de Debian sin X.org. Es adecuada para el
-arranque desde dispositivos USB, discos duros USB y otros dispositivos de
-almacenamiento portátil. Normalmente, se puede utilizar para este propósito
-una imagen ISO híbrida, pero es posible que la BIOS que no maneje
-adecuadamente las imágenes híbridas. También es interesante una imagen
-USB/HDD si se desea utilizar el espacio restante en los medios de
-almacenamiento para una partición con persistencia.
+Building a USB/HDD image is similar to ISO hybrid in all respects except you
+specify #{--b usb-hdd}# and the resulting filename is #{binary.img}# which
+cannot be burnt to optical media. It is suitable for booting from USB
+sticks, USB hard drives, and various other portable storage
+devices. Normally, an ISO hybrid image can be used for this purpose instead,
+but if you have a BIOS which does not handle hybrid images properly, or want
+to use the remaining space on the media for some purpose, such as a
+persistence partition, you need a USB/HDD image.
-Nota: si se ha creado una imagen ISO con el ejemplo anterior, se tendrá que
-limpiar el directorio de trabajo con el comando #{lb clean}# (ver el comando
-lb clean}#lb-clean):
+Note: if you created an ISO hybrid image with the previous example, you will
+need to clean up your working directory with the #{lb clean}# command (see
+{The lb clean command}#lb-clean):
code{
@@ -254,8 +253,8 @@ code{
}code
-Ejecutar el comando #{lb config}# con los parámetros para configurar la
-jerarquía #{config/}# para crear una imágen USB/HDD:
+Run the #{lb config}# command as before, except this time specifying the
+USB/HDD image type:
code{
@@ -271,50 +270,36 @@ code{
}code
-3~copying-usb-hdd-image Copiar una imagen USB/HDD a un dispositivo USB
-
-% FIXME: eliminate duplication with ISO hybrid, as these are virtually the
-same instructions!
-
-La imagen binaria generada contiene una partición VFAT y el gestor de
-arranque syslinux, lista para ser copiada directamente en un dispositivo
-USB. Conecte una memoria USB de tamaño mayor que el del fichero binary.img y
-teclee:
-
-code{
-
- $ dd if=binary.img of=${USBSTICK}
-
-}code
-
-Siendo #{${USBSTICK}}# la ubicación del dispositivo, como #{/dev/sdb}#
-(ATENCIÓN: no es una partición como #{/dev/sdb1}# sino todo el dispositivo
-completo). Una vez conectado el dispositivo, se puede encontrar su nombre
-correcto utilizando mediante la orden #{dmesg}#, o incluso mejor mediante la
-orden #{ls -l /dev/disk/by-id}#.
+When the build finishes, a #{binary.img}# file should be present in the
+current directory.
-*{ATENCIÓN: Esto borrará definitivamente cualquier contenido anterior del dispositivo.}*
+2~using-usb-hdd-image Using a USB/HDD image
-Nota: Como se mencionó anteriormente, este mismo proceso se puede utilizar
-para imágenes #{iso-hybrid}# (con sufijo #{-hybrid.iso}#), pero no imágenes
-tipo #{iso}#.
+The generated binary image contains a VFAT partition and the syslinux
+bootloader, ready to be directly written on a USB stick. Since using a
+USB/HDD image is just like using an ISO hybrid image on USB, follow the
+instructions in #{Using an ISO hybrid live image}#using-iso-hybrid, except
+use the filename #{binary.img}# instead of #{binary-hybrid.iso}#.
3~testing-usb-hdd-with-qemu Probar una imágen USB/HDD con Qemu
-code{
+First, install QEMU as described above in #{Testing an ISO image with
+QEMU}#testing-iso-with-qemu. Then run #{kvm}# or #{qemu}#, depending on
+which version your host system needs, specifying #{binary.img}# as the first
+hard drive.
- # apt-get install qemu
+code{
- $ qemu -hda binary.img
+ $ kvm -hda binary.img
}code
-3~ Cómo usar el espacio que queda libre en el dispositivo USB
+3~using-usb-extra-space Using the space left on a USB stick
-Si se desea usar el espacio libre después de haber instalado la imagen
-binary.img, se puede usar un programa de particionado como #{gparted}# o
-#{parted}# para crear una partición nueva en el dispositivo. La primera
-partición será usada por el sistema Debian en vivo.
+To use the remaining free space after copying #{binary.img}# to a USB stick,
+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{
@@ -322,9 +307,9 @@ code{
}code
-Después de la creación de la partición, siendo #{${PARTITION}}# el nombre de
-la partición (por ejemplo #{/dev/sdb2}# ),se tiene que crear un sistema de
-ficheros en él. Una opción posible sería ext4.
+After the partition is created, where #{${PARTITION}}# is the name of the
+partition, such as #{/dev/sdb2}#, you have to create a filesystem on it. One
+possible choice would be ext4.
code{
@@ -332,15 +317,12 @@ code{
}code
-Si se desea usar los datos de esta partición con Windows, usar FAT32.
-
-code{
-
- # mkfs.vfat -F 32
-
-}code
+Note: If you want to use the extra space with Windows, apparently that OS
+cannot normally access any partitions but the first. Some solutions to this
+problem have been discussed on our #{mailing list}#contact, but it seems
+there are no easy answers.
-*{Recordar: Cada vez que se instale una nueva binary.img en el dispositivo, todos los datos del dispositivo se perderán debido a que la tabla de particiones se sobrescribe con el contenido de la imagen.}*
+*{Remember: Every time you install a new binary.img on the stick, all data on the stick will be lost because the partition table is overwritten by the contents of the image, so back up your extra partition first to restore again after updating the live image.}*
2~building-netboot-image Creación de una imagen de arranque en red
diff --git a/manual/es/user_examples.ssi b/manual/es/user_examples.ssi
index 0d09331..5c7ed59 100644
--- a/manual/es/user_examples.ssi
+++ b/manual/es/user_examples.ssi
@@ -65,14 +65,14 @@ code{
}code
-Suponiendo que todo va bien, después de un rato, el directorio actual
-contendrá #{binary-hybrid.iso}#. Esta imagen ISO hybrid se puede arrancar
-directamente en una máquina virtual como se describe en {Probar una imagen
-ISO con Qemu}#testing-iso-with-qemu y en {Probar una imagen ISO con
-virtualbox-ose}#testing-iso-with-virtualbox o bien ser copiada a un medio
-óptico como un dispositivo USB tal y como se describe en {Grabar una imagen
-ISO en un medio físico}#burning-iso-image y {Copiar una imagen USB/HDD a un
-dispositivo USB}#copying-usb-hdd-image, respectivamente.
+Assuming all goes well, after a while, the current directory will contain
+#{binary-hybrid.iso}#. This ISO hybrid image can be booted directly in a
+virtual machine as described in {Testing an ISO image with
+Qemu}#testing-iso-with-qemu and {Testing an ISO image with
+virtualbox-ose}#testing-iso-with-virtualbox, or else imaged onto optical
+media or a USB flash device as described in {Burning an ISO image to a
+physical medium}#burning-iso-image and {Copying an ISO hybrid image to a USB
+stick}#copying-iso-hybrid-to-usb, respectively.
2~tutorial-2 Tutorial 2: Una utilidad de navegador web
diff --git a/manual/fr/live-manual.ssm b/manual/fr/live-manual.ssm
index 4d25f00..5de4bbf 100644
--- a/manual/fr/live-manual.ssm
+++ b/manual/fr/live-manual.ssm
@@ -9,7 +9,7 @@
:license: This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.<br><br>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.<br><br>You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/. <br><br>On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-3 file.
@date:
- :published: 2011-03-17
+ :published: 2011-03-18
@publisher: Debian Live Project <debian-live at lists.debian.org>
diff --git a/manual/fr/user_basics.ssi b/manual/fr/user_basics.ssi
index a097a47..cf93fac 100644
--- a/manual/fr/user_basics.ssi
+++ b/manual/fr/user_basics.ssi
@@ -14,7 +14,7 @@ netbooting, but is included here because once the setup is done, it is a
very convenient way to test and deploy images for booting on the local
network without the hassle of dealing with image media.
-2~ What is a live system?
+2~what-is-live What is a live system?
A live system usually means an operating system booted on a computer from a
removable medium, such as a CD-ROM or USB stick, or from a network, ready to
@@ -52,7 +52,7 @@ You can use live-build to build the system image from your specifications,
set up a Linux kernel, its initrd, and a bootloader to run them, all in one
media-dependant format (ISO9660 image, disk image, etc.).
-2~ First steps: building an ISO hybrid image
+2~building-iso-hybrid First steps: building an ISO hybrid image
Regardless of the image type, you will need to perform the same basic steps
to build an image each time. As a first example, execute the following
@@ -86,7 +86,7 @@ This process can take a while, depending on the speed of your network
connection. When it is complete, there should be a #{binary-hybrid.iso}#
image file, ready to use, in the current directory.
-2~ Using an ISO hybrid live image
+2~using-iso-hybrid Using an ISO hybrid live image
After either building or downloading an ISO hybrid image, which can be
obtained at http://www.debian.org/CD/live/, the usual next step is to
@@ -108,19 +108,18 @@ code{
3~copying-iso-hybrid-to-usb Copying an ISO hybrid image to a USB stick
ISO images prepared with the #{isohybrid}# command, like the images produced
-by live-build's default #{iso-hybrid}# binary image type, can be copied to a
-USB stick and directly booted without further steps. Plug in a USB stick
-with a size larger than that of #{binary-hybrid.iso}# and determine which
-device it is, which we hereafter refer to as #{${USBSTICK}}#. This is the
-device file of your key, such as #{/dev/sdb}#, not a partition, such as
+by the default #{iso-hybrid}# binary image type, can be simply copied to a
+USB stick with the #{dd}# program or an equivalent. Plug in a USB stick with
+a size larger than that of #{binary-hybrid.iso}# and determine which device
+it is, which we hereafter refer to as #{${USBSTICK}}#. This is the device
+file of your key, such as #{/dev/sdb}#, not a partition, such as
#{/dev/sdb1}#! You can find the right device name by looking in #{dmesg}#'s
output after plugging in the stick, or better yet, #{ls -l
/dev/disk/by-id}#.
-*{This will definitely overwrite any previous contents on your stick!}*
-
Once you are certain you have the correct device name, use the #{dd}#
-command to copy the image to the stick as follows:
+command to copy the image to the stick. *{This will definitely overwrite
+any previous contents on your stick!}*
code{
@@ -129,7 +128,7 @@ code{
}code
-3~ Booting the live media
+3~booting-live-media Booting the live media
The first time you boot your live media, whether CD, DVD, USB key, or PXE
boot, some setup in your computer's BIOS may be needed first. Since BIOSes
@@ -153,7 +152,7 @@ console-only image, such as #{standard}# or #{rescue}# flavour prebuilt
images, you should be automatically logged in on the console to the #{user}#
account and see a shell prompt, ready to use.
-2~ Using a virtual machine for testing
+2~using-virtual-machine Using a virtual machine for testing
It can be a great time-saver for the development of live images to run them
in a virtual machine (VM). This is not without its caveats:
@@ -226,19 +225,20 @@ code{
}code
-2~ Building a USB/HDD image
+2~building-usb-hdd Building a 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
+Building a USB/HDD image is similar to ISO hybrid in all respects except you
+specify #{--b usb-hdd}# and the resulting filename is #{binary.img}# which
+cannot be burnt to optical media. It is suitable for booting from USB
+sticks, USB hard drives, and various other portable storage
devices. Normally, an ISO hybrid image can be used for this purpose instead,
but if you have a BIOS which does not handle hybrid images properly, or want
-to use the remaining space on the media for a persistence partition, you
-need a USB/HDD image.
+to use the remaining space on the media for some purpose, such as a
+persistence partition, you need a USB/HDD image.
-Note: if you created an ISO image with the previous example, you will need
-to clean up your working directory with the #{lb clean}# command (see {The
-lb clean command}#lb-clean):
+Note: if you created an ISO hybrid image with the previous example, you will
+need to clean up your working directory with the #{lb clean}# command (see
+{The lb clean command}#lb-clean):
code{
@@ -246,8 +246,8 @@ code{
}code
-Run the #{lb config}# command with the parameters to configure the
-#{config/}# hierarchy to create a USB/HDD image type:
+Run the #{lb config}# command as before, except this time specifying the
+USB/HDD image type:
code{
@@ -263,47 +263,36 @@ code{
}code
-3~copying-usb-hdd-image Copying USB/HDD image to a USB stick
+When the build finishes, a #{binary.img}# file should be present in the
+current directory.
-% FIXME: eliminate duplication with ISO hybrid, as these are virtually the
-same instructions!
+2~using-usb-hdd-image Using a USB/HDD image
The generated binary image contains a VFAT partition and the syslinux
-bootloader, ready to be directly written on a USB stick. Plug in a USB stick
-with a size larger than that of binary.img and type:
-
-code{
-
- $ dd if=binary.img of=${USBSTICK}
-
-}code
-
-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
-looking in #{dmesg}#'s output after plugging in the stick, for example, or
-better yet, #{ls -l /dev/disk/by-id}#.
-
-*{This will definitely overwrite any previous contents on your stick!}*
-
-Note: As discussed earlier, this same process can be used for #{iso-hybrid}#
-type images (suffixed #{-hybrid.iso}#), but not #{iso}# type images.
+bootloader, ready to be directly written on a USB stick. Since using a
+USB/HDD image is just like using an ISO hybrid image on USB, follow the
+instructions in #{Using an ISO hybrid live image}#using-iso-hybrid, except
+use the filename #{binary.img}# instead of #{binary-hybrid.iso}#.
3~testing-usb-hdd-with-qemu Testing a USB/HDD image with Qemu
-code{
+First, install QEMU as described above in #{Testing an ISO image with
+QEMU}#testing-iso-with-qemu. Then run #{kvm}# or #{qemu}#, depending on
+which version your host system needs, specifying #{binary.img}# as the first
+hard drive.
- # apt-get install qemu
+code{
- $ qemu -hda binary.img
+ $ kvm -hda binary.img
}code
-3~ Using the space left on a USB stick
+3~using-usb-extra-space 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.
+To use the remaining free space after copying #{binary.img}# to a USB stick,
+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{
@@ -311,9 +300,9 @@ code{
}code
-After the creation of the partition, where #{${PARTITION}}# is the name of
-the partition, like #{/dev/sdb2}#, you have to create a filesystem on
-it. One possible choice would be ext4.
+After the partition is created, where #{${PARTITION}}# is the name of the
+partition, such as #{/dev/sdb2}#, you have to create a filesystem on it. One
+possible choice would be ext4.
code{
@@ -321,15 +310,12 @@ code{
}code
-If you want to use this data partition with Windows, use FAT32.
-
-code{
-
- # mkfs.vfat -F 32
-
-}code
+Note: If you want to use the extra space with Windows, apparently that OS
+cannot normally access any partitions but the first. Some solutions to this
+problem have been discussed on our #{mailing list}#contact, but it seems
+there are no easy answers.
-*{Remember: Every time you install a new binary.img on the stick, all data on the stick will be lost because the partition table is overwritten by the contents of the image.}*
+*{Remember: Every time you install a new binary.img on the stick, all data on the stick will be lost because the partition table is overwritten by the contents of the image, so back up your extra partition first to restore again after updating the live image.}*
2~building-netboot-image Building a netboot image
diff --git a/manual/fr/user_examples.ssi b/manual/fr/user_examples.ssi
index 5eaf0c1..5bb918a 100644
--- a/manual/fr/user_examples.ssi
+++ b/manual/fr/user_examples.ssi
@@ -64,8 +64,8 @@ virtual machine as described in {Testing an ISO image with
Qemu}#testing-iso-with-qemu and {Testing an ISO image with
virtualbox-ose}#testing-iso-with-virtualbox, or else imaged onto optical
media or a USB flash device as described in {Burning an ISO image to a
-physical medium}#burning-iso-image and {Copying USB/HDD image to a USB
-stick}#copying-usb-hdd-image, respectively.
+physical medium}#burning-iso-image and {Copying an ISO hybrid image to a USB
+stick}#copying-iso-hybrid-to-usb, respectively.
2~tutorial-2 Tutorial 2: A web browser utility
diff --git a/manual/it/live-manual.ssm b/manual/it/live-manual.ssm
index b7a29f1..d296a26 100644
--- a/manual/it/live-manual.ssm
+++ b/manual/it/live-manual.ssm
@@ -9,7 +9,7 @@
:license: Questo programma è software libero: è possibile ridistribuirlo e modificarlo secondo i termini della GNU General Public License come pubblicata dalla Free Software Foundation, sia la versione 3 della licenza o (a scelta) una versione successiva.<br><br>Questo programma è distribuito nella speranza che possa essere utile, ma SENZA ALCUNA GARANZIA, nemmeno la garanzia implicita di COMMERCIABILITÀ o IDONEITÀ PER UN PARTICOLARE SCOPO. Vedere la GNU General Public License per ulteriori dettagli.<br><br>Si dovrebbe aver ricevuto una copia della GNU General Public License con questo programma. In caso contrario, vedere http://www.gnu.org/licenses/. <br><br>Sui sistemi Debian, il testo completo della GNU General Public License può essere trovato nel file /usr/share/common-licenses/GPL-3.
@date:
- :published: 2011-03-17
+ :published: 2011-03-18
@publisher: Debian Live Project <debian-live at lists.debian.org>
diff --git a/manual/it/user_basics.ssi b/manual/it/user_basics.ssi
index b398c57..7598cd8 100644
--- a/manual/it/user_basics.ssi
+++ b/manual/it/user_basics.ssi
@@ -14,7 +14,7 @@ netbooting, but is included here because once the setup is done, it is a
very convenient way to test and deploy images for booting on the local
network without the hassle of dealing with image media.
-2~ Che cos'è un sistema live?
+2~what-is-live What is a live system?
Per sistema live generalmente si intende un sistema operativo che può essere
avviato da un supporto rimovibile, come un CD-ROM o una chiavetta USB,
@@ -56,7 +56,7 @@ proprie specifiche, scegliere un kernel Linux, il suo initrd ed un
bootloader per avviarli, tutto in un unico formato che dipende dal mezzo
(immagini ISO9660, immagine disco, ecc.)
-2~ First steps: building an ISO hybrid image
+2~building-iso-hybrid First steps: building an ISO hybrid image
Regardless of the image type, you will need to perform the same basic steps
to build an image each time. As a first example, execute the following
@@ -90,7 +90,7 @@ This process can take a while, depending on the speed of your network
connection. When it is complete, there should be a #{binary-hybrid.iso}#
image file, ready to use, in the current directory.
-2~ Using an ISO hybrid live image
+2~using-iso-hybrid Using an ISO hybrid live image
After either building or downloading an ISO hybrid image, which can be
obtained at http://www.debian.org/CD/live/, the usual next step is to
@@ -112,19 +112,18 @@ code{
3~copying-iso-hybrid-to-usb Copying an ISO hybrid image to a USB stick
ISO images prepared with the #{isohybrid}# command, like the images produced
-by live-build's default #{iso-hybrid}# binary image type, can be copied to a
-USB stick and directly booted without further steps. Plug in a USB stick
-with a size larger than that of #{binary-hybrid.iso}# and determine which
-device it is, which we hereafter refer to as #{${USBSTICK}}#. This is the
-device file of your key, such as #{/dev/sdb}#, not a partition, such as
+by the default #{iso-hybrid}# binary image type, can be simply copied to a
+USB stick with the #{dd}# program or an equivalent. Plug in a USB stick with
+a size larger than that of #{binary-hybrid.iso}# and determine which device
+it is, which we hereafter refer to as #{${USBSTICK}}#. This is the device
+file of your key, such as #{/dev/sdb}#, not a partition, such as
#{/dev/sdb1}#! You can find the right device name by looking in #{dmesg}#'s
output after plugging in the stick, or better yet, #{ls -l
/dev/disk/by-id}#.
-*{Questo sovrascriverà definitivamente qualsiasi dato esistente sulla chiavetta!}*
-
Once you are certain you have the correct device name, use the #{dd}#
-command to copy the image to the stick as follows:
+command to copy the image to the stick. *{This will definitely overwrite
+any previous contents on your stick!}*
code{
@@ -133,7 +132,7 @@ code{
}code
-3~ Booting the live media
+3~booting-live-media Booting the live media
The first time you boot your live media, whether CD, DVD, USB key, or PXE
boot, some setup in your computer's BIOS may be needed first. Since BIOSes
@@ -157,7 +156,7 @@ console-only image, such as #{standard}# or #{rescue}# flavour prebuilt
images, you should be automatically logged in on the console to the #{user}#
account and see a shell prompt, ready to use.
-2~ Using a virtual machine for testing
+2~using-virtual-machine Using a virtual machine for testing
It can be a great time-saver for the development of live images to run them
in a virtual machine (VM). This is not without its caveats:
@@ -230,19 +229,20 @@ code{
}code
-2~ Creare un'immagine USB/HDD
+2~building-usb-hdd Building a USB/HDD image
-La seguente sequenza di comandi creerà un'immagine USB/HDD di base
-contenente solo un sistema Debian standard senza X.org. È adatta per
-avviarsi da chiavette USB, dischi rigidi USB, e da svariati altri
-dispositivi di archiviazione portatili. In genere per questo scopo può
-essere usata un'immagine ISO ibrida, ma se si ha un BIOS che non supporta le
-immagini ibride, o si vuole usare lo spazio rimanente sul supporto per una
-partizione persistente, allora occorre un'immagine USB/HDD.
+Building a USB/HDD image is similar to ISO hybrid in all respects except you
+specify #{--b usb-hdd}# and the resulting filename is #{binary.img}# which
+cannot be burnt to optical media. It is suitable for booting from USB
+sticks, USB hard drives, and various other portable storage
+devices. Normally, an ISO hybrid image can be used for this purpose instead,
+but if you have a BIOS which does not handle hybrid images properly, or want
+to use the remaining space on the media for some purpose, such as a
+persistence partition, you need a USB/HDD image.
-Nota: se si è creata un'immagine ISO con gli esempi precedenti, occorre
-pulire la directory di lavoro con il comando #{lb clean}# (vedere {Il
-comando lb clean}#lb-clean):
+Note: if you created an ISO hybrid image with the previous example, you will
+need to clean up your working directory with the #{lb clean}# command (see
+{The lb clean command}#lb-clean):
code{
@@ -250,8 +250,8 @@ code{
}code
-Eseguire il comando #{lb config}# con i parametri atti a configurare la
-struttura #{config/}# per creare un'immagine di tipo USB/HDD:
+Run the #{lb config}# command as before, except this time specifying the
+USB/HDD image type:
code{
@@ -267,49 +267,36 @@ code{
}code
-3~copying-usb-hdd-image Copiare un'immagine USB/HDD su una penna USB
-
-% FIXME: eliminate duplication with ISO hybrid, as these are virtually the
-same instructions!
-
-L'immagine binaria generata contiene una partizione VFAT e il bootloader
-syslinux, pronti per essere scritti direttamente su una penna USB. Inserire
-una chiavetta USB con una dimensione maggiore di quella di binary.img e
-digitare:
-
-code{
-
- $ dd if=binary.img of=${USBSTICK}
-
-}code
-
-dove #{${USBSTICK}}# è il nome del device, come #{/dev/sdb}# (non una
-partizione come #{/dev/sdb1}#!); si può trovare il nome corretto del device
-guardando l'output di #{dmesg}# dopo aver inserito la chiavetta USB, o
-meglio ancora #{ls -l /dev/disk/by-id}#.
+When the build finishes, a #{binary.img}# file should be present in the
+current directory.
-*{Questo sovrascriverà definitivamente qualsiasi dato esistente sulla chiavetta!}*
+2~using-usb-hdd-image Using a USB/HDD image
-Nota: come disquisito in precedenza, questo stesso processo può essere usato
-per immagini di tipo #{iso-hybrid}# (con suffisso #{-hybrid.iso}#), ma non
-per le immagini di tipo #{iso}#.
+The generated binary image contains a VFAT partition and the syslinux
+bootloader, ready to be directly written on a USB stick. Since using a
+USB/HDD image is just like using an ISO hybrid image on USB, follow the
+instructions in #{Using an ISO hybrid live image}#using-iso-hybrid, except
+use the filename #{binary.img}# instead of #{binary-hybrid.iso}#.
3~testing-usb-hdd-with-qemu Provare un'immagine USB/HDD con Qemu
-code{
+First, install QEMU as described above in #{Testing an ISO image with
+QEMU}#testing-iso-with-qemu. Then run #{kvm}# or #{qemu}#, depending on
+which version your host system needs, specifying #{binary.img}# as the first
+hard drive.
- # apt-get install qemu
+code{
- $ qemu -hda binary.img
+ $ kvm -hda binary.img
}code
-3~ Usare lo spazio rimanente su una penna USB
+3~using-usb-extra-space Using the space left on a USB stick
-Se si vuole usare lo spazio libero che rimane dopo l'installazione di
-binary.img, si può usare uno strumento di partizionamento come #{gparted}# o
-#{parted}# per creare una nuova partizione sulla penna. La prima partizione
-verrà utilizzata dal sistema Debian Live.
+To use the remaining free space after copying #{binary.img}# to a USB stick,
+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{
@@ -317,9 +304,9 @@ code{
}code
-Dopo aver creato la partizione, dove #{${PARTITION}}# è il nome della
-partizione, ad esempio #{/dev/sdb2}#, si deve creare su di essa un
-filesystem. Una scelta possibile potrebbe essere ext4.
+After the partition is created, where #{${PARTITION}}# is the name of the
+partition, such as #{/dev/sdb2}#, you have to create a filesystem on it. One
+possible choice would be ext4.
code{
@@ -327,15 +314,12 @@ code{
}code
-Usare FAT32 se si vuole usare questa partizione dati con Windows.
-
-code{
-
- # mkfs.vfat -F 32
-
-}code
+Note: If you want to use the extra space with Windows, apparently that OS
+cannot normally access any partitions but the first. Some solutions to this
+problem have been discussed on our #{mailing list}#contact, but it seems
+there are no easy answers.
-*{Ricorda: ogni volta che si installa un nuovo file binary.img sulla penna, tutti i dati sulla chiavetta saranno persi perché la tabella delle partizioni viene sovrascritta con i contenuti dell'immagine.}*
+*{Remember: Every time you install a new binary.img on the stick, all data on the stick will be lost because the partition table is overwritten by the contents of the image, so back up your extra partition first to restore again after updating the live image.}*
2~building-netboot-image Creare un'immagine netboot
diff --git a/manual/it/user_examples.ssi b/manual/it/user_examples.ssi
index e28483d..db4f7e2 100644
--- a/manual/it/user_examples.ssi
+++ b/manual/it/user_examples.ssi
@@ -60,15 +60,14 @@ code{
}code
-Presupponendo che tutto vada per il verso giusto, dopo un po' la directory
-corrente conterrà #{binary-hybrid.iso}#. Questa immagine ISO ibrida può
-essere avviata direttamente in una macchina virtuale come descritto in
-{Provare un'immagine ISO con Qemu}#testing-iso-with-qemu e {Provare
-un'immagine ISO con virtualbox-ose}#testing-iso-with-virtualbox, oppure
-masterizzata su un supporto ottico o ancora su una chiavetta USB come
-descritto rispettivamente in {Masterizzare un'immagine ISO su un supporto
-fisico}#burning-iso-image e {Copiare un'immagine USB/HDD su una penna
-USB}#copying-usb-hdd-image.
+Assuming all goes well, after a while, the current directory will contain
+#{binary-hybrid.iso}#. This ISO hybrid image can be booted directly in a
+virtual machine as described in {Testing an ISO image with
+Qemu}#testing-iso-with-qemu and {Testing an ISO image with
+virtualbox-ose}#testing-iso-with-virtualbox, or else imaged onto optical
+media or a USB flash device as described in {Burning an ISO image to a
+physical medium}#burning-iso-image and {Copying an ISO hybrid image to a USB
+stick}#copying-iso-hybrid-to-usb, respectively.
2~tutorial-2 Tutorial 2: servizio browser web
diff --git a/manual/po/de/live-manual.ssm.po b/manual/po/de/live-manual.ssm.po
index 494e72d..90fe7d8 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 2.0.0\n"
-"POT-Creation-Date: 2011-03-17 18:01-0200\n"
+"POT-Creation-Date: 2011-03-18 07:39-0200\n"
"PO-Revision-Date: 2010-10-03 20:30+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -45,7 +45,7 @@ msgstr ""
#, no-wrap
msgid ""
"@date:\n"
-" :published: 2011-03-17\n"
+" :published: 2011-03-18\n"
msgstr ""
#. type: Plain text
diff --git a/manual/po/de/user_basics.ssi.po b/manual/po/de/user_basics.ssi.po
index 6536403..2cfd337 100644
--- a/manual/po/de/user_basics.ssi.po
+++ b/manual/po/de/user_basics.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-03-17 18:01-0200\n"
+"POT-Creation-Date: 2011-03-18 07:39-0200\n"
"PO-Revision-Date: 2010-10-03 20:30+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -27,14 +27,13 @@ msgstr ""
#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
#: en/project_procedures.ssi:58 en/user_basics.ssi:30 en/user_basics.ssi:40
-#: en/user_basics.ssi:56 en/user_basics.ssi:72 en/user_basics.ssi:107
-#: en/user_basics.ssi:115 en/user_basics.ssi:127 en/user_basics.ssi:139
-#: en/user_basics.ssi:151 en/user_basics.ssi:159 en/user_basics.ssi:167
-#: en/user_basics.ssi:179 en/user_basics.ssi:193 en/user_basics.ssi:205
-#: en/user_basics.ssi:213 en/user_basics.ssi:221 en/user_basics.ssi:235
-#: en/user_basics.ssi:243 en/user_basics.ssi:253 en/user_basics.ssi:271
-#: en/user_basics.ssi:299 en/user_basics.ssi:315 en/user_basics.ssi:323
-#: en/user_basics.ssi:343 en/user_basics.ssi:368
+#: en/user_basics.ssi:56 en/user_basics.ssi:71 en/user_basics.ssi:106
+#: en/user_basics.ssi:114 en/user_basics.ssi:126 en/user_basics.ssi:138
+#: en/user_basics.ssi:150 en/user_basics.ssi:158 en/user_basics.ssi:166
+#: en/user_basics.ssi:182 en/user_basics.ssi:192 en/user_basics.ssi:200
+#: en/user_basics.ssi:216 en/user_basics.ssi:224 en/user_basics.ssi:234
+#: en/user_basics.ssi:252 en/user_basics.ssi:280 en/user_basics.ssi:296
+#: en/user_basics.ssi:304 en/user_basics.ssi:324 en/user_basics.ssi:349
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
@@ -92,14 +91,13 @@ msgstr ""
#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
#: en/project_procedures.ssi:131 en/user_basics.ssi:34 en/user_basics.ssi:44
-#: en/user_basics.ssi:62 en/user_basics.ssi:76 en/user_basics.ssi:111
-#: en/user_basics.ssi:119 en/user_basics.ssi:133 en/user_basics.ssi:143
-#: en/user_basics.ssi:155 en/user_basics.ssi:163 en/user_basics.ssi:171
-#: en/user_basics.ssi:183 en/user_basics.ssi:199 en/user_basics.ssi:209
-#: en/user_basics.ssi:217 en/user_basics.ssi:225 en/user_basics.ssi:239
-#: en/user_basics.ssi:247 en/user_basics.ssi:257 en/user_basics.ssi:291
-#: en/user_basics.ssi:303 en/user_basics.ssi:319 en/user_basics.ssi:327
-#: en/user_basics.ssi:354 en/user_basics.ssi:393
+#: en/user_basics.ssi:62 en/user_basics.ssi:75 en/user_basics.ssi:110
+#: en/user_basics.ssi:118 en/user_basics.ssi:132 en/user_basics.ssi:142
+#: en/user_basics.ssi:154 en/user_basics.ssi:162 en/user_basics.ssi:170
+#: en/user_basics.ssi:186 en/user_basics.ssi:196 en/user_basics.ssi:204
+#: en/user_basics.ssi:220 en/user_basics.ssi:228 en/user_basics.ssi:238
+#: en/user_basics.ssi:272 en/user_basics.ssi:284 en/user_basics.ssi:300
+#: en/user_basics.ssi:308 en/user_basics.ssi:335 en/user_basics.ssi:374
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:37
@@ -174,7 +172,7 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:8
-msgid "2~ What is a live system?"
+msgid "2~what-is-live What is a live system?"
msgstr ""
#. type: Plain text
@@ -242,7 +240,7 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:24
-msgid "2~ First steps: building an ISO hybrid image"
+msgid "2~building-iso-hybrid First steps: building an ISO hybrid image"
msgstr ""
#. type: Plain text
@@ -284,7 +282,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:42 en/user_basics.ssi:169 en/user_basics.ssi:255
+#: en/user_basics.ssi:42 en/user_basics.ssi:168 en/user_basics.ssi:236
#: en/user_examples.ssi:109 en/user_examples.ssi:208
#, no-wrap
msgid " # lb build\n"
@@ -300,7 +298,7 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:48
-msgid "2~ Using an ISO hybrid live image"
+msgid "2~using-iso-hybrid Using an ISO hybrid live image"
msgstr ""
#. type: Plain text
@@ -343,41 +341,36 @@ msgstr ""
#: en/user_basics.ssi:66
msgid ""
"ISO images prepared with the #{isohybrid}# command, like the images produced "
-"by live-build's default #{iso-hybrid}# binary image type, can be copied to a "
-"USB stick and directly booted without further steps. Plug in a USB stick "
-"with a size larger than that of #{binary-hybrid.iso}# and determine which "
-"device it is, which we hereafter refer to as #{${USBSTICK}}#. This is the "
-"device file of your key, such as #{/dev/sdb}#, not a partition, such as #{/"
-"dev/sdb1}#! You can find the right device name by looking in #{dmesg}#'s "
-"output after plugging in the stick, or better yet, #{ls -l /dev/disk/by-id}#."
+"by the default #{iso-hybrid}# binary image type, can be simply copied to a "
+"USB stick with the #{dd}# program or an equivalent. Plug in a USB stick with "
+"a size larger than that of #{binary-hybrid.iso}# and determine which device "
+"it is, which we hereafter refer to as #{${USBSTICK}}#. This is the device "
+"file of your key, such as #{/dev/sdb}#, not a partition, such as #{/dev/sdb1}"
+"#! You can find the right device name by looking in #{dmesg}#'s output after "
+"plugging in the stick, or better yet, #{ls -l /dev/disk/by-id}#."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:68 en/user_basics.ssi:187
-#, no-wrap
-msgid "*{This will definitely overwrite any previous contents on your stick!}*\n"
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:70
+#: en/user_basics.ssi:69
msgid ""
"Once you are certain you have the correct device name, use the #{dd}# "
-"command to copy the image to the stick as follows:"
+"command to copy the image to the stick. *{This will definitely overwrite "
+"any previous contents on your stick!}*"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:74
+#: en/user_basics.ssi:73
#, no-wrap
msgid " $ dd if=binary-hybrid.iso of=${USBSTICK}\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:79
-msgid "3~ Booting the live media"
+#: en/user_basics.ssi:78
+msgid "3~booting-live-media Booting the live media"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:81
+#: en/user_basics.ssi:80
msgid ""
"The first time you boot your live media, whether CD, DVD, USB key, or PXE "
"boot, some setup in your computer's BIOS may be needed first. Since BIOSes "
@@ -390,7 +383,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:83
+#: en/user_basics.ssi:82
msgid ""
"Once you've booted the media, you are presented with a boot menu. If you "
"just press enter here, the system will boot using the default entry, #{Live}"
@@ -400,7 +393,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:85
+#: en/user_basics.ssi:84
msgid ""
"Assuming you've selected #{Live}# and booted a default desktop live image, "
"after the boot messages scroll by, you should be automatically logged into "
@@ -411,59 +404,59 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:87
-msgid "2~ Using a virtual machine for testing"
+#: en/user_basics.ssi:86
+msgid "2~using-virtual-machine Using a virtual machine for testing"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:89
+#: en/user_basics.ssi:88
msgid ""
"It can be a great time-saver for the development of live images to run them "
"in a virtual machine (VM). This is not without its caveats:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:91
+#: en/user_basics.ssi:90
msgid ""
"_* Running a VM requires enough RAM for both the guest OS and the host and a "
"CPU with hardware support for virtualization is recommended."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:93
+#: en/user_basics.ssi:92
msgid ""
"_* There are some inherent limitations to running on a VM, e.g. poor video "
"performance, limited choice of emulated hardware."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:95
+#: en/user_basics.ssi:94
msgid ""
"_* When developing for specific hardware, there is no substitute for running "
"on the hardware itself."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:97
+#: en/user_basics.ssi:96
msgid ""
"_* Occasionally there are bugs that relate only to running in a VM. When in "
"doubt, test your image directly on the hardware."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:99
+#: en/user_basics.ssi:98
msgid ""
"Provided you can work within these constraints, survey the available VM "
"software and choose one that is suitable for your needs."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:101
+#: en/user_basics.ssi:100
msgid "3~testing-iso-with-qemu Testing an ISO image with QEMU"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:103
+#: en/user_basics.ssi:102
msgid ""
"The most versatile VM in Debian is QEMU. If your processor has hardware "
"support for virtualization, use the #{qemu-kvm}# package; the #{qemu-kvm}# "
@@ -471,7 +464,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:105
+#: en/user_basics.ssi:104
msgid ""
"First, install #{qemu-kvm}# if your processor supports it. If not, install #"
"{qemu}#, in which case the program name is #{qemu}# instead of #{kvm}# in "
@@ -480,58 +473,58 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:109
+#: en/user_basics.ssi:108
#, no-wrap
msgid " # apt-get install qemu-kvm qemu-utils\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:113
+#: en/user_basics.ssi:112
msgid "Booting an ISO image is simple:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:117
+#: en/user_basics.ssi:116
#, no-wrap
msgid " $ kvm -cdrom binary-hybrid.iso\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:121
+#: en/user_basics.ssi:120
msgid "See the man pages for more details."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:123
+#: en/user_basics.ssi:122
msgid "3~testing-iso-with-virtualbox Testing an ISO image with virtualbox-ose"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:125
+#: en/user_basics.ssi:124
msgid "In order to test the ISO with virtualbox-ose:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:129
+#: en/user_basics.ssi:128
#, no-wrap
msgid " # apt-get install virtualbox-ose virtualbox-ose-dkms\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:131
+#: en/user_basics.ssi:130
#, no-wrap
msgid " $ virtualbox\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:135
+#: en/user_basics.ssi:134
msgid ""
"Create a new virtual machine, change the storage settings to use binary-"
"hybrid.iso as the CD/DVD device, and start the machine."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:137
+#: en/user_basics.ssi:136
msgid ""
"Note: For live systems containing X.org that you want to test with #"
"{virtualbox-ose}#, you may wish to include the VirtualBox X.org driver "
@@ -540,177 +533,159 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:141
+#: en/user_basics.ssi:140
#, no-wrap
msgid " $ lb config --packages virtualbox-ose-guest-x11\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:145
-msgid "2~ Building a USB/HDD image"
+#: en/user_basics.ssi:144
+msgid "2~building-usb-hdd Building a USB/HDD image"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:147
+#: en/user_basics.ssi:146
msgid ""
-"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. Normally, an ISO hybrid image can be used for this purpose instead, "
-"but if you have a BIOS which does not handle hybrid images properly, or want "
-"to use the remaining space on the media for a persistence partition, you "
-"need a USB/HDD image."
+"Building a USB/HDD image is similar to ISO hybrid in all respects except you "
+"specify #{--b usb-hdd}# and the resulting filename is #{binary.img}# which "
+"cannot be burnt to optical media. It is suitable for booting from USB "
+"sticks, USB hard drives, and various other portable storage devices. "
+"Normally, an ISO hybrid image can be used for this purpose instead, but if "
+"you have a BIOS which does not handle hybrid images properly, or want to use "
+"the remaining space on the media for some purpose, such as a persistence "
+"partition, you need a USB/HDD image."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:149
+#: en/user_basics.ssi:148
msgid ""
-"Note: if you created an ISO image with the previous example, you will need "
-"to clean up your working directory with the #{lb clean}# command (see {The "
-"lb clean command}#lb-clean):"
+"Note: if you created an ISO hybrid image with the previous example, you will "
+"need to clean up your working directory with the #{lb clean}# command (see "
+"{The lb clean command}#lb-clean):"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:153 en/user_basics.ssi:237
+#: en/user_basics.ssi:152 en/user_basics.ssi:218
#, no-wrap
msgid " # lb clean --binary\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:157
+#: en/user_basics.ssi:156
msgid ""
-"Run the #{lb config}# command with the parameters to configure the #{config/}"
-"# hierarchy to create a USB/HDD image type:"
+"Run the #{lb config}# command as before, except this time specifying the USB/"
+"HDD image type:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:161
+#: en/user_basics.ssi:160
#, no-wrap
msgid " $ lb config -b usb-hdd\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:165 en/user_basics.ssi:251
+#: en/user_basics.ssi:164 en/user_basics.ssi:232
msgid "Now build the image with the #{lb build}# command:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:173
-msgid "3~copying-usb-hdd-image Copying USB/HDD image to a USB stick"
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:175
-msgid ""
-"% FIXME: eliminate duplication with ISO hybrid, as these are virtually the "
-"same instructions!"
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:177
+#: en/user_basics.ssi:172
msgid ""
-"The generated binary image contains a VFAT partition and the syslinux "
-"bootloader, ready to be directly written on a USB stick. Plug in a USB stick "
-"with a size larger than that of binary.img and type:"
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:181
-#, no-wrap
-msgid " $ dd if=binary.img of=${USBSTICK}\n"
+"When the build finishes, a #{binary.img}# file should be present in the "
+"current directory."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:185
-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 "
-"looking in #{dmesg}#'s output after plugging in the stick, for example, or "
-"better yet, #{ls -l /dev/disk/by-id}#."
+#: en/user_basics.ssi:174
+msgid "2~using-usb-hdd-image Using a USB/HDD image"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:189
+#: en/user_basics.ssi:176
msgid ""
-"Note: As discussed earlier, this same process can be used for #{iso-hybrid}# "
-"type images (suffixed #{-hybrid.iso}#), but not #{iso}# type images."
+"The generated binary image contains a VFAT partition and the syslinux "
+"bootloader, ready to be directly written on a USB stick. Since using a USB/"
+"HDD image is just like using an ISO hybrid image on USB, follow the "
+"instructions in #{Using an ISO hybrid live image}#using-iso-hybrid, except "
+"use the filename #{binary.img}# instead of #{binary-hybrid.iso}#."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:191
+#: en/user_basics.ssi:178
msgid "3~testing-usb-hdd-with-qemu Testing a USB/HDD image with Qemu"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:195
-#, no-wrap
-msgid " # apt-get install qemu\n"
+#: en/user_basics.ssi:180
+msgid ""
+"First, install QEMU as described above in #{Testing an ISO image with QEMU}"
+"#testing-iso-with-qemu. Then run #{kvm}# or #{qemu}#, depending on which "
+"version your host system needs, specifying #{binary.img}# as the first hard "
+"drive."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:197
+#: en/user_basics.ssi:184
#, no-wrap
-msgid " $ qemu -hda binary.img\n"
+msgid " $ kvm -hda binary.img\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:201
-msgid "3~ Using the space left on a USB stick"
+#: en/user_basics.ssi:188
+msgid "3~using-usb-extra-space Using the space left on a USB stick"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:203
+#: en/user_basics.ssi:190
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."
+"To use the remaining free space after copying #{binary.img}# to a USB stick, "
+"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/user_basics.ssi:207
+#: en/user_basics.ssi:194
#, no-wrap
msgid " # gparted ${USBSTICK}\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:211
+#: en/user_basics.ssi:198
msgid ""
-"After the creation of the partition, where #{${PARTITION}}# is the name of "
-"the partition, like #{/dev/sdb2}#, you have to create a filesystem on it. "
-"One possible choice would be ext4."
+"After the partition is created, where #{${PARTITION}}# is the name of the "
+"partition, such as #{/dev/sdb2}#, you have to create a filesystem on it. One "
+"possible choice would be ext4."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:215
+#: en/user_basics.ssi:202
#, no-wrap
msgid " # mkfs.ext4 ${PARTITION}\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:219
-msgid "If you want to use this data partition with Windows, use FAT32."
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:223
-#, no-wrap
-msgid " # mkfs.vfat -F 32\n"
+#: en/user_basics.ssi:206
+msgid ""
+"Note: If you want to use the extra space with Windows, apparently that OS "
+"cannot normally access any partitions but the first. Some solutions to this "
+"problem have been discussed on our #{mailing list}#contact, but it seems "
+"there are no easy answers."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:227
+#: en/user_basics.ssi:208
#, no-wrap
-msgid "*{Remember: Every time you install a new binary.img on the stick, all data on the stick will be lost because the partition table is overwritten by the contents of the image.}*\n"
+msgid "*{Remember: Every time you install a new binary.img on the stick, all data on the stick will be lost because the partition table is overwritten by the contents of the image, so back up your extra partition first to restore again after updating the live image.}*\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:229
+#: en/user_basics.ssi:210
msgid "2~building-netboot-image Building a netboot image"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:231
+#: en/user_basics.ssi:212
msgid ""
"The following sequence of commands will create a basic netboot image "
"containing the Debian standard system without X.org. It is suitable for "
@@ -718,27 +693,27 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:233
+#: en/user_basics.ssi:214
msgid ""
"Note: if you performed any previous examples, you will need to clean up your "
"working directory with the #{lb clean}# command:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:241
+#: en/user_basics.ssi:222
msgid ""
"Run the #{lb config}# command as follows to configure your image for "
"netbooting:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:245
+#: en/user_basics.ssi:226
#, no-wrap
msgid " $ lb config -b net --net-root-path \"/srv/debian-live\" --net-root-server \"192.168.0.1\"\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:249
+#: en/user_basics.ssi:230
msgid ""
"In contrast with the ISO and USB/HDD images, netbooting does not, itself, "
"serve the filesystem image to the client, so the files must be served via "
@@ -749,7 +724,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:259
+#: en/user_basics.ssi:240
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 "
@@ -760,7 +735,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:261
+#: en/user_basics.ssi:242
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 #"
@@ -769,19 +744,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:263
+#: en/user_basics.ssi:244
msgid ""
"We must now configure three services on the server to enable netboot: the "
"DHCP server, the TFTP server and the NFS server."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:265
+#: en/user_basics.ssi:246
msgid "3~ DHCP server"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:267
+#: en/user_basics.ssi:248
msgid ""
"We must configure our network's DHCP server to be sure to give an IP address "
"to the netbooting client system, and to advertise the location of the PXE "
@@ -789,26 +764,26 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:269
+#: en/user_basics.ssi:250
msgid ""
"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/user_basics.ssi:273
+#: en/user_basics.ssi:254
#, no-wrap
msgid " # /etc/dhcp/dhcpd.conf - configuration file for isc-dhcp-server\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:275
+#: en/user_basics.ssi:256
#, no-wrap
msgid " ddns-update-style none;\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:278
+#: en/user_basics.ssi:259
#, no-wrap
msgid ""
" option domain-name \"example.org\";\n"
@@ -816,7 +791,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:281
+#: en/user_basics.ssi:262
#, no-wrap
msgid ""
" default-lease-time 600;\n"
@@ -824,13 +799,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:283
+#: en/user_basics.ssi:264
#, no-wrap
msgid " log-facility local7;\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:289
+#: en/user_basics.ssi:270
#, no-wrap
msgid ""
" subnet 192.168.0.0 netmask 255.255.255.0 {\n"
@@ -841,17 +816,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:293
+#: en/user_basics.ssi:274
msgid "3~ TFTP server"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:295
+#: en/user_basics.ssi:276
msgid "This serves the kernel and initial ramdisk to the system at run time."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:297
+#: en/user_basics.ssi:278
msgid ""
"You should install the tftpd-hpa package. It can serve all files contained "
"inside a root directory, usually #{/srv/tftp}#. To let it serve files inside "
@@ -859,23 +834,23 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:301
+#: en/user_basics.ssi:282
#, no-wrap
msgid " # dpkg-reconfigure -plow tftpd-hpa\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:305
+#: en/user_basics.ssi:286
msgid "and fill in the new tftp server directory when being asked about it."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:307
+#: en/user_basics.ssi:288
msgid "3~ NFS server"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:309
+#: en/user_basics.ssi:290
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 "
@@ -883,37 +858,37 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:311
+#: en/user_basics.ssi:292
msgid "You need to install the #{nfs-kernel-server}# package."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:313
+#: en/user_basics.ssi:294
msgid ""
"Then, make the filesystem image available through NFS by adding a line like "
"the following to #{/etc/exports}#:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:317
+#: en/user_basics.ssi:298
#, no-wrap
msgid " /srv/debian-live *(ro,async,no_root_squash,no_subtree_check)\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:321
+#: en/user_basics.ssi:302
msgid ""
"and tell the NFS server about this new export with the following command:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:325
+#: en/user_basics.ssi:306
#, no-wrap
msgid " # exportfs -rv\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:329
+#: en/user_basics.ssi:310
msgid ""
"Setting up these three services can be a little tricky. You might need some "
"patience to get all of them working together. For more information, see the "
@@ -924,40 +899,40 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:331
+#: en/user_basics.ssi:312
msgid "3~ Netboot testing HowTo"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:333
+#: en/user_basics.ssi:314
msgid ""
"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/user_basics.ssi:335
+#: en/user_basics.ssi:316
msgid ""
"To make our life easier, we can use virtualization. There are two solutions."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:337
+#: en/user_basics.ssi:318
msgid "3~ Qemu"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:339
+#: en/user_basics.ssi:320
msgid "_* Install #{qemu}#, #{bridge-utils}#, #{sudo}#."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:341
+#: en/user_basics.ssi:322
msgid "Edit #{/etc/qemu-ifup}#:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:352
+#: en/user_basics.ssi:333
#, no-wrap
msgid ""
" #!/bin/sh\n"
@@ -971,40 +946,40 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:356
+#: en/user_basics.ssi:337
msgid "Get, or build a #{grub-floppy-netboot}# (in the svn)."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:358
+#: en/user_basics.ssi:339
msgid ""
"Launch #{qemu}# with \"#{-net nic,vlan=0 -net tap,vlan=0,ifname=tun0}#\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:360
+#: en/user_basics.ssi:341
msgid "3~ VMWare Player"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:362
+#: en/user_basics.ssi:343
msgid "_* Install VMWare Player (\"free as in beer\" edition)"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:364
+#: en/user_basics.ssi:345
msgid ""
"_* Create a PXETester directory, and create a text file called #{pxe.vwx}# "
"inside"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:366
+#: en/user_basics.ssi:347
msgid "_* Paste this text inside:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:374
+#: en/user_basics.ssi:355
#, no-wrap
msgid ""
" #!/usr/bin/vmware\n"
@@ -1015,7 +990,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:380
+#: en/user_basics.ssi:361
#, no-wrap
msgid ""
" ide0:0.present = \"FALSE\"\n"
@@ -1026,7 +1001,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:383
+#: en/user_basics.ssi:364
#, no-wrap
msgid ""
" ethernet0.present = \"TRUE\"\n"
@@ -1034,7 +1009,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:386
+#: en/user_basics.ssi:367
#, no-wrap
msgid ""
" displayName = \"Test Boot PXE\"\n"
@@ -1042,7 +1017,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:391
+#: en/user_basics.ssi:372
#, no-wrap
msgid ""
" ethernet0.generatedAddress = \"00:0c:29:8d:71:3b\"\n"
@@ -1052,19 +1027,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:395
+#: en/user_basics.ssi:376
msgid ""
"_* You can play with this configuration file (e.g. change memory limit to "
"256)"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:397
+#: en/user_basics.ssi:378
msgid ""
"_* Double click on this file (or run VMWare player and select this file)."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:398
+#: en/user_basics.ssi:379
msgid "_* When running just press space if that strange question comes up..."
msgstr ""
diff --git a/manual/po/de/user_examples.ssi.po b/manual/po/de/user_examples.ssi.po
index d9b0aa9..5c542e6 100644
--- a/manual/po/de/user_examples.ssi.po
+++ b/manual/po/de/user_examples.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2010-12-19 20:37-0400\n"
+"POT-Creation-Date: 2011-03-18 07:39-0200\n"
"PO-Revision-Date: 2010-11-04 16:34-0400\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -24,21 +24,21 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
-#: en/about_manual.ssi:170 en/project_bugs.ssi:58
+#: en/about_manual.ssi:146 en/about_manual.ssi:157 en/about_manual.ssi:165
+#: en/about_manual.ssi:173 en/project_bugs.ssi:60
#: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
#: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
#: en/project_procedures.ssi:58 en/user_basics.ssi:30 en/user_basics.ssi:40
-#: en/user_basics.ssi:52 en/user_basics.ssi:64 en/user_basics.ssi:76
-#: en/user_basics.ssi:86 en/user_basics.ssi:100 en/user_basics.ssi:108
-#: en/user_basics.ssi:116 en/user_basics.ssi:126 en/user_basics.ssi:140
-#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
-#: en/user_basics.ssi:182 en/user_basics.ssi:190 en/user_basics.ssi:200
-#: en/user_basics.ssi:218 en/user_basics.ssi:246 en/user_basics.ssi:262
-#: en/user_basics.ssi:270 en/user_basics.ssi:290 en/user_basics.ssi:315
+#: en/user_basics.ssi:56 en/user_basics.ssi:71 en/user_basics.ssi:106
+#: en/user_basics.ssi:114 en/user_basics.ssi:126 en/user_basics.ssi:138
+#: en/user_basics.ssi:150 en/user_basics.ssi:158 en/user_basics.ssi:166
+#: en/user_basics.ssi:182 en/user_basics.ssi:192 en/user_basics.ssi:200
+#: en/user_basics.ssi:216 en/user_basics.ssi:224 en/user_basics.ssi:234
+#: en/user_basics.ssi:252 en/user_basics.ssi:280 en/user_basics.ssi:296
+#: en/user_basics.ssi:304 en/user_basics.ssi:324 en/user_basics.ssi:349
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
@@ -64,7 +64,7 @@ msgstr ""
#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
-#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:106
+#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:105
#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
#: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
@@ -88,21 +88,21 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
-#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
-#: en/about_manual.ssi:174 en/project_bugs.ssi:62
+#: en/about_manual.ssi:151 en/about_manual.ssi:161 en/about_manual.ssi:169
+#: en/about_manual.ssi:177 en/project_bugs.ssi:64
#: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
#: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
#: en/project_procedures.ssi:131 en/user_basics.ssi:34 en/user_basics.ssi:44
-#: en/user_basics.ssi:58 en/user_basics.ssi:70 en/user_basics.ssi:80
-#: en/user_basics.ssi:92 en/user_basics.ssi:104 en/user_basics.ssi:112
-#: en/user_basics.ssi:120 en/user_basics.ssi:130 en/user_basics.ssi:146
-#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
-#: en/user_basics.ssi:186 en/user_basics.ssi:194 en/user_basics.ssi:204
-#: en/user_basics.ssi:238 en/user_basics.ssi:250 en/user_basics.ssi:266
-#: en/user_basics.ssi:274 en/user_basics.ssi:301 en/user_basics.ssi:340
+#: en/user_basics.ssi:62 en/user_basics.ssi:75 en/user_basics.ssi:110
+#: en/user_basics.ssi:118 en/user_basics.ssi:132 en/user_basics.ssi:142
+#: en/user_basics.ssi:154 en/user_basics.ssi:162 en/user_basics.ssi:170
+#: en/user_basics.ssi:186 en/user_basics.ssi:196 en/user_basics.ssi:204
+#: en/user_basics.ssi:220 en/user_basics.ssi:228 en/user_basics.ssi:238
+#: en/user_basics.ssi:272 en/user_basics.ssi:284 en/user_basics.ssi:300
+#: en/user_basics.ssi:308 en/user_basics.ssi:335 en/user_basics.ssi:374
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:37
@@ -124,11 +124,11 @@ msgstr ""
#: en/user_customization-packages.ssi:307
#: en/user_customization-packages.ssi:317
#: en/user_customization-packages.ssi:344
-#: en/user_customization-packages.ssi:354 en/user_customization-runtime.ssi:18
+#: en/user_customization-packages.ssi:353 en/user_customization-runtime.ssi:18
#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
-#: en/user_customization-runtime.ssi:102 en/user_customization-runtime.ssi:111
+#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:110
#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
#: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
#: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
@@ -141,7 +141,7 @@ msgstr ""
#: en/user_installation.ssi:70 en/user_installation.ssi:78
#: en/user_installation.ssi:86 en/user_installation.ssi:94
#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_installation.ssi:150 en/user_managing_a_configuration.ssi:31
+#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
@@ -150,7 +150,7 @@ msgid "}code"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:42 en/user_basics.ssi:118 en/user_basics.ssi:202
+#: en/user_basics.ssi:42 en/user_basics.ssi:168 en/user_basics.ssi:236
#: en/user_examples.ssi:109 en/user_examples.ssi:208
#, no-wrap
msgid " # lb build\n"
@@ -264,7 +264,7 @@ msgid ""
"with-qemu and {Testing an ISO image with virtualbox-ose}#testing-iso-with-"
"virtualbox, or else imaged onto optical media or a USB flash device as "
"described in {Burning an ISO image to a physical medium}#burning-iso-image "
-"and {Copying USB/HDD image to a USB stick}#copying-usb-hdd-image, "
+"and {Copying an ISO hybrid image to a USB stick}#copying-iso-hybrid-to-usb, "
"respectively."
msgstr ""
@@ -743,7 +743,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:299
+#: en/user_examples.ssi:298
msgid ""
"Note that we have included the #{debian-installer-launcher}# package to "
"launch the installer from the live desktop, and have also specified the 486 "
diff --git a/manual/po/es/live-manual.ssm.po b/manual/po/es/live-manual.ssm.po
index 2be3126..1d97b5d 100644
--- a/manual/po/es/live-manual.ssm.po
+++ b/manual/po/es/live-manual.ssm.po
@@ -9,7 +9,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2011-03-17 18:01-0200\n"
+"POT-Creation-Date: 2011-03-18 07:39-0200\n"
"PO-Revision-Date: 2011-03-12 08:00-0000\n"
"Last-Translator: José Luis Zabalza <jlz.3008 at gmail.com>\n"
"Language-Team: Debian live Spanish translation team <debian-live at lists."
@@ -55,7 +55,7 @@ msgstr ""
#| " :published: 2011-03-13\n"
msgid ""
"@date:\n"
-" :published: 2011-03-17\n"
+" :published: 2011-03-18\n"
msgstr ""
"@date:\n"
" :published: 2011-03-13\n"
diff --git a/manual/po/es/user_basics.ssi.po b/manual/po/es/user_basics.ssi.po
index 99f02b7..3a3130b 100644
--- a/manual/po/es/user_basics.ssi.po
+++ b/manual/po/es/user_basics.ssi.po
@@ -9,7 +9,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2011-03-17 18:01-0200\n"
+"POT-Creation-Date: 2011-03-18 07:39-0200\n"
"PO-Revision-Date: 2011-03-11 19:32+0100\n"
"Last-Translator: José Luis Zabalza and Carlos Zuferri «chals» "
"<jlz.3008 at gmail.com> <chals at altorricon.com>\n"
@@ -32,14 +32,13 @@ msgstr ""
#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
#: en/project_procedures.ssi:58 en/user_basics.ssi:30 en/user_basics.ssi:40
-#: en/user_basics.ssi:56 en/user_basics.ssi:72 en/user_basics.ssi:107
-#: en/user_basics.ssi:115 en/user_basics.ssi:127 en/user_basics.ssi:139
-#: en/user_basics.ssi:151 en/user_basics.ssi:159 en/user_basics.ssi:167
-#: en/user_basics.ssi:179 en/user_basics.ssi:193 en/user_basics.ssi:205
-#: en/user_basics.ssi:213 en/user_basics.ssi:221 en/user_basics.ssi:235
-#: en/user_basics.ssi:243 en/user_basics.ssi:253 en/user_basics.ssi:271
-#: en/user_basics.ssi:299 en/user_basics.ssi:315 en/user_basics.ssi:323
-#: en/user_basics.ssi:343 en/user_basics.ssi:368
+#: en/user_basics.ssi:56 en/user_basics.ssi:71 en/user_basics.ssi:106
+#: en/user_basics.ssi:114 en/user_basics.ssi:126 en/user_basics.ssi:138
+#: en/user_basics.ssi:150 en/user_basics.ssi:158 en/user_basics.ssi:166
+#: en/user_basics.ssi:182 en/user_basics.ssi:192 en/user_basics.ssi:200
+#: en/user_basics.ssi:216 en/user_basics.ssi:224 en/user_basics.ssi:234
+#: en/user_basics.ssi:252 en/user_basics.ssi:280 en/user_basics.ssi:296
+#: en/user_basics.ssi:304 en/user_basics.ssi:324 en/user_basics.ssi:349
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
@@ -97,14 +96,13 @@ msgstr "code{"
#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
#: en/project_procedures.ssi:131 en/user_basics.ssi:34 en/user_basics.ssi:44
-#: en/user_basics.ssi:62 en/user_basics.ssi:76 en/user_basics.ssi:111
-#: en/user_basics.ssi:119 en/user_basics.ssi:133 en/user_basics.ssi:143
-#: en/user_basics.ssi:155 en/user_basics.ssi:163 en/user_basics.ssi:171
-#: en/user_basics.ssi:183 en/user_basics.ssi:199 en/user_basics.ssi:209
-#: en/user_basics.ssi:217 en/user_basics.ssi:225 en/user_basics.ssi:239
-#: en/user_basics.ssi:247 en/user_basics.ssi:257 en/user_basics.ssi:291
-#: en/user_basics.ssi:303 en/user_basics.ssi:319 en/user_basics.ssi:327
-#: en/user_basics.ssi:354 en/user_basics.ssi:393
+#: en/user_basics.ssi:62 en/user_basics.ssi:75 en/user_basics.ssi:110
+#: en/user_basics.ssi:118 en/user_basics.ssi:132 en/user_basics.ssi:142
+#: en/user_basics.ssi:154 en/user_basics.ssi:162 en/user_basics.ssi:170
+#: en/user_basics.ssi:186 en/user_basics.ssi:196 en/user_basics.ssi:204
+#: en/user_basics.ssi:220 en/user_basics.ssi:228 en/user_basics.ssi:238
+#: en/user_basics.ssi:272 en/user_basics.ssi:284 en/user_basics.ssi:300
+#: en/user_basics.ssi:308 en/user_basics.ssi:335 en/user_basics.ssi:374
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:37
@@ -205,7 +203,9 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:8
-msgid "2~ What is a live system?"
+#, fuzzy
+#| msgid "2~ What is a live system?"
+msgid "2~what-is-live What is a live system?"
msgstr "2~ ¿Qué es un sistema en vivo?"
#. type: Plain text
@@ -310,7 +310,7 @@ msgstr ""
#: en/user_basics.ssi:24
#, fuzzy
#| msgid "2~ First steps: building an ISO image"
-msgid "2~ First steps: building an ISO hybrid image"
+msgid "2~building-iso-hybrid First steps: building an ISO hybrid image"
msgstr "2~ Primeros pasos: creación de una imagen ISO"
#. type: Plain text
@@ -384,7 +384,7 @@ msgstr ""
"comando #{lb build}#:"
#. type: Plain text
-#: en/user_basics.ssi:42 en/user_basics.ssi:169 en/user_basics.ssi:255
+#: en/user_basics.ssi:42 en/user_basics.ssi:168 en/user_basics.ssi:236
#: en/user_examples.ssi:109 en/user_examples.ssi:208
#, no-wrap
msgid " # lb build\n"
@@ -406,8 +406,10 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:48
-msgid "2~ Using an ISO hybrid live image"
-msgstr ""
+#, fuzzy
+#| msgid "3~copying-usb-hdd-image Copying USB/HDD image to a USB stick"
+msgid "2~using-iso-hybrid Using an ISO hybrid live image"
+msgstr "3~copying-usb-hdd-image Copiar una imagen USB/HDD a un dispositivo USB"
#. type: Plain text
#: en/user_basics.ssi:50
@@ -452,44 +454,39 @@ msgstr "3~copying-usb-hdd-image Copiar una imagen USB/HDD a un dispositivo USB"
#: en/user_basics.ssi:66
msgid ""
"ISO images prepared with the #{isohybrid}# command, like the images produced "
-"by live-build's default #{iso-hybrid}# binary image type, can be copied to a "
-"USB stick and directly booted without further steps. Plug in a USB stick "
-"with a size larger than that of #{binary-hybrid.iso}# and determine which "
-"device it is, which we hereafter refer to as #{${USBSTICK}}#. This is the "
-"device file of your key, such as #{/dev/sdb}#, not a partition, such as #{/"
-"dev/sdb1}#! You can find the right device name by looking in #{dmesg}#'s "
-"output after plugging in the stick, or better yet, #{ls -l /dev/disk/by-id}#."
+"by the default #{iso-hybrid}# binary image type, can be simply copied to a "
+"USB stick with the #{dd}# program or an equivalent. Plug in a USB stick with "
+"a size larger than that of #{binary-hybrid.iso}# and determine which device "
+"it is, which we hereafter refer to as #{${USBSTICK}}#. This is the device "
+"file of your key, such as #{/dev/sdb}#, not a partition, such as #{/dev/sdb1}"
+"#! You can find the right device name by looking in #{dmesg}#'s output after "
+"plugging in the stick, or better yet, #{ls -l /dev/disk/by-id}#."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:68 en/user_basics.ssi:187
-#, no-wrap
-msgid "*{This will definitely overwrite any previous contents on your stick!}*\n"
-msgstr "*{ATENCIÓN: Esto borrará definitivamente cualquier contenido anterior del dispositivo.}*\n"
-
-#. type: Plain text
-#: en/user_basics.ssi:70
+#: en/user_basics.ssi:69
msgid ""
"Once you are certain you have the correct device name, use the #{dd}# "
-"command to copy the image to the stick as follows:"
+"command to copy the image to the stick. *{This will definitely overwrite "
+"any previous contents on your stick!}*"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:74
+#: en/user_basics.ssi:73
#, fuzzy, no-wrap
#| msgid " $ dd if=binary.img of=${USBSTICK}\n"
msgid " $ dd if=binary-hybrid.iso of=${USBSTICK}\n"
msgstr " $ dd if=binary.img of=${USBSTICK}\n"
#. type: Plain text
-#: en/user_basics.ssi:79
+#: en/user_basics.ssi:78
#, fuzzy
#| msgid "2~ Customizing the live user"
-msgid "3~ Booting the live media"
+msgid "3~booting-live-media Booting the live media"
msgstr "2~ Personalización del usuario por defecto del sistema en vivo"
#. type: Plain text
-#: en/user_basics.ssi:81
+#: en/user_basics.ssi:80
msgid ""
"The first time you boot your live media, whether CD, DVD, USB key, or PXE "
"boot, some setup in your computer's BIOS may be needed first. Since BIOSes "
@@ -502,7 +499,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:83
+#: en/user_basics.ssi:82
msgid ""
"Once you've booted the media, you are presented with a boot menu. If you "
"just press enter here, the system will boot using the default entry, #{Live}"
@@ -512,7 +509,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:85
+#: en/user_basics.ssi:84
msgid ""
"Assuming you've selected #{Live}# and booted a default desktop live image, "
"after the boot messages scroll by, you should be automatically logged into "
@@ -523,61 +520,61 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:87
-msgid "2~ Using a virtual machine for testing"
+#: en/user_basics.ssi:86
+msgid "2~using-virtual-machine Using a virtual machine for testing"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:89
+#: en/user_basics.ssi:88
msgid ""
"It can be a great time-saver for the development of live images to run them "
"in a virtual machine (VM). This is not without its caveats:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:91
+#: en/user_basics.ssi:90
msgid ""
"_* Running a VM requires enough RAM for both the guest OS and the host and a "
"CPU with hardware support for virtualization is recommended."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:93
+#: en/user_basics.ssi:92
msgid ""
"_* There are some inherent limitations to running on a VM, e.g. poor video "
"performance, limited choice of emulated hardware."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:95
+#: en/user_basics.ssi:94
msgid ""
"_* When developing for specific hardware, there is no substitute for running "
"on the hardware itself."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:97
+#: en/user_basics.ssi:96
msgid ""
"_* Occasionally there are bugs that relate only to running in a VM. When in "
"doubt, test your image directly on the hardware."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:99
+#: en/user_basics.ssi:98
msgid ""
"Provided you can work within these constraints, survey the available VM "
"software and choose one that is suitable for your needs."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:101
+#: en/user_basics.ssi:100
#, fuzzy
#| msgid "3~testing-iso-with-qemu Testing an ISO image with Qemu"
msgid "3~testing-iso-with-qemu Testing an ISO image with QEMU"
msgstr "3~testing-iso-with-qemu Probar una imagen ISO con Qemu"
#. type: Plain text
-#: en/user_basics.ssi:103
+#: en/user_basics.ssi:102
msgid ""
"The most versatile VM in Debian is QEMU. If your processor has hardware "
"support for virtualization, use the #{qemu-kvm}# package; the #{qemu-kvm}# "
@@ -585,7 +582,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:105
+#: en/user_basics.ssi:104
msgid ""
"First, install #{qemu-kvm}# if your processor supports it. If not, install #"
"{qemu}#, in which case the program name is #{qemu}# instead of #{kvm}# in "
@@ -594,56 +591,56 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:109
+#: en/user_basics.ssi:108
#, fuzzy, no-wrap
#| msgid " # apt-get install qemu\n"
msgid " # apt-get install qemu-kvm qemu-utils\n"
msgstr " # apt-get install qemu\n"
#. type: Plain text
-#: en/user_basics.ssi:113
+#: en/user_basics.ssi:112
#, fuzzy
#| msgid "Testing an ISO is simple:"
msgid "Booting an ISO image is simple:"
msgstr "Probar un imagen ISO es sencillo:"
#. type: Plain text
-#: en/user_basics.ssi:117
+#: en/user_basics.ssi:116
#, fuzzy, no-wrap
#| msgid " $ qemu -cdrom binary.iso\n"
msgid " $ kvm -cdrom binary-hybrid.iso\n"
msgstr " $ qemu -cdrom binary.iso\n"
#. type: Plain text
-#: en/user_basics.ssi:121
+#: en/user_basics.ssi:120
msgid "See the man pages for more details."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:123
+#: en/user_basics.ssi:122
msgid "3~testing-iso-with-virtualbox Testing an ISO image with virtualbox-ose"
msgstr ""
"3~testing-iso-with-virtualbox Probar una imagen ISO con virtualbox-ose"
#. type: Plain text
-#: en/user_basics.ssi:125
+#: en/user_basics.ssi:124
msgid "In order to test the ISO with virtualbox-ose:"
msgstr "Para probar una imagen ISO con virtualbox-ose:"
#. type: Plain text
-#: en/user_basics.ssi:129
+#: en/user_basics.ssi:128
#, no-wrap
msgid " # apt-get install virtualbox-ose virtualbox-ose-dkms\n"
msgstr " # apt-get install virtualbox-ose virtualbox-ose-dkms\n"
#. type: Plain text
-#: en/user_basics.ssi:131
+#: en/user_basics.ssi:130
#, no-wrap
msgid " $ virtualbox\n"
msgstr " $ virtualbox\n"
#. type: Plain text
-#: en/user_basics.ssi:135
+#: en/user_basics.ssi:134
#, fuzzy
#| msgid ""
#| "Create a new virtual machine, change the storage settings to use binary."
@@ -656,7 +653,7 @@ msgstr ""
"para utilizar binary.iso como el dispositivo de CD/DVD y arrancar la máquina."
#. type: Plain text
-#: en/user_basics.ssi:137
+#: en/user_basics.ssi:136
#, fuzzy
#| msgid ""
#| "Note: For live systems containing X.org that you want to test with "
@@ -675,26 +672,38 @@ msgstr ""
"800x600"
#. type: Plain text
-#: en/user_basics.ssi:141
+#: en/user_basics.ssi:140
#, no-wrap
msgid " $ lb config --packages virtualbox-ose-guest-x11\n"
msgstr " $ lb config --packages virtualbox-ose-guest-x11\n"
#. type: Plain text
-#: en/user_basics.ssi:145
-msgid "2~ Building a USB/HDD image"
+#: en/user_basics.ssi:144
+#, fuzzy
+#| msgid "2~ Building a USB/HDD image"
+msgid "2~building-usb-hdd Building a USB/HDD image"
msgstr "2~ Crear una imagen USB/HDD"
#. type: Plain text
-#: en/user_basics.ssi:147
-msgid ""
-"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. Normally, an ISO hybrid image can be used for this purpose instead, "
-"but if you have a BIOS which does not handle hybrid images properly, or want "
-"to use the remaining space on the media for a persistence partition, you "
-"need a USB/HDD image."
+#: en/user_basics.ssi:146
+#, fuzzy
+#| msgid ""
+#| "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. Normally, an ISO hybrid image can be used for this "
+#| "purpose instead, but if you have a BIOS which does not handle hybrid "
+#| "images properly, or want to use the remaining space on the media for a "
+#| "persistence partition, you need a USB/HDD image."
+msgid ""
+"Building a USB/HDD image is similar to ISO hybrid in all respects except you "
+"specify #{--b usb-hdd}# and the resulting filename is #{binary.img}# which "
+"cannot be burnt to optical media. It is suitable for booting from USB "
+"sticks, USB hard drives, and various other portable storage devices. "
+"Normally, an ISO hybrid image can be used for this purpose instead, but if "
+"you have a BIOS which does not handle hybrid images properly, or want to use "
+"the remaining space on the media for some purpose, such as a persistence "
+"partition, you need a USB/HDD image."
msgstr ""
"La siguiente secuencia de comandos creará una imagen USB/HDD básica que "
"contendrá sólo el sistema estándar de Debian sin X.org. Es adecuada para el "
@@ -706,60 +715,78 @@ msgstr ""
"para una partición con persistencia."
#. type: Plain text
-#: en/user_basics.ssi:149
+#: en/user_basics.ssi:148
+#, fuzzy
+#| msgid ""
+#| "Note: if you created an ISO image with the previous example, you will "
+#| "need to clean up your working directory with the #{lb clean}# command "
+#| "(see {The lb clean command}#lb-clean):"
msgid ""
-"Note: if you created an ISO image with the previous example, you will need "
-"to clean up your working directory with the #{lb clean}# command (see {The "
-"lb clean command}#lb-clean):"
+"Note: if you created an ISO hybrid image with the previous example, you will "
+"need to clean up your working directory with the #{lb clean}# command (see "
+"{The lb clean command}#lb-clean):"
msgstr ""
"Nota: si se ha creado una imagen ISO con el ejemplo anterior, se tendrá que "
"limpiar el directorio de trabajo con el comando #{lb clean}# (ver el comando "
"lb clean}#lb-clean):"
#. type: Plain text
-#: en/user_basics.ssi:153 en/user_basics.ssi:237
+#: en/user_basics.ssi:152 en/user_basics.ssi:218
#, no-wrap
msgid " # lb clean --binary\n"
msgstr " # lb clean --binary\n"
#. type: Plain text
-#: en/user_basics.ssi:157
+#: en/user_basics.ssi:156
+#, fuzzy
+#| msgid ""
+#| "Run the #{lb config}# command with the parameters to configure the #"
+#| "{config/}# hierarchy to create a USB/HDD image type:"
msgid ""
-"Run the #{lb config}# command with the parameters to configure the #{config/}"
-"# hierarchy to create a USB/HDD image type:"
+"Run the #{lb config}# command as before, except this time specifying the USB/"
+"HDD image type:"
msgstr ""
"Ejecutar el comando #{lb config}# con los parámetros para configurar la "
"jerarquía #{config/}# para crear una imágen USB/HDD:"
#. type: Plain text
-#: en/user_basics.ssi:161
+#: en/user_basics.ssi:160
#, no-wrap
msgid " $ lb config -b usb-hdd\n"
msgstr " $ lb config -b usb-hdd\n"
#. type: Plain text
-#: en/user_basics.ssi:165 en/user_basics.ssi:251
+#: en/user_basics.ssi:164 en/user_basics.ssi:232
msgid "Now build the image with the #{lb build}# command:"
msgstr "Crear ahora la imagen con el comando #{lb build}#:"
#. type: Plain text
-#: en/user_basics.ssi:173
-msgid "3~copying-usb-hdd-image Copying USB/HDD image to a USB stick"
-msgstr "3~copying-usb-hdd-image Copiar una imagen USB/HDD a un dispositivo USB"
-
-#. type: Plain text
-#: en/user_basics.ssi:175
+#: en/user_basics.ssi:172
msgid ""
-"% FIXME: eliminate duplication with ISO hybrid, as these are virtually the "
-"same instructions!"
+"When the build finishes, a #{binary.img}# file should be present in the "
+"current directory."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:177
+#: en/user_basics.ssi:174
+#, fuzzy
+#| msgid "3~testing-usb-hdd-with-qemu Testing a USB/HDD image with Qemu"
+msgid "2~using-usb-hdd-image Using a USB/HDD image"
+msgstr "3~testing-usb-hdd-with-qemu Probar una imágen USB/HDD con Qemu"
+
+#. type: Plain text
+#: en/user_basics.ssi:176
+#, fuzzy
+#| msgid ""
+#| "The generated binary image contains a VFAT partition and the syslinux "
+#| "bootloader, ready to be directly written on a USB stick. Plug in a USB "
+#| "stick with a size larger than that of binary.img and type:"
msgid ""
"The generated binary image contains a VFAT partition and the syslinux "
-"bootloader, ready to be directly written on a USB stick. Plug in a USB stick "
-"with a size larger than that of binary.img and type:"
+"bootloader, ready to be directly written on a USB stick. Since using a USB/"
+"HDD image is just like using an ISO hybrid image on USB, follow the "
+"instructions in #{Using an ISO hybrid live image}#using-iso-hybrid, except "
+"use the filename #{binary.img}# instead of #{binary-hybrid.iso}#."
msgstr ""
"La imagen binaria generada contiene una partición VFAT y el gestor de "
"arranque syslinux, lista para ser copiada directamente en un dispositivo "
@@ -767,64 +794,46 @@ msgstr ""
"teclee:"
#. type: Plain text
-#: en/user_basics.ssi:181
-#, no-wrap
-msgid " $ dd if=binary.img of=${USBSTICK}\n"
-msgstr " $ dd if=binary.img of=${USBSTICK}\n"
-
-#. type: Plain text
-#: en/user_basics.ssi:185
-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 "
-"looking in #{dmesg}#'s output after plugging in the stick, for example, or "
-"better yet, #{ls -l /dev/disk/by-id}#."
-msgstr ""
-"Siendo #{${USBSTICK}}# la ubicación del dispositivo, como #{/dev/sdb}# "
-"(ATENCIÓN: no es una partición como #{/dev/sdb1}# sino todo el dispositivo "
-"completo). Una vez conectado el dispositivo, se puede encontrar su nombre "
-"correcto utilizando mediante la orden #{dmesg}#, o incluso mejor mediante la "
-"orden #{ls -l /dev/disk/by-id}#."
-
-#. type: Plain text
-#: en/user_basics.ssi:189
-msgid ""
-"Note: As discussed earlier, this same process can be used for #{iso-hybrid}# "
-"type images (suffixed #{-hybrid.iso}#), but not #{iso}# type images."
-msgstr ""
-"Nota: Como se mencionó anteriormente, este mismo proceso se puede utilizar "
-"para imágenes #{iso-hybrid}# (con sufijo #{-hybrid.iso}#), pero no imágenes "
-"tipo #{iso}#."
-
-#. type: Plain text
-#: en/user_basics.ssi:191
+#: en/user_basics.ssi:178
msgid "3~testing-usb-hdd-with-qemu Testing a USB/HDD image with Qemu"
msgstr "3~testing-usb-hdd-with-qemu Probar una imágen USB/HDD con Qemu"
#. type: Plain text
-#: en/user_basics.ssi:195
-#, no-wrap
-msgid " # apt-get install qemu\n"
-msgstr " # apt-get install qemu\n"
+#: en/user_basics.ssi:180
+msgid ""
+"First, install QEMU as described above in #{Testing an ISO image with QEMU}"
+"#testing-iso-with-qemu. Then run #{kvm}# or #{qemu}#, depending on which "
+"version your host system needs, specifying #{binary.img}# as the first hard "
+"drive."
+msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:197
-#, no-wrap
-msgid " $ qemu -hda binary.img\n"
+#: en/user_basics.ssi:184
+#, fuzzy, no-wrap
+#| msgid " $ qemu -hda binary.img\n"
+msgid " $ kvm -hda binary.img\n"
msgstr " $ qemu -hda binary.img\n"
#. type: Plain text
-#: en/user_basics.ssi:201
-msgid "3~ Using the space left on a USB stick"
+#: en/user_basics.ssi:188
+#, fuzzy
+#| msgid "3~ Using the space left on a USB stick"
+msgid "3~using-usb-extra-space Using the space left on a USB stick"
msgstr "3~ Cómo usar el espacio que queda libre en el dispositivo USB"
#. type: Plain text
-#: en/user_basics.ssi:203
+#: en/user_basics.ssi:190
+#, fuzzy
+#| 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."
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."
+"To use the remaining free space after copying #{binary.img}# to a USB stick, "
+"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 ""
"Si se desea usar el espacio libre después de haber instalado la imagen "
"binary.img, se puede usar un programa de particionado como #{gparted}# o #"
@@ -832,52 +841,56 @@ msgstr ""
"partición será usada por el sistema Debian en vivo."
#. type: Plain text
-#: en/user_basics.ssi:207
+#: en/user_basics.ssi:194
#, no-wrap
msgid " # gparted ${USBSTICK}\n"
msgstr " # gparted ${USBSTICK}\n"
#. type: Plain text
-#: en/user_basics.ssi:211
+#: en/user_basics.ssi:198
+#, fuzzy
+#| msgid ""
+#| "After the creation of the partition, where #{${PARTITION}}# is the name "
+#| "of the partition, like #{/dev/sdb2}#, you have to create a filesystem on "
+#| "it. One possible choice would be ext4."
msgid ""
-"After the creation of the partition, where #{${PARTITION}}# is the name of "
-"the partition, like #{/dev/sdb2}#, you have to create a filesystem on it. "
-"One possible choice would be ext4."
+"After the partition is created, where #{${PARTITION}}# is the name of the "
+"partition, such as #{/dev/sdb2}#, you have to create a filesystem on it. One "
+"possible choice would be ext4."
msgstr ""
"Después de la creación de la partición, siendo #{${PARTITION}}# el nombre de "
"la partición (por ejemplo #{/dev/sdb2}# ),se tiene que crear un sistema de "
"ficheros en él. Una opción posible sería ext4."
#. type: Plain text
-#: en/user_basics.ssi:215
+#: en/user_basics.ssi:202
#, no-wrap
msgid " # mkfs.ext4 ${PARTITION}\n"
msgstr " # mkfs.ext4 ${PARTITION}\n"
#. type: Plain text
-#: en/user_basics.ssi:219
-msgid "If you want to use this data partition with Windows, use FAT32."
-msgstr "Si se desea usar los datos de esta partición con Windows, usar FAT32."
-
-#. type: Plain text
-#: en/user_basics.ssi:223
-#, no-wrap
-msgid " # mkfs.vfat -F 32\n"
-msgstr " # mkfs.vfat -F 32\n"
+#: en/user_basics.ssi:206
+msgid ""
+"Note: If you want to use the extra space with Windows, apparently that OS "
+"cannot normally access any partitions but the first. Some solutions to this "
+"problem have been discussed on our #{mailing list}#contact, but it seems "
+"there are no easy answers."
+msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:227
-#, no-wrap
-msgid "*{Remember: Every time you install a new binary.img on the stick, all data on the stick will be lost because the partition table is overwritten by the contents of the image.}*\n"
+#: en/user_basics.ssi:208
+#, fuzzy, no-wrap
+#| msgid "*{Remember: Every time you install a new binary.img on the stick, all data on the stick will be lost because the partition table is overwritten by the contents of the image.}*\n"
+msgid "*{Remember: Every time you install a new binary.img on the stick, all data on the stick will be lost because the partition table is overwritten by the contents of the image, so back up your extra partition first to restore again after updating the live image.}*\n"
msgstr "*{Recordar: Cada vez que se instale una nueva binary.img en el dispositivo, todos los datos del dispositivo se perderán debido a que la tabla de particiones se sobrescribe con el contenido de la imagen.}*\n"
#. type: Plain text
-#: en/user_basics.ssi:229
+#: en/user_basics.ssi:210
msgid "2~building-netboot-image Building a netboot image"
msgstr "2~building-netboot-image Creación de una imagen de arranque en red"
#. type: Plain text
-#: en/user_basics.ssi:231
+#: en/user_basics.ssi:212
msgid ""
"The following sequence of commands will create a basic netboot image "
"containing the Debian standard system without X.org. It is suitable for "
@@ -888,7 +901,7 @@ msgstr ""
"para el arranque en red."
#. type: Plain text
-#: en/user_basics.ssi:233
+#: en/user_basics.ssi:214
msgid ""
"Note: if you performed any previous examples, you will need to clean up your "
"working directory with the #{lb clean}# command:"
@@ -897,7 +910,7 @@ msgstr ""
"limpiar el directorio de trabajo con el comando #{lb clean}#:"
#. type: Plain text
-#: en/user_basics.ssi:241
+#: en/user_basics.ssi:222
msgid ""
"Run the #{lb config}# command as follows to configure your image for "
"netbooting:"
@@ -906,13 +919,13 @@ msgstr ""
"imagen de arranque en red:"
#. type: Plain text
-#: en/user_basics.ssi:245
+#: en/user_basics.ssi:226
#, no-wrap
msgid " $ lb config -b net --net-root-path \"/srv/debian-live\" --net-root-server \"192.168.0.1\"\n"
msgstr " $ lb config -b net --net-root-path \"/srv/debian-live\" --net-root-server \"192.168.0.1\"\n"
#. type: Plain text
-#: en/user_basics.ssi:249
+#: en/user_basics.ssi:230
msgid ""
"In contrast with the ISO and USB/HDD images, netbooting does not, itself, "
"serve the filesystem image to the client, so the files must be served via "
@@ -930,7 +943,7 @@ msgstr ""
"los valores adecuados para la red y el servidor deseados."
#. type: Plain text
-#: en/user_basics.ssi:259
+#: en/user_basics.ssi:240
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 "
@@ -948,7 +961,7 @@ msgstr ""
"sistema operativo como Linux."
#. type: Plain text
-#: en/user_basics.ssi:261
+#: en/user_basics.ssi:242
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 #"
@@ -961,7 +974,7 @@ msgstr ""
"arranque pxelinux en #{tftpboot/debian-live/i386}#."
#. type: Plain text
-#: en/user_basics.ssi:263
+#: en/user_basics.ssi:244
msgid ""
"We must now configure three services on the server to enable netboot: the "
"DHCP server, the TFTP server and the NFS server."
@@ -970,12 +983,12 @@ msgstr ""
"red: el servidor DHCP, el servidor TFTP y el servidor NFS."
#. type: Plain text
-#: en/user_basics.ssi:265
+#: en/user_basics.ssi:246
msgid "3~ DHCP server"
msgstr "3~ Servidor DHCP"
#. type: Plain text
-#: en/user_basics.ssi:267
+#: en/user_basics.ssi:248
msgid ""
"We must configure our network's DHCP server to be sure to give an IP address "
"to the netbooting client system, and to advertise the location of the PXE "
@@ -986,7 +999,7 @@ msgstr ""
"arranque PXE."
#. type: Plain text
-#: en/user_basics.ssi:269
+#: en/user_basics.ssi:250
msgid ""
"Here is an example for inspiration, written for the ISC DHCP server #{isc-"
"dhcp-server}# in the #{/etc/dhcp/dhcpd.conf}# configuration file:"
@@ -996,19 +1009,19 @@ msgstr ""
"dhcp/dhcpd.conf}#:"
#. type: Plain text
-#: en/user_basics.ssi:273
+#: en/user_basics.ssi:254
#, no-wrap
msgid " # /etc/dhcp/dhcpd.conf - configuration file for isc-dhcp-server\n"
msgstr " # /etc/dhcp/dhcpd.conf - fichero de configuración para isc-dhcp-server\n"
#. type: Plain text
-#: en/user_basics.ssi:275
+#: en/user_basics.ssi:256
#, no-wrap
msgid " ddns-update-style none;\n"
msgstr " ddns-update-style none;\n"
#. type: Plain text
-#: en/user_basics.ssi:278
+#: en/user_basics.ssi:259
#, no-wrap
msgid ""
" option domain-name \"example.org\";\n"
@@ -1018,7 +1031,7 @@ msgstr ""
" option domain-name-servers ns1.example.org, ns2.example.org;\n"
#. type: Plain text
-#: en/user_basics.ssi:281
+#: en/user_basics.ssi:262
#, no-wrap
msgid ""
" default-lease-time 600;\n"
@@ -1028,13 +1041,13 @@ msgstr ""
" max-lease-time 7200;\n"
#. type: Plain text
-#: en/user_basics.ssi:283
+#: en/user_basics.ssi:264
#, no-wrap
msgid " log-facility local7;\n"
msgstr " log-facility local7;\n"
#. type: Plain text
-#: en/user_basics.ssi:289
+#: en/user_basics.ssi:270
#, no-wrap
msgid ""
" subnet 192.168.0.0 netmask 255.255.255.0 {\n"
@@ -1050,18 +1063,18 @@ msgstr ""
"}\n"
#. type: Plain text
-#: en/user_basics.ssi:293
+#: en/user_basics.ssi:274
msgid "3~ TFTP server"
msgstr "3~ Servidor TFTP"
#. type: Plain text
-#: en/user_basics.ssi:295
+#: en/user_basics.ssi:276
msgid "This serves the kernel and initial ramdisk to the system at run time."
msgstr ""
"Se encarga de suministrar el kernel y el Disco RAM inicial para el sistema."
#. type: Plain text
-#: en/user_basics.ssi:297
+#: en/user_basics.ssi:278
msgid ""
"You should install the tftpd-hpa package. It can serve all files contained "
"inside a root directory, usually #{/srv/tftp}#. To let it serve files inside "
@@ -1073,23 +1086,23 @@ msgstr ""
"#, se debe ejecutar el siguiente comando con privilegios de superusuario:"
#. type: Plain text
-#: en/user_basics.ssi:301
+#: en/user_basics.ssi:282
#, no-wrap
msgid " # dpkg-reconfigure -plow tftpd-hpa\n"
msgstr " # dpkg-reconfigure -plow tftpd-hpa\n"
#. type: Plain text
-#: en/user_basics.ssi:305
+#: en/user_basics.ssi:286
msgid "and fill in the new tftp server directory when being asked about it."
msgstr "y llenar el directorio del nuevo servidor tftp cuando sea requerido."
#. type: Plain text
-#: en/user_basics.ssi:307
+#: en/user_basics.ssi:288
msgid "3~ NFS server"
msgstr "3~ Servidor NFS "
#. type: Plain text
-#: en/user_basics.ssi:309
+#: en/user_basics.ssi:290
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 "
@@ -1100,12 +1113,12 @@ msgstr ""
"través de un servidor NFS."
#. type: Plain text
-#: en/user_basics.ssi:311
+#: en/user_basics.ssi:292
msgid "You need to install the #{nfs-kernel-server}# package."
msgstr "Se debe instalar el paquete #{nfs-kernel-server}#."
#. type: Plain text
-#: en/user_basics.ssi:313
+#: en/user_basics.ssi:294
msgid ""
"Then, make the filesystem image available through NFS by adding a line like "
"the following to #{/etc/exports}#:"
@@ -1115,13 +1128,13 @@ msgstr ""
"exports}#:"
#. type: Plain text
-#: en/user_basics.ssi:317
+#: en/user_basics.ssi:298
#, no-wrap
msgid " /srv/debian-live *(ro,async,no_root_squash,no_subtree_check)\n"
msgstr " /srv/debian-live *(ro,async,no_root_squash,no_subtree_check)\n"
#. type: Plain text
-#: en/user_basics.ssi:321
+#: en/user_basics.ssi:302
msgid ""
"and tell the NFS server about this new export with the following command:"
msgstr ""
@@ -1129,13 +1142,13 @@ msgstr ""
"comando:"
#. type: Plain text
-#: en/user_basics.ssi:325
+#: en/user_basics.ssi:306
#, no-wrap
msgid " # exportfs -rv\n"
msgstr " # exportfs -rv\n"
#. type: Plain text
-#: en/user_basics.ssi:329
+#: en/user_basics.ssi:310
msgid ""
"Setting up these three services can be a little tricky. You might need some "
"patience to get all of them working together. For more information, see the "
@@ -1153,12 +1166,12 @@ msgstr ""
"similares."
#. type: Plain text
-#: en/user_basics.ssi:331
+#: en/user_basics.ssi:312
msgid "3~ Netboot testing HowTo"
msgstr "3~ Cómo probar el arranque en red"
#. type: Plain text
-#: en/user_basics.ssi:333
+#: en/user_basics.ssi:314
msgid ""
"Netboot image creation is made easy with live-build magic, but testing the "
"images on physical machines can be really time consuming."
@@ -1168,7 +1181,7 @@ msgstr ""
"proceso mucho más lento."
#. type: Plain text
-#: en/user_basics.ssi:335
+#: en/user_basics.ssi:316
msgid ""
"To make our life easier, we can use virtualization. There are two solutions."
msgstr ""
@@ -1176,22 +1189,22 @@ msgstr ""
"dos soluciones."
#. type: Plain text
-#: en/user_basics.ssi:337
+#: en/user_basics.ssi:318
msgid "3~ Qemu"
msgstr "3~ Qemu"
#. type: Plain text
-#: en/user_basics.ssi:339
+#: en/user_basics.ssi:320
msgid "_* Install #{qemu}#, #{bridge-utils}#, #{sudo}#."
msgstr "_* Install #{qemu}#, #{bridge-utils}#, #{sudo}#."
#. type: Plain text
-#: en/user_basics.ssi:341
+#: en/user_basics.ssi:322
msgid "Edit #{/etc/qemu-ifup}#:"
msgstr "Se debe editar el fichero #{/etc/qemu-ifup}#:"
#. type: Plain text
-#: en/user_basics.ssi:352
+#: en/user_basics.ssi:333
#, no-wrap
msgid ""
" #!/bin/sh\n"
@@ -1213,29 +1226,29 @@ msgstr ""
" sleep 2\n"
#. type: Plain text
-#: en/user_basics.ssi:356
+#: en/user_basics.ssi:337
msgid "Get, or build a #{grub-floppy-netboot}# (in the svn)."
msgstr "Obtener o crear un #{grub-floppy-netboot}# (en el svn)."
#. type: Plain text
-#: en/user_basics.ssi:358
+#: en/user_basics.ssi:339
msgid ""
"Launch #{qemu}# with \"#{-net nic,vlan=0 -net tap,vlan=0,ifname=tun0}#\""
msgstr ""
"Lanzar #{qemu}# con \"#{-net nic,vlan=0 -net tap,vlan=0,ifname=tun0}#\""
#. type: Plain text
-#: en/user_basics.ssi:360
+#: en/user_basics.ssi:341
msgid "3~ VMWare Player"
msgstr "3~ VMWare Player"
#. type: Plain text
-#: en/user_basics.ssi:362
+#: en/user_basics.ssi:343
msgid "_* Install VMWare Player (\"free as in beer\" edition)"
msgstr "_* Instalar VMWare Player (Edición gratuita \"free as in beer\")"
#. type: Plain text
-#: en/user_basics.ssi:364
+#: en/user_basics.ssi:345
msgid ""
"_* Create a PXETester directory, and create a text file called #{pxe.vwx}# "
"inside"
@@ -1244,12 +1257,12 @@ msgstr ""
"{pxe.vwx}#"
#. type: Plain text
-#: en/user_basics.ssi:366
+#: en/user_basics.ssi:347
msgid "_* Paste this text inside:"
msgstr "_* Copiar este texto dentro:"
#. type: Plain text
-#: en/user_basics.ssi:374
+#: en/user_basics.ssi:355
#, no-wrap
msgid ""
" #!/usr/bin/vmware\n"
@@ -1265,7 +1278,7 @@ msgstr ""
" MemAllowAutoScaleDown = \"FALSE\"\n"
#. type: Plain text
-#: en/user_basics.ssi:380
+#: en/user_basics.ssi:361
#, no-wrap
msgid ""
" ide0:0.present = \"FALSE\"\n"
@@ -1281,7 +1294,7 @@ msgstr ""
" tools.remindInstall = \"FALSE\"\n"
#. type: Plain text
-#: en/user_basics.ssi:383
+#: en/user_basics.ssi:364
#, no-wrap
msgid ""
" ethernet0.present = \"TRUE\"\n"
@@ -1291,7 +1304,7 @@ msgstr ""
" ethernet0.addressType = \"generated\"\n"
#. type: Plain text
-#: en/user_basics.ssi:386
+#: en/user_basics.ssi:367
#, no-wrap
msgid ""
" displayName = \"Test Boot PXE\"\n"
@@ -1301,7 +1314,7 @@ msgstr ""
" guestOS = \"other\"\n"
#. type: Plain text
-#: en/user_basics.ssi:391
+#: en/user_basics.ssi:372
#, no-wrap
msgid ""
" ethernet0.generatedAddress = \"00:0c:29:8d:71:3b\"\n"
@@ -1315,7 +1328,7 @@ msgstr ""
" ethernet0.generatedAddressOffset = \"0\"\n"
#. type: Plain text
-#: en/user_basics.ssi:395
+#: en/user_basics.ssi:376
msgid ""
"_* You can play with this configuration file (e.g. change memory limit to "
"256)"
@@ -1324,7 +1337,7 @@ msgstr ""
"cambiar el limite de memoria a 256)"
#. type: Plain text
-#: en/user_basics.ssi:397
+#: en/user_basics.ssi:378
msgid ""
"_* Double click on this file (or run VMWare player and select this file)."
msgstr ""
@@ -1332,7 +1345,7 @@ msgstr ""
"este fichero)."
#. type: Plain text
-#: en/user_basics.ssi:398
+#: en/user_basics.ssi:379
msgid "_* When running just press space if that strange question comes up..."
msgstr ""
"_* Mientras esté en ejecución solo hay que pulsar espacio si surge esa "
diff --git a/manual/po/es/user_examples.ssi.po b/manual/po/es/user_examples.ssi.po
index daa0dfc..df21b7c 100644
--- a/manual/po/es/user_examples.ssi.po
+++ b/manual/po/es/user_examples.ssi.po
@@ -9,7 +9,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-12-19 20:37-0400\n"
+"POT-Creation-Date: 2011-03-18 07:39-0200\n"
"PO-Revision-Date: 2011-03-13 14:04+0100\n"
"Last-Translator: José Luis Zabalza and Carlos Zuferri «chals» "
"<jlz.3008 at gmail.com> <chals at altorricon.com>\n"
@@ -29,21 +29,21 @@ msgstr ":B~ Ejemplos"
#. type: Plain text
#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
-#: en/about_manual.ssi:170 en/project_bugs.ssi:58
+#: en/about_manual.ssi:146 en/about_manual.ssi:157 en/about_manual.ssi:165
+#: en/about_manual.ssi:173 en/project_bugs.ssi:60
#: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
#: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
#: en/project_procedures.ssi:58 en/user_basics.ssi:30 en/user_basics.ssi:40
-#: en/user_basics.ssi:52 en/user_basics.ssi:64 en/user_basics.ssi:76
-#: en/user_basics.ssi:86 en/user_basics.ssi:100 en/user_basics.ssi:108
-#: en/user_basics.ssi:116 en/user_basics.ssi:126 en/user_basics.ssi:140
-#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
-#: en/user_basics.ssi:182 en/user_basics.ssi:190 en/user_basics.ssi:200
-#: en/user_basics.ssi:218 en/user_basics.ssi:246 en/user_basics.ssi:262
-#: en/user_basics.ssi:270 en/user_basics.ssi:290 en/user_basics.ssi:315
+#: en/user_basics.ssi:56 en/user_basics.ssi:71 en/user_basics.ssi:106
+#: en/user_basics.ssi:114 en/user_basics.ssi:126 en/user_basics.ssi:138
+#: en/user_basics.ssi:150 en/user_basics.ssi:158 en/user_basics.ssi:166
+#: en/user_basics.ssi:182 en/user_basics.ssi:192 en/user_basics.ssi:200
+#: en/user_basics.ssi:216 en/user_basics.ssi:224 en/user_basics.ssi:234
+#: en/user_basics.ssi:252 en/user_basics.ssi:280 en/user_basics.ssi:296
+#: en/user_basics.ssi:304 en/user_basics.ssi:324 en/user_basics.ssi:349
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
@@ -69,7 +69,7 @@ msgstr ":B~ Ejemplos"
#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
-#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:106
+#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:105
#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
#: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
@@ -93,21 +93,21 @@ msgstr "code{"
#. type: Plain text
#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
-#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
-#: en/about_manual.ssi:174 en/project_bugs.ssi:62
+#: en/about_manual.ssi:151 en/about_manual.ssi:161 en/about_manual.ssi:169
+#: en/about_manual.ssi:177 en/project_bugs.ssi:64
#: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
#: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
#: en/project_procedures.ssi:131 en/user_basics.ssi:34 en/user_basics.ssi:44
-#: en/user_basics.ssi:58 en/user_basics.ssi:70 en/user_basics.ssi:80
-#: en/user_basics.ssi:92 en/user_basics.ssi:104 en/user_basics.ssi:112
-#: en/user_basics.ssi:120 en/user_basics.ssi:130 en/user_basics.ssi:146
-#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
-#: en/user_basics.ssi:186 en/user_basics.ssi:194 en/user_basics.ssi:204
-#: en/user_basics.ssi:238 en/user_basics.ssi:250 en/user_basics.ssi:266
-#: en/user_basics.ssi:274 en/user_basics.ssi:301 en/user_basics.ssi:340
+#: en/user_basics.ssi:62 en/user_basics.ssi:75 en/user_basics.ssi:110
+#: en/user_basics.ssi:118 en/user_basics.ssi:132 en/user_basics.ssi:142
+#: en/user_basics.ssi:154 en/user_basics.ssi:162 en/user_basics.ssi:170
+#: en/user_basics.ssi:186 en/user_basics.ssi:196 en/user_basics.ssi:204
+#: en/user_basics.ssi:220 en/user_basics.ssi:228 en/user_basics.ssi:238
+#: en/user_basics.ssi:272 en/user_basics.ssi:284 en/user_basics.ssi:300
+#: en/user_basics.ssi:308 en/user_basics.ssi:335 en/user_basics.ssi:374
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:37
@@ -129,11 +129,11 @@ msgstr "code{"
#: en/user_customization-packages.ssi:307
#: en/user_customization-packages.ssi:317
#: en/user_customization-packages.ssi:344
-#: en/user_customization-packages.ssi:354 en/user_customization-runtime.ssi:18
+#: en/user_customization-packages.ssi:353 en/user_customization-runtime.ssi:18
#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
-#: en/user_customization-runtime.ssi:102 en/user_customization-runtime.ssi:111
+#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:110
#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
#: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
#: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
@@ -146,7 +146,7 @@ msgstr "code{"
#: en/user_installation.ssi:70 en/user_installation.ssi:78
#: en/user_installation.ssi:86 en/user_installation.ssi:94
#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_installation.ssi:150 en/user_managing_a_configuration.ssi:31
+#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
@@ -155,7 +155,7 @@ msgid "}code"
msgstr "}code"
#. type: Plain text
-#: en/user_basics.ssi:42 en/user_basics.ssi:118 en/user_basics.ssi:202
+#: en/user_basics.ssi:42 en/user_basics.ssi:168 en/user_basics.ssi:236
#: en/user_examples.ssi:109 en/user_examples.ssi:208
#, no-wrap
msgid " # lb build\n"
@@ -293,6 +293,16 @@ msgstr " # lb build 2>&1 | tee binary.log\n"
#. type: Plain text
#: en/user_examples.ssi:46
+#, fuzzy
+#| msgid ""
+#| "Assuming all goes well, after a while, the current directory will contain "
+#| "#{binary-hybrid.iso}#. This ISO hybrid image can be booted directly in a "
+#| "virtual machine as described in {Testing an ISO image with Qemu}#testing-"
+#| "iso-with-qemu and {Testing an ISO image with virtualbox-ose}#testing-iso-"
+#| "with-virtualbox, or else imaged onto optical media or a USB flash device "
+#| "as described in {Burning an ISO image to a physical medium}#burning-iso-"
+#| "image and {Copying USB/HDD image to a USB stick}#copying-usb-hdd-image, "
+#| "respectively."
msgid ""
"Assuming all goes well, after a while, the current directory will contain #"
"{binary-hybrid.iso}#. This ISO hybrid image can be booted directly in a "
@@ -300,7 +310,7 @@ msgid ""
"with-qemu and {Testing an ISO image with virtualbox-ose}#testing-iso-with-"
"virtualbox, or else imaged onto optical media or a USB flash device as "
"described in {Burning an ISO image to a physical medium}#burning-iso-image "
-"and {Copying USB/HDD image to a USB stick}#copying-usb-hdd-image, "
+"and {Copying an ISO hybrid image to a USB stick}#copying-iso-hybrid-to-usb, "
"respectively."
msgstr ""
"Suponiendo que todo va bien, después de un rato, el directorio actual "
@@ -951,7 +961,7 @@ msgstr ""
" --packages debian-installer-launcher\n"
#. type: Plain text
-#: en/user_examples.ssi:299
+#: en/user_examples.ssi:298
msgid ""
"Note that we have included the #{debian-installer-launcher}# package to "
"launch the installer from the live desktop, and have also specified the 486 "
diff --git a/manual/po/fr/live-manual.ssm.po b/manual/po/fr/live-manual.ssm.po
index 630c529..b95288b 100644
--- a/manual/po/fr/live-manual.ssm.po
+++ b/manual/po/fr/live-manual.ssm.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-03-17 18:01-0200\n"
+"POT-Creation-Date: 2011-03-18 07:39-0200\n"
"PO-Revision-Date: 2010-10-21 07:06-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -45,7 +45,7 @@ msgstr ""
#, no-wrap
msgid ""
"@date:\n"
-" :published: 2011-03-17\n"
+" :published: 2011-03-18\n"
msgstr ""
#. type: Plain text
diff --git a/manual/po/fr/user_basics.ssi.po b/manual/po/fr/user_basics.ssi.po
index dce918d..b10ad18 100644
--- a/manual/po/fr/user_basics.ssi.po
+++ b/manual/po/fr/user_basics.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-03-17 18:01-0200\n"
+"POT-Creation-Date: 2011-03-18 07:39-0200\n"
"PO-Revision-Date: 2010-10-20 06:53-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -27,14 +27,13 @@ msgstr ""
#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
#: en/project_procedures.ssi:58 en/user_basics.ssi:30 en/user_basics.ssi:40
-#: en/user_basics.ssi:56 en/user_basics.ssi:72 en/user_basics.ssi:107
-#: en/user_basics.ssi:115 en/user_basics.ssi:127 en/user_basics.ssi:139
-#: en/user_basics.ssi:151 en/user_basics.ssi:159 en/user_basics.ssi:167
-#: en/user_basics.ssi:179 en/user_basics.ssi:193 en/user_basics.ssi:205
-#: en/user_basics.ssi:213 en/user_basics.ssi:221 en/user_basics.ssi:235
-#: en/user_basics.ssi:243 en/user_basics.ssi:253 en/user_basics.ssi:271
-#: en/user_basics.ssi:299 en/user_basics.ssi:315 en/user_basics.ssi:323
-#: en/user_basics.ssi:343 en/user_basics.ssi:368
+#: en/user_basics.ssi:56 en/user_basics.ssi:71 en/user_basics.ssi:106
+#: en/user_basics.ssi:114 en/user_basics.ssi:126 en/user_basics.ssi:138
+#: en/user_basics.ssi:150 en/user_basics.ssi:158 en/user_basics.ssi:166
+#: en/user_basics.ssi:182 en/user_basics.ssi:192 en/user_basics.ssi:200
+#: en/user_basics.ssi:216 en/user_basics.ssi:224 en/user_basics.ssi:234
+#: en/user_basics.ssi:252 en/user_basics.ssi:280 en/user_basics.ssi:296
+#: en/user_basics.ssi:304 en/user_basics.ssi:324 en/user_basics.ssi:349
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
@@ -92,14 +91,13 @@ msgstr "code{"
#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
#: en/project_procedures.ssi:131 en/user_basics.ssi:34 en/user_basics.ssi:44
-#: en/user_basics.ssi:62 en/user_basics.ssi:76 en/user_basics.ssi:111
-#: en/user_basics.ssi:119 en/user_basics.ssi:133 en/user_basics.ssi:143
-#: en/user_basics.ssi:155 en/user_basics.ssi:163 en/user_basics.ssi:171
-#: en/user_basics.ssi:183 en/user_basics.ssi:199 en/user_basics.ssi:209
-#: en/user_basics.ssi:217 en/user_basics.ssi:225 en/user_basics.ssi:239
-#: en/user_basics.ssi:247 en/user_basics.ssi:257 en/user_basics.ssi:291
-#: en/user_basics.ssi:303 en/user_basics.ssi:319 en/user_basics.ssi:327
-#: en/user_basics.ssi:354 en/user_basics.ssi:393
+#: en/user_basics.ssi:62 en/user_basics.ssi:75 en/user_basics.ssi:110
+#: en/user_basics.ssi:118 en/user_basics.ssi:132 en/user_basics.ssi:142
+#: en/user_basics.ssi:154 en/user_basics.ssi:162 en/user_basics.ssi:170
+#: en/user_basics.ssi:186 en/user_basics.ssi:196 en/user_basics.ssi:204
+#: en/user_basics.ssi:220 en/user_basics.ssi:228 en/user_basics.ssi:238
+#: en/user_basics.ssi:272 en/user_basics.ssi:284 en/user_basics.ssi:300
+#: en/user_basics.ssi:308 en/user_basics.ssi:335 en/user_basics.ssi:374
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:37
@@ -174,7 +172,7 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:8
-msgid "2~ What is a live system?"
+msgid "2~what-is-live What is a live system?"
msgstr ""
#. type: Plain text
@@ -242,7 +240,7 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:24
-msgid "2~ First steps: building an ISO hybrid image"
+msgid "2~building-iso-hybrid First steps: building an ISO hybrid image"
msgstr ""
#. type: Plain text
@@ -284,7 +282,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:42 en/user_basics.ssi:169 en/user_basics.ssi:255
+#: en/user_basics.ssi:42 en/user_basics.ssi:168 en/user_basics.ssi:236
#: en/user_examples.ssi:109 en/user_examples.ssi:208
#, no-wrap
msgid " # lb build\n"
@@ -300,7 +298,7 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:48
-msgid "2~ Using an ISO hybrid live image"
+msgid "2~using-iso-hybrid Using an ISO hybrid live image"
msgstr ""
#. type: Plain text
@@ -343,41 +341,36 @@ msgstr ""
#: en/user_basics.ssi:66
msgid ""
"ISO images prepared with the #{isohybrid}# command, like the images produced "
-"by live-build's default #{iso-hybrid}# binary image type, can be copied to a "
-"USB stick and directly booted without further steps. Plug in a USB stick "
-"with a size larger than that of #{binary-hybrid.iso}# and determine which "
-"device it is, which we hereafter refer to as #{${USBSTICK}}#. This is the "
-"device file of your key, such as #{/dev/sdb}#, not a partition, such as #{/"
-"dev/sdb1}#! You can find the right device name by looking in #{dmesg}#'s "
-"output after plugging in the stick, or better yet, #{ls -l /dev/disk/by-id}#."
+"by the default #{iso-hybrid}# binary image type, can be simply copied to a "
+"USB stick with the #{dd}# program or an equivalent. Plug in a USB stick with "
+"a size larger than that of #{binary-hybrid.iso}# and determine which device "
+"it is, which we hereafter refer to as #{${USBSTICK}}#. This is the device "
+"file of your key, such as #{/dev/sdb}#, not a partition, such as #{/dev/sdb1}"
+"#! You can find the right device name by looking in #{dmesg}#'s output after "
+"plugging in the stick, or better yet, #{ls -l /dev/disk/by-id}#."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:68 en/user_basics.ssi:187
-#, no-wrap
-msgid "*{This will definitely overwrite any previous contents on your stick!}*\n"
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:70
+#: en/user_basics.ssi:69
msgid ""
"Once you are certain you have the correct device name, use the #{dd}# "
-"command to copy the image to the stick as follows:"
+"command to copy the image to the stick. *{This will definitely overwrite "
+"any previous contents on your stick!}*"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:74
+#: en/user_basics.ssi:73
#, no-wrap
msgid " $ dd if=binary-hybrid.iso of=${USBSTICK}\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:79
-msgid "3~ Booting the live media"
+#: en/user_basics.ssi:78
+msgid "3~booting-live-media Booting the live media"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:81
+#: en/user_basics.ssi:80
msgid ""
"The first time you boot your live media, whether CD, DVD, USB key, or PXE "
"boot, some setup in your computer's BIOS may be needed first. Since BIOSes "
@@ -390,7 +383,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:83
+#: en/user_basics.ssi:82
msgid ""
"Once you've booted the media, you are presented with a boot menu. If you "
"just press enter here, the system will boot using the default entry, #{Live}"
@@ -400,7 +393,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:85
+#: en/user_basics.ssi:84
msgid ""
"Assuming you've selected #{Live}# and booted a default desktop live image, "
"after the boot messages scroll by, you should be automatically logged into "
@@ -411,59 +404,59 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:87
-msgid "2~ Using a virtual machine for testing"
+#: en/user_basics.ssi:86
+msgid "2~using-virtual-machine Using a virtual machine for testing"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:89
+#: en/user_basics.ssi:88
msgid ""
"It can be a great time-saver for the development of live images to run them "
"in a virtual machine (VM). This is not without its caveats:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:91
+#: en/user_basics.ssi:90
msgid ""
"_* Running a VM requires enough RAM for both the guest OS and the host and a "
"CPU with hardware support for virtualization is recommended."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:93
+#: en/user_basics.ssi:92
msgid ""
"_* There are some inherent limitations to running on a VM, e.g. poor video "
"performance, limited choice of emulated hardware."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:95
+#: en/user_basics.ssi:94
msgid ""
"_* When developing for specific hardware, there is no substitute for running "
"on the hardware itself."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:97
+#: en/user_basics.ssi:96
msgid ""
"_* Occasionally there are bugs that relate only to running in a VM. When in "
"doubt, test your image directly on the hardware."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:99
+#: en/user_basics.ssi:98
msgid ""
"Provided you can work within these constraints, survey the available VM "
"software and choose one that is suitable for your needs."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:101
+#: en/user_basics.ssi:100
msgid "3~testing-iso-with-qemu Testing an ISO image with QEMU"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:103
+#: en/user_basics.ssi:102
msgid ""
"The most versatile VM in Debian is QEMU. If your processor has hardware "
"support for virtualization, use the #{qemu-kvm}# package; the #{qemu-kvm}# "
@@ -471,7 +464,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:105
+#: en/user_basics.ssi:104
msgid ""
"First, install #{qemu-kvm}# if your processor supports it. If not, install #"
"{qemu}#, in which case the program name is #{qemu}# instead of #{kvm}# in "
@@ -480,58 +473,58 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:109
+#: en/user_basics.ssi:108
#, no-wrap
msgid " # apt-get install qemu-kvm qemu-utils\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:113
+#: en/user_basics.ssi:112
msgid "Booting an ISO image is simple:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:117
+#: en/user_basics.ssi:116
#, no-wrap
msgid " $ kvm -cdrom binary-hybrid.iso\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:121
+#: en/user_basics.ssi:120
msgid "See the man pages for more details."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:123
+#: en/user_basics.ssi:122
msgid "3~testing-iso-with-virtualbox Testing an ISO image with virtualbox-ose"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:125
+#: en/user_basics.ssi:124
msgid "In order to test the ISO with virtualbox-ose:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:129
+#: en/user_basics.ssi:128
#, no-wrap
msgid " # apt-get install virtualbox-ose virtualbox-ose-dkms\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:131
+#: en/user_basics.ssi:130
#, no-wrap
msgid " $ virtualbox\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:135
+#: en/user_basics.ssi:134
msgid ""
"Create a new virtual machine, change the storage settings to use binary-"
"hybrid.iso as the CD/DVD device, and start the machine."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:137
+#: en/user_basics.ssi:136
msgid ""
"Note: For live systems containing X.org that you want to test with #"
"{virtualbox-ose}#, you may wish to include the VirtualBox X.org driver "
@@ -540,177 +533,159 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:141
+#: en/user_basics.ssi:140
#, no-wrap
msgid " $ lb config --packages virtualbox-ose-guest-x11\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:145
-msgid "2~ Building a USB/HDD image"
+#: en/user_basics.ssi:144
+msgid "2~building-usb-hdd Building a USB/HDD image"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:147
+#: en/user_basics.ssi:146
msgid ""
-"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. Normally, an ISO hybrid image can be used for this purpose instead, "
-"but if you have a BIOS which does not handle hybrid images properly, or want "
-"to use the remaining space on the media for a persistence partition, you "
-"need a USB/HDD image."
+"Building a USB/HDD image is similar to ISO hybrid in all respects except you "
+"specify #{--b usb-hdd}# and the resulting filename is #{binary.img}# which "
+"cannot be burnt to optical media. It is suitable for booting from USB "
+"sticks, USB hard drives, and various other portable storage devices. "
+"Normally, an ISO hybrid image can be used for this purpose instead, but if "
+"you have a BIOS which does not handle hybrid images properly, or want to use "
+"the remaining space on the media for some purpose, such as a persistence "
+"partition, you need a USB/HDD image."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:149
+#: en/user_basics.ssi:148
msgid ""
-"Note: if you created an ISO image with the previous example, you will need "
-"to clean up your working directory with the #{lb clean}# command (see {The "
-"lb clean command}#lb-clean):"
+"Note: if you created an ISO hybrid image with the previous example, you will "
+"need to clean up your working directory with the #{lb clean}# command (see "
+"{The lb clean command}#lb-clean):"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:153 en/user_basics.ssi:237
+#: en/user_basics.ssi:152 en/user_basics.ssi:218
#, no-wrap
msgid " # lb clean --binary\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:157
+#: en/user_basics.ssi:156
msgid ""
-"Run the #{lb config}# command with the parameters to configure the #{config/}"
-"# hierarchy to create a USB/HDD image type:"
+"Run the #{lb config}# command as before, except this time specifying the USB/"
+"HDD image type:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:161
+#: en/user_basics.ssi:160
#, no-wrap
msgid " $ lb config -b usb-hdd\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:165 en/user_basics.ssi:251
+#: en/user_basics.ssi:164 en/user_basics.ssi:232
msgid "Now build the image with the #{lb build}# command:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:173
-msgid "3~copying-usb-hdd-image Copying USB/HDD image to a USB stick"
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:175
-msgid ""
-"% FIXME: eliminate duplication with ISO hybrid, as these are virtually the "
-"same instructions!"
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:177
+#: en/user_basics.ssi:172
msgid ""
-"The generated binary image contains a VFAT partition and the syslinux "
-"bootloader, ready to be directly written on a USB stick. Plug in a USB stick "
-"with a size larger than that of binary.img and type:"
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:181
-#, no-wrap
-msgid " $ dd if=binary.img of=${USBSTICK}\n"
+"When the build finishes, a #{binary.img}# file should be present in the "
+"current directory."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:185
-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 "
-"looking in #{dmesg}#'s output after plugging in the stick, for example, or "
-"better yet, #{ls -l /dev/disk/by-id}#."
+#: en/user_basics.ssi:174
+msgid "2~using-usb-hdd-image Using a USB/HDD image"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:189
+#: en/user_basics.ssi:176
msgid ""
-"Note: As discussed earlier, this same process can be used for #{iso-hybrid}# "
-"type images (suffixed #{-hybrid.iso}#), but not #{iso}# type images."
+"The generated binary image contains a VFAT partition and the syslinux "
+"bootloader, ready to be directly written on a USB stick. Since using a USB/"
+"HDD image is just like using an ISO hybrid image on USB, follow the "
+"instructions in #{Using an ISO hybrid live image}#using-iso-hybrid, except "
+"use the filename #{binary.img}# instead of #{binary-hybrid.iso}#."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:191
+#: en/user_basics.ssi:178
msgid "3~testing-usb-hdd-with-qemu Testing a USB/HDD image with Qemu"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:195
-#, no-wrap
-msgid " # apt-get install qemu\n"
+#: en/user_basics.ssi:180
+msgid ""
+"First, install QEMU as described above in #{Testing an ISO image with QEMU}"
+"#testing-iso-with-qemu. Then run #{kvm}# or #{qemu}#, depending on which "
+"version your host system needs, specifying #{binary.img}# as the first hard "
+"drive."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:197
+#: en/user_basics.ssi:184
#, no-wrap
-msgid " $ qemu -hda binary.img\n"
+msgid " $ kvm -hda binary.img\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:201
-msgid "3~ Using the space left on a USB stick"
+#: en/user_basics.ssi:188
+msgid "3~using-usb-extra-space Using the space left on a USB stick"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:203
+#: en/user_basics.ssi:190
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."
+"To use the remaining free space after copying #{binary.img}# to a USB stick, "
+"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/user_basics.ssi:207
+#: en/user_basics.ssi:194
#, no-wrap
msgid " # gparted ${USBSTICK}\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:211
+#: en/user_basics.ssi:198
msgid ""
-"After the creation of the partition, where #{${PARTITION}}# is the name of "
-"the partition, like #{/dev/sdb2}#, you have to create a filesystem on it. "
-"One possible choice would be ext4."
+"After the partition is created, where #{${PARTITION}}# is the name of the "
+"partition, such as #{/dev/sdb2}#, you have to create a filesystem on it. One "
+"possible choice would be ext4."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:215
+#: en/user_basics.ssi:202
#, no-wrap
msgid " # mkfs.ext4 ${PARTITION}\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:219
-msgid "If you want to use this data partition with Windows, use FAT32."
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:223
-#, no-wrap
-msgid " # mkfs.vfat -F 32\n"
+#: en/user_basics.ssi:206
+msgid ""
+"Note: If you want to use the extra space with Windows, apparently that OS "
+"cannot normally access any partitions but the first. Some solutions to this "
+"problem have been discussed on our #{mailing list}#contact, but it seems "
+"there are no easy answers."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:227
+#: en/user_basics.ssi:208
#, no-wrap
-msgid "*{Remember: Every time you install a new binary.img on the stick, all data on the stick will be lost because the partition table is overwritten by the contents of the image.}*\n"
+msgid "*{Remember: Every time you install a new binary.img on the stick, all data on the stick will be lost because the partition table is overwritten by the contents of the image, so back up your extra partition first to restore again after updating the live image.}*\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:229
+#: en/user_basics.ssi:210
msgid "2~building-netboot-image Building a netboot image"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:231
+#: en/user_basics.ssi:212
msgid ""
"The following sequence of commands will create a basic netboot image "
"containing the Debian standard system without X.org. It is suitable for "
@@ -718,27 +693,27 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:233
+#: en/user_basics.ssi:214
msgid ""
"Note: if you performed any previous examples, you will need to clean up your "
"working directory with the #{lb clean}# command:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:241
+#: en/user_basics.ssi:222
msgid ""
"Run the #{lb config}# command as follows to configure your image for "
"netbooting:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:245
+#: en/user_basics.ssi:226
#, no-wrap
msgid " $ lb config -b net --net-root-path \"/srv/debian-live\" --net-root-server \"192.168.0.1\"\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:249
+#: en/user_basics.ssi:230
msgid ""
"In contrast with the ISO and USB/HDD images, netbooting does not, itself, "
"serve the filesystem image to the client, so the files must be served via "
@@ -749,7 +724,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:259
+#: en/user_basics.ssi:240
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 "
@@ -760,7 +735,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:261
+#: en/user_basics.ssi:242
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 #"
@@ -769,19 +744,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:263
+#: en/user_basics.ssi:244
msgid ""
"We must now configure three services on the server to enable netboot: the "
"DHCP server, the TFTP server and the NFS server."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:265
+#: en/user_basics.ssi:246
msgid "3~ DHCP server"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:267
+#: en/user_basics.ssi:248
msgid ""
"We must configure our network's DHCP server to be sure to give an IP address "
"to the netbooting client system, and to advertise the location of the PXE "
@@ -789,26 +764,26 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:269
+#: en/user_basics.ssi:250
msgid ""
"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/user_basics.ssi:273
+#: en/user_basics.ssi:254
#, no-wrap
msgid " # /etc/dhcp/dhcpd.conf - configuration file for isc-dhcp-server\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:275
+#: en/user_basics.ssi:256
#, no-wrap
msgid " ddns-update-style none;\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:278
+#: en/user_basics.ssi:259
#, no-wrap
msgid ""
" option domain-name \"example.org\";\n"
@@ -816,7 +791,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:281
+#: en/user_basics.ssi:262
#, no-wrap
msgid ""
" default-lease-time 600;\n"
@@ -824,13 +799,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:283
+#: en/user_basics.ssi:264
#, no-wrap
msgid " log-facility local7;\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:289
+#: en/user_basics.ssi:270
#, no-wrap
msgid ""
" subnet 192.168.0.0 netmask 255.255.255.0 {\n"
@@ -841,17 +816,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:293
+#: en/user_basics.ssi:274
msgid "3~ TFTP server"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:295
+#: en/user_basics.ssi:276
msgid "This serves the kernel and initial ramdisk to the system at run time."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:297
+#: en/user_basics.ssi:278
msgid ""
"You should install the tftpd-hpa package. It can serve all files contained "
"inside a root directory, usually #{/srv/tftp}#. To let it serve files inside "
@@ -859,23 +834,23 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:301
+#: en/user_basics.ssi:282
#, no-wrap
msgid " # dpkg-reconfigure -plow tftpd-hpa\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:305
+#: en/user_basics.ssi:286
msgid "and fill in the new tftp server directory when being asked about it."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:307
+#: en/user_basics.ssi:288
msgid "3~ NFS server"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:309
+#: en/user_basics.ssi:290
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 "
@@ -883,37 +858,37 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:311
+#: en/user_basics.ssi:292
msgid "You need to install the #{nfs-kernel-server}# package."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:313
+#: en/user_basics.ssi:294
msgid ""
"Then, make the filesystem image available through NFS by adding a line like "
"the following to #{/etc/exports}#:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:317
+#: en/user_basics.ssi:298
#, no-wrap
msgid " /srv/debian-live *(ro,async,no_root_squash,no_subtree_check)\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:321
+#: en/user_basics.ssi:302
msgid ""
"and tell the NFS server about this new export with the following command:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:325
+#: en/user_basics.ssi:306
#, no-wrap
msgid " # exportfs -rv\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:329
+#: en/user_basics.ssi:310
msgid ""
"Setting up these three services can be a little tricky. You might need some "
"patience to get all of them working together. For more information, see the "
@@ -924,40 +899,40 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:331
+#: en/user_basics.ssi:312
msgid "3~ Netboot testing HowTo"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:333
+#: en/user_basics.ssi:314
msgid ""
"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/user_basics.ssi:335
+#: en/user_basics.ssi:316
msgid ""
"To make our life easier, we can use virtualization. There are two solutions."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:337
+#: en/user_basics.ssi:318
msgid "3~ Qemu"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:339
+#: en/user_basics.ssi:320
msgid "_* Install #{qemu}#, #{bridge-utils}#, #{sudo}#."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:341
+#: en/user_basics.ssi:322
msgid "Edit #{/etc/qemu-ifup}#:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:352
+#: en/user_basics.ssi:333
#, no-wrap
msgid ""
" #!/bin/sh\n"
@@ -971,40 +946,40 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:356
+#: en/user_basics.ssi:337
msgid "Get, or build a #{grub-floppy-netboot}# (in the svn)."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:358
+#: en/user_basics.ssi:339
msgid ""
"Launch #{qemu}# with \"#{-net nic,vlan=0 -net tap,vlan=0,ifname=tun0}#\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:360
+#: en/user_basics.ssi:341
msgid "3~ VMWare Player"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:362
+#: en/user_basics.ssi:343
msgid "_* Install VMWare Player (\"free as in beer\" edition)"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:364
+#: en/user_basics.ssi:345
msgid ""
"_* Create a PXETester directory, and create a text file called #{pxe.vwx}# "
"inside"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:366
+#: en/user_basics.ssi:347
msgid "_* Paste this text inside:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:374
+#: en/user_basics.ssi:355
#, no-wrap
msgid ""
" #!/usr/bin/vmware\n"
@@ -1015,7 +990,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:380
+#: en/user_basics.ssi:361
#, no-wrap
msgid ""
" ide0:0.present = \"FALSE\"\n"
@@ -1026,7 +1001,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:383
+#: en/user_basics.ssi:364
#, no-wrap
msgid ""
" ethernet0.present = \"TRUE\"\n"
@@ -1034,7 +1009,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:386
+#: en/user_basics.ssi:367
#, no-wrap
msgid ""
" displayName = \"Test Boot PXE\"\n"
@@ -1042,7 +1017,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:391
+#: en/user_basics.ssi:372
#, no-wrap
msgid ""
" ethernet0.generatedAddress = \"00:0c:29:8d:71:3b\"\n"
@@ -1052,19 +1027,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:395
+#: en/user_basics.ssi:376
msgid ""
"_* You can play with this configuration file (e.g. change memory limit to "
"256)"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:397
+#: en/user_basics.ssi:378
msgid ""
"_* Double click on this file (or run VMWare player and select this file)."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:398
+#: en/user_basics.ssi:379
msgid "_* When running just press space if that strange question comes up..."
msgstr ""
diff --git a/manual/po/fr/user_examples.ssi.po b/manual/po/fr/user_examples.ssi.po
index 8f2ea47..dbe54d1 100644
--- a/manual/po/fr/user_examples.ssi.po
+++ b/manual/po/fr/user_examples.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2010-12-19 20:37-0400\n"
+"POT-Creation-Date: 2011-03-18 07:39-0200\n"
"PO-Revision-Date: 2010-11-04 16:34-0400\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -24,21 +24,21 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
-#: en/about_manual.ssi:170 en/project_bugs.ssi:58
+#: en/about_manual.ssi:146 en/about_manual.ssi:157 en/about_manual.ssi:165
+#: en/about_manual.ssi:173 en/project_bugs.ssi:60
#: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
#: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
#: en/project_procedures.ssi:58 en/user_basics.ssi:30 en/user_basics.ssi:40
-#: en/user_basics.ssi:52 en/user_basics.ssi:64 en/user_basics.ssi:76
-#: en/user_basics.ssi:86 en/user_basics.ssi:100 en/user_basics.ssi:108
-#: en/user_basics.ssi:116 en/user_basics.ssi:126 en/user_basics.ssi:140
-#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
-#: en/user_basics.ssi:182 en/user_basics.ssi:190 en/user_basics.ssi:200
-#: en/user_basics.ssi:218 en/user_basics.ssi:246 en/user_basics.ssi:262
-#: en/user_basics.ssi:270 en/user_basics.ssi:290 en/user_basics.ssi:315
+#: en/user_basics.ssi:56 en/user_basics.ssi:71 en/user_basics.ssi:106
+#: en/user_basics.ssi:114 en/user_basics.ssi:126 en/user_basics.ssi:138
+#: en/user_basics.ssi:150 en/user_basics.ssi:158 en/user_basics.ssi:166
+#: en/user_basics.ssi:182 en/user_basics.ssi:192 en/user_basics.ssi:200
+#: en/user_basics.ssi:216 en/user_basics.ssi:224 en/user_basics.ssi:234
+#: en/user_basics.ssi:252 en/user_basics.ssi:280 en/user_basics.ssi:296
+#: en/user_basics.ssi:304 en/user_basics.ssi:324 en/user_basics.ssi:349
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
@@ -64,7 +64,7 @@ msgstr ""
#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
-#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:106
+#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:105
#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
#: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
@@ -88,21 +88,21 @@ msgstr "code{"
#. type: Plain text
#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
-#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
-#: en/about_manual.ssi:174 en/project_bugs.ssi:62
+#: en/about_manual.ssi:151 en/about_manual.ssi:161 en/about_manual.ssi:169
+#: en/about_manual.ssi:177 en/project_bugs.ssi:64
#: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
#: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
#: en/project_procedures.ssi:131 en/user_basics.ssi:34 en/user_basics.ssi:44
-#: en/user_basics.ssi:58 en/user_basics.ssi:70 en/user_basics.ssi:80
-#: en/user_basics.ssi:92 en/user_basics.ssi:104 en/user_basics.ssi:112
-#: en/user_basics.ssi:120 en/user_basics.ssi:130 en/user_basics.ssi:146
-#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
-#: en/user_basics.ssi:186 en/user_basics.ssi:194 en/user_basics.ssi:204
-#: en/user_basics.ssi:238 en/user_basics.ssi:250 en/user_basics.ssi:266
-#: en/user_basics.ssi:274 en/user_basics.ssi:301 en/user_basics.ssi:340
+#: en/user_basics.ssi:62 en/user_basics.ssi:75 en/user_basics.ssi:110
+#: en/user_basics.ssi:118 en/user_basics.ssi:132 en/user_basics.ssi:142
+#: en/user_basics.ssi:154 en/user_basics.ssi:162 en/user_basics.ssi:170
+#: en/user_basics.ssi:186 en/user_basics.ssi:196 en/user_basics.ssi:204
+#: en/user_basics.ssi:220 en/user_basics.ssi:228 en/user_basics.ssi:238
+#: en/user_basics.ssi:272 en/user_basics.ssi:284 en/user_basics.ssi:300
+#: en/user_basics.ssi:308 en/user_basics.ssi:335 en/user_basics.ssi:374
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:37
@@ -124,11 +124,11 @@ msgstr "code{"
#: en/user_customization-packages.ssi:307
#: en/user_customization-packages.ssi:317
#: en/user_customization-packages.ssi:344
-#: en/user_customization-packages.ssi:354 en/user_customization-runtime.ssi:18
+#: en/user_customization-packages.ssi:353 en/user_customization-runtime.ssi:18
#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
-#: en/user_customization-runtime.ssi:102 en/user_customization-runtime.ssi:111
+#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:110
#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
#: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
#: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
@@ -141,7 +141,7 @@ msgstr "code{"
#: en/user_installation.ssi:70 en/user_installation.ssi:78
#: en/user_installation.ssi:86 en/user_installation.ssi:94
#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_installation.ssi:150 en/user_managing_a_configuration.ssi:31
+#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
@@ -150,7 +150,7 @@ msgid "}code"
msgstr "}code"
#. type: Plain text
-#: en/user_basics.ssi:42 en/user_basics.ssi:118 en/user_basics.ssi:202
+#: en/user_basics.ssi:42 en/user_basics.ssi:168 en/user_basics.ssi:236
#: en/user_examples.ssi:109 en/user_examples.ssi:208
#, no-wrap
msgid " # lb build\n"
@@ -264,7 +264,7 @@ msgid ""
"with-qemu and {Testing an ISO image with virtualbox-ose}#testing-iso-with-"
"virtualbox, or else imaged onto optical media or a USB flash device as "
"described in {Burning an ISO image to a physical medium}#burning-iso-image "
-"and {Copying USB/HDD image to a USB stick}#copying-usb-hdd-image, "
+"and {Copying an ISO hybrid image to a USB stick}#copying-iso-hybrid-to-usb, "
"respectively."
msgstr ""
@@ -743,7 +743,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:299
+#: en/user_examples.ssi:298
msgid ""
"Note that we have included the #{debian-installer-launcher}# package to "
"launch the installer from the live desktop, and have also specified the 486 "
diff --git a/manual/po/it/live-manual.ssm.po b/manual/po/it/live-manual.ssm.po
index 814c2c3..5c514ce 100644
--- a/manual/po/it/live-manual.ssm.po
+++ b/manual/po/it/live-manual.ssm.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-03-17 18:01-0200\n"
+"POT-Creation-Date: 2011-03-18 07:39-0200\n"
"PO-Revision-Date: 2011-03-11 10:33+0100\n"
"Last-Translator: skizzhg <skizzhg at gmx.com>\n"
"Language-Team: Italian <tp at lists.linux.it>\n"
@@ -49,7 +49,7 @@ msgstr ""
#, no-wrap
msgid ""
"@date:\n"
-" :published: 2011-03-17\n"
+" :published: 2011-03-18\n"
msgstr ""
#. type: Plain text
diff --git a/manual/po/it/user_basics.ssi.po b/manual/po/it/user_basics.ssi.po
index 4ef738c..6f885db 100644
--- a/manual/po/it/user_basics.ssi.po
+++ b/manual/po/it/user_basics.ssi.po
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-03-17 18:01-0200\n"
+"POT-Creation-Date: 2011-03-18 07:39-0200\n"
"PO-Revision-Date: 2011-03-11 10:56+0100\n"
"Last-Translator: skizzhg <skizzhg at gmx.com>\n"
"Language-Team: Italian <tp at lists.linux.it>\n"
@@ -29,14 +29,13 @@ msgstr ""
#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
#: en/project_procedures.ssi:58 en/user_basics.ssi:30 en/user_basics.ssi:40
-#: en/user_basics.ssi:56 en/user_basics.ssi:72 en/user_basics.ssi:107
-#: en/user_basics.ssi:115 en/user_basics.ssi:127 en/user_basics.ssi:139
-#: en/user_basics.ssi:151 en/user_basics.ssi:159 en/user_basics.ssi:167
-#: en/user_basics.ssi:179 en/user_basics.ssi:193 en/user_basics.ssi:205
-#: en/user_basics.ssi:213 en/user_basics.ssi:221 en/user_basics.ssi:235
-#: en/user_basics.ssi:243 en/user_basics.ssi:253 en/user_basics.ssi:271
-#: en/user_basics.ssi:299 en/user_basics.ssi:315 en/user_basics.ssi:323
-#: en/user_basics.ssi:343 en/user_basics.ssi:368
+#: en/user_basics.ssi:56 en/user_basics.ssi:71 en/user_basics.ssi:106
+#: en/user_basics.ssi:114 en/user_basics.ssi:126 en/user_basics.ssi:138
+#: en/user_basics.ssi:150 en/user_basics.ssi:158 en/user_basics.ssi:166
+#: en/user_basics.ssi:182 en/user_basics.ssi:192 en/user_basics.ssi:200
+#: en/user_basics.ssi:216 en/user_basics.ssi:224 en/user_basics.ssi:234
+#: en/user_basics.ssi:252 en/user_basics.ssi:280 en/user_basics.ssi:296
+#: en/user_basics.ssi:304 en/user_basics.ssi:324 en/user_basics.ssi:349
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
@@ -94,14 +93,13 @@ msgstr "code{"
#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
#: en/project_procedures.ssi:131 en/user_basics.ssi:34 en/user_basics.ssi:44
-#: en/user_basics.ssi:62 en/user_basics.ssi:76 en/user_basics.ssi:111
-#: en/user_basics.ssi:119 en/user_basics.ssi:133 en/user_basics.ssi:143
-#: en/user_basics.ssi:155 en/user_basics.ssi:163 en/user_basics.ssi:171
-#: en/user_basics.ssi:183 en/user_basics.ssi:199 en/user_basics.ssi:209
-#: en/user_basics.ssi:217 en/user_basics.ssi:225 en/user_basics.ssi:239
-#: en/user_basics.ssi:247 en/user_basics.ssi:257 en/user_basics.ssi:291
-#: en/user_basics.ssi:303 en/user_basics.ssi:319 en/user_basics.ssi:327
-#: en/user_basics.ssi:354 en/user_basics.ssi:393
+#: en/user_basics.ssi:62 en/user_basics.ssi:75 en/user_basics.ssi:110
+#: en/user_basics.ssi:118 en/user_basics.ssi:132 en/user_basics.ssi:142
+#: en/user_basics.ssi:154 en/user_basics.ssi:162 en/user_basics.ssi:170
+#: en/user_basics.ssi:186 en/user_basics.ssi:196 en/user_basics.ssi:204
+#: en/user_basics.ssi:220 en/user_basics.ssi:228 en/user_basics.ssi:238
+#: en/user_basics.ssi:272 en/user_basics.ssi:284 en/user_basics.ssi:300
+#: en/user_basics.ssi:308 en/user_basics.ssi:335 en/user_basics.ssi:374
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:37
@@ -202,7 +200,9 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:8
-msgid "2~ What is a live system?"
+#, fuzzy
+#| msgid "2~ What is a live system?"
+msgid "2~what-is-live What is a live system?"
msgstr "2~ Che cos'è un sistema live?"
#. type: Plain text
@@ -304,7 +304,7 @@ msgstr ""
#: en/user_basics.ssi:24
#, fuzzy
#| msgid "2~ First steps: building an ISO image"
-msgid "2~ First steps: building an ISO hybrid image"
+msgid "2~building-iso-hybrid First steps: building an ISO hybrid image"
msgstr "2~ Primi passi: creare un'immagine ISO"
#. type: Plain text
@@ -378,7 +378,7 @@ msgstr ""
"comando #{lb build}#:"
#. type: Plain text
-#: en/user_basics.ssi:42 en/user_basics.ssi:169 en/user_basics.ssi:255
+#: en/user_basics.ssi:42 en/user_basics.ssi:168 en/user_basics.ssi:236
#: en/user_examples.ssi:109 en/user_examples.ssi:208
#, no-wrap
msgid " # lb build\n"
@@ -400,8 +400,10 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:48
-msgid "2~ Using an ISO hybrid live image"
-msgstr ""
+#, fuzzy
+#| msgid "3~copying-usb-hdd-image Copying USB/HDD image to a USB stick"
+msgid "2~using-iso-hybrid Using an ISO hybrid live image"
+msgstr "3~copying-usb-hdd-image Copiare un'immagine USB/HDD su una penna USB"
#. type: Plain text
#: en/user_basics.ssi:50
@@ -445,43 +447,38 @@ msgstr "3~copying-usb-hdd-image Copiare un'immagine USB/HDD su una penna USB"
#: en/user_basics.ssi:66
msgid ""
"ISO images prepared with the #{isohybrid}# command, like the images produced "
-"by live-build's default #{iso-hybrid}# binary image type, can be copied to a "
-"USB stick and directly booted without further steps. Plug in a USB stick "
-"with a size larger than that of #{binary-hybrid.iso}# and determine which "
-"device it is, which we hereafter refer to as #{${USBSTICK}}#. This is the "
-"device file of your key, such as #{/dev/sdb}#, not a partition, such as #{/"
-"dev/sdb1}#! You can find the right device name by looking in #{dmesg}#'s "
-"output after plugging in the stick, or better yet, #{ls -l /dev/disk/by-id}#."
+"by the default #{iso-hybrid}# binary image type, can be simply copied to a "
+"USB stick with the #{dd}# program or an equivalent. Plug in a USB stick with "
+"a size larger than that of #{binary-hybrid.iso}# and determine which device "
+"it is, which we hereafter refer to as #{${USBSTICK}}#. This is the device "
+"file of your key, such as #{/dev/sdb}#, not a partition, such as #{/dev/sdb1}"
+"#! You can find the right device name by looking in #{dmesg}#'s output after "
+"plugging in the stick, or better yet, #{ls -l /dev/disk/by-id}#."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:68 en/user_basics.ssi:187
-#, no-wrap
-msgid "*{This will definitely overwrite any previous contents on your stick!}*\n"
-msgstr "*{Questo sovrascriverà definitivamente qualsiasi dato esistente sulla chiavetta!}*\n"
-
-#. type: Plain text
-#: en/user_basics.ssi:70
+#: en/user_basics.ssi:69
msgid ""
"Once you are certain you have the correct device name, use the #{dd}# "
-"command to copy the image to the stick as follows:"
+"command to copy the image to the stick. *{This will definitely overwrite "
+"any previous contents on your stick!}*"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:74
+#: en/user_basics.ssi:73
#, no-wrap
msgid " $ dd if=binary-hybrid.iso of=${USBSTICK}\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:79
+#: en/user_basics.ssi:78
#, fuzzy
#| msgid "2~ Customizing the live user"
-msgid "3~ Booting the live media"
+msgid "3~booting-live-media Booting the live media"
msgstr "2~ Personalizzare l'utente live"
#. type: Plain text
-#: en/user_basics.ssi:81
+#: en/user_basics.ssi:80
msgid ""
"The first time you boot your live media, whether CD, DVD, USB key, or PXE "
"boot, some setup in your computer's BIOS may be needed first. Since BIOSes "
@@ -494,7 +491,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:83
+#: en/user_basics.ssi:82
msgid ""
"Once you've booted the media, you are presented with a boot menu. If you "
"just press enter here, the system will boot using the default entry, #{Live}"
@@ -504,7 +501,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:85
+#: en/user_basics.ssi:84
msgid ""
"Assuming you've selected #{Live}# and booted a default desktop live image, "
"after the boot messages scroll by, you should be automatically logged into "
@@ -515,61 +512,61 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:87
-msgid "2~ Using a virtual machine for testing"
+#: en/user_basics.ssi:86
+msgid "2~using-virtual-machine Using a virtual machine for testing"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:89
+#: en/user_basics.ssi:88
msgid ""
"It can be a great time-saver for the development of live images to run them "
"in a virtual machine (VM). This is not without its caveats:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:91
+#: en/user_basics.ssi:90
msgid ""
"_* Running a VM requires enough RAM for both the guest OS and the host and a "
"CPU with hardware support for virtualization is recommended."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:93
+#: en/user_basics.ssi:92
msgid ""
"_* There are some inherent limitations to running on a VM, e.g. poor video "
"performance, limited choice of emulated hardware."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:95
+#: en/user_basics.ssi:94
msgid ""
"_* When developing for specific hardware, there is no substitute for running "
"on the hardware itself."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:97
+#: en/user_basics.ssi:96
msgid ""
"_* Occasionally there are bugs that relate only to running in a VM. When in "
"doubt, test your image directly on the hardware."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:99
+#: en/user_basics.ssi:98
msgid ""
"Provided you can work within these constraints, survey the available VM "
"software and choose one that is suitable for your needs."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:101
+#: en/user_basics.ssi:100
#, fuzzy
#| msgid "3~testing-iso-with-qemu Testing an ISO image with Qemu"
msgid "3~testing-iso-with-qemu Testing an ISO image with QEMU"
msgstr "3~testing-iso-with-qemu Provare un'immagine ISO con Qemu"
#. type: Plain text
-#: en/user_basics.ssi:103
+#: en/user_basics.ssi:102
msgid ""
"The most versatile VM in Debian is QEMU. If your processor has hardware "
"support for virtualization, use the #{qemu-kvm}# package; the #{qemu-kvm}# "
@@ -577,7 +574,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:105
+#: en/user_basics.ssi:104
msgid ""
"First, install #{qemu-kvm}# if your processor supports it. If not, install #"
"{qemu}#, in which case the program name is #{qemu}# instead of #{kvm}# in "
@@ -586,54 +583,54 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:109
+#: en/user_basics.ssi:108
#, no-wrap
msgid " # apt-get install qemu-kvm qemu-utils\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:113
+#: en/user_basics.ssi:112
#, fuzzy
#| msgid "Testing an ISO is simple:"
msgid "Booting an ISO image is simple:"
msgstr "Collaudare una ISO è semplice:"
#. type: Plain text
-#: en/user_basics.ssi:117
+#: en/user_basics.ssi:116
#, no-wrap
msgid " $ kvm -cdrom binary-hybrid.iso\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:121
+#: en/user_basics.ssi:120
msgid "See the man pages for more details."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:123
+#: en/user_basics.ssi:122
msgid "3~testing-iso-with-virtualbox Testing an ISO image with virtualbox-ose"
msgstr ""
"3~testing-iso-with-virtualbox Provare un'immagine ISO con virtualbox-ose"
#. type: Plain text
-#: en/user_basics.ssi:125
+#: en/user_basics.ssi:124
msgid "In order to test the ISO with virtualbox-ose:"
msgstr "Per provare la ISO con virtualbox-ose:"
#. type: Plain text
-#: en/user_basics.ssi:129
+#: en/user_basics.ssi:128
#, no-wrap
msgid " # apt-get install virtualbox-ose virtualbox-ose-dkms\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:131
+#: en/user_basics.ssi:130
#, no-wrap
msgid " $ virtualbox\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:135
+#: en/user_basics.ssi:134
#, fuzzy
#| msgid ""
#| "Create a new virtual machine, change the storage settings to use binary."
@@ -647,7 +644,7 @@ msgstr ""
"avviare la macchina."
#. type: Plain text
-#: en/user_basics.ssi:137
+#: en/user_basics.ssi:136
#, fuzzy
#| msgid ""
#| "Note: For live systems containing X.org that you want to test with "
@@ -666,26 +663,38 @@ msgstr ""
"Altrimenti, la risoluzione è limitata a 800x600."
#. type: Plain text
-#: en/user_basics.ssi:141
+#: en/user_basics.ssi:140
#, no-wrap
msgid " $ lb config --packages virtualbox-ose-guest-x11\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:145
-msgid "2~ Building a USB/HDD image"
+#: en/user_basics.ssi:144
+#, fuzzy
+#| msgid "2~ Building a USB/HDD image"
+msgid "2~building-usb-hdd Building a USB/HDD image"
msgstr "2~ Creare un'immagine USB/HDD"
#. type: Plain text
-#: en/user_basics.ssi:147
-msgid ""
-"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. Normally, an ISO hybrid image can be used for this purpose instead, "
-"but if you have a BIOS which does not handle hybrid images properly, or want "
-"to use the remaining space on the media for a persistence partition, you "
-"need a USB/HDD image."
+#: en/user_basics.ssi:146
+#, fuzzy
+#| msgid ""
+#| "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. Normally, an ISO hybrid image can be used for this "
+#| "purpose instead, but if you have a BIOS which does not handle hybrid "
+#| "images properly, or want to use the remaining space on the media for a "
+#| "persistence partition, you need a USB/HDD image."
+msgid ""
+"Building a USB/HDD image is similar to ISO hybrid in all respects except you "
+"specify #{--b usb-hdd}# and the resulting filename is #{binary.img}# which "
+"cannot be burnt to optical media. It is suitable for booting from USB "
+"sticks, USB hard drives, and various other portable storage devices. "
+"Normally, an ISO hybrid image can be used for this purpose instead, but if "
+"you have a BIOS which does not handle hybrid images properly, or want to use "
+"the remaining space on the media for some purpose, such as a persistence "
+"partition, you need a USB/HDD image."
msgstr ""
"La seguente sequenza di comandi creerà un'immagine USB/HDD di base "
"contenente solo un sistema Debian standard senza X.org. È adatta per "
@@ -696,60 +705,78 @@ msgstr ""
"partizione persistente, allora occorre un'immagine USB/HDD."
#. type: Plain text
-#: en/user_basics.ssi:149
+#: en/user_basics.ssi:148
+#, fuzzy
+#| msgid ""
+#| "Note: if you created an ISO image with the previous example, you will "
+#| "need to clean up your working directory with the #{lb clean}# command "
+#| "(see {The lb clean command}#lb-clean):"
msgid ""
-"Note: if you created an ISO image with the previous example, you will need "
-"to clean up your working directory with the #{lb clean}# command (see {The "
-"lb clean command}#lb-clean):"
+"Note: if you created an ISO hybrid image with the previous example, you will "
+"need to clean up your working directory with the #{lb clean}# command (see "
+"{The lb clean command}#lb-clean):"
msgstr ""
"Nota: se si è creata un'immagine ISO con gli esempi precedenti, occorre "
"pulire la directory di lavoro con il comando #{lb clean}# (vedere {Il "
"comando lb clean}#lb-clean):"
#. type: Plain text
-#: en/user_basics.ssi:153 en/user_basics.ssi:237
+#: en/user_basics.ssi:152 en/user_basics.ssi:218
#, no-wrap
msgid " # lb clean --binary\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:157
+#: en/user_basics.ssi:156
+#, fuzzy
+#| msgid ""
+#| "Run the #{lb config}# command with the parameters to configure the #"
+#| "{config/}# hierarchy to create a USB/HDD image type:"
msgid ""
-"Run the #{lb config}# command with the parameters to configure the #{config/}"
-"# hierarchy to create a USB/HDD image type:"
+"Run the #{lb config}# command as before, except this time specifying the USB/"
+"HDD image type:"
msgstr ""
"Eseguire il comando #{lb config}# con i parametri atti a configurare la "
"struttura #{config/}# per creare un'immagine di tipo USB/HDD:"
#. type: Plain text
-#: en/user_basics.ssi:161
+#: en/user_basics.ssi:160
#, no-wrap
msgid " $ lb config -b usb-hdd\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:165 en/user_basics.ssi:251
+#: en/user_basics.ssi:164 en/user_basics.ssi:232
msgid "Now build the image with the #{lb build}# command:"
msgstr "Si crei ora l'immagine con il comando #{lb build}#:"
#. type: Plain text
-#: en/user_basics.ssi:173
-msgid "3~copying-usb-hdd-image Copying USB/HDD image to a USB stick"
-msgstr "3~copying-usb-hdd-image Copiare un'immagine USB/HDD su una penna USB"
-
-#. type: Plain text
-#: en/user_basics.ssi:175
+#: en/user_basics.ssi:172
msgid ""
-"% FIXME: eliminate duplication with ISO hybrid, as these are virtually the "
-"same instructions!"
+"When the build finishes, a #{binary.img}# file should be present in the "
+"current directory."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:177
+#: en/user_basics.ssi:174
+#, fuzzy
+#| msgid "3~testing-usb-hdd-with-qemu Testing a USB/HDD image with Qemu"
+msgid "2~using-usb-hdd-image Using a USB/HDD image"
+msgstr "3~testing-usb-hdd-with-qemu Provare un'immagine USB/HDD con Qemu"
+
+#. type: Plain text
+#: en/user_basics.ssi:176
+#, fuzzy
+#| msgid ""
+#| "The generated binary image contains a VFAT partition and the syslinux "
+#| "bootloader, ready to be directly written on a USB stick. Plug in a USB "
+#| "stick with a size larger than that of binary.img and type:"
msgid ""
"The generated binary image contains a VFAT partition and the syslinux "
-"bootloader, ready to be directly written on a USB stick. Plug in a USB stick "
-"with a size larger than that of binary.img and type:"
+"bootloader, ready to be directly written on a USB stick. Since using a USB/"
+"HDD image is just like using an ISO hybrid image on USB, follow the "
+"instructions in #{Using an ISO hybrid live image}#using-iso-hybrid, except "
+"use the filename #{binary.img}# instead of #{binary-hybrid.iso}#."
msgstr ""
"L'immagine binaria generata contiene una partizione VFAT e il bootloader "
"syslinux, pronti per essere scritti direttamente su una penna USB. Inserire "
@@ -757,63 +784,45 @@ msgstr ""
"digitare:"
#. type: Plain text
-#: en/user_basics.ssi:181
-#, no-wrap
-msgid " $ dd if=binary.img of=${USBSTICK}\n"
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:185
-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 "
-"looking in #{dmesg}#'s output after plugging in the stick, for example, or "
-"better yet, #{ls -l /dev/disk/by-id}#."
-msgstr ""
-"dove #{${USBSTICK}}# è il nome del device, come #{/dev/sdb}# (non una "
-"partizione come #{/dev/sdb1}#!); si può trovare il nome corretto del device "
-"guardando l'output di #{dmesg}# dopo aver inserito la chiavetta USB, o "
-"meglio ancora #{ls -l /dev/disk/by-id}#."
-
-#. type: Plain text
-#: en/user_basics.ssi:189
-msgid ""
-"Note: As discussed earlier, this same process can be used for #{iso-hybrid}# "
-"type images (suffixed #{-hybrid.iso}#), but not #{iso}# type images."
-msgstr ""
-"Nota: come disquisito in precedenza, questo stesso processo può essere usato "
-"per immagini di tipo #{iso-hybrid}# (con suffisso #{-hybrid.iso}#), ma non "
-"per le immagini di tipo #{iso}#."
-
-#. type: Plain text
-#: en/user_basics.ssi:191
+#: en/user_basics.ssi:178
msgid "3~testing-usb-hdd-with-qemu Testing a USB/HDD image with Qemu"
msgstr "3~testing-usb-hdd-with-qemu Provare un'immagine USB/HDD con Qemu"
#. type: Plain text
-#: en/user_basics.ssi:195
-#, no-wrap
-msgid " # apt-get install qemu\n"
+#: en/user_basics.ssi:180
+msgid ""
+"First, install QEMU as described above in #{Testing an ISO image with QEMU}"
+"#testing-iso-with-qemu. Then run #{kvm}# or #{qemu}#, depending on which "
+"version your host system needs, specifying #{binary.img}# as the first hard "
+"drive."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:197
+#: en/user_basics.ssi:184
#, no-wrap
-msgid " $ qemu -hda binary.img\n"
+msgid " $ kvm -hda binary.img\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:201
-msgid "3~ Using the space left on a USB stick"
+#: en/user_basics.ssi:188
+#, fuzzy
+#| msgid "3~ Using the space left on a USB stick"
+msgid "3~using-usb-extra-space Using the space left on a USB stick"
msgstr "3~ Usare lo spazio rimanente su una penna USB"
#. type: Plain text
-#: en/user_basics.ssi:203
+#: en/user_basics.ssi:190
+#, fuzzy
+#| 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."
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."
+"To use the remaining free space after copying #{binary.img}# to a USB stick, "
+"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 ""
"Se si vuole usare lo spazio libero che rimane dopo l'installazione di binary."
"img, si può usare uno strumento di partizionamento come #{gparted}# o #"
@@ -821,52 +830,56 @@ msgstr ""
"verrà utilizzata dal sistema Debian Live."
#. type: Plain text
-#: en/user_basics.ssi:207
+#: en/user_basics.ssi:194
#, no-wrap
msgid " # gparted ${USBSTICK}\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:211
+#: en/user_basics.ssi:198
+#, fuzzy
+#| msgid ""
+#| "After the creation of the partition, where #{${PARTITION}}# is the name "
+#| "of the partition, like #{/dev/sdb2}#, you have to create a filesystem on "
+#| "it. One possible choice would be ext4."
msgid ""
-"After the creation of the partition, where #{${PARTITION}}# is the name of "
-"the partition, like #{/dev/sdb2}#, you have to create a filesystem on it. "
-"One possible choice would be ext4."
+"After the partition is created, where #{${PARTITION}}# is the name of the "
+"partition, such as #{/dev/sdb2}#, you have to create a filesystem on it. One "
+"possible choice would be ext4."
msgstr ""
"Dopo aver creato la partizione, dove #{${PARTITION}}# è il nome della "
"partizione, ad esempio #{/dev/sdb2}#, si deve creare su di essa un "
"filesystem. Una scelta possibile potrebbe essere ext4."
#. type: Plain text
-#: en/user_basics.ssi:215
+#: en/user_basics.ssi:202
#, no-wrap
msgid " # mkfs.ext4 ${PARTITION}\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:219
-msgid "If you want to use this data partition with Windows, use FAT32."
-msgstr "Usare FAT32 se si vuole usare questa partizione dati con Windows."
-
-#. type: Plain text
-#: en/user_basics.ssi:223
-#, no-wrap
-msgid " # mkfs.vfat -F 32\n"
+#: en/user_basics.ssi:206
+msgid ""
+"Note: If you want to use the extra space with Windows, apparently that OS "
+"cannot normally access any partitions but the first. Some solutions to this "
+"problem have been discussed on our #{mailing list}#contact, but it seems "
+"there are no easy answers."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:227
-#, no-wrap
-msgid "*{Remember: Every time you install a new binary.img on the stick, all data on the stick will be lost because the partition table is overwritten by the contents of the image.}*\n"
+#: en/user_basics.ssi:208
+#, fuzzy, no-wrap
+#| msgid "*{Remember: Every time you install a new binary.img on the stick, all data on the stick will be lost because the partition table is overwritten by the contents of the image.}*\n"
+msgid "*{Remember: Every time you install a new binary.img on the stick, all data on the stick will be lost because the partition table is overwritten by the contents of the image, so back up your extra partition first to restore again after updating the live image.}*\n"
msgstr "*{Ricorda: ogni volta che si installa un nuovo file binary.img sulla penna, tutti i dati sulla chiavetta saranno persi perché la tabella delle partizioni viene sovrascritta con i contenuti dell'immagine.}*\n"
#. type: Plain text
-#: en/user_basics.ssi:229
+#: en/user_basics.ssi:210
msgid "2~building-netboot-image Building a netboot image"
msgstr "2~building-netboot-image Creare un'immagine netboot"
#. type: Plain text
-#: en/user_basics.ssi:231
+#: en/user_basics.ssi:212
msgid ""
"The following sequence of commands will create a basic netboot image "
"containing the Debian standard system without X.org. It is suitable for "
@@ -877,7 +890,7 @@ msgstr ""
"tramite rete."
#. type: Plain text
-#: en/user_basics.ssi:233
+#: en/user_basics.ssi:214
msgid ""
"Note: if you performed any previous examples, you will need to clean up your "
"working directory with the #{lb clean}# command:"
@@ -886,7 +899,7 @@ msgstr ""
"la directory di lavoro con il comando #{lb clean}#:"
#. type: Plain text
-#: en/user_basics.ssi:241
+#: en/user_basics.ssi:222
msgid ""
"Run the #{lb config}# command as follows to configure your image for "
"netbooting:"
@@ -895,13 +908,13 @@ msgstr ""
"config}# come segue:"
#. type: Plain text
-#: en/user_basics.ssi:245
+#: en/user_basics.ssi:226
#, no-wrap
msgid " $ lb config -b net --net-root-path \"/srv/debian-live\" --net-root-server \"192.168.0.1\"\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:249
+#: en/user_basics.ssi:230
msgid ""
"In contrast with the ISO and USB/HDD images, netbooting does not, itself, "
"serve the filesystem image to the client, so the files must be served via "
@@ -918,7 +931,7 @@ msgstr ""
"valori adeguati alla propria rete."
#. type: Plain text
-#: en/user_basics.ssi:259
+#: en/user_basics.ssi:240
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 "
@@ -936,7 +949,7 @@ msgstr ""
"come Linux."
#. type: Plain text
-#: en/user_basics.ssi:261
+#: en/user_basics.ssi:242
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 #"
@@ -949,7 +962,7 @@ msgstr ""
"pxelinux in #{tftpboot/debian-live/i386}#."
#. type: Plain text
-#: en/user_basics.ssi:263
+#: en/user_basics.ssi:244
msgid ""
"We must now configure three services on the server to enable netboot: the "
"DHCP server, the TFTP server and the NFS server."
@@ -958,12 +971,12 @@ msgstr ""
"server DHCP, TFTP e NFS."
#. type: Plain text
-#: en/user_basics.ssi:265
+#: en/user_basics.ssi:246
msgid "3~ DHCP server"
msgstr "3~ Server DHCP"
#. type: Plain text
-#: en/user_basics.ssi:267
+#: en/user_basics.ssi:248
msgid ""
"We must configure our network's DHCP server to be sure to give an IP address "
"to the netbooting client system, and to advertise the location of the PXE "
@@ -974,7 +987,7 @@ msgstr ""
"posizione del bootloader PXE."
#. type: Plain text
-#: en/user_basics.ssi:269
+#: en/user_basics.ssi:250
msgid ""
"Here is an example for inspiration, written for the ISC DHCP server #{isc-"
"dhcp-server}# in the #{/etc/dhcp/dhcpd.conf}# configuration file:"
@@ -983,19 +996,19 @@ msgstr ""
"di configurazione #{/etc/dhcp/dhcpd.conf}#:"
#. type: Plain text
-#: en/user_basics.ssi:273
+#: en/user_basics.ssi:254
#, no-wrap
msgid " # /etc/dhcp/dhcpd.conf - configuration file for isc-dhcp-server\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:275
+#: en/user_basics.ssi:256
#, no-wrap
msgid " ddns-update-style none;\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:278
+#: en/user_basics.ssi:259
#, no-wrap
msgid ""
" option domain-name \"example.org\";\n"
@@ -1003,7 +1016,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:281
+#: en/user_basics.ssi:262
#, no-wrap
msgid ""
" default-lease-time 600;\n"
@@ -1011,13 +1024,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:283
+#: en/user_basics.ssi:264
#, no-wrap
msgid " log-facility local7;\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:289
+#: en/user_basics.ssi:270
#, no-wrap
msgid ""
" subnet 192.168.0.0 netmask 255.255.255.0 {\n"
@@ -1028,18 +1041,18 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:293
+#: en/user_basics.ssi:274
msgid "3~ TFTP server"
msgstr "3~ Server TFTP"
#. type: Plain text
-#: en/user_basics.ssi:295
+#: en/user_basics.ssi:276
msgid "This serves the kernel and initial ramdisk to the system at run time."
msgstr ""
"Fornisce al sistema il kernel e il ramdisk iniziale in fase di esecuzione."
#. type: Plain text
-#: en/user_basics.ssi:297
+#: en/user_basics.ssi:278
msgid ""
"You should install the tftpd-hpa package. It can serve all files contained "
"inside a root directory, usually #{/srv/tftp}#. To let it serve files inside "
@@ -1051,23 +1064,23 @@ msgstr ""
"seguente comando come utente root:"
#. type: Plain text
-#: en/user_basics.ssi:301
+#: en/user_basics.ssi:282
#, no-wrap
msgid " # dpkg-reconfigure -plow tftpd-hpa\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:305
+#: en/user_basics.ssi:286
msgid "and fill in the new tftp server directory when being asked about it."
msgstr "e inserire la nuova directory del server tftp quando viene richiesto."
#. type: Plain text
-#: en/user_basics.ssi:307
+#: en/user_basics.ssi:288
msgid "3~ NFS server"
msgstr "3~ Server NFS"
#. type: Plain text
-#: en/user_basics.ssi:309
+#: en/user_basics.ssi:290
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 "
@@ -1078,12 +1091,12 @@ msgstr ""
"tramite un server NFS."
#. type: Plain text
-#: en/user_basics.ssi:311
+#: en/user_basics.ssi:292
msgid "You need to install the #{nfs-kernel-server}# package."
msgstr "Bisogna installare il pacchetto #{nfs-kernel-server}#."
#. type: Plain text
-#: en/user_basics.ssi:313
+#: en/user_basics.ssi:294
msgid ""
"Then, make the filesystem image available through NFS by adding a line like "
"the following to #{/etc/exports}#:"
@@ -1092,25 +1105,25 @@ msgstr ""
"una riga come la seguente in #{/etc/exports}#:"
#. type: Plain text
-#: en/user_basics.ssi:317
+#: en/user_basics.ssi:298
#, no-wrap
msgid " /srv/debian-live *(ro,async,no_root_squash,no_subtree_check)\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:321
+#: en/user_basics.ssi:302
msgid ""
"and tell the NFS server about this new export with the following command:"
msgstr "e comunicare il nuovo export al server NFS con il seguente comando:"
#. type: Plain text
-#: en/user_basics.ssi:325
+#: en/user_basics.ssi:306
#, no-wrap
msgid " # exportfs -rv\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:329
+#: en/user_basics.ssi:310
msgid ""
"Setting up these three services can be a little tricky. You might need some "
"patience to get all of them working together. For more information, see the "
@@ -1127,12 +1140,12 @@ msgstr ""
"considerato che il procedimento è molto simile."
#. type: Plain text
-#: en/user_basics.ssi:331
+#: en/user_basics.ssi:312
msgid "3~ Netboot testing HowTo"
msgstr "3~ Come provare una netboot"
#. type: Plain text
-#: en/user_basics.ssi:333
+#: en/user_basics.ssi:314
msgid ""
"Netboot image creation is made easy with live-build magic, but testing the "
"images on physical machines can be really time consuming."
@@ -1142,7 +1155,7 @@ msgstr ""
"in termini di tempo."
#. type: Plain text
-#: en/user_basics.ssi:335
+#: en/user_basics.ssi:316
msgid ""
"To make our life easier, we can use virtualization. There are two solutions."
msgstr ""
@@ -1150,22 +1163,22 @@ msgstr ""
"soluzioni."
#. type: Plain text
-#: en/user_basics.ssi:337
+#: en/user_basics.ssi:318
msgid "3~ Qemu"
msgstr "3~ Qemu"
#. type: Plain text
-#: en/user_basics.ssi:339
+#: en/user_basics.ssi:320
msgid "_* Install #{qemu}#, #{bridge-utils}#, #{sudo}#."
msgstr "_* Installare #{qemu}#, #{bridge-utils}#, #{sudo}#."
#. type: Plain text
-#: en/user_basics.ssi:341
+#: en/user_basics.ssi:322
msgid "Edit #{/etc/qemu-ifup}#:"
msgstr "Modificare #{/etc/qemu-ifup}#:"
#. type: Plain text
-#: en/user_basics.ssi:352
+#: en/user_basics.ssi:333
#, no-wrap
msgid ""
" #!/bin/sh\n"
@@ -1179,29 +1192,29 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:356
+#: en/user_basics.ssi:337
msgid "Get, or build a #{grub-floppy-netboot}# (in the svn)."
msgstr "Procurarsi o compilare #{grub-floppy-netboot}# (su svn)."
#. type: Plain text
-#: en/user_basics.ssi:358
+#: en/user_basics.ssi:339
msgid ""
"Launch #{qemu}# with \"#{-net nic,vlan=0 -net tap,vlan=0,ifname=tun0}#\""
msgstr ""
"Lanciare #{qemu}# con \"#{-net nic,vlan=0 -net tap,vlan=0,ifname=tun0}#\""
#. type: Plain text
-#: en/user_basics.ssi:360
+#: en/user_basics.ssi:341
msgid "3~ VMWare Player"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:362
+#: en/user_basics.ssi:343
msgid "_* Install VMWare Player (\"free as in beer\" edition)"
msgstr "_* Installare VMWare Player (edizione \"free as in beer\")"
#. type: Plain text
-#: en/user_basics.ssi:364
+#: en/user_basics.ssi:345
msgid ""
"_* Create a PXETester directory, and create a text file called #{pxe.vwx}# "
"inside"
@@ -1210,12 +1223,12 @@ msgstr ""
"chiamato #{pxe.vwx}#"
#. type: Plain text
-#: en/user_basics.ssi:366
+#: en/user_basics.ssi:347
msgid "_* Paste this text inside:"
msgstr "_* Vi si copi dentro questo testo:"
#. type: Plain text
-#: en/user_basics.ssi:374
+#: en/user_basics.ssi:355
#, no-wrap
msgid ""
" #!/usr/bin/vmware\n"
@@ -1226,7 +1239,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:380
+#: en/user_basics.ssi:361
#, no-wrap
msgid ""
" ide0:0.present = \"FALSE\"\n"
@@ -1237,7 +1250,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:383
+#: en/user_basics.ssi:364
#, no-wrap
msgid ""
" ethernet0.present = \"TRUE\"\n"
@@ -1245,7 +1258,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:386
+#: en/user_basics.ssi:367
#, no-wrap
msgid ""
" displayName = \"Test Boot PXE\"\n"
@@ -1253,7 +1266,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:391
+#: en/user_basics.ssi:372
#, no-wrap
msgid ""
" ethernet0.generatedAddress = \"00:0c:29:8d:71:3b\"\n"
@@ -1263,7 +1276,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:395
+#: en/user_basics.ssi:376
msgid ""
"_* You can play with this configuration file (e.g. change memory limit to "
"256)"
@@ -1272,7 +1285,7 @@ msgstr ""
"portando a 256 il limite della memoria)"
#. type: Plain text
-#: en/user_basics.ssi:397
+#: en/user_basics.ssi:378
msgid ""
"_* Double click on this file (or run VMWare player and select this file)."
msgstr ""
@@ -1280,7 +1293,7 @@ msgstr ""
"selezionare questo file)."
#. type: Plain text
-#: en/user_basics.ssi:398
+#: en/user_basics.ssi:379
msgid "_* When running just press space if that strange question comes up..."
msgstr ""
"_* Se viene posta qualche strana domanda durante l'esecuzione premere il "
diff --git a/manual/po/it/user_examples.ssi.po b/manual/po/it/user_examples.ssi.po
index 4ce3c3a..67f84f9 100644
--- a/manual/po/it/user_examples.ssi.po
+++ b/manual/po/it/user_examples.ssi.po
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2010-12-19 20:37-0400\n"
+"POT-Creation-Date: 2011-03-18 07:39-0200\n"
"PO-Revision-Date: 2011-03-11 11:15+0100\n"
"Last-Translator: skizzhg <skizzhg at gmx.com>\n"
"Language-Team: Italian <tp at lists.linux.it>\n"
@@ -26,21 +26,21 @@ msgstr ":B~ Esempi"
#. type: Plain text
#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
-#: en/about_manual.ssi:170 en/project_bugs.ssi:58
+#: en/about_manual.ssi:146 en/about_manual.ssi:157 en/about_manual.ssi:165
+#: en/about_manual.ssi:173 en/project_bugs.ssi:60
#: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
#: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
#: en/project_procedures.ssi:58 en/user_basics.ssi:30 en/user_basics.ssi:40
-#: en/user_basics.ssi:52 en/user_basics.ssi:64 en/user_basics.ssi:76
-#: en/user_basics.ssi:86 en/user_basics.ssi:100 en/user_basics.ssi:108
-#: en/user_basics.ssi:116 en/user_basics.ssi:126 en/user_basics.ssi:140
-#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
-#: en/user_basics.ssi:182 en/user_basics.ssi:190 en/user_basics.ssi:200
-#: en/user_basics.ssi:218 en/user_basics.ssi:246 en/user_basics.ssi:262
-#: en/user_basics.ssi:270 en/user_basics.ssi:290 en/user_basics.ssi:315
+#: en/user_basics.ssi:56 en/user_basics.ssi:71 en/user_basics.ssi:106
+#: en/user_basics.ssi:114 en/user_basics.ssi:126 en/user_basics.ssi:138
+#: en/user_basics.ssi:150 en/user_basics.ssi:158 en/user_basics.ssi:166
+#: en/user_basics.ssi:182 en/user_basics.ssi:192 en/user_basics.ssi:200
+#: en/user_basics.ssi:216 en/user_basics.ssi:224 en/user_basics.ssi:234
+#: en/user_basics.ssi:252 en/user_basics.ssi:280 en/user_basics.ssi:296
+#: en/user_basics.ssi:304 en/user_basics.ssi:324 en/user_basics.ssi:349
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
@@ -66,7 +66,7 @@ msgstr ":B~ Esempi"
#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
-#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:106
+#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:105
#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
#: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
@@ -90,21 +90,21 @@ msgstr "code{"
#. type: Plain text
#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
-#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
-#: en/about_manual.ssi:174 en/project_bugs.ssi:62
+#: en/about_manual.ssi:151 en/about_manual.ssi:161 en/about_manual.ssi:169
+#: en/about_manual.ssi:177 en/project_bugs.ssi:64
#: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
#: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
#: en/project_procedures.ssi:131 en/user_basics.ssi:34 en/user_basics.ssi:44
-#: en/user_basics.ssi:58 en/user_basics.ssi:70 en/user_basics.ssi:80
-#: en/user_basics.ssi:92 en/user_basics.ssi:104 en/user_basics.ssi:112
-#: en/user_basics.ssi:120 en/user_basics.ssi:130 en/user_basics.ssi:146
-#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
-#: en/user_basics.ssi:186 en/user_basics.ssi:194 en/user_basics.ssi:204
-#: en/user_basics.ssi:238 en/user_basics.ssi:250 en/user_basics.ssi:266
-#: en/user_basics.ssi:274 en/user_basics.ssi:301 en/user_basics.ssi:340
+#: en/user_basics.ssi:62 en/user_basics.ssi:75 en/user_basics.ssi:110
+#: en/user_basics.ssi:118 en/user_basics.ssi:132 en/user_basics.ssi:142
+#: en/user_basics.ssi:154 en/user_basics.ssi:162 en/user_basics.ssi:170
+#: en/user_basics.ssi:186 en/user_basics.ssi:196 en/user_basics.ssi:204
+#: en/user_basics.ssi:220 en/user_basics.ssi:228 en/user_basics.ssi:238
+#: en/user_basics.ssi:272 en/user_basics.ssi:284 en/user_basics.ssi:300
+#: en/user_basics.ssi:308 en/user_basics.ssi:335 en/user_basics.ssi:374
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:37
@@ -126,11 +126,11 @@ msgstr "code{"
#: en/user_customization-packages.ssi:307
#: en/user_customization-packages.ssi:317
#: en/user_customization-packages.ssi:344
-#: en/user_customization-packages.ssi:354 en/user_customization-runtime.ssi:18
+#: en/user_customization-packages.ssi:353 en/user_customization-runtime.ssi:18
#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
-#: en/user_customization-runtime.ssi:102 en/user_customization-runtime.ssi:111
+#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:110
#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
#: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
#: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
@@ -143,7 +143,7 @@ msgstr "code{"
#: en/user_installation.ssi:70 en/user_installation.ssi:78
#: en/user_installation.ssi:86 en/user_installation.ssi:94
#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_installation.ssi:150 en/user_managing_a_configuration.ssi:31
+#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
@@ -152,7 +152,7 @@ msgid "}code"
msgstr "}code"
#. type: Plain text
-#: en/user_basics.ssi:42 en/user_basics.ssi:118 en/user_basics.ssi:202
+#: en/user_basics.ssi:42 en/user_basics.ssi:168 en/user_basics.ssi:236
#: en/user_examples.ssi:109 en/user_examples.ssi:208
#, no-wrap
msgid " # lb build\n"
@@ -283,6 +283,16 @@ msgstr ""
#. type: Plain text
#: en/user_examples.ssi:46
+#, fuzzy
+#| msgid ""
+#| "Assuming all goes well, after a while, the current directory will contain "
+#| "#{binary-hybrid.iso}#. This ISO hybrid image can be booted directly in a "
+#| "virtual machine as described in {Testing an ISO image with Qemu}#testing-"
+#| "iso-with-qemu and {Testing an ISO image with virtualbox-ose}#testing-iso-"
+#| "with-virtualbox, or else imaged onto optical media or a USB flash device "
+#| "as described in {Burning an ISO image to a physical medium}#burning-iso-"
+#| "image and {Copying USB/HDD image to a USB stick}#copying-usb-hdd-image, "
+#| "respectively."
msgid ""
"Assuming all goes well, after a while, the current directory will contain #"
"{binary-hybrid.iso}#. This ISO hybrid image can be booted directly in a "
@@ -290,7 +300,7 @@ msgid ""
"with-qemu and {Testing an ISO image with virtualbox-ose}#testing-iso-with-"
"virtualbox, or else imaged onto optical media or a USB flash device as "
"described in {Burning an ISO image to a physical medium}#burning-iso-image "
-"and {Copying USB/HDD image to a USB stick}#copying-usb-hdd-image, "
+"and {Copying an ISO hybrid image to a USB stick}#copying-iso-hybrid-to-usb, "
"respectively."
msgstr ""
"Presupponendo che tutto vada per il verso giusto, dopo un po' la directory "
@@ -882,7 +892,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:299
+#: en/user_examples.ssi:298
msgid ""
"Note that we have included the #{debian-installer-launcher}# package to "
"launch the installer from the live desktop, and have also specified the 486 "
diff --git a/manual/po/pt_BR/live-manual.ssm.po b/manual/po/pt_BR/live-manual.ssm.po
index 86bbc32..61fc19c 100644
--- a/manual/po/pt_BR/live-manual.ssm.po
+++ b/manual/po/pt_BR/live-manual.ssm.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-03-17 18:01-0200\n"
+"POT-Creation-Date: 2011-03-18 07:39-0200\n"
"PO-Revision-Date: 2010-10-22 07:52-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -45,7 +45,7 @@ msgstr ""
#, no-wrap
msgid ""
"@date:\n"
-" :published: 2011-03-17\n"
+" :published: 2011-03-18\n"
msgstr ""
#. type: Plain text
diff --git a/manual/po/pt_BR/user_basics.ssi.po b/manual/po/pt_BR/user_basics.ssi.po
index 3655077..9658ff6 100644
--- a/manual/po/pt_BR/user_basics.ssi.po
+++ b/manual/po/pt_BR/user_basics.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-03-17 18:01-0200\n"
+"POT-Creation-Date: 2011-03-18 07:39-0200\n"
"PO-Revision-Date: 2010-10-20 06:53-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -27,14 +27,13 @@ msgstr ""
#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
#: en/project_procedures.ssi:58 en/user_basics.ssi:30 en/user_basics.ssi:40
-#: en/user_basics.ssi:56 en/user_basics.ssi:72 en/user_basics.ssi:107
-#: en/user_basics.ssi:115 en/user_basics.ssi:127 en/user_basics.ssi:139
-#: en/user_basics.ssi:151 en/user_basics.ssi:159 en/user_basics.ssi:167
-#: en/user_basics.ssi:179 en/user_basics.ssi:193 en/user_basics.ssi:205
-#: en/user_basics.ssi:213 en/user_basics.ssi:221 en/user_basics.ssi:235
-#: en/user_basics.ssi:243 en/user_basics.ssi:253 en/user_basics.ssi:271
-#: en/user_basics.ssi:299 en/user_basics.ssi:315 en/user_basics.ssi:323
-#: en/user_basics.ssi:343 en/user_basics.ssi:368
+#: en/user_basics.ssi:56 en/user_basics.ssi:71 en/user_basics.ssi:106
+#: en/user_basics.ssi:114 en/user_basics.ssi:126 en/user_basics.ssi:138
+#: en/user_basics.ssi:150 en/user_basics.ssi:158 en/user_basics.ssi:166
+#: en/user_basics.ssi:182 en/user_basics.ssi:192 en/user_basics.ssi:200
+#: en/user_basics.ssi:216 en/user_basics.ssi:224 en/user_basics.ssi:234
+#: en/user_basics.ssi:252 en/user_basics.ssi:280 en/user_basics.ssi:296
+#: en/user_basics.ssi:304 en/user_basics.ssi:324 en/user_basics.ssi:349
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
@@ -92,14 +91,13 @@ msgstr "code{"
#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
#: en/project_procedures.ssi:131 en/user_basics.ssi:34 en/user_basics.ssi:44
-#: en/user_basics.ssi:62 en/user_basics.ssi:76 en/user_basics.ssi:111
-#: en/user_basics.ssi:119 en/user_basics.ssi:133 en/user_basics.ssi:143
-#: en/user_basics.ssi:155 en/user_basics.ssi:163 en/user_basics.ssi:171
-#: en/user_basics.ssi:183 en/user_basics.ssi:199 en/user_basics.ssi:209
-#: en/user_basics.ssi:217 en/user_basics.ssi:225 en/user_basics.ssi:239
-#: en/user_basics.ssi:247 en/user_basics.ssi:257 en/user_basics.ssi:291
-#: en/user_basics.ssi:303 en/user_basics.ssi:319 en/user_basics.ssi:327
-#: en/user_basics.ssi:354 en/user_basics.ssi:393
+#: en/user_basics.ssi:62 en/user_basics.ssi:75 en/user_basics.ssi:110
+#: en/user_basics.ssi:118 en/user_basics.ssi:132 en/user_basics.ssi:142
+#: en/user_basics.ssi:154 en/user_basics.ssi:162 en/user_basics.ssi:170
+#: en/user_basics.ssi:186 en/user_basics.ssi:196 en/user_basics.ssi:204
+#: en/user_basics.ssi:220 en/user_basics.ssi:228 en/user_basics.ssi:238
+#: en/user_basics.ssi:272 en/user_basics.ssi:284 en/user_basics.ssi:300
+#: en/user_basics.ssi:308 en/user_basics.ssi:335 en/user_basics.ssi:374
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:37
@@ -174,7 +172,7 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:8
-msgid "2~ What is a live system?"
+msgid "2~what-is-live What is a live system?"
msgstr ""
#. type: Plain text
@@ -242,7 +240,7 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:24
-msgid "2~ First steps: building an ISO hybrid image"
+msgid "2~building-iso-hybrid First steps: building an ISO hybrid image"
msgstr ""
#. type: Plain text
@@ -284,7 +282,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:42 en/user_basics.ssi:169 en/user_basics.ssi:255
+#: en/user_basics.ssi:42 en/user_basics.ssi:168 en/user_basics.ssi:236
#: en/user_examples.ssi:109 en/user_examples.ssi:208
#, no-wrap
msgid " # lb build\n"
@@ -300,7 +298,7 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:48
-msgid "2~ Using an ISO hybrid live image"
+msgid "2~using-iso-hybrid Using an ISO hybrid live image"
msgstr ""
#. type: Plain text
@@ -343,41 +341,36 @@ msgstr ""
#: en/user_basics.ssi:66
msgid ""
"ISO images prepared with the #{isohybrid}# command, like the images produced "
-"by live-build's default #{iso-hybrid}# binary image type, can be copied to a "
-"USB stick and directly booted without further steps. Plug in a USB stick "
-"with a size larger than that of #{binary-hybrid.iso}# and determine which "
-"device it is, which we hereafter refer to as #{${USBSTICK}}#. This is the "
-"device file of your key, such as #{/dev/sdb}#, not a partition, such as #{/"
-"dev/sdb1}#! You can find the right device name by looking in #{dmesg}#'s "
-"output after plugging in the stick, or better yet, #{ls -l /dev/disk/by-id}#."
+"by the default #{iso-hybrid}# binary image type, can be simply copied to a "
+"USB stick with the #{dd}# program or an equivalent. Plug in a USB stick with "
+"a size larger than that of #{binary-hybrid.iso}# and determine which device "
+"it is, which we hereafter refer to as #{${USBSTICK}}#. This is the device "
+"file of your key, such as #{/dev/sdb}#, not a partition, such as #{/dev/sdb1}"
+"#! You can find the right device name by looking in #{dmesg}#'s output after "
+"plugging in the stick, or better yet, #{ls -l /dev/disk/by-id}#."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:68 en/user_basics.ssi:187
-#, no-wrap
-msgid "*{This will definitely overwrite any previous contents on your stick!}*\n"
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:70
+#: en/user_basics.ssi:69
msgid ""
"Once you are certain you have the correct device name, use the #{dd}# "
-"command to copy the image to the stick as follows:"
+"command to copy the image to the stick. *{This will definitely overwrite "
+"any previous contents on your stick!}*"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:74
+#: en/user_basics.ssi:73
#, no-wrap
msgid " $ dd if=binary-hybrid.iso of=${USBSTICK}\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:79
-msgid "3~ Booting the live media"
+#: en/user_basics.ssi:78
+msgid "3~booting-live-media Booting the live media"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:81
+#: en/user_basics.ssi:80
msgid ""
"The first time you boot your live media, whether CD, DVD, USB key, or PXE "
"boot, some setup in your computer's BIOS may be needed first. Since BIOSes "
@@ -390,7 +383,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:83
+#: en/user_basics.ssi:82
msgid ""
"Once you've booted the media, you are presented with a boot menu. If you "
"just press enter here, the system will boot using the default entry, #{Live}"
@@ -400,7 +393,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:85
+#: en/user_basics.ssi:84
msgid ""
"Assuming you've selected #{Live}# and booted a default desktop live image, "
"after the boot messages scroll by, you should be automatically logged into "
@@ -411,59 +404,59 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:87
-msgid "2~ Using a virtual machine for testing"
+#: en/user_basics.ssi:86
+msgid "2~using-virtual-machine Using a virtual machine for testing"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:89
+#: en/user_basics.ssi:88
msgid ""
"It can be a great time-saver for the development of live images to run them "
"in a virtual machine (VM). This is not without its caveats:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:91
+#: en/user_basics.ssi:90
msgid ""
"_* Running a VM requires enough RAM for both the guest OS and the host and a "
"CPU with hardware support for virtualization is recommended."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:93
+#: en/user_basics.ssi:92
msgid ""
"_* There are some inherent limitations to running on a VM, e.g. poor video "
"performance, limited choice of emulated hardware."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:95
+#: en/user_basics.ssi:94
msgid ""
"_* When developing for specific hardware, there is no substitute for running "
"on the hardware itself."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:97
+#: en/user_basics.ssi:96
msgid ""
"_* Occasionally there are bugs that relate only to running in a VM. When in "
"doubt, test your image directly on the hardware."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:99
+#: en/user_basics.ssi:98
msgid ""
"Provided you can work within these constraints, survey the available VM "
"software and choose one that is suitable for your needs."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:101
+#: en/user_basics.ssi:100
msgid "3~testing-iso-with-qemu Testing an ISO image with QEMU"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:103
+#: en/user_basics.ssi:102
msgid ""
"The most versatile VM in Debian is QEMU. If your processor has hardware "
"support for virtualization, use the #{qemu-kvm}# package; the #{qemu-kvm}# "
@@ -471,7 +464,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:105
+#: en/user_basics.ssi:104
msgid ""
"First, install #{qemu-kvm}# if your processor supports it. If not, install #"
"{qemu}#, in which case the program name is #{qemu}# instead of #{kvm}# in "
@@ -480,58 +473,58 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:109
+#: en/user_basics.ssi:108
#, no-wrap
msgid " # apt-get install qemu-kvm qemu-utils\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:113
+#: en/user_basics.ssi:112
msgid "Booting an ISO image is simple:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:117
+#: en/user_basics.ssi:116
#, no-wrap
msgid " $ kvm -cdrom binary-hybrid.iso\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:121
+#: en/user_basics.ssi:120
msgid "See the man pages for more details."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:123
+#: en/user_basics.ssi:122
msgid "3~testing-iso-with-virtualbox Testing an ISO image with virtualbox-ose"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:125
+#: en/user_basics.ssi:124
msgid "In order to test the ISO with virtualbox-ose:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:129
+#: en/user_basics.ssi:128
#, no-wrap
msgid " # apt-get install virtualbox-ose virtualbox-ose-dkms\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:131
+#: en/user_basics.ssi:130
#, no-wrap
msgid " $ virtualbox\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:135
+#: en/user_basics.ssi:134
msgid ""
"Create a new virtual machine, change the storage settings to use binary-"
"hybrid.iso as the CD/DVD device, and start the machine."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:137
+#: en/user_basics.ssi:136
msgid ""
"Note: For live systems containing X.org that you want to test with #"
"{virtualbox-ose}#, you may wish to include the VirtualBox X.org driver "
@@ -540,177 +533,159 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:141
+#: en/user_basics.ssi:140
#, no-wrap
msgid " $ lb config --packages virtualbox-ose-guest-x11\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:145
-msgid "2~ Building a USB/HDD image"
+#: en/user_basics.ssi:144
+msgid "2~building-usb-hdd Building a USB/HDD image"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:147
+#: en/user_basics.ssi:146
msgid ""
-"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. Normally, an ISO hybrid image can be used for this purpose instead, "
-"but if you have a BIOS which does not handle hybrid images properly, or want "
-"to use the remaining space on the media for a persistence partition, you "
-"need a USB/HDD image."
+"Building a USB/HDD image is similar to ISO hybrid in all respects except you "
+"specify #{--b usb-hdd}# and the resulting filename is #{binary.img}# which "
+"cannot be burnt to optical media. It is suitable for booting from USB "
+"sticks, USB hard drives, and various other portable storage devices. "
+"Normally, an ISO hybrid image can be used for this purpose instead, but if "
+"you have a BIOS which does not handle hybrid images properly, or want to use "
+"the remaining space on the media for some purpose, such as a persistence "
+"partition, you need a USB/HDD image."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:149
+#: en/user_basics.ssi:148
msgid ""
-"Note: if you created an ISO image with the previous example, you will need "
-"to clean up your working directory with the #{lb clean}# command (see {The "
-"lb clean command}#lb-clean):"
+"Note: if you created an ISO hybrid image with the previous example, you will "
+"need to clean up your working directory with the #{lb clean}# command (see "
+"{The lb clean command}#lb-clean):"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:153 en/user_basics.ssi:237
+#: en/user_basics.ssi:152 en/user_basics.ssi:218
#, no-wrap
msgid " # lb clean --binary\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:157
+#: en/user_basics.ssi:156
msgid ""
-"Run the #{lb config}# command with the parameters to configure the #{config/}"
-"# hierarchy to create a USB/HDD image type:"
+"Run the #{lb config}# command as before, except this time specifying the USB/"
+"HDD image type:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:161
+#: en/user_basics.ssi:160
#, no-wrap
msgid " $ lb config -b usb-hdd\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:165 en/user_basics.ssi:251
+#: en/user_basics.ssi:164 en/user_basics.ssi:232
msgid "Now build the image with the #{lb build}# command:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:173
-msgid "3~copying-usb-hdd-image Copying USB/HDD image to a USB stick"
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:175
-msgid ""
-"% FIXME: eliminate duplication with ISO hybrid, as these are virtually the "
-"same instructions!"
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:177
+#: en/user_basics.ssi:172
msgid ""
-"The generated binary image contains a VFAT partition and the syslinux "
-"bootloader, ready to be directly written on a USB stick. Plug in a USB stick "
-"with a size larger than that of binary.img and type:"
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:181
-#, no-wrap
-msgid " $ dd if=binary.img of=${USBSTICK}\n"
+"When the build finishes, a #{binary.img}# file should be present in the "
+"current directory."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:185
-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 "
-"looking in #{dmesg}#'s output after plugging in the stick, for example, or "
-"better yet, #{ls -l /dev/disk/by-id}#."
+#: en/user_basics.ssi:174
+msgid "2~using-usb-hdd-image Using a USB/HDD image"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:189
+#: en/user_basics.ssi:176
msgid ""
-"Note: As discussed earlier, this same process can be used for #{iso-hybrid}# "
-"type images (suffixed #{-hybrid.iso}#), but not #{iso}# type images."
+"The generated binary image contains a VFAT partition and the syslinux "
+"bootloader, ready to be directly written on a USB stick. Since using a USB/"
+"HDD image is just like using an ISO hybrid image on USB, follow the "
+"instructions in #{Using an ISO hybrid live image}#using-iso-hybrid, except "
+"use the filename #{binary.img}# instead of #{binary-hybrid.iso}#."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:191
+#: en/user_basics.ssi:178
msgid "3~testing-usb-hdd-with-qemu Testing a USB/HDD image with Qemu"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:195
-#, no-wrap
-msgid " # apt-get install qemu\n"
+#: en/user_basics.ssi:180
+msgid ""
+"First, install QEMU as described above in #{Testing an ISO image with QEMU}"
+"#testing-iso-with-qemu. Then run #{kvm}# or #{qemu}#, depending on which "
+"version your host system needs, specifying #{binary.img}# as the first hard "
+"drive."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:197
+#: en/user_basics.ssi:184
#, no-wrap
-msgid " $ qemu -hda binary.img\n"
+msgid " $ kvm -hda binary.img\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:201
-msgid "3~ Using the space left on a USB stick"
+#: en/user_basics.ssi:188
+msgid "3~using-usb-extra-space Using the space left on a USB stick"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:203
+#: en/user_basics.ssi:190
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."
+"To use the remaining free space after copying #{binary.img}# to a USB stick, "
+"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/user_basics.ssi:207
+#: en/user_basics.ssi:194
#, no-wrap
msgid " # gparted ${USBSTICK}\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:211
+#: en/user_basics.ssi:198
msgid ""
-"After the creation of the partition, where #{${PARTITION}}# is the name of "
-"the partition, like #{/dev/sdb2}#, you have to create a filesystem on it. "
-"One possible choice would be ext4."
+"After the partition is created, where #{${PARTITION}}# is the name of the "
+"partition, such as #{/dev/sdb2}#, you have to create a filesystem on it. One "
+"possible choice would be ext4."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:215
+#: en/user_basics.ssi:202
#, no-wrap
msgid " # mkfs.ext4 ${PARTITION}\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:219
-msgid "If you want to use this data partition with Windows, use FAT32."
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:223
-#, no-wrap
-msgid " # mkfs.vfat -F 32\n"
+#: en/user_basics.ssi:206
+msgid ""
+"Note: If you want to use the extra space with Windows, apparently that OS "
+"cannot normally access any partitions but the first. Some solutions to this "
+"problem have been discussed on our #{mailing list}#contact, but it seems "
+"there are no easy answers."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:227
+#: en/user_basics.ssi:208
#, no-wrap
-msgid "*{Remember: Every time you install a new binary.img on the stick, all data on the stick will be lost because the partition table is overwritten by the contents of the image.}*\n"
+msgid "*{Remember: Every time you install a new binary.img on the stick, all data on the stick will be lost because the partition table is overwritten by the contents of the image, so back up your extra partition first to restore again after updating the live image.}*\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:229
+#: en/user_basics.ssi:210
msgid "2~building-netboot-image Building a netboot image"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:231
+#: en/user_basics.ssi:212
msgid ""
"The following sequence of commands will create a basic netboot image "
"containing the Debian standard system without X.org. It is suitable for "
@@ -718,27 +693,27 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:233
+#: en/user_basics.ssi:214
msgid ""
"Note: if you performed any previous examples, you will need to clean up your "
"working directory with the #{lb clean}# command:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:241
+#: en/user_basics.ssi:222
msgid ""
"Run the #{lb config}# command as follows to configure your image for "
"netbooting:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:245
+#: en/user_basics.ssi:226
#, no-wrap
msgid " $ lb config -b net --net-root-path \"/srv/debian-live\" --net-root-server \"192.168.0.1\"\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:249
+#: en/user_basics.ssi:230
msgid ""
"In contrast with the ISO and USB/HDD images, netbooting does not, itself, "
"serve the filesystem image to the client, so the files must be served via "
@@ -749,7 +724,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:259
+#: en/user_basics.ssi:240
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 "
@@ -760,7 +735,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:261
+#: en/user_basics.ssi:242
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 #"
@@ -769,19 +744,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:263
+#: en/user_basics.ssi:244
msgid ""
"We must now configure three services on the server to enable netboot: the "
"DHCP server, the TFTP server and the NFS server."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:265
+#: en/user_basics.ssi:246
msgid "3~ DHCP server"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:267
+#: en/user_basics.ssi:248
msgid ""
"We must configure our network's DHCP server to be sure to give an IP address "
"to the netbooting client system, and to advertise the location of the PXE "
@@ -789,26 +764,26 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:269
+#: en/user_basics.ssi:250
msgid ""
"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/user_basics.ssi:273
+#: en/user_basics.ssi:254
#, no-wrap
msgid " # /etc/dhcp/dhcpd.conf - configuration file for isc-dhcp-server\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:275
+#: en/user_basics.ssi:256
#, no-wrap
msgid " ddns-update-style none;\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:278
+#: en/user_basics.ssi:259
#, no-wrap
msgid ""
" option domain-name \"example.org\";\n"
@@ -816,7 +791,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:281
+#: en/user_basics.ssi:262
#, no-wrap
msgid ""
" default-lease-time 600;\n"
@@ -824,13 +799,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:283
+#: en/user_basics.ssi:264
#, no-wrap
msgid " log-facility local7;\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:289
+#: en/user_basics.ssi:270
#, no-wrap
msgid ""
" subnet 192.168.0.0 netmask 255.255.255.0 {\n"
@@ -841,17 +816,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:293
+#: en/user_basics.ssi:274
msgid "3~ TFTP server"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:295
+#: en/user_basics.ssi:276
msgid "This serves the kernel and initial ramdisk to the system at run time."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:297
+#: en/user_basics.ssi:278
msgid ""
"You should install the tftpd-hpa package. It can serve all files contained "
"inside a root directory, usually #{/srv/tftp}#. To let it serve files inside "
@@ -859,23 +834,23 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:301
+#: en/user_basics.ssi:282
#, no-wrap
msgid " # dpkg-reconfigure -plow tftpd-hpa\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:305
+#: en/user_basics.ssi:286
msgid "and fill in the new tftp server directory when being asked about it."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:307
+#: en/user_basics.ssi:288
msgid "3~ NFS server"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:309
+#: en/user_basics.ssi:290
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 "
@@ -883,37 +858,37 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:311
+#: en/user_basics.ssi:292
msgid "You need to install the #{nfs-kernel-server}# package."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:313
+#: en/user_basics.ssi:294
msgid ""
"Then, make the filesystem image available through NFS by adding a line like "
"the following to #{/etc/exports}#:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:317
+#: en/user_basics.ssi:298
#, no-wrap
msgid " /srv/debian-live *(ro,async,no_root_squash,no_subtree_check)\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:321
+#: en/user_basics.ssi:302
msgid ""
"and tell the NFS server about this new export with the following command:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:325
+#: en/user_basics.ssi:306
#, no-wrap
msgid " # exportfs -rv\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:329
+#: en/user_basics.ssi:310
msgid ""
"Setting up these three services can be a little tricky. You might need some "
"patience to get all of them working together. For more information, see the "
@@ -924,40 +899,40 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:331
+#: en/user_basics.ssi:312
msgid "3~ Netboot testing HowTo"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:333
+#: en/user_basics.ssi:314
msgid ""
"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/user_basics.ssi:335
+#: en/user_basics.ssi:316
msgid ""
"To make our life easier, we can use virtualization. There are two solutions."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:337
+#: en/user_basics.ssi:318
msgid "3~ Qemu"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:339
+#: en/user_basics.ssi:320
msgid "_* Install #{qemu}#, #{bridge-utils}#, #{sudo}#."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:341
+#: en/user_basics.ssi:322
msgid "Edit #{/etc/qemu-ifup}#:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:352
+#: en/user_basics.ssi:333
#, no-wrap
msgid ""
" #!/bin/sh\n"
@@ -971,40 +946,40 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:356
+#: en/user_basics.ssi:337
msgid "Get, or build a #{grub-floppy-netboot}# (in the svn)."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:358
+#: en/user_basics.ssi:339
msgid ""
"Launch #{qemu}# with \"#{-net nic,vlan=0 -net tap,vlan=0,ifname=tun0}#\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:360
+#: en/user_basics.ssi:341
msgid "3~ VMWare Player"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:362
+#: en/user_basics.ssi:343
msgid "_* Install VMWare Player (\"free as in beer\" edition)"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:364
+#: en/user_basics.ssi:345
msgid ""
"_* Create a PXETester directory, and create a text file called #{pxe.vwx}# "
"inside"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:366
+#: en/user_basics.ssi:347
msgid "_* Paste this text inside:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:374
+#: en/user_basics.ssi:355
#, no-wrap
msgid ""
" #!/usr/bin/vmware\n"
@@ -1015,7 +990,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:380
+#: en/user_basics.ssi:361
#, no-wrap
msgid ""
" ide0:0.present = \"FALSE\"\n"
@@ -1026,7 +1001,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:383
+#: en/user_basics.ssi:364
#, no-wrap
msgid ""
" ethernet0.present = \"TRUE\"\n"
@@ -1034,7 +1009,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:386
+#: en/user_basics.ssi:367
#, no-wrap
msgid ""
" displayName = \"Test Boot PXE\"\n"
@@ -1042,7 +1017,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:391
+#: en/user_basics.ssi:372
#, no-wrap
msgid ""
" ethernet0.generatedAddress = \"00:0c:29:8d:71:3b\"\n"
@@ -1052,19 +1027,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:395
+#: en/user_basics.ssi:376
msgid ""
"_* You can play with this configuration file (e.g. change memory limit to "
"256)"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:397
+#: en/user_basics.ssi:378
msgid ""
"_* Double click on this file (or run VMWare player and select this file)."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:398
+#: en/user_basics.ssi:379
msgid "_* When running just press space if that strange question comes up..."
msgstr ""
diff --git a/manual/po/pt_BR/user_examples.ssi.po b/manual/po/pt_BR/user_examples.ssi.po
index 7d2295a..a6f8c78 100644
--- a/manual/po/pt_BR/user_examples.ssi.po
+++ b/manual/po/pt_BR/user_examples.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2010-12-19 20:37-0400\n"
+"POT-Creation-Date: 2011-03-18 07:39-0200\n"
"PO-Revision-Date: 2010-11-04 16:34-0400\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -24,21 +24,21 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
-#: en/about_manual.ssi:170 en/project_bugs.ssi:58
+#: en/about_manual.ssi:146 en/about_manual.ssi:157 en/about_manual.ssi:165
+#: en/about_manual.ssi:173 en/project_bugs.ssi:60
#: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
#: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
#: en/project_procedures.ssi:58 en/user_basics.ssi:30 en/user_basics.ssi:40
-#: en/user_basics.ssi:52 en/user_basics.ssi:64 en/user_basics.ssi:76
-#: en/user_basics.ssi:86 en/user_basics.ssi:100 en/user_basics.ssi:108
-#: en/user_basics.ssi:116 en/user_basics.ssi:126 en/user_basics.ssi:140
-#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
-#: en/user_basics.ssi:182 en/user_basics.ssi:190 en/user_basics.ssi:200
-#: en/user_basics.ssi:218 en/user_basics.ssi:246 en/user_basics.ssi:262
-#: en/user_basics.ssi:270 en/user_basics.ssi:290 en/user_basics.ssi:315
+#: en/user_basics.ssi:56 en/user_basics.ssi:71 en/user_basics.ssi:106
+#: en/user_basics.ssi:114 en/user_basics.ssi:126 en/user_basics.ssi:138
+#: en/user_basics.ssi:150 en/user_basics.ssi:158 en/user_basics.ssi:166
+#: en/user_basics.ssi:182 en/user_basics.ssi:192 en/user_basics.ssi:200
+#: en/user_basics.ssi:216 en/user_basics.ssi:224 en/user_basics.ssi:234
+#: en/user_basics.ssi:252 en/user_basics.ssi:280 en/user_basics.ssi:296
+#: en/user_basics.ssi:304 en/user_basics.ssi:324 en/user_basics.ssi:349
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
@@ -64,7 +64,7 @@ msgstr ""
#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
-#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:106
+#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:105
#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
#: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
@@ -88,21 +88,21 @@ msgstr "code{"
#. type: Plain text
#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
-#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
-#: en/about_manual.ssi:174 en/project_bugs.ssi:62
+#: en/about_manual.ssi:151 en/about_manual.ssi:161 en/about_manual.ssi:169
+#: en/about_manual.ssi:177 en/project_bugs.ssi:64
#: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
#: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
#: en/project_procedures.ssi:131 en/user_basics.ssi:34 en/user_basics.ssi:44
-#: en/user_basics.ssi:58 en/user_basics.ssi:70 en/user_basics.ssi:80
-#: en/user_basics.ssi:92 en/user_basics.ssi:104 en/user_basics.ssi:112
-#: en/user_basics.ssi:120 en/user_basics.ssi:130 en/user_basics.ssi:146
-#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
-#: en/user_basics.ssi:186 en/user_basics.ssi:194 en/user_basics.ssi:204
-#: en/user_basics.ssi:238 en/user_basics.ssi:250 en/user_basics.ssi:266
-#: en/user_basics.ssi:274 en/user_basics.ssi:301 en/user_basics.ssi:340
+#: en/user_basics.ssi:62 en/user_basics.ssi:75 en/user_basics.ssi:110
+#: en/user_basics.ssi:118 en/user_basics.ssi:132 en/user_basics.ssi:142
+#: en/user_basics.ssi:154 en/user_basics.ssi:162 en/user_basics.ssi:170
+#: en/user_basics.ssi:186 en/user_basics.ssi:196 en/user_basics.ssi:204
+#: en/user_basics.ssi:220 en/user_basics.ssi:228 en/user_basics.ssi:238
+#: en/user_basics.ssi:272 en/user_basics.ssi:284 en/user_basics.ssi:300
+#: en/user_basics.ssi:308 en/user_basics.ssi:335 en/user_basics.ssi:374
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:37
@@ -124,11 +124,11 @@ msgstr "code{"
#: en/user_customization-packages.ssi:307
#: en/user_customization-packages.ssi:317
#: en/user_customization-packages.ssi:344
-#: en/user_customization-packages.ssi:354 en/user_customization-runtime.ssi:18
+#: en/user_customization-packages.ssi:353 en/user_customization-runtime.ssi:18
#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
-#: en/user_customization-runtime.ssi:102 en/user_customization-runtime.ssi:111
+#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:110
#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
#: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
#: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
@@ -141,7 +141,7 @@ msgstr "code{"
#: en/user_installation.ssi:70 en/user_installation.ssi:78
#: en/user_installation.ssi:86 en/user_installation.ssi:94
#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_installation.ssi:150 en/user_managing_a_configuration.ssi:31
+#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
@@ -150,7 +150,7 @@ msgid "}code"
msgstr "}code"
#. type: Plain text
-#: en/user_basics.ssi:42 en/user_basics.ssi:118 en/user_basics.ssi:202
+#: en/user_basics.ssi:42 en/user_basics.ssi:168 en/user_basics.ssi:236
#: en/user_examples.ssi:109 en/user_examples.ssi:208
#, no-wrap
msgid " # lb build\n"
@@ -264,7 +264,7 @@ msgid ""
"with-qemu and {Testing an ISO image with virtualbox-ose}#testing-iso-with-"
"virtualbox, or else imaged onto optical media or a USB flash device as "
"described in {Burning an ISO image to a physical medium}#burning-iso-image "
-"and {Copying USB/HDD image to a USB stick}#copying-usb-hdd-image, "
+"and {Copying an ISO hybrid image to a USB stick}#copying-iso-hybrid-to-usb, "
"respectively."
msgstr ""
@@ -743,7 +743,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:299
+#: en/user_examples.ssi:298
msgid ""
"Note that we have included the #{debian-installer-launcher}# package to "
"launch the installer from the live desktop, and have also specified the 486 "
diff --git a/manual/po/ro/live-manual.ssm.po b/manual/po/ro/live-manual.ssm.po
index 97faf6b..adb86e7 100644
--- a/manual/po/ro/live-manual.ssm.po
+++ b/manual/po/ro/live-manual.ssm.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-03-17 18:01-0200\n"
+"POT-Creation-Date: 2011-03-18 07:39-0200\n"
"PO-Revision-Date: 2010-10-23 00:04+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -46,7 +46,7 @@ msgstr ""
#, no-wrap
msgid ""
"@date:\n"
-" :published: 2011-03-17\n"
+" :published: 2011-03-18\n"
msgstr ""
#. type: Plain text
diff --git a/manual/po/ro/user_basics.ssi.po b/manual/po/ro/user_basics.ssi.po
index a4a20a8..ec4bbb7 100644
--- a/manual/po/ro/user_basics.ssi.po
+++ b/manual/po/ro/user_basics.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-03-17 18:01-0200\n"
+"POT-Creation-Date: 2011-03-18 07:39-0200\n"
"PO-Revision-Date: 2010-10-23 16:43+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -28,14 +28,13 @@ msgstr ""
#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
#: en/project_procedures.ssi:58 en/user_basics.ssi:30 en/user_basics.ssi:40
-#: en/user_basics.ssi:56 en/user_basics.ssi:72 en/user_basics.ssi:107
-#: en/user_basics.ssi:115 en/user_basics.ssi:127 en/user_basics.ssi:139
-#: en/user_basics.ssi:151 en/user_basics.ssi:159 en/user_basics.ssi:167
-#: en/user_basics.ssi:179 en/user_basics.ssi:193 en/user_basics.ssi:205
-#: en/user_basics.ssi:213 en/user_basics.ssi:221 en/user_basics.ssi:235
-#: en/user_basics.ssi:243 en/user_basics.ssi:253 en/user_basics.ssi:271
-#: en/user_basics.ssi:299 en/user_basics.ssi:315 en/user_basics.ssi:323
-#: en/user_basics.ssi:343 en/user_basics.ssi:368
+#: en/user_basics.ssi:56 en/user_basics.ssi:71 en/user_basics.ssi:106
+#: en/user_basics.ssi:114 en/user_basics.ssi:126 en/user_basics.ssi:138
+#: en/user_basics.ssi:150 en/user_basics.ssi:158 en/user_basics.ssi:166
+#: en/user_basics.ssi:182 en/user_basics.ssi:192 en/user_basics.ssi:200
+#: en/user_basics.ssi:216 en/user_basics.ssi:224 en/user_basics.ssi:234
+#: en/user_basics.ssi:252 en/user_basics.ssi:280 en/user_basics.ssi:296
+#: en/user_basics.ssi:304 en/user_basics.ssi:324 en/user_basics.ssi:349
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
@@ -93,14 +92,13 @@ msgstr "code{"
#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
#: en/project_procedures.ssi:131 en/user_basics.ssi:34 en/user_basics.ssi:44
-#: en/user_basics.ssi:62 en/user_basics.ssi:76 en/user_basics.ssi:111
-#: en/user_basics.ssi:119 en/user_basics.ssi:133 en/user_basics.ssi:143
-#: en/user_basics.ssi:155 en/user_basics.ssi:163 en/user_basics.ssi:171
-#: en/user_basics.ssi:183 en/user_basics.ssi:199 en/user_basics.ssi:209
-#: en/user_basics.ssi:217 en/user_basics.ssi:225 en/user_basics.ssi:239
-#: en/user_basics.ssi:247 en/user_basics.ssi:257 en/user_basics.ssi:291
-#: en/user_basics.ssi:303 en/user_basics.ssi:319 en/user_basics.ssi:327
-#: en/user_basics.ssi:354 en/user_basics.ssi:393
+#: en/user_basics.ssi:62 en/user_basics.ssi:75 en/user_basics.ssi:110
+#: en/user_basics.ssi:118 en/user_basics.ssi:132 en/user_basics.ssi:142
+#: en/user_basics.ssi:154 en/user_basics.ssi:162 en/user_basics.ssi:170
+#: en/user_basics.ssi:186 en/user_basics.ssi:196 en/user_basics.ssi:204
+#: en/user_basics.ssi:220 en/user_basics.ssi:228 en/user_basics.ssi:238
+#: en/user_basics.ssi:272 en/user_basics.ssi:284 en/user_basics.ssi:300
+#: en/user_basics.ssi:308 en/user_basics.ssi:335 en/user_basics.ssi:374
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:37
@@ -175,7 +173,7 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:8
-msgid "2~ What is a live system?"
+msgid "2~what-is-live What is a live system?"
msgstr ""
#. type: Plain text
@@ -243,7 +241,7 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:24
-msgid "2~ First steps: building an ISO hybrid image"
+msgid "2~building-iso-hybrid First steps: building an ISO hybrid image"
msgstr ""
#. type: Plain text
@@ -285,7 +283,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:42 en/user_basics.ssi:169 en/user_basics.ssi:255
+#: en/user_basics.ssi:42 en/user_basics.ssi:168 en/user_basics.ssi:236
#: en/user_examples.ssi:109 en/user_examples.ssi:208
#, no-wrap
msgid " # lb build\n"
@@ -301,7 +299,7 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:48
-msgid "2~ Using an ISO hybrid live image"
+msgid "2~using-iso-hybrid Using an ISO hybrid live image"
msgstr ""
#. type: Plain text
@@ -344,41 +342,36 @@ msgstr ""
#: en/user_basics.ssi:66
msgid ""
"ISO images prepared with the #{isohybrid}# command, like the images produced "
-"by live-build's default #{iso-hybrid}# binary image type, can be copied to a "
-"USB stick and directly booted without further steps. Plug in a USB stick "
-"with a size larger than that of #{binary-hybrid.iso}# and determine which "
-"device it is, which we hereafter refer to as #{${USBSTICK}}#. This is the "
-"device file of your key, such as #{/dev/sdb}#, not a partition, such as #{/"
-"dev/sdb1}#! You can find the right device name by looking in #{dmesg}#'s "
-"output after plugging in the stick, or better yet, #{ls -l /dev/disk/by-id}#."
+"by the default #{iso-hybrid}# binary image type, can be simply copied to a "
+"USB stick with the #{dd}# program or an equivalent. Plug in a USB stick with "
+"a size larger than that of #{binary-hybrid.iso}# and determine which device "
+"it is, which we hereafter refer to as #{${USBSTICK}}#. This is the device "
+"file of your key, such as #{/dev/sdb}#, not a partition, such as #{/dev/sdb1}"
+"#! You can find the right device name by looking in #{dmesg}#'s output after "
+"plugging in the stick, or better yet, #{ls -l /dev/disk/by-id}#."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:68 en/user_basics.ssi:187
-#, no-wrap
-msgid "*{This will definitely overwrite any previous contents on your stick!}*\n"
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:70
+#: en/user_basics.ssi:69
msgid ""
"Once you are certain you have the correct device name, use the #{dd}# "
-"command to copy the image to the stick as follows:"
+"command to copy the image to the stick. *{This will definitely overwrite "
+"any previous contents on your stick!}*"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:74
+#: en/user_basics.ssi:73
#, no-wrap
msgid " $ dd if=binary-hybrid.iso of=${USBSTICK}\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:79
-msgid "3~ Booting the live media"
+#: en/user_basics.ssi:78
+msgid "3~booting-live-media Booting the live media"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:81
+#: en/user_basics.ssi:80
msgid ""
"The first time you boot your live media, whether CD, DVD, USB key, or PXE "
"boot, some setup in your computer's BIOS may be needed first. Since BIOSes "
@@ -391,7 +384,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:83
+#: en/user_basics.ssi:82
msgid ""
"Once you've booted the media, you are presented with a boot menu. If you "
"just press enter here, the system will boot using the default entry, #{Live}"
@@ -401,7 +394,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:85
+#: en/user_basics.ssi:84
msgid ""
"Assuming you've selected #{Live}# and booted a default desktop live image, "
"after the boot messages scroll by, you should be automatically logged into "
@@ -412,59 +405,59 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:87
-msgid "2~ Using a virtual machine for testing"
+#: en/user_basics.ssi:86
+msgid "2~using-virtual-machine Using a virtual machine for testing"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:89
+#: en/user_basics.ssi:88
msgid ""
"It can be a great time-saver for the development of live images to run them "
"in a virtual machine (VM). This is not without its caveats:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:91
+#: en/user_basics.ssi:90
msgid ""
"_* Running a VM requires enough RAM for both the guest OS and the host and a "
"CPU with hardware support for virtualization is recommended."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:93
+#: en/user_basics.ssi:92
msgid ""
"_* There are some inherent limitations to running on a VM, e.g. poor video "
"performance, limited choice of emulated hardware."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:95
+#: en/user_basics.ssi:94
msgid ""
"_* When developing for specific hardware, there is no substitute for running "
"on the hardware itself."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:97
+#: en/user_basics.ssi:96
msgid ""
"_* Occasionally there are bugs that relate only to running in a VM. When in "
"doubt, test your image directly on the hardware."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:99
+#: en/user_basics.ssi:98
msgid ""
"Provided you can work within these constraints, survey the available VM "
"software and choose one that is suitable for your needs."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:101
+#: en/user_basics.ssi:100
msgid "3~testing-iso-with-qemu Testing an ISO image with QEMU"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:103
+#: en/user_basics.ssi:102
msgid ""
"The most versatile VM in Debian is QEMU. If your processor has hardware "
"support for virtualization, use the #{qemu-kvm}# package; the #{qemu-kvm}# "
@@ -472,7 +465,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:105
+#: en/user_basics.ssi:104
msgid ""
"First, install #{qemu-kvm}# if your processor supports it. If not, install #"
"{qemu}#, in which case the program name is #{qemu}# instead of #{kvm}# in "
@@ -481,58 +474,58 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:109
+#: en/user_basics.ssi:108
#, no-wrap
msgid " # apt-get install qemu-kvm qemu-utils\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:113
+#: en/user_basics.ssi:112
msgid "Booting an ISO image is simple:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:117
+#: en/user_basics.ssi:116
#, no-wrap
msgid " $ kvm -cdrom binary-hybrid.iso\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:121
+#: en/user_basics.ssi:120
msgid "See the man pages for more details."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:123
+#: en/user_basics.ssi:122
msgid "3~testing-iso-with-virtualbox Testing an ISO image with virtualbox-ose"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:125
+#: en/user_basics.ssi:124
msgid "In order to test the ISO with virtualbox-ose:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:129
+#: en/user_basics.ssi:128
#, no-wrap
msgid " # apt-get install virtualbox-ose virtualbox-ose-dkms\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:131
+#: en/user_basics.ssi:130
#, no-wrap
msgid " $ virtualbox\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:135
+#: en/user_basics.ssi:134
msgid ""
"Create a new virtual machine, change the storage settings to use binary-"
"hybrid.iso as the CD/DVD device, and start the machine."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:137
+#: en/user_basics.ssi:136
msgid ""
"Note: For live systems containing X.org that you want to test with #"
"{virtualbox-ose}#, you may wish to include the VirtualBox X.org driver "
@@ -541,177 +534,159 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:141
+#: en/user_basics.ssi:140
#, no-wrap
msgid " $ lb config --packages virtualbox-ose-guest-x11\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:145
-msgid "2~ Building a USB/HDD image"
+#: en/user_basics.ssi:144
+msgid "2~building-usb-hdd Building a USB/HDD image"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:147
+#: en/user_basics.ssi:146
msgid ""
-"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. Normally, an ISO hybrid image can be used for this purpose instead, "
-"but if you have a BIOS which does not handle hybrid images properly, or want "
-"to use the remaining space on the media for a persistence partition, you "
-"need a USB/HDD image."
+"Building a USB/HDD image is similar to ISO hybrid in all respects except you "
+"specify #{--b usb-hdd}# and the resulting filename is #{binary.img}# which "
+"cannot be burnt to optical media. It is suitable for booting from USB "
+"sticks, USB hard drives, and various other portable storage devices. "
+"Normally, an ISO hybrid image can be used for this purpose instead, but if "
+"you have a BIOS which does not handle hybrid images properly, or want to use "
+"the remaining space on the media for some purpose, such as a persistence "
+"partition, you need a USB/HDD image."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:149
+#: en/user_basics.ssi:148
msgid ""
-"Note: if you created an ISO image with the previous example, you will need "
-"to clean up your working directory with the #{lb clean}# command (see {The "
-"lb clean command}#lb-clean):"
+"Note: if you created an ISO hybrid image with the previous example, you will "
+"need to clean up your working directory with the #{lb clean}# command (see "
+"{The lb clean command}#lb-clean):"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:153 en/user_basics.ssi:237
+#: en/user_basics.ssi:152 en/user_basics.ssi:218
#, no-wrap
msgid " # lb clean --binary\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:157
+#: en/user_basics.ssi:156
msgid ""
-"Run the #{lb config}# command with the parameters to configure the #{config/}"
-"# hierarchy to create a USB/HDD image type:"
+"Run the #{lb config}# command as before, except this time specifying the USB/"
+"HDD image type:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:161
+#: en/user_basics.ssi:160
#, no-wrap
msgid " $ lb config -b usb-hdd\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:165 en/user_basics.ssi:251
+#: en/user_basics.ssi:164 en/user_basics.ssi:232
msgid "Now build the image with the #{lb build}# command:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:173
-msgid "3~copying-usb-hdd-image Copying USB/HDD image to a USB stick"
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:175
-msgid ""
-"% FIXME: eliminate duplication with ISO hybrid, as these are virtually the "
-"same instructions!"
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:177
+#: en/user_basics.ssi:172
msgid ""
-"The generated binary image contains a VFAT partition and the syslinux "
-"bootloader, ready to be directly written on a USB stick. Plug in a USB stick "
-"with a size larger than that of binary.img and type:"
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:181
-#, no-wrap
-msgid " $ dd if=binary.img of=${USBSTICK}\n"
+"When the build finishes, a #{binary.img}# file should be present in the "
+"current directory."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:185
-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 "
-"looking in #{dmesg}#'s output after plugging in the stick, for example, or "
-"better yet, #{ls -l /dev/disk/by-id}#."
+#: en/user_basics.ssi:174
+msgid "2~using-usb-hdd-image Using a USB/HDD image"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:189
+#: en/user_basics.ssi:176
msgid ""
-"Note: As discussed earlier, this same process can be used for #{iso-hybrid}# "
-"type images (suffixed #{-hybrid.iso}#), but not #{iso}# type images."
+"The generated binary image contains a VFAT partition and the syslinux "
+"bootloader, ready to be directly written on a USB stick. Since using a USB/"
+"HDD image is just like using an ISO hybrid image on USB, follow the "
+"instructions in #{Using an ISO hybrid live image}#using-iso-hybrid, except "
+"use the filename #{binary.img}# instead of #{binary-hybrid.iso}#."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:191
+#: en/user_basics.ssi:178
msgid "3~testing-usb-hdd-with-qemu Testing a USB/HDD image with Qemu"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:195
-#, no-wrap
-msgid " # apt-get install qemu\n"
+#: en/user_basics.ssi:180
+msgid ""
+"First, install QEMU as described above in #{Testing an ISO image with QEMU}"
+"#testing-iso-with-qemu. Then run #{kvm}# or #{qemu}#, depending on which "
+"version your host system needs, specifying #{binary.img}# as the first hard "
+"drive."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:197
+#: en/user_basics.ssi:184
#, no-wrap
-msgid " $ qemu -hda binary.img\n"
+msgid " $ kvm -hda binary.img\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:201
-msgid "3~ Using the space left on a USB stick"
+#: en/user_basics.ssi:188
+msgid "3~using-usb-extra-space Using the space left on a USB stick"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:203
+#: en/user_basics.ssi:190
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."
+"To use the remaining free space after copying #{binary.img}# to a USB stick, "
+"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/user_basics.ssi:207
+#: en/user_basics.ssi:194
#, no-wrap
msgid " # gparted ${USBSTICK}\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:211
+#: en/user_basics.ssi:198
msgid ""
-"After the creation of the partition, where #{${PARTITION}}# is the name of "
-"the partition, like #{/dev/sdb2}#, you have to create a filesystem on it. "
-"One possible choice would be ext4."
+"After the partition is created, where #{${PARTITION}}# is the name of the "
+"partition, such as #{/dev/sdb2}#, you have to create a filesystem on it. One "
+"possible choice would be ext4."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:215
+#: en/user_basics.ssi:202
#, no-wrap
msgid " # mkfs.ext4 ${PARTITION}\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:219
-msgid "If you want to use this data partition with Windows, use FAT32."
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:223
-#, no-wrap
-msgid " # mkfs.vfat -F 32\n"
+#: en/user_basics.ssi:206
+msgid ""
+"Note: If you want to use the extra space with Windows, apparently that OS "
+"cannot normally access any partitions but the first. Some solutions to this "
+"problem have been discussed on our #{mailing list}#contact, but it seems "
+"there are no easy answers."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:227
+#: en/user_basics.ssi:208
#, no-wrap
-msgid "*{Remember: Every time you install a new binary.img on the stick, all data on the stick will be lost because the partition table is overwritten by the contents of the image.}*\n"
+msgid "*{Remember: Every time you install a new binary.img on the stick, all data on the stick will be lost because the partition table is overwritten by the contents of the image, so back up your extra partition first to restore again after updating the live image.}*\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:229
+#: en/user_basics.ssi:210
msgid "2~building-netboot-image Building a netboot image"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:231
+#: en/user_basics.ssi:212
msgid ""
"The following sequence of commands will create a basic netboot image "
"containing the Debian standard system without X.org. It is suitable for "
@@ -719,27 +694,27 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:233
+#: en/user_basics.ssi:214
msgid ""
"Note: if you performed any previous examples, you will need to clean up your "
"working directory with the #{lb clean}# command:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:241
+#: en/user_basics.ssi:222
msgid ""
"Run the #{lb config}# command as follows to configure your image for "
"netbooting:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:245
+#: en/user_basics.ssi:226
#, no-wrap
msgid " $ lb config -b net --net-root-path \"/srv/debian-live\" --net-root-server \"192.168.0.1\"\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:249
+#: en/user_basics.ssi:230
msgid ""
"In contrast with the ISO and USB/HDD images, netbooting does not, itself, "
"serve the filesystem image to the client, so the files must be served via "
@@ -750,7 +725,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:259
+#: en/user_basics.ssi:240
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 "
@@ -761,7 +736,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:261
+#: en/user_basics.ssi:242
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 #"
@@ -770,19 +745,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:263
+#: en/user_basics.ssi:244
msgid ""
"We must now configure three services on the server to enable netboot: the "
"DHCP server, the TFTP server and the NFS server."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:265
+#: en/user_basics.ssi:246
msgid "3~ DHCP server"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:267
+#: en/user_basics.ssi:248
msgid ""
"We must configure our network's DHCP server to be sure to give an IP address "
"to the netbooting client system, and to advertise the location of the PXE "
@@ -790,26 +765,26 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:269
+#: en/user_basics.ssi:250
msgid ""
"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/user_basics.ssi:273
+#: en/user_basics.ssi:254
#, no-wrap
msgid " # /etc/dhcp/dhcpd.conf - configuration file for isc-dhcp-server\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:275
+#: en/user_basics.ssi:256
#, no-wrap
msgid " ddns-update-style none;\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:278
+#: en/user_basics.ssi:259
#, no-wrap
msgid ""
" option domain-name \"example.org\";\n"
@@ -817,7 +792,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:281
+#: en/user_basics.ssi:262
#, no-wrap
msgid ""
" default-lease-time 600;\n"
@@ -825,13 +800,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:283
+#: en/user_basics.ssi:264
#, no-wrap
msgid " log-facility local7;\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:289
+#: en/user_basics.ssi:270
#, no-wrap
msgid ""
" subnet 192.168.0.0 netmask 255.255.255.0 {\n"
@@ -842,17 +817,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:293
+#: en/user_basics.ssi:274
msgid "3~ TFTP server"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:295
+#: en/user_basics.ssi:276
msgid "This serves the kernel and initial ramdisk to the system at run time."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:297
+#: en/user_basics.ssi:278
msgid ""
"You should install the tftpd-hpa package. It can serve all files contained "
"inside a root directory, usually #{/srv/tftp}#. To let it serve files inside "
@@ -860,23 +835,23 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:301
+#: en/user_basics.ssi:282
#, no-wrap
msgid " # dpkg-reconfigure -plow tftpd-hpa\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:305
+#: en/user_basics.ssi:286
msgid "and fill in the new tftp server directory when being asked about it."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:307
+#: en/user_basics.ssi:288
msgid "3~ NFS server"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:309
+#: en/user_basics.ssi:290
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 "
@@ -884,37 +859,37 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:311
+#: en/user_basics.ssi:292
msgid "You need to install the #{nfs-kernel-server}# package."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:313
+#: en/user_basics.ssi:294
msgid ""
"Then, make the filesystem image available through NFS by adding a line like "
"the following to #{/etc/exports}#:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:317
+#: en/user_basics.ssi:298
#, no-wrap
msgid " /srv/debian-live *(ro,async,no_root_squash,no_subtree_check)\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:321
+#: en/user_basics.ssi:302
msgid ""
"and tell the NFS server about this new export with the following command:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:325
+#: en/user_basics.ssi:306
#, no-wrap
msgid " # exportfs -rv\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:329
+#: en/user_basics.ssi:310
msgid ""
"Setting up these three services can be a little tricky. You might need some "
"patience to get all of them working together. For more information, see the "
@@ -925,40 +900,40 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:331
+#: en/user_basics.ssi:312
msgid "3~ Netboot testing HowTo"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:333
+#: en/user_basics.ssi:314
msgid ""
"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/user_basics.ssi:335
+#: en/user_basics.ssi:316
msgid ""
"To make our life easier, we can use virtualization. There are two solutions."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:337
+#: en/user_basics.ssi:318
msgid "3~ Qemu"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:339
+#: en/user_basics.ssi:320
msgid "_* Install #{qemu}#, #{bridge-utils}#, #{sudo}#."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:341
+#: en/user_basics.ssi:322
msgid "Edit #{/etc/qemu-ifup}#:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:352
+#: en/user_basics.ssi:333
#, no-wrap
msgid ""
" #!/bin/sh\n"
@@ -972,40 +947,40 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:356
+#: en/user_basics.ssi:337
msgid "Get, or build a #{grub-floppy-netboot}# (in the svn)."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:358
+#: en/user_basics.ssi:339
msgid ""
"Launch #{qemu}# with \"#{-net nic,vlan=0 -net tap,vlan=0,ifname=tun0}#\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:360
+#: en/user_basics.ssi:341
msgid "3~ VMWare Player"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:362
+#: en/user_basics.ssi:343
msgid "_* Install VMWare Player (\"free as in beer\" edition)"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:364
+#: en/user_basics.ssi:345
msgid ""
"_* Create a PXETester directory, and create a text file called #{pxe.vwx}# "
"inside"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:366
+#: en/user_basics.ssi:347
msgid "_* Paste this text inside:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:374
+#: en/user_basics.ssi:355
#, no-wrap
msgid ""
" #!/usr/bin/vmware\n"
@@ -1016,7 +991,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:380
+#: en/user_basics.ssi:361
#, no-wrap
msgid ""
" ide0:0.present = \"FALSE\"\n"
@@ -1027,7 +1002,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:383
+#: en/user_basics.ssi:364
#, no-wrap
msgid ""
" ethernet0.present = \"TRUE\"\n"
@@ -1035,7 +1010,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:386
+#: en/user_basics.ssi:367
#, no-wrap
msgid ""
" displayName = \"Test Boot PXE\"\n"
@@ -1043,7 +1018,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:391
+#: en/user_basics.ssi:372
#, no-wrap
msgid ""
" ethernet0.generatedAddress = \"00:0c:29:8d:71:3b\"\n"
@@ -1053,19 +1028,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:395
+#: en/user_basics.ssi:376
msgid ""
"_* You can play with this configuration file (e.g. change memory limit to "
"256)"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:397
+#: en/user_basics.ssi:378
msgid ""
"_* Double click on this file (or run VMWare player and select this file)."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:398
+#: en/user_basics.ssi:379
msgid "_* When running just press space if that strange question comes up..."
msgstr ""
diff --git a/manual/po/ro/user_examples.ssi.po b/manual/po/ro/user_examples.ssi.po
index 7314afb..b299e57 100644
--- a/manual/po/ro/user_examples.ssi.po
+++ b/manual/po/ro/user_examples.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2010-12-19 20:37-0400\n"
+"POT-Creation-Date: 2011-03-18 07:39-0200\n"
"PO-Revision-Date: 2010-11-04 16:34-0400\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -25,21 +25,21 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
-#: en/about_manual.ssi:170 en/project_bugs.ssi:58
+#: en/about_manual.ssi:146 en/about_manual.ssi:157 en/about_manual.ssi:165
+#: en/about_manual.ssi:173 en/project_bugs.ssi:60
#: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
#: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
#: en/project_procedures.ssi:58 en/user_basics.ssi:30 en/user_basics.ssi:40
-#: en/user_basics.ssi:52 en/user_basics.ssi:64 en/user_basics.ssi:76
-#: en/user_basics.ssi:86 en/user_basics.ssi:100 en/user_basics.ssi:108
-#: en/user_basics.ssi:116 en/user_basics.ssi:126 en/user_basics.ssi:140
-#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
-#: en/user_basics.ssi:182 en/user_basics.ssi:190 en/user_basics.ssi:200
-#: en/user_basics.ssi:218 en/user_basics.ssi:246 en/user_basics.ssi:262
-#: en/user_basics.ssi:270 en/user_basics.ssi:290 en/user_basics.ssi:315
+#: en/user_basics.ssi:56 en/user_basics.ssi:71 en/user_basics.ssi:106
+#: en/user_basics.ssi:114 en/user_basics.ssi:126 en/user_basics.ssi:138
+#: en/user_basics.ssi:150 en/user_basics.ssi:158 en/user_basics.ssi:166
+#: en/user_basics.ssi:182 en/user_basics.ssi:192 en/user_basics.ssi:200
+#: en/user_basics.ssi:216 en/user_basics.ssi:224 en/user_basics.ssi:234
+#: en/user_basics.ssi:252 en/user_basics.ssi:280 en/user_basics.ssi:296
+#: en/user_basics.ssi:304 en/user_basics.ssi:324 en/user_basics.ssi:349
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
@@ -65,7 +65,7 @@ msgstr ""
#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
-#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:106
+#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:105
#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
#: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
@@ -89,21 +89,21 @@ msgstr "code{"
#. type: Plain text
#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
-#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
-#: en/about_manual.ssi:174 en/project_bugs.ssi:62
+#: en/about_manual.ssi:151 en/about_manual.ssi:161 en/about_manual.ssi:169
+#: en/about_manual.ssi:177 en/project_bugs.ssi:64
#: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
#: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
#: en/project_procedures.ssi:131 en/user_basics.ssi:34 en/user_basics.ssi:44
-#: en/user_basics.ssi:58 en/user_basics.ssi:70 en/user_basics.ssi:80
-#: en/user_basics.ssi:92 en/user_basics.ssi:104 en/user_basics.ssi:112
-#: en/user_basics.ssi:120 en/user_basics.ssi:130 en/user_basics.ssi:146
-#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
-#: en/user_basics.ssi:186 en/user_basics.ssi:194 en/user_basics.ssi:204
-#: en/user_basics.ssi:238 en/user_basics.ssi:250 en/user_basics.ssi:266
-#: en/user_basics.ssi:274 en/user_basics.ssi:301 en/user_basics.ssi:340
+#: en/user_basics.ssi:62 en/user_basics.ssi:75 en/user_basics.ssi:110
+#: en/user_basics.ssi:118 en/user_basics.ssi:132 en/user_basics.ssi:142
+#: en/user_basics.ssi:154 en/user_basics.ssi:162 en/user_basics.ssi:170
+#: en/user_basics.ssi:186 en/user_basics.ssi:196 en/user_basics.ssi:204
+#: en/user_basics.ssi:220 en/user_basics.ssi:228 en/user_basics.ssi:238
+#: en/user_basics.ssi:272 en/user_basics.ssi:284 en/user_basics.ssi:300
+#: en/user_basics.ssi:308 en/user_basics.ssi:335 en/user_basics.ssi:374
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:37
@@ -125,11 +125,11 @@ msgstr "code{"
#: en/user_customization-packages.ssi:307
#: en/user_customization-packages.ssi:317
#: en/user_customization-packages.ssi:344
-#: en/user_customization-packages.ssi:354 en/user_customization-runtime.ssi:18
+#: en/user_customization-packages.ssi:353 en/user_customization-runtime.ssi:18
#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
-#: en/user_customization-runtime.ssi:102 en/user_customization-runtime.ssi:111
+#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:110
#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
#: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
#: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
@@ -142,7 +142,7 @@ msgstr "code{"
#: en/user_installation.ssi:70 en/user_installation.ssi:78
#: en/user_installation.ssi:86 en/user_installation.ssi:94
#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_installation.ssi:150 en/user_managing_a_configuration.ssi:31
+#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
@@ -151,7 +151,7 @@ msgid "}code"
msgstr "}code"
#. type: Plain text
-#: en/user_basics.ssi:42 en/user_basics.ssi:118 en/user_basics.ssi:202
+#: en/user_basics.ssi:42 en/user_basics.ssi:168 en/user_basics.ssi:236
#: en/user_examples.ssi:109 en/user_examples.ssi:208
#, no-wrap
msgid " # lb build\n"
@@ -265,7 +265,7 @@ msgid ""
"with-qemu and {Testing an ISO image with virtualbox-ose}#testing-iso-with-"
"virtualbox, or else imaged onto optical media or a USB flash device as "
"described in {Burning an ISO image to a physical medium}#burning-iso-image "
-"and {Copying USB/HDD image to a USB stick}#copying-usb-hdd-image, "
+"and {Copying an ISO hybrid image to a USB stick}#copying-iso-hybrid-to-usb, "
"respectively."
msgstr ""
@@ -744,7 +744,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:299
+#: en/user_examples.ssi:298
msgid ""
"Note that we have included the #{debian-installer-launcher}# package to "
"launch the installer from the live desktop, and have also specified the 486 "
diff --git a/manual/pot/live-manual.ssm.pot b/manual/pot/live-manual.ssm.pot
index 1ca8e3b..a0a62c7 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: 2011-03-17 18:01-0200\n"
+"POT-Creation-Date: 2011-03-18 07:39-0200\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"
@@ -45,7 +45,7 @@ msgstr ""
#, no-wrap
msgid ""
"@date:\n"
-" :published: 2011-03-17\n"
+" :published: 2011-03-18\n"
msgstr ""
#. type: Plain text
diff --git a/manual/pot/user_basics.ssi.pot b/manual/pot/user_basics.ssi.pot
index f87bd04..8324e34 100644
--- a/manual/pot/user_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: 2011-03-17 18:01-0200\n"
+"POT-Creation-Date: 2011-03-18 07:39-0200\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"
@@ -27,14 +27,13 @@ msgstr ""
#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
#: en/project_procedures.ssi:58 en/user_basics.ssi:30 en/user_basics.ssi:40
-#: en/user_basics.ssi:56 en/user_basics.ssi:72 en/user_basics.ssi:107
-#: en/user_basics.ssi:115 en/user_basics.ssi:127 en/user_basics.ssi:139
-#: en/user_basics.ssi:151 en/user_basics.ssi:159 en/user_basics.ssi:167
-#: en/user_basics.ssi:179 en/user_basics.ssi:193 en/user_basics.ssi:205
-#: en/user_basics.ssi:213 en/user_basics.ssi:221 en/user_basics.ssi:235
-#: en/user_basics.ssi:243 en/user_basics.ssi:253 en/user_basics.ssi:271
-#: en/user_basics.ssi:299 en/user_basics.ssi:315 en/user_basics.ssi:323
-#: en/user_basics.ssi:343 en/user_basics.ssi:368
+#: en/user_basics.ssi:56 en/user_basics.ssi:71 en/user_basics.ssi:106
+#: en/user_basics.ssi:114 en/user_basics.ssi:126 en/user_basics.ssi:138
+#: en/user_basics.ssi:150 en/user_basics.ssi:158 en/user_basics.ssi:166
+#: en/user_basics.ssi:182 en/user_basics.ssi:192 en/user_basics.ssi:200
+#: en/user_basics.ssi:216 en/user_basics.ssi:224 en/user_basics.ssi:234
+#: en/user_basics.ssi:252 en/user_basics.ssi:280 en/user_basics.ssi:296
+#: en/user_basics.ssi:304 en/user_basics.ssi:324 en/user_basics.ssi:349
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
@@ -92,14 +91,13 @@ msgstr ""
#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
#: en/project_procedures.ssi:131 en/user_basics.ssi:34 en/user_basics.ssi:44
-#: en/user_basics.ssi:62 en/user_basics.ssi:76 en/user_basics.ssi:111
-#: en/user_basics.ssi:119 en/user_basics.ssi:133 en/user_basics.ssi:143
-#: en/user_basics.ssi:155 en/user_basics.ssi:163 en/user_basics.ssi:171
-#: en/user_basics.ssi:183 en/user_basics.ssi:199 en/user_basics.ssi:209
-#: en/user_basics.ssi:217 en/user_basics.ssi:225 en/user_basics.ssi:239
-#: en/user_basics.ssi:247 en/user_basics.ssi:257 en/user_basics.ssi:291
-#: en/user_basics.ssi:303 en/user_basics.ssi:319 en/user_basics.ssi:327
-#: en/user_basics.ssi:354 en/user_basics.ssi:393
+#: en/user_basics.ssi:62 en/user_basics.ssi:75 en/user_basics.ssi:110
+#: en/user_basics.ssi:118 en/user_basics.ssi:132 en/user_basics.ssi:142
+#: en/user_basics.ssi:154 en/user_basics.ssi:162 en/user_basics.ssi:170
+#: en/user_basics.ssi:186 en/user_basics.ssi:196 en/user_basics.ssi:204
+#: en/user_basics.ssi:220 en/user_basics.ssi:228 en/user_basics.ssi:238
+#: en/user_basics.ssi:272 en/user_basics.ssi:284 en/user_basics.ssi:300
+#: en/user_basics.ssi:308 en/user_basics.ssi:335 en/user_basics.ssi:374
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:37
@@ -174,7 +172,7 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:8
-msgid "2~ What is a live system?"
+msgid "2~what-is-live What is a live system?"
msgstr ""
#. type: Plain text
@@ -242,7 +240,7 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:24
-msgid "2~ First steps: building an ISO hybrid image"
+msgid "2~building-iso-hybrid First steps: building an ISO hybrid image"
msgstr ""
#. type: Plain text
@@ -284,7 +282,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:42 en/user_basics.ssi:169 en/user_basics.ssi:255
+#: en/user_basics.ssi:42 en/user_basics.ssi:168 en/user_basics.ssi:236
#: en/user_examples.ssi:109 en/user_examples.ssi:208
#, no-wrap
msgid " # lb build\n"
@@ -300,7 +298,7 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:48
-msgid "2~ Using an ISO hybrid live image"
+msgid "2~using-iso-hybrid Using an ISO hybrid live image"
msgstr ""
#. type: Plain text
@@ -343,41 +341,36 @@ msgstr ""
#: en/user_basics.ssi:66
msgid ""
"ISO images prepared with the #{isohybrid}# command, like the images produced "
-"by live-build's default #{iso-hybrid}# binary image type, can be copied to a "
-"USB stick and directly booted without further steps. Plug in a USB stick "
-"with a size larger than that of #{binary-hybrid.iso}# and determine which "
-"device it is, which we hereafter refer to as #{${USBSTICK}}#. This is the "
-"device file of your key, such as #{/dev/sdb}#, not a partition, such as #{/"
-"dev/sdb1}#! You can find the right device name by looking in #{dmesg}#'s "
-"output after plugging in the stick, or better yet, #{ls -l /dev/disk/by-id}#."
+"by the default #{iso-hybrid}# binary image type, can be simply copied to a "
+"USB stick with the #{dd}# program or an equivalent. Plug in a USB stick with "
+"a size larger than that of #{binary-hybrid.iso}# and determine which device "
+"it is, which we hereafter refer to as #{${USBSTICK}}#. This is the device "
+"file of your key, such as #{/dev/sdb}#, not a partition, such as #{/dev/sdb1}"
+"#! You can find the right device name by looking in #{dmesg}#'s output after "
+"plugging in the stick, or better yet, #{ls -l /dev/disk/by-id}#."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:68 en/user_basics.ssi:187
-#, no-wrap
-msgid "*{This will definitely overwrite any previous contents on your stick!}*\n"
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:70
+#: en/user_basics.ssi:69
msgid ""
"Once you are certain you have the correct device name, use the #{dd}# "
-"command to copy the image to the stick as follows:"
+"command to copy the image to the stick. *{This will definitely overwrite "
+"any previous contents on your stick!}*"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:74
+#: en/user_basics.ssi:73
#, no-wrap
msgid " $ dd if=binary-hybrid.iso of=${USBSTICK}\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:79
-msgid "3~ Booting the live media"
+#: en/user_basics.ssi:78
+msgid "3~booting-live-media Booting the live media"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:81
+#: en/user_basics.ssi:80
msgid ""
"The first time you boot your live media, whether CD, DVD, USB key, or PXE "
"boot, some setup in your computer's BIOS may be needed first. Since BIOSes "
@@ -390,7 +383,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:83
+#: en/user_basics.ssi:82
msgid ""
"Once you've booted the media, you are presented with a boot menu. If you "
"just press enter here, the system will boot using the default entry, #{Live}"
@@ -400,7 +393,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:85
+#: en/user_basics.ssi:84
msgid ""
"Assuming you've selected #{Live}# and booted a default desktop live image, "
"after the boot messages scroll by, you should be automatically logged into "
@@ -411,59 +404,59 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:87
-msgid "2~ Using a virtual machine for testing"
+#: en/user_basics.ssi:86
+msgid "2~using-virtual-machine Using a virtual machine for testing"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:89
+#: en/user_basics.ssi:88
msgid ""
"It can be a great time-saver for the development of live images to run them "
"in a virtual machine (VM). This is not without its caveats:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:91
+#: en/user_basics.ssi:90
msgid ""
"_* Running a VM requires enough RAM for both the guest OS and the host and a "
"CPU with hardware support for virtualization is recommended."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:93
+#: en/user_basics.ssi:92
msgid ""
"_* There are some inherent limitations to running on a VM, e.g. poor video "
"performance, limited choice of emulated hardware."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:95
+#: en/user_basics.ssi:94
msgid ""
"_* When developing for specific hardware, there is no substitute for running "
"on the hardware itself."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:97
+#: en/user_basics.ssi:96
msgid ""
"_* Occasionally there are bugs that relate only to running in a VM. When in "
"doubt, test your image directly on the hardware."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:99
+#: en/user_basics.ssi:98
msgid ""
"Provided you can work within these constraints, survey the available VM "
"software and choose one that is suitable for your needs."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:101
+#: en/user_basics.ssi:100
msgid "3~testing-iso-with-qemu Testing an ISO image with QEMU"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:103
+#: en/user_basics.ssi:102
msgid ""
"The most versatile VM in Debian is QEMU. If your processor has hardware "
"support for virtualization, use the #{qemu-kvm}# package; the #{qemu-kvm}# "
@@ -471,7 +464,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:105
+#: en/user_basics.ssi:104
msgid ""
"First, install #{qemu-kvm}# if your processor supports it. If not, install #"
"{qemu}#, in which case the program name is #{qemu}# instead of #{kvm}# in "
@@ -480,58 +473,58 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:109
+#: en/user_basics.ssi:108
#, no-wrap
msgid " # apt-get install qemu-kvm qemu-utils\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:113
+#: en/user_basics.ssi:112
msgid "Booting an ISO image is simple:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:117
+#: en/user_basics.ssi:116
#, no-wrap
msgid " $ kvm -cdrom binary-hybrid.iso\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:121
+#: en/user_basics.ssi:120
msgid "See the man pages for more details."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:123
+#: en/user_basics.ssi:122
msgid "3~testing-iso-with-virtualbox Testing an ISO image with virtualbox-ose"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:125
+#: en/user_basics.ssi:124
msgid "In order to test the ISO with virtualbox-ose:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:129
+#: en/user_basics.ssi:128
#, no-wrap
msgid " # apt-get install virtualbox-ose virtualbox-ose-dkms\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:131
+#: en/user_basics.ssi:130
#, no-wrap
msgid " $ virtualbox\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:135
+#: en/user_basics.ssi:134
msgid ""
"Create a new virtual machine, change the storage settings to use binary-"
"hybrid.iso as the CD/DVD device, and start the machine."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:137
+#: en/user_basics.ssi:136
msgid ""
"Note: For live systems containing X.org that you want to test with #"
"{virtualbox-ose}#, you may wish to include the VirtualBox X.org driver "
@@ -540,177 +533,159 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:141
+#: en/user_basics.ssi:140
#, no-wrap
msgid " $ lb config --packages virtualbox-ose-guest-x11\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:145
-msgid "2~ Building a USB/HDD image"
+#: en/user_basics.ssi:144
+msgid "2~building-usb-hdd Building a USB/HDD image"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:147
+#: en/user_basics.ssi:146
msgid ""
-"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. Normally, an ISO hybrid image can be used for this purpose instead, "
-"but if you have a BIOS which does not handle hybrid images properly, or want "
-"to use the remaining space on the media for a persistence partition, you "
-"need a USB/HDD image."
+"Building a USB/HDD image is similar to ISO hybrid in all respects except you "
+"specify #{--b usb-hdd}# and the resulting filename is #{binary.img}# which "
+"cannot be burnt to optical media. It is suitable for booting from USB "
+"sticks, USB hard drives, and various other portable storage devices. "
+"Normally, an ISO hybrid image can be used for this purpose instead, but if "
+"you have a BIOS which does not handle hybrid images properly, or want to use "
+"the remaining space on the media for some purpose, such as a persistence "
+"partition, you need a USB/HDD image."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:149
+#: en/user_basics.ssi:148
msgid ""
-"Note: if you created an ISO image with the previous example, you will need "
-"to clean up your working directory with the #{lb clean}# command (see {The "
-"lb clean command}#lb-clean):"
+"Note: if you created an ISO hybrid image with the previous example, you will "
+"need to clean up your working directory with the #{lb clean}# command (see "
+"{The lb clean command}#lb-clean):"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:153 en/user_basics.ssi:237
+#: en/user_basics.ssi:152 en/user_basics.ssi:218
#, no-wrap
msgid " # lb clean --binary\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:157
+#: en/user_basics.ssi:156
msgid ""
-"Run the #{lb config}# command with the parameters to configure the #{config/}"
-"# hierarchy to create a USB/HDD image type:"
+"Run the #{lb config}# command as before, except this time specifying the USB/"
+"HDD image type:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:161
+#: en/user_basics.ssi:160
#, no-wrap
msgid " $ lb config -b usb-hdd\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:165 en/user_basics.ssi:251
+#: en/user_basics.ssi:164 en/user_basics.ssi:232
msgid "Now build the image with the #{lb build}# command:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:173
-msgid "3~copying-usb-hdd-image Copying USB/HDD image to a USB stick"
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:175
-msgid ""
-"% FIXME: eliminate duplication with ISO hybrid, as these are virtually the "
-"same instructions!"
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:177
+#: en/user_basics.ssi:172
msgid ""
-"The generated binary image contains a VFAT partition and the syslinux "
-"bootloader, ready to be directly written on a USB stick. Plug in a USB stick "
-"with a size larger than that of binary.img and type:"
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:181
-#, no-wrap
-msgid " $ dd if=binary.img of=${USBSTICK}\n"
+"When the build finishes, a #{binary.img}# file should be present in the "
+"current directory."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:185
-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 "
-"looking in #{dmesg}#'s output after plugging in the stick, for example, or "
-"better yet, #{ls -l /dev/disk/by-id}#."
+#: en/user_basics.ssi:174
+msgid "2~using-usb-hdd-image Using a USB/HDD image"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:189
+#: en/user_basics.ssi:176
msgid ""
-"Note: As discussed earlier, this same process can be used for #{iso-hybrid}# "
-"type images (suffixed #{-hybrid.iso}#), but not #{iso}# type images."
+"The generated binary image contains a VFAT partition and the syslinux "
+"bootloader, ready to be directly written on a USB stick. Since using a USB/"
+"HDD image is just like using an ISO hybrid image on USB, follow the "
+"instructions in #{Using an ISO hybrid live image}#using-iso-hybrid, except "
+"use the filename #{binary.img}# instead of #{binary-hybrid.iso}#."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:191
+#: en/user_basics.ssi:178
msgid "3~testing-usb-hdd-with-qemu Testing a USB/HDD image with Qemu"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:195
-#, no-wrap
-msgid " # apt-get install qemu\n"
+#: en/user_basics.ssi:180
+msgid ""
+"First, install QEMU as described above in #{Testing an ISO image with QEMU}"
+"#testing-iso-with-qemu. Then run #{kvm}# or #{qemu}#, depending on which "
+"version your host system needs, specifying #{binary.img}# as the first hard "
+"drive."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:197
+#: en/user_basics.ssi:184
#, no-wrap
-msgid " $ qemu -hda binary.img\n"
+msgid " $ kvm -hda binary.img\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:201
-msgid "3~ Using the space left on a USB stick"
+#: en/user_basics.ssi:188
+msgid "3~using-usb-extra-space Using the space left on a USB stick"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:203
+#: en/user_basics.ssi:190
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."
+"To use the remaining free space after copying #{binary.img}# to a USB stick, "
+"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/user_basics.ssi:207
+#: en/user_basics.ssi:194
#, no-wrap
msgid " # gparted ${USBSTICK}\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:211
+#: en/user_basics.ssi:198
msgid ""
-"After the creation of the partition, where #{${PARTITION}}# is the name of "
-"the partition, like #{/dev/sdb2}#, you have to create a filesystem on it. "
-"One possible choice would be ext4."
+"After the partition is created, where #{${PARTITION}}# is the name of the "
+"partition, such as #{/dev/sdb2}#, you have to create a filesystem on it. One "
+"possible choice would be ext4."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:215
+#: en/user_basics.ssi:202
#, no-wrap
msgid " # mkfs.ext4 ${PARTITION}\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:219
-msgid "If you want to use this data partition with Windows, use FAT32."
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:223
-#, no-wrap
-msgid " # mkfs.vfat -F 32\n"
+#: en/user_basics.ssi:206
+msgid ""
+"Note: If you want to use the extra space with Windows, apparently that OS "
+"cannot normally access any partitions but the first. Some solutions to this "
+"problem have been discussed on our #{mailing list}#contact, but it seems "
+"there are no easy answers."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:227
+#: en/user_basics.ssi:208
#, no-wrap
-msgid "*{Remember: Every time you install a new binary.img on the stick, all data on the stick will be lost because the partition table is overwritten by the contents of the image.}*\n"
+msgid "*{Remember: Every time you install a new binary.img on the stick, all data on the stick will be lost because the partition table is overwritten by the contents of the image, so back up your extra partition first to restore again after updating the live image.}*\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:229
+#: en/user_basics.ssi:210
msgid "2~building-netboot-image Building a netboot image"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:231
+#: en/user_basics.ssi:212
msgid ""
"The following sequence of commands will create a basic netboot image "
"containing the Debian standard system without X.org. It is suitable for "
@@ -718,27 +693,27 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:233
+#: en/user_basics.ssi:214
msgid ""
"Note: if you performed any previous examples, you will need to clean up your "
"working directory with the #{lb clean}# command:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:241
+#: en/user_basics.ssi:222
msgid ""
"Run the #{lb config}# command as follows to configure your image for "
"netbooting:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:245
+#: en/user_basics.ssi:226
#, no-wrap
msgid " $ lb config -b net --net-root-path \"/srv/debian-live\" --net-root-server \"192.168.0.1\"\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:249
+#: en/user_basics.ssi:230
msgid ""
"In contrast with the ISO and USB/HDD images, netbooting does not, itself, "
"serve the filesystem image to the client, so the files must be served via "
@@ -749,7 +724,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:259
+#: en/user_basics.ssi:240
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 "
@@ -760,7 +735,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:261
+#: en/user_basics.ssi:242
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 #"
@@ -769,19 +744,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:263
+#: en/user_basics.ssi:244
msgid ""
"We must now configure three services on the server to enable netboot: the "
"DHCP server, the TFTP server and the NFS server."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:265
+#: en/user_basics.ssi:246
msgid "3~ DHCP server"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:267
+#: en/user_basics.ssi:248
msgid ""
"We must configure our network's DHCP server to be sure to give an IP address "
"to the netbooting client system, and to advertise the location of the PXE "
@@ -789,26 +764,26 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:269
+#: en/user_basics.ssi:250
msgid ""
"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/user_basics.ssi:273
+#: en/user_basics.ssi:254
#, no-wrap
msgid " # /etc/dhcp/dhcpd.conf - configuration file for isc-dhcp-server\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:275
+#: en/user_basics.ssi:256
#, no-wrap
msgid " ddns-update-style none;\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:278
+#: en/user_basics.ssi:259
#, no-wrap
msgid ""
" option domain-name \"example.org\";\n"
@@ -816,7 +791,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:281
+#: en/user_basics.ssi:262
#, no-wrap
msgid ""
" default-lease-time 600;\n"
@@ -824,13 +799,13 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:283
+#: en/user_basics.ssi:264
#, no-wrap
msgid " log-facility local7;\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:289
+#: en/user_basics.ssi:270
#, no-wrap
msgid ""
" subnet 192.168.0.0 netmask 255.255.255.0 {\n"
@@ -841,17 +816,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:293
+#: en/user_basics.ssi:274
msgid "3~ TFTP server"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:295
+#: en/user_basics.ssi:276
msgid "This serves the kernel and initial ramdisk to the system at run time."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:297
+#: en/user_basics.ssi:278
msgid ""
"You should install the tftpd-hpa package. It can serve all files contained "
"inside a root directory, usually #{/srv/tftp}#. To let it serve files inside "
@@ -859,23 +834,23 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:301
+#: en/user_basics.ssi:282
#, no-wrap
msgid " # dpkg-reconfigure -plow tftpd-hpa\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:305
+#: en/user_basics.ssi:286
msgid "and fill in the new tftp server directory when being asked about it."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:307
+#: en/user_basics.ssi:288
msgid "3~ NFS server"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:309
+#: en/user_basics.ssi:290
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 "
@@ -883,37 +858,37 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:311
+#: en/user_basics.ssi:292
msgid "You need to install the #{nfs-kernel-server}# package."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:313
+#: en/user_basics.ssi:294
msgid ""
"Then, make the filesystem image available through NFS by adding a line like "
"the following to #{/etc/exports}#:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:317
+#: en/user_basics.ssi:298
#, no-wrap
msgid " /srv/debian-live *(ro,async,no_root_squash,no_subtree_check)\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:321
+#: en/user_basics.ssi:302
msgid ""
"and tell the NFS server about this new export with the following command:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:325
+#: en/user_basics.ssi:306
#, no-wrap
msgid " # exportfs -rv\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:329
+#: en/user_basics.ssi:310
msgid ""
"Setting up these three services can be a little tricky. You might need some "
"patience to get all of them working together. For more information, see the "
@@ -924,40 +899,40 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:331
+#: en/user_basics.ssi:312
msgid "3~ Netboot testing HowTo"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:333
+#: en/user_basics.ssi:314
msgid ""
"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/user_basics.ssi:335
+#: en/user_basics.ssi:316
msgid ""
"To make our life easier, we can use virtualization. There are two solutions."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:337
+#: en/user_basics.ssi:318
msgid "3~ Qemu"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:339
+#: en/user_basics.ssi:320
msgid "_* Install #{qemu}#, #{bridge-utils}#, #{sudo}#."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:341
+#: en/user_basics.ssi:322
msgid "Edit #{/etc/qemu-ifup}#:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:352
+#: en/user_basics.ssi:333
#, no-wrap
msgid ""
" #!/bin/sh\n"
@@ -971,40 +946,40 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:356
+#: en/user_basics.ssi:337
msgid "Get, or build a #{grub-floppy-netboot}# (in the svn)."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:358
+#: en/user_basics.ssi:339
msgid ""
"Launch #{qemu}# with \"#{-net nic,vlan=0 -net tap,vlan=0,ifname=tun0}#\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:360
+#: en/user_basics.ssi:341
msgid "3~ VMWare Player"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:362
+#: en/user_basics.ssi:343
msgid "_* Install VMWare Player (\"free as in beer\" edition)"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:364
+#: en/user_basics.ssi:345
msgid ""
"_* Create a PXETester directory, and create a text file called #{pxe.vwx}# "
"inside"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:366
+#: en/user_basics.ssi:347
msgid "_* Paste this text inside:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:374
+#: en/user_basics.ssi:355
#, no-wrap
msgid ""
" #!/usr/bin/vmware\n"
@@ -1015,7 +990,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:380
+#: en/user_basics.ssi:361
#, no-wrap
msgid ""
" ide0:0.present = \"FALSE\"\n"
@@ -1026,7 +1001,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:383
+#: en/user_basics.ssi:364
#, no-wrap
msgid ""
" ethernet0.present = \"TRUE\"\n"
@@ -1034,7 +1009,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:386
+#: en/user_basics.ssi:367
#, no-wrap
msgid ""
" displayName = \"Test Boot PXE\"\n"
@@ -1042,7 +1017,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:391
+#: en/user_basics.ssi:372
#, no-wrap
msgid ""
" ethernet0.generatedAddress = \"00:0c:29:8d:71:3b\"\n"
@@ -1052,19 +1027,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:395
+#: en/user_basics.ssi:376
msgid ""
"_* You can play with this configuration file (e.g. change memory limit to "
"256)"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:397
+#: en/user_basics.ssi:378
msgid ""
"_* Double click on this file (or run VMWare player and select this file)."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:398
+#: en/user_basics.ssi:379
msgid "_* When running just press space if that strange question comes up..."
msgstr ""
diff --git a/manual/pot/user_examples.ssi.pot b/manual/pot/user_examples.ssi.pot
index 1b9a83e..08b788e 100644
--- a/manual/pot/user_examples.ssi.pot
+++ b/manual/pot/user_examples.ssi.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-12-19 20:37-0400\n"
+"POT-Creation-Date: 2011-03-18 07:39-0200\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"
@@ -24,21 +24,21 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
-#: en/about_manual.ssi:170 en/project_bugs.ssi:58
+#: en/about_manual.ssi:146 en/about_manual.ssi:157 en/about_manual.ssi:165
+#: en/about_manual.ssi:173 en/project_bugs.ssi:60
#: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
#: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
#: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
#: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
#: en/project_procedures.ssi:12 en/project_procedures.ssi:46
#: en/project_procedures.ssi:58 en/user_basics.ssi:30 en/user_basics.ssi:40
-#: en/user_basics.ssi:52 en/user_basics.ssi:64 en/user_basics.ssi:76
-#: en/user_basics.ssi:86 en/user_basics.ssi:100 en/user_basics.ssi:108
-#: en/user_basics.ssi:116 en/user_basics.ssi:126 en/user_basics.ssi:140
-#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
-#: en/user_basics.ssi:182 en/user_basics.ssi:190 en/user_basics.ssi:200
-#: en/user_basics.ssi:218 en/user_basics.ssi:246 en/user_basics.ssi:262
-#: en/user_basics.ssi:270 en/user_basics.ssi:290 en/user_basics.ssi:315
+#: en/user_basics.ssi:56 en/user_basics.ssi:71 en/user_basics.ssi:106
+#: en/user_basics.ssi:114 en/user_basics.ssi:126 en/user_basics.ssi:138
+#: en/user_basics.ssi:150 en/user_basics.ssi:158 en/user_basics.ssi:166
+#: en/user_basics.ssi:182 en/user_basics.ssi:192 en/user_basics.ssi:200
+#: en/user_basics.ssi:216 en/user_basics.ssi:224 en/user_basics.ssi:234
+#: en/user_basics.ssi:252 en/user_basics.ssi:280 en/user_basics.ssi:296
+#: en/user_basics.ssi:304 en/user_basics.ssi:324 en/user_basics.ssi:349
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
@@ -64,7 +64,7 @@ msgstr ""
#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
#: en/user_customization-runtime.ssi:51 en/user_customization-runtime.ssi:59
#: en/user_customization-runtime.ssi:68 en/user_customization-runtime.ssi:89
-#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:106
+#: en/user_customization-runtime.ssi:97 en/user_customization-runtime.ssi:105
#: en/user_examples.ssi:14 en/user_examples.ssi:30 en/user_examples.ssi:40
#: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
@@ -88,21 +88,21 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
-#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:166
-#: en/about_manual.ssi:174 en/project_bugs.ssi:62
+#: en/about_manual.ssi:151 en/about_manual.ssi:161 en/about_manual.ssi:169
+#: en/about_manual.ssi:177 en/project_bugs.ssi:64
#: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
#: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
#: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
#: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
#: en/project_procedures.ssi:16 en/project_procedures.ssi:54
#: en/project_procedures.ssi:131 en/user_basics.ssi:34 en/user_basics.ssi:44
-#: en/user_basics.ssi:58 en/user_basics.ssi:70 en/user_basics.ssi:80
-#: en/user_basics.ssi:92 en/user_basics.ssi:104 en/user_basics.ssi:112
-#: en/user_basics.ssi:120 en/user_basics.ssi:130 en/user_basics.ssi:146
-#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
-#: en/user_basics.ssi:186 en/user_basics.ssi:194 en/user_basics.ssi:204
-#: en/user_basics.ssi:238 en/user_basics.ssi:250 en/user_basics.ssi:266
-#: en/user_basics.ssi:274 en/user_basics.ssi:301 en/user_basics.ssi:340
+#: en/user_basics.ssi:62 en/user_basics.ssi:75 en/user_basics.ssi:110
+#: en/user_basics.ssi:118 en/user_basics.ssi:132 en/user_basics.ssi:142
+#: en/user_basics.ssi:154 en/user_basics.ssi:162 en/user_basics.ssi:170
+#: en/user_basics.ssi:186 en/user_basics.ssi:196 en/user_basics.ssi:204
+#: en/user_basics.ssi:220 en/user_basics.ssi:228 en/user_basics.ssi:238
+#: en/user_basics.ssi:272 en/user_basics.ssi:284 en/user_basics.ssi:300
+#: en/user_basics.ssi:308 en/user_basics.ssi:335 en/user_basics.ssi:374
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:37
@@ -124,11 +124,11 @@ msgstr ""
#: en/user_customization-packages.ssi:307
#: en/user_customization-packages.ssi:317
#: en/user_customization-packages.ssi:344
-#: en/user_customization-packages.ssi:354 en/user_customization-runtime.ssi:18
+#: en/user_customization-packages.ssi:353 en/user_customization-runtime.ssi:18
#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:47
#: en/user_customization-runtime.ssi:55 en/user_customization-runtime.ssi:64
#: en/user_customization-runtime.ssi:73 en/user_customization-runtime.ssi:93
-#: en/user_customization-runtime.ssi:102 en/user_customization-runtime.ssi:111
+#: en/user_customization-runtime.ssi:101 en/user_customization-runtime.ssi:110
#: en/user_examples.ssi:20 en/user_examples.ssi:34 en/user_examples.ssi:44
#: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
#: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
@@ -141,7 +141,7 @@ msgstr ""
#: en/user_installation.ssi:70 en/user_installation.ssi:78
#: en/user_installation.ssi:86 en/user_installation.ssi:94
#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_installation.ssi:150 en/user_managing_a_configuration.ssi:31
+#: en/user_installation.ssi:149 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
@@ -150,7 +150,7 @@ msgid "}code"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:42 en/user_basics.ssi:118 en/user_basics.ssi:202
+#: en/user_basics.ssi:42 en/user_basics.ssi:168 en/user_basics.ssi:236
#: en/user_examples.ssi:109 en/user_examples.ssi:208
#, no-wrap
msgid " # lb build\n"
@@ -264,7 +264,7 @@ msgid ""
"with-qemu and {Testing an ISO image with virtualbox-ose}#testing-iso-with-"
"virtualbox, or else imaged onto optical media or a USB flash device as "
"described in {Burning an ISO image to a physical medium}#burning-iso-image "
-"and {Copying USB/HDD image to a USB stick}#copying-usb-hdd-image, "
+"and {Copying an ISO hybrid image to a USB stick}#copying-iso-hybrid-to-usb, "
"respectively."
msgstr ""
@@ -743,7 +743,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:299
+#: en/user_examples.ssi:298
msgid ""
"Note that we have included the #{debian-installer-launcher}# package to "
"launch the installer from the live desktop, and have also specified the 486 "
diff --git a/manual/pt_BR/live-manual.ssm b/manual/pt_BR/live-manual.ssm
index 4d25f00..5de4bbf 100644
--- a/manual/pt_BR/live-manual.ssm
+++ b/manual/pt_BR/live-manual.ssm
@@ -9,7 +9,7 @@
:license: This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.<br><br>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.<br><br>You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/. <br><br>On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-3 file.
@date:
- :published: 2011-03-17
+ :published: 2011-03-18
@publisher: Debian Live Project <debian-live at lists.debian.org>
diff --git a/manual/pt_BR/user_basics.ssi b/manual/pt_BR/user_basics.ssi
index a097a47..cf93fac 100644
--- a/manual/pt_BR/user_basics.ssi
+++ b/manual/pt_BR/user_basics.ssi
@@ -14,7 +14,7 @@ netbooting, but is included here because once the setup is done, it is a
very convenient way to test and deploy images for booting on the local
network without the hassle of dealing with image media.
-2~ What is a live system?
+2~what-is-live What is a live system?
A live system usually means an operating system booted on a computer from a
removable medium, such as a CD-ROM or USB stick, or from a network, ready to
@@ -52,7 +52,7 @@ You can use live-build to build the system image from your specifications,
set up a Linux kernel, its initrd, and a bootloader to run them, all in one
media-dependant format (ISO9660 image, disk image, etc.).
-2~ First steps: building an ISO hybrid image
+2~building-iso-hybrid First steps: building an ISO hybrid image
Regardless of the image type, you will need to perform the same basic steps
to build an image each time. As a first example, execute the following
@@ -86,7 +86,7 @@ This process can take a while, depending on the speed of your network
connection. When it is complete, there should be a #{binary-hybrid.iso}#
image file, ready to use, in the current directory.
-2~ Using an ISO hybrid live image
+2~using-iso-hybrid Using an ISO hybrid live image
After either building or downloading an ISO hybrid image, which can be
obtained at http://www.debian.org/CD/live/, the usual next step is to
@@ -108,19 +108,18 @@ code{
3~copying-iso-hybrid-to-usb Copying an ISO hybrid image to a USB stick
ISO images prepared with the #{isohybrid}# command, like the images produced
-by live-build's default #{iso-hybrid}# binary image type, can be copied to a
-USB stick and directly booted without further steps. Plug in a USB stick
-with a size larger than that of #{binary-hybrid.iso}# and determine which
-device it is, which we hereafter refer to as #{${USBSTICK}}#. This is the
-device file of your key, such as #{/dev/sdb}#, not a partition, such as
+by the default #{iso-hybrid}# binary image type, can be simply copied to a
+USB stick with the #{dd}# program or an equivalent. Plug in a USB stick with
+a size larger than that of #{binary-hybrid.iso}# and determine which device
+it is, which we hereafter refer to as #{${USBSTICK}}#. This is the device
+file of your key, such as #{/dev/sdb}#, not a partition, such as
#{/dev/sdb1}#! You can find the right device name by looking in #{dmesg}#'s
output after plugging in the stick, or better yet, #{ls -l
/dev/disk/by-id}#.
-*{This will definitely overwrite any previous contents on your stick!}*
-
Once you are certain you have the correct device name, use the #{dd}#
-command to copy the image to the stick as follows:
+command to copy the image to the stick. *{This will definitely overwrite
+any previous contents on your stick!}*
code{
@@ -129,7 +128,7 @@ code{
}code
-3~ Booting the live media
+3~booting-live-media Booting the live media
The first time you boot your live media, whether CD, DVD, USB key, or PXE
boot, some setup in your computer's BIOS may be needed first. Since BIOSes
@@ -153,7 +152,7 @@ console-only image, such as #{standard}# or #{rescue}# flavour prebuilt
images, you should be automatically logged in on the console to the #{user}#
account and see a shell prompt, ready to use.
-2~ Using a virtual machine for testing
+2~using-virtual-machine Using a virtual machine for testing
It can be a great time-saver for the development of live images to run them
in a virtual machine (VM). This is not without its caveats:
@@ -226,19 +225,20 @@ code{
}code
-2~ Building a USB/HDD image
+2~building-usb-hdd Building a 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
+Building a USB/HDD image is similar to ISO hybrid in all respects except you
+specify #{--b usb-hdd}# and the resulting filename is #{binary.img}# which
+cannot be burnt to optical media. It is suitable for booting from USB
+sticks, USB hard drives, and various other portable storage
devices. Normally, an ISO hybrid image can be used for this purpose instead,
but if you have a BIOS which does not handle hybrid images properly, or want
-to use the remaining space on the media for a persistence partition, you
-need a USB/HDD image.
+to use the remaining space on the media for some purpose, such as a
+persistence partition, you need a USB/HDD image.
-Note: if you created an ISO image with the previous example, you will need
-to clean up your working directory with the #{lb clean}# command (see {The
-lb clean command}#lb-clean):
+Note: if you created an ISO hybrid image with the previous example, you will
+need to clean up your working directory with the #{lb clean}# command (see
+{The lb clean command}#lb-clean):
code{
@@ -246,8 +246,8 @@ code{
}code
-Run the #{lb config}# command with the parameters to configure the
-#{config/}# hierarchy to create a USB/HDD image type:
+Run the #{lb config}# command as before, except this time specifying the
+USB/HDD image type:
code{
@@ -263,47 +263,36 @@ code{
}code
-3~copying-usb-hdd-image Copying USB/HDD image to a USB stick
+When the build finishes, a #{binary.img}# file should be present in the
+current directory.
-% FIXME: eliminate duplication with ISO hybrid, as these are virtually the
-same instructions!
+2~using-usb-hdd-image Using a USB/HDD image
The generated binary image contains a VFAT partition and the syslinux
-bootloader, ready to be directly written on a USB stick. Plug in a USB stick
-with a size larger than that of binary.img and type:
-
-code{
-
- $ dd if=binary.img of=${USBSTICK}
-
-}code
-
-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
-looking in #{dmesg}#'s output after plugging in the stick, for example, or
-better yet, #{ls -l /dev/disk/by-id}#.
-
-*{This will definitely overwrite any previous contents on your stick!}*
-
-Note: As discussed earlier, this same process can be used for #{iso-hybrid}#
-type images (suffixed #{-hybrid.iso}#), but not #{iso}# type images.
+bootloader, ready to be directly written on a USB stick. Since using a
+USB/HDD image is just like using an ISO hybrid image on USB, follow the
+instructions in #{Using an ISO hybrid live image}#using-iso-hybrid, except
+use the filename #{binary.img}# instead of #{binary-hybrid.iso}#.
3~testing-usb-hdd-with-qemu Testing a USB/HDD image with Qemu
-code{
+First, install QEMU as described above in #{Testing an ISO image with
+QEMU}#testing-iso-with-qemu. Then run #{kvm}# or #{qemu}#, depending on
+which version your host system needs, specifying #{binary.img}# as the first
+hard drive.
- # apt-get install qemu
+code{
- $ qemu -hda binary.img
+ $ kvm -hda binary.img
}code
-3~ Using the space left on a USB stick
+3~using-usb-extra-space 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.
+To use the remaining free space after copying #{binary.img}# to a USB stick,
+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{
@@ -311,9 +300,9 @@ code{
}code
-After the creation of the partition, where #{${PARTITION}}# is the name of
-the partition, like #{/dev/sdb2}#, you have to create a filesystem on
-it. One possible choice would be ext4.
+After the partition is created, where #{${PARTITION}}# is the name of the
+partition, such as #{/dev/sdb2}#, you have to create a filesystem on it. One
+possible choice would be ext4.
code{
@@ -321,15 +310,12 @@ code{
}code
-If you want to use this data partition with Windows, use FAT32.
-
-code{
-
- # mkfs.vfat -F 32
-
-}code
+Note: If you want to use the extra space with Windows, apparently that OS
+cannot normally access any partitions but the first. Some solutions to this
+problem have been discussed on our #{mailing list}#contact, but it seems
+there are no easy answers.
-*{Remember: Every time you install a new binary.img on the stick, all data on the stick will be lost because the partition table is overwritten by the contents of the image.}*
+*{Remember: Every time you install a new binary.img on the stick, all data on the stick will be lost because the partition table is overwritten by the contents of the image, so back up your extra partition first to restore again after updating the live image.}*
2~building-netboot-image Building a netboot image
diff --git a/manual/pt_BR/user_examples.ssi b/manual/pt_BR/user_examples.ssi
index 5eaf0c1..5bb918a 100644
--- a/manual/pt_BR/user_examples.ssi
+++ b/manual/pt_BR/user_examples.ssi
@@ -64,8 +64,8 @@ virtual machine as described in {Testing an ISO image with
Qemu}#testing-iso-with-qemu and {Testing an ISO image with
virtualbox-ose}#testing-iso-with-virtualbox, or else imaged onto optical
media or a USB flash device as described in {Burning an ISO image to a
-physical medium}#burning-iso-image and {Copying USB/HDD image to a USB
-stick}#copying-usb-hdd-image, respectively.
+physical medium}#burning-iso-image and {Copying an ISO hybrid image to a USB
+stick}#copying-iso-hybrid-to-usb, respectively.
2~tutorial-2 Tutorial 2: A web browser utility
diff --git a/manual/ro/live-manual.ssm b/manual/ro/live-manual.ssm
index 4d25f00..5de4bbf 100644
--- a/manual/ro/live-manual.ssm
+++ b/manual/ro/live-manual.ssm
@@ -9,7 +9,7 @@
:license: This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.<br><br>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.<br><br>You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/. <br><br>On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-3 file.
@date:
- :published: 2011-03-17
+ :published: 2011-03-18
@publisher: Debian Live Project <debian-live at lists.debian.org>
diff --git a/manual/ro/user_basics.ssi b/manual/ro/user_basics.ssi
index a097a47..cf93fac 100644
--- a/manual/ro/user_basics.ssi
+++ b/manual/ro/user_basics.ssi
@@ -14,7 +14,7 @@ netbooting, but is included here because once the setup is done, it is a
very convenient way to test and deploy images for booting on the local
network without the hassle of dealing with image media.
-2~ What is a live system?
+2~what-is-live What is a live system?
A live system usually means an operating system booted on a computer from a
removable medium, such as a CD-ROM or USB stick, or from a network, ready to
@@ -52,7 +52,7 @@ You can use live-build to build the system image from your specifications,
set up a Linux kernel, its initrd, and a bootloader to run them, all in one
media-dependant format (ISO9660 image, disk image, etc.).
-2~ First steps: building an ISO hybrid image
+2~building-iso-hybrid First steps: building an ISO hybrid image
Regardless of the image type, you will need to perform the same basic steps
to build an image each time. As a first example, execute the following
@@ -86,7 +86,7 @@ This process can take a while, depending on the speed of your network
connection. When it is complete, there should be a #{binary-hybrid.iso}#
image file, ready to use, in the current directory.
-2~ Using an ISO hybrid live image
+2~using-iso-hybrid Using an ISO hybrid live image
After either building or downloading an ISO hybrid image, which can be
obtained at http://www.debian.org/CD/live/, the usual next step is to
@@ -108,19 +108,18 @@ code{
3~copying-iso-hybrid-to-usb Copying an ISO hybrid image to a USB stick
ISO images prepared with the #{isohybrid}# command, like the images produced
-by live-build's default #{iso-hybrid}# binary image type, can be copied to a
-USB stick and directly booted without further steps. Plug in a USB stick
-with a size larger than that of #{binary-hybrid.iso}# and determine which
-device it is, which we hereafter refer to as #{${USBSTICK}}#. This is the
-device file of your key, such as #{/dev/sdb}#, not a partition, such as
+by the default #{iso-hybrid}# binary image type, can be simply copied to a
+USB stick with the #{dd}# program or an equivalent. Plug in a USB stick with
+a size larger than that of #{binary-hybrid.iso}# and determine which device
+it is, which we hereafter refer to as #{${USBSTICK}}#. This is the device
+file of your key, such as #{/dev/sdb}#, not a partition, such as
#{/dev/sdb1}#! You can find the right device name by looking in #{dmesg}#'s
output after plugging in the stick, or better yet, #{ls -l
/dev/disk/by-id}#.
-*{This will definitely overwrite any previous contents on your stick!}*
-
Once you are certain you have the correct device name, use the #{dd}#
-command to copy the image to the stick as follows:
+command to copy the image to the stick. *{This will definitely overwrite
+any previous contents on your stick!}*
code{
@@ -129,7 +128,7 @@ code{
}code
-3~ Booting the live media
+3~booting-live-media Booting the live media
The first time you boot your live media, whether CD, DVD, USB key, or PXE
boot, some setup in your computer's BIOS may be needed first. Since BIOSes
@@ -153,7 +152,7 @@ console-only image, such as #{standard}# or #{rescue}# flavour prebuilt
images, you should be automatically logged in on the console to the #{user}#
account and see a shell prompt, ready to use.
-2~ Using a virtual machine for testing
+2~using-virtual-machine Using a virtual machine for testing
It can be a great time-saver for the development of live images to run them
in a virtual machine (VM). This is not without its caveats:
@@ -226,19 +225,20 @@ code{
}code
-2~ Building a USB/HDD image
+2~building-usb-hdd Building a 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
+Building a USB/HDD image is similar to ISO hybrid in all respects except you
+specify #{--b usb-hdd}# and the resulting filename is #{binary.img}# which
+cannot be burnt to optical media. It is suitable for booting from USB
+sticks, USB hard drives, and various other portable storage
devices. Normally, an ISO hybrid image can be used for this purpose instead,
but if you have a BIOS which does not handle hybrid images properly, or want
-to use the remaining space on the media for a persistence partition, you
-need a USB/HDD image.
+to use the remaining space on the media for some purpose, such as a
+persistence partition, you need a USB/HDD image.
-Note: if you created an ISO image with the previous example, you will need
-to clean up your working directory with the #{lb clean}# command (see {The
-lb clean command}#lb-clean):
+Note: if you created an ISO hybrid image with the previous example, you will
+need to clean up your working directory with the #{lb clean}# command (see
+{The lb clean command}#lb-clean):
code{
@@ -246,8 +246,8 @@ code{
}code
-Run the #{lb config}# command with the parameters to configure the
-#{config/}# hierarchy to create a USB/HDD image type:
+Run the #{lb config}# command as before, except this time specifying the
+USB/HDD image type:
code{
@@ -263,47 +263,36 @@ code{
}code
-3~copying-usb-hdd-image Copying USB/HDD image to a USB stick
+When the build finishes, a #{binary.img}# file should be present in the
+current directory.
-% FIXME: eliminate duplication with ISO hybrid, as these are virtually the
-same instructions!
+2~using-usb-hdd-image Using a USB/HDD image
The generated binary image contains a VFAT partition and the syslinux
-bootloader, ready to be directly written on a USB stick. Plug in a USB stick
-with a size larger than that of binary.img and type:
-
-code{
-
- $ dd if=binary.img of=${USBSTICK}
-
-}code
-
-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
-looking in #{dmesg}#'s output after plugging in the stick, for example, or
-better yet, #{ls -l /dev/disk/by-id}#.
-
-*{This will definitely overwrite any previous contents on your stick!}*
-
-Note: As discussed earlier, this same process can be used for #{iso-hybrid}#
-type images (suffixed #{-hybrid.iso}#), but not #{iso}# type images.
+bootloader, ready to be directly written on a USB stick. Since using a
+USB/HDD image is just like using an ISO hybrid image on USB, follow the
+instructions in #{Using an ISO hybrid live image}#using-iso-hybrid, except
+use the filename #{binary.img}# instead of #{binary-hybrid.iso}#.
3~testing-usb-hdd-with-qemu Testing a USB/HDD image with Qemu
-code{
+First, install QEMU as described above in #{Testing an ISO image with
+QEMU}#testing-iso-with-qemu. Then run #{kvm}# or #{qemu}#, depending on
+which version your host system needs, specifying #{binary.img}# as the first
+hard drive.
- # apt-get install qemu
+code{
- $ qemu -hda binary.img
+ $ kvm -hda binary.img
}code
-3~ Using the space left on a USB stick
+3~using-usb-extra-space 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.
+To use the remaining free space after copying #{binary.img}# to a USB stick,
+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{
@@ -311,9 +300,9 @@ code{
}code
-After the creation of the partition, where #{${PARTITION}}# is the name of
-the partition, like #{/dev/sdb2}#, you have to create a filesystem on
-it. One possible choice would be ext4.
+After the partition is created, where #{${PARTITION}}# is the name of the
+partition, such as #{/dev/sdb2}#, you have to create a filesystem on it. One
+possible choice would be ext4.
code{
@@ -321,15 +310,12 @@ code{
}code
-If you want to use this data partition with Windows, use FAT32.
-
-code{
-
- # mkfs.vfat -F 32
-
-}code
+Note: If you want to use the extra space with Windows, apparently that OS
+cannot normally access any partitions but the first. Some solutions to this
+problem have been discussed on our #{mailing list}#contact, but it seems
+there are no easy answers.
-*{Remember: Every time you install a new binary.img on the stick, all data on the stick will be lost because the partition table is overwritten by the contents of the image.}*
+*{Remember: Every time you install a new binary.img on the stick, all data on the stick will be lost because the partition table is overwritten by the contents of the image, so back up your extra partition first to restore again after updating the live image.}*
2~building-netboot-image Building a netboot image
diff --git a/manual/ro/user_examples.ssi b/manual/ro/user_examples.ssi
index 5eaf0c1..5bb918a 100644
--- a/manual/ro/user_examples.ssi
+++ b/manual/ro/user_examples.ssi
@@ -64,8 +64,8 @@ virtual machine as described in {Testing an ISO image with
Qemu}#testing-iso-with-qemu and {Testing an ISO image with
virtualbox-ose}#testing-iso-with-virtualbox, or else imaged onto optical
media or a USB flash device as described in {Burning an ISO image to a
-physical medium}#burning-iso-image and {Copying USB/HDD image to a USB
-stick}#copying-usb-hdd-image, respectively.
+physical medium}#burning-iso-image and {Copying an ISO hybrid image to a USB
+stick}#copying-iso-hybrid-to-usb, respectively.
2~tutorial-2 Tutorial 2: A web browser utility
--
live-manual
More information about the debian-live-changes
mailing list