[SCM] live-manual branch, debian, updated. debian/2.0_a9-1-8-gd1b553a
Ben Armstrong
synrg at debian.org
Thu Oct 28 00:44:15 UTC 2010
The following commit has been merged in the debian branch:
commit d1b553a23cd0ab53883d383705cadb1adc5d4ab6
Author: Ben Armstrong <synrg at debian.org>
Date: Wed Oct 27 21:43:31 2010 -0300
Updating language strings.
diff --git a/manual/de/project_bugs.ssi b/manual/de/project_bugs.ssi
index c82d6cf..8443811 100644
--- a/manual/de/project_bugs.ssi
+++ b/manual/de/project_bugs.ssi
@@ -124,7 +124,7 @@ Also, if you are using a local mirror and/or any of sort of proxy and you
are experiencing a problem, please always reproduce it first by
bootstrapping from an official mirror.
-3~ At boot-time
+3~ At boot time
If your image does not boot, please report it to the mailing list together
with the information requested in {Collect
@@ -134,7 +134,7 @@ virtualization technology of any kind, please always run it on real hardware
before reporting a bug. Providing a screenshot of the failure is also very
helpful.
-3~ At run-time
+3~ At run time
If a package was successfully installed, but fails while actually running
the Live system, this is probably a bug in Debian Live. However,
diff --git a/manual/de/user_basics.ssi b/manual/de/user_basics.ssi
index aef09b7..acd6c26 100644
--- a/manual/de/user_basics.ssi
+++ b/manual/de/user_basics.ssi
@@ -2,56 +2,56 @@
1~ The basics
-This chapter contains a brief overview of the build process as well as
-containing instructions on how to boot the various binary image types.
+This chapter contains a brief overview of the build process and instructions
+for booting the various binary image types.
2~ What is a live system?
A live system usually means an operating system booted on a computer from a
-removable medium (such as CD-ROM, USB stick, or network), ready to use
-without any installation on the usual drive(s), with an auto-configuration
+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 runtime (see {Terms}#terms ).
With Debian Live, it's a Debian GNU/Linux operating system, built for one of
the supported architectures (currently amd64, i386, powerpc and sparc). It
-is made from following parts:
+is made from the following parts:
-_* Linux kernel
+_* *{Linux kernel image}*, usually named #{vmlinuz*}#
-_* The Linux image, usually named #{vmlinuz*}#
-
-_* *{Initial RAM disk image (initrd)}*: RAM disk setup for the Linux boot,
-containing modules possibly needed to mount the filesystem's image and some
+_* *{Initial RAM disk image (initrd)}*: a RAM disk set up for the Linux
+boot, containing modules possibly needed to mount the System image and some
scripts to do it.
-_* *{System image}*: The operating systems filesystem image. The SquashFS
-compressed filesystem is used to minimize the Debian Live image size. Note
-that it's read-only. So, during boot the Debian Live system will use a RAM
-disk and 'union' mechanism to enable writing files within the running
-system. However, all modifications will be lost upon shutdown unless
-optional persistence partition(s) are used (see persistence).
+_* *{System image}*: The operating system's filesystem image. Usually, a
+SquashFS compressed filesystem is used to minimize the Debian Live image
+size. Note that it is read-only. So, during boot the Debian Live system will
+use a RAM disk and 'union' mechanism to enable writing files within the
+running system. However, all modifications will be lost upon shutdown unless
+optional persistence is used (see persistence).
% FIXME: <xref linkend="persistence"/>
-_* *{Bootloader}*: A small piece of code, crafted to boot up from the chosen
+_* *{Bootloader}*: A small piece of code crafted to boot from the chosen
media, possibly presenting a prompt or menu to allow selection of
-options/configuration. It then loads the Linux kernel and its initrd to run
-with an associated filesystem image. Different solutions can be used
-depending on the target media and format of the filesystem containing the
-previous components: Isolinux to boot from a CD or DVD in ISO9660 format,
+options/configuration. It loads the Linux kernel and its initrd to run with
+an associated system filesystem. Different solutions can be used, depending
+on the target media and format of the filesystem containing the previously
+mentioned components: isolinux to boot from a CD or DVD in ISO9660 format,
syslinux for HDD or USB drive booting from a VFAT partition, extlinux for
ext2/3/4 and btrfs partitions, pxelinux for PXE netboot, GRUB for ext2/3/4
-partition, etc.
+partitions, etc.
-_* live-build will build the system image from your specifications, setup a
-Linux kernel and its initrd, a bootloader to run them, all in one
+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 image
-The following sequence of commands, provided by live-build, will create a
-basic ISO image containing just the Debian standard system without X.org. It
-is suitable for burning to CD or DVD media.
+The following sequence of live-build commands will 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
+(as per {Copying USB/HDD image to a USB stick}#copying-usb-hdd-image,
+specifying ".iso" extension where ".img" is indicated).
First, we run the #{lb config}# command which will create a "config/"
hierarchy in the current directory for use by other commands:
@@ -62,7 +62,7 @@ $ lb config
}code
-By passing no parameters to #{lb config}# we indicated that we wish to use
+By passing no parameters to #{lb config}#, we indicated that we wish to use
the defaults (see {The lb config command}#lb-config ).
Now that we have a "config/" hierarchy, we may build the image with the lb
@@ -95,26 +95,23 @@ In order to test the ISO with virtualbox-ose:
code{
-# apt-get install virtualbox-ose
+# apt-get install virtualbox-ose virtualbox-ose-dkms
-}code
+$ virtualbox
-and either install #{virtualbox-ose-source}# or #{virtualbox-ose-dkms}# to
-build the required kernel modules to run virtualbox-ose.
+}code
-After successful installation, virtualbox can be e.g. found in the GNOME
-menu under 'Applications/System Tools/VirtualBox OSE'.
+Create a new virtual machine, change the storage settings to use binary.iso
+as the CD/DVD device, and start the machine.
-Please consider including of following packages onto the live image to
-achieve higher resolution of the display when booting the live image in
-virutalbox-ose (1280x1024 instead of 800x600 and in particular if the
-default resolution of the virtualbox-ose display shouldn't work with the
-gui-installer).
+Note: For live systems containing X.org that you want to test with
+virtualbox-ose, you may wish to include the VirtualBox X.org driver package,
+virtualbox-ose-guest-x11, in your live-build configuration. Otherwise, the
+resolution is limited to 800x600.
code{
-virtualbox-ose-guest-dkms virtualbox-ose-guest-utils
-virtualbox-ose-guest-x11
+# lb config --packages virtualbox-ose-guest-x11
}code
@@ -130,15 +127,18 @@ $ wodim binary.iso
}code
-2~ Building an USB/HDD image
+2~ 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.
+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.
-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
+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 ):
code{
@@ -164,11 +164,11 @@ code{
}code
-3~ Copying USB/HDD image to a USB stick
+3~copying-usb-hdd-image Copying USB/HDD image to a USB stick
The generated binary image contains a VFAT partition and the syslinux
-bootloader, ready to be directly written on an USB stick. Plug in an USB
-stick with a size larger than that of binary.img and type:
+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{
@@ -178,7 +178,8 @@ $ dd if=binary.img of=${USBSTICK}
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.
+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!}*
@@ -205,8 +206,8 @@ code{
}code
-Ater the creation of the partition you have to create a filsystem on it. One
-possible choice would be ext4.
+After the creation of the partition, you have to create a filesystem on
+it. One possible choice would be ext4.
code{
@@ -222,7 +223,7 @@ code{
}code
-*{Remember: Every time you install a new binary.img on the stick, all your data will be lost because the image includes a complete partition table.}*
+*{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.}*
2~ Building a netboot image
@@ -230,7 +231,7 @@ The following sequence of commands will create a basic netboot image
containing the Debian standard system without X.org. It is suitable for
booting over the network.
-Note if you performed any previous examples, you will need to clean up your
+Note: if you performed any previous examples, you will need to clean up your
working directory with the #{lb clean}# command:
code{
@@ -249,11 +250,11 @@ $ lb config -b net --net-root-path "/srv/debian-live" --net-root-server
}code
-In contrast with the ISO and USB hdd images, netbooting does not support
-serving a filesystem image with the client so the files must be served via
+In contrast with the ISO and USB/HDD images, netbooting does not support
+serving a filesystem image with the client, so the files must be served via
NFS. The net-root-path and net-root-server options specify the location and
server, respectively, of the NFS server where the filesytem image will be
-located at boot-time.
+located at boot time.
Now build the image with the #{lb build}# command:
@@ -263,11 +264,11 @@ code{
}code
-In a network boot the client runs a small piece of software, which usually
+In a network boot, the client runs a small piece of software which usually
resides on the EPROM of the Ethernet card. This program sends a DHCP request
-to get an IP address and information about what to do next. Typically the
-next step is getting a higher level boot loader via the TFTP protocol. That
-could be PXELINUX, Grub or even boot directly to an operating system like
+to get an IP address and information about what to do next. Typically, the
+next step is getting a higher level bootloader via the TFTP protocol. That
+could be PXELINUX, GRUB, or even boot directly to an operating system like
Linux.
For example, if you unpack the generated binary-net.tar.gz archive in the
@@ -280,7 +281,7 @@ We must now configure three services on the server to enable netboot.
3~ DHCP server
We must configure our network's DHCP server to be sure to give an IP address
-to the computer netbooting, and to advertise the location of the PXE
+to the netbooting client system, and to advertise the location of the PXE
bootloader.
Here is an example for inspiration, written for the ISC DHCP server
@@ -305,9 +306,9 @@ subnet 192.168.1.0 netmask 255.255.255.0 { # 192.168.1.0/24
# net boot configuration for guests with a PXE client :
if substring (option vendor-class-identifier, 0, 9) = "PXEClient" {
- # Note : all files for PXE are relatives to the TFTP server's root
+ # Note: all files for PXE are relatives to the TFTP server's root
- # PXE boot loader (first program to be loaded, by TFTP)
+ # PXE bootloader (first program to be loaded, by TFTP)
filename "pxelinux.0";
}
@@ -317,7 +318,7 @@ subnet 192.168.1.0 netmask 255.255.255.0 { # 192.168.1.0/24
3~ TFTP server
-This serves the kernel and initial ramdisk to the system at run-time.
+This serves the kernel and initial ramdisk to the system at run time.
You should install the tftpd-hpa package. It can serve all files contained
inside a root directory, usually /srv/tftp. To let it serve files inside
@@ -418,6 +419,6 @@ ethernet0.generatedAddress = "00:0c:29:8d:71:3b" uuid.location = "56 4d 83
_* You can play with this configuration file (i.e. change memory limit to
256)
-_* Double click on this file (or run VMWare player and selecet this file).
+_* Double click on this file (or run VMWare player and select this file).
_* When running just press space if that strange question comes up...
diff --git a/manual/fr/project_bugs.ssi b/manual/fr/project_bugs.ssi
index c82d6cf..8443811 100644
--- a/manual/fr/project_bugs.ssi
+++ b/manual/fr/project_bugs.ssi
@@ -124,7 +124,7 @@ Also, if you are using a local mirror and/or any of sort of proxy and you
are experiencing a problem, please always reproduce it first by
bootstrapping from an official mirror.
-3~ At boot-time
+3~ At boot time
If your image does not boot, please report it to the mailing list together
with the information requested in {Collect
@@ -134,7 +134,7 @@ virtualization technology of any kind, please always run it on real hardware
before reporting a bug. Providing a screenshot of the failure is also very
helpful.
-3~ At run-time
+3~ At run time
If a package was successfully installed, but fails while actually running
the Live system, this is probably a bug in Debian Live. However,
diff --git a/manual/fr/user_basics.ssi b/manual/fr/user_basics.ssi
index aef09b7..acd6c26 100644
--- a/manual/fr/user_basics.ssi
+++ b/manual/fr/user_basics.ssi
@@ -2,56 +2,56 @@
1~ The basics
-This chapter contains a brief overview of the build process as well as
-containing instructions on how to boot the various binary image types.
+This chapter contains a brief overview of the build process and instructions
+for booting the various binary image types.
2~ What is a live system?
A live system usually means an operating system booted on a computer from a
-removable medium (such as CD-ROM, USB stick, or network), ready to use
-without any installation on the usual drive(s), with an auto-configuration
+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 runtime (see {Terms}#terms ).
With Debian Live, it's a Debian GNU/Linux operating system, built for one of
the supported architectures (currently amd64, i386, powerpc and sparc). It
-is made from following parts:
+is made from the following parts:
-_* Linux kernel
+_* *{Linux kernel image}*, usually named #{vmlinuz*}#
-_* The Linux image, usually named #{vmlinuz*}#
-
-_* *{Initial RAM disk image (initrd)}*: RAM disk setup for the Linux boot,
-containing modules possibly needed to mount the filesystem's image and some
+_* *{Initial RAM disk image (initrd)}*: a RAM disk set up for the Linux
+boot, containing modules possibly needed to mount the System image and some
scripts to do it.
-_* *{System image}*: The operating systems filesystem image. The SquashFS
-compressed filesystem is used to minimize the Debian Live image size. Note
-that it's read-only. So, during boot the Debian Live system will use a RAM
-disk and 'union' mechanism to enable writing files within the running
-system. However, all modifications will be lost upon shutdown unless
-optional persistence partition(s) are used (see persistence).
+_* *{System image}*: The operating system's filesystem image. Usually, a
+SquashFS compressed filesystem is used to minimize the Debian Live image
+size. Note that it is read-only. So, during boot the Debian Live system will
+use a RAM disk and 'union' mechanism to enable writing files within the
+running system. However, all modifications will be lost upon shutdown unless
+optional persistence is used (see persistence).
% FIXME: <xref linkend="persistence"/>
-_* *{Bootloader}*: A small piece of code, crafted to boot up from the chosen
+_* *{Bootloader}*: A small piece of code crafted to boot from the chosen
media, possibly presenting a prompt or menu to allow selection of
-options/configuration. It then loads the Linux kernel and its initrd to run
-with an associated filesystem image. Different solutions can be used
-depending on the target media and format of the filesystem containing the
-previous components: Isolinux to boot from a CD or DVD in ISO9660 format,
+options/configuration. It loads the Linux kernel and its initrd to run with
+an associated system filesystem. Different solutions can be used, depending
+on the target media and format of the filesystem containing the previously
+mentioned components: isolinux to boot from a CD or DVD in ISO9660 format,
syslinux for HDD or USB drive booting from a VFAT partition, extlinux for
ext2/3/4 and btrfs partitions, pxelinux for PXE netboot, GRUB for ext2/3/4
-partition, etc.
+partitions, etc.
-_* live-build will build the system image from your specifications, setup a
-Linux kernel and its initrd, a bootloader to run them, all in one
+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 image
-The following sequence of commands, provided by live-build, will create a
-basic ISO image containing just the Debian standard system without X.org. It
-is suitable for burning to CD or DVD media.
+The following sequence of live-build commands will 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
+(as per {Copying USB/HDD image to a USB stick}#copying-usb-hdd-image,
+specifying ".iso" extension where ".img" is indicated).
First, we run the #{lb config}# command which will create a "config/"
hierarchy in the current directory for use by other commands:
@@ -62,7 +62,7 @@ $ lb config
}code
-By passing no parameters to #{lb config}# we indicated that we wish to use
+By passing no parameters to #{lb config}#, we indicated that we wish to use
the defaults (see {The lb config command}#lb-config ).
Now that we have a "config/" hierarchy, we may build the image with the lb
@@ -95,26 +95,23 @@ In order to test the ISO with virtualbox-ose:
code{
-# apt-get install virtualbox-ose
+# apt-get install virtualbox-ose virtualbox-ose-dkms
-}code
+$ virtualbox
-and either install #{virtualbox-ose-source}# or #{virtualbox-ose-dkms}# to
-build the required kernel modules to run virtualbox-ose.
+}code
-After successful installation, virtualbox can be e.g. found in the GNOME
-menu under 'Applications/System Tools/VirtualBox OSE'.
+Create a new virtual machine, change the storage settings to use binary.iso
+as the CD/DVD device, and start the machine.
-Please consider including of following packages onto the live image to
-achieve higher resolution of the display when booting the live image in
-virutalbox-ose (1280x1024 instead of 800x600 and in particular if the
-default resolution of the virtualbox-ose display shouldn't work with the
-gui-installer).
+Note: For live systems containing X.org that you want to test with
+virtualbox-ose, you may wish to include the VirtualBox X.org driver package,
+virtualbox-ose-guest-x11, in your live-build configuration. Otherwise, the
+resolution is limited to 800x600.
code{
-virtualbox-ose-guest-dkms virtualbox-ose-guest-utils
-virtualbox-ose-guest-x11
+# lb config --packages virtualbox-ose-guest-x11
}code
@@ -130,15 +127,18 @@ $ wodim binary.iso
}code
-2~ Building an USB/HDD image
+2~ 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.
+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.
-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
+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 ):
code{
@@ -164,11 +164,11 @@ code{
}code
-3~ Copying USB/HDD image to a USB stick
+3~copying-usb-hdd-image Copying USB/HDD image to a USB stick
The generated binary image contains a VFAT partition and the syslinux
-bootloader, ready to be directly written on an USB stick. Plug in an USB
-stick with a size larger than that of binary.img and type:
+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{
@@ -178,7 +178,8 @@ $ dd if=binary.img of=${USBSTICK}
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.
+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!}*
@@ -205,8 +206,8 @@ code{
}code
-Ater the creation of the partition you have to create a filsystem on it. One
-possible choice would be ext4.
+After the creation of the partition, you have to create a filesystem on
+it. One possible choice would be ext4.
code{
@@ -222,7 +223,7 @@ code{
}code
-*{Remember: Every time you install a new binary.img on the stick, all your data will be lost because the image includes a complete partition table.}*
+*{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.}*
2~ Building a netboot image
@@ -230,7 +231,7 @@ The following sequence of commands will create a basic netboot image
containing the Debian standard system without X.org. It is suitable for
booting over the network.
-Note if you performed any previous examples, you will need to clean up your
+Note: if you performed any previous examples, you will need to clean up your
working directory with the #{lb clean}# command:
code{
@@ -249,11 +250,11 @@ $ lb config -b net --net-root-path "/srv/debian-live" --net-root-server
}code
-In contrast with the ISO and USB hdd images, netbooting does not support
-serving a filesystem image with the client so the files must be served via
+In contrast with the ISO and USB/HDD images, netbooting does not support
+serving a filesystem image with the client, so the files must be served via
NFS. The net-root-path and net-root-server options specify the location and
server, respectively, of the NFS server where the filesytem image will be
-located at boot-time.
+located at boot time.
Now build the image with the #{lb build}# command:
@@ -263,11 +264,11 @@ code{
}code
-In a network boot the client runs a small piece of software, which usually
+In a network boot, the client runs a small piece of software which usually
resides on the EPROM of the Ethernet card. This program sends a DHCP request
-to get an IP address and information about what to do next. Typically the
-next step is getting a higher level boot loader via the TFTP protocol. That
-could be PXELINUX, Grub or even boot directly to an operating system like
+to get an IP address and information about what to do next. Typically, the
+next step is getting a higher level bootloader via the TFTP protocol. That
+could be PXELINUX, GRUB, or even boot directly to an operating system like
Linux.
For example, if you unpack the generated binary-net.tar.gz archive in the
@@ -280,7 +281,7 @@ We must now configure three services on the server to enable netboot.
3~ DHCP server
We must configure our network's DHCP server to be sure to give an IP address
-to the computer netbooting, and to advertise the location of the PXE
+to the netbooting client system, and to advertise the location of the PXE
bootloader.
Here is an example for inspiration, written for the ISC DHCP server
@@ -305,9 +306,9 @@ subnet 192.168.1.0 netmask 255.255.255.0 { # 192.168.1.0/24
# net boot configuration for guests with a PXE client :
if substring (option vendor-class-identifier, 0, 9) = "PXEClient" {
- # Note : all files for PXE are relatives to the TFTP server's root
+ # Note: all files for PXE are relatives to the TFTP server's root
- # PXE boot loader (first program to be loaded, by TFTP)
+ # PXE bootloader (first program to be loaded, by TFTP)
filename "pxelinux.0";
}
@@ -317,7 +318,7 @@ subnet 192.168.1.0 netmask 255.255.255.0 { # 192.168.1.0/24
3~ TFTP server
-This serves the kernel and initial ramdisk to the system at run-time.
+This serves the kernel and initial ramdisk to the system at run time.
You should install the tftpd-hpa package. It can serve all files contained
inside a root directory, usually /srv/tftp. To let it serve files inside
@@ -418,6 +419,6 @@ ethernet0.generatedAddress = "00:0c:29:8d:71:3b" uuid.location = "56 4d 83
_* You can play with this configuration file (i.e. change memory limit to
256)
-_* Double click on this file (or run VMWare player and selecet this file).
+_* Double click on this file (or run VMWare player and select this file).
_* When running just press space if that strange question comes up...
diff --git a/manual/po/de/project_bugs.ssi.po b/manual/po/de/project_bugs.ssi.po
index fd45b7a..c5e0191 100644
--- a/manual/po/de/project_bugs.ssi.po
+++ b/manual/po/de/project_bugs.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-25 23:27+0300\n"
+"POT-Creation-Date: 2010-10-27 21:40-0200\n"
"PO-Revision-Date: 2010-10-25 23:27+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -42,14 +42,14 @@ msgstr ""
#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111
-#: en/project_bugs.ssi:58 en/user_basics.ssi:34 en/user_basics.ssi:44
-#: en/user_basics.ssi:56 en/user_basics.ssi:68 en/user_basics.ssi:80
-#: en/user_basics.ssi:92 en/user_basics.ssi:106 en/user_basics.ssi:114
-#: en/user_basics.ssi:122 en/user_basics.ssi:132 en/user_basics.ssi:144
-#: 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:224 en/user_basics.ssi:257 en/user_basics.ssi:273
-#: en/user_basics.ssi:281 en/user_basics.ssi:301 en/user_basics.ssi:326
+#: en/project_bugs.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:54 en/user_basics.ssi:66 en/user_basics.ssi:78
+#: en/user_basics.ssi:88 en/user_basics.ssi:102 en/user_basics.ssi:110
+#: en/user_basics.ssi:118 en/user_basics.ssi:128 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:220 en/user_basics.ssi:253 en/user_basics.ssi:269
+#: en/user_basics.ssi:277 en/user_basics.ssi:297 en/user_basics.ssi:322
#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
#: en/user_customization-contents.ssi:66
#: en/user_customization-internationalization.ssi:10
@@ -102,15 +102,15 @@ msgstr ""
#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
#: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
#: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
-#: en/other_use-cases.ssi:137 en/project_bugs.ssi:62 en/user_basics.ssi:38
-#: en/user_basics.ssi:48 en/user_basics.ssi:62 en/user_basics.ssi:72
-#: en/user_basics.ssi:86 en/user_basics.ssi:98 en/user_basics.ssi:110
-#: en/user_basics.ssi:118 en/user_basics.ssi:126 en/user_basics.ssi:136
-#: en/user_basics.ssi:150 en/user_basics.ssi:160 en/user_basics.ssi:168
-#: en/user_basics.ssi:176 en/user_basics.ssi:190 en/user_basics.ssi:198
-#: en/user_basics.ssi:208 en/user_basics.ssi:249 en/user_basics.ssi:261
-#: en/user_basics.ssi:277 en/user_basics.ssi:285 en/user_basics.ssi:312
-#: en/user_basics.ssi:351 en/user_customization-contents.ssi:39
+#: en/other_use-cases.ssi:137 en/project_bugs.ssi:62 en/user_basics.ssi:36
+#: en/user_basics.ssi:46 en/user_basics.ssi:60 en/user_basics.ssi:72
+#: en/user_basics.ssi:82 en/user_basics.ssi:94 en/user_basics.ssi:106
+#: en/user_basics.ssi:114 en/user_basics.ssi:122 en/user_basics.ssi:132
+#: 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:245 en/user_basics.ssi:257
+#: en/user_basics.ssi:273 en/user_basics.ssi:281 en/user_basics.ssi:308
+#: en/user_basics.ssi:347 en/user_customization-contents.ssi:39
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
#: en/user_customization-internationalization.ssi:14
#: en/user_customization-internationalization.ssi:22
@@ -400,7 +400,7 @@ msgstr ""
#. type: Plain text
#: en/project_bugs.ssi:86
-msgid "3~ At boot-time"
+msgid "3~ At boot time"
msgstr ""
#. type: Plain text
@@ -416,7 +416,7 @@ msgstr ""
#. type: Plain text
#: en/project_bugs.ssi:90
-msgid "3~ At run-time"
+msgid "3~ At run time"
msgstr ""
#. type: Plain text
diff --git a/manual/po/de/user_basics.ssi.po b/manual/po/de/user_basics.ssi.po
index 14ec30b..af85de1 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 VERSION\n"
-"POT-Creation-Date: 2010-10-23 16:43+0300\n"
+"POT-Creation-Date: 2010-10-27 21:40-0200\n"
"PO-Revision-Date: 2010-10-03 20:30+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -41,16 +41,17 @@ msgstr ""
#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
-#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111 en/user_basics.ssi:34
-#: en/user_basics.ssi:44 en/user_basics.ssi:56 en/user_basics.ssi:68
-#: en/user_basics.ssi:80 en/user_basics.ssi:92 en/user_basics.ssi:106
-#: en/user_basics.ssi:114 en/user_basics.ssi:122 en/user_basics.ssi:132
-#: en/user_basics.ssi:144 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:224 en/user_basics.ssi:257
-#: en/user_basics.ssi:273 en/user_basics.ssi:281 en/user_basics.ssi:301
-#: en/user_basics.ssi:326 en/user_customization-contents.ssi:34
-#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
+#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111
+#: en/project_bugs.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:54 en/user_basics.ssi:66 en/user_basics.ssi:78
+#: en/user_basics.ssi:88 en/user_basics.ssi:102 en/user_basics.ssi:110
+#: en/user_basics.ssi:118 en/user_basics.ssi:128 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:220 en/user_basics.ssi:253 en/user_basics.ssi:269
+#: en/user_basics.ssi:277 en/user_basics.ssi:297 en/user_basics.ssi:322
+#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
+#: en/user_customization-contents.ssi:66
#: en/user_customization-internationalization.ssi:10
#: en/user_customization-internationalization.ssi:18
#: en/user_customization-internationalization.ssi:26
@@ -101,16 +102,16 @@ msgstr ""
#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
#: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
#: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
-#: en/other_use-cases.ssi:137 en/user_basics.ssi:38 en/user_basics.ssi:48
-#: en/user_basics.ssi:62 en/user_basics.ssi:72 en/user_basics.ssi:86
-#: en/user_basics.ssi:98 en/user_basics.ssi:110 en/user_basics.ssi:118
-#: en/user_basics.ssi:126 en/user_basics.ssi:136 en/user_basics.ssi:150
-#: en/user_basics.ssi:160 en/user_basics.ssi:168 en/user_basics.ssi:176
-#: en/user_basics.ssi:190 en/user_basics.ssi:198 en/user_basics.ssi:208
-#: en/user_basics.ssi:249 en/user_basics.ssi:261 en/user_basics.ssi:277
-#: en/user_basics.ssi:285 en/user_basics.ssi:312 en/user_basics.ssi:351
-#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
-#: en/user_customization-contents.ssi:70
+#: en/other_use-cases.ssi:137 en/project_bugs.ssi:62 en/user_basics.ssi:36
+#: en/user_basics.ssi:46 en/user_basics.ssi:60 en/user_basics.ssi:72
+#: en/user_basics.ssi:82 en/user_basics.ssi:94 en/user_basics.ssi:106
+#: en/user_basics.ssi:114 en/user_basics.ssi:122 en/user_basics.ssi:132
+#: 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:245 en/user_basics.ssi:257
+#: en/user_basics.ssi:273 en/user_basics.ssi:281 en/user_basics.ssi:308
+#: en/user_basics.ssi:347 en/user_customization-contents.ssi:39
+#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
#: en/user_customization-internationalization.ssi:14
#: en/user_customization-internationalization.ssi:22
#: en/user_customization-internationalization.ssi:30
@@ -149,8 +150,8 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:6
msgid ""
-"This chapter contains a brief overview of the build process as well as "
-"containing instructions on how to boot the various binary image types."
+"This chapter contains a brief overview of the build process and instructions "
+"for booting the various binary image types."
msgstr ""
#. type: Plain text
@@ -162,8 +163,8 @@ msgstr ""
#: en/user_basics.ssi:10
msgid ""
"A live system usually means an operating system booted on a computer from a "
-"removable medium (such as CD-ROM, USB stick, or network), ready to use "
-"without any installation on the usual drive(s), with an auto-configuration "
+"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 runtime (see {Terms}#terms )."
msgstr ""
@@ -172,294 +173,291 @@ msgstr ""
msgid ""
"With Debian Live, it's a Debian GNU/Linux operating system, built for one of "
"the supported architectures (currently amd64, i386, powerpc and sparc). It "
-"is made from following parts:"
+"is made from the following parts:"
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:14
-msgid "_* Linux kernel"
+msgid "_* *{Linux kernel image}*, usually named #{vmlinuz*}#"
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:16
-msgid "_* The Linux image, usually named #{vmlinuz*}#"
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:18
msgid ""
-"_* *{Initial RAM disk image (initrd)}*: RAM disk setup for the Linux boot, "
-"containing modules possibly needed to mount the filesystem's image and some "
+"_* *{Initial RAM disk image (initrd)}*: a RAM disk set up for the Linux "
+"boot, containing modules possibly needed to mount the System image and some "
"scripts to do it."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:20
+#: en/user_basics.ssi:18
msgid ""
-"_* *{System image}*: The operating systems filesystem image. The SquashFS "
-"compressed filesystem is used to minimize the Debian Live image size. Note "
-"that it's read-only. So, during boot the Debian Live system will use a RAM "
-"disk and 'union' mechanism to enable writing files within the running "
-"system. However, all modifications will be lost upon shutdown unless "
-"optional persistence partition(s) are used (see persistence)."
+"_* *{System image}*: The operating system's filesystem image. Usually, a "
+"SquashFS compressed filesystem is used to minimize the Debian Live image "
+"size. Note that it is read-only. So, during boot the Debian Live system will "
+"use a RAM disk and 'union' mechanism to enable writing files within the "
+"running system. However, all modifications will be lost upon shutdown unless "
+"optional persistence is used (see persistence)."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:22
+#: en/user_basics.ssi:20
msgid "% FIXME: <xref linkend=\"persistence\"/>"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:24
+#: en/user_basics.ssi:22
msgid ""
-"_* *{Bootloader}*: A small piece of code, crafted to boot up from the chosen "
+"_* *{Bootloader}*: A small piece of code crafted to boot from the chosen "
"media, possibly presenting a prompt or menu to allow selection of options/"
-"configuration. It then loads the Linux kernel and its initrd to run with an "
-"associated filesystem image. Different solutions can be used depending on "
-"the target media and format of the filesystem containing the previous "
-"components: Isolinux to boot from a CD or DVD in ISO9660 format, syslinux "
-"for HDD or USB drive booting from a VFAT partition, extlinux for ext2/3/4 "
-"and btrfs partitions, pxelinux for PXE netboot, GRUB for ext2/3/4 partition, "
-"etc."
+"configuration. It loads the Linux kernel and its initrd to run with an "
+"associated system filesystem. Different solutions can be used, depending on "
+"the target media and format of the filesystem containing the previously "
+"mentioned components: isolinux to boot from a CD or DVD in ISO9660 format, "
+"syslinux for HDD or USB drive booting from a VFAT partition, extlinux for "
+"ext2/3/4 and btrfs partitions, pxelinux for PXE netboot, GRUB for ext2/3/4 "
+"partitions, etc."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:26
+#: en/user_basics.ssi:24
msgid ""
-"_* live-build will build the system image from your specifications, setup a "
-"Linux kernel and its initrd, a bootloader to run them, all in one media-"
-"dependant format (ISO9660 image, disk image, etc.)"
+"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.)"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:28
+#: en/user_basics.ssi:26
msgid "2~ First steps: building an ISO image"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:30
+#: en/user_basics.ssi:28
msgid ""
-"The following sequence of commands, provided by live-build, will create a "
-"basic ISO image containing just the Debian standard system without X.org. It "
-"is suitable for burning to CD or DVD media."
+"The following sequence of live-build commands will 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 "
+"(as per {Copying USB/HDD image to a USB stick}#copying-usb-hdd-image, "
+"specifying \".iso\" extension where \".img\" is indicated)."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:32
+#: en/user_basics.ssi:30
msgid ""
"First, we run the #{lb config}# command which will create a \"config/\" "
"hierarchy in the current directory for use by other commands:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:36
+#: en/user_basics.ssi:34
msgid "$ lb config"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:40
+#: en/user_basics.ssi:38
msgid ""
-"By passing no parameters to #{lb config}# we indicated that we wish to use "
+"By passing no parameters to #{lb config}#, we indicated that we wish to use "
"the defaults (see {The lb config command}#lb-config )."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:42
+#: en/user_basics.ssi:40
msgid ""
"Now that we have a \"config/\" hierarchy, we may build the image with the lb "
"build command:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:46 en/user_basics.ssi:124 en/user_basics.ssi:206
+#: en/user_basics.ssi:44 en/user_basics.ssi:120 en/user_basics.ssi:202
msgid "# lb build"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:50
+#: en/user_basics.ssi:48
msgid ""
"This process can take a while, depending on the speed of your network "
"connection (see {The lb build command}#lb-build )."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:52
+#: en/user_basics.ssi:50
msgid "3~ Testing an ISO image with Qemu"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:54
+#: en/user_basics.ssi:52
msgid "Testing an ISO is simple:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:58 en/user_basics.ssi:146
+#: en/user_basics.ssi:56 en/user_basics.ssi:142
msgid "# apt-get install qemu"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:60
+#: en/user_basics.ssi:58
msgid "$ qemu -cdrom binary.iso"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:64
+#: en/user_basics.ssi:62
msgid "3~ Testing an ISO image with virtualbox-ose"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:66
+#: en/user_basics.ssi:64
msgid "In order to test the ISO with virtualbox-ose:"
msgstr ""
#. type: Plain text
+#: en/user_basics.ssi:68
+msgid "# apt-get install virtualbox-ose virtualbox-ose-dkms"
+msgstr ""
+
+#. type: Plain text
#: en/user_basics.ssi:70
-msgid "# apt-get install virtualbox-ose"
+msgid "$ virtualbox"
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:74
msgid ""
-"and either install #{virtualbox-ose-source}# or #{virtualbox-ose-dkms}# to "
-"build the required kernel modules to run virtualbox-ose."
+"Create a new virtual machine, change the storage settings to use binary.iso "
+"as the CD/DVD device, and start the machine."
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:76
msgid ""
-"After successful installation, virtualbox can be e.g. found in the GNOME "
-"menu under 'Applications/System Tools/VirtualBox OSE'."
+"Note: For live systems containing X.org that you want to test with "
+"virtualbox-ose, you may wish to include the VirtualBox X.org driver package, "
+"virtualbox-ose-guest-x11, in your live-build configuration. Otherwise, the "
+"resolution is limited to 800x600."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:78
-msgid ""
-"Please consider including of following packages onto the live image to "
-"achieve higher resolution of the display when booting the live image in "
-"virutalbox-ose (1280x1024 instead of 800x600 and in particular if the "
-"default resolution of the virtualbox-ose display shouldn't work with the gui-"
-"installer)."
+#: en/user_basics.ssi:80
+msgid "# lb config --packages virtualbox-ose-guest-x11"
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:84
-msgid ""
-"virtualbox-ose-guest-dkms virtualbox-ose-guest-utils virtualbox-ose-guest-x11"
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:88
msgid "3~ Burning an ISO image to a physical medium"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:90
+#: en/user_basics.ssi:86
msgid "Burning an ISO image is easy:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:94
+#: en/user_basics.ssi:90
msgid "# apt-get install wodim"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:96
+#: en/user_basics.ssi:92
msgid "$ wodim binary.iso"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:100
-msgid "2~ Building an USB/HDD image"
+#: en/user_basics.ssi:96
+msgid "2~ Building a USB/HDD image"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:102
+#: en/user_basics.ssi:98
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."
+"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."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:104
+#: en/user_basics.ssi:100
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 "
+"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 ):"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:108 en/user_basics.ssi:188
+#: en/user_basics.ssi:104 en/user_basics.ssi:184
msgid "$ lb clean --binary"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:112
+#: en/user_basics.ssi:108
msgid ""
"Run the #{lb config}# command with the parameters to configure the \"config/"
"\" hierarchy to create a USB/HDD image type:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:116
+#: en/user_basics.ssi:112
msgid "$ lb config -b usb-hdd"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:120
+#: en/user_basics.ssi:116
msgid "Now build the image with the #{lb build} command:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:128
-msgid "3~ Copying USB/HDD image to a USB stick"
+#: en/user_basics.ssi:124
+msgid "3~copying-usb-hdd-image Copying USB/HDD image to a USB stick"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:130
+#: en/user_basics.ssi:126
msgid ""
"The generated binary image contains a VFAT partition and the syslinux "
-"bootloader, ready to be directly written on an USB stick. Plug in an USB "
-"stick with a size larger than that of binary.img and type:"
+"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:134
+#: en/user_basics.ssi:130
msgid "$ dd if=binary.img of=${USBSTICK}"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:138
+#: en/user_basics.ssi:134
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."
+"looking in #{dmesg}#'s output after plugging in the stick, for example, or "
+"better yet, #{ls -l /dev/disk/by-id}#."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:140
+#: en/user_basics.ssi:136
#, no-wrap
msgid "*{This will definitely overwrite any previous contents on your stick!}*\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:142
+#: en/user_basics.ssi:138
msgid "3~ Testing a USB/HDD image with Qemu"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:148
+#: en/user_basics.ssi:144
msgid "$ qemu -hda binary.img"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:152
+#: en/user_basics.ssi:148
msgid "3~ Using the space left on a USB stick"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:154
+#: en/user_basics.ssi:150
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}"
@@ -468,45 +466,45 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:158
+#: en/user_basics.ssi:154
msgid "# gparted ${USBSTICK}"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:162
+#: en/user_basics.ssi:158
msgid ""
-"Ater the creation of the partition you have to create a filsystem on it. One "
-"possible choice would be ext4."
+"After the creation of the partition, you have to create a filesystem on it. "
+"One possible choice would be ext4."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:166
+#: en/user_basics.ssi:162
msgid "# mkfs.ext4 ${USBSTICK}"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:170
+#: en/user_basics.ssi:166
msgid "If you want to use this data partition with Windows, use FAT32."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:174
+#: en/user_basics.ssi:170
msgid "# mkfs.vfat -F 32"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:178
+#: en/user_basics.ssi:174
#, no-wrap
-msgid "*{Remember: Every time you install a new binary.img on the stick, all your data will be lost because the image includes a complete partition table.}*\n"
+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"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:180
+#: en/user_basics.ssi:176
msgid "2~ Building a netboot image"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:182
+#: en/user_basics.ssi:178
msgid ""
"The following sequence of commands will create a basic netboot image "
"containing the Debian standard system without X.org. It is suitable for "
@@ -514,54 +512,54 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:184
+#: en/user_basics.ssi:180
msgid ""
-"Note if you performed any previous examples, you will need to clean up your "
+"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:192
+#: en/user_basics.ssi:188
msgid ""
"Run the #{lb config}# command with the parameters to configure the \"config/"
"\" hierarchy to create our netboot image:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:196
+#: en/user_basics.ssi:192
msgid ""
"$ lb config -b net --net-root-path \"/srv/debian-live\" --net-root-server "
"\"192.168.0.1\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:200
+#: en/user_basics.ssi:196
msgid ""
-"In contrast with the ISO and USB hdd images, netbooting does not support "
-"serving a filesystem image with the client so the files must be served via "
+"In contrast with the ISO and USB/HDD images, netbooting does not support "
+"serving a filesystem image with the client, so the files must be served via "
"NFS. The net-root-path and net-root-server options specify the location and "
"server, respectively, of the NFS server where the filesytem image will be "
-"located at boot-time."
+"located at boot time."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:202
+#: en/user_basics.ssi:198
msgid "Now build the image with the #{lb build}# command:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:210
+#: en/user_basics.ssi:206
msgid ""
-"In a network boot the client runs a small piece of software, which usually "
+"In a network boot, the client runs a small piece of software which usually "
"resides on the EPROM of the Ethernet card. This program sends a DHCP request "
-"to get an IP address and information about what to do next. Typically the "
-"next step is getting a higher level boot loader via the TFTP protocol. That "
-"could be PXELINUX, Grub or even boot directly to an operating system like "
+"to get an IP address and information about what to do next. Typically, the "
+"next step is getting a higher level bootloader via the TFTP protocol. That "
+"could be PXELINUX, GRUB, or even boot directly to an operating system like "
"Linux."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:212
+#: en/user_basics.ssi:208
msgid ""
"For example, if you unpack the generated binary-net.tar.gz archive in the /"
"srv/debian-live directory, you'll find the filesystem image in live/"
@@ -570,43 +568,43 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:214
+#: en/user_basics.ssi:210
msgid "We must now configure three services on the server to enable netboot."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:216
+#: en/user_basics.ssi:212
msgid "3~ DHCP server"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:218
+#: en/user_basics.ssi:214
msgid ""
"We must configure our network's DHCP server to be sure to give an IP address "
-"to the computer netbooting, and to advertise the location of the PXE "
+"to the netbooting client system, and to advertise the location of the PXE "
"bootloader."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:220
+#: en/user_basics.ssi:216
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:222 en/user_customization-packages.ssi:153
+#: en/user_basics.ssi:218 en/user_customization-packages.ssi:153
msgid "% FIXME"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:226
+#: en/user_basics.ssi:222
#, no-wrap
msgid "subnet 192.168.1.0 netmask 255.255.255.0 { # 192.168.1.0/24\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:229
+#: en/user_basics.ssi:225
#, no-wrap
msgid ""
" # IP addresses available for guests\n"
@@ -614,7 +612,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:232
+#: en/user_basics.ssi:228
#, no-wrap
msgid ""
" # allow booting from the net\n"
@@ -622,7 +620,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:237
+#: en/user_basics.ssi:233
#, no-wrap
msgid ""
" # for net booting, server where the first file to be loaded (by TFTP\n"
@@ -632,7 +630,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:241
+#: en/user_basics.ssi:237
#, no-wrap
msgid ""
" # net boot configuration for guests with a PXE client:\n"
@@ -641,15 +639,15 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:244
+#: en/user_basics.ssi:240
#, no-wrap
msgid ""
-" # PXE boot loader (first program to be loaded, by TFTP)\n"
+" # PXE bootloader (first program to be loaded, by TFTP)\n"
" filename \"pxelinux.0\";\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:247
+#: en/user_basics.ssi:243
#, no-wrap
msgid ""
" }\n"
@@ -657,17 +655,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:251
+#: en/user_basics.ssi:247
msgid "3~ TFTP server"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:253
-msgid "This serves the kernel and initial ramdisk to the system at run-time."
+#: en/user_basics.ssi:249
+msgid "This serves the kernel and initial ramdisk to the system at run time."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:255
+#: en/user_basics.ssi:251
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 /"
@@ -675,22 +673,22 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:259
+#: en/user_basics.ssi:255
msgid "dpkg-reconfigure -plow tftpd-hpa"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:263
+#: en/user_basics.ssi:259
msgid "and fill in the new tftp server directory when being asked about it."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:265
+#: en/user_basics.ssi:261
msgid "3~ NFS server"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:267
+#: en/user_basics.ssi:263
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 "
@@ -698,35 +696,35 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:269
+#: en/user_basics.ssi:265
msgid "You need to install the nfs-kernel-server package."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:271
+#: en/user_basics.ssi:267
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:275
+#: en/user_basics.ssi:271
msgid "/srv/debian-live *(ro,async,no_root_squash,no_subtree_check)"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:279
+#: en/user_basics.ssi:275
msgid ""
"and tell the NFS server about this new export with the following command:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:283
+#: en/user_basics.ssi:279
msgid "# exportfs -rv"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:287
+#: en/user_basics.ssi:283
msgid ""
"Setting up these three services can be a little tricky. You might need some "
"patience to get all of them working together. The Debian Installer Manual's "
@@ -735,40 +733,40 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:289
+#: en/user_basics.ssi:285
msgid "3~ Netboot testing HowTo"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:291
+#: en/user_basics.ssi:287
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:293
+#: en/user_basics.ssi:289
msgid ""
"To make our life easier, we can use virtualization. There are two solutions."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:295
+#: en/user_basics.ssi:291
msgid "3~ Qemu"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:297
+#: en/user_basics.ssi:293
msgid "_* Install qemu, bridge-utils, sudo."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:299
+#: en/user_basics.ssi:295
msgid "Edit /etc/qemu-ifup:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:310
+#: en/user_basics.ssi:306
msgid ""
"#!/bin/sh sudo -p \"Password for $0:\" /sbin/ifconfig $1 172.20.0.1 echo "
"\"Executing /etc/qemu-ifup\" echo \"Bringing up $1 for bridged mode...\" "
@@ -777,62 +775,62 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:314
+#: en/user_basics.ssi:310
msgid "Get, or build a grub-floppy-netboot (in the svn)."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:316
+#: en/user_basics.ssi:312
msgid "Launch qemu with \"-net nic,vlan=0 -net tap,vlan=0,ifname=tun0\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:318
+#: en/user_basics.ssi:314
msgid "3~ VMWare Player"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:320
+#: en/user_basics.ssi:316
msgid "_* Install VMWare Player (\"free as in beer\" edition)"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:322
+#: en/user_basics.ssi:318
msgid ""
"_* Create a PXETester directory, and create a text file called pxe.vwx inside"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:324
+#: en/user_basics.ssi:320
msgid "_* Paste this text inside:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:332
+#: en/user_basics.ssi:328
msgid ""
"#!/usr/bin/vmware config.version = \"8\" virtualHW.version = \"4\" memsize = "
"\"512\" MemAllowAutoScaleDown = \"FALSE\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:338
+#: en/user_basics.ssi:334
msgid ""
"ide0:0.present = \"FALSE\" ide1:0.present = \"FALSE\" floppy0.present = "
"\"FALSE\" sound.present = \"FALSE\" tools.remindInstall = \"FALSE\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:341
+#: en/user_basics.ssi:337
msgid "ethernet0.present = \"TRUE\" ethernet0.addressType = \"generated\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:344
+#: en/user_basics.ssi:340
msgid "displayName = \"Test Boot PXE\" guestOS = \"other\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:349
+#: en/user_basics.ssi:345
msgid ""
"ethernet0.generatedAddress = \"00:0c:29:8d:71:3b\" uuid.location = \"56 4d "
"83 72 5c c4 de 3f-ae 9e 07 91 1d 8d 71 3b\" uuid.bios = \"56 4d 83 72 5c c4 "
@@ -840,19 +838,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:353
+#: en/user_basics.ssi:349
msgid ""
"_* You can play with this configuration file (i.e. change memory limit to "
"256)"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:355
+#: en/user_basics.ssi:351
msgid ""
-"_* Double click on this file (or run VMWare player and selecet this file)."
+"_* Double click on this file (or run VMWare player and select this file)."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:356
+#: en/user_basics.ssi:352
msgid "_* When running just press space if that strange question comes up..."
msgstr ""
diff --git a/manual/po/fr/project_bugs.ssi.po b/manual/po/fr/project_bugs.ssi.po
index 6e963eb..17e6d7d 100644
--- a/manual/po/fr/project_bugs.ssi.po
+++ b/manual/po/fr/project_bugs.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-25 23:27+0300\n"
+"POT-Creation-Date: 2010-10-27 21:40-0200\n"
"PO-Revision-Date: 2010-10-25 23:27+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -42,14 +42,14 @@ msgstr ""
#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111
-#: en/project_bugs.ssi:58 en/user_basics.ssi:34 en/user_basics.ssi:44
-#: en/user_basics.ssi:56 en/user_basics.ssi:68 en/user_basics.ssi:80
-#: en/user_basics.ssi:92 en/user_basics.ssi:106 en/user_basics.ssi:114
-#: en/user_basics.ssi:122 en/user_basics.ssi:132 en/user_basics.ssi:144
-#: 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:224 en/user_basics.ssi:257 en/user_basics.ssi:273
-#: en/user_basics.ssi:281 en/user_basics.ssi:301 en/user_basics.ssi:326
+#: en/project_bugs.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:54 en/user_basics.ssi:66 en/user_basics.ssi:78
+#: en/user_basics.ssi:88 en/user_basics.ssi:102 en/user_basics.ssi:110
+#: en/user_basics.ssi:118 en/user_basics.ssi:128 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:220 en/user_basics.ssi:253 en/user_basics.ssi:269
+#: en/user_basics.ssi:277 en/user_basics.ssi:297 en/user_basics.ssi:322
#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
#: en/user_customization-contents.ssi:66
#: en/user_customization-internationalization.ssi:10
@@ -102,15 +102,15 @@ msgstr "code{"
#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
#: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
#: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
-#: en/other_use-cases.ssi:137 en/project_bugs.ssi:62 en/user_basics.ssi:38
-#: en/user_basics.ssi:48 en/user_basics.ssi:62 en/user_basics.ssi:72
-#: en/user_basics.ssi:86 en/user_basics.ssi:98 en/user_basics.ssi:110
-#: en/user_basics.ssi:118 en/user_basics.ssi:126 en/user_basics.ssi:136
-#: en/user_basics.ssi:150 en/user_basics.ssi:160 en/user_basics.ssi:168
-#: en/user_basics.ssi:176 en/user_basics.ssi:190 en/user_basics.ssi:198
-#: en/user_basics.ssi:208 en/user_basics.ssi:249 en/user_basics.ssi:261
-#: en/user_basics.ssi:277 en/user_basics.ssi:285 en/user_basics.ssi:312
-#: en/user_basics.ssi:351 en/user_customization-contents.ssi:39
+#: en/other_use-cases.ssi:137 en/project_bugs.ssi:62 en/user_basics.ssi:36
+#: en/user_basics.ssi:46 en/user_basics.ssi:60 en/user_basics.ssi:72
+#: en/user_basics.ssi:82 en/user_basics.ssi:94 en/user_basics.ssi:106
+#: en/user_basics.ssi:114 en/user_basics.ssi:122 en/user_basics.ssi:132
+#: 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:245 en/user_basics.ssi:257
+#: en/user_basics.ssi:273 en/user_basics.ssi:281 en/user_basics.ssi:308
+#: en/user_basics.ssi:347 en/user_customization-contents.ssi:39
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
#: en/user_customization-internationalization.ssi:14
#: en/user_customization-internationalization.ssi:22
@@ -400,7 +400,7 @@ msgstr ""
#. type: Plain text
#: en/project_bugs.ssi:86
-msgid "3~ At boot-time"
+msgid "3~ At boot time"
msgstr ""
#. type: Plain text
@@ -416,7 +416,7 @@ msgstr ""
#. type: Plain text
#: en/project_bugs.ssi:90
-msgid "3~ At run-time"
+msgid "3~ At run time"
msgstr ""
#. type: Plain text
diff --git a/manual/po/fr/user_basics.ssi.po b/manual/po/fr/user_basics.ssi.po
index eed62b0..cf3b59a 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 VERSION\n"
-"POT-Creation-Date: 2010-10-23 16:43+0300\n"
+"POT-Creation-Date: 2010-10-27 21:40-0200\n"
"PO-Revision-Date: 2010-10-20 06:53-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -41,16 +41,17 @@ msgstr ""
#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
-#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111 en/user_basics.ssi:34
-#: en/user_basics.ssi:44 en/user_basics.ssi:56 en/user_basics.ssi:68
-#: en/user_basics.ssi:80 en/user_basics.ssi:92 en/user_basics.ssi:106
-#: en/user_basics.ssi:114 en/user_basics.ssi:122 en/user_basics.ssi:132
-#: en/user_basics.ssi:144 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:224 en/user_basics.ssi:257
-#: en/user_basics.ssi:273 en/user_basics.ssi:281 en/user_basics.ssi:301
-#: en/user_basics.ssi:326 en/user_customization-contents.ssi:34
-#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
+#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111
+#: en/project_bugs.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:54 en/user_basics.ssi:66 en/user_basics.ssi:78
+#: en/user_basics.ssi:88 en/user_basics.ssi:102 en/user_basics.ssi:110
+#: en/user_basics.ssi:118 en/user_basics.ssi:128 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:220 en/user_basics.ssi:253 en/user_basics.ssi:269
+#: en/user_basics.ssi:277 en/user_basics.ssi:297 en/user_basics.ssi:322
+#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
+#: en/user_customization-contents.ssi:66
#: en/user_customization-internationalization.ssi:10
#: en/user_customization-internationalization.ssi:18
#: en/user_customization-internationalization.ssi:26
@@ -101,16 +102,16 @@ msgstr "code{"
#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
#: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
#: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
-#: en/other_use-cases.ssi:137 en/user_basics.ssi:38 en/user_basics.ssi:48
-#: en/user_basics.ssi:62 en/user_basics.ssi:72 en/user_basics.ssi:86
-#: en/user_basics.ssi:98 en/user_basics.ssi:110 en/user_basics.ssi:118
-#: en/user_basics.ssi:126 en/user_basics.ssi:136 en/user_basics.ssi:150
-#: en/user_basics.ssi:160 en/user_basics.ssi:168 en/user_basics.ssi:176
-#: en/user_basics.ssi:190 en/user_basics.ssi:198 en/user_basics.ssi:208
-#: en/user_basics.ssi:249 en/user_basics.ssi:261 en/user_basics.ssi:277
-#: en/user_basics.ssi:285 en/user_basics.ssi:312 en/user_basics.ssi:351
-#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
-#: en/user_customization-contents.ssi:70
+#: en/other_use-cases.ssi:137 en/project_bugs.ssi:62 en/user_basics.ssi:36
+#: en/user_basics.ssi:46 en/user_basics.ssi:60 en/user_basics.ssi:72
+#: en/user_basics.ssi:82 en/user_basics.ssi:94 en/user_basics.ssi:106
+#: en/user_basics.ssi:114 en/user_basics.ssi:122 en/user_basics.ssi:132
+#: 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:245 en/user_basics.ssi:257
+#: en/user_basics.ssi:273 en/user_basics.ssi:281 en/user_basics.ssi:308
+#: en/user_basics.ssi:347 en/user_customization-contents.ssi:39
+#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
#: en/user_customization-internationalization.ssi:14
#: en/user_customization-internationalization.ssi:22
#: en/user_customization-internationalization.ssi:30
@@ -149,8 +150,8 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:6
msgid ""
-"This chapter contains a brief overview of the build process as well as "
-"containing instructions on how to boot the various binary image types."
+"This chapter contains a brief overview of the build process and instructions "
+"for booting the various binary image types."
msgstr ""
#. type: Plain text
@@ -162,8 +163,8 @@ msgstr ""
#: en/user_basics.ssi:10
msgid ""
"A live system usually means an operating system booted on a computer from a "
-"removable medium (such as CD-ROM, USB stick, or network), ready to use "
-"without any installation on the usual drive(s), with an auto-configuration "
+"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 runtime (see {Terms}#terms )."
msgstr ""
@@ -172,294 +173,291 @@ msgstr ""
msgid ""
"With Debian Live, it's a Debian GNU/Linux operating system, built for one of "
"the supported architectures (currently amd64, i386, powerpc and sparc). It "
-"is made from following parts:"
+"is made from the following parts:"
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:14
-msgid "_* Linux kernel"
+msgid "_* *{Linux kernel image}*, usually named #{vmlinuz*}#"
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:16
-msgid "_* The Linux image, usually named #{vmlinuz*}#"
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:18
msgid ""
-"_* *{Initial RAM disk image (initrd)}*: RAM disk setup for the Linux boot, "
-"containing modules possibly needed to mount the filesystem's image and some "
+"_* *{Initial RAM disk image (initrd)}*: a RAM disk set up for the Linux "
+"boot, containing modules possibly needed to mount the System image and some "
"scripts to do it."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:20
+#: en/user_basics.ssi:18
msgid ""
-"_* *{System image}*: The operating systems filesystem image. The SquashFS "
-"compressed filesystem is used to minimize the Debian Live image size. Note "
-"that it's read-only. So, during boot the Debian Live system will use a RAM "
-"disk and 'union' mechanism to enable writing files within the running "
-"system. However, all modifications will be lost upon shutdown unless "
-"optional persistence partition(s) are used (see persistence)."
+"_* *{System image}*: The operating system's filesystem image. Usually, a "
+"SquashFS compressed filesystem is used to minimize the Debian Live image "
+"size. Note that it is read-only. So, during boot the Debian Live system will "
+"use a RAM disk and 'union' mechanism to enable writing files within the "
+"running system. However, all modifications will be lost upon shutdown unless "
+"optional persistence is used (see persistence)."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:22
+#: en/user_basics.ssi:20
msgid "% FIXME: <xref linkend=\"persistence\"/>"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:24
+#: en/user_basics.ssi:22
msgid ""
-"_* *{Bootloader}*: A small piece of code, crafted to boot up from the chosen "
+"_* *{Bootloader}*: A small piece of code crafted to boot from the chosen "
"media, possibly presenting a prompt or menu to allow selection of options/"
-"configuration. It then loads the Linux kernel and its initrd to run with an "
-"associated filesystem image. Different solutions can be used depending on "
-"the target media and format of the filesystem containing the previous "
-"components: Isolinux to boot from a CD or DVD in ISO9660 format, syslinux "
-"for HDD or USB drive booting from a VFAT partition, extlinux for ext2/3/4 "
-"and btrfs partitions, pxelinux for PXE netboot, GRUB for ext2/3/4 partition, "
-"etc."
+"configuration. It loads the Linux kernel and its initrd to run with an "
+"associated system filesystem. Different solutions can be used, depending on "
+"the target media and format of the filesystem containing the previously "
+"mentioned components: isolinux to boot from a CD or DVD in ISO9660 format, "
+"syslinux for HDD or USB drive booting from a VFAT partition, extlinux for "
+"ext2/3/4 and btrfs partitions, pxelinux for PXE netboot, GRUB for ext2/3/4 "
+"partitions, etc."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:26
+#: en/user_basics.ssi:24
msgid ""
-"_* live-build will build the system image from your specifications, setup a "
-"Linux kernel and its initrd, a bootloader to run them, all in one media-"
-"dependant format (ISO9660 image, disk image, etc.)"
+"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.)"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:28
+#: en/user_basics.ssi:26
msgid "2~ First steps: building an ISO image"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:30
+#: en/user_basics.ssi:28
msgid ""
-"The following sequence of commands, provided by live-build, will create a "
-"basic ISO image containing just the Debian standard system without X.org. It "
-"is suitable for burning to CD or DVD media."
+"The following sequence of live-build commands will 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 "
+"(as per {Copying USB/HDD image to a USB stick}#copying-usb-hdd-image, "
+"specifying \".iso\" extension where \".img\" is indicated)."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:32
+#: en/user_basics.ssi:30
msgid ""
"First, we run the #{lb config}# command which will create a \"config/\" "
"hierarchy in the current directory for use by other commands:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:36
+#: en/user_basics.ssi:34
msgid "$ lb config"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:40
+#: en/user_basics.ssi:38
msgid ""
-"By passing no parameters to #{lb config}# we indicated that we wish to use "
+"By passing no parameters to #{lb config}#, we indicated that we wish to use "
"the defaults (see {The lb config command}#lb-config )."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:42
+#: en/user_basics.ssi:40
msgid ""
"Now that we have a \"config/\" hierarchy, we may build the image with the lb "
"build command:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:46 en/user_basics.ssi:124 en/user_basics.ssi:206
+#: en/user_basics.ssi:44 en/user_basics.ssi:120 en/user_basics.ssi:202
msgid "# lb build"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:50
+#: en/user_basics.ssi:48
msgid ""
"This process can take a while, depending on the speed of your network "
"connection (see {The lb build command}#lb-build )."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:52
+#: en/user_basics.ssi:50
msgid "3~ Testing an ISO image with Qemu"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:54
+#: en/user_basics.ssi:52
msgid "Testing an ISO is simple:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:58 en/user_basics.ssi:146
+#: en/user_basics.ssi:56 en/user_basics.ssi:142
msgid "# apt-get install qemu"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:60
+#: en/user_basics.ssi:58
msgid "$ qemu -cdrom binary.iso"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:64
+#: en/user_basics.ssi:62
msgid "3~ Testing an ISO image with virtualbox-ose"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:66
+#: en/user_basics.ssi:64
msgid "In order to test the ISO with virtualbox-ose:"
msgstr ""
#. type: Plain text
+#: en/user_basics.ssi:68
+msgid "# apt-get install virtualbox-ose virtualbox-ose-dkms"
+msgstr ""
+
+#. type: Plain text
#: en/user_basics.ssi:70
-msgid "# apt-get install virtualbox-ose"
+msgid "$ virtualbox"
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:74
msgid ""
-"and either install #{virtualbox-ose-source}# or #{virtualbox-ose-dkms}# to "
-"build the required kernel modules to run virtualbox-ose."
+"Create a new virtual machine, change the storage settings to use binary.iso "
+"as the CD/DVD device, and start the machine."
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:76
msgid ""
-"After successful installation, virtualbox can be e.g. found in the GNOME "
-"menu under 'Applications/System Tools/VirtualBox OSE'."
+"Note: For live systems containing X.org that you want to test with "
+"virtualbox-ose, you may wish to include the VirtualBox X.org driver package, "
+"virtualbox-ose-guest-x11, in your live-build configuration. Otherwise, the "
+"resolution is limited to 800x600."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:78
-msgid ""
-"Please consider including of following packages onto the live image to "
-"achieve higher resolution of the display when booting the live image in "
-"virutalbox-ose (1280x1024 instead of 800x600 and in particular if the "
-"default resolution of the virtualbox-ose display shouldn't work with the gui-"
-"installer)."
+#: en/user_basics.ssi:80
+msgid "# lb config --packages virtualbox-ose-guest-x11"
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:84
-msgid ""
-"virtualbox-ose-guest-dkms virtualbox-ose-guest-utils virtualbox-ose-guest-x11"
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:88
msgid "3~ Burning an ISO image to a physical medium"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:90
+#: en/user_basics.ssi:86
msgid "Burning an ISO image is easy:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:94
+#: en/user_basics.ssi:90
msgid "# apt-get install wodim"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:96
+#: en/user_basics.ssi:92
msgid "$ wodim binary.iso"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:100
-msgid "2~ Building an USB/HDD image"
+#: en/user_basics.ssi:96
+msgid "2~ Building a USB/HDD image"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:102
+#: en/user_basics.ssi:98
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."
+"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."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:104
+#: en/user_basics.ssi:100
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 "
+"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 ):"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:108 en/user_basics.ssi:188
+#: en/user_basics.ssi:104 en/user_basics.ssi:184
msgid "$ lb clean --binary"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:112
+#: en/user_basics.ssi:108
msgid ""
"Run the #{lb config}# command with the parameters to configure the \"config/"
"\" hierarchy to create a USB/HDD image type:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:116
+#: en/user_basics.ssi:112
msgid "$ lb config -b usb-hdd"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:120
+#: en/user_basics.ssi:116
msgid "Now build the image with the #{lb build} command:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:128
-msgid "3~ Copying USB/HDD image to a USB stick"
+#: en/user_basics.ssi:124
+msgid "3~copying-usb-hdd-image Copying USB/HDD image to a USB stick"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:130
+#: en/user_basics.ssi:126
msgid ""
"The generated binary image contains a VFAT partition and the syslinux "
-"bootloader, ready to be directly written on an USB stick. Plug in an USB "
-"stick with a size larger than that of binary.img and type:"
+"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:134
+#: en/user_basics.ssi:130
msgid "$ dd if=binary.img of=${USBSTICK}"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:138
+#: en/user_basics.ssi:134
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."
+"looking in #{dmesg}#'s output after plugging in the stick, for example, or "
+"better yet, #{ls -l /dev/disk/by-id}#."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:140
+#: en/user_basics.ssi:136
#, no-wrap
msgid "*{This will definitely overwrite any previous contents on your stick!}*\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:142
+#: en/user_basics.ssi:138
msgid "3~ Testing a USB/HDD image with Qemu"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:148
+#: en/user_basics.ssi:144
msgid "$ qemu -hda binary.img"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:152
+#: en/user_basics.ssi:148
msgid "3~ Using the space left on a USB stick"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:154
+#: en/user_basics.ssi:150
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}"
@@ -468,45 +466,45 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:158
+#: en/user_basics.ssi:154
msgid "# gparted ${USBSTICK}"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:162
+#: en/user_basics.ssi:158
msgid ""
-"Ater the creation of the partition you have to create a filsystem on it. One "
-"possible choice would be ext4."
+"After the creation of the partition, you have to create a filesystem on it. "
+"One possible choice would be ext4."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:166
+#: en/user_basics.ssi:162
msgid "# mkfs.ext4 ${USBSTICK}"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:170
+#: en/user_basics.ssi:166
msgid "If you want to use this data partition with Windows, use FAT32."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:174
+#: en/user_basics.ssi:170
msgid "# mkfs.vfat -F 32"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:178
+#: en/user_basics.ssi:174
#, no-wrap
-msgid "*{Remember: Every time you install a new binary.img on the stick, all your data will be lost because the image includes a complete partition table.}*\n"
+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"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:180
+#: en/user_basics.ssi:176
msgid "2~ Building a netboot image"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:182
+#: en/user_basics.ssi:178
msgid ""
"The following sequence of commands will create a basic netboot image "
"containing the Debian standard system without X.org. It is suitable for "
@@ -514,54 +512,54 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:184
+#: en/user_basics.ssi:180
msgid ""
-"Note if you performed any previous examples, you will need to clean up your "
+"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:192
+#: en/user_basics.ssi:188
msgid ""
"Run the #{lb config}# command with the parameters to configure the \"config/"
"\" hierarchy to create our netboot image:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:196
+#: en/user_basics.ssi:192
msgid ""
"$ lb config -b net --net-root-path \"/srv/debian-live\" --net-root-server "
"\"192.168.0.1\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:200
+#: en/user_basics.ssi:196
msgid ""
-"In contrast with the ISO and USB hdd images, netbooting does not support "
-"serving a filesystem image with the client so the files must be served via "
+"In contrast with the ISO and USB/HDD images, netbooting does not support "
+"serving a filesystem image with the client, so the files must be served via "
"NFS. The net-root-path and net-root-server options specify the location and "
"server, respectively, of the NFS server where the filesytem image will be "
-"located at boot-time."
+"located at boot time."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:202
+#: en/user_basics.ssi:198
msgid "Now build the image with the #{lb build}# command:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:210
+#: en/user_basics.ssi:206
msgid ""
-"In a network boot the client runs a small piece of software, which usually "
+"In a network boot, the client runs a small piece of software which usually "
"resides on the EPROM of the Ethernet card. This program sends a DHCP request "
-"to get an IP address and information about what to do next. Typically the "
-"next step is getting a higher level boot loader via the TFTP protocol. That "
-"could be PXELINUX, Grub or even boot directly to an operating system like "
+"to get an IP address and information about what to do next. Typically, the "
+"next step is getting a higher level bootloader via the TFTP protocol. That "
+"could be PXELINUX, GRUB, or even boot directly to an operating system like "
"Linux."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:212
+#: en/user_basics.ssi:208
msgid ""
"For example, if you unpack the generated binary-net.tar.gz archive in the /"
"srv/debian-live directory, you'll find the filesystem image in live/"
@@ -570,43 +568,43 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:214
+#: en/user_basics.ssi:210
msgid "We must now configure three services on the server to enable netboot."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:216
+#: en/user_basics.ssi:212
msgid "3~ DHCP server"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:218
+#: en/user_basics.ssi:214
msgid ""
"We must configure our network's DHCP server to be sure to give an IP address "
-"to the computer netbooting, and to advertise the location of the PXE "
+"to the netbooting client system, and to advertise the location of the PXE "
"bootloader."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:220
+#: en/user_basics.ssi:216
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:222 en/user_customization-packages.ssi:153
+#: en/user_basics.ssi:218 en/user_customization-packages.ssi:153
msgid "% FIXME"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:226
+#: en/user_basics.ssi:222
#, no-wrap
msgid "subnet 192.168.1.0 netmask 255.255.255.0 { # 192.168.1.0/24\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:229
+#: en/user_basics.ssi:225
#, no-wrap
msgid ""
" # IP addresses available for guests\n"
@@ -614,7 +612,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:232
+#: en/user_basics.ssi:228
#, no-wrap
msgid ""
" # allow booting from the net\n"
@@ -622,7 +620,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:237
+#: en/user_basics.ssi:233
#, no-wrap
msgid ""
" # for net booting, server where the first file to be loaded (by TFTP\n"
@@ -632,7 +630,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:241
+#: en/user_basics.ssi:237
#, no-wrap
msgid ""
" # net boot configuration for guests with a PXE client:\n"
@@ -641,15 +639,15 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:244
+#: en/user_basics.ssi:240
#, no-wrap
msgid ""
-" # PXE boot loader (first program to be loaded, by TFTP)\n"
+" # PXE bootloader (first program to be loaded, by TFTP)\n"
" filename \"pxelinux.0\";\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:247
+#: en/user_basics.ssi:243
#, no-wrap
msgid ""
" }\n"
@@ -657,17 +655,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:251
+#: en/user_basics.ssi:247
msgid "3~ TFTP server"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:253
-msgid "This serves the kernel and initial ramdisk to the system at run-time."
+#: en/user_basics.ssi:249
+msgid "This serves the kernel and initial ramdisk to the system at run time."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:255
+#: en/user_basics.ssi:251
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 /"
@@ -675,22 +673,22 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:259
+#: en/user_basics.ssi:255
msgid "dpkg-reconfigure -plow tftpd-hpa"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:263
+#: en/user_basics.ssi:259
msgid "and fill in the new tftp server directory when being asked about it."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:265
+#: en/user_basics.ssi:261
msgid "3~ NFS server"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:267
+#: en/user_basics.ssi:263
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 "
@@ -698,35 +696,35 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:269
+#: en/user_basics.ssi:265
msgid "You need to install the nfs-kernel-server package."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:271
+#: en/user_basics.ssi:267
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:275
+#: en/user_basics.ssi:271
msgid "/srv/debian-live *(ro,async,no_root_squash,no_subtree_check)"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:279
+#: en/user_basics.ssi:275
msgid ""
"and tell the NFS server about this new export with the following command:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:283
+#: en/user_basics.ssi:279
msgid "# exportfs -rv"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:287
+#: en/user_basics.ssi:283
msgid ""
"Setting up these three services can be a little tricky. You might need some "
"patience to get all of them working together. The Debian Installer Manual's "
@@ -735,40 +733,40 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:289
+#: en/user_basics.ssi:285
msgid "3~ Netboot testing HowTo"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:291
+#: en/user_basics.ssi:287
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:293
+#: en/user_basics.ssi:289
msgid ""
"To make our life easier, we can use virtualization. There are two solutions."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:295
+#: en/user_basics.ssi:291
msgid "3~ Qemu"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:297
+#: en/user_basics.ssi:293
msgid "_* Install qemu, bridge-utils, sudo."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:299
+#: en/user_basics.ssi:295
msgid "Edit /etc/qemu-ifup:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:310
+#: en/user_basics.ssi:306
msgid ""
"#!/bin/sh sudo -p \"Password for $0:\" /sbin/ifconfig $1 172.20.0.1 echo "
"\"Executing /etc/qemu-ifup\" echo \"Bringing up $1 for bridged mode...\" "
@@ -777,62 +775,62 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:314
+#: en/user_basics.ssi:310
msgid "Get, or build a grub-floppy-netboot (in the svn)."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:316
+#: en/user_basics.ssi:312
msgid "Launch qemu with \"-net nic,vlan=0 -net tap,vlan=0,ifname=tun0\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:318
+#: en/user_basics.ssi:314
msgid "3~ VMWare Player"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:320
+#: en/user_basics.ssi:316
msgid "_* Install VMWare Player (\"free as in beer\" edition)"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:322
+#: en/user_basics.ssi:318
msgid ""
"_* Create a PXETester directory, and create a text file called pxe.vwx inside"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:324
+#: en/user_basics.ssi:320
msgid "_* Paste this text inside:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:332
+#: en/user_basics.ssi:328
msgid ""
"#!/usr/bin/vmware config.version = \"8\" virtualHW.version = \"4\" memsize = "
"\"512\" MemAllowAutoScaleDown = \"FALSE\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:338
+#: en/user_basics.ssi:334
msgid ""
"ide0:0.present = \"FALSE\" ide1:0.present = \"FALSE\" floppy0.present = "
"\"FALSE\" sound.present = \"FALSE\" tools.remindInstall = \"FALSE\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:341
+#: en/user_basics.ssi:337
msgid "ethernet0.present = \"TRUE\" ethernet0.addressType = \"generated\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:344
+#: en/user_basics.ssi:340
msgid "displayName = \"Test Boot PXE\" guestOS = \"other\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:349
+#: en/user_basics.ssi:345
msgid ""
"ethernet0.generatedAddress = \"00:0c:29:8d:71:3b\" uuid.location = \"56 4d "
"83 72 5c c4 de 3f-ae 9e 07 91 1d 8d 71 3b\" uuid.bios = \"56 4d 83 72 5c c4 "
@@ -840,19 +838,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:353
+#: en/user_basics.ssi:349
msgid ""
"_* You can play with this configuration file (i.e. change memory limit to "
"256)"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:355
+#: en/user_basics.ssi:351
msgid ""
-"_* Double click on this file (or run VMWare player and selecet this file)."
+"_* Double click on this file (or run VMWare player and select this file)."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:356
+#: en/user_basics.ssi:352
msgid "_* When running just press space if that strange question comes up..."
msgstr ""
diff --git a/manual/po/pt_BR/project_bugs.ssi.po b/manual/po/pt_BR/project_bugs.ssi.po
index a69dabe..553bccf 100644
--- a/manual/po/pt_BR/project_bugs.ssi.po
+++ b/manual/po/pt_BR/project_bugs.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-25 23:27+0300\n"
+"POT-Creation-Date: 2010-10-27 21:40-0200\n"
"PO-Revision-Date: 2010-10-25 23:27+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -42,14 +42,14 @@ msgstr ""
#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111
-#: en/project_bugs.ssi:58 en/user_basics.ssi:34 en/user_basics.ssi:44
-#: en/user_basics.ssi:56 en/user_basics.ssi:68 en/user_basics.ssi:80
-#: en/user_basics.ssi:92 en/user_basics.ssi:106 en/user_basics.ssi:114
-#: en/user_basics.ssi:122 en/user_basics.ssi:132 en/user_basics.ssi:144
-#: 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:224 en/user_basics.ssi:257 en/user_basics.ssi:273
-#: en/user_basics.ssi:281 en/user_basics.ssi:301 en/user_basics.ssi:326
+#: en/project_bugs.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:54 en/user_basics.ssi:66 en/user_basics.ssi:78
+#: en/user_basics.ssi:88 en/user_basics.ssi:102 en/user_basics.ssi:110
+#: en/user_basics.ssi:118 en/user_basics.ssi:128 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:220 en/user_basics.ssi:253 en/user_basics.ssi:269
+#: en/user_basics.ssi:277 en/user_basics.ssi:297 en/user_basics.ssi:322
#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
#: en/user_customization-contents.ssi:66
#: en/user_customization-internationalization.ssi:10
@@ -102,15 +102,15 @@ msgstr "code{"
#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
#: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
#: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
-#: en/other_use-cases.ssi:137 en/project_bugs.ssi:62 en/user_basics.ssi:38
-#: en/user_basics.ssi:48 en/user_basics.ssi:62 en/user_basics.ssi:72
-#: en/user_basics.ssi:86 en/user_basics.ssi:98 en/user_basics.ssi:110
-#: en/user_basics.ssi:118 en/user_basics.ssi:126 en/user_basics.ssi:136
-#: en/user_basics.ssi:150 en/user_basics.ssi:160 en/user_basics.ssi:168
-#: en/user_basics.ssi:176 en/user_basics.ssi:190 en/user_basics.ssi:198
-#: en/user_basics.ssi:208 en/user_basics.ssi:249 en/user_basics.ssi:261
-#: en/user_basics.ssi:277 en/user_basics.ssi:285 en/user_basics.ssi:312
-#: en/user_basics.ssi:351 en/user_customization-contents.ssi:39
+#: en/other_use-cases.ssi:137 en/project_bugs.ssi:62 en/user_basics.ssi:36
+#: en/user_basics.ssi:46 en/user_basics.ssi:60 en/user_basics.ssi:72
+#: en/user_basics.ssi:82 en/user_basics.ssi:94 en/user_basics.ssi:106
+#: en/user_basics.ssi:114 en/user_basics.ssi:122 en/user_basics.ssi:132
+#: 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:245 en/user_basics.ssi:257
+#: en/user_basics.ssi:273 en/user_basics.ssi:281 en/user_basics.ssi:308
+#: en/user_basics.ssi:347 en/user_customization-contents.ssi:39
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
#: en/user_customization-internationalization.ssi:14
#: en/user_customization-internationalization.ssi:22
@@ -400,7 +400,7 @@ msgstr ""
#. type: Plain text
#: en/project_bugs.ssi:86
-msgid "3~ At boot-time"
+msgid "3~ At boot time"
msgstr ""
#. type: Plain text
@@ -416,7 +416,7 @@ msgstr ""
#. type: Plain text
#: en/project_bugs.ssi:90
-msgid "3~ At run-time"
+msgid "3~ At run time"
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 6c3300c..afd4721 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 VERSION\n"
-"POT-Creation-Date: 2010-10-23 16:43+0300\n"
+"POT-Creation-Date: 2010-10-27 21:40-0200\n"
"PO-Revision-Date: 2010-10-20 06:53-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -41,16 +41,17 @@ msgstr ""
#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
-#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111 en/user_basics.ssi:34
-#: en/user_basics.ssi:44 en/user_basics.ssi:56 en/user_basics.ssi:68
-#: en/user_basics.ssi:80 en/user_basics.ssi:92 en/user_basics.ssi:106
-#: en/user_basics.ssi:114 en/user_basics.ssi:122 en/user_basics.ssi:132
-#: en/user_basics.ssi:144 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:224 en/user_basics.ssi:257
-#: en/user_basics.ssi:273 en/user_basics.ssi:281 en/user_basics.ssi:301
-#: en/user_basics.ssi:326 en/user_customization-contents.ssi:34
-#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
+#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111
+#: en/project_bugs.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:54 en/user_basics.ssi:66 en/user_basics.ssi:78
+#: en/user_basics.ssi:88 en/user_basics.ssi:102 en/user_basics.ssi:110
+#: en/user_basics.ssi:118 en/user_basics.ssi:128 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:220 en/user_basics.ssi:253 en/user_basics.ssi:269
+#: en/user_basics.ssi:277 en/user_basics.ssi:297 en/user_basics.ssi:322
+#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
+#: en/user_customization-contents.ssi:66
#: en/user_customization-internationalization.ssi:10
#: en/user_customization-internationalization.ssi:18
#: en/user_customization-internationalization.ssi:26
@@ -101,16 +102,16 @@ msgstr "code{"
#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
#: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
#: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
-#: en/other_use-cases.ssi:137 en/user_basics.ssi:38 en/user_basics.ssi:48
-#: en/user_basics.ssi:62 en/user_basics.ssi:72 en/user_basics.ssi:86
-#: en/user_basics.ssi:98 en/user_basics.ssi:110 en/user_basics.ssi:118
-#: en/user_basics.ssi:126 en/user_basics.ssi:136 en/user_basics.ssi:150
-#: en/user_basics.ssi:160 en/user_basics.ssi:168 en/user_basics.ssi:176
-#: en/user_basics.ssi:190 en/user_basics.ssi:198 en/user_basics.ssi:208
-#: en/user_basics.ssi:249 en/user_basics.ssi:261 en/user_basics.ssi:277
-#: en/user_basics.ssi:285 en/user_basics.ssi:312 en/user_basics.ssi:351
-#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
-#: en/user_customization-contents.ssi:70
+#: en/other_use-cases.ssi:137 en/project_bugs.ssi:62 en/user_basics.ssi:36
+#: en/user_basics.ssi:46 en/user_basics.ssi:60 en/user_basics.ssi:72
+#: en/user_basics.ssi:82 en/user_basics.ssi:94 en/user_basics.ssi:106
+#: en/user_basics.ssi:114 en/user_basics.ssi:122 en/user_basics.ssi:132
+#: 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:245 en/user_basics.ssi:257
+#: en/user_basics.ssi:273 en/user_basics.ssi:281 en/user_basics.ssi:308
+#: en/user_basics.ssi:347 en/user_customization-contents.ssi:39
+#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
#: en/user_customization-internationalization.ssi:14
#: en/user_customization-internationalization.ssi:22
#: en/user_customization-internationalization.ssi:30
@@ -149,8 +150,8 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:6
msgid ""
-"This chapter contains a brief overview of the build process as well as "
-"containing instructions on how to boot the various binary image types."
+"This chapter contains a brief overview of the build process and instructions "
+"for booting the various binary image types."
msgstr ""
#. type: Plain text
@@ -162,8 +163,8 @@ msgstr ""
#: en/user_basics.ssi:10
msgid ""
"A live system usually means an operating system booted on a computer from a "
-"removable medium (such as CD-ROM, USB stick, or network), ready to use "
-"without any installation on the usual drive(s), with an auto-configuration "
+"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 runtime (see {Terms}#terms )."
msgstr ""
@@ -172,294 +173,291 @@ msgstr ""
msgid ""
"With Debian Live, it's a Debian GNU/Linux operating system, built for one of "
"the supported architectures (currently amd64, i386, powerpc and sparc). It "
-"is made from following parts:"
+"is made from the following parts:"
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:14
-msgid "_* Linux kernel"
+msgid "_* *{Linux kernel image}*, usually named #{vmlinuz*}#"
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:16
-msgid "_* The Linux image, usually named #{vmlinuz*}#"
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:18
msgid ""
-"_* *{Initial RAM disk image (initrd)}*: RAM disk setup for the Linux boot, "
-"containing modules possibly needed to mount the filesystem's image and some "
+"_* *{Initial RAM disk image (initrd)}*: a RAM disk set up for the Linux "
+"boot, containing modules possibly needed to mount the System image and some "
"scripts to do it."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:20
+#: en/user_basics.ssi:18
msgid ""
-"_* *{System image}*: The operating systems filesystem image. The SquashFS "
-"compressed filesystem is used to minimize the Debian Live image size. Note "
-"that it's read-only. So, during boot the Debian Live system will use a RAM "
-"disk and 'union' mechanism to enable writing files within the running "
-"system. However, all modifications will be lost upon shutdown unless "
-"optional persistence partition(s) are used (see persistence)."
+"_* *{System image}*: The operating system's filesystem image. Usually, a "
+"SquashFS compressed filesystem is used to minimize the Debian Live image "
+"size. Note that it is read-only. So, during boot the Debian Live system will "
+"use a RAM disk and 'union' mechanism to enable writing files within the "
+"running system. However, all modifications will be lost upon shutdown unless "
+"optional persistence is used (see persistence)."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:22
+#: en/user_basics.ssi:20
msgid "% FIXME: <xref linkend=\"persistence\"/>"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:24
+#: en/user_basics.ssi:22
msgid ""
-"_* *{Bootloader}*: A small piece of code, crafted to boot up from the chosen "
+"_* *{Bootloader}*: A small piece of code crafted to boot from the chosen "
"media, possibly presenting a prompt or menu to allow selection of options/"
-"configuration. It then loads the Linux kernel and its initrd to run with an "
-"associated filesystem image. Different solutions can be used depending on "
-"the target media and format of the filesystem containing the previous "
-"components: Isolinux to boot from a CD or DVD in ISO9660 format, syslinux "
-"for HDD or USB drive booting from a VFAT partition, extlinux for ext2/3/4 "
-"and btrfs partitions, pxelinux for PXE netboot, GRUB for ext2/3/4 partition, "
-"etc."
+"configuration. It loads the Linux kernel and its initrd to run with an "
+"associated system filesystem. Different solutions can be used, depending on "
+"the target media and format of the filesystem containing the previously "
+"mentioned components: isolinux to boot from a CD or DVD in ISO9660 format, "
+"syslinux for HDD or USB drive booting from a VFAT partition, extlinux for "
+"ext2/3/4 and btrfs partitions, pxelinux for PXE netboot, GRUB for ext2/3/4 "
+"partitions, etc."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:26
+#: en/user_basics.ssi:24
msgid ""
-"_* live-build will build the system image from your specifications, setup a "
-"Linux kernel and its initrd, a bootloader to run them, all in one media-"
-"dependant format (ISO9660 image, disk image, etc.)"
+"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.)"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:28
+#: en/user_basics.ssi:26
msgid "2~ First steps: building an ISO image"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:30
+#: en/user_basics.ssi:28
msgid ""
-"The following sequence of commands, provided by live-build, will create a "
-"basic ISO image containing just the Debian standard system without X.org. It "
-"is suitable for burning to CD or DVD media."
+"The following sequence of live-build commands will 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 "
+"(as per {Copying USB/HDD image to a USB stick}#copying-usb-hdd-image, "
+"specifying \".iso\" extension where \".img\" is indicated)."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:32
+#: en/user_basics.ssi:30
msgid ""
"First, we run the #{lb config}# command which will create a \"config/\" "
"hierarchy in the current directory for use by other commands:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:36
+#: en/user_basics.ssi:34
msgid "$ lb config"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:40
+#: en/user_basics.ssi:38
msgid ""
-"By passing no parameters to #{lb config}# we indicated that we wish to use "
+"By passing no parameters to #{lb config}#, we indicated that we wish to use "
"the defaults (see {The lb config command}#lb-config )."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:42
+#: en/user_basics.ssi:40
msgid ""
"Now that we have a \"config/\" hierarchy, we may build the image with the lb "
"build command:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:46 en/user_basics.ssi:124 en/user_basics.ssi:206
+#: en/user_basics.ssi:44 en/user_basics.ssi:120 en/user_basics.ssi:202
msgid "# lb build"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:50
+#: en/user_basics.ssi:48
msgid ""
"This process can take a while, depending on the speed of your network "
"connection (see {The lb build command}#lb-build )."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:52
+#: en/user_basics.ssi:50
msgid "3~ Testing an ISO image with Qemu"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:54
+#: en/user_basics.ssi:52
msgid "Testing an ISO is simple:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:58 en/user_basics.ssi:146
+#: en/user_basics.ssi:56 en/user_basics.ssi:142
msgid "# apt-get install qemu"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:60
+#: en/user_basics.ssi:58
msgid "$ qemu -cdrom binary.iso"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:64
+#: en/user_basics.ssi:62
msgid "3~ Testing an ISO image with virtualbox-ose"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:66
+#: en/user_basics.ssi:64
msgid "In order to test the ISO with virtualbox-ose:"
msgstr ""
#. type: Plain text
+#: en/user_basics.ssi:68
+msgid "# apt-get install virtualbox-ose virtualbox-ose-dkms"
+msgstr ""
+
+#. type: Plain text
#: en/user_basics.ssi:70
-msgid "# apt-get install virtualbox-ose"
+msgid "$ virtualbox"
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:74
msgid ""
-"and either install #{virtualbox-ose-source}# or #{virtualbox-ose-dkms}# to "
-"build the required kernel modules to run virtualbox-ose."
+"Create a new virtual machine, change the storage settings to use binary.iso "
+"as the CD/DVD device, and start the machine."
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:76
msgid ""
-"After successful installation, virtualbox can be e.g. found in the GNOME "
-"menu under 'Applications/System Tools/VirtualBox OSE'."
+"Note: For live systems containing X.org that you want to test with "
+"virtualbox-ose, you may wish to include the VirtualBox X.org driver package, "
+"virtualbox-ose-guest-x11, in your live-build configuration. Otherwise, the "
+"resolution is limited to 800x600."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:78
-msgid ""
-"Please consider including of following packages onto the live image to "
-"achieve higher resolution of the display when booting the live image in "
-"virutalbox-ose (1280x1024 instead of 800x600 and in particular if the "
-"default resolution of the virtualbox-ose display shouldn't work with the gui-"
-"installer)."
+#: en/user_basics.ssi:80
+msgid "# lb config --packages virtualbox-ose-guest-x11"
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:84
-msgid ""
-"virtualbox-ose-guest-dkms virtualbox-ose-guest-utils virtualbox-ose-guest-x11"
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:88
msgid "3~ Burning an ISO image to a physical medium"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:90
+#: en/user_basics.ssi:86
msgid "Burning an ISO image is easy:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:94
+#: en/user_basics.ssi:90
msgid "# apt-get install wodim"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:96
+#: en/user_basics.ssi:92
msgid "$ wodim binary.iso"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:100
-msgid "2~ Building an USB/HDD image"
+#: en/user_basics.ssi:96
+msgid "2~ Building a USB/HDD image"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:102
+#: en/user_basics.ssi:98
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."
+"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."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:104
+#: en/user_basics.ssi:100
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 "
+"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 ):"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:108 en/user_basics.ssi:188
+#: en/user_basics.ssi:104 en/user_basics.ssi:184
msgid "$ lb clean --binary"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:112
+#: en/user_basics.ssi:108
msgid ""
"Run the #{lb config}# command with the parameters to configure the \"config/"
"\" hierarchy to create a USB/HDD image type:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:116
+#: en/user_basics.ssi:112
msgid "$ lb config -b usb-hdd"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:120
+#: en/user_basics.ssi:116
msgid "Now build the image with the #{lb build} command:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:128
-msgid "3~ Copying USB/HDD image to a USB stick"
+#: en/user_basics.ssi:124
+msgid "3~copying-usb-hdd-image Copying USB/HDD image to a USB stick"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:130
+#: en/user_basics.ssi:126
msgid ""
"The generated binary image contains a VFAT partition and the syslinux "
-"bootloader, ready to be directly written on an USB stick. Plug in an USB "
-"stick with a size larger than that of binary.img and type:"
+"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:134
+#: en/user_basics.ssi:130
msgid "$ dd if=binary.img of=${USBSTICK}"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:138
+#: en/user_basics.ssi:134
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."
+"looking in #{dmesg}#'s output after plugging in the stick, for example, or "
+"better yet, #{ls -l /dev/disk/by-id}#."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:140
+#: en/user_basics.ssi:136
#, no-wrap
msgid "*{This will definitely overwrite any previous contents on your stick!}*\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:142
+#: en/user_basics.ssi:138
msgid "3~ Testing a USB/HDD image with Qemu"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:148
+#: en/user_basics.ssi:144
msgid "$ qemu -hda binary.img"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:152
+#: en/user_basics.ssi:148
msgid "3~ Using the space left on a USB stick"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:154
+#: en/user_basics.ssi:150
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}"
@@ -468,45 +466,45 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:158
+#: en/user_basics.ssi:154
msgid "# gparted ${USBSTICK}"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:162
+#: en/user_basics.ssi:158
msgid ""
-"Ater the creation of the partition you have to create a filsystem on it. One "
-"possible choice would be ext4."
+"After the creation of the partition, you have to create a filesystem on it. "
+"One possible choice would be ext4."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:166
+#: en/user_basics.ssi:162
msgid "# mkfs.ext4 ${USBSTICK}"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:170
+#: en/user_basics.ssi:166
msgid "If you want to use this data partition with Windows, use FAT32."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:174
+#: en/user_basics.ssi:170
msgid "# mkfs.vfat -F 32"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:178
+#: en/user_basics.ssi:174
#, no-wrap
-msgid "*{Remember: Every time you install a new binary.img on the stick, all your data will be lost because the image includes a complete partition table.}*\n"
+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"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:180
+#: en/user_basics.ssi:176
msgid "2~ Building a netboot image"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:182
+#: en/user_basics.ssi:178
msgid ""
"The following sequence of commands will create a basic netboot image "
"containing the Debian standard system without X.org. It is suitable for "
@@ -514,54 +512,54 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:184
+#: en/user_basics.ssi:180
msgid ""
-"Note if you performed any previous examples, you will need to clean up your "
+"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:192
+#: en/user_basics.ssi:188
msgid ""
"Run the #{lb config}# command with the parameters to configure the \"config/"
"\" hierarchy to create our netboot image:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:196
+#: en/user_basics.ssi:192
msgid ""
"$ lb config -b net --net-root-path \"/srv/debian-live\" --net-root-server "
"\"192.168.0.1\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:200
+#: en/user_basics.ssi:196
msgid ""
-"In contrast with the ISO and USB hdd images, netbooting does not support "
-"serving a filesystem image with the client so the files must be served via "
+"In contrast with the ISO and USB/HDD images, netbooting does not support "
+"serving a filesystem image with the client, so the files must be served via "
"NFS. The net-root-path and net-root-server options specify the location and "
"server, respectively, of the NFS server where the filesytem image will be "
-"located at boot-time."
+"located at boot time."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:202
+#: en/user_basics.ssi:198
msgid "Now build the image with the #{lb build}# command:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:210
+#: en/user_basics.ssi:206
msgid ""
-"In a network boot the client runs a small piece of software, which usually "
+"In a network boot, the client runs a small piece of software which usually "
"resides on the EPROM of the Ethernet card. This program sends a DHCP request "
-"to get an IP address and information about what to do next. Typically the "
-"next step is getting a higher level boot loader via the TFTP protocol. That "
-"could be PXELINUX, Grub or even boot directly to an operating system like "
+"to get an IP address and information about what to do next. Typically, the "
+"next step is getting a higher level bootloader via the TFTP protocol. That "
+"could be PXELINUX, GRUB, or even boot directly to an operating system like "
"Linux."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:212
+#: en/user_basics.ssi:208
msgid ""
"For example, if you unpack the generated binary-net.tar.gz archive in the /"
"srv/debian-live directory, you'll find the filesystem image in live/"
@@ -570,43 +568,43 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:214
+#: en/user_basics.ssi:210
msgid "We must now configure three services on the server to enable netboot."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:216
+#: en/user_basics.ssi:212
msgid "3~ DHCP server"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:218
+#: en/user_basics.ssi:214
msgid ""
"We must configure our network's DHCP server to be sure to give an IP address "
-"to the computer netbooting, and to advertise the location of the PXE "
+"to the netbooting client system, and to advertise the location of the PXE "
"bootloader."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:220
+#: en/user_basics.ssi:216
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:222 en/user_customization-packages.ssi:153
+#: en/user_basics.ssi:218 en/user_customization-packages.ssi:153
msgid "% FIXME"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:226
+#: en/user_basics.ssi:222
#, no-wrap
msgid "subnet 192.168.1.0 netmask 255.255.255.0 { # 192.168.1.0/24\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:229
+#: en/user_basics.ssi:225
#, no-wrap
msgid ""
" # IP addresses available for guests\n"
@@ -614,7 +612,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:232
+#: en/user_basics.ssi:228
#, no-wrap
msgid ""
" # allow booting from the net\n"
@@ -622,7 +620,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:237
+#: en/user_basics.ssi:233
#, no-wrap
msgid ""
" # for net booting, server where the first file to be loaded (by TFTP\n"
@@ -632,7 +630,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:241
+#: en/user_basics.ssi:237
#, no-wrap
msgid ""
" # net boot configuration for guests with a PXE client:\n"
@@ -641,15 +639,15 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:244
+#: en/user_basics.ssi:240
#, no-wrap
msgid ""
-" # PXE boot loader (first program to be loaded, by TFTP)\n"
+" # PXE bootloader (first program to be loaded, by TFTP)\n"
" filename \"pxelinux.0\";\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:247
+#: en/user_basics.ssi:243
#, no-wrap
msgid ""
" }\n"
@@ -657,17 +655,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:251
+#: en/user_basics.ssi:247
msgid "3~ TFTP server"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:253
-msgid "This serves the kernel and initial ramdisk to the system at run-time."
+#: en/user_basics.ssi:249
+msgid "This serves the kernel and initial ramdisk to the system at run time."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:255
+#: en/user_basics.ssi:251
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 /"
@@ -675,22 +673,22 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:259
+#: en/user_basics.ssi:255
msgid "dpkg-reconfigure -plow tftpd-hpa"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:263
+#: en/user_basics.ssi:259
msgid "and fill in the new tftp server directory when being asked about it."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:265
+#: en/user_basics.ssi:261
msgid "3~ NFS server"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:267
+#: en/user_basics.ssi:263
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 "
@@ -698,35 +696,35 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:269
+#: en/user_basics.ssi:265
msgid "You need to install the nfs-kernel-server package."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:271
+#: en/user_basics.ssi:267
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:275
+#: en/user_basics.ssi:271
msgid "/srv/debian-live *(ro,async,no_root_squash,no_subtree_check)"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:279
+#: en/user_basics.ssi:275
msgid ""
"and tell the NFS server about this new export with the following command:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:283
+#: en/user_basics.ssi:279
msgid "# exportfs -rv"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:287
+#: en/user_basics.ssi:283
msgid ""
"Setting up these three services can be a little tricky. You might need some "
"patience to get all of them working together. The Debian Installer Manual's "
@@ -735,40 +733,40 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:289
+#: en/user_basics.ssi:285
msgid "3~ Netboot testing HowTo"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:291
+#: en/user_basics.ssi:287
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:293
+#: en/user_basics.ssi:289
msgid ""
"To make our life easier, we can use virtualization. There are two solutions."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:295
+#: en/user_basics.ssi:291
msgid "3~ Qemu"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:297
+#: en/user_basics.ssi:293
msgid "_* Install qemu, bridge-utils, sudo."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:299
+#: en/user_basics.ssi:295
msgid "Edit /etc/qemu-ifup:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:310
+#: en/user_basics.ssi:306
msgid ""
"#!/bin/sh sudo -p \"Password for $0:\" /sbin/ifconfig $1 172.20.0.1 echo "
"\"Executing /etc/qemu-ifup\" echo \"Bringing up $1 for bridged mode...\" "
@@ -777,62 +775,62 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:314
+#: en/user_basics.ssi:310
msgid "Get, or build a grub-floppy-netboot (in the svn)."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:316
+#: en/user_basics.ssi:312
msgid "Launch qemu with \"-net nic,vlan=0 -net tap,vlan=0,ifname=tun0\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:318
+#: en/user_basics.ssi:314
msgid "3~ VMWare Player"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:320
+#: en/user_basics.ssi:316
msgid "_* Install VMWare Player (\"free as in beer\" edition)"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:322
+#: en/user_basics.ssi:318
msgid ""
"_* Create a PXETester directory, and create a text file called pxe.vwx inside"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:324
+#: en/user_basics.ssi:320
msgid "_* Paste this text inside:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:332
+#: en/user_basics.ssi:328
msgid ""
"#!/usr/bin/vmware config.version = \"8\" virtualHW.version = \"4\" memsize = "
"\"512\" MemAllowAutoScaleDown = \"FALSE\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:338
+#: en/user_basics.ssi:334
msgid ""
"ide0:0.present = \"FALSE\" ide1:0.present = \"FALSE\" floppy0.present = "
"\"FALSE\" sound.present = \"FALSE\" tools.remindInstall = \"FALSE\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:341
+#: en/user_basics.ssi:337
msgid "ethernet0.present = \"TRUE\" ethernet0.addressType = \"generated\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:344
+#: en/user_basics.ssi:340
msgid "displayName = \"Test Boot PXE\" guestOS = \"other\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:349
+#: en/user_basics.ssi:345
msgid ""
"ethernet0.generatedAddress = \"00:0c:29:8d:71:3b\" uuid.location = \"56 4d "
"83 72 5c c4 de 3f-ae 9e 07 91 1d 8d 71 3b\" uuid.bios = \"56 4d 83 72 5c c4 "
@@ -840,19 +838,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:353
+#: en/user_basics.ssi:349
msgid ""
"_* You can play with this configuration file (i.e. change memory limit to "
"256)"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:355
+#: en/user_basics.ssi:351
msgid ""
-"_* Double click on this file (or run VMWare player and selecet this file)."
+"_* Double click on this file (or run VMWare player and select this file)."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:356
+#: en/user_basics.ssi:352
msgid "_* When running just press space if that strange question comes up..."
msgstr ""
diff --git a/manual/po/ro/project_bugs.ssi.po b/manual/po/ro/project_bugs.ssi.po
index b2cd98a..011847e 100644
--- a/manual/po/ro/project_bugs.ssi.po
+++ b/manual/po/ro/project_bugs.ssi.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-25 23:27+0300\n"
+"POT-Creation-Date: 2010-10-27 21:40-0200\n"
"PO-Revision-Date: 2010-10-27 22:56+0200\n"
"Last-Translator: Creak <romain.failliot at foolstep.com>\n"
"Language-Team: Français <debian-live at lists.debian.org>\n"
@@ -43,14 +43,14 @@ msgstr ""
#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111
-#: en/project_bugs.ssi:58 en/user_basics.ssi:34 en/user_basics.ssi:44
-#: en/user_basics.ssi:56 en/user_basics.ssi:68 en/user_basics.ssi:80
-#: en/user_basics.ssi:92 en/user_basics.ssi:106 en/user_basics.ssi:114
-#: en/user_basics.ssi:122 en/user_basics.ssi:132 en/user_basics.ssi:144
-#: 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:224 en/user_basics.ssi:257 en/user_basics.ssi:273
-#: en/user_basics.ssi:281 en/user_basics.ssi:301 en/user_basics.ssi:326
+#: en/project_bugs.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:54 en/user_basics.ssi:66 en/user_basics.ssi:78
+#: en/user_basics.ssi:88 en/user_basics.ssi:102 en/user_basics.ssi:110
+#: en/user_basics.ssi:118 en/user_basics.ssi:128 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:220 en/user_basics.ssi:253 en/user_basics.ssi:269
+#: en/user_basics.ssi:277 en/user_basics.ssi:297 en/user_basics.ssi:322
#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
#: en/user_customization-contents.ssi:66
#: en/user_customization-internationalization.ssi:10
@@ -103,15 +103,15 @@ msgstr "code{"
#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
#: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
#: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
-#: en/other_use-cases.ssi:137 en/project_bugs.ssi:62 en/user_basics.ssi:38
-#: en/user_basics.ssi:48 en/user_basics.ssi:62 en/user_basics.ssi:72
-#: en/user_basics.ssi:86 en/user_basics.ssi:98 en/user_basics.ssi:110
-#: en/user_basics.ssi:118 en/user_basics.ssi:126 en/user_basics.ssi:136
-#: en/user_basics.ssi:150 en/user_basics.ssi:160 en/user_basics.ssi:168
-#: en/user_basics.ssi:176 en/user_basics.ssi:190 en/user_basics.ssi:198
-#: en/user_basics.ssi:208 en/user_basics.ssi:249 en/user_basics.ssi:261
-#: en/user_basics.ssi:277 en/user_basics.ssi:285 en/user_basics.ssi:312
-#: en/user_basics.ssi:351 en/user_customization-contents.ssi:39
+#: en/other_use-cases.ssi:137 en/project_bugs.ssi:62 en/user_basics.ssi:36
+#: en/user_basics.ssi:46 en/user_basics.ssi:60 en/user_basics.ssi:72
+#: en/user_basics.ssi:82 en/user_basics.ssi:94 en/user_basics.ssi:106
+#: en/user_basics.ssi:114 en/user_basics.ssi:122 en/user_basics.ssi:132
+#: 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:245 en/user_basics.ssi:257
+#: en/user_basics.ssi:273 en/user_basics.ssi:281 en/user_basics.ssi:308
+#: en/user_basics.ssi:347 en/user_customization-contents.ssi:39
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
#: en/user_customization-internationalization.ssi:14
#: en/user_customization-internationalization.ssi:22
@@ -401,7 +401,7 @@ msgstr ""
#. type: Plain text
#: en/project_bugs.ssi:86
-msgid "3~ At boot-time"
+msgid "3~ At boot time"
msgstr ""
#. type: Plain text
@@ -417,7 +417,7 @@ msgstr ""
#. type: Plain text
#: en/project_bugs.ssi:90
-msgid "3~ At run-time"
+msgid "3~ At run time"
msgstr ""
#. type: Plain text
diff --git a/manual/po/ro/user_basics.ssi.po b/manual/po/ro/user_basics.ssi.po
index 2f177d7..4c7dae2 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 VERSION\n"
-"POT-Creation-Date: 2010-10-23 16:43+0300\n"
+"POT-Creation-Date: 2010-10-27 21:40-0200\n"
"PO-Revision-Date: 2010-10-23 16:43+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -42,16 +42,17 @@ msgstr ""
#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
-#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111 en/user_basics.ssi:34
-#: en/user_basics.ssi:44 en/user_basics.ssi:56 en/user_basics.ssi:68
-#: en/user_basics.ssi:80 en/user_basics.ssi:92 en/user_basics.ssi:106
-#: en/user_basics.ssi:114 en/user_basics.ssi:122 en/user_basics.ssi:132
-#: en/user_basics.ssi:144 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:224 en/user_basics.ssi:257
-#: en/user_basics.ssi:273 en/user_basics.ssi:281 en/user_basics.ssi:301
-#: en/user_basics.ssi:326 en/user_customization-contents.ssi:34
-#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
+#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111
+#: en/project_bugs.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:54 en/user_basics.ssi:66 en/user_basics.ssi:78
+#: en/user_basics.ssi:88 en/user_basics.ssi:102 en/user_basics.ssi:110
+#: en/user_basics.ssi:118 en/user_basics.ssi:128 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:220 en/user_basics.ssi:253 en/user_basics.ssi:269
+#: en/user_basics.ssi:277 en/user_basics.ssi:297 en/user_basics.ssi:322
+#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
+#: en/user_customization-contents.ssi:66
#: en/user_customization-internationalization.ssi:10
#: en/user_customization-internationalization.ssi:18
#: en/user_customization-internationalization.ssi:26
@@ -102,16 +103,16 @@ msgstr "code{"
#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
#: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
#: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
-#: en/other_use-cases.ssi:137 en/user_basics.ssi:38 en/user_basics.ssi:48
-#: en/user_basics.ssi:62 en/user_basics.ssi:72 en/user_basics.ssi:86
-#: en/user_basics.ssi:98 en/user_basics.ssi:110 en/user_basics.ssi:118
-#: en/user_basics.ssi:126 en/user_basics.ssi:136 en/user_basics.ssi:150
-#: en/user_basics.ssi:160 en/user_basics.ssi:168 en/user_basics.ssi:176
-#: en/user_basics.ssi:190 en/user_basics.ssi:198 en/user_basics.ssi:208
-#: en/user_basics.ssi:249 en/user_basics.ssi:261 en/user_basics.ssi:277
-#: en/user_basics.ssi:285 en/user_basics.ssi:312 en/user_basics.ssi:351
-#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
-#: en/user_customization-contents.ssi:70
+#: en/other_use-cases.ssi:137 en/project_bugs.ssi:62 en/user_basics.ssi:36
+#: en/user_basics.ssi:46 en/user_basics.ssi:60 en/user_basics.ssi:72
+#: en/user_basics.ssi:82 en/user_basics.ssi:94 en/user_basics.ssi:106
+#: en/user_basics.ssi:114 en/user_basics.ssi:122 en/user_basics.ssi:132
+#: 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:245 en/user_basics.ssi:257
+#: en/user_basics.ssi:273 en/user_basics.ssi:281 en/user_basics.ssi:308
+#: en/user_basics.ssi:347 en/user_customization-contents.ssi:39
+#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
#: en/user_customization-internationalization.ssi:14
#: en/user_customization-internationalization.ssi:22
#: en/user_customization-internationalization.ssi:30
@@ -150,8 +151,8 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:6
msgid ""
-"This chapter contains a brief overview of the build process as well as "
-"containing instructions on how to boot the various binary image types."
+"This chapter contains a brief overview of the build process and instructions "
+"for booting the various binary image types."
msgstr ""
#. type: Plain text
@@ -163,8 +164,8 @@ msgstr ""
#: en/user_basics.ssi:10
msgid ""
"A live system usually means an operating system booted on a computer from a "
-"removable medium (such as CD-ROM, USB stick, or network), ready to use "
-"without any installation on the usual drive(s), with an auto-configuration "
+"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 runtime (see {Terms}#terms )."
msgstr ""
@@ -173,294 +174,291 @@ msgstr ""
msgid ""
"With Debian Live, it's a Debian GNU/Linux operating system, built for one of "
"the supported architectures (currently amd64, i386, powerpc and sparc). It "
-"is made from following parts:"
+"is made from the following parts:"
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:14
-msgid "_* Linux kernel"
+msgid "_* *{Linux kernel image}*, usually named #{vmlinuz*}#"
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:16
-msgid "_* The Linux image, usually named #{vmlinuz*}#"
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:18
msgid ""
-"_* *{Initial RAM disk image (initrd)}*: RAM disk setup for the Linux boot, "
-"containing modules possibly needed to mount the filesystem's image and some "
+"_* *{Initial RAM disk image (initrd)}*: a RAM disk set up for the Linux "
+"boot, containing modules possibly needed to mount the System image and some "
"scripts to do it."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:20
+#: en/user_basics.ssi:18
msgid ""
-"_* *{System image}*: The operating systems filesystem image. The SquashFS "
-"compressed filesystem is used to minimize the Debian Live image size. Note "
-"that it's read-only. So, during boot the Debian Live system will use a RAM "
-"disk and 'union' mechanism to enable writing files within the running "
-"system. However, all modifications will be lost upon shutdown unless "
-"optional persistence partition(s) are used (see persistence)."
+"_* *{System image}*: The operating system's filesystem image. Usually, a "
+"SquashFS compressed filesystem is used to minimize the Debian Live image "
+"size. Note that it is read-only. So, during boot the Debian Live system will "
+"use a RAM disk and 'union' mechanism to enable writing files within the "
+"running system. However, all modifications will be lost upon shutdown unless "
+"optional persistence is used (see persistence)."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:22
+#: en/user_basics.ssi:20
msgid "% FIXME: <xref linkend=\"persistence\"/>"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:24
+#: en/user_basics.ssi:22
msgid ""
-"_* *{Bootloader}*: A small piece of code, crafted to boot up from the chosen "
+"_* *{Bootloader}*: A small piece of code crafted to boot from the chosen "
"media, possibly presenting a prompt or menu to allow selection of options/"
-"configuration. It then loads the Linux kernel and its initrd to run with an "
-"associated filesystem image. Different solutions can be used depending on "
-"the target media and format of the filesystem containing the previous "
-"components: Isolinux to boot from a CD or DVD in ISO9660 format, syslinux "
-"for HDD or USB drive booting from a VFAT partition, extlinux for ext2/3/4 "
-"and btrfs partitions, pxelinux for PXE netboot, GRUB for ext2/3/4 partition, "
-"etc."
+"configuration. It loads the Linux kernel and its initrd to run with an "
+"associated system filesystem. Different solutions can be used, depending on "
+"the target media and format of the filesystem containing the previously "
+"mentioned components: isolinux to boot from a CD or DVD in ISO9660 format, "
+"syslinux for HDD or USB drive booting from a VFAT partition, extlinux for "
+"ext2/3/4 and btrfs partitions, pxelinux for PXE netboot, GRUB for ext2/3/4 "
+"partitions, etc."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:26
+#: en/user_basics.ssi:24
msgid ""
-"_* live-build will build the system image from your specifications, setup a "
-"Linux kernel and its initrd, a bootloader to run them, all in one media-"
-"dependant format (ISO9660 image, disk image, etc.)"
+"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.)"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:28
+#: en/user_basics.ssi:26
msgid "2~ First steps: building an ISO image"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:30
+#: en/user_basics.ssi:28
msgid ""
-"The following sequence of commands, provided by live-build, will create a "
-"basic ISO image containing just the Debian standard system without X.org. It "
-"is suitable for burning to CD or DVD media."
+"The following sequence of live-build commands will 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 "
+"(as per {Copying USB/HDD image to a USB stick}#copying-usb-hdd-image, "
+"specifying \".iso\" extension where \".img\" is indicated)."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:32
+#: en/user_basics.ssi:30
msgid ""
"First, we run the #{lb config}# command which will create a \"config/\" "
"hierarchy in the current directory for use by other commands:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:36
+#: en/user_basics.ssi:34
msgid "$ lb config"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:40
+#: en/user_basics.ssi:38
msgid ""
-"By passing no parameters to #{lb config}# we indicated that we wish to use "
+"By passing no parameters to #{lb config}#, we indicated that we wish to use "
"the defaults (see {The lb config command}#lb-config )."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:42
+#: en/user_basics.ssi:40
msgid ""
"Now that we have a \"config/\" hierarchy, we may build the image with the lb "
"build command:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:46 en/user_basics.ssi:124 en/user_basics.ssi:206
+#: en/user_basics.ssi:44 en/user_basics.ssi:120 en/user_basics.ssi:202
msgid "# lb build"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:50
+#: en/user_basics.ssi:48
msgid ""
"This process can take a while, depending on the speed of your network "
"connection (see {The lb build command}#lb-build )."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:52
+#: en/user_basics.ssi:50
msgid "3~ Testing an ISO image with Qemu"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:54
+#: en/user_basics.ssi:52
msgid "Testing an ISO is simple:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:58 en/user_basics.ssi:146
+#: en/user_basics.ssi:56 en/user_basics.ssi:142
msgid "# apt-get install qemu"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:60
+#: en/user_basics.ssi:58
msgid "$ qemu -cdrom binary.iso"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:64
+#: en/user_basics.ssi:62
msgid "3~ Testing an ISO image with virtualbox-ose"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:66
+#: en/user_basics.ssi:64
msgid "In order to test the ISO with virtualbox-ose:"
msgstr ""
#. type: Plain text
+#: en/user_basics.ssi:68
+msgid "# apt-get install virtualbox-ose virtualbox-ose-dkms"
+msgstr ""
+
+#. type: Plain text
#: en/user_basics.ssi:70
-msgid "# apt-get install virtualbox-ose"
+msgid "$ virtualbox"
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:74
msgid ""
-"and either install #{virtualbox-ose-source}# or #{virtualbox-ose-dkms}# to "
-"build the required kernel modules to run virtualbox-ose."
+"Create a new virtual machine, change the storage settings to use binary.iso "
+"as the CD/DVD device, and start the machine."
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:76
msgid ""
-"After successful installation, virtualbox can be e.g. found in the GNOME "
-"menu under 'Applications/System Tools/VirtualBox OSE'."
+"Note: For live systems containing X.org that you want to test with "
+"virtualbox-ose, you may wish to include the VirtualBox X.org driver package, "
+"virtualbox-ose-guest-x11, in your live-build configuration. Otherwise, the "
+"resolution is limited to 800x600."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:78
-msgid ""
-"Please consider including of following packages onto the live image to "
-"achieve higher resolution of the display when booting the live image in "
-"virutalbox-ose (1280x1024 instead of 800x600 and in particular if the "
-"default resolution of the virtualbox-ose display shouldn't work with the gui-"
-"installer)."
+#: en/user_basics.ssi:80
+msgid "# lb config --packages virtualbox-ose-guest-x11"
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:84
-msgid ""
-"virtualbox-ose-guest-dkms virtualbox-ose-guest-utils virtualbox-ose-guest-x11"
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:88
msgid "3~ Burning an ISO image to a physical medium"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:90
+#: en/user_basics.ssi:86
msgid "Burning an ISO image is easy:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:94
+#: en/user_basics.ssi:90
msgid "# apt-get install wodim"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:96
+#: en/user_basics.ssi:92
msgid "$ wodim binary.iso"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:100
-msgid "2~ Building an USB/HDD image"
+#: en/user_basics.ssi:96
+msgid "2~ Building a USB/HDD image"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:102
+#: en/user_basics.ssi:98
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."
+"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."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:104
+#: en/user_basics.ssi:100
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 "
+"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 ):"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:108 en/user_basics.ssi:188
+#: en/user_basics.ssi:104 en/user_basics.ssi:184
msgid "$ lb clean --binary"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:112
+#: en/user_basics.ssi:108
msgid ""
"Run the #{lb config}# command with the parameters to configure the \"config/"
"\" hierarchy to create a USB/HDD image type:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:116
+#: en/user_basics.ssi:112
msgid "$ lb config -b usb-hdd"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:120
+#: en/user_basics.ssi:116
msgid "Now build the image with the #{lb build} command:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:128
-msgid "3~ Copying USB/HDD image to a USB stick"
+#: en/user_basics.ssi:124
+msgid "3~copying-usb-hdd-image Copying USB/HDD image to a USB stick"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:130
+#: en/user_basics.ssi:126
msgid ""
"The generated binary image contains a VFAT partition and the syslinux "
-"bootloader, ready to be directly written on an USB stick. Plug in an USB "
-"stick with a size larger than that of binary.img and type:"
+"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:134
+#: en/user_basics.ssi:130
msgid "$ dd if=binary.img of=${USBSTICK}"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:138
+#: en/user_basics.ssi:134
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."
+"looking in #{dmesg}#'s output after plugging in the stick, for example, or "
+"better yet, #{ls -l /dev/disk/by-id}#."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:140
+#: en/user_basics.ssi:136
#, no-wrap
msgid "*{This will definitely overwrite any previous contents on your stick!}*\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:142
+#: en/user_basics.ssi:138
msgid "3~ Testing a USB/HDD image with Qemu"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:148
+#: en/user_basics.ssi:144
msgid "$ qemu -hda binary.img"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:152
+#: en/user_basics.ssi:148
msgid "3~ Using the space left on a USB stick"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:154
+#: en/user_basics.ssi:150
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}"
@@ -469,45 +467,45 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:158
+#: en/user_basics.ssi:154
msgid "# gparted ${USBSTICK}"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:162
+#: en/user_basics.ssi:158
msgid ""
-"Ater the creation of the partition you have to create a filsystem on it. One "
-"possible choice would be ext4."
+"After the creation of the partition, you have to create a filesystem on it. "
+"One possible choice would be ext4."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:166
+#: en/user_basics.ssi:162
msgid "# mkfs.ext4 ${USBSTICK}"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:170
+#: en/user_basics.ssi:166
msgid "If you want to use this data partition with Windows, use FAT32."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:174
+#: en/user_basics.ssi:170
msgid "# mkfs.vfat -F 32"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:178
+#: en/user_basics.ssi:174
#, no-wrap
-msgid "*{Remember: Every time you install a new binary.img on the stick, all your data will be lost because the image includes a complete partition table.}*\n"
+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"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:180
+#: en/user_basics.ssi:176
msgid "2~ Building a netboot image"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:182
+#: en/user_basics.ssi:178
msgid ""
"The following sequence of commands will create a basic netboot image "
"containing the Debian standard system without X.org. It is suitable for "
@@ -515,54 +513,54 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:184
+#: en/user_basics.ssi:180
msgid ""
-"Note if you performed any previous examples, you will need to clean up your "
+"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:192
+#: en/user_basics.ssi:188
msgid ""
"Run the #{lb config}# command with the parameters to configure the \"config/"
"\" hierarchy to create our netboot image:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:196
+#: en/user_basics.ssi:192
msgid ""
"$ lb config -b net --net-root-path \"/srv/debian-live\" --net-root-server "
"\"192.168.0.1\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:200
+#: en/user_basics.ssi:196
msgid ""
-"In contrast with the ISO and USB hdd images, netbooting does not support "
-"serving a filesystem image with the client so the files must be served via "
+"In contrast with the ISO and USB/HDD images, netbooting does not support "
+"serving a filesystem image with the client, so the files must be served via "
"NFS. The net-root-path and net-root-server options specify the location and "
"server, respectively, of the NFS server where the filesytem image will be "
-"located at boot-time."
+"located at boot time."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:202
+#: en/user_basics.ssi:198
msgid "Now build the image with the #{lb build}# command:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:210
+#: en/user_basics.ssi:206
msgid ""
-"In a network boot the client runs a small piece of software, which usually "
+"In a network boot, the client runs a small piece of software which usually "
"resides on the EPROM of the Ethernet card. This program sends a DHCP request "
-"to get an IP address and information about what to do next. Typically the "
-"next step is getting a higher level boot loader via the TFTP protocol. That "
-"could be PXELINUX, Grub or even boot directly to an operating system like "
+"to get an IP address and information about what to do next. Typically, the "
+"next step is getting a higher level bootloader via the TFTP protocol. That "
+"could be PXELINUX, GRUB, or even boot directly to an operating system like "
"Linux."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:212
+#: en/user_basics.ssi:208
msgid ""
"For example, if you unpack the generated binary-net.tar.gz archive in the /"
"srv/debian-live directory, you'll find the filesystem image in live/"
@@ -571,43 +569,43 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:214
+#: en/user_basics.ssi:210
msgid "We must now configure three services on the server to enable netboot."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:216
+#: en/user_basics.ssi:212
msgid "3~ DHCP server"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:218
+#: en/user_basics.ssi:214
msgid ""
"We must configure our network's DHCP server to be sure to give an IP address "
-"to the computer netbooting, and to advertise the location of the PXE "
+"to the netbooting client system, and to advertise the location of the PXE "
"bootloader."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:220
+#: en/user_basics.ssi:216
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:222 en/user_customization-packages.ssi:153
+#: en/user_basics.ssi:218 en/user_customization-packages.ssi:153
msgid "% FIXME"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:226
+#: en/user_basics.ssi:222
#, no-wrap
msgid "subnet 192.168.1.0 netmask 255.255.255.0 { # 192.168.1.0/24\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:229
+#: en/user_basics.ssi:225
#, no-wrap
msgid ""
" # IP addresses available for guests\n"
@@ -615,7 +613,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:232
+#: en/user_basics.ssi:228
#, no-wrap
msgid ""
" # allow booting from the net\n"
@@ -623,7 +621,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:237
+#: en/user_basics.ssi:233
#, no-wrap
msgid ""
" # for net booting, server where the first file to be loaded (by TFTP\n"
@@ -633,7 +631,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:241
+#: en/user_basics.ssi:237
#, no-wrap
msgid ""
" # net boot configuration for guests with a PXE client:\n"
@@ -642,15 +640,15 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:244
+#: en/user_basics.ssi:240
#, no-wrap
msgid ""
-" # PXE boot loader (first program to be loaded, by TFTP)\n"
+" # PXE bootloader (first program to be loaded, by TFTP)\n"
" filename \"pxelinux.0\";\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:247
+#: en/user_basics.ssi:243
#, no-wrap
msgid ""
" }\n"
@@ -658,17 +656,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:251
+#: en/user_basics.ssi:247
msgid "3~ TFTP server"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:253
-msgid "This serves the kernel and initial ramdisk to the system at run-time."
+#: en/user_basics.ssi:249
+msgid "This serves the kernel and initial ramdisk to the system at run time."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:255
+#: en/user_basics.ssi:251
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 /"
@@ -676,22 +674,22 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:259
+#: en/user_basics.ssi:255
msgid "dpkg-reconfigure -plow tftpd-hpa"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:263
+#: en/user_basics.ssi:259
msgid "and fill in the new tftp server directory when being asked about it."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:265
+#: en/user_basics.ssi:261
msgid "3~ NFS server"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:267
+#: en/user_basics.ssi:263
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 "
@@ -699,35 +697,35 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:269
+#: en/user_basics.ssi:265
msgid "You need to install the nfs-kernel-server package."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:271
+#: en/user_basics.ssi:267
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:275
+#: en/user_basics.ssi:271
msgid "/srv/debian-live *(ro,async,no_root_squash,no_subtree_check)"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:279
+#: en/user_basics.ssi:275
msgid ""
"and tell the NFS server about this new export with the following command:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:283
+#: en/user_basics.ssi:279
msgid "# exportfs -rv"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:287
+#: en/user_basics.ssi:283
msgid ""
"Setting up these three services can be a little tricky. You might need some "
"patience to get all of them working together. The Debian Installer Manual's "
@@ -736,40 +734,40 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:289
+#: en/user_basics.ssi:285
msgid "3~ Netboot testing HowTo"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:291
+#: en/user_basics.ssi:287
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:293
+#: en/user_basics.ssi:289
msgid ""
"To make our life easier, we can use virtualization. There are two solutions."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:295
+#: en/user_basics.ssi:291
msgid "3~ Qemu"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:297
+#: en/user_basics.ssi:293
msgid "_* Install qemu, bridge-utils, sudo."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:299
+#: en/user_basics.ssi:295
msgid "Edit /etc/qemu-ifup:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:310
+#: en/user_basics.ssi:306
msgid ""
"#!/bin/sh sudo -p \"Password for $0:\" /sbin/ifconfig $1 172.20.0.1 echo "
"\"Executing /etc/qemu-ifup\" echo \"Bringing up $1 for bridged mode...\" "
@@ -778,62 +776,62 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:314
+#: en/user_basics.ssi:310
msgid "Get, or build a grub-floppy-netboot (in the svn)."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:316
+#: en/user_basics.ssi:312
msgid "Launch qemu with \"-net nic,vlan=0 -net tap,vlan=0,ifname=tun0\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:318
+#: en/user_basics.ssi:314
msgid "3~ VMWare Player"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:320
+#: en/user_basics.ssi:316
msgid "_* Install VMWare Player (\"free as in beer\" edition)"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:322
+#: en/user_basics.ssi:318
msgid ""
"_* Create a PXETester directory, and create a text file called pxe.vwx inside"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:324
+#: en/user_basics.ssi:320
msgid "_* Paste this text inside:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:332
+#: en/user_basics.ssi:328
msgid ""
"#!/usr/bin/vmware config.version = \"8\" virtualHW.version = \"4\" memsize = "
"\"512\" MemAllowAutoScaleDown = \"FALSE\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:338
+#: en/user_basics.ssi:334
msgid ""
"ide0:0.present = \"FALSE\" ide1:0.present = \"FALSE\" floppy0.present = "
"\"FALSE\" sound.present = \"FALSE\" tools.remindInstall = \"FALSE\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:341
+#: en/user_basics.ssi:337
msgid "ethernet0.present = \"TRUE\" ethernet0.addressType = \"generated\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:344
+#: en/user_basics.ssi:340
msgid "displayName = \"Test Boot PXE\" guestOS = \"other\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:349
+#: en/user_basics.ssi:345
msgid ""
"ethernet0.generatedAddress = \"00:0c:29:8d:71:3b\" uuid.location = \"56 4d "
"83 72 5c c4 de 3f-ae 9e 07 91 1d 8d 71 3b\" uuid.bios = \"56 4d 83 72 5c c4 "
@@ -841,19 +839,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:353
+#: en/user_basics.ssi:349
msgid ""
"_* You can play with this configuration file (i.e. change memory limit to "
"256)"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:355
+#: en/user_basics.ssi:351
msgid ""
-"_* Double click on this file (or run VMWare player and selecet this file)."
+"_* Double click on this file (or run VMWare player and select this file)."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:356
+#: en/user_basics.ssi:352
msgid "_* When running just press space if that strange question comes up..."
msgstr ""
diff --git a/manual/pot/project_bugs.ssi.pot b/manual/pot/project_bugs.ssi.pot
index db499d7..dc6fde9 100644
--- a/manual/pot/project_bugs.ssi.pot
+++ b/manual/pot/project_bugs.ssi.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-25 23:27+0300\n"
+"POT-Creation-Date: 2010-10-27 21:40-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"
@@ -42,14 +42,14 @@ msgstr ""
#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111
-#: en/project_bugs.ssi:58 en/user_basics.ssi:34 en/user_basics.ssi:44
-#: en/user_basics.ssi:56 en/user_basics.ssi:68 en/user_basics.ssi:80
-#: en/user_basics.ssi:92 en/user_basics.ssi:106 en/user_basics.ssi:114
-#: en/user_basics.ssi:122 en/user_basics.ssi:132 en/user_basics.ssi:144
-#: 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:224 en/user_basics.ssi:257 en/user_basics.ssi:273
-#: en/user_basics.ssi:281 en/user_basics.ssi:301 en/user_basics.ssi:326
+#: en/project_bugs.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:54 en/user_basics.ssi:66 en/user_basics.ssi:78
+#: en/user_basics.ssi:88 en/user_basics.ssi:102 en/user_basics.ssi:110
+#: en/user_basics.ssi:118 en/user_basics.ssi:128 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:220 en/user_basics.ssi:253 en/user_basics.ssi:269
+#: en/user_basics.ssi:277 en/user_basics.ssi:297 en/user_basics.ssi:322
#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
#: en/user_customization-contents.ssi:66
#: en/user_customization-internationalization.ssi:10
@@ -102,15 +102,15 @@ msgstr ""
#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
#: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
#: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
-#: en/other_use-cases.ssi:137 en/project_bugs.ssi:62 en/user_basics.ssi:38
-#: en/user_basics.ssi:48 en/user_basics.ssi:62 en/user_basics.ssi:72
-#: en/user_basics.ssi:86 en/user_basics.ssi:98 en/user_basics.ssi:110
-#: en/user_basics.ssi:118 en/user_basics.ssi:126 en/user_basics.ssi:136
-#: en/user_basics.ssi:150 en/user_basics.ssi:160 en/user_basics.ssi:168
-#: en/user_basics.ssi:176 en/user_basics.ssi:190 en/user_basics.ssi:198
-#: en/user_basics.ssi:208 en/user_basics.ssi:249 en/user_basics.ssi:261
-#: en/user_basics.ssi:277 en/user_basics.ssi:285 en/user_basics.ssi:312
-#: en/user_basics.ssi:351 en/user_customization-contents.ssi:39
+#: en/other_use-cases.ssi:137 en/project_bugs.ssi:62 en/user_basics.ssi:36
+#: en/user_basics.ssi:46 en/user_basics.ssi:60 en/user_basics.ssi:72
+#: en/user_basics.ssi:82 en/user_basics.ssi:94 en/user_basics.ssi:106
+#: en/user_basics.ssi:114 en/user_basics.ssi:122 en/user_basics.ssi:132
+#: 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:245 en/user_basics.ssi:257
+#: en/user_basics.ssi:273 en/user_basics.ssi:281 en/user_basics.ssi:308
+#: en/user_basics.ssi:347 en/user_customization-contents.ssi:39
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
#: en/user_customization-internationalization.ssi:14
#: en/user_customization-internationalization.ssi:22
@@ -400,7 +400,7 @@ msgstr ""
#. type: Plain text
#: en/project_bugs.ssi:86
-msgid "3~ At boot-time"
+msgid "3~ At boot time"
msgstr ""
#. type: Plain text
@@ -416,7 +416,7 @@ msgstr ""
#. type: Plain text
#: en/project_bugs.ssi:90
-msgid "3~ At run-time"
+msgid "3~ At run time"
msgstr ""
#. type: Plain text
diff --git a/manual/pot/user_basics.ssi.pot b/manual/pot/user_basics.ssi.pot
index 580b48f..aa75ffd 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: 2010-10-23 16:43+0300\n"
+"POT-Creation-Date: 2010-10-27 21:40-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"
@@ -41,16 +41,17 @@ msgstr ""
#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
-#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111 en/user_basics.ssi:34
-#: en/user_basics.ssi:44 en/user_basics.ssi:56 en/user_basics.ssi:68
-#: en/user_basics.ssi:80 en/user_basics.ssi:92 en/user_basics.ssi:106
-#: en/user_basics.ssi:114 en/user_basics.ssi:122 en/user_basics.ssi:132
-#: en/user_basics.ssi:144 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:224 en/user_basics.ssi:257
-#: en/user_basics.ssi:273 en/user_basics.ssi:281 en/user_basics.ssi:301
-#: en/user_basics.ssi:326 en/user_customization-contents.ssi:34
-#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
+#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111
+#: en/project_bugs.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
+#: en/user_basics.ssi:54 en/user_basics.ssi:66 en/user_basics.ssi:78
+#: en/user_basics.ssi:88 en/user_basics.ssi:102 en/user_basics.ssi:110
+#: en/user_basics.ssi:118 en/user_basics.ssi:128 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:220 en/user_basics.ssi:253 en/user_basics.ssi:269
+#: en/user_basics.ssi:277 en/user_basics.ssi:297 en/user_basics.ssi:322
+#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
+#: en/user_customization-contents.ssi:66
#: en/user_customization-internationalization.ssi:10
#: en/user_customization-internationalization.ssi:18
#: en/user_customization-internationalization.ssi:26
@@ -101,16 +102,16 @@ msgstr ""
#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
#: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
#: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
-#: en/other_use-cases.ssi:137 en/user_basics.ssi:38 en/user_basics.ssi:48
-#: en/user_basics.ssi:62 en/user_basics.ssi:72 en/user_basics.ssi:86
-#: en/user_basics.ssi:98 en/user_basics.ssi:110 en/user_basics.ssi:118
-#: en/user_basics.ssi:126 en/user_basics.ssi:136 en/user_basics.ssi:150
-#: en/user_basics.ssi:160 en/user_basics.ssi:168 en/user_basics.ssi:176
-#: en/user_basics.ssi:190 en/user_basics.ssi:198 en/user_basics.ssi:208
-#: en/user_basics.ssi:249 en/user_basics.ssi:261 en/user_basics.ssi:277
-#: en/user_basics.ssi:285 en/user_basics.ssi:312 en/user_basics.ssi:351
-#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
-#: en/user_customization-contents.ssi:70
+#: en/other_use-cases.ssi:137 en/project_bugs.ssi:62 en/user_basics.ssi:36
+#: en/user_basics.ssi:46 en/user_basics.ssi:60 en/user_basics.ssi:72
+#: en/user_basics.ssi:82 en/user_basics.ssi:94 en/user_basics.ssi:106
+#: en/user_basics.ssi:114 en/user_basics.ssi:122 en/user_basics.ssi:132
+#: 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:245 en/user_basics.ssi:257
+#: en/user_basics.ssi:273 en/user_basics.ssi:281 en/user_basics.ssi:308
+#: en/user_basics.ssi:347 en/user_customization-contents.ssi:39
+#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
#: en/user_customization-internationalization.ssi:14
#: en/user_customization-internationalization.ssi:22
#: en/user_customization-internationalization.ssi:30
@@ -149,8 +150,8 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:6
msgid ""
-"This chapter contains a brief overview of the build process as well as "
-"containing instructions on how to boot the various binary image types."
+"This chapter contains a brief overview of the build process and instructions "
+"for booting the various binary image types."
msgstr ""
#. type: Plain text
@@ -162,8 +163,8 @@ msgstr ""
#: en/user_basics.ssi:10
msgid ""
"A live system usually means an operating system booted on a computer from a "
-"removable medium (such as CD-ROM, USB stick, or network), ready to use "
-"without any installation on the usual drive(s), with an auto-configuration "
+"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 runtime (see {Terms}#terms )."
msgstr ""
@@ -172,294 +173,291 @@ msgstr ""
msgid ""
"With Debian Live, it's a Debian GNU/Linux operating system, built for one of "
"the supported architectures (currently amd64, i386, powerpc and sparc). It "
-"is made from following parts:"
+"is made from the following parts:"
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:14
-msgid "_* Linux kernel"
+msgid "_* *{Linux kernel image}*, usually named #{vmlinuz*}#"
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:16
-msgid "_* The Linux image, usually named #{vmlinuz*}#"
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:18
msgid ""
-"_* *{Initial RAM disk image (initrd)}*: RAM disk setup for the Linux boot, "
-"containing modules possibly needed to mount the filesystem's image and some "
+"_* *{Initial RAM disk image (initrd)}*: a RAM disk set up for the Linux "
+"boot, containing modules possibly needed to mount the System image and some "
"scripts to do it."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:20
+#: en/user_basics.ssi:18
msgid ""
-"_* *{System image}*: The operating systems filesystem image. The SquashFS "
-"compressed filesystem is used to minimize the Debian Live image size. Note "
-"that it's read-only. So, during boot the Debian Live system will use a RAM "
-"disk and 'union' mechanism to enable writing files within the running "
-"system. However, all modifications will be lost upon shutdown unless "
-"optional persistence partition(s) are used (see persistence)."
+"_* *{System image}*: The operating system's filesystem image. Usually, a "
+"SquashFS compressed filesystem is used to minimize the Debian Live image "
+"size. Note that it is read-only. So, during boot the Debian Live system will "
+"use a RAM disk and 'union' mechanism to enable writing files within the "
+"running system. However, all modifications will be lost upon shutdown unless "
+"optional persistence is used (see persistence)."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:22
+#: en/user_basics.ssi:20
msgid "% FIXME: <xref linkend=\"persistence\"/>"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:24
+#: en/user_basics.ssi:22
msgid ""
-"_* *{Bootloader}*: A small piece of code, crafted to boot up from the chosen "
+"_* *{Bootloader}*: A small piece of code crafted to boot from the chosen "
"media, possibly presenting a prompt or menu to allow selection of options/"
-"configuration. It then loads the Linux kernel and its initrd to run with an "
-"associated filesystem image. Different solutions can be used depending on "
-"the target media and format of the filesystem containing the previous "
-"components: Isolinux to boot from a CD or DVD in ISO9660 format, syslinux "
-"for HDD or USB drive booting from a VFAT partition, extlinux for ext2/3/4 "
-"and btrfs partitions, pxelinux for PXE netboot, GRUB for ext2/3/4 partition, "
-"etc."
+"configuration. It loads the Linux kernel and its initrd to run with an "
+"associated system filesystem. Different solutions can be used, depending on "
+"the target media and format of the filesystem containing the previously "
+"mentioned components: isolinux to boot from a CD or DVD in ISO9660 format, "
+"syslinux for HDD or USB drive booting from a VFAT partition, extlinux for "
+"ext2/3/4 and btrfs partitions, pxelinux for PXE netboot, GRUB for ext2/3/4 "
+"partitions, etc."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:26
+#: en/user_basics.ssi:24
msgid ""
-"_* live-build will build the system image from your specifications, setup a "
-"Linux kernel and its initrd, a bootloader to run them, all in one media-"
-"dependant format (ISO9660 image, disk image, etc.)"
+"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.)"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:28
+#: en/user_basics.ssi:26
msgid "2~ First steps: building an ISO image"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:30
+#: en/user_basics.ssi:28
msgid ""
-"The following sequence of commands, provided by live-build, will create a "
-"basic ISO image containing just the Debian standard system without X.org. It "
-"is suitable for burning to CD or DVD media."
+"The following sequence of live-build commands will 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 "
+"(as per {Copying USB/HDD image to a USB stick}#copying-usb-hdd-image, "
+"specifying \".iso\" extension where \".img\" is indicated)."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:32
+#: en/user_basics.ssi:30
msgid ""
"First, we run the #{lb config}# command which will create a \"config/\" "
"hierarchy in the current directory for use by other commands:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:36
+#: en/user_basics.ssi:34
msgid "$ lb config"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:40
+#: en/user_basics.ssi:38
msgid ""
-"By passing no parameters to #{lb config}# we indicated that we wish to use "
+"By passing no parameters to #{lb config}#, we indicated that we wish to use "
"the defaults (see {The lb config command}#lb-config )."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:42
+#: en/user_basics.ssi:40
msgid ""
"Now that we have a \"config/\" hierarchy, we may build the image with the lb "
"build command:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:46 en/user_basics.ssi:124 en/user_basics.ssi:206
+#: en/user_basics.ssi:44 en/user_basics.ssi:120 en/user_basics.ssi:202
msgid "# lb build"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:50
+#: en/user_basics.ssi:48
msgid ""
"This process can take a while, depending on the speed of your network "
"connection (see {The lb build command}#lb-build )."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:52
+#: en/user_basics.ssi:50
msgid "3~ Testing an ISO image with Qemu"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:54
+#: en/user_basics.ssi:52
msgid "Testing an ISO is simple:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:58 en/user_basics.ssi:146
+#: en/user_basics.ssi:56 en/user_basics.ssi:142
msgid "# apt-get install qemu"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:60
+#: en/user_basics.ssi:58
msgid "$ qemu -cdrom binary.iso"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:64
+#: en/user_basics.ssi:62
msgid "3~ Testing an ISO image with virtualbox-ose"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:66
+#: en/user_basics.ssi:64
msgid "In order to test the ISO with virtualbox-ose:"
msgstr ""
#. type: Plain text
+#: en/user_basics.ssi:68
+msgid "# apt-get install virtualbox-ose virtualbox-ose-dkms"
+msgstr ""
+
+#. type: Plain text
#: en/user_basics.ssi:70
-msgid "# apt-get install virtualbox-ose"
+msgid "$ virtualbox"
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:74
msgid ""
-"and either install #{virtualbox-ose-source}# or #{virtualbox-ose-dkms}# to "
-"build the required kernel modules to run virtualbox-ose."
+"Create a new virtual machine, change the storage settings to use binary.iso "
+"as the CD/DVD device, and start the machine."
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:76
msgid ""
-"After successful installation, virtualbox can be e.g. found in the GNOME "
-"menu under 'Applications/System Tools/VirtualBox OSE'."
+"Note: For live systems containing X.org that you want to test with "
+"virtualbox-ose, you may wish to include the VirtualBox X.org driver package, "
+"virtualbox-ose-guest-x11, in your live-build configuration. Otherwise, the "
+"resolution is limited to 800x600."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:78
-msgid ""
-"Please consider including of following packages onto the live image to "
-"achieve higher resolution of the display when booting the live image in "
-"virutalbox-ose (1280x1024 instead of 800x600 and in particular if the "
-"default resolution of the virtualbox-ose display shouldn't work with the gui-"
-"installer)."
+#: en/user_basics.ssi:80
+msgid "# lb config --packages virtualbox-ose-guest-x11"
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:84
-msgid ""
-"virtualbox-ose-guest-dkms virtualbox-ose-guest-utils virtualbox-ose-guest-x11"
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:88
msgid "3~ Burning an ISO image to a physical medium"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:90
+#: en/user_basics.ssi:86
msgid "Burning an ISO image is easy:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:94
+#: en/user_basics.ssi:90
msgid "# apt-get install wodim"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:96
+#: en/user_basics.ssi:92
msgid "$ wodim binary.iso"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:100
-msgid "2~ Building an USB/HDD image"
+#: en/user_basics.ssi:96
+msgid "2~ Building a USB/HDD image"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:102
+#: en/user_basics.ssi:98
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."
+"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."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:104
+#: en/user_basics.ssi:100
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 "
+"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 ):"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:108 en/user_basics.ssi:188
+#: en/user_basics.ssi:104 en/user_basics.ssi:184
msgid "$ lb clean --binary"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:112
+#: en/user_basics.ssi:108
msgid ""
"Run the #{lb config}# command with the parameters to configure the \"config/"
"\" hierarchy to create a USB/HDD image type:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:116
+#: en/user_basics.ssi:112
msgid "$ lb config -b usb-hdd"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:120
+#: en/user_basics.ssi:116
msgid "Now build the image with the #{lb build} command:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:128
-msgid "3~ Copying USB/HDD image to a USB stick"
+#: en/user_basics.ssi:124
+msgid "3~copying-usb-hdd-image Copying USB/HDD image to a USB stick"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:130
+#: en/user_basics.ssi:126
msgid ""
"The generated binary image contains a VFAT partition and the syslinux "
-"bootloader, ready to be directly written on an USB stick. Plug in an USB "
-"stick with a size larger than that of binary.img and type:"
+"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:134
+#: en/user_basics.ssi:130
msgid "$ dd if=binary.img of=${USBSTICK}"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:138
+#: en/user_basics.ssi:134
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."
+"looking in #{dmesg}#'s output after plugging in the stick, for example, or "
+"better yet, #{ls -l /dev/disk/by-id}#."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:140
+#: en/user_basics.ssi:136
#, no-wrap
msgid "*{This will definitely overwrite any previous contents on your stick!}*\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:142
+#: en/user_basics.ssi:138
msgid "3~ Testing a USB/HDD image with Qemu"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:148
+#: en/user_basics.ssi:144
msgid "$ qemu -hda binary.img"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:152
+#: en/user_basics.ssi:148
msgid "3~ Using the space left on a USB stick"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:154
+#: en/user_basics.ssi:150
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}"
@@ -468,45 +466,45 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:158
+#: en/user_basics.ssi:154
msgid "# gparted ${USBSTICK}"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:162
+#: en/user_basics.ssi:158
msgid ""
-"Ater the creation of the partition you have to create a filsystem on it. One "
-"possible choice would be ext4."
+"After the creation of the partition, you have to create a filesystem on it. "
+"One possible choice would be ext4."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:166
+#: en/user_basics.ssi:162
msgid "# mkfs.ext4 ${USBSTICK}"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:170
+#: en/user_basics.ssi:166
msgid "If you want to use this data partition with Windows, use FAT32."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:174
+#: en/user_basics.ssi:170
msgid "# mkfs.vfat -F 32"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:178
+#: en/user_basics.ssi:174
#, no-wrap
-msgid "*{Remember: Every time you install a new binary.img on the stick, all your data will be lost because the image includes a complete partition table.}*\n"
+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"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:180
+#: en/user_basics.ssi:176
msgid "2~ Building a netboot image"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:182
+#: en/user_basics.ssi:178
msgid ""
"The following sequence of commands will create a basic netboot image "
"containing the Debian standard system without X.org. It is suitable for "
@@ -514,54 +512,54 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:184
+#: en/user_basics.ssi:180
msgid ""
-"Note if you performed any previous examples, you will need to clean up your "
+"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:192
+#: en/user_basics.ssi:188
msgid ""
"Run the #{lb config}# command with the parameters to configure the \"config/"
"\" hierarchy to create our netboot image:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:196
+#: en/user_basics.ssi:192
msgid ""
"$ lb config -b net --net-root-path \"/srv/debian-live\" --net-root-server "
"\"192.168.0.1\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:200
+#: en/user_basics.ssi:196
msgid ""
-"In contrast with the ISO and USB hdd images, netbooting does not support "
-"serving a filesystem image with the client so the files must be served via "
+"In contrast with the ISO and USB/HDD images, netbooting does not support "
+"serving a filesystem image with the client, so the files must be served via "
"NFS. The net-root-path and net-root-server options specify the location and "
"server, respectively, of the NFS server where the filesytem image will be "
-"located at boot-time."
+"located at boot time."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:202
+#: en/user_basics.ssi:198
msgid "Now build the image with the #{lb build}# command:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:210
+#: en/user_basics.ssi:206
msgid ""
-"In a network boot the client runs a small piece of software, which usually "
+"In a network boot, the client runs a small piece of software which usually "
"resides on the EPROM of the Ethernet card. This program sends a DHCP request "
-"to get an IP address and information about what to do next. Typically the "
-"next step is getting a higher level boot loader via the TFTP protocol. That "
-"could be PXELINUX, Grub or even boot directly to an operating system like "
+"to get an IP address and information about what to do next. Typically, the "
+"next step is getting a higher level bootloader via the TFTP protocol. That "
+"could be PXELINUX, GRUB, or even boot directly to an operating system like "
"Linux."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:212
+#: en/user_basics.ssi:208
msgid ""
"For example, if you unpack the generated binary-net.tar.gz archive in the /"
"srv/debian-live directory, you'll find the filesystem image in live/"
@@ -570,43 +568,43 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:214
+#: en/user_basics.ssi:210
msgid "We must now configure three services on the server to enable netboot."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:216
+#: en/user_basics.ssi:212
msgid "3~ DHCP server"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:218
+#: en/user_basics.ssi:214
msgid ""
"We must configure our network's DHCP server to be sure to give an IP address "
-"to the computer netbooting, and to advertise the location of the PXE "
+"to the netbooting client system, and to advertise the location of the PXE "
"bootloader."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:220
+#: en/user_basics.ssi:216
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:222 en/user_customization-packages.ssi:153
+#: en/user_basics.ssi:218 en/user_customization-packages.ssi:153
msgid "% FIXME"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:226
+#: en/user_basics.ssi:222
#, no-wrap
msgid "subnet 192.168.1.0 netmask 255.255.255.0 { # 192.168.1.0/24\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:229
+#: en/user_basics.ssi:225
#, no-wrap
msgid ""
" # IP addresses available for guests\n"
@@ -614,7 +612,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:232
+#: en/user_basics.ssi:228
#, no-wrap
msgid ""
" # allow booting from the net\n"
@@ -622,7 +620,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:237
+#: en/user_basics.ssi:233
#, no-wrap
msgid ""
" # for net booting, server where the first file to be loaded (by TFTP\n"
@@ -632,7 +630,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:241
+#: en/user_basics.ssi:237
#, no-wrap
msgid ""
" # net boot configuration for guests with a PXE client:\n"
@@ -641,15 +639,15 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:244
+#: en/user_basics.ssi:240
#, no-wrap
msgid ""
-" # PXE boot loader (first program to be loaded, by TFTP)\n"
+" # PXE bootloader (first program to be loaded, by TFTP)\n"
" filename \"pxelinux.0\";\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:247
+#: en/user_basics.ssi:243
#, no-wrap
msgid ""
" }\n"
@@ -657,17 +655,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:251
+#: en/user_basics.ssi:247
msgid "3~ TFTP server"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:253
-msgid "This serves the kernel and initial ramdisk to the system at run-time."
+#: en/user_basics.ssi:249
+msgid "This serves the kernel and initial ramdisk to the system at run time."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:255
+#: en/user_basics.ssi:251
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 /"
@@ -675,22 +673,22 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:259
+#: en/user_basics.ssi:255
msgid "dpkg-reconfigure -plow tftpd-hpa"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:263
+#: en/user_basics.ssi:259
msgid "and fill in the new tftp server directory when being asked about it."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:265
+#: en/user_basics.ssi:261
msgid "3~ NFS server"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:267
+#: en/user_basics.ssi:263
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 "
@@ -698,35 +696,35 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:269
+#: en/user_basics.ssi:265
msgid "You need to install the nfs-kernel-server package."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:271
+#: en/user_basics.ssi:267
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:275
+#: en/user_basics.ssi:271
msgid "/srv/debian-live *(ro,async,no_root_squash,no_subtree_check)"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:279
+#: en/user_basics.ssi:275
msgid ""
"and tell the NFS server about this new export with the following command:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:283
+#: en/user_basics.ssi:279
msgid "# exportfs -rv"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:287
+#: en/user_basics.ssi:283
msgid ""
"Setting up these three services can be a little tricky. You might need some "
"patience to get all of them working together. The Debian Installer Manual's "
@@ -735,40 +733,40 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:289
+#: en/user_basics.ssi:285
msgid "3~ Netboot testing HowTo"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:291
+#: en/user_basics.ssi:287
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:293
+#: en/user_basics.ssi:289
msgid ""
"To make our life easier, we can use virtualization. There are two solutions."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:295
+#: en/user_basics.ssi:291
msgid "3~ Qemu"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:297
+#: en/user_basics.ssi:293
msgid "_* Install qemu, bridge-utils, sudo."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:299
+#: en/user_basics.ssi:295
msgid "Edit /etc/qemu-ifup:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:310
+#: en/user_basics.ssi:306
msgid ""
"#!/bin/sh sudo -p \"Password for $0:\" /sbin/ifconfig $1 172.20.0.1 echo "
"\"Executing /etc/qemu-ifup\" echo \"Bringing up $1 for bridged mode...\" "
@@ -777,62 +775,62 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:314
+#: en/user_basics.ssi:310
msgid "Get, or build a grub-floppy-netboot (in the svn)."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:316
+#: en/user_basics.ssi:312
msgid "Launch qemu with \"-net nic,vlan=0 -net tap,vlan=0,ifname=tun0\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:318
+#: en/user_basics.ssi:314
msgid "3~ VMWare Player"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:320
+#: en/user_basics.ssi:316
msgid "_* Install VMWare Player (\"free as in beer\" edition)"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:322
+#: en/user_basics.ssi:318
msgid ""
"_* Create a PXETester directory, and create a text file called pxe.vwx inside"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:324
+#: en/user_basics.ssi:320
msgid "_* Paste this text inside:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:332
+#: en/user_basics.ssi:328
msgid ""
"#!/usr/bin/vmware config.version = \"8\" virtualHW.version = \"4\" memsize = "
"\"512\" MemAllowAutoScaleDown = \"FALSE\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:338
+#: en/user_basics.ssi:334
msgid ""
"ide0:0.present = \"FALSE\" ide1:0.present = \"FALSE\" floppy0.present = "
"\"FALSE\" sound.present = \"FALSE\" tools.remindInstall = \"FALSE\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:341
+#: en/user_basics.ssi:337
msgid "ethernet0.present = \"TRUE\" ethernet0.addressType = \"generated\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:344
+#: en/user_basics.ssi:340
msgid "displayName = \"Test Boot PXE\" guestOS = \"other\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:349
+#: en/user_basics.ssi:345
msgid ""
"ethernet0.generatedAddress = \"00:0c:29:8d:71:3b\" uuid.location = \"56 4d "
"83 72 5c c4 de 3f-ae 9e 07 91 1d 8d 71 3b\" uuid.bios = \"56 4d 83 72 5c c4 "
@@ -840,19 +838,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:353
+#: en/user_basics.ssi:349
msgid ""
"_* You can play with this configuration file (i.e. change memory limit to "
"256)"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:355
+#: en/user_basics.ssi:351
msgid ""
-"_* Double click on this file (or run VMWare player and selecet this file)."
+"_* Double click on this file (or run VMWare player and select this file)."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:356
+#: en/user_basics.ssi:352
msgid "_* When running just press space if that strange question comes up..."
msgstr ""
diff --git a/manual/pt_BR/project_bugs.ssi b/manual/pt_BR/project_bugs.ssi
index c82d6cf..8443811 100644
--- a/manual/pt_BR/project_bugs.ssi
+++ b/manual/pt_BR/project_bugs.ssi
@@ -124,7 +124,7 @@ Also, if you are using a local mirror and/or any of sort of proxy and you
are experiencing a problem, please always reproduce it first by
bootstrapping from an official mirror.
-3~ At boot-time
+3~ At boot time
If your image does not boot, please report it to the mailing list together
with the information requested in {Collect
@@ -134,7 +134,7 @@ virtualization technology of any kind, please always run it on real hardware
before reporting a bug. Providing a screenshot of the failure is also very
helpful.
-3~ At run-time
+3~ At run time
If a package was successfully installed, but fails while actually running
the Live system, this is probably a bug in Debian Live. However,
diff --git a/manual/pt_BR/user_basics.ssi b/manual/pt_BR/user_basics.ssi
index aef09b7..acd6c26 100644
--- a/manual/pt_BR/user_basics.ssi
+++ b/manual/pt_BR/user_basics.ssi
@@ -2,56 +2,56 @@
1~ The basics
-This chapter contains a brief overview of the build process as well as
-containing instructions on how to boot the various binary image types.
+This chapter contains a brief overview of the build process and instructions
+for booting the various binary image types.
2~ What is a live system?
A live system usually means an operating system booted on a computer from a
-removable medium (such as CD-ROM, USB stick, or network), ready to use
-without any installation on the usual drive(s), with an auto-configuration
+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 runtime (see {Terms}#terms ).
With Debian Live, it's a Debian GNU/Linux operating system, built for one of
the supported architectures (currently amd64, i386, powerpc and sparc). It
-is made from following parts:
+is made from the following parts:
-_* Linux kernel
+_* *{Linux kernel image}*, usually named #{vmlinuz*}#
-_* The Linux image, usually named #{vmlinuz*}#
-
-_* *{Initial RAM disk image (initrd)}*: RAM disk setup for the Linux boot,
-containing modules possibly needed to mount the filesystem's image and some
+_* *{Initial RAM disk image (initrd)}*: a RAM disk set up for the Linux
+boot, containing modules possibly needed to mount the System image and some
scripts to do it.
-_* *{System image}*: The operating systems filesystem image. The SquashFS
-compressed filesystem is used to minimize the Debian Live image size. Note
-that it's read-only. So, during boot the Debian Live system will use a RAM
-disk and 'union' mechanism to enable writing files within the running
-system. However, all modifications will be lost upon shutdown unless
-optional persistence partition(s) are used (see persistence).
+_* *{System image}*: The operating system's filesystem image. Usually, a
+SquashFS compressed filesystem is used to minimize the Debian Live image
+size. Note that it is read-only. So, during boot the Debian Live system will
+use a RAM disk and 'union' mechanism to enable writing files within the
+running system. However, all modifications will be lost upon shutdown unless
+optional persistence is used (see persistence).
% FIXME: <xref linkend="persistence"/>
-_* *{Bootloader}*: A small piece of code, crafted to boot up from the chosen
+_* *{Bootloader}*: A small piece of code crafted to boot from the chosen
media, possibly presenting a prompt or menu to allow selection of
-options/configuration. It then loads the Linux kernel and its initrd to run
-with an associated filesystem image. Different solutions can be used
-depending on the target media and format of the filesystem containing the
-previous components: Isolinux to boot from a CD or DVD in ISO9660 format,
+options/configuration. It loads the Linux kernel and its initrd to run with
+an associated system filesystem. Different solutions can be used, depending
+on the target media and format of the filesystem containing the previously
+mentioned components: isolinux to boot from a CD or DVD in ISO9660 format,
syslinux for HDD or USB drive booting from a VFAT partition, extlinux for
ext2/3/4 and btrfs partitions, pxelinux for PXE netboot, GRUB for ext2/3/4
-partition, etc.
+partitions, etc.
-_* live-build will build the system image from your specifications, setup a
-Linux kernel and its initrd, a bootloader to run them, all in one
+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 image
-The following sequence of commands, provided by live-build, will create a
-basic ISO image containing just the Debian standard system without X.org. It
-is suitable for burning to CD or DVD media.
+The following sequence of live-build commands will 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
+(as per {Copying USB/HDD image to a USB stick}#copying-usb-hdd-image,
+specifying ".iso" extension where ".img" is indicated).
First, we run the #{lb config}# command which will create a "config/"
hierarchy in the current directory for use by other commands:
@@ -62,7 +62,7 @@ $ lb config
}code
-By passing no parameters to #{lb config}# we indicated that we wish to use
+By passing no parameters to #{lb config}#, we indicated that we wish to use
the defaults (see {The lb config command}#lb-config ).
Now that we have a "config/" hierarchy, we may build the image with the lb
@@ -95,26 +95,23 @@ In order to test the ISO with virtualbox-ose:
code{
-# apt-get install virtualbox-ose
+# apt-get install virtualbox-ose virtualbox-ose-dkms
-}code
+$ virtualbox
-and either install #{virtualbox-ose-source}# or #{virtualbox-ose-dkms}# to
-build the required kernel modules to run virtualbox-ose.
+}code
-After successful installation, virtualbox can be e.g. found in the GNOME
-menu under 'Applications/System Tools/VirtualBox OSE'.
+Create a new virtual machine, change the storage settings to use binary.iso
+as the CD/DVD device, and start the machine.
-Please consider including of following packages onto the live image to
-achieve higher resolution of the display when booting the live image in
-virutalbox-ose (1280x1024 instead of 800x600 and in particular if the
-default resolution of the virtualbox-ose display shouldn't work with the
-gui-installer).
+Note: For live systems containing X.org that you want to test with
+virtualbox-ose, you may wish to include the VirtualBox X.org driver package,
+virtualbox-ose-guest-x11, in your live-build configuration. Otherwise, the
+resolution is limited to 800x600.
code{
-virtualbox-ose-guest-dkms virtualbox-ose-guest-utils
-virtualbox-ose-guest-x11
+# lb config --packages virtualbox-ose-guest-x11
}code
@@ -130,15 +127,18 @@ $ wodim binary.iso
}code
-2~ Building an USB/HDD image
+2~ 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.
+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.
-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
+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 ):
code{
@@ -164,11 +164,11 @@ code{
}code
-3~ Copying USB/HDD image to a USB stick
+3~copying-usb-hdd-image Copying USB/HDD image to a USB stick
The generated binary image contains a VFAT partition and the syslinux
-bootloader, ready to be directly written on an USB stick. Plug in an USB
-stick with a size larger than that of binary.img and type:
+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{
@@ -178,7 +178,8 @@ $ dd if=binary.img of=${USBSTICK}
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.
+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!}*
@@ -205,8 +206,8 @@ code{
}code
-Ater the creation of the partition you have to create a filsystem on it. One
-possible choice would be ext4.
+After the creation of the partition, you have to create a filesystem on
+it. One possible choice would be ext4.
code{
@@ -222,7 +223,7 @@ code{
}code
-*{Remember: Every time you install a new binary.img on the stick, all your data will be lost because the image includes a complete partition table.}*
+*{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.}*
2~ Building a netboot image
@@ -230,7 +231,7 @@ The following sequence of commands will create a basic netboot image
containing the Debian standard system without X.org. It is suitable for
booting over the network.
-Note if you performed any previous examples, you will need to clean up your
+Note: if you performed any previous examples, you will need to clean up your
working directory with the #{lb clean}# command:
code{
@@ -249,11 +250,11 @@ $ lb config -b net --net-root-path "/srv/debian-live" --net-root-server
}code
-In contrast with the ISO and USB hdd images, netbooting does not support
-serving a filesystem image with the client so the files must be served via
+In contrast with the ISO and USB/HDD images, netbooting does not support
+serving a filesystem image with the client, so the files must be served via
NFS. The net-root-path and net-root-server options specify the location and
server, respectively, of the NFS server where the filesytem image will be
-located at boot-time.
+located at boot time.
Now build the image with the #{lb build}# command:
@@ -263,11 +264,11 @@ code{
}code
-In a network boot the client runs a small piece of software, which usually
+In a network boot, the client runs a small piece of software which usually
resides on the EPROM of the Ethernet card. This program sends a DHCP request
-to get an IP address and information about what to do next. Typically the
-next step is getting a higher level boot loader via the TFTP protocol. That
-could be PXELINUX, Grub or even boot directly to an operating system like
+to get an IP address and information about what to do next. Typically, the
+next step is getting a higher level bootloader via the TFTP protocol. That
+could be PXELINUX, GRUB, or even boot directly to an operating system like
Linux.
For example, if you unpack the generated binary-net.tar.gz archive in the
@@ -280,7 +281,7 @@ We must now configure three services on the server to enable netboot.
3~ DHCP server
We must configure our network's DHCP server to be sure to give an IP address
-to the computer netbooting, and to advertise the location of the PXE
+to the netbooting client system, and to advertise the location of the PXE
bootloader.
Here is an example for inspiration, written for the ISC DHCP server
@@ -305,9 +306,9 @@ subnet 192.168.1.0 netmask 255.255.255.0 { # 192.168.1.0/24
# net boot configuration for guests with a PXE client :
if substring (option vendor-class-identifier, 0, 9) = "PXEClient" {
- # Note : all files for PXE are relatives to the TFTP server's root
+ # Note: all files for PXE are relatives to the TFTP server's root
- # PXE boot loader (first program to be loaded, by TFTP)
+ # PXE bootloader (first program to be loaded, by TFTP)
filename "pxelinux.0";
}
@@ -317,7 +318,7 @@ subnet 192.168.1.0 netmask 255.255.255.0 { # 192.168.1.0/24
3~ TFTP server
-This serves the kernel and initial ramdisk to the system at run-time.
+This serves the kernel and initial ramdisk to the system at run time.
You should install the tftpd-hpa package. It can serve all files contained
inside a root directory, usually /srv/tftp. To let it serve files inside
@@ -418,6 +419,6 @@ ethernet0.generatedAddress = "00:0c:29:8d:71:3b" uuid.location = "56 4d 83
_* You can play with this configuration file (i.e. change memory limit to
256)
-_* Double click on this file (or run VMWare player and selecet this file).
+_* Double click on this file (or run VMWare player and select this file).
_* When running just press space if that strange question comes up...
diff --git a/manual/ro/project_bugs.ssi b/manual/ro/project_bugs.ssi
index c82d6cf..8443811 100644
--- a/manual/ro/project_bugs.ssi
+++ b/manual/ro/project_bugs.ssi
@@ -124,7 +124,7 @@ Also, if you are using a local mirror and/or any of sort of proxy and you
are experiencing a problem, please always reproduce it first by
bootstrapping from an official mirror.
-3~ At boot-time
+3~ At boot time
If your image does not boot, please report it to the mailing list together
with the information requested in {Collect
@@ -134,7 +134,7 @@ virtualization technology of any kind, please always run it on real hardware
before reporting a bug. Providing a screenshot of the failure is also very
helpful.
-3~ At run-time
+3~ At run time
If a package was successfully installed, but fails while actually running
the Live system, this is probably a bug in Debian Live. However,
diff --git a/manual/ro/user_basics.ssi b/manual/ro/user_basics.ssi
index aef09b7..acd6c26 100644
--- a/manual/ro/user_basics.ssi
+++ b/manual/ro/user_basics.ssi
@@ -2,56 +2,56 @@
1~ The basics
-This chapter contains a brief overview of the build process as well as
-containing instructions on how to boot the various binary image types.
+This chapter contains a brief overview of the build process and instructions
+for booting the various binary image types.
2~ What is a live system?
A live system usually means an operating system booted on a computer from a
-removable medium (such as CD-ROM, USB stick, or network), ready to use
-without any installation on the usual drive(s), with an auto-configuration
+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 runtime (see {Terms}#terms ).
With Debian Live, it's a Debian GNU/Linux operating system, built for one of
the supported architectures (currently amd64, i386, powerpc and sparc). It
-is made from following parts:
+is made from the following parts:
-_* Linux kernel
+_* *{Linux kernel image}*, usually named #{vmlinuz*}#
-_* The Linux image, usually named #{vmlinuz*}#
-
-_* *{Initial RAM disk image (initrd)}*: RAM disk setup for the Linux boot,
-containing modules possibly needed to mount the filesystem's image and some
+_* *{Initial RAM disk image (initrd)}*: a RAM disk set up for the Linux
+boot, containing modules possibly needed to mount the System image and some
scripts to do it.
-_* *{System image}*: The operating systems filesystem image. The SquashFS
-compressed filesystem is used to minimize the Debian Live image size. Note
-that it's read-only. So, during boot the Debian Live system will use a RAM
-disk and 'union' mechanism to enable writing files within the running
-system. However, all modifications will be lost upon shutdown unless
-optional persistence partition(s) are used (see persistence).
+_* *{System image}*: The operating system's filesystem image. Usually, a
+SquashFS compressed filesystem is used to minimize the Debian Live image
+size. Note that it is read-only. So, during boot the Debian Live system will
+use a RAM disk and 'union' mechanism to enable writing files within the
+running system. However, all modifications will be lost upon shutdown unless
+optional persistence is used (see persistence).
% FIXME: <xref linkend="persistence"/>
-_* *{Bootloader}*: A small piece of code, crafted to boot up from the chosen
+_* *{Bootloader}*: A small piece of code crafted to boot from the chosen
media, possibly presenting a prompt or menu to allow selection of
-options/configuration. It then loads the Linux kernel and its initrd to run
-with an associated filesystem image. Different solutions can be used
-depending on the target media and format of the filesystem containing the
-previous components: Isolinux to boot from a CD or DVD in ISO9660 format,
+options/configuration. It loads the Linux kernel and its initrd to run with
+an associated system filesystem. Different solutions can be used, depending
+on the target media and format of the filesystem containing the previously
+mentioned components: isolinux to boot from a CD or DVD in ISO9660 format,
syslinux for HDD or USB drive booting from a VFAT partition, extlinux for
ext2/3/4 and btrfs partitions, pxelinux for PXE netboot, GRUB for ext2/3/4
-partition, etc.
+partitions, etc.
-_* live-build will build the system image from your specifications, setup a
-Linux kernel and its initrd, a bootloader to run them, all in one
+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 image
-The following sequence of commands, provided by live-build, will create a
-basic ISO image containing just the Debian standard system without X.org. It
-is suitable for burning to CD or DVD media.
+The following sequence of live-build commands will 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
+(as per {Copying USB/HDD image to a USB stick}#copying-usb-hdd-image,
+specifying ".iso" extension where ".img" is indicated).
First, we run the #{lb config}# command which will create a "config/"
hierarchy in the current directory for use by other commands:
@@ -62,7 +62,7 @@ $ lb config
}code
-By passing no parameters to #{lb config}# we indicated that we wish to use
+By passing no parameters to #{lb config}#, we indicated that we wish to use
the defaults (see {The lb config command}#lb-config ).
Now that we have a "config/" hierarchy, we may build the image with the lb
@@ -95,26 +95,23 @@ In order to test the ISO with virtualbox-ose:
code{
-# apt-get install virtualbox-ose
+# apt-get install virtualbox-ose virtualbox-ose-dkms
-}code
+$ virtualbox
-and either install #{virtualbox-ose-source}# or #{virtualbox-ose-dkms}# to
-build the required kernel modules to run virtualbox-ose.
+}code
-After successful installation, virtualbox can be e.g. found in the GNOME
-menu under 'Applications/System Tools/VirtualBox OSE'.
+Create a new virtual machine, change the storage settings to use binary.iso
+as the CD/DVD device, and start the machine.
-Please consider including of following packages onto the live image to
-achieve higher resolution of the display when booting the live image in
-virutalbox-ose (1280x1024 instead of 800x600 and in particular if the
-default resolution of the virtualbox-ose display shouldn't work with the
-gui-installer).
+Note: For live systems containing X.org that you want to test with
+virtualbox-ose, you may wish to include the VirtualBox X.org driver package,
+virtualbox-ose-guest-x11, in your live-build configuration. Otherwise, the
+resolution is limited to 800x600.
code{
-virtualbox-ose-guest-dkms virtualbox-ose-guest-utils
-virtualbox-ose-guest-x11
+# lb config --packages virtualbox-ose-guest-x11
}code
@@ -130,15 +127,18 @@ $ wodim binary.iso
}code
-2~ Building an USB/HDD image
+2~ 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.
+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.
-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
+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 ):
code{
@@ -164,11 +164,11 @@ code{
}code
-3~ Copying USB/HDD image to a USB stick
+3~copying-usb-hdd-image Copying USB/HDD image to a USB stick
The generated binary image contains a VFAT partition and the syslinux
-bootloader, ready to be directly written on an USB stick. Plug in an USB
-stick with a size larger than that of binary.img and type:
+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{
@@ -178,7 +178,8 @@ $ dd if=binary.img of=${USBSTICK}
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.
+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!}*
@@ -205,8 +206,8 @@ code{
}code
-Ater the creation of the partition you have to create a filsystem on it. One
-possible choice would be ext4.
+After the creation of the partition, you have to create a filesystem on
+it. One possible choice would be ext4.
code{
@@ -222,7 +223,7 @@ code{
}code
-*{Remember: Every time you install a new binary.img on the stick, all your data will be lost because the image includes a complete partition table.}*
+*{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.}*
2~ Building a netboot image
@@ -230,7 +231,7 @@ The following sequence of commands will create a basic netboot image
containing the Debian standard system without X.org. It is suitable for
booting over the network.
-Note if you performed any previous examples, you will need to clean up your
+Note: if you performed any previous examples, you will need to clean up your
working directory with the #{lb clean}# command:
code{
@@ -249,11 +250,11 @@ $ lb config -b net --net-root-path "/srv/debian-live" --net-root-server
}code
-In contrast with the ISO and USB hdd images, netbooting does not support
-serving a filesystem image with the client so the files must be served via
+In contrast with the ISO and USB/HDD images, netbooting does not support
+serving a filesystem image with the client, so the files must be served via
NFS. The net-root-path and net-root-server options specify the location and
server, respectively, of the NFS server where the filesytem image will be
-located at boot-time.
+located at boot time.
Now build the image with the #{lb build}# command:
@@ -263,11 +264,11 @@ code{
}code
-In a network boot the client runs a small piece of software, which usually
+In a network boot, the client runs a small piece of software which usually
resides on the EPROM of the Ethernet card. This program sends a DHCP request
-to get an IP address and information about what to do next. Typically the
-next step is getting a higher level boot loader via the TFTP protocol. That
-could be PXELINUX, Grub or even boot directly to an operating system like
+to get an IP address and information about what to do next. Typically, the
+next step is getting a higher level bootloader via the TFTP protocol. That
+could be PXELINUX, GRUB, or even boot directly to an operating system like
Linux.
For example, if you unpack the generated binary-net.tar.gz archive in the
@@ -280,7 +281,7 @@ We must now configure three services on the server to enable netboot.
3~ DHCP server
We must configure our network's DHCP server to be sure to give an IP address
-to the computer netbooting, and to advertise the location of the PXE
+to the netbooting client system, and to advertise the location of the PXE
bootloader.
Here is an example for inspiration, written for the ISC DHCP server
@@ -305,9 +306,9 @@ subnet 192.168.1.0 netmask 255.255.255.0 { # 192.168.1.0/24
# net boot configuration for guests with a PXE client :
if substring (option vendor-class-identifier, 0, 9) = "PXEClient" {
- # Note : all files for PXE are relatives to the TFTP server's root
+ # Note: all files for PXE are relatives to the TFTP server's root
- # PXE boot loader (first program to be loaded, by TFTP)
+ # PXE bootloader (first program to be loaded, by TFTP)
filename "pxelinux.0";
}
@@ -317,7 +318,7 @@ subnet 192.168.1.0 netmask 255.255.255.0 { # 192.168.1.0/24
3~ TFTP server
-This serves the kernel and initial ramdisk to the system at run-time.
+This serves the kernel and initial ramdisk to the system at run time.
You should install the tftpd-hpa package. It can serve all files contained
inside a root directory, usually /srv/tftp. To let it serve files inside
@@ -418,6 +419,6 @@ ethernet0.generatedAddress = "00:0c:29:8d:71:3b" uuid.location = "56 4d 83
_* You can play with this configuration file (i.e. change memory limit to
256)
-_* Double click on this file (or run VMWare player and selecet this file).
+_* Double click on this file (or run VMWare player and select this file).
_* When running just press space if that strange question comes up...
--
live-manual
More information about the debian-live-changes
mailing list