[SCM] live-manual branch, debian, updated. debian/2.0_a10-1-8-g63483b2
Ben Armstrong
synrg at debian.org
Sat Nov 27 13:42:24 UTC 2010
The following commit has been merged in the debian branch:
commit 63483b20872ba3994d07855540d71c932920aa95
Author: Ben Armstrong <synrg at debian.org>
Date: Sat Nov 27 09:41:56 2010 -0400
Adding 'For the impatient' and tutorial examples.
diff --git a/manual/de/about_manual.ssi b/manual/de/about_manual.ssi
index f84a3c9..3681aa9 100644
--- a/manual/de/about_manual.ssi
+++ b/manual/de/about_manual.ssi
@@ -14,6 +14,25 @@ unprivileged user and those requiring superuser privileges, commands are
prepended by #{$}# or #{#}# respectively. This symbol is not a part of the
command.
+2~ For the impatient
+
+While we believe that everything in this manual is important to at least
+some of our users, we realize it is a lot of material to cover and that you
+may wish to experience early success using the software before delving into
+the details. Therefore, we have provided three tutorials in the
+{Examples}#examples section designed to teach you image building and
+customization basics. Read {Using the examples}#using-the-examples first,
+followed by {Tutorial 1: A standard image}#tutorial-1, {Tutorial 2: A web
+browser utility}#tutorial-2 and finally {Tutorial 3: A personal travelling
+companion}#tutorial-3. By the end of these tutorials, you will have a taste
+of what can be done with Debian Live. We encourage you to return to more
+in-depth study of the manual, perhaps next reading {The basics}#the-basics,
+skimming or skipping {Building a netboot image}#building-netboot-image, and
+finishing by reading the {Customization overview}#customization-overview and
+the chapters that follow it. By this point, we hope you are thoroughly
+excited by what can be done with Debian Live and motivated to read the rest
+of the manual, cover-to-cover.
+
2~terms Terms
_* *{Live system}*: An operating system that can boot without installation
diff --git a/manual/de/live-manual.ssm b/manual/de/live-manual.ssm
index e4c0fbb..354e7e6 100644
--- a/manual/de/live-manual.ssm
+++ b/manual/de/live-manual.ssm
@@ -9,7 +9,7 @@
:license: This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.<br><br>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.<br><br>You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/. <br><br>On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-3 file.
@date:
- :published: 2010-11-26
+ :published: 2010-11-27
@publisher: Debian Live Project <debian-live at lists.debian.org>
diff --git a/manual/de/user_basics.ssi b/manual/de/user_basics.ssi
index 303cdd7..eda6c9e 100644
--- a/manual/de/user_basics.ssi
+++ b/manual/de/user_basics.ssi
@@ -1,9 +1,16 @@
:B~ The basics
-1~ The basics
+1~the-basics The basics
This chapter contains a brief overview of the build process and instructions
-for booting the various binary image types.
+for using the default image type, #{iso-hybrid}# with a virtual machine,
+optical media or USB portable storage device. The chapter finishes with
+instructions for building and using a #{net}# type image, which is a bit
+more involved due to the setup required on the server. This is a slightly
+advanced topic for anyone who is not familiar already with netbooting, but
+is included here because once the setup is done, it is a very convenient way
+to test and deploy images for booting on the local network without the
+hassle of dealing with image media.
2~ What is a live system?
@@ -77,7 +84,7 @@ code{
This process can take a while, depending on the speed of your network
connection (see {The lb build command}#lb-build).
-3~ Testing an ISO image with Qemu
+3~testing-iso-with-qemu Testing an ISO image with Qemu
Testing an ISO is simple:
@@ -89,7 +96,7 @@ $ qemu -cdrom binary.iso
}code
-3~ Testing an ISO image with virtualbox-ose
+3~testing-iso-with-virtualbox Testing an ISO image with virtualbox-ose
In order to test the ISO with virtualbox-ose:
@@ -115,7 +122,7 @@ code{
}code
-3~ Burning an ISO image to a physical medium
+3~burning-iso-image Burning an ISO image to a physical medium
Burning an ISO image is easy:
@@ -138,8 +145,8 @@ 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
-clean command}#lb-clean):
+to clean up your working directory with the #{lb clean}# command (see {The
+lb clean command}#lb-clean):
code{
@@ -147,8 +154,8 @@ $ lb clean --binary
}code
-Run the #{lb config}# command with the parameters to configure the "config/"
-hierarchy to create a USB/HDD image type:
+Run the #{lb config}# command with the parameters to configure the
+#{config/}# hierarchy to create a USB/HDD image type:
code{
@@ -183,7 +190,10 @@ better yet, #{ls -l /dev/disk/by-id}#.
*{This will definitely overwrite any previous contents on your stick!}*
-3~ Testing a USB/HDD image with Qemu
+Note: As discussed earlier, this same process can be used for #{iso-hybrid}#
+type images, (suffixed #{-hybrid.iso}#,) but not #{iso}# type images.
+
+3~testing-usb-hdd-with-qemu Testing a USB/HDD image with Qemu
code{
@@ -225,7 +235,7 @@ code{
*{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
+2~building-netboot-image Building a netboot image
The following sequence of commands will create a basic netboot image
containing the Debian standard system without X.org. It is suitable for
diff --git a/manual/de/user_customization-contents.ssi b/manual/de/user_customization-contents.ssi
index df28e53..f8d01ce 100644
--- a/manual/de/user_customization-contents.ssi
+++ b/manual/de/user_customization-contents.ssi
@@ -1,4 +1,4 @@
-B~ Customizing contents
+:B~ Customizing contents
1~customizing-contents Customizing contents
diff --git a/manual/de/user_customization-internationalization.ssi b/manual/de/user_customization-internationalization.ssi
index b86f8f8..0288819 100644
--- a/manual/de/user_customization-internationalization.ssi
+++ b/manual/de/user_customization-internationalization.ssi
@@ -1,4 +1,4 @@
-B~ Customizing locale and language
+:B~ Customizing locale and language
1~customizing-locale-and-language Customizing locale and language
diff --git a/manual/de/user_customization-overview.ssi b/manual/de/user_customization-overview.ssi
index 44c6731..dfef318 100644
--- a/manual/de/user_customization-overview.ssi
+++ b/manual/de/user_customization-overview.ssi
@@ -1,4 +1,4 @@
-B~ Customizing contents
+:B~ Customizing contents
1~customization-overview Customization overview
diff --git a/manual/de/user_examples.ssi b/manual/de/user_examples.ssi
index 2567323..d265d54 100644
--- a/manual/de/user_examples.ssi
+++ b/manual/de/user_examples.ssi
@@ -1,8 +1,81 @@
-B~ Examples
+:B~ Examples
-1~ Use Case Builds
+1~examples Examples
-This chapter covers example builds for specific use cases with Debian Live.
+This chapter covers example builds for specific use cases with Debian
+Live. If you are new to building your own Debian Live images, we recommend
+you first look at the three tutorials in sequence, as each one teaches new
+techniques that will help you use and understand the remaining examples.
+
+2~using-the-examples Using the examples
+
+Note that for the sake of brevity, in all of these examples we do not
+specify a local mirror to use for the build. You can either add the options
+to #{lb config}# each time you use the command, or else establish a default
+for your build system by creating #{/etc/live/build.conf}# and putting your
+preferred mirror in it as in the following example:
+
+code{
+
+LB_MIRROR_BOOTSTRAP="http://mirror/debian"
+LB_MIRROR_CHROOT="http://mirror/debian"
+
+}code
+
+2~tutorial-1 Tutorial 1: A standard image
+
+*{Use case:}* Create a simple first image, learning the basics of live-build
+
+In this tutorial, we will build a default ISO hybrid Debian Live image
+containing only base packages (no Xorg) and some Debian Live support
+packages, as a first exercise in using live-build.
+
+You can't get much simpler than this:
+
+code{
+
+$ mkdir tutorial1 ; cd tutorial1 ; lb config
+
+}code
+
+Examine the contents of the #{config/}# directory if you wish. You will see
+stored here a skeletal configuration, ready to customize or, in this case,
+use immediately to build a default image.
+
+Now, as superuser, build the image, saving a log as you build with #{tee}#.
+
+code{
+
+# lb_build 2>&1 | tee binary.log
+
+}code
+
+Assuming all goes well, after a while, the current directory will contain
+#{binary-hybrid.iso}#. This ISO hybrid image can be booted directly in a
+virtual machine as described in {Testing an ISO image with
+Qemu}#testing-iso-with-qemu and {Testing an ISO image with
+virtualbox-ose}#testing-iso-with-virtualbox, or else imaged onto optical
+media or a USB flash device as described in {Burning an ISO image to a
+physical medium}#burning-iso-image and {Copying USB/HDD image to a USB
+stick}#copying-usb-hdd-image, respectively.
+
+2~tutorial-2 Tutorial 2: A web browser utility
+
+*{Use case}* Create a web browser utility image, learning how to apply customizations
+
+In this tutorial, we will create an image suitable for use as a web browser
+utility using a single extra repository, a single package list, a single
+extra package, and a single extra file, configured with your locale and
+keyboard preferences, thereby introducing the various ways you can customize
+Debian Live images.
+
+FIXME
+
+2~tutorial-3 Tutorial 3: A personal travelling companion
+
+*{Use case}* Create a project to build a personal travelling companion image, containing your favourite software to take with you on a USB stick wherever you go, and evolving in successive revisions as your needs and preferences change.
+
+FIXME
2~ VNC Kiosk Client
diff --git a/manual/en/about_manual.ssi b/manual/en/about_manual.ssi
index f4ea010..3fcf6d4 100644
--- a/manual/en/about_manual.ssi
+++ b/manual/en/about_manual.ssi
@@ -6,6 +6,10 @@ The main goal of this manual is to serve as a single access point to all documen
Some of the commands mentioned in the text must be executed with superuser privileges which can be obtained by becoming the root user via #{su}# or by using #{sudo}#. To distinguish between commands which may be executed by an unprivileged user and those requiring superuser privileges, commands are prepended by #{$}# or #{#}# respectively. This symbol is not a part of the command.
+2~ For the impatient
+
+While we believe that everything in this manual is important to at least some of our users, we realize it is a lot of material to cover and that you may wish to experience early success using the software before delving into the details. Therefore, we have provided three tutorials in the {Examples}#examples section designed to teach you image building and customization basics. Read {Using the examples}#using-the-examples first, followed by {Tutorial 1: A standard image}#tutorial-1, {Tutorial 2: A web browser utility}#tutorial-2 and finally {Tutorial 3: A personal travelling companion}#tutorial-3. By the end of these tutorials, you will have a taste of what can be done with Debian Live. We encourage you to return to more in-depth study of the manual, perhaps next reading {The basics}#the-basics, skimming or skipping {Building a netboot image}#building-netboot-image, and finishing by reading the {Customization overview}#customization-overview and the chapters that follow it. B
y this point, we hope you are thoroughly excited by what can be done with Debian Live and motivated to read the rest of the manual, cover-to-cover.
+
2~terms Terms
_* *{Live system}*: An operating system that can boot without installation to a hard drive. Live systems do not alter local operating system(s) or file(s) already installed on the computer hard drive unless instructed to do so. Live systems are typically booted from media such as CDs, DVDs or USB sticks. Some may also boot over the network.
diff --git a/manual/en/live-manual.ssm b/manual/en/live-manual.ssm
index 3aa673a..afd9ca6 100644
--- a/manual/en/live-manual.ssm
+++ b/manual/en/live-manual.ssm
@@ -9,7 +9,7 @@
:license: This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.<br><br>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.<br><br>You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/. <br><br>On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-3 file.
@date:
- :published: 2010-11-26
+ :published: 2010-11-27
@publisher: Debian Live Project <debian-live at lists.debian.org>
diff --git a/manual/en/user_basics.ssi b/manual/en/user_basics.ssi
index c707245..8fdecf7 100644
--- a/manual/en/user_basics.ssi
+++ b/manual/en/user_basics.ssi
@@ -1,8 +1,8 @@
:B~ The basics
-1~ The basics
+1~the-basics The basics
-This chapter contains a brief overview of the build process and instructions for booting the various binary image types.
+This chapter contains a brief overview of the build process and instructions for using the default image type, #{iso-hybrid}# with a virtual machine, optical media or USB portable storage device. The chapter finishes with instructions for building and using a #{net}# type image, which is a bit more involved due to the setup required on the server. This is a slightly advanced topic for anyone who is not familiar already with netbooting, but is included here because once the setup is done, it is a very convenient way to test and deploy images for booting on the local network without the hassle of dealing with image media.
2~ What is a live system?
@@ -46,7 +46,7 @@ code{
This process can take a while, depending on the speed of your network connection (see {The lb build command}#lb-build).
-3~ Testing an ISO image with Qemu
+3~testing-iso-with-qemu Testing an ISO image with Qemu
Testing an ISO is simple:
@@ -58,7 +58,7 @@ $ qemu -cdrom binary.iso
}code
-3~ Testing an ISO image with virtualbox-ose
+3~testing-iso-with-virtualbox Testing an ISO image with virtualbox-ose
In order to test the ISO with virtualbox-ose:
@@ -80,7 +80,7 @@ code{
}code
-3~ Burning an ISO image to a physical medium
+3~burning-iso-image Burning an ISO image to a physical medium
Burning an ISO image is easy:
@@ -96,7 +96,7 @@ $ wodim binary.iso
The following sequence of commands will create a basic USB/HDD image containing just the Debian standard system without X.org. It is suitable for booting from USB sticks, USB hard drives, and various other portable storage devices. Normally, an ISO hybrid image can be used for this purpose instead, but if you have a BIOS which does not handle hybrid images properly, or want to use the remaining space on the media for a persistence partition, you need a USB/HDD image.
-Note: if you created an ISO image with the previous example, you will need to clean up your working directory with the #{lb clean} command (see {The lb clean command}#lb-clean):
+Note: if you created an ISO 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{
@@ -104,7 +104,7 @@ $ lb clean --binary
}code
-Run the #{lb config}# command with the parameters to configure the "config/" hierarchy to create a USB/HDD image type:
+Run the #{lb config}# command with the parameters to configure the #{config/}# hierarchy to create a USB/HDD image type:
code{
@@ -134,7 +134,9 @@ where #{${USBSTICK}}# is the device file of your key, like #{/dev/sdb}# (not a p
*{This will definitely overwrite any previous contents on your stick!}*
-3~ Testing a USB/HDD image with Qemu
+Note: As discussed earlier, this same process can be used for #{iso-hybrid}# type images, (suffixed #{-hybrid.iso}#,) but not #{iso}# type images.
+
+3~testing-usb-hdd-with-qemu Testing a USB/HDD image with Qemu
code{
@@ -172,7 +174,7 @@ code{
*{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
+2~building-netboot-image Building a netboot image
The following sequence of commands will create a basic netboot image containing the Debian standard system without X.org. It is suitable for booting over the network.
diff --git a/manual/en/user_customization-contents.ssi b/manual/en/user_customization-contents.ssi
index 7d706fe..ccd4e9e 100644
--- a/manual/en/user_customization-contents.ssi
+++ b/manual/en/user_customization-contents.ssi
@@ -1,4 +1,4 @@
-B~ Customizing contents
+:B~ Customizing contents
1~customizing-contents Customizing contents
diff --git a/manual/en/user_customization-internationalization.ssi b/manual/en/user_customization-internationalization.ssi
index 6298067..7afca4b 100644
--- a/manual/en/user_customization-internationalization.ssi
+++ b/manual/en/user_customization-internationalization.ssi
@@ -1,4 +1,4 @@
-B~ Customizing locale and language
+:B~ Customizing locale and language
1~customizing-locale-and-language Customizing locale and language
diff --git a/manual/en/user_customization-overview.ssi b/manual/en/user_customization-overview.ssi
index 450a64d..ea851ac 100644
--- a/manual/en/user_customization-overview.ssi
+++ b/manual/en/user_customization-overview.ssi
@@ -1,4 +1,4 @@
-B~ Customizing contents
+:B~ Customizing contents
1~customization-overview Customization overview
diff --git a/manual/en/user_examples.ssi b/manual/en/user_examples.ssi
index a2ab393..38d038f 100644
--- a/manual/en/user_examples.ssi
+++ b/manual/en/user_examples.ssi
@@ -1,8 +1,59 @@
-B~ Examples
+:B~ Examples
-1~ Use Case Builds
+1~examples Examples
-This chapter covers example builds for specific use cases with Debian Live.
+This chapter covers example builds for specific use cases with Debian Live. If you are new to building your own Debian Live images, we recommend you first look at the three tutorials in sequence, as each one teaches new techniques that will help you use and understand the remaining examples.
+
+2~using-the-examples Using the examples
+
+Note that for the sake of brevity, in all of these examples we do not specify a local mirror to use for the build. You can either add the options to #{lb config}# each time you use the command, or else establish a default for your build system by creating #{/etc/live/build.conf}# and putting your preferred mirror in it as in the following example:
+
+code{
+
+LB_MIRROR_BOOTSTRAP="http://mirror/debian"
+LB_MIRROR_CHROOT="http://mirror/debian"
+
+}code
+
+2~tutorial-1 Tutorial 1: A standard image
+
+*{Use case:}* Create a simple first image, learning the basics of live-build
+
+In this tutorial, we will build a default ISO hybrid Debian Live image containing only base packages (no Xorg) and some Debian Live support packages, as a first exercise in using live-build.
+
+You can't get much simpler than this:
+
+code{
+
+$ mkdir tutorial1 ; cd tutorial1 ; lb config
+
+}code
+
+Examine the contents of the #{config/}# directory if you wish. You will see stored here a skeletal configuration, ready to customize or, in this case, use immediately to build a default image.
+
+Now, as superuser, build the image, saving a log as you build with #{tee}#.
+
+code{
+
+# lb_build 2>&1 | tee binary.log
+
+}code
+
+Assuming all goes well, after a while, the current directory will contain #{binary-hybrid.iso}#. This ISO hybrid image can be booted directly in a virtual machine as described in {Testing an ISO image with Qemu}#testing-iso-with-qemu and {Testing an ISO image with virtualbox-ose}#testing-iso-with-virtualbox, or else imaged onto optical media or a USB flash device as described in {Burning an ISO image to a physical medium}#burning-iso-image and {Copying USB/HDD image to a USB stick}#copying-usb-hdd-image, respectively.
+
+2~tutorial-2 Tutorial 2: A web browser utility
+
+*{Use case}* Create a web browser utility image, learning how to apply customizations
+
+In this tutorial, we will create an image suitable for use as a web browser utility using a single extra repository, a single package list, a single extra package, and a single extra file, configured with your locale and keyboard preferences, thereby introducing the various ways you can customize Debian Live images.
+
+FIXME
+
+2~tutorial-3 Tutorial 3: A personal travelling companion
+
+*{Use case}* Create a project to build a personal travelling companion image, containing your favourite software to take with you on a USB stick wherever you go, and evolving in successive revisions as your needs and preferences change.
+
+FIXME
2~ VNC Kiosk Client
diff --git a/manual/fr/about_manual.ssi b/manual/fr/about_manual.ssi
index 77d2bbb..b7f62d0 100644
--- a/manual/fr/about_manual.ssi
+++ b/manual/fr/about_manual.ssi
@@ -15,6 +15,25 @@ nécessitant les privilèges super-utilisateur, les commandes sont précédées
respectivement par #{$}# ou #{#}#. Ce symbole ne fait pas partie de la
commande.
+2~ For the impatient
+
+While we believe that everything in this manual is important to at least
+some of our users, we realize it is a lot of material to cover and that you
+may wish to experience early success using the software before delving into
+the details. Therefore, we have provided three tutorials in the
+{Examples}#examples section designed to teach you image building and
+customization basics. Read {Using the examples}#using-the-examples first,
+followed by {Tutorial 1: A standard image}#tutorial-1, {Tutorial 2: A web
+browser utility}#tutorial-2 and finally {Tutorial 3: A personal travelling
+companion}#tutorial-3. By the end of these tutorials, you will have a taste
+of what can be done with Debian Live. We encourage you to return to more
+in-depth study of the manual, perhaps next reading {The basics}#the-basics,
+skimming or skipping {Building a netboot image}#building-netboot-image, and
+finishing by reading the {Customization overview}#customization-overview and
+the chapters that follow it. By this point, we hope you are thoroughly
+excited by what can be done with Debian Live and motivated to read the rest
+of the manual, cover-to-cover.
+
2~terms Terminologie
_* *{Système Live}*: Un système d'exploitation pouvant être démarré sans
diff --git a/manual/fr/live-manual.ssm b/manual/fr/live-manual.ssm
index aff987f..92bd15d 100644
--- a/manual/fr/live-manual.ssm
+++ b/manual/fr/live-manual.ssm
@@ -9,7 +9,7 @@
:license: This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.<br><br>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.<br><br>You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/. <br><br>On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-3 file.
@date:
- :published: 2010-11-26
+ :published: 2010-11-27
@publisher: Debian Live Project <debian-live at lists.debian.org>
diff --git a/manual/fr/user_basics.ssi b/manual/fr/user_basics.ssi
index 303cdd7..eda6c9e 100644
--- a/manual/fr/user_basics.ssi
+++ b/manual/fr/user_basics.ssi
@@ -1,9 +1,16 @@
:B~ The basics
-1~ The basics
+1~the-basics The basics
This chapter contains a brief overview of the build process and instructions
-for booting the various binary image types.
+for using the default image type, #{iso-hybrid}# with a virtual machine,
+optical media or USB portable storage device. The chapter finishes with
+instructions for building and using a #{net}# type image, which is a bit
+more involved due to the setup required on the server. This is a slightly
+advanced topic for anyone who is not familiar already with netbooting, but
+is included here because once the setup is done, it is a very convenient way
+to test and deploy images for booting on the local network without the
+hassle of dealing with image media.
2~ What is a live system?
@@ -77,7 +84,7 @@ code{
This process can take a while, depending on the speed of your network
connection (see {The lb build command}#lb-build).
-3~ Testing an ISO image with Qemu
+3~testing-iso-with-qemu Testing an ISO image with Qemu
Testing an ISO is simple:
@@ -89,7 +96,7 @@ $ qemu -cdrom binary.iso
}code
-3~ Testing an ISO image with virtualbox-ose
+3~testing-iso-with-virtualbox Testing an ISO image with virtualbox-ose
In order to test the ISO with virtualbox-ose:
@@ -115,7 +122,7 @@ code{
}code
-3~ Burning an ISO image to a physical medium
+3~burning-iso-image Burning an ISO image to a physical medium
Burning an ISO image is easy:
@@ -138,8 +145,8 @@ 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
-clean command}#lb-clean):
+to clean up your working directory with the #{lb clean}# command (see {The
+lb clean command}#lb-clean):
code{
@@ -147,8 +154,8 @@ $ lb clean --binary
}code
-Run the #{lb config}# command with the parameters to configure the "config/"
-hierarchy to create a USB/HDD image type:
+Run the #{lb config}# command with the parameters to configure the
+#{config/}# hierarchy to create a USB/HDD image type:
code{
@@ -183,7 +190,10 @@ better yet, #{ls -l /dev/disk/by-id}#.
*{This will definitely overwrite any previous contents on your stick!}*
-3~ Testing a USB/HDD image with Qemu
+Note: As discussed earlier, this same process can be used for #{iso-hybrid}#
+type images, (suffixed #{-hybrid.iso}#,) but not #{iso}# type images.
+
+3~testing-usb-hdd-with-qemu Testing a USB/HDD image with Qemu
code{
@@ -225,7 +235,7 @@ code{
*{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
+2~building-netboot-image Building a netboot image
The following sequence of commands will create a basic netboot image
containing the Debian standard system without X.org. It is suitable for
diff --git a/manual/fr/user_customization-contents.ssi b/manual/fr/user_customization-contents.ssi
index df28e53..f8d01ce 100644
--- a/manual/fr/user_customization-contents.ssi
+++ b/manual/fr/user_customization-contents.ssi
@@ -1,4 +1,4 @@
-B~ Customizing contents
+:B~ Customizing contents
1~customizing-contents Customizing contents
diff --git a/manual/fr/user_customization-internationalization.ssi b/manual/fr/user_customization-internationalization.ssi
index b86f8f8..0288819 100644
--- a/manual/fr/user_customization-internationalization.ssi
+++ b/manual/fr/user_customization-internationalization.ssi
@@ -1,4 +1,4 @@
-B~ Customizing locale and language
+:B~ Customizing locale and language
1~customizing-locale-and-language Customizing locale and language
diff --git a/manual/fr/user_customization-overview.ssi b/manual/fr/user_customization-overview.ssi
index 44c6731..dfef318 100644
--- a/manual/fr/user_customization-overview.ssi
+++ b/manual/fr/user_customization-overview.ssi
@@ -1,4 +1,4 @@
-B~ Customizing contents
+:B~ Customizing contents
1~customization-overview Customization overview
diff --git a/manual/fr/user_examples.ssi b/manual/fr/user_examples.ssi
index 2567323..d265d54 100644
--- a/manual/fr/user_examples.ssi
+++ b/manual/fr/user_examples.ssi
@@ -1,8 +1,81 @@
-B~ Examples
+:B~ Examples
-1~ Use Case Builds
+1~examples Examples
-This chapter covers example builds for specific use cases with Debian Live.
+This chapter covers example builds for specific use cases with Debian
+Live. If you are new to building your own Debian Live images, we recommend
+you first look at the three tutorials in sequence, as each one teaches new
+techniques that will help you use and understand the remaining examples.
+
+2~using-the-examples Using the examples
+
+Note that for the sake of brevity, in all of these examples we do not
+specify a local mirror to use for the build. You can either add the options
+to #{lb config}# each time you use the command, or else establish a default
+for your build system by creating #{/etc/live/build.conf}# and putting your
+preferred mirror in it as in the following example:
+
+code{
+
+LB_MIRROR_BOOTSTRAP="http://mirror/debian"
+LB_MIRROR_CHROOT="http://mirror/debian"
+
+}code
+
+2~tutorial-1 Tutorial 1: A standard image
+
+*{Use case:}* Create a simple first image, learning the basics of live-build
+
+In this tutorial, we will build a default ISO hybrid Debian Live image
+containing only base packages (no Xorg) and some Debian Live support
+packages, as a first exercise in using live-build.
+
+You can't get much simpler than this:
+
+code{
+
+$ mkdir tutorial1 ; cd tutorial1 ; lb config
+
+}code
+
+Examine the contents of the #{config/}# directory if you wish. You will see
+stored here a skeletal configuration, ready to customize or, in this case,
+use immediately to build a default image.
+
+Now, as superuser, build the image, saving a log as you build with #{tee}#.
+
+code{
+
+# lb_build 2>&1 | tee binary.log
+
+}code
+
+Assuming all goes well, after a while, the current directory will contain
+#{binary-hybrid.iso}#. This ISO hybrid image can be booted directly in a
+virtual machine as described in {Testing an ISO image with
+Qemu}#testing-iso-with-qemu and {Testing an ISO image with
+virtualbox-ose}#testing-iso-with-virtualbox, or else imaged onto optical
+media or a USB flash device as described in {Burning an ISO image to a
+physical medium}#burning-iso-image and {Copying USB/HDD image to a USB
+stick}#copying-usb-hdd-image, respectively.
+
+2~tutorial-2 Tutorial 2: A web browser utility
+
+*{Use case}* Create a web browser utility image, learning how to apply customizations
+
+In this tutorial, we will create an image suitable for use as a web browser
+utility using a single extra repository, a single package list, a single
+extra package, and a single extra file, configured with your locale and
+keyboard preferences, thereby introducing the various ways you can customize
+Debian Live images.
+
+FIXME
+
+2~tutorial-3 Tutorial 3: A personal travelling companion
+
+*{Use case}* Create a project to build a personal travelling companion image, containing your favourite software to take with you on a USB stick wherever you go, and evolving in successive revisions as your needs and preferences change.
+
+FIXME
2~ VNC Kiosk Client
diff --git a/manual/po/de/about_manual.ssi.po b/manual/po/de/about_manual.ssi.po
index 5fae85c..337b13b 100644
--- a/manual/po/de/about_manual.ssi.po
+++ b/manual/po/de/about_manual.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-11-25 16:53+0100\n"
+"POT-Creation-Date: 2010-11-27 09:40-0400\n"
"PO-Revision-Date: 2010-10-22 08:36-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -48,12 +48,38 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:10
-msgid "2~terms Terms"
+msgid "2~ For the impatient"
msgstr ""
#. type: Plain text
#: en/about_manual.ssi:12
msgid ""
+"While we believe that everything in this manual is important to at least "
+"some of our users, we realize it is a lot of material to cover and that you "
+"may wish to experience early success using the software before delving into "
+"the details. Therefore, we have provided three tutorials in the {Examples}"
+"#examples section designed to teach you image building and customization "
+"basics. Read {Using the examples}#using-the-examples first, followed by "
+"{Tutorial 1: A standard image}#tutorial-1, {Tutorial 2: A web browser "
+"utility}#tutorial-2 and finally {Tutorial 3: A personal travelling companion}"
+"#tutorial-3. By the end of these tutorials, you will have a taste of what "
+"can be done with Debian Live. We encourage you to return to more in-depth "
+"study of the manual, perhaps next reading {The basics}#the-basics, skimming "
+"or skipping {Building a netboot image}#building-netboot-image, and finishing "
+"by reading the {Customization overview}#customization-overview and the "
+"chapters that follow it. By this point, we hope you are thoroughly excited "
+"by what can be done with Debian Live and motivated to read the rest of the "
+"manual, cover-to-cover."
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:14
+msgid "2~terms Terms"
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:16
+msgid ""
"_* *{Live system}*: An operating system that can boot without installation "
"to a hard drive. Live systems do not alter local operating system(s) or file"
"(s) already installed on the computer hard drive unless instructed to do so. "
@@ -62,14 +88,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:14
+#: en/about_manual.ssi:18
msgid ""
"_* *{Debian Live}*: The Debian sub-project which maintains the live-boot, "
"live-build, live-config, and live-manual packages."
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:16
+#: en/about_manual.ssi:20
msgid ""
"_* *{Debian Live system}*: A live system that uses software from the Debian "
"operating system that may be booted from CDs, DVDs, USB sticks, over the "
@@ -78,24 +104,24 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:18
+#: en/about_manual.ssi:22
msgid "_* *{Host system}*: The environment used to create the live system."
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:20
+#: en/about_manual.ssi:24
msgid "_* *{Target system}*: The environment used to run the live system."
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:22
+#: en/about_manual.ssi:26
msgid ""
"_* *{live-boot}*: A collection of scripts used to boot live systems. live-"
"boot was formerly a part of live-initramfs."
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:24
+#: en/about_manual.ssi:28
msgid ""
"_* *{live-build}*: A collection of scripts used to build customized Debian "
"Live systems. live-build was formerly known as live-helper, and even earlier "
@@ -103,35 +129,35 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:26
+#: en/about_manual.ssi:30
msgid ""
"_* *{live-config}*: A collection of scripts used to configure a live system "
"during the boot process. live-config was formerly a part of live-initramfs."
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:28
+#: en/about_manual.ssi:32
msgid ""
"_* *{live-manual}*: This document is maintained in a package called live-"
"manual."
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:30
+#: en/about_manual.ssi:34
msgid ""
"_* *{Debian Installer (d-i)}*: The official installation system for the "
"Debian distribution."
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:32
+#: en/about_manual.ssi:36
msgid ""
"_* *{Boot parameters}*: Parameters that can be entered at the bootloader "
"prompt to influence the kernel or live-config."
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:34
+#: en/about_manual.ssi:38
msgid ""
"_* *{chroot}*: The chroot program, chroot(8), enables us to run different "
"instances of the GNU/Linux environment on a single system simultaneously "
@@ -139,21 +165,21 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:36
+#: en/about_manual.ssi:40
msgid ""
"_* *{Binary image}*: A file containing the live system, such as binary.iso "
"or binary.img."
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:38
+#: en/about_manual.ssi:42
msgid ""
"_* *{Target distribution}*: The distribution upon which your live system "
"will be based. This can differ from the distribution of your host system."
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:40
+#: en/about_manual.ssi:44
msgid ""
"_* *{Squeeze/Wheezy/Sid (stable/testing/unstable)}*: The stable distribution "
"contains the latest officially released distribution of Debian. The testing "
@@ -165,7 +191,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:42
+#: en/about_manual.ssi:46
msgid ""
"At the time of writing, Squeeze is the current stable release and Wheezy is "
"the current testing release. Sid will always be a synonym for the unstable "
@@ -173,82 +199,82 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:44
+#: en/about_manual.ssi:48
msgid "2~ Authors"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:46
+#: en/about_manual.ssi:50
msgid "A list of authors (in alphabetical order):"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:48
+#: en/about_manual.ssi:52
msgid "_* Ben Armstrong"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:50
+#: en/about_manual.ssi:54
msgid "_* Brendan Sleight"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:52
+#: en/about_manual.ssi:56
msgid "_* Chris Lamb"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:54
+#: en/about_manual.ssi:58
msgid "_* Daniel Baumann"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:56
+#: en/about_manual.ssi:60
msgid "_* Franklin Piat"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:58
+#: en/about_manual.ssi:62
msgid "_* Jonas Stein"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:60
+#: en/about_manual.ssi:64
msgid "_* Kai Hendry"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:62
+#: en/about_manual.ssi:66
msgid "_* Marco Amadori"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:64
+#: en/about_manual.ssi:68
msgid "_* Mathieu Geli"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:66
+#: en/about_manual.ssi:70
msgid "_* Matthias Kirschner"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:68
+#: en/about_manual.ssi:72
msgid "_* Richard Nelson"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:70
+#: en/about_manual.ssi:74
msgid "_* Trent W. Buck"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:72
+#: en/about_manual.ssi:76
msgid "2~ Contributing to this document"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:74
+#: en/about_manual.ssi:78
msgid ""
"This manual is intended as a community project and all proposals for "
"improvements and contributions are extremely welcome. The preferred way to "
@@ -257,7 +283,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:76
+#: en/about_manual.ssi:80
msgid ""
"When submitting a contribution, please clearly identify its copyright holder "
"and include the licensing statement. Note that to be accepted, the "
@@ -266,16 +292,16 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:78
+#: en/about_manual.ssi:82
msgid ""
"The sources for this manual are maintained using the Git version control "
"system. You can checkout the latest copy by executing:"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:80 en/about_manual.ssi:88 en/about_manual.ssi:96
-#: en/about_manual.ssi:108 en/about_manual.ssi:121 en/about_manual.ssi:134
-#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
+#: en/about_manual.ssi:112 en/about_manual.ssi:125 en/about_manual.ssi:138
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
@@ -299,11 +325,11 @@ msgstr ""
#: 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_basics.ssi:142 en/user_basics.ssi:154 en/user_basics.ssi:162
+#: en/user_basics.ssi:170 en/user_basics.ssi:184 en/user_basics.ssi:192
+#: en/user_basics.ssi:202 en/user_basics.ssi:222 en/user_basics.ssi:255
+#: en/user_basics.ssi:271 en/user_basics.ssi:279 en/user_basics.ssi:299
+#: en/user_basics.ssi:324 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
@@ -311,16 +337,18 @@ msgstr ""
#: en/user_customization-internationalization.ssi:38
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:88
-#: en/user_customization-packages.ssi:127
-#: en/user_customization-packages.ssi:137
-#: en/user_customization-packages.ssi:147
-#: en/user_customization-packages.ssi:157
-#: en/user_customization-packages.ssi:171
-#: en/user_customization-packages.ssi:187
-#: en/user_customization-packages.ssi:255
-#: en/user_customization-packages.ssi:267
-#: en/user_customization-packages.ssi:277 en/user_examples.ssi:24
+#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
+#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:133
+#: en/user_customization-packages.ssi:143
+#: en/user_customization-packages.ssi:153
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:261
+#: en/user_customization-packages.ssi:273
+#: en/user_customization-packages.ssi:283 en/user_examples.ssi:12
+#: en/user_examples.ssi:27 en/user_examples.ssi:37 en/user_examples.ssi:75
#: en/user_installation.ssi:38 en/user_installation.ssi:46
#: en/user_installation.ssi:56 en/user_installation.ssi:64
#: en/user_installation.ssi:76 en/user_installation.ssi:84
@@ -333,14 +361,14 @@ msgid "code{"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:82
+#: en/about_manual.ssi:86
msgid "$ git clone git://live.debian.net/git/live-manual.git"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:121 en/about_manual.ssi:134 en/about_manual.ssi:142
+#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:165
#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
@@ -363,11 +391,11 @@ msgstr ""
#: 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_basics.ssi:122 en/user_basics.ssi:132 en/user_basics.ssi:148
+#: en/user_basics.ssi:158 en/user_basics.ssi:166 en/user_basics.ssi:174
+#: en/user_basics.ssi:188 en/user_basics.ssi:196 en/user_basics.ssi:206
+#: en/user_basics.ssi:247 en/user_basics.ssi:259 en/user_basics.ssi:275
+#: en/user_basics.ssi:283 en/user_basics.ssi:310 en/user_basics.ssi:349
#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
#: en/user_customization-contents.ssi:70
#: en/user_customization-internationalization.ssi:14
@@ -376,16 +404,18 @@ msgstr ""
#: en/user_customization-internationalization.ssi:42
#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
-#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:92
-#: en/user_customization-packages.ssi:133
-#: en/user_customization-packages.ssi:143
-#: en/user_customization-packages.ssi:153
-#: en/user_customization-packages.ssi:163
-#: en/user_customization-packages.ssi:175
-#: en/user_customization-packages.ssi:191
-#: en/user_customization-packages.ssi:259
-#: en/user_customization-packages.ssi:271
-#: en/user_customization-packages.ssi:281 en/user_examples.ssi:33
+#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
+#: en/user_customization-packages.ssi:125
+#: en/user_customization-packages.ssi:139
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:159
+#: en/user_customization-packages.ssi:169
+#: en/user_customization-packages.ssi:181
+#: en/user_customization-packages.ssi:197
+#: en/user_customization-packages.ssi:265
+#: en/user_customization-packages.ssi:277
+#: en/user_customization-packages.ssi:287 en/user_examples.ssi:17
+#: en/user_examples.ssi:31 en/user_examples.ssi:41 en/user_examples.ssi:84
#: en/user_installation.ssi:42 en/user_installation.ssi:50
#: en/user_installation.ssi:60 en/user_installation.ssi:72
#: en/user_installation.ssi:80 en/user_installation.ssi:88
@@ -398,7 +428,7 @@ msgid "}code"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:86
+#: en/about_manual.ssi:90
msgid ""
"Prior to submission of your contribution, please preview your work. To "
"preview the live-manual, ensure the packages needed for building are "
@@ -406,29 +436,29 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:90
+#: en/about_manual.ssi:94
msgid "# apt-get install make po4a sisu-complete"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:94
+#: en/about_manual.ssi:98
msgid ""
"You may build the live-manual from the top level directory of your git "
"checkout by executing:"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:98
+#: en/about_manual.ssi:102
msgid "$ make build"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:102
+#: en/about_manual.ssi:106
msgid "3~ Applying patches"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:104
+#: en/about_manual.ssi:108
msgid ""
"Directly commiting to the repository is possible by anyone. However, we ask "
"you to send bigger changes to the mailing list to discuss them first. In "
@@ -436,12 +466,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:106
+#: en/about_manual.ssi:110
msgid "_* Fetch the public commit key:"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:115
+#: en/about_manual.ssi:119
#, no-wrap
msgid ""
"$ mkdir -p ~/.ssh/identity.d\n"
@@ -453,12 +483,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:119
+#: en/about_manual.ssi:123
msgid "_* Add the following section to your openssh-client config:"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:128
+#: en/about_manual.ssi:132
#, no-wrap
msgid ""
"$ cat >> ~/.ssh/config << EOF\n"
@@ -470,17 +500,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:132
+#: en/about_manual.ssi:136
msgid "_* Checkout a clone of the manual through ssh:"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:136
+#: en/about_manual.ssi:140
msgid "$ git clone gitosis at live.debian.net:/live-manual.git"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:140
+#: en/about_manual.ssi:144
msgid ""
"_* After editing the files in manual/en/, please call the 'commit' target in "
"the top level directory to sanitize the files and update the translation "
@@ -488,12 +518,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:144
+#: en/about_manual.ssi:148
msgid "$ make commit"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:148
+#: en/about_manual.ssi:152
msgid ""
"_* After sanitizing commit the changes. Write commit messages, that consist "
"of full useful sentences, starting with a capital letter and ending with a "
@@ -502,16 +532,16 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:152
+#: en/about_manual.ssi:156
msgid "$ git commit -a"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:156
+#: en/about_manual.ssi:160
msgid "_* Push the commit to the server:"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:160
+#: en/about_manual.ssi:164
msgid "$ git push"
msgstr ""
diff --git a/manual/po/de/live-manual.ssm.po b/manual/po/de/live-manual.ssm.po
index 7b9645c..e600257 100644
--- a/manual/po/de/live-manual.ssm.po
+++ b/manual/po/de/live-manual.ssm.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-11-26 07:06-0400\n"
+"POT-Creation-Date: 2010-11-27 09:40-0400\n"
"PO-Revision-Date: 2010-10-03 20:30+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -45,7 +45,7 @@ msgstr ""
#, no-wrap
msgid ""
"@date:\n"
-" :published: 2010-11-26\n"
+" :published: 2010-11-27\n"
msgstr ""
#. type: Plain text
diff --git a/manual/po/de/user_basics.ssi.po b/manual/po/de/user_basics.ssi.po
index 4bd270e..99e86e9 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-11-01 06:47-0200\n"
+"POT-Creation-Date: 2010-11-27 09:40-0400\n"
"PO-Revision-Date: 2010-10-03 20:30+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -17,9 +17,9 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. type: Plain text
-#: en/about_manual.ssi:80 en/about_manual.ssi:88 en/about_manual.ssi:96
-#: en/about_manual.ssi:108 en/about_manual.ssi:121 en/about_manual.ssi:134
-#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
+#: en/about_manual.ssi:112 en/about_manual.ssi:125 en/about_manual.ssi:138
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
@@ -39,38 +39,39 @@ msgstr ""
#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
#: en/other_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/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/other_procedures.ssi:58 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:142 en/user_basics.ssi:154 en/user_basics.ssi:162
+#: en/user_basics.ssi:170 en/user_basics.ssi:184 en/user_basics.ssi:192
+#: en/user_basics.ssi:202 en/user_basics.ssi:222 en/user_basics.ssi:255
+#: en/user_basics.ssi:271 en/user_basics.ssi:279 en/user_basics.ssi:299
+#: en/user_basics.ssi:324 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
#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
-#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
-#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
-#: en/user_customization-packages.ssi:103
-#: en/user_customization-packages.ssi:111
-#: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:104
-#: en/user_installation.ssi:118 en/user_installation.ssi:135
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
+#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
+#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
+#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:133
+#: en/user_customization-packages.ssi:143
+#: en/user_customization-packages.ssi:153
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:261
+#: en/user_customization-packages.ssi:273
+#: en/user_customization-packages.ssi:283 en/user_examples.ssi:12
+#: en/user_examples.ssi:27 en/user_examples.ssi:37 en/user_examples.ssi:75
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:76 en/user_installation.ssi:84
+#: en/user_installation.ssi:104 en/user_installation.ssi:118
+#: en/user_installation.ssi:135 en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:36
#: en/user_overview.ssi:80 en/user_overview.ssi:88
@@ -78,9 +79,9 @@ msgid "code{"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:121 en/about_manual.ssi:134 en/about_manual.ssi:142
+#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:165
#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
@@ -100,37 +101,39 @@ msgstr ""
#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
-#: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
-#: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
-#: en/other_use-cases.ssi:137 en/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/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:148
+#: en/user_basics.ssi:158 en/user_basics.ssi:166 en/user_basics.ssi:174
+#: en/user_basics.ssi:188 en/user_basics.ssi:196 en/user_basics.ssi:206
+#: en/user_basics.ssi:247 en/user_basics.ssi:259 en/user_basics.ssi:275
+#: en/user_basics.ssi:283 en/user_basics.ssi:310 en/user_basics.ssi:349
+#: 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
#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
-#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
-#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
-#: en/user_customization-packages.ssi:107
-#: en/user_customization-packages.ssi:115
-#: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:172
-#: en/user_customization-packages.ssi:182
-#: en/user_customization-packages.ssi:192
-#: en/user_customization-packages.ssi:202 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:88 en/user_installation.ssi:108
-#: en/user_installation.ssi:123 en/user_installation.ssi:138
-#: en/user_managing_a_configuration.ssi:31
+#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
+#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
+#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
+#: en/user_customization-packages.ssi:125
+#: en/user_customization-packages.ssi:139
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:159
+#: en/user_customization-packages.ssi:169
+#: en/user_customization-packages.ssi:181
+#: en/user_customization-packages.ssi:197
+#: en/user_customization-packages.ssi:265
+#: en/user_customization-packages.ssi:277
+#: en/user_customization-packages.ssi:287 en/user_examples.ssi:17
+#: en/user_examples.ssi:31 en/user_examples.ssi:41 en/user_examples.ssi:84
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:72
+#: en/user_installation.ssi:80 en/user_installation.ssi:88
+#: en/user_installation.ssi:108 en/user_installation.ssi:123
+#: en/user_installation.ssi:138 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:74
#: en/user_overview.ssi:84 en/user_overview.ssi:92
@@ -144,14 +147,21 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:4
-msgid "1~ The basics"
+msgid "1~the-basics The basics"
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:6
msgid ""
"This chapter contains a brief overview of the build process and instructions "
-"for booting the various binary image types."
+"for using the default image type, #{iso-hybrid}# with a virtual machine, "
+"optical media or USB portable storage device. The chapter finishes with "
+"instructions for building and using a #{net}# type image, which is a bit "
+"more involved due to the setup required on the server. This is a slightly "
+"advanced topic for anyone who is not familiar already with netbooting, but "
+"is included here because once the setup is done, it is a very convenient way "
+"to test and deploy images for booting on the local network without the "
+"hassle of dealing with image media."
msgstr ""
#. type: Plain text
@@ -269,7 +279,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:44 en/user_basics.ssi:120 en/user_basics.ssi:202
+#: en/user_basics.ssi:44 en/user_basics.ssi:120 en/user_basics.ssi:204
msgid "# lb build"
msgstr ""
@@ -282,7 +292,7 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:50
-msgid "3~ Testing an ISO image with Qemu"
+msgid "3~testing-iso-with-qemu Testing an ISO image with Qemu"
msgstr ""
#. type: Plain text
@@ -291,7 +301,7 @@ msgid "Testing an ISO is simple:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:56 en/user_basics.ssi:142
+#: en/user_basics.ssi:56 en/user_basics.ssi:144
msgid "# apt-get install qemu"
msgstr ""
@@ -302,7 +312,7 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:62
-msgid "3~ Testing an ISO image with virtualbox-ose"
+msgid "3~testing-iso-with-virtualbox Testing an ISO image with virtualbox-ose"
msgstr ""
#. type: Plain text
@@ -343,7 +353,7 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:84
-msgid "3~ Burning an ISO image to a physical medium"
+msgid "3~burning-iso-image Burning an ISO image to a physical medium"
msgstr ""
#. type: Plain text
@@ -382,20 +392,20 @@ msgstr ""
#: 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 "
-"clean command}#lb-clean):"
+"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:104 en/user_basics.ssi:184
+#: en/user_basics.ssi:104 en/user_basics.ssi:186
msgid "$ lb clean --binary"
msgstr ""
#. type: Plain text
#: 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:"
+"Run the #{lb config}# command with the parameters to configure the #{config/}"
+"# hierarchy to create a USB/HDD image type:"
msgstr ""
#. type: Plain text
@@ -443,21 +453,28 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:138
-msgid "3~ Testing a USB/HDD image with Qemu"
+msgid ""
+"Note: As discussed earlier, this same process can be used for #{iso-hybrid}# "
+"type images, (suffixed #{-hybrid.iso}#,) but not #{iso}# type images."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:144
+#: en/user_basics.ssi:140
+msgid "3~testing-usb-hdd-with-qemu Testing a USB/HDD image with Qemu"
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:146
msgid "$ qemu -hda binary.img"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:148
+#: en/user_basics.ssi:150
msgid "3~ Using the space left on a USB stick"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:150
+#: en/user_basics.ssi:152
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}"
@@ -466,45 +483,45 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:154
+#: en/user_basics.ssi:156
msgid "# gparted ${USBSTICK}"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:158
+#: en/user_basics.ssi:160
msgid ""
"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:162
+#: en/user_basics.ssi:164
msgid "# mkfs.ext4 ${USBSTICK}"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:166
+#: en/user_basics.ssi:168
msgid "If you want to use this data partition with Windows, use FAT32."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:170
+#: en/user_basics.ssi:172
msgid "# mkfs.vfat -F 32"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:174
+#: en/user_basics.ssi:176
#, no-wrap
msgid "*{Remember: Every time you install a new binary.img on the stick, all data on the stick will be lost because the partition table is overwritten by the contents of the image.}*\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:176
-msgid "2~ Building a netboot image"
+#: en/user_basics.ssi:178
+msgid "2~building-netboot-image Building a netboot image"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:178
+#: en/user_basics.ssi:180
msgid ""
"The following sequence of commands will create a basic netboot image "
"containing the Debian standard system without X.org. It is suitable for "
@@ -512,28 +529,28 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:180
+#: en/user_basics.ssi:182
msgid ""
"Note: if you performed any previous examples, you will need to clean up your "
"working directory with the #{lb clean}# command:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:188
+#: en/user_basics.ssi:190
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:192
+#: en/user_basics.ssi:194
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:196
+#: en/user_basics.ssi:198
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 "
@@ -543,12 +560,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:198
+#: en/user_basics.ssi:200
msgid "Now build the image with the #{lb build}# command:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:206
+#: en/user_basics.ssi:208
msgid ""
"In a network boot, the client runs a small piece of software which usually "
"resides on the EPROM of the Ethernet card. This program sends a DHCP request "
@@ -559,7 +576,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:208
+#: en/user_basics.ssi:210
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/"
@@ -568,17 +585,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:210
+#: en/user_basics.ssi:212
msgid "We must now configure three services on the server to enable netboot."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:212
+#: en/user_basics.ssi:214
msgid "3~ DHCP server"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:214
+#: en/user_basics.ssi:216
msgid ""
"We must configure our network's DHCP server to be sure to give an IP address "
"to the netbooting client system, and to advertise the location of the PXE "
@@ -586,25 +603,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:216
+#: en/user_basics.ssi:218
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:218 en/user_customization-packages.ssi:153
+#: en/user_basics.ssi:220
msgid "% FIXME"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:222
+#: en/user_basics.ssi:224
#, 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:225
+#: en/user_basics.ssi:227
#, no-wrap
msgid ""
" # IP addresses available for guests\n"
@@ -612,7 +629,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:228
+#: en/user_basics.ssi:230
#, no-wrap
msgid ""
" # allow booting from the net\n"
@@ -620,7 +637,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:233
+#: en/user_basics.ssi:235
#, no-wrap
msgid ""
" # for net booting, server where the first file to be loaded (by TFTP\n"
@@ -630,7 +647,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:237
+#: en/user_basics.ssi:239
#, no-wrap
msgid ""
" # net boot configuration for guests with a PXE client:\n"
@@ -639,7 +656,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:240
+#: en/user_basics.ssi:242
#, no-wrap
msgid ""
" # PXE bootloader (first program to be loaded, by TFTP)\n"
@@ -647,7 +664,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:243
+#: en/user_basics.ssi:245
#, no-wrap
msgid ""
" }\n"
@@ -655,17 +672,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:247
+#: en/user_basics.ssi:249
msgid "3~ TFTP server"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:249
+#: en/user_basics.ssi:251
msgid "This serves the kernel and initial ramdisk to the system at run time."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:251
+#: en/user_basics.ssi:253
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 /"
@@ -673,22 +690,22 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:255
+#: en/user_basics.ssi:257
msgid "dpkg-reconfigure -plow tftpd-hpa"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:259
+#: en/user_basics.ssi:261
msgid "and fill in the new tftp server directory when being asked about it."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:261
+#: en/user_basics.ssi:263
msgid "3~ NFS server"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:263
+#: en/user_basics.ssi:265
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 "
@@ -696,35 +713,35 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:265
+#: en/user_basics.ssi:267
msgid "You need to install the nfs-kernel-server package."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:267
+#: en/user_basics.ssi:269
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:271
+#: en/user_basics.ssi:273
msgid "/srv/debian-live *(ro,async,no_root_squash,no_subtree_check)"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:275
+#: en/user_basics.ssi:277
msgid ""
"and tell the NFS server about this new export with the following command:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:279
+#: en/user_basics.ssi:281
msgid "# exportfs -rv"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:283
+#: en/user_basics.ssi:285
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 "
@@ -733,40 +750,40 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:285
+#: en/user_basics.ssi:287
msgid "3~ Netboot testing HowTo"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:287
+#: en/user_basics.ssi:289
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:289
+#: en/user_basics.ssi:291
msgid ""
"To make our life easier, we can use virtualization. There are two solutions."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:291
+#: en/user_basics.ssi:293
msgid "3~ Qemu"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:293
+#: en/user_basics.ssi:295
msgid "_* Install qemu, bridge-utils, sudo."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:295
+#: en/user_basics.ssi:297
msgid "Edit /etc/qemu-ifup:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:306
+#: en/user_basics.ssi:308
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...\" "
@@ -775,62 +792,62 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:310
+#: en/user_basics.ssi:312
msgid "Get, or build a grub-floppy-netboot (in the svn)."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:312
+#: en/user_basics.ssi:314
msgid "Launch qemu with \"-net nic,vlan=0 -net tap,vlan=0,ifname=tun0\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:314
+#: en/user_basics.ssi:316
msgid "3~ VMWare Player"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:316
+#: en/user_basics.ssi:318
msgid "_* Install VMWare Player (\"free as in beer\" edition)"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:318
+#: en/user_basics.ssi:320
msgid ""
"_* Create a PXETester directory, and create a text file called pxe.vwx inside"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:320
+#: en/user_basics.ssi:322
msgid "_* Paste this text inside:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:328
+#: en/user_basics.ssi:330
msgid ""
"#!/usr/bin/vmware config.version = \"8\" virtualHW.version = \"4\" memsize = "
"\"512\" MemAllowAutoScaleDown = \"FALSE\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:334
+#: en/user_basics.ssi:336
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:337
+#: en/user_basics.ssi:339
msgid "ethernet0.present = \"TRUE\" ethernet0.addressType = \"generated\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:340
+#: en/user_basics.ssi:342
msgid "displayName = \"Test Boot PXE\" guestOS = \"other\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:345
+#: en/user_basics.ssi:347
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 "
@@ -838,19 +855,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:349
+#: en/user_basics.ssi:351
msgid ""
"_* You can play with this configuration file (i.e. change memory limit to "
"256)"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:351
+#: en/user_basics.ssi:353
msgid ""
"_* Double click on this file (or run VMWare player and select this file)."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:352
+#: en/user_basics.ssi:354
msgid "_* When running just press space if that strange question comes up..."
msgstr ""
diff --git a/manual/po/de/user_customization-contents.ssi.po b/manual/po/de/user_customization-contents.ssi.po
index 66e39e1..3c160cd 100644
--- a/manual/po/de/user_customization-contents.ssi.po
+++ b/manual/po/de/user_customization-contents.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-11-27 09:40-0400\n"
"PO-Revision-Date: 2010-10-03 20:30+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -17,9 +17,9 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. type: Plain text
-#: en/about_manual.ssi:80 en/about_manual.ssi:88 en/about_manual.ssi:96
-#: en/about_manual.ssi:108 en/about_manual.ssi:121 en/about_manual.ssi:134
-#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
+#: en/about_manual.ssi:112 en/about_manual.ssi:125 en/about_manual.ssi:138
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
@@ -39,47 +39,49 @@ msgstr ""
#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
#: en/other_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/other_procedures.ssi:58 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:142 en/user_basics.ssi:154 en/user_basics.ssi:162
+#: en/user_basics.ssi:170 en/user_basics.ssi:184 en/user_basics.ssi:192
+#: en/user_basics.ssi:202 en/user_basics.ssi:222 en/user_basics.ssi:255
+#: en/user_basics.ssi:271 en/user_basics.ssi:279 en/user_basics.ssi:299
+#: en/user_basics.ssi:324 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
#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
-#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
-#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
-#: en/user_customization-packages.ssi:103
-#: en/user_customization-packages.ssi:111
-#: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:104
-#: en/user_installation.ssi:118 en/user_installation.ssi:135
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
+#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
+#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
+#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:133
+#: en/user_customization-packages.ssi:143
+#: en/user_customization-packages.ssi:153
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:261
+#: en/user_customization-packages.ssi:273
+#: en/user_customization-packages.ssi:283 en/user_examples.ssi:12
+#: en/user_examples.ssi:27 en/user_examples.ssi:37 en/user_examples.ssi:75
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:76 en/user_installation.ssi:84
+#: en/user_installation.ssi:104 en/user_installation.ssi:118
+#: en/user_installation.ssi:135 en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
-#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:46
-#: en/user_overview.ssi:90 en/user_overview.ssi:98
+#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:36
+#: en/user_overview.ssi:80 en/user_overview.ssi:88
msgid "code{"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:121 en/about_manual.ssi:134 en/about_manual.ssi:142
+#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:165
#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
@@ -99,46 +101,48 @@ msgstr ""
#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
-#: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
-#: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
-#: en/other_use-cases.ssi:137 en/user_basics.ssi:38 en/user_basics.ssi: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/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:148
+#: en/user_basics.ssi:158 en/user_basics.ssi:166 en/user_basics.ssi:174
+#: en/user_basics.ssi:188 en/user_basics.ssi:196 en/user_basics.ssi:206
+#: en/user_basics.ssi:247 en/user_basics.ssi:259 en/user_basics.ssi:275
+#: en/user_basics.ssi:283 en/user_basics.ssi:310 en/user_basics.ssi:349
#: 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
#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
-#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
-#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
-#: en/user_customization-packages.ssi:107
-#: en/user_customization-packages.ssi:115
-#: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:172
-#: en/user_customization-packages.ssi:182
-#: en/user_customization-packages.ssi:192
-#: en/user_customization-packages.ssi:202 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:88 en/user_installation.ssi:108
-#: en/user_installation.ssi:123 en/user_installation.ssi:138
-#: en/user_managing_a_configuration.ssi:31
+#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
+#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
+#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
+#: en/user_customization-packages.ssi:125
+#: en/user_customization-packages.ssi:139
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:159
+#: en/user_customization-packages.ssi:169
+#: en/user_customization-packages.ssi:181
+#: en/user_customization-packages.ssi:197
+#: en/user_customization-packages.ssi:265
+#: en/user_customization-packages.ssi:277
+#: en/user_customization-packages.ssi:287 en/user_examples.ssi:17
+#: en/user_examples.ssi:31 en/user_examples.ssi:41 en/user_examples.ssi:84
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:72
+#: en/user_installation.ssi:80 en/user_installation.ssi:88
+#: en/user_installation.ssi:108 en/user_installation.ssi:123
+#: en/user_installation.ssi:138 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
-#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:84
-#: en/user_overview.ssi:94 en/user_overview.ssi:102
+#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:74
+#: en/user_overview.ssi:84 en/user_overview.ssi:92
msgid "}code"
msgstr ""
#. type: Plain text
#: en/user_customization-contents.ssi:2 en/user_customization-overview.ssi:2
-msgid "B~ Customizing contents"
+msgid ":B~ Customizing contents"
msgstr ""
#. type: Plain text
diff --git a/manual/po/de/user_customization-internationalization.ssi.po b/manual/po/de/user_customization-internationalization.ssi.po
index 052e2ca..c0cc38d 100644
--- a/manual/po/de/user_customization-internationalization.ssi.po
+++ b/manual/po/de/user_customization-internationalization.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-28 09:15-0200\n"
+"POT-Creation-Date: 2010-11-27 09:40-0400\n"
"PO-Revision-Date: 2010-10-03 21:43+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -17,9 +17,9 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. type: Plain text
-#: en/about_manual.ssi:80 en/about_manual.ssi:88 en/about_manual.ssi:96
-#: en/about_manual.ssi:108 en/about_manual.ssi:121 en/about_manual.ssi:134
-#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
+#: en/about_manual.ssi:112 en/about_manual.ssi:125 en/about_manual.ssi:138
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
@@ -39,48 +39,49 @@ msgstr ""
#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
#: en/other_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/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/other_procedures.ssi:58 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:142 en/user_basics.ssi:154 en/user_basics.ssi:162
+#: en/user_basics.ssi:170 en/user_basics.ssi:184 en/user_basics.ssi:192
+#: en/user_basics.ssi:202 en/user_basics.ssi:222 en/user_basics.ssi:255
+#: en/user_basics.ssi:271 en/user_basics.ssi:279 en/user_basics.ssi:299
+#: en/user_basics.ssi:324 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
#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
-#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
-#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
-#: en/user_customization-packages.ssi:103
-#: en/user_customization-packages.ssi:111
-#: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:104
-#: en/user_installation.ssi:118 en/user_installation.ssi:135
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
+#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
+#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
+#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:133
+#: en/user_customization-packages.ssi:143
+#: en/user_customization-packages.ssi:153
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:261
+#: en/user_customization-packages.ssi:273
+#: en/user_customization-packages.ssi:283 en/user_examples.ssi:12
+#: en/user_examples.ssi:27 en/user_examples.ssi:37 en/user_examples.ssi:75
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:76 en/user_installation.ssi:84
+#: en/user_installation.ssi:104 en/user_installation.ssi:118
+#: en/user_installation.ssi:135 en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
-#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:46
-#: en/user_overview.ssi:90 en/user_overview.ssi:98
+#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:36
+#: en/user_overview.ssi:80 en/user_overview.ssi:88
msgid "code{"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:121 en/about_manual.ssi:134 en/about_manual.ssi:142
+#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:165
#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
@@ -100,46 +101,48 @@ msgstr ""
#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
-#: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
-#: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
-#: en/other_use-cases.ssi:137 en/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/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:148
+#: en/user_basics.ssi:158 en/user_basics.ssi:166 en/user_basics.ssi:174
+#: en/user_basics.ssi:188 en/user_basics.ssi:196 en/user_basics.ssi:206
+#: en/user_basics.ssi:247 en/user_basics.ssi:259 en/user_basics.ssi:275
+#: en/user_basics.ssi:283 en/user_basics.ssi:310 en/user_basics.ssi:349
+#: 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
#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
-#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
-#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
-#: en/user_customization-packages.ssi:107
-#: en/user_customization-packages.ssi:115
-#: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:172
-#: en/user_customization-packages.ssi:182
-#: en/user_customization-packages.ssi:192
-#: en/user_customization-packages.ssi:202 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:88 en/user_installation.ssi:108
-#: en/user_installation.ssi:123 en/user_installation.ssi:138
-#: en/user_managing_a_configuration.ssi:31
+#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
+#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
+#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
+#: en/user_customization-packages.ssi:125
+#: en/user_customization-packages.ssi:139
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:159
+#: en/user_customization-packages.ssi:169
+#: en/user_customization-packages.ssi:181
+#: en/user_customization-packages.ssi:197
+#: en/user_customization-packages.ssi:265
+#: en/user_customization-packages.ssi:277
+#: en/user_customization-packages.ssi:287 en/user_examples.ssi:17
+#: en/user_examples.ssi:31 en/user_examples.ssi:41 en/user_examples.ssi:84
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:72
+#: en/user_installation.ssi:80 en/user_installation.ssi:88
+#: en/user_installation.ssi:108 en/user_installation.ssi:123
+#: en/user_installation.ssi:138 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
-#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:84
-#: en/user_overview.ssi:94 en/user_overview.ssi:102
+#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:74
+#: en/user_overview.ssi:84 en/user_overview.ssi:92
msgid "}code"
msgstr ""
#. type: Plain text
#: en/user_customization-internationalization.ssi:2
-msgid "B~ Customizing locale and language"
+msgid ":B~ Customizing locale and language"
msgstr ""
#. type: Plain text
diff --git a/manual/po/de/user_customization-overview.ssi.po b/manual/po/de/user_customization-overview.ssi.po
index f05addd..214bd0c 100644
--- a/manual/po/de/user_customization-overview.ssi.po
+++ b/manual/po/de/user_customization-overview.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-11-11 11:58-0400\n"
+"POT-Creation-Date: 2010-11-27 09:40-0400\n"
"PO-Revision-Date: 2010-10-22 07:52-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -18,7 +18,7 @@ msgstr ""
#. type: Plain text
#: en/user_customization-contents.ssi:2 en/user_customization-overview.ssi:2
-msgid "B~ Customizing contents"
+msgid ":B~ Customizing contents"
msgstr ""
#. type: Plain text
diff --git a/manual/po/de/user_examples.ssi.po b/manual/po/de/user_examples.ssi.po
index a41671f..25db497 100644
--- a/manual/po/de/user_examples.ssi.po
+++ b/manual/po/de/user_examples.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-11-04 16:34-0400\n"
+"POT-Creation-Date: 2010-11-27 09:40-0400\n"
"PO-Revision-Date: 2010-11-04 16:34-0400\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -17,9 +17,9 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. type: Plain text
-#: en/about_manual.ssi:80 en/about_manual.ssi:88 en/about_manual.ssi:96
-#: en/about_manual.ssi:108 en/about_manual.ssi:121 en/about_manual.ssi:134
-#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
+#: en/about_manual.ssi:112 en/about_manual.ssi:125 en/about_manual.ssi:138
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
@@ -43,26 +43,30 @@ msgstr ""
#: 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_basics.ssi:142 en/user_basics.ssi:154 en/user_basics.ssi:162
+#: en/user_basics.ssi:170 en/user_basics.ssi:184 en/user_basics.ssi:192
+#: en/user_basics.ssi:202 en/user_basics.ssi:222 en/user_basics.ssi:255
+#: en/user_basics.ssi:271 en/user_basics.ssi:279 en/user_basics.ssi:299
+#: en/user_basics.ssi:324 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
#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
-#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
-#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
-#: en/user_customization-packages.ssi:103
-#: en/user_customization-packages.ssi:111
-#: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_examples.ssi:24
+#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
+#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
+#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
+#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:133
+#: en/user_customization-packages.ssi:143
+#: en/user_customization-packages.ssi:153
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:261
+#: en/user_customization-packages.ssi:273
+#: en/user_customization-packages.ssi:283 en/user_examples.ssi:12
+#: en/user_examples.ssi:27 en/user_examples.ssi:37 en/user_examples.ssi:75
#: en/user_installation.ssi:38 en/user_installation.ssi:46
#: en/user_installation.ssi:56 en/user_installation.ssi:64
#: en/user_installation.ssi:76 en/user_installation.ssi:84
@@ -75,9 +79,9 @@ msgid "code{"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:121 en/about_manual.ssi:134 en/about_manual.ssi:142
+#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:165
#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
@@ -100,27 +104,31 @@ msgstr ""
#: 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_basics.ssi:122 en/user_basics.ssi:132 en/user_basics.ssi:148
+#: en/user_basics.ssi:158 en/user_basics.ssi:166 en/user_basics.ssi:174
+#: en/user_basics.ssi:188 en/user_basics.ssi:196 en/user_basics.ssi:206
+#: en/user_basics.ssi:247 en/user_basics.ssi:259 en/user_basics.ssi:275
+#: en/user_basics.ssi:283 en/user_basics.ssi:310 en/user_basics.ssi:349
#: 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
#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
-#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
-#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
-#: en/user_customization-packages.ssi:107
-#: en/user_customization-packages.ssi:115
-#: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:172
-#: en/user_customization-packages.ssi:182
-#: en/user_customization-packages.ssi:192
-#: en/user_customization-packages.ssi:202 en/user_examples.ssi:33
+#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
+#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
+#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
+#: en/user_customization-packages.ssi:125
+#: en/user_customization-packages.ssi:139
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:159
+#: en/user_customization-packages.ssi:169
+#: en/user_customization-packages.ssi:181
+#: en/user_customization-packages.ssi:197
+#: en/user_customization-packages.ssi:265
+#: en/user_customization-packages.ssi:277
+#: en/user_customization-packages.ssi:287 en/user_examples.ssi:17
+#: en/user_examples.ssi:31 en/user_examples.ssi:41 en/user_examples.ssi:84
#: en/user_installation.ssi:42 en/user_installation.ssi:50
#: en/user_installation.ssi:60 en/user_installation.ssi:72
#: en/user_installation.ssi:80 en/user_installation.ssi:88
@@ -133,95 +141,223 @@ msgid "}code"
msgstr ""
#. type: Plain text
-#: en/other_faq.ssi:85 en/other_faq.ssi:247 en/user_examples.ssi:26
+#: en/other_customization-bootup.ssi:8 en/other_customization-bootup.ssi:14
+#: en/other_customization-bootup.ssi:56 en/other_customization-bootup.ssi:60
+#: en/other_customization-bootup.ssi:64 en/other_customization-bootup.ssi:68
+#: en/other_live-environment.ssi:8 en/other_resources.ssi:8
+#: en/other_success-stories.ssi:7 en/user_examples.ssi:51
+#: en/user_examples.ssi:57
+msgid "FIXME"
+msgstr ""
+
+#. type: Plain text
+#: en/other_faq.ssi:85 en/other_faq.ssi:247 en/user_examples.ssi:77
msgid "#!/bin/sh"
msgstr ""
#. type: Plain text
#: en/user_examples.ssi:2
-msgid "B~ Examples"
+msgid ":B~ Examples"
msgstr ""
#. type: Plain text
#: en/user_examples.ssi:4
-msgid "1~ Use Case Builds"
+msgid "1~examples Examples"
msgstr ""
#. type: Plain text
#: en/user_examples.ssi:6
msgid ""
-"This chapter covers example builds for specific use cases with Debian Live."
+"This chapter covers example builds for specific use cases with Debian Live. "
+"If you are new to building your own Debian Live images, we recommend you "
+"first look at the three tutorials in sequence, as each one teaches new "
+"techniques that will help you use and understand the remaining examples."
msgstr ""
#. type: Plain text
#: en/user_examples.ssi:8
-msgid "2~ VNC Kiosk Client"
+msgid "2~using-the-examples Using the examples"
msgstr ""
#. type: Plain text
#: en/user_examples.ssi:10
+msgid ""
+"Note that for the sake of brevity, in all of these examples we do not "
+"specify a local mirror to use for the build. You can either add the options "
+"to #{lb config}# each time you use the command, or else establish a default "
+"for your build system by creating #{/etc/live/build.conf}# and putting your "
+"preferred mirror in it as in the following example:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:15
+msgid ""
+"LB_MIRROR_BOOTSTRAP=\"http://mirror/debian\" LB_MIRROR_CHROOT=\"http://"
+"mirror/debian\""
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:19
+msgid "2~tutorial-1 Tutorial 1: A standard image"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:21
+#, no-wrap
+msgid "*{Use case:}* Create a simple first image, learning the basics of live-build\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:23
+msgid ""
+"In this tutorial, we will build a default ISO hybrid Debian Live image "
+"containing only base packages (no Xorg) and some Debian Live support "
+"packages, as a first exercise in using live-build."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:25
+msgid "You can't get much simpler than this:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:29
+msgid "$ mkdir tutorial1 ; cd tutorial1 ; lb config"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:33
+msgid ""
+"Examine the contents of the #{config/}# directory if you wish. You will see "
+"stored here a skeletal configuration, ready to customize or, in this case, "
+"use immediately to build a default image."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:35
+msgid ""
+"Now, as superuser, build the image, saving a log as you build with #{tee}#."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:39
+msgid "# lb_build 2>&1 | tee binary.log"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:43
+msgid ""
+"Assuming all goes well, after a while, the current directory will contain #"
+"{binary-hybrid.iso}#. This ISO hybrid image can be booted directly in a "
+"virtual machine as described in {Testing an ISO image with Qemu}#testing-iso-"
+"with-qemu and {Testing an ISO image with virtualbox-ose}#testing-iso-with-"
+"virtualbox, or else imaged onto optical media or a USB flash device as "
+"described in {Burning an ISO image to a physical medium}#burning-iso-image "
+"and {Copying USB/HDD image to a USB stick}#copying-usb-hdd-image, "
+"respectively."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:45
+msgid "2~tutorial-2 Tutorial 2: A web browser utility"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:47
+#, no-wrap
+msgid "*{Use case}* Create a web browser utility image, learning how to apply customizations\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:49
+msgid ""
+"In this tutorial, we will create an image suitable for use as a web browser "
+"utility using a single extra repository, a single package list, a single "
+"extra package, and a single extra file, configured with your locale and "
+"keyboard preferences, thereby introducing the various ways you can customize "
+"Debian Live images."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:53
+msgid "2~tutorial-3 Tutorial 3: A personal travelling companion"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:55
+#, no-wrap
+msgid "*{Use case}* Create a project to build a personal travelling companion image, containing your favourite software to take with you on a USB stick wherever you go, and evolving in successive revisions as your needs and preferences change.\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:59
+msgid "2~ VNC Kiosk Client"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:61
msgid "Create an image with live-build to boot directly to a VNC server."
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:12
+#: en/user_examples.ssi:63
msgid "_* Make a build directory: #{$ mkdir vncBuild}#"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:14
+#: en/user_examples.ssi:65
msgid "_* Move to the build directory: #{$ cd vncBuild}#"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:16
+#: en/user_examples.ssi:67
msgid ""
"Example to config the build directory to include gdm metacity "
"xtightvncviewer: #{$ lb config --packages \"gdm3 metacity xtightvncviewer\"}#"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:18
+#: en/user_examples.ssi:69
msgid ""
"Create a folder /etc/skel folder for a custom .xsession for the default "
"user: #{$ mkdir -p config/chroot_local-includes/etc/skel}#"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:20
+#: en/user_examples.ssi:71
msgid ""
"Create the .xsession for the default user: #{$ touch config/chroot_local-"
"includes/etc/skel/.xsession}#"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:22
+#: en/user_examples.ssi:73
msgid ""
"Edit the .xsession file to launch metacity and start xvncviewer with "
"something similar to the below:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:29
+#: en/user_examples.ssi:80
msgid "/usr/bin/metacity & /usr/bin/vncviewer xxx.xxx.xxx.xxx:PORT"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:31
+#: en/user_examples.ssi:82
msgid "exit"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:35
+#: en/user_examples.ssi:86
msgid "_* Build the image: #{# lb build}#"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:37
+#: en/user_examples.ssi:88
msgid "_* Enjoy."
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:39
+#: en/user_examples.ssi:90
msgid "2~ Next Example FIXME"
msgstr ""
diff --git a/manual/po/fr/about_manual.ssi.po b/manual/po/fr/about_manual.ssi.po
index 0f1d113..e1c04bb 100644
--- a/manual/po/fr/about_manual.ssi.po
+++ b/manual/po/fr/about_manual.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0~a8\n"
-"POT-Creation-Date: 2010-11-25 16:53+0100\n"
+"POT-Creation-Date: 2010-11-27 09:40-0400\n"
"PO-Revision-Date: 2010-10-27 23:14+0200\n"
"Last-Translator: Creak <romain.failliot at foolstep.com>\n"
"Language-Team: Français <debian-live at lists.debian.org>\n"
@@ -59,11 +59,37 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:10
+msgid "2~ For the impatient"
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:12
+msgid ""
+"While we believe that everything in this manual is important to at least "
+"some of our users, we realize it is a lot of material to cover and that you "
+"may wish to experience early success using the software before delving into "
+"the details. Therefore, we have provided three tutorials in the {Examples}"
+"#examples section designed to teach you image building and customization "
+"basics. Read {Using the examples}#using-the-examples first, followed by "
+"{Tutorial 1: A standard image}#tutorial-1, {Tutorial 2: A web browser "
+"utility}#tutorial-2 and finally {Tutorial 3: A personal travelling companion}"
+"#tutorial-3. By the end of these tutorials, you will have a taste of what "
+"can be done with Debian Live. We encourage you to return to more in-depth "
+"study of the manual, perhaps next reading {The basics}#the-basics, skimming "
+"or skipping {Building a netboot image}#building-netboot-image, and finishing "
+"by reading the {Customization overview}#customization-overview and the "
+"chapters that follow it. By this point, we hope you are thoroughly excited "
+"by what can be done with Debian Live and motivated to read the rest of the "
+"manual, cover-to-cover."
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:14
msgid "2~terms Terms"
msgstr "2~terms Terminologie"
#. type: Plain text
-#: en/about_manual.ssi:12
+#: en/about_manual.ssi:16
msgid ""
"_* *{Live system}*: An operating system that can boot without installation "
"to a hard drive. Live systems do not alter local operating system(s) or file"
@@ -79,7 +105,7 @@ msgstr ""
"clés USB. Certains peuvent également être démarrés depuis le réseau."
#. type: Plain text
-#: en/about_manual.ssi:14
+#: en/about_manual.ssi:18
msgid ""
"_* *{Debian Live}*: The Debian sub-project which maintains the live-boot, "
"live-build, live-config, and live-manual packages."
@@ -88,7 +114,7 @@ msgstr ""
"boot, live-build, live-config, et live-manual."
#. type: Plain text
-#: en/about_manual.ssi:16
+#: en/about_manual.ssi:20
msgid ""
"_* *{Debian Live system}*: A live system that uses software from the Debian "
"operating system that may be booted from CDs, DVDs, USB sticks, over the "
@@ -101,20 +127,20 @@ msgstr ""
"l'aide du paramètre de démarrage #{fetch=URL}#)."
#. type: Plain text
-#: en/about_manual.ssi:18
+#: en/about_manual.ssi:22
msgid "_* *{Host system}*: The environment used to create the live system."
msgstr ""
"_* *{Système hôte}*: L'environnement utilisé pour créer le système live."
#. type: Plain text
-#: en/about_manual.ssi:20
+#: en/about_manual.ssi:24
msgid "_* *{Target system}*: The environment used to run the live system."
msgstr ""
"_* *{Système de destination}*: L'environnement utilisé pour faire tourner le "
"système live."
#. type: Plain text
-#: en/about_manual.ssi:22
+#: en/about_manual.ssi:26
msgid ""
"_* *{live-boot}*: A collection of scripts used to boot live systems. live-"
"boot was formerly a part of live-initramfs."
@@ -123,7 +149,7 @@ msgstr ""
"systèmes live. live-boot faisait initialement partie de live-initramfs."
#. type: Plain text
-#: en/about_manual.ssi:24
+#: en/about_manual.ssi:28
msgid ""
"_* *{live-build}*: A collection of scripts used to build customized Debian "
"Live systems. live-build was formerly known as live-helper, and even earlier "
@@ -134,7 +160,7 @@ msgstr ""
"live-helper."
#. type: Plain text
-#: en/about_manual.ssi:26
+#: en/about_manual.ssi:30
msgid ""
"_* *{live-config}*: A collection of scripts used to configure a live system "
"during the boot process. live-config was formerly a part of live-initramfs."
@@ -144,7 +170,7 @@ msgstr ""
"initialement partie de live-initramfs."
#. type: Plain text
-#: en/about_manual.ssi:28
+#: en/about_manual.ssi:32
msgid ""
"_* *{live-manual}*: This document is maintained in a package called live-"
"manual."
@@ -153,7 +179,7 @@ msgstr ""
"manual."
#. type: Plain text
-#: en/about_manual.ssi:30
+#: en/about_manual.ssi:34
msgid ""
"_* *{Debian Installer (d-i)}*: The official installation system for the "
"Debian distribution."
@@ -162,7 +188,7 @@ msgstr ""
"distribution Debian."
#. type: Plain text
-#: en/about_manual.ssi:32
+#: en/about_manual.ssi:36
msgid ""
"_* *{Boot parameters}*: Parameters that can be entered at the bootloader "
"prompt to influence the kernel or live-config."
@@ -171,7 +197,7 @@ msgstr ""
"l'invite du bootloader afin de modifier le kernel ou live-config."
#. type: Plain text
-#: en/about_manual.ssi:34
+#: en/about_manual.ssi:38
msgid ""
"_* *{chroot}*: The chroot program, chroot(8), enables us to run different "
"instances of the GNU/Linux environment on a single system simultaneously "
@@ -182,7 +208,7 @@ msgstr ""
"sans redémarrage."
#. type: Plain text
-#: en/about_manual.ssi:36
+#: en/about_manual.ssi:40
msgid ""
"_* *{Binary image}*: A file containing the live system, such as binary.iso "
"or binary.img."
@@ -191,7 +217,7 @@ msgstr ""
"iso ou binary.img."
#. type: Plain text
-#: en/about_manual.ssi:38
+#: en/about_manual.ssi:42
msgid ""
"_* *{Target distribution}*: The distribution upon which your live system "
"will be based. This can differ from the distribution of your host system."
@@ -201,7 +227,7 @@ msgstr ""
"votre système hôte."
#. type: Plain text
-#: en/about_manual.ssi:40
+#: en/about_manual.ssi:44
msgid ""
"_* *{Squeeze/Wheezy/Sid (stable/testing/unstable)}*: The stable distribution "
"contains the latest officially released distribution of Debian. The testing "
@@ -220,7 +246,7 @@ msgstr ""
"utilisée par les développeurs et ceux qui aiment le risque."
#. type: Plain text
-#: en/about_manual.ssi:42
+#: en/about_manual.ssi:46
msgid ""
"At the time of writing, Squeeze is the current stable release and Wheezy is "
"the current testing release. Sid will always be a synonym for the unstable "
@@ -230,82 +256,82 @@ msgstr ""
"la version testing. Sid restera toujours synonyme de version unstable."
#. type: Plain text
-#: en/about_manual.ssi:44
+#: en/about_manual.ssi:48
msgid "2~ Authors"
msgstr "2~ Auteurs"
#. type: Plain text
-#: en/about_manual.ssi:46
+#: en/about_manual.ssi:50
msgid "A list of authors (in alphabetical order):"
msgstr "La liste des auteurs (dans l'ordre alphabétique):"
#. type: Plain text
-#: en/about_manual.ssi:48
+#: en/about_manual.ssi:52
msgid "_* Ben Armstrong"
msgstr "_* Ben Armstrong"
#. type: Plain text
-#: en/about_manual.ssi:50
+#: en/about_manual.ssi:54
msgid "_* Brendan Sleight"
msgstr "_* Brendan Sleight"
#. type: Plain text
-#: en/about_manual.ssi:52
+#: en/about_manual.ssi:56
msgid "_* Chris Lamb"
msgstr "_* Chris Lamb"
#. type: Plain text
-#: en/about_manual.ssi:54
+#: en/about_manual.ssi:58
msgid "_* Daniel Baumann"
msgstr "_* Daniel Baumann"
#. type: Plain text
-#: en/about_manual.ssi:56
+#: en/about_manual.ssi:60
msgid "_* Franklin Piat"
msgstr "_* Franklin Piat"
#. type: Plain text
-#: en/about_manual.ssi:58
+#: en/about_manual.ssi:62
msgid "_* Jonas Stein"
msgstr "_* Jonas Stein"
#. type: Plain text
-#: en/about_manual.ssi:60
+#: en/about_manual.ssi:64
msgid "_* Kai Hendry"
msgstr "_* Kai Hendry"
#. type: Plain text
-#: en/about_manual.ssi:62
+#: en/about_manual.ssi:66
msgid "_* Marco Amadori"
msgstr "_* Marco Amadori"
#. type: Plain text
-#: en/about_manual.ssi:64
+#: en/about_manual.ssi:68
msgid "_* Mathieu Geli"
msgstr "_* Mathieu Geli"
#. type: Plain text
-#: en/about_manual.ssi:66
+#: en/about_manual.ssi:70
msgid "_* Matthias Kirschner"
msgstr "_* Matthias Kirschner"
#. type: Plain text
-#: en/about_manual.ssi:68
+#: en/about_manual.ssi:72
msgid "_* Richard Nelson"
msgstr "_* Richard Nelson"
#. type: Plain text
-#: en/about_manual.ssi:70
+#: en/about_manual.ssi:74
msgid "_* Trent W. Buck"
msgstr "_* Trent W. Buck"
#. type: Plain text
-#: en/about_manual.ssi:72
+#: en/about_manual.ssi:76
msgid "2~ Contributing to this document"
msgstr "2~ Contribuer à ce document"
#. type: Plain text
-#: en/about_manual.ssi:74
+#: en/about_manual.ssi:78
msgid ""
"This manual is intended as a community project and all proposals for "
"improvements and contributions are extremely welcome. The preferred way to "
@@ -318,7 +344,7 @@ msgstr ""
"vous plaît voir {Contact}#contact pour plus d'informations."
#. type: Plain text
-#: en/about_manual.ssi:76
+#: en/about_manual.ssi:80
msgid ""
"When submitting a contribution, please clearly identify its copyright holder "
"and include the licensing statement. Note that to be accepted, the "
@@ -331,7 +357,7 @@ msgstr ""
"reste du document, c'est-à-dire la GPL version 3 ou ultérieure."
#. type: Plain text
-#: en/about_manual.ssi:78
+#: en/about_manual.ssi:82
msgid ""
"The sources for this manual are maintained using the Git version control "
"system. You can checkout the latest copy by executing:"
@@ -340,9 +366,9 @@ msgstr ""
"versions Git. Vous pouvez obtenir la dernière copie en exécutant:"
#. type: Plain text
-#: en/about_manual.ssi:80 en/about_manual.ssi:88 en/about_manual.ssi:96
-#: en/about_manual.ssi:108 en/about_manual.ssi:121 en/about_manual.ssi:134
-#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
+#: en/about_manual.ssi:112 en/about_manual.ssi:125 en/about_manual.ssi:138
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
@@ -366,11 +392,11 @@ msgstr ""
#: 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_basics.ssi:142 en/user_basics.ssi:154 en/user_basics.ssi:162
+#: en/user_basics.ssi:170 en/user_basics.ssi:184 en/user_basics.ssi:192
+#: en/user_basics.ssi:202 en/user_basics.ssi:222 en/user_basics.ssi:255
+#: en/user_basics.ssi:271 en/user_basics.ssi:279 en/user_basics.ssi:299
+#: en/user_basics.ssi:324 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
@@ -378,16 +404,18 @@ msgstr ""
#: en/user_customization-internationalization.ssi:38
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:88
-#: en/user_customization-packages.ssi:127
-#: en/user_customization-packages.ssi:137
-#: en/user_customization-packages.ssi:147
-#: en/user_customization-packages.ssi:157
-#: en/user_customization-packages.ssi:171
-#: en/user_customization-packages.ssi:187
-#: en/user_customization-packages.ssi:255
-#: en/user_customization-packages.ssi:267
-#: en/user_customization-packages.ssi:277 en/user_examples.ssi:24
+#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
+#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:133
+#: en/user_customization-packages.ssi:143
+#: en/user_customization-packages.ssi:153
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:261
+#: en/user_customization-packages.ssi:273
+#: en/user_customization-packages.ssi:283 en/user_examples.ssi:12
+#: en/user_examples.ssi:27 en/user_examples.ssi:37 en/user_examples.ssi:75
#: en/user_installation.ssi:38 en/user_installation.ssi:46
#: en/user_installation.ssi:56 en/user_installation.ssi:64
#: en/user_installation.ssi:76 en/user_installation.ssi:84
@@ -400,14 +428,14 @@ msgid "code{"
msgstr "code{"
#. type: Plain text
-#: en/about_manual.ssi:82
+#: en/about_manual.ssi:86
msgid "$ git clone git://live.debian.net/git/live-manual.git"
msgstr "$ git clone git://live.debian.net/git/live-manual.git"
#. type: Plain text
-#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:121 en/about_manual.ssi:134 en/about_manual.ssi:142
+#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:165
#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
@@ -430,11 +458,11 @@ msgstr "$ git clone git://live.debian.net/git/live-manual.git"
#: 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_basics.ssi:122 en/user_basics.ssi:132 en/user_basics.ssi:148
+#: en/user_basics.ssi:158 en/user_basics.ssi:166 en/user_basics.ssi:174
+#: en/user_basics.ssi:188 en/user_basics.ssi:196 en/user_basics.ssi:206
+#: en/user_basics.ssi:247 en/user_basics.ssi:259 en/user_basics.ssi:275
+#: en/user_basics.ssi:283 en/user_basics.ssi:310 en/user_basics.ssi:349
#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
#: en/user_customization-contents.ssi:70
#: en/user_customization-internationalization.ssi:14
@@ -443,16 +471,18 @@ msgstr "$ git clone git://live.debian.net/git/live-manual.git"
#: en/user_customization-internationalization.ssi:42
#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
-#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:92
-#: en/user_customization-packages.ssi:133
-#: en/user_customization-packages.ssi:143
-#: en/user_customization-packages.ssi:153
-#: en/user_customization-packages.ssi:163
-#: en/user_customization-packages.ssi:175
-#: en/user_customization-packages.ssi:191
-#: en/user_customization-packages.ssi:259
-#: en/user_customization-packages.ssi:271
-#: en/user_customization-packages.ssi:281 en/user_examples.ssi:33
+#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
+#: en/user_customization-packages.ssi:125
+#: en/user_customization-packages.ssi:139
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:159
+#: en/user_customization-packages.ssi:169
+#: en/user_customization-packages.ssi:181
+#: en/user_customization-packages.ssi:197
+#: en/user_customization-packages.ssi:265
+#: en/user_customization-packages.ssi:277
+#: en/user_customization-packages.ssi:287 en/user_examples.ssi:17
+#: en/user_examples.ssi:31 en/user_examples.ssi:41 en/user_examples.ssi:84
#: en/user_installation.ssi:42 en/user_installation.ssi:50
#: en/user_installation.ssi:60 en/user_installation.ssi:72
#: en/user_installation.ssi:80 en/user_installation.ssi:88
@@ -465,7 +495,7 @@ msgid "}code"
msgstr "}code"
#. type: Plain text
-#: en/about_manual.ssi:86
+#: en/about_manual.ssi:90
msgid ""
"Prior to submission of your contribution, please preview your work. To "
"preview the live-manual, ensure the packages needed for building are "
@@ -476,12 +506,12 @@ msgstr ""
"sont installés en exécutant:"
#. type: Plain text
-#: en/about_manual.ssi:90
+#: en/about_manual.ssi:94
msgid "# apt-get install make po4a sisu-complete"
msgstr "# apt-get install make po4a sisu-complete"
#. type: Plain text
-#: en/about_manual.ssi:94
+#: en/about_manual.ssi:98
msgid ""
"You may build the live-manual from the top level directory of your git "
"checkout by executing:"
@@ -490,17 +520,17 @@ msgstr ""
"checkout git en exécutant:"
#. type: Plain text
-#: en/about_manual.ssi:98
+#: en/about_manual.ssi:102
msgid "$ make build"
msgstr "$ make build"
#. type: Plain text
-#: en/about_manual.ssi:102
+#: en/about_manual.ssi:106
msgid "3~ Applying patches"
msgstr "3~ Appliquer des patches"
#. type: Plain text
-#: en/about_manual.ssi:104
+#: en/about_manual.ssi:108
msgid ""
"Directly commiting to the repository is possible by anyone. However, we ask "
"you to send bigger changes to the mailing list to discuss them first. In "
@@ -512,12 +542,12 @@ msgstr ""
"répertoire, les étapes suivantes sont nécessaires."
#. type: Plain text
-#: en/about_manual.ssi:106
+#: en/about_manual.ssi:110
msgid "_* Fetch the public commit key:"
msgstr "_* Téléchargez la clé publique:"
#. type: Plain text
-#: en/about_manual.ssi:115
+#: en/about_manual.ssi:119
#, no-wrap
msgid ""
"$ mkdir -p ~/.ssh/identity.d\n"
@@ -535,12 +565,12 @@ msgstr ""
"$ chmod 0600 ~/.ssh/identity.d/gitosis at live.debian.net*\n"
#. type: Plain text
-#: en/about_manual.ssi:119
+#: en/about_manual.ssi:123
msgid "_* Add the following section to your openssh-client config:"
msgstr "_* Ajoutez la section suivante à votre configuration openssh-client:"
#. type: Plain text
-#: en/about_manual.ssi:128
+#: en/about_manual.ssi:132
#, no-wrap
msgid ""
"$ cat >> ~/.ssh/config << EOF\n"
@@ -558,17 +588,17 @@ msgstr ""
"EOF\n"
#. type: Plain text
-#: en/about_manual.ssi:132
+#: en/about_manual.ssi:136
msgid "_* Checkout a clone of the manual through ssh:"
msgstr "_* Clonez le manuel via ssh:"
#. type: Plain text
-#: en/about_manual.ssi:136
+#: en/about_manual.ssi:140
msgid "$ git clone gitosis at live.debian.net:/live-manual.git"
msgstr "$ git clone gitosis at live.debian.net:/live-manual.git"
#. type: Plain text
-#: en/about_manual.ssi:140
+#: en/about_manual.ssi:144
msgid ""
"_* After editing the files in manual/en/, please call the 'commit' target in "
"the top level directory to sanitize the files and update the translation "
@@ -579,12 +609,12 @@ msgstr ""
"mettre à jour les fichiers de traduction:"
#. type: Plain text
-#: en/about_manual.ssi:144
+#: en/about_manual.ssi:148
msgid "$ make commit"
msgstr "$ make commit"
#. type: Plain text
-#: en/about_manual.ssi:148
+#: en/about_manual.ssi:152
msgid ""
"_* After sanitizing commit the changes. Write commit messages, that consist "
"of full useful sentences, starting with a capital letter and ending with a "
@@ -597,16 +627,16 @@ msgstr ""
"Removing/Correcting/':"
#. type: Plain text
-#: en/about_manual.ssi:152
+#: en/about_manual.ssi:156
msgid "$ git commit -a"
msgstr "$ git commit -a"
#. type: Plain text
-#: en/about_manual.ssi:156
+#: en/about_manual.ssi:160
msgid "_* Push the commit to the server:"
msgstr "_* Envoyez votre commit au serveur:"
#. type: Plain text
-#: en/about_manual.ssi:160
+#: en/about_manual.ssi:164
msgid "$ git push"
msgstr "$ git push"
diff --git a/manual/po/fr/live-manual.ssm.po b/manual/po/fr/live-manual.ssm.po
index c0881b4..7bde496 100644
--- a/manual/po/fr/live-manual.ssm.po
+++ b/manual/po/fr/live-manual.ssm.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-11-26 07:06-0400\n"
+"POT-Creation-Date: 2010-11-27 09:40-0400\n"
"PO-Revision-Date: 2010-10-21 07:06-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -45,7 +45,7 @@ msgstr ""
#, no-wrap
msgid ""
"@date:\n"
-" :published: 2010-11-26\n"
+" :published: 2010-11-27\n"
msgstr ""
#. type: Plain text
diff --git a/manual/po/fr/user_basics.ssi.po b/manual/po/fr/user_basics.ssi.po
index bdde68f..b4b18cf 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-11-01 06:47-0200\n"
+"POT-Creation-Date: 2010-11-27 09:40-0400\n"
"PO-Revision-Date: 2010-10-20 06:53-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -17,9 +17,9 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#. type: Plain text
-#: en/about_manual.ssi:80 en/about_manual.ssi:88 en/about_manual.ssi:96
-#: en/about_manual.ssi:108 en/about_manual.ssi:121 en/about_manual.ssi:134
-#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
+#: en/about_manual.ssi:112 en/about_manual.ssi:125 en/about_manual.ssi:138
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
@@ -39,38 +39,39 @@ msgstr ""
#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
#: en/other_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/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/other_procedures.ssi:58 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:142 en/user_basics.ssi:154 en/user_basics.ssi:162
+#: en/user_basics.ssi:170 en/user_basics.ssi:184 en/user_basics.ssi:192
+#: en/user_basics.ssi:202 en/user_basics.ssi:222 en/user_basics.ssi:255
+#: en/user_basics.ssi:271 en/user_basics.ssi:279 en/user_basics.ssi:299
+#: en/user_basics.ssi:324 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
#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
-#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
-#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
-#: en/user_customization-packages.ssi:103
-#: en/user_customization-packages.ssi:111
-#: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:104
-#: en/user_installation.ssi:118 en/user_installation.ssi:135
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
+#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
+#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
+#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:133
+#: en/user_customization-packages.ssi:143
+#: en/user_customization-packages.ssi:153
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:261
+#: en/user_customization-packages.ssi:273
+#: en/user_customization-packages.ssi:283 en/user_examples.ssi:12
+#: en/user_examples.ssi:27 en/user_examples.ssi:37 en/user_examples.ssi:75
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:76 en/user_installation.ssi:84
+#: en/user_installation.ssi:104 en/user_installation.ssi:118
+#: en/user_installation.ssi:135 en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:36
#: en/user_overview.ssi:80 en/user_overview.ssi:88
@@ -78,9 +79,9 @@ msgid "code{"
msgstr "code{"
#. type: Plain text
-#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:121 en/about_manual.ssi:134 en/about_manual.ssi:142
+#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:165
#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
@@ -100,37 +101,39 @@ msgstr "code{"
#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
-#: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
-#: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
-#: en/other_use-cases.ssi:137 en/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/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:148
+#: en/user_basics.ssi:158 en/user_basics.ssi:166 en/user_basics.ssi:174
+#: en/user_basics.ssi:188 en/user_basics.ssi:196 en/user_basics.ssi:206
+#: en/user_basics.ssi:247 en/user_basics.ssi:259 en/user_basics.ssi:275
+#: en/user_basics.ssi:283 en/user_basics.ssi:310 en/user_basics.ssi:349
+#: 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
#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
-#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
-#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
-#: en/user_customization-packages.ssi:107
-#: en/user_customization-packages.ssi:115
-#: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:172
-#: en/user_customization-packages.ssi:182
-#: en/user_customization-packages.ssi:192
-#: en/user_customization-packages.ssi:202 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:88 en/user_installation.ssi:108
-#: en/user_installation.ssi:123 en/user_installation.ssi:138
-#: en/user_managing_a_configuration.ssi:31
+#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
+#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
+#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
+#: en/user_customization-packages.ssi:125
+#: en/user_customization-packages.ssi:139
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:159
+#: en/user_customization-packages.ssi:169
+#: en/user_customization-packages.ssi:181
+#: en/user_customization-packages.ssi:197
+#: en/user_customization-packages.ssi:265
+#: en/user_customization-packages.ssi:277
+#: en/user_customization-packages.ssi:287 en/user_examples.ssi:17
+#: en/user_examples.ssi:31 en/user_examples.ssi:41 en/user_examples.ssi:84
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:72
+#: en/user_installation.ssi:80 en/user_installation.ssi:88
+#: en/user_installation.ssi:108 en/user_installation.ssi:123
+#: en/user_installation.ssi:138 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:74
#: en/user_overview.ssi:84 en/user_overview.ssi:92
@@ -144,14 +147,21 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:4
-msgid "1~ The basics"
+msgid "1~the-basics The basics"
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:6
msgid ""
"This chapter contains a brief overview of the build process and instructions "
-"for booting the various binary image types."
+"for using the default image type, #{iso-hybrid}# with a virtual machine, "
+"optical media or USB portable storage device. The chapter finishes with "
+"instructions for building and using a #{net}# type image, which is a bit "
+"more involved due to the setup required on the server. This is a slightly "
+"advanced topic for anyone who is not familiar already with netbooting, but "
+"is included here because once the setup is done, it is a very convenient way "
+"to test and deploy images for booting on the local network without the "
+"hassle of dealing with image media."
msgstr ""
#. type: Plain text
@@ -269,7 +279,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:44 en/user_basics.ssi:120 en/user_basics.ssi:202
+#: en/user_basics.ssi:44 en/user_basics.ssi:120 en/user_basics.ssi:204
msgid "# lb build"
msgstr ""
@@ -282,7 +292,7 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:50
-msgid "3~ Testing an ISO image with Qemu"
+msgid "3~testing-iso-with-qemu Testing an ISO image with Qemu"
msgstr ""
#. type: Plain text
@@ -291,7 +301,7 @@ msgid "Testing an ISO is simple:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:56 en/user_basics.ssi:142
+#: en/user_basics.ssi:56 en/user_basics.ssi:144
msgid "# apt-get install qemu"
msgstr ""
@@ -302,7 +312,7 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:62
-msgid "3~ Testing an ISO image with virtualbox-ose"
+msgid "3~testing-iso-with-virtualbox Testing an ISO image with virtualbox-ose"
msgstr ""
#. type: Plain text
@@ -343,7 +353,7 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:84
-msgid "3~ Burning an ISO image to a physical medium"
+msgid "3~burning-iso-image Burning an ISO image to a physical medium"
msgstr ""
#. type: Plain text
@@ -382,20 +392,20 @@ msgstr ""
#: 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 "
-"clean command}#lb-clean):"
+"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:104 en/user_basics.ssi:184
+#: en/user_basics.ssi:104 en/user_basics.ssi:186
msgid "$ lb clean --binary"
msgstr ""
#. type: Plain text
#: 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:"
+"Run the #{lb config}# command with the parameters to configure the #{config/}"
+"# hierarchy to create a USB/HDD image type:"
msgstr ""
#. type: Plain text
@@ -443,21 +453,28 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:138
-msgid "3~ Testing a USB/HDD image with Qemu"
+msgid ""
+"Note: As discussed earlier, this same process can be used for #{iso-hybrid}# "
+"type images, (suffixed #{-hybrid.iso}#,) but not #{iso}# type images."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:144
+#: en/user_basics.ssi:140
+msgid "3~testing-usb-hdd-with-qemu Testing a USB/HDD image with Qemu"
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:146
msgid "$ qemu -hda binary.img"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:148
+#: en/user_basics.ssi:150
msgid "3~ Using the space left on a USB stick"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:150
+#: en/user_basics.ssi:152
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}"
@@ -466,45 +483,45 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:154
+#: en/user_basics.ssi:156
msgid "# gparted ${USBSTICK}"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:158
+#: en/user_basics.ssi:160
msgid ""
"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:162
+#: en/user_basics.ssi:164
msgid "# mkfs.ext4 ${USBSTICK}"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:166
+#: en/user_basics.ssi:168
msgid "If you want to use this data partition with Windows, use FAT32."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:170
+#: en/user_basics.ssi:172
msgid "# mkfs.vfat -F 32"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:174
+#: en/user_basics.ssi:176
#, no-wrap
msgid "*{Remember: Every time you install a new binary.img on the stick, all data on the stick will be lost because the partition table is overwritten by the contents of the image.}*\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:176
-msgid "2~ Building a netboot image"
+#: en/user_basics.ssi:178
+msgid "2~building-netboot-image Building a netboot image"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:178
+#: en/user_basics.ssi:180
msgid ""
"The following sequence of commands will create a basic netboot image "
"containing the Debian standard system without X.org. It is suitable for "
@@ -512,28 +529,28 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:180
+#: en/user_basics.ssi:182
msgid ""
"Note: if you performed any previous examples, you will need to clean up your "
"working directory with the #{lb clean}# command:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:188
+#: en/user_basics.ssi:190
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:192
+#: en/user_basics.ssi:194
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:196
+#: en/user_basics.ssi:198
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 "
@@ -543,12 +560,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:198
+#: en/user_basics.ssi:200
msgid "Now build the image with the #{lb build}# command:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:206
+#: en/user_basics.ssi:208
msgid ""
"In a network boot, the client runs a small piece of software which usually "
"resides on the EPROM of the Ethernet card. This program sends a DHCP request "
@@ -559,7 +576,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:208
+#: en/user_basics.ssi:210
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/"
@@ -568,17 +585,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:210
+#: en/user_basics.ssi:212
msgid "We must now configure three services on the server to enable netboot."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:212
+#: en/user_basics.ssi:214
msgid "3~ DHCP server"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:214
+#: en/user_basics.ssi:216
msgid ""
"We must configure our network's DHCP server to be sure to give an IP address "
"to the netbooting client system, and to advertise the location of the PXE "
@@ -586,25 +603,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:216
+#: en/user_basics.ssi:218
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:218 en/user_customization-packages.ssi:153
+#: en/user_basics.ssi:220
msgid "% FIXME"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:222
+#: en/user_basics.ssi:224
#, 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:225
+#: en/user_basics.ssi:227
#, no-wrap
msgid ""
" # IP addresses available for guests\n"
@@ -612,7 +629,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:228
+#: en/user_basics.ssi:230
#, no-wrap
msgid ""
" # allow booting from the net\n"
@@ -620,7 +637,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:233
+#: en/user_basics.ssi:235
#, no-wrap
msgid ""
" # for net booting, server where the first file to be loaded (by TFTP\n"
@@ -630,7 +647,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:237
+#: en/user_basics.ssi:239
#, no-wrap
msgid ""
" # net boot configuration for guests with a PXE client:\n"
@@ -639,7 +656,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:240
+#: en/user_basics.ssi:242
#, no-wrap
msgid ""
" # PXE bootloader (first program to be loaded, by TFTP)\n"
@@ -647,7 +664,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:243
+#: en/user_basics.ssi:245
#, no-wrap
msgid ""
" }\n"
@@ -655,17 +672,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:247
+#: en/user_basics.ssi:249
msgid "3~ TFTP server"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:249
+#: en/user_basics.ssi:251
msgid "This serves the kernel and initial ramdisk to the system at run time."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:251
+#: en/user_basics.ssi:253
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 /"
@@ -673,22 +690,22 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:255
+#: en/user_basics.ssi:257
msgid "dpkg-reconfigure -plow tftpd-hpa"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:259
+#: en/user_basics.ssi:261
msgid "and fill in the new tftp server directory when being asked about it."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:261
+#: en/user_basics.ssi:263
msgid "3~ NFS server"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:263
+#: en/user_basics.ssi:265
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 "
@@ -696,35 +713,35 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:265
+#: en/user_basics.ssi:267
msgid "You need to install the nfs-kernel-server package."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:267
+#: en/user_basics.ssi:269
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:271
+#: en/user_basics.ssi:273
msgid "/srv/debian-live *(ro,async,no_root_squash,no_subtree_check)"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:275
+#: en/user_basics.ssi:277
msgid ""
"and tell the NFS server about this new export with the following command:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:279
+#: en/user_basics.ssi:281
msgid "# exportfs -rv"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:283
+#: en/user_basics.ssi:285
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 "
@@ -733,40 +750,40 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:285
+#: en/user_basics.ssi:287
msgid "3~ Netboot testing HowTo"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:287
+#: en/user_basics.ssi:289
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:289
+#: en/user_basics.ssi:291
msgid ""
"To make our life easier, we can use virtualization. There are two solutions."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:291
+#: en/user_basics.ssi:293
msgid "3~ Qemu"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:293
+#: en/user_basics.ssi:295
msgid "_* Install qemu, bridge-utils, sudo."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:295
+#: en/user_basics.ssi:297
msgid "Edit /etc/qemu-ifup:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:306
+#: en/user_basics.ssi:308
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...\" "
@@ -775,62 +792,62 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:310
+#: en/user_basics.ssi:312
msgid "Get, or build a grub-floppy-netboot (in the svn)."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:312
+#: en/user_basics.ssi:314
msgid "Launch qemu with \"-net nic,vlan=0 -net tap,vlan=0,ifname=tun0\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:314
+#: en/user_basics.ssi:316
msgid "3~ VMWare Player"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:316
+#: en/user_basics.ssi:318
msgid "_* Install VMWare Player (\"free as in beer\" edition)"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:318
+#: en/user_basics.ssi:320
msgid ""
"_* Create a PXETester directory, and create a text file called pxe.vwx inside"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:320
+#: en/user_basics.ssi:322
msgid "_* Paste this text inside:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:328
+#: en/user_basics.ssi:330
msgid ""
"#!/usr/bin/vmware config.version = \"8\" virtualHW.version = \"4\" memsize = "
"\"512\" MemAllowAutoScaleDown = \"FALSE\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:334
+#: en/user_basics.ssi:336
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:337
+#: en/user_basics.ssi:339
msgid "ethernet0.present = \"TRUE\" ethernet0.addressType = \"generated\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:340
+#: en/user_basics.ssi:342
msgid "displayName = \"Test Boot PXE\" guestOS = \"other\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:345
+#: en/user_basics.ssi:347
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 "
@@ -838,19 +855,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:349
+#: en/user_basics.ssi:351
msgid ""
"_* You can play with this configuration file (i.e. change memory limit to "
"256)"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:351
+#: en/user_basics.ssi:353
msgid ""
"_* Double click on this file (or run VMWare player and select this file)."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:352
+#: en/user_basics.ssi:354
msgid "_* When running just press space if that strange question comes up..."
msgstr ""
diff --git a/manual/po/fr/user_customization-contents.ssi.po b/manual/po/fr/user_customization-contents.ssi.po
index 60a7d10..8e52b37 100644
--- a/manual/po/fr/user_customization-contents.ssi.po
+++ b/manual/po/fr/user_customization-contents.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-11-27 09:40-0400\n"
"PO-Revision-Date: 2010-10-16 14:45-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -17,9 +17,9 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#. type: Plain text
-#: en/about_manual.ssi:80 en/about_manual.ssi:88 en/about_manual.ssi:96
-#: en/about_manual.ssi:108 en/about_manual.ssi:121 en/about_manual.ssi:134
-#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
+#: en/about_manual.ssi:112 en/about_manual.ssi:125 en/about_manual.ssi:138
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
@@ -39,47 +39,49 @@ msgstr ""
#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
#: en/other_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/other_procedures.ssi:58 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:142 en/user_basics.ssi:154 en/user_basics.ssi:162
+#: en/user_basics.ssi:170 en/user_basics.ssi:184 en/user_basics.ssi:192
+#: en/user_basics.ssi:202 en/user_basics.ssi:222 en/user_basics.ssi:255
+#: en/user_basics.ssi:271 en/user_basics.ssi:279 en/user_basics.ssi:299
+#: en/user_basics.ssi:324 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
#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
-#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
-#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
-#: en/user_customization-packages.ssi:103
-#: en/user_customization-packages.ssi:111
-#: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:104
-#: en/user_installation.ssi:118 en/user_installation.ssi:135
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
+#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
+#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
+#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:133
+#: en/user_customization-packages.ssi:143
+#: en/user_customization-packages.ssi:153
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:261
+#: en/user_customization-packages.ssi:273
+#: en/user_customization-packages.ssi:283 en/user_examples.ssi:12
+#: en/user_examples.ssi:27 en/user_examples.ssi:37 en/user_examples.ssi:75
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:76 en/user_installation.ssi:84
+#: en/user_installation.ssi:104 en/user_installation.ssi:118
+#: en/user_installation.ssi:135 en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
-#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:46
-#: en/user_overview.ssi:90 en/user_overview.ssi:98
+#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:36
+#: en/user_overview.ssi:80 en/user_overview.ssi:88
msgid "code{"
msgstr "code{"
#. type: Plain text
-#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:121 en/about_manual.ssi:134 en/about_manual.ssi:142
+#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:165
#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
@@ -99,46 +101,48 @@ msgstr "code{"
#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
-#: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
-#: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
-#: en/other_use-cases.ssi:137 en/user_basics.ssi:38 en/user_basics.ssi: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/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:148
+#: en/user_basics.ssi:158 en/user_basics.ssi:166 en/user_basics.ssi:174
+#: en/user_basics.ssi:188 en/user_basics.ssi:196 en/user_basics.ssi:206
+#: en/user_basics.ssi:247 en/user_basics.ssi:259 en/user_basics.ssi:275
+#: en/user_basics.ssi:283 en/user_basics.ssi:310 en/user_basics.ssi:349
#: 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
#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
-#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
-#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
-#: en/user_customization-packages.ssi:107
-#: en/user_customization-packages.ssi:115
-#: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:172
-#: en/user_customization-packages.ssi:182
-#: en/user_customization-packages.ssi:192
-#: en/user_customization-packages.ssi:202 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:88 en/user_installation.ssi:108
-#: en/user_installation.ssi:123 en/user_installation.ssi:138
-#: en/user_managing_a_configuration.ssi:31
+#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
+#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
+#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
+#: en/user_customization-packages.ssi:125
+#: en/user_customization-packages.ssi:139
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:159
+#: en/user_customization-packages.ssi:169
+#: en/user_customization-packages.ssi:181
+#: en/user_customization-packages.ssi:197
+#: en/user_customization-packages.ssi:265
+#: en/user_customization-packages.ssi:277
+#: en/user_customization-packages.ssi:287 en/user_examples.ssi:17
+#: en/user_examples.ssi:31 en/user_examples.ssi:41 en/user_examples.ssi:84
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:72
+#: en/user_installation.ssi:80 en/user_installation.ssi:88
+#: en/user_installation.ssi:108 en/user_installation.ssi:123
+#: en/user_installation.ssi:138 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
-#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:84
-#: en/user_overview.ssi:94 en/user_overview.ssi:102
+#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:74
+#: en/user_overview.ssi:84 en/user_overview.ssi:92
msgid "}code"
msgstr "}code"
#. type: Plain text
#: en/user_customization-contents.ssi:2 en/user_customization-overview.ssi:2
-msgid "B~ Customizing contents"
+msgid ":B~ Customizing contents"
msgstr ""
#. type: Plain text
diff --git a/manual/po/fr/user_customization-internationalization.ssi.po b/manual/po/fr/user_customization-internationalization.ssi.po
index fc5dced..ebc8f6b 100644
--- a/manual/po/fr/user_customization-internationalization.ssi.po
+++ b/manual/po/fr/user_customization-internationalization.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-28 09:15-0200\n"
+"POT-Creation-Date: 2010-11-27 09:40-0400\n"
"PO-Revision-Date: 2010-10-16 15:48-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -17,9 +17,9 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#. type: Plain text
-#: en/about_manual.ssi:80 en/about_manual.ssi:88 en/about_manual.ssi:96
-#: en/about_manual.ssi:108 en/about_manual.ssi:121 en/about_manual.ssi:134
-#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
+#: en/about_manual.ssi:112 en/about_manual.ssi:125 en/about_manual.ssi:138
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
@@ -39,48 +39,49 @@ msgstr ""
#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
#: en/other_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/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/other_procedures.ssi:58 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:142 en/user_basics.ssi:154 en/user_basics.ssi:162
+#: en/user_basics.ssi:170 en/user_basics.ssi:184 en/user_basics.ssi:192
+#: en/user_basics.ssi:202 en/user_basics.ssi:222 en/user_basics.ssi:255
+#: en/user_basics.ssi:271 en/user_basics.ssi:279 en/user_basics.ssi:299
+#: en/user_basics.ssi:324 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
#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
-#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
-#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
-#: en/user_customization-packages.ssi:103
-#: en/user_customization-packages.ssi:111
-#: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:104
-#: en/user_installation.ssi:118 en/user_installation.ssi:135
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
+#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
+#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
+#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:133
+#: en/user_customization-packages.ssi:143
+#: en/user_customization-packages.ssi:153
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:261
+#: en/user_customization-packages.ssi:273
+#: en/user_customization-packages.ssi:283 en/user_examples.ssi:12
+#: en/user_examples.ssi:27 en/user_examples.ssi:37 en/user_examples.ssi:75
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:76 en/user_installation.ssi:84
+#: en/user_installation.ssi:104 en/user_installation.ssi:118
+#: en/user_installation.ssi:135 en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
-#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:46
-#: en/user_overview.ssi:90 en/user_overview.ssi:98
+#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:36
+#: en/user_overview.ssi:80 en/user_overview.ssi:88
msgid "code{"
msgstr "code{"
#. type: Plain text
-#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:121 en/about_manual.ssi:134 en/about_manual.ssi:142
+#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:165
#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
@@ -100,46 +101,48 @@ msgstr "code{"
#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
-#: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
-#: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
-#: en/other_use-cases.ssi:137 en/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/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:148
+#: en/user_basics.ssi:158 en/user_basics.ssi:166 en/user_basics.ssi:174
+#: en/user_basics.ssi:188 en/user_basics.ssi:196 en/user_basics.ssi:206
+#: en/user_basics.ssi:247 en/user_basics.ssi:259 en/user_basics.ssi:275
+#: en/user_basics.ssi:283 en/user_basics.ssi:310 en/user_basics.ssi:349
+#: 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
#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
-#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
-#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
-#: en/user_customization-packages.ssi:107
-#: en/user_customization-packages.ssi:115
-#: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:172
-#: en/user_customization-packages.ssi:182
-#: en/user_customization-packages.ssi:192
-#: en/user_customization-packages.ssi:202 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:88 en/user_installation.ssi:108
-#: en/user_installation.ssi:123 en/user_installation.ssi:138
-#: en/user_managing_a_configuration.ssi:31
+#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
+#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
+#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
+#: en/user_customization-packages.ssi:125
+#: en/user_customization-packages.ssi:139
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:159
+#: en/user_customization-packages.ssi:169
+#: en/user_customization-packages.ssi:181
+#: en/user_customization-packages.ssi:197
+#: en/user_customization-packages.ssi:265
+#: en/user_customization-packages.ssi:277
+#: en/user_customization-packages.ssi:287 en/user_examples.ssi:17
+#: en/user_examples.ssi:31 en/user_examples.ssi:41 en/user_examples.ssi:84
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:72
+#: en/user_installation.ssi:80 en/user_installation.ssi:88
+#: en/user_installation.ssi:108 en/user_installation.ssi:123
+#: en/user_installation.ssi:138 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
-#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:84
-#: en/user_overview.ssi:94 en/user_overview.ssi:102
+#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:74
+#: en/user_overview.ssi:84 en/user_overview.ssi:92
msgid "}code"
msgstr "}code"
#. type: Plain text
#: en/user_customization-internationalization.ssi:2
-msgid "B~ Customizing locale and language"
+msgid ":B~ Customizing locale and language"
msgstr ""
#. type: Plain text
diff --git a/manual/po/fr/user_customization-overview.ssi.po b/manual/po/fr/user_customization-overview.ssi.po
index 58afc9c..d442da7 100644
--- a/manual/po/fr/user_customization-overview.ssi.po
+++ b/manual/po/fr/user_customization-overview.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-11-11 11:58-0400\n"
+"POT-Creation-Date: 2010-11-27 09:40-0400\n"
"PO-Revision-Date: 2010-10-22 07:52-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -18,7 +18,7 @@ msgstr ""
#. type: Plain text
#: en/user_customization-contents.ssi:2 en/user_customization-overview.ssi:2
-msgid "B~ Customizing contents"
+msgid ":B~ Customizing contents"
msgstr ""
#. type: Plain text
diff --git a/manual/po/fr/user_examples.ssi.po b/manual/po/fr/user_examples.ssi.po
index 8e8b835..ff41674 100644
--- a/manual/po/fr/user_examples.ssi.po
+++ b/manual/po/fr/user_examples.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-11-04 16:34-0400\n"
+"POT-Creation-Date: 2010-11-27 09:40-0400\n"
"PO-Revision-Date: 2010-11-04 16:34-0400\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -17,9 +17,9 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#. type: Plain text
-#: en/about_manual.ssi:80 en/about_manual.ssi:88 en/about_manual.ssi:96
-#: en/about_manual.ssi:108 en/about_manual.ssi:121 en/about_manual.ssi:134
-#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
+#: en/about_manual.ssi:112 en/about_manual.ssi:125 en/about_manual.ssi:138
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
@@ -43,26 +43,30 @@ msgstr ""
#: 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_basics.ssi:142 en/user_basics.ssi:154 en/user_basics.ssi:162
+#: en/user_basics.ssi:170 en/user_basics.ssi:184 en/user_basics.ssi:192
+#: en/user_basics.ssi:202 en/user_basics.ssi:222 en/user_basics.ssi:255
+#: en/user_basics.ssi:271 en/user_basics.ssi:279 en/user_basics.ssi:299
+#: en/user_basics.ssi:324 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
#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
-#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
-#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
-#: en/user_customization-packages.ssi:103
-#: en/user_customization-packages.ssi:111
-#: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_examples.ssi:24
+#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
+#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
+#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
+#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:133
+#: en/user_customization-packages.ssi:143
+#: en/user_customization-packages.ssi:153
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:261
+#: en/user_customization-packages.ssi:273
+#: en/user_customization-packages.ssi:283 en/user_examples.ssi:12
+#: en/user_examples.ssi:27 en/user_examples.ssi:37 en/user_examples.ssi:75
#: en/user_installation.ssi:38 en/user_installation.ssi:46
#: en/user_installation.ssi:56 en/user_installation.ssi:64
#: en/user_installation.ssi:76 en/user_installation.ssi:84
@@ -75,9 +79,9 @@ msgid "code{"
msgstr "code{"
#. type: Plain text
-#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:121 en/about_manual.ssi:134 en/about_manual.ssi:142
+#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:165
#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
@@ -100,27 +104,31 @@ msgstr "code{"
#: 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_basics.ssi:122 en/user_basics.ssi:132 en/user_basics.ssi:148
+#: en/user_basics.ssi:158 en/user_basics.ssi:166 en/user_basics.ssi:174
+#: en/user_basics.ssi:188 en/user_basics.ssi:196 en/user_basics.ssi:206
+#: en/user_basics.ssi:247 en/user_basics.ssi:259 en/user_basics.ssi:275
+#: en/user_basics.ssi:283 en/user_basics.ssi:310 en/user_basics.ssi:349
#: 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
#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
-#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
-#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
-#: en/user_customization-packages.ssi:107
-#: en/user_customization-packages.ssi:115
-#: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:172
-#: en/user_customization-packages.ssi:182
-#: en/user_customization-packages.ssi:192
-#: en/user_customization-packages.ssi:202 en/user_examples.ssi:33
+#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
+#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
+#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
+#: en/user_customization-packages.ssi:125
+#: en/user_customization-packages.ssi:139
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:159
+#: en/user_customization-packages.ssi:169
+#: en/user_customization-packages.ssi:181
+#: en/user_customization-packages.ssi:197
+#: en/user_customization-packages.ssi:265
+#: en/user_customization-packages.ssi:277
+#: en/user_customization-packages.ssi:287 en/user_examples.ssi:17
+#: en/user_examples.ssi:31 en/user_examples.ssi:41 en/user_examples.ssi:84
#: en/user_installation.ssi:42 en/user_installation.ssi:50
#: en/user_installation.ssi:60 en/user_installation.ssi:72
#: en/user_installation.ssi:80 en/user_installation.ssi:88
@@ -133,95 +141,223 @@ msgid "}code"
msgstr "}code"
#. type: Plain text
-#: en/other_faq.ssi:85 en/other_faq.ssi:247 en/user_examples.ssi:26
+#: en/other_customization-bootup.ssi:8 en/other_customization-bootup.ssi:14
+#: en/other_customization-bootup.ssi:56 en/other_customization-bootup.ssi:60
+#: en/other_customization-bootup.ssi:64 en/other_customization-bootup.ssi:68
+#: en/other_live-environment.ssi:8 en/other_resources.ssi:8
+#: en/other_success-stories.ssi:7 en/user_examples.ssi:51
+#: en/user_examples.ssi:57
+msgid "FIXME"
+msgstr ""
+
+#. type: Plain text
+#: en/other_faq.ssi:85 en/other_faq.ssi:247 en/user_examples.ssi:77
msgid "#!/bin/sh"
msgstr ""
#. type: Plain text
#: en/user_examples.ssi:2
-msgid "B~ Examples"
+msgid ":B~ Examples"
msgstr ""
#. type: Plain text
#: en/user_examples.ssi:4
-msgid "1~ Use Case Builds"
+msgid "1~examples Examples"
msgstr ""
#. type: Plain text
#: en/user_examples.ssi:6
msgid ""
-"This chapter covers example builds for specific use cases with Debian Live."
+"This chapter covers example builds for specific use cases with Debian Live. "
+"If you are new to building your own Debian Live images, we recommend you "
+"first look at the three tutorials in sequence, as each one teaches new "
+"techniques that will help you use and understand the remaining examples."
msgstr ""
#. type: Plain text
#: en/user_examples.ssi:8
-msgid "2~ VNC Kiosk Client"
+msgid "2~using-the-examples Using the examples"
msgstr ""
#. type: Plain text
#: en/user_examples.ssi:10
+msgid ""
+"Note that for the sake of brevity, in all of these examples we do not "
+"specify a local mirror to use for the build. You can either add the options "
+"to #{lb config}# each time you use the command, or else establish a default "
+"for your build system by creating #{/etc/live/build.conf}# and putting your "
+"preferred mirror in it as in the following example:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:15
+msgid ""
+"LB_MIRROR_BOOTSTRAP=\"http://mirror/debian\" LB_MIRROR_CHROOT=\"http://"
+"mirror/debian\""
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:19
+msgid "2~tutorial-1 Tutorial 1: A standard image"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:21
+#, no-wrap
+msgid "*{Use case:}* Create a simple first image, learning the basics of live-build\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:23
+msgid ""
+"In this tutorial, we will build a default ISO hybrid Debian Live image "
+"containing only base packages (no Xorg) and some Debian Live support "
+"packages, as a first exercise in using live-build."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:25
+msgid "You can't get much simpler than this:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:29
+msgid "$ mkdir tutorial1 ; cd tutorial1 ; lb config"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:33
+msgid ""
+"Examine the contents of the #{config/}# directory if you wish. You will see "
+"stored here a skeletal configuration, ready to customize or, in this case, "
+"use immediately to build a default image."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:35
+msgid ""
+"Now, as superuser, build the image, saving a log as you build with #{tee}#."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:39
+msgid "# lb_build 2>&1 | tee binary.log"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:43
+msgid ""
+"Assuming all goes well, after a while, the current directory will contain #"
+"{binary-hybrid.iso}#. This ISO hybrid image can be booted directly in a "
+"virtual machine as described in {Testing an ISO image with Qemu}#testing-iso-"
+"with-qemu and {Testing an ISO image with virtualbox-ose}#testing-iso-with-"
+"virtualbox, or else imaged onto optical media or a USB flash device as "
+"described in {Burning an ISO image to a physical medium}#burning-iso-image "
+"and {Copying USB/HDD image to a USB stick}#copying-usb-hdd-image, "
+"respectively."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:45
+msgid "2~tutorial-2 Tutorial 2: A web browser utility"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:47
+#, no-wrap
+msgid "*{Use case}* Create a web browser utility image, learning how to apply customizations\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:49
+msgid ""
+"In this tutorial, we will create an image suitable for use as a web browser "
+"utility using a single extra repository, a single package list, a single "
+"extra package, and a single extra file, configured with your locale and "
+"keyboard preferences, thereby introducing the various ways you can customize "
+"Debian Live images."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:53
+msgid "2~tutorial-3 Tutorial 3: A personal travelling companion"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:55
+#, no-wrap
+msgid "*{Use case}* Create a project to build a personal travelling companion image, containing your favourite software to take with you on a USB stick wherever you go, and evolving in successive revisions as your needs and preferences change.\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:59
+msgid "2~ VNC Kiosk Client"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:61
msgid "Create an image with live-build to boot directly to a VNC server."
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:12
+#: en/user_examples.ssi:63
msgid "_* Make a build directory: #{$ mkdir vncBuild}#"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:14
+#: en/user_examples.ssi:65
msgid "_* Move to the build directory: #{$ cd vncBuild}#"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:16
+#: en/user_examples.ssi:67
msgid ""
"Example to config the build directory to include gdm metacity "
"xtightvncviewer: #{$ lb config --packages \"gdm3 metacity xtightvncviewer\"}#"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:18
+#: en/user_examples.ssi:69
msgid ""
"Create a folder /etc/skel folder for a custom .xsession for the default "
"user: #{$ mkdir -p config/chroot_local-includes/etc/skel}#"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:20
+#: en/user_examples.ssi:71
msgid ""
"Create the .xsession for the default user: #{$ touch config/chroot_local-"
"includes/etc/skel/.xsession}#"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:22
+#: en/user_examples.ssi:73
msgid ""
"Edit the .xsession file to launch metacity and start xvncviewer with "
"something similar to the below:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:29
+#: en/user_examples.ssi:80
msgid "/usr/bin/metacity & /usr/bin/vncviewer xxx.xxx.xxx.xxx:PORT"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:31
+#: en/user_examples.ssi:82
msgid "exit"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:35
+#: en/user_examples.ssi:86
msgid "_* Build the image: #{# lb build}#"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:37
+#: en/user_examples.ssi:88
msgid "_* Enjoy."
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:39
+#: en/user_examples.ssi:90
msgid "2~ Next Example FIXME"
msgstr ""
diff --git a/manual/po/pt_BR/about_manual.ssi.po b/manual/po/pt_BR/about_manual.ssi.po
index 5e33855..866825c 100644
--- a/manual/po/pt_BR/about_manual.ssi.po
+++ b/manual/po/pt_BR/about_manual.ssi.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0~a8\n"
-"POT-Creation-Date: 2010-11-25 16:53+0100\n"
+"POT-Creation-Date: 2010-11-27 09:40-0400\n"
"PO-Revision-Date: 2010-10-22 18:16-0300\n"
"Last-Translator: Bruno Gurgel <bruno.gurgel at gmail.com>\n"
"Language-Team: none\n"
@@ -57,11 +57,37 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:10
+msgid "2~ For the impatient"
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:12
+msgid ""
+"While we believe that everything in this manual is important to at least "
+"some of our users, we realize it is a lot of material to cover and that you "
+"may wish to experience early success using the software before delving into "
+"the details. Therefore, we have provided three tutorials in the {Examples}"
+"#examples section designed to teach you image building and customization "
+"basics. Read {Using the examples}#using-the-examples first, followed by "
+"{Tutorial 1: A standard image}#tutorial-1, {Tutorial 2: A web browser "
+"utility}#tutorial-2 and finally {Tutorial 3: A personal travelling companion}"
+"#tutorial-3. By the end of these tutorials, you will have a taste of what "
+"can be done with Debian Live. We encourage you to return to more in-depth "
+"study of the manual, perhaps next reading {The basics}#the-basics, skimming "
+"or skipping {Building a netboot image}#building-netboot-image, and finishing "
+"by reading the {Customization overview}#customization-overview and the "
+"chapters that follow it. By this point, we hope you are thoroughly excited "
+"by what can be done with Debian Live and motivated to read the rest of the "
+"manual, cover-to-cover."
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:14
msgid "2~terms Terms"
msgstr "2~terms Terminologia"
#. type: Plain text
-#: en/about_manual.ssi:12
+#: en/about_manual.ssi:16
msgid ""
"_* *{Live system}*: An operating system that can boot without installation "
"to a hard drive. Live systems do not alter local operating system(s) or file"
@@ -77,7 +103,7 @@ msgstr ""
"(s). Alguns também podem inicializar através da rede."
#. type: Plain text
-#: en/about_manual.ssi:14
+#: en/about_manual.ssi:18
msgid ""
"_* *{Debian Live}*: The Debian sub-project which maintains the live-boot, "
"live-build, live-config, and live-manual packages."
@@ -86,7 +112,7 @@ msgstr ""
"live-build, live-config, e live-manual."
#. type: Plain text
-#: en/about_manual.ssi:16
+#: en/about_manual.ssi:20
msgid ""
"_* *{Debian Live system}*: A live system that uses software from the Debian "
"operating system that may be booted from CDs, DVDs, USB sticks, over the "
@@ -99,17 +125,17 @@ msgstr ""
"(via parametro de boot #{fetch=URL}#)."
#. type: Plain text
-#: en/about_manual.ssi:18
+#: en/about_manual.ssi:22
msgid "_* *{Host system}*: The environment used to create the live system."
msgstr "_* *{Host system}*: O ambiente usado para criar o sistema live."
#. type: Plain text
-#: en/about_manual.ssi:20
+#: en/about_manual.ssi:24
msgid "_* *{Target system}*: The environment used to run the live system."
msgstr "_* *{Target system}*: O ambiente usado para rodar o sistema live."
#. type: Plain text
-#: en/about_manual.ssi:22
+#: en/about_manual.ssi:26
msgid ""
"_* *{live-boot}*: A collection of scripts used to boot live systems. live-"
"boot was formerly a part of live-initramfs."
@@ -118,7 +144,7 @@ msgstr ""
"live. live-boot era formalmente parte do live-initramfs."
#. type: Plain text
-#: en/about_manual.ssi:24
+#: en/about_manual.ssi:28
msgid ""
"_* *{live-build}*: A collection of scripts used to build customized Debian "
"Live systems. live-build was formerly known as live-helper, and even earlier "
@@ -129,7 +155,7 @@ msgstr ""
"helper, e ainda antes conhecido como live-package."
#. type: Plain text
-#: en/about_manual.ssi:26
+#: en/about_manual.ssi:30
msgid ""
"_* *{live-config}*: A collection of scripts used to configure a live system "
"during the boot process. live-config was formerly a part of live-initramfs."
@@ -139,7 +165,7 @@ msgstr ""
"initramfs."
#. type: Plain text
-#: en/about_manual.ssi:28
+#: en/about_manual.ssi:32
msgid ""
"_* *{live-manual}*: This document is maintained in a package called live-"
"manual."
@@ -148,7 +174,7 @@ msgstr ""
"manual."
#. type: Plain text
-#: en/about_manual.ssi:30
+#: en/about_manual.ssi:34
msgid ""
"_* *{Debian Installer (d-i)}*: The official installation system for the "
"Debian distribution."
@@ -157,7 +183,7 @@ msgstr ""
"distribuição Debian."
#. type: Plain text
-#: en/about_manual.ssi:32
+#: en/about_manual.ssi:36
msgid ""
"_* *{Boot parameters}*: Parameters that can be entered at the bootloader "
"prompt to influence the kernel or live-config."
@@ -166,7 +192,7 @@ msgstr ""
"bootloader para influenciar o kernel ou o live-config."
#. type: Plain text
-#: en/about_manual.ssi:34
+#: en/about_manual.ssi:38
msgid ""
"_* *{chroot}*: The chroot program, chroot(8), enables us to run different "
"instances of the GNU/Linux environment on a single system simultaneously "
@@ -177,7 +203,7 @@ msgstr ""
"sistema sem reinicialização."
#. type: Plain text
-#: en/about_manual.ssi:36
+#: en/about_manual.ssi:40
msgid ""
"_* *{Binary image}*: A file containing the live system, such as binary.iso "
"or binary.img."
@@ -186,7 +212,7 @@ msgstr ""
"binary.img."
#. type: Plain text
-#: en/about_manual.ssi:38
+#: en/about_manual.ssi:42
msgid ""
"_* *{Target distribution}*: The distribution upon which your live system "
"will be based. This can differ from the distribution of your host system."
@@ -195,7 +221,7 @@ msgstr ""
"baseado. Isso pode diferir da distribuição do seu sistema host."
#. type: Plain text
-#: en/about_manual.ssi:40
+#: en/about_manual.ssi:44
msgid ""
"_* *{Squeeze/Wheezy/Sid (stable/testing/unstable)}*: The stable distribution "
"contains the latest officially released distribution of Debian. The testing "
@@ -214,7 +240,7 @@ msgstr ""
"distribuição é mantida por desenvolvedores e aqueles que vivem no limite."
#. type: Plain text
-#: en/about_manual.ssi:42
+#: en/about_manual.ssi:46
msgid ""
"At the time of writing, Squeeze is the current stable release and Wheezy is "
"the current testing release. Sid will always be a synonym for the unstable "
@@ -225,82 +251,82 @@ msgstr ""
"(unstable)."
#. type: Plain text
-#: en/about_manual.ssi:44
+#: en/about_manual.ssi:48
msgid "2~ Authors"
msgstr "2~Autores"
#. type: Plain text
-#: en/about_manual.ssi:46
+#: en/about_manual.ssi:50
msgid "A list of authors (in alphabetical order):"
msgstr "A lista de autores (em ordem alfabética)"
#. type: Plain text
-#: en/about_manual.ssi:48
+#: en/about_manual.ssi:52
msgid "_* Ben Armstrong"
msgstr "_* Ben Armstrong"
#. type: Plain text
-#: en/about_manual.ssi:50
+#: en/about_manual.ssi:54
msgid "_* Brendan Sleight"
msgstr "_* Brendan Sleight"
#. type: Plain text
-#: en/about_manual.ssi:52
+#: en/about_manual.ssi:56
msgid "_* Chris Lamb"
msgstr "_* Chris Lamb"
#. type: Plain text
-#: en/about_manual.ssi:54
+#: en/about_manual.ssi:58
msgid "_* Daniel Baumann"
msgstr "_* Daniel Baumann"
#. type: Plain text
-#: en/about_manual.ssi:56
+#: en/about_manual.ssi:60
msgid "_* Franklin Piat"
msgstr "_* Franklin Piat"
#. type: Plain text
-#: en/about_manual.ssi:58
+#: en/about_manual.ssi:62
msgid "_* Jonas Stein"
msgstr "_* Jonas Stein"
#. type: Plain text
-#: en/about_manual.ssi:60
+#: en/about_manual.ssi:64
msgid "_* Kai Hendry"
msgstr "_* Kai Hendry"
#. type: Plain text
-#: en/about_manual.ssi:62
+#: en/about_manual.ssi:66
msgid "_* Marco Amadori"
msgstr "_* Marco Amadori"
#. type: Plain text
-#: en/about_manual.ssi:64
+#: en/about_manual.ssi:68
msgid "_* Mathieu Geli"
msgstr "_* Mathieu Geli"
#. type: Plain text
-#: en/about_manual.ssi:66
+#: en/about_manual.ssi:70
msgid "_* Matthias Kirschner"
msgstr "_* Matthias Kirschner"
#. type: Plain text
-#: en/about_manual.ssi:68
+#: en/about_manual.ssi:72
msgid "_* Richard Nelson"
msgstr "_* Richard Nelson"
#. type: Plain text
-#: en/about_manual.ssi:70
+#: en/about_manual.ssi:74
msgid "_* Trent W. Buck"
msgstr "_* Trent W. Buck"
#. type: Plain text
-#: en/about_manual.ssi:72
+#: en/about_manual.ssi:76
msgid "2~ Contributing to this document"
msgstr "2~ Contribuindo com esse documento"
#. type: Plain text
-#: en/about_manual.ssi:74
+#: en/about_manual.ssi:78
msgid ""
"This manual is intended as a community project and all proposals for "
"improvements and contributions are extremely welcome. The preferred way to "
@@ -309,7 +335,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:76
+#: en/about_manual.ssi:80
msgid ""
"When submitting a contribution, please clearly identify its copyright holder "
"and include the licensing statement. Note that to be accepted, the "
@@ -322,7 +348,7 @@ msgstr ""
"licenças do resto do documento, ou seja, GPL versão 3 ou superior."
#. type: Plain text
-#: en/about_manual.ssi:78
+#: en/about_manual.ssi:82
msgid ""
"The sources for this manual are maintained using the Git version control "
"system. You can checkout the latest copy by executing:"
@@ -331,9 +357,9 @@ msgstr ""
"versão Git. Você pode fazer o checkout da ultima cópia executando:"
#. type: Plain text
-#: en/about_manual.ssi:80 en/about_manual.ssi:88 en/about_manual.ssi:96
-#: en/about_manual.ssi:108 en/about_manual.ssi:121 en/about_manual.ssi:134
-#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
+#: en/about_manual.ssi:112 en/about_manual.ssi:125 en/about_manual.ssi:138
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
@@ -357,11 +383,11 @@ msgstr ""
#: 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_basics.ssi:142 en/user_basics.ssi:154 en/user_basics.ssi:162
+#: en/user_basics.ssi:170 en/user_basics.ssi:184 en/user_basics.ssi:192
+#: en/user_basics.ssi:202 en/user_basics.ssi:222 en/user_basics.ssi:255
+#: en/user_basics.ssi:271 en/user_basics.ssi:279 en/user_basics.ssi:299
+#: en/user_basics.ssi:324 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
@@ -369,16 +395,18 @@ msgstr ""
#: en/user_customization-internationalization.ssi:38
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:88
-#: en/user_customization-packages.ssi:127
-#: en/user_customization-packages.ssi:137
-#: en/user_customization-packages.ssi:147
-#: en/user_customization-packages.ssi:157
-#: en/user_customization-packages.ssi:171
-#: en/user_customization-packages.ssi:187
-#: en/user_customization-packages.ssi:255
-#: en/user_customization-packages.ssi:267
-#: en/user_customization-packages.ssi:277 en/user_examples.ssi:24
+#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
+#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:133
+#: en/user_customization-packages.ssi:143
+#: en/user_customization-packages.ssi:153
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:261
+#: en/user_customization-packages.ssi:273
+#: en/user_customization-packages.ssi:283 en/user_examples.ssi:12
+#: en/user_examples.ssi:27 en/user_examples.ssi:37 en/user_examples.ssi:75
#: en/user_installation.ssi:38 en/user_installation.ssi:46
#: en/user_installation.ssi:56 en/user_installation.ssi:64
#: en/user_installation.ssi:76 en/user_installation.ssi:84
@@ -391,14 +419,14 @@ msgid "code{"
msgstr "code{"
#. type: Plain text
-#: en/about_manual.ssi:82
+#: en/about_manual.ssi:86
msgid "$ git clone git://live.debian.net/git/live-manual.git"
msgstr "$ git clone git://live.debian.net/git/live-manual.git"
#. type: Plain text
-#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:121 en/about_manual.ssi:134 en/about_manual.ssi:142
+#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:165
#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
@@ -421,11 +449,11 @@ msgstr "$ git clone git://live.debian.net/git/live-manual.git"
#: 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_basics.ssi:122 en/user_basics.ssi:132 en/user_basics.ssi:148
+#: en/user_basics.ssi:158 en/user_basics.ssi:166 en/user_basics.ssi:174
+#: en/user_basics.ssi:188 en/user_basics.ssi:196 en/user_basics.ssi:206
+#: en/user_basics.ssi:247 en/user_basics.ssi:259 en/user_basics.ssi:275
+#: en/user_basics.ssi:283 en/user_basics.ssi:310 en/user_basics.ssi:349
#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
#: en/user_customization-contents.ssi:70
#: en/user_customization-internationalization.ssi:14
@@ -434,16 +462,18 @@ msgstr "$ git clone git://live.debian.net/git/live-manual.git"
#: en/user_customization-internationalization.ssi:42
#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
-#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:92
-#: en/user_customization-packages.ssi:133
-#: en/user_customization-packages.ssi:143
-#: en/user_customization-packages.ssi:153
-#: en/user_customization-packages.ssi:163
-#: en/user_customization-packages.ssi:175
-#: en/user_customization-packages.ssi:191
-#: en/user_customization-packages.ssi:259
-#: en/user_customization-packages.ssi:271
-#: en/user_customization-packages.ssi:281 en/user_examples.ssi:33
+#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
+#: en/user_customization-packages.ssi:125
+#: en/user_customization-packages.ssi:139
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:159
+#: en/user_customization-packages.ssi:169
+#: en/user_customization-packages.ssi:181
+#: en/user_customization-packages.ssi:197
+#: en/user_customization-packages.ssi:265
+#: en/user_customization-packages.ssi:277
+#: en/user_customization-packages.ssi:287 en/user_examples.ssi:17
+#: en/user_examples.ssi:31 en/user_examples.ssi:41 en/user_examples.ssi:84
#: en/user_installation.ssi:42 en/user_installation.ssi:50
#: en/user_installation.ssi:60 en/user_installation.ssi:72
#: en/user_installation.ssi:80 en/user_installation.ssi:88
@@ -456,7 +486,7 @@ msgid "}code"
msgstr "}code"
#. type: Plain text
-#: en/about_manual.ssi:86
+#: en/about_manual.ssi:90
msgid ""
"Prior to submission of your contribution, please preview your work. To "
"preview the live-manual, ensure the packages needed for building are "
@@ -467,12 +497,12 @@ msgstr ""
"para contruir estão instalados executando:"
#. type: Plain text
-#: en/about_manual.ssi:90
+#: en/about_manual.ssi:94
msgid "# apt-get install make po4a sisu-complete"
msgstr "# apt-get install make po4a sisu-complete"
#. type: Plain text
-#: en/about_manual.ssi:94
+#: en/about_manual.ssi:98
msgid ""
"You may build the live-manual from the top level directory of your git "
"checkout by executing:"
@@ -481,17 +511,17 @@ msgstr ""
"diretório do seu git checkout executando:"
#. type: Plain text
-#: en/about_manual.ssi:98
+#: en/about_manual.ssi:102
msgid "$ make build"
msgstr "$ make build"
#. type: Plain text
-#: en/about_manual.ssi:102
+#: en/about_manual.ssi:106
msgid "3~ Applying patches"
msgstr "3~ Aplicando patches"
#. type: Plain text
-#: en/about_manual.ssi:104
+#: en/about_manual.ssi:108
msgid ""
"Directly commiting to the repository is possible by anyone. However, we ask "
"you to send bigger changes to the mailing list to discuss them first. In "
@@ -503,12 +533,12 @@ msgstr ""
"necessários:"
#. type: Plain text
-#: en/about_manual.ssi:106
+#: en/about_manual.ssi:110
msgid "_* Fetch the public commit key:"
msgstr "_* Obter a chave publica de commit:"
#. type: Plain text
-#: en/about_manual.ssi:115
+#: en/about_manual.ssi:119
#, no-wrap
msgid ""
"$ mkdir -p ~/.ssh/identity.d\n"
@@ -526,12 +556,12 @@ msgstr ""
"$ chmod 0600 ~/.ssh/identity.d/gitosis at live.debian.net*\n"
#. type: Plain text
-#: en/about_manual.ssi:119
+#: en/about_manual.ssi:123
msgid "_* Add the following section to your openssh-client config:"
msgstr "_* Adicione a seguinte sessão na configuração do seu openssh-client:"
#. type: Plain text
-#: en/about_manual.ssi:128
+#: en/about_manual.ssi:132
#, no-wrap
msgid ""
"$ cat >> ~/.ssh/config << EOF\n"
@@ -549,17 +579,17 @@ msgstr ""
"EOF\n"
#. type: Plain text
-#: en/about_manual.ssi:132
+#: en/about_manual.ssi:136
msgid "_* Checkout a clone of the manual through ssh:"
msgstr "_* Fazer o checkout de um clone do manual por ssh:"
#. type: Plain text
-#: en/about_manual.ssi:136
+#: en/about_manual.ssi:140
msgid "$ git clone gitosis at live.debian.net:/live-manual.git"
msgstr "$ git clone gitosis at live.debian.net:/live-manual.git"
#. type: Plain text
-#: en/about_manual.ssi:140
+#: en/about_manual.ssi:144
msgid ""
"_* After editing the files in manual/en/, please call the 'commit' target in "
"the top level directory to sanitize the files and update the translation "
@@ -570,12 +600,12 @@ msgstr ""
"atualizar os arquivos de tradução. "
#. type: Plain text
-#: en/about_manual.ssi:144
+#: en/about_manual.ssi:148
msgid "$ make commit"
msgstr "$ make commit"
#. type: Plain text
-#: en/about_manual.ssi:148
+#: en/about_manual.ssi:152
msgid ""
"_* After sanitizing commit the changes. Write commit messages, that consist "
"of full useful sentences, starting with a capital letter and ending with a "
@@ -588,16 +618,16 @@ msgstr ""
"Adding/Removing/Correcting/':"
#. type: Plain text
-#: en/about_manual.ssi:152
+#: en/about_manual.ssi:156
msgid "$ git commit -a"
msgstr "$ git commit -a"
#. type: Plain text
-#: en/about_manual.ssi:156
+#: en/about_manual.ssi:160
msgid "_* Push the commit to the server:"
msgstr "_* Enviar as submissões para os servidor."
#. type: Plain text
-#: en/about_manual.ssi:160
+#: en/about_manual.ssi:164
msgid "$ git push"
msgstr "$ git push"
diff --git a/manual/po/pt_BR/live-manual.ssm.po b/manual/po/pt_BR/live-manual.ssm.po
index 30c602e..76baaf3 100644
--- a/manual/po/pt_BR/live-manual.ssm.po
+++ b/manual/po/pt_BR/live-manual.ssm.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-11-26 07:06-0400\n"
+"POT-Creation-Date: 2010-11-27 09:40-0400\n"
"PO-Revision-Date: 2010-10-22 07:52-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -45,7 +45,7 @@ msgstr ""
#, no-wrap
msgid ""
"@date:\n"
-" :published: 2010-11-26\n"
+" :published: 2010-11-27\n"
msgstr ""
#. type: Plain text
diff --git a/manual/po/pt_BR/user_basics.ssi.po b/manual/po/pt_BR/user_basics.ssi.po
index 0ab51a8..665d824 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-11-01 06:47-0200\n"
+"POT-Creation-Date: 2010-11-27 09:40-0400\n"
"PO-Revision-Date: 2010-10-20 06:53-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -17,9 +17,9 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#. type: Plain text
-#: en/about_manual.ssi:80 en/about_manual.ssi:88 en/about_manual.ssi:96
-#: en/about_manual.ssi:108 en/about_manual.ssi:121 en/about_manual.ssi:134
-#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
+#: en/about_manual.ssi:112 en/about_manual.ssi:125 en/about_manual.ssi:138
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
@@ -39,38 +39,39 @@ msgstr ""
#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
#: en/other_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/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/other_procedures.ssi:58 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:142 en/user_basics.ssi:154 en/user_basics.ssi:162
+#: en/user_basics.ssi:170 en/user_basics.ssi:184 en/user_basics.ssi:192
+#: en/user_basics.ssi:202 en/user_basics.ssi:222 en/user_basics.ssi:255
+#: en/user_basics.ssi:271 en/user_basics.ssi:279 en/user_basics.ssi:299
+#: en/user_basics.ssi:324 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
#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
-#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
-#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
-#: en/user_customization-packages.ssi:103
-#: en/user_customization-packages.ssi:111
-#: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:104
-#: en/user_installation.ssi:118 en/user_installation.ssi:135
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
+#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
+#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
+#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:133
+#: en/user_customization-packages.ssi:143
+#: en/user_customization-packages.ssi:153
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:261
+#: en/user_customization-packages.ssi:273
+#: en/user_customization-packages.ssi:283 en/user_examples.ssi:12
+#: en/user_examples.ssi:27 en/user_examples.ssi:37 en/user_examples.ssi:75
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:76 en/user_installation.ssi:84
+#: en/user_installation.ssi:104 en/user_installation.ssi:118
+#: en/user_installation.ssi:135 en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:36
#: en/user_overview.ssi:80 en/user_overview.ssi:88
@@ -78,9 +79,9 @@ msgid "code{"
msgstr "code{"
#. type: Plain text
-#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:121 en/about_manual.ssi:134 en/about_manual.ssi:142
+#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:165
#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
@@ -100,37 +101,39 @@ msgstr "code{"
#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
-#: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
-#: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
-#: en/other_use-cases.ssi:137 en/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/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:148
+#: en/user_basics.ssi:158 en/user_basics.ssi:166 en/user_basics.ssi:174
+#: en/user_basics.ssi:188 en/user_basics.ssi:196 en/user_basics.ssi:206
+#: en/user_basics.ssi:247 en/user_basics.ssi:259 en/user_basics.ssi:275
+#: en/user_basics.ssi:283 en/user_basics.ssi:310 en/user_basics.ssi:349
+#: 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
#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
-#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
-#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
-#: en/user_customization-packages.ssi:107
-#: en/user_customization-packages.ssi:115
-#: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:172
-#: en/user_customization-packages.ssi:182
-#: en/user_customization-packages.ssi:192
-#: en/user_customization-packages.ssi:202 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:88 en/user_installation.ssi:108
-#: en/user_installation.ssi:123 en/user_installation.ssi:138
-#: en/user_managing_a_configuration.ssi:31
+#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
+#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
+#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
+#: en/user_customization-packages.ssi:125
+#: en/user_customization-packages.ssi:139
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:159
+#: en/user_customization-packages.ssi:169
+#: en/user_customization-packages.ssi:181
+#: en/user_customization-packages.ssi:197
+#: en/user_customization-packages.ssi:265
+#: en/user_customization-packages.ssi:277
+#: en/user_customization-packages.ssi:287 en/user_examples.ssi:17
+#: en/user_examples.ssi:31 en/user_examples.ssi:41 en/user_examples.ssi:84
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:72
+#: en/user_installation.ssi:80 en/user_installation.ssi:88
+#: en/user_installation.ssi:108 en/user_installation.ssi:123
+#: en/user_installation.ssi:138 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:74
#: en/user_overview.ssi:84 en/user_overview.ssi:92
@@ -144,14 +147,21 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:4
-msgid "1~ The basics"
+msgid "1~the-basics The basics"
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:6
msgid ""
"This chapter contains a brief overview of the build process and instructions "
-"for booting the various binary image types."
+"for using the default image type, #{iso-hybrid}# with a virtual machine, "
+"optical media or USB portable storage device. The chapter finishes with "
+"instructions for building and using a #{net}# type image, which is a bit "
+"more involved due to the setup required on the server. This is a slightly "
+"advanced topic for anyone who is not familiar already with netbooting, but "
+"is included here because once the setup is done, it is a very convenient way "
+"to test and deploy images for booting on the local network without the "
+"hassle of dealing with image media."
msgstr ""
#. type: Plain text
@@ -269,7 +279,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:44 en/user_basics.ssi:120 en/user_basics.ssi:202
+#: en/user_basics.ssi:44 en/user_basics.ssi:120 en/user_basics.ssi:204
msgid "# lb build"
msgstr ""
@@ -282,7 +292,7 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:50
-msgid "3~ Testing an ISO image with Qemu"
+msgid "3~testing-iso-with-qemu Testing an ISO image with Qemu"
msgstr ""
#. type: Plain text
@@ -291,7 +301,7 @@ msgid "Testing an ISO is simple:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:56 en/user_basics.ssi:142
+#: en/user_basics.ssi:56 en/user_basics.ssi:144
msgid "# apt-get install qemu"
msgstr ""
@@ -302,7 +312,7 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:62
-msgid "3~ Testing an ISO image with virtualbox-ose"
+msgid "3~testing-iso-with-virtualbox Testing an ISO image with virtualbox-ose"
msgstr ""
#. type: Plain text
@@ -343,7 +353,7 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:84
-msgid "3~ Burning an ISO image to a physical medium"
+msgid "3~burning-iso-image Burning an ISO image to a physical medium"
msgstr ""
#. type: Plain text
@@ -382,20 +392,20 @@ msgstr ""
#: 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 "
-"clean command}#lb-clean):"
+"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:104 en/user_basics.ssi:184
+#: en/user_basics.ssi:104 en/user_basics.ssi:186
msgid "$ lb clean --binary"
msgstr ""
#. type: Plain text
#: 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:"
+"Run the #{lb config}# command with the parameters to configure the #{config/}"
+"# hierarchy to create a USB/HDD image type:"
msgstr ""
#. type: Plain text
@@ -443,21 +453,28 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:138
-msgid "3~ Testing a USB/HDD image with Qemu"
+msgid ""
+"Note: As discussed earlier, this same process can be used for #{iso-hybrid}# "
+"type images, (suffixed #{-hybrid.iso}#,) but not #{iso}# type images."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:144
+#: en/user_basics.ssi:140
+msgid "3~testing-usb-hdd-with-qemu Testing a USB/HDD image with Qemu"
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:146
msgid "$ qemu -hda binary.img"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:148
+#: en/user_basics.ssi:150
msgid "3~ Using the space left on a USB stick"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:150
+#: en/user_basics.ssi:152
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}"
@@ -466,45 +483,45 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:154
+#: en/user_basics.ssi:156
msgid "# gparted ${USBSTICK}"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:158
+#: en/user_basics.ssi:160
msgid ""
"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:162
+#: en/user_basics.ssi:164
msgid "# mkfs.ext4 ${USBSTICK}"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:166
+#: en/user_basics.ssi:168
msgid "If you want to use this data partition with Windows, use FAT32."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:170
+#: en/user_basics.ssi:172
msgid "# mkfs.vfat -F 32"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:174
+#: en/user_basics.ssi:176
#, no-wrap
msgid "*{Remember: Every time you install a new binary.img on the stick, all data on the stick will be lost because the partition table is overwritten by the contents of the image.}*\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:176
-msgid "2~ Building a netboot image"
+#: en/user_basics.ssi:178
+msgid "2~building-netboot-image Building a netboot image"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:178
+#: en/user_basics.ssi:180
msgid ""
"The following sequence of commands will create a basic netboot image "
"containing the Debian standard system without X.org. It is suitable for "
@@ -512,28 +529,28 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:180
+#: en/user_basics.ssi:182
msgid ""
"Note: if you performed any previous examples, you will need to clean up your "
"working directory with the #{lb clean}# command:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:188
+#: en/user_basics.ssi:190
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:192
+#: en/user_basics.ssi:194
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:196
+#: en/user_basics.ssi:198
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 "
@@ -543,12 +560,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:198
+#: en/user_basics.ssi:200
msgid "Now build the image with the #{lb build}# command:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:206
+#: en/user_basics.ssi:208
msgid ""
"In a network boot, the client runs a small piece of software which usually "
"resides on the EPROM of the Ethernet card. This program sends a DHCP request "
@@ -559,7 +576,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:208
+#: en/user_basics.ssi:210
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/"
@@ -568,17 +585,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:210
+#: en/user_basics.ssi:212
msgid "We must now configure three services on the server to enable netboot."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:212
+#: en/user_basics.ssi:214
msgid "3~ DHCP server"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:214
+#: en/user_basics.ssi:216
msgid ""
"We must configure our network's DHCP server to be sure to give an IP address "
"to the netbooting client system, and to advertise the location of the PXE "
@@ -586,25 +603,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:216
+#: en/user_basics.ssi:218
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:218 en/user_customization-packages.ssi:153
+#: en/user_basics.ssi:220
msgid "% FIXME"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:222
+#: en/user_basics.ssi:224
#, 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:225
+#: en/user_basics.ssi:227
#, no-wrap
msgid ""
" # IP addresses available for guests\n"
@@ -612,7 +629,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:228
+#: en/user_basics.ssi:230
#, no-wrap
msgid ""
" # allow booting from the net\n"
@@ -620,7 +637,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:233
+#: en/user_basics.ssi:235
#, no-wrap
msgid ""
" # for net booting, server where the first file to be loaded (by TFTP\n"
@@ -630,7 +647,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:237
+#: en/user_basics.ssi:239
#, no-wrap
msgid ""
" # net boot configuration for guests with a PXE client:\n"
@@ -639,7 +656,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:240
+#: en/user_basics.ssi:242
#, no-wrap
msgid ""
" # PXE bootloader (first program to be loaded, by TFTP)\n"
@@ -647,7 +664,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:243
+#: en/user_basics.ssi:245
#, no-wrap
msgid ""
" }\n"
@@ -655,17 +672,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:247
+#: en/user_basics.ssi:249
msgid "3~ TFTP server"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:249
+#: en/user_basics.ssi:251
msgid "This serves the kernel and initial ramdisk to the system at run time."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:251
+#: en/user_basics.ssi:253
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 /"
@@ -673,22 +690,22 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:255
+#: en/user_basics.ssi:257
msgid "dpkg-reconfigure -plow tftpd-hpa"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:259
+#: en/user_basics.ssi:261
msgid "and fill in the new tftp server directory when being asked about it."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:261
+#: en/user_basics.ssi:263
msgid "3~ NFS server"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:263
+#: en/user_basics.ssi:265
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 "
@@ -696,35 +713,35 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:265
+#: en/user_basics.ssi:267
msgid "You need to install the nfs-kernel-server package."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:267
+#: en/user_basics.ssi:269
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:271
+#: en/user_basics.ssi:273
msgid "/srv/debian-live *(ro,async,no_root_squash,no_subtree_check)"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:275
+#: en/user_basics.ssi:277
msgid ""
"and tell the NFS server about this new export with the following command:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:279
+#: en/user_basics.ssi:281
msgid "# exportfs -rv"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:283
+#: en/user_basics.ssi:285
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 "
@@ -733,40 +750,40 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:285
+#: en/user_basics.ssi:287
msgid "3~ Netboot testing HowTo"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:287
+#: en/user_basics.ssi:289
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:289
+#: en/user_basics.ssi:291
msgid ""
"To make our life easier, we can use virtualization. There are two solutions."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:291
+#: en/user_basics.ssi:293
msgid "3~ Qemu"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:293
+#: en/user_basics.ssi:295
msgid "_* Install qemu, bridge-utils, sudo."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:295
+#: en/user_basics.ssi:297
msgid "Edit /etc/qemu-ifup:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:306
+#: en/user_basics.ssi:308
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...\" "
@@ -775,62 +792,62 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:310
+#: en/user_basics.ssi:312
msgid "Get, or build a grub-floppy-netboot (in the svn)."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:312
+#: en/user_basics.ssi:314
msgid "Launch qemu with \"-net nic,vlan=0 -net tap,vlan=0,ifname=tun0\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:314
+#: en/user_basics.ssi:316
msgid "3~ VMWare Player"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:316
+#: en/user_basics.ssi:318
msgid "_* Install VMWare Player (\"free as in beer\" edition)"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:318
+#: en/user_basics.ssi:320
msgid ""
"_* Create a PXETester directory, and create a text file called pxe.vwx inside"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:320
+#: en/user_basics.ssi:322
msgid "_* Paste this text inside:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:328
+#: en/user_basics.ssi:330
msgid ""
"#!/usr/bin/vmware config.version = \"8\" virtualHW.version = \"4\" memsize = "
"\"512\" MemAllowAutoScaleDown = \"FALSE\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:334
+#: en/user_basics.ssi:336
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:337
+#: en/user_basics.ssi:339
msgid "ethernet0.present = \"TRUE\" ethernet0.addressType = \"generated\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:340
+#: en/user_basics.ssi:342
msgid "displayName = \"Test Boot PXE\" guestOS = \"other\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:345
+#: en/user_basics.ssi:347
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 "
@@ -838,19 +855,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:349
+#: en/user_basics.ssi:351
msgid ""
"_* You can play with this configuration file (i.e. change memory limit to "
"256)"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:351
+#: en/user_basics.ssi:353
msgid ""
"_* Double click on this file (or run VMWare player and select this file)."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:352
+#: en/user_basics.ssi:354
msgid "_* When running just press space if that strange question comes up..."
msgstr ""
diff --git a/manual/po/pt_BR/user_customization-contents.ssi.po b/manual/po/pt_BR/user_customization-contents.ssi.po
index 11c52cf..408fb9e 100644
--- a/manual/po/pt_BR/user_customization-contents.ssi.po
+++ b/manual/po/pt_BR/user_customization-contents.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-11-27 09:40-0400\n"
"PO-Revision-Date: 2010-10-22 07:52-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -17,9 +17,9 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#. type: Plain text
-#: en/about_manual.ssi:80 en/about_manual.ssi:88 en/about_manual.ssi:96
-#: en/about_manual.ssi:108 en/about_manual.ssi:121 en/about_manual.ssi:134
-#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
+#: en/about_manual.ssi:112 en/about_manual.ssi:125 en/about_manual.ssi:138
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
@@ -39,47 +39,49 @@ msgstr ""
#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
#: en/other_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/other_procedures.ssi:58 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:142 en/user_basics.ssi:154 en/user_basics.ssi:162
+#: en/user_basics.ssi:170 en/user_basics.ssi:184 en/user_basics.ssi:192
+#: en/user_basics.ssi:202 en/user_basics.ssi:222 en/user_basics.ssi:255
+#: en/user_basics.ssi:271 en/user_basics.ssi:279 en/user_basics.ssi:299
+#: en/user_basics.ssi:324 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
#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
-#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
-#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
-#: en/user_customization-packages.ssi:103
-#: en/user_customization-packages.ssi:111
-#: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:104
-#: en/user_installation.ssi:118 en/user_installation.ssi:135
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
+#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
+#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
+#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:133
+#: en/user_customization-packages.ssi:143
+#: en/user_customization-packages.ssi:153
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:261
+#: en/user_customization-packages.ssi:273
+#: en/user_customization-packages.ssi:283 en/user_examples.ssi:12
+#: en/user_examples.ssi:27 en/user_examples.ssi:37 en/user_examples.ssi:75
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:76 en/user_installation.ssi:84
+#: en/user_installation.ssi:104 en/user_installation.ssi:118
+#: en/user_installation.ssi:135 en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
-#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:46
-#: en/user_overview.ssi:90 en/user_overview.ssi:98
+#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:36
+#: en/user_overview.ssi:80 en/user_overview.ssi:88
msgid "code{"
msgstr "code{"
#. type: Plain text
-#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:121 en/about_manual.ssi:134 en/about_manual.ssi:142
+#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:165
#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
@@ -99,46 +101,48 @@ msgstr "code{"
#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
-#: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
-#: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
-#: en/other_use-cases.ssi:137 en/user_basics.ssi:38 en/user_basics.ssi: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/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:148
+#: en/user_basics.ssi:158 en/user_basics.ssi:166 en/user_basics.ssi:174
+#: en/user_basics.ssi:188 en/user_basics.ssi:196 en/user_basics.ssi:206
+#: en/user_basics.ssi:247 en/user_basics.ssi:259 en/user_basics.ssi:275
+#: en/user_basics.ssi:283 en/user_basics.ssi:310 en/user_basics.ssi:349
#: 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
#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
-#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
-#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
-#: en/user_customization-packages.ssi:107
-#: en/user_customization-packages.ssi:115
-#: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:172
-#: en/user_customization-packages.ssi:182
-#: en/user_customization-packages.ssi:192
-#: en/user_customization-packages.ssi:202 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:88 en/user_installation.ssi:108
-#: en/user_installation.ssi:123 en/user_installation.ssi:138
-#: en/user_managing_a_configuration.ssi:31
+#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
+#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
+#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
+#: en/user_customization-packages.ssi:125
+#: en/user_customization-packages.ssi:139
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:159
+#: en/user_customization-packages.ssi:169
+#: en/user_customization-packages.ssi:181
+#: en/user_customization-packages.ssi:197
+#: en/user_customization-packages.ssi:265
+#: en/user_customization-packages.ssi:277
+#: en/user_customization-packages.ssi:287 en/user_examples.ssi:17
+#: en/user_examples.ssi:31 en/user_examples.ssi:41 en/user_examples.ssi:84
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:72
+#: en/user_installation.ssi:80 en/user_installation.ssi:88
+#: en/user_installation.ssi:108 en/user_installation.ssi:123
+#: en/user_installation.ssi:138 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
-#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:84
-#: en/user_overview.ssi:94 en/user_overview.ssi:102
+#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:74
+#: en/user_overview.ssi:84 en/user_overview.ssi:92
msgid "}code"
msgstr "}code"
#. type: Plain text
#: en/user_customization-contents.ssi:2 en/user_customization-overview.ssi:2
-msgid "B~ Customizing contents"
+msgid ":B~ Customizing contents"
msgstr ""
#. type: Plain text
diff --git a/manual/po/pt_BR/user_customization-internationalization.ssi.po b/manual/po/pt_BR/user_customization-internationalization.ssi.po
index 1b95502..34543e2 100644
--- a/manual/po/pt_BR/user_customization-internationalization.ssi.po
+++ b/manual/po/pt_BR/user_customization-internationalization.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-28 09:15-0200\n"
+"POT-Creation-Date: 2010-11-27 09:40-0400\n"
"PO-Revision-Date: 2010-10-22 08:57-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -17,9 +17,9 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#. type: Plain text
-#: en/about_manual.ssi:80 en/about_manual.ssi:88 en/about_manual.ssi:96
-#: en/about_manual.ssi:108 en/about_manual.ssi:121 en/about_manual.ssi:134
-#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
+#: en/about_manual.ssi:112 en/about_manual.ssi:125 en/about_manual.ssi:138
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
@@ -39,48 +39,49 @@ msgstr ""
#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
#: en/other_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/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/other_procedures.ssi:58 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:142 en/user_basics.ssi:154 en/user_basics.ssi:162
+#: en/user_basics.ssi:170 en/user_basics.ssi:184 en/user_basics.ssi:192
+#: en/user_basics.ssi:202 en/user_basics.ssi:222 en/user_basics.ssi:255
+#: en/user_basics.ssi:271 en/user_basics.ssi:279 en/user_basics.ssi:299
+#: en/user_basics.ssi:324 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
#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
-#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
-#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
-#: en/user_customization-packages.ssi:103
-#: en/user_customization-packages.ssi:111
-#: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:104
-#: en/user_installation.ssi:118 en/user_installation.ssi:135
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
+#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
+#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
+#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:133
+#: en/user_customization-packages.ssi:143
+#: en/user_customization-packages.ssi:153
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:261
+#: en/user_customization-packages.ssi:273
+#: en/user_customization-packages.ssi:283 en/user_examples.ssi:12
+#: en/user_examples.ssi:27 en/user_examples.ssi:37 en/user_examples.ssi:75
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:76 en/user_installation.ssi:84
+#: en/user_installation.ssi:104 en/user_installation.ssi:118
+#: en/user_installation.ssi:135 en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
-#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:46
-#: en/user_overview.ssi:90 en/user_overview.ssi:98
+#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:36
+#: en/user_overview.ssi:80 en/user_overview.ssi:88
msgid "code{"
msgstr "code{"
#. type: Plain text
-#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:121 en/about_manual.ssi:134 en/about_manual.ssi:142
+#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:165
#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
@@ -100,46 +101,48 @@ msgstr "code{"
#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
-#: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
-#: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
-#: en/other_use-cases.ssi:137 en/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/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:148
+#: en/user_basics.ssi:158 en/user_basics.ssi:166 en/user_basics.ssi:174
+#: en/user_basics.ssi:188 en/user_basics.ssi:196 en/user_basics.ssi:206
+#: en/user_basics.ssi:247 en/user_basics.ssi:259 en/user_basics.ssi:275
+#: en/user_basics.ssi:283 en/user_basics.ssi:310 en/user_basics.ssi:349
+#: 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
#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
-#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
-#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
-#: en/user_customization-packages.ssi:107
-#: en/user_customization-packages.ssi:115
-#: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:172
-#: en/user_customization-packages.ssi:182
-#: en/user_customization-packages.ssi:192
-#: en/user_customization-packages.ssi:202 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:88 en/user_installation.ssi:108
-#: en/user_installation.ssi:123 en/user_installation.ssi:138
-#: en/user_managing_a_configuration.ssi:31
+#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
+#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
+#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
+#: en/user_customization-packages.ssi:125
+#: en/user_customization-packages.ssi:139
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:159
+#: en/user_customization-packages.ssi:169
+#: en/user_customization-packages.ssi:181
+#: en/user_customization-packages.ssi:197
+#: en/user_customization-packages.ssi:265
+#: en/user_customization-packages.ssi:277
+#: en/user_customization-packages.ssi:287 en/user_examples.ssi:17
+#: en/user_examples.ssi:31 en/user_examples.ssi:41 en/user_examples.ssi:84
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:72
+#: en/user_installation.ssi:80 en/user_installation.ssi:88
+#: en/user_installation.ssi:108 en/user_installation.ssi:123
+#: en/user_installation.ssi:138 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
-#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:84
-#: en/user_overview.ssi:94 en/user_overview.ssi:102
+#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:74
+#: en/user_overview.ssi:84 en/user_overview.ssi:92
msgid "}code"
msgstr "}code"
#. type: Plain text
#: en/user_customization-internationalization.ssi:2
-msgid "B~ Customizing locale and language"
+msgid ":B~ Customizing locale and language"
msgstr ""
#. type: Plain text
diff --git a/manual/po/pt_BR/user_customization-overview.ssi.po b/manual/po/pt_BR/user_customization-overview.ssi.po
index 96e386a..16412af 100644
--- a/manual/po/pt_BR/user_customization-overview.ssi.po
+++ b/manual/po/pt_BR/user_customization-overview.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-11-11 11:58-0400\n"
+"POT-Creation-Date: 2010-11-27 09:40-0400\n"
"PO-Revision-Date: 2010-10-22 08:57-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -18,7 +18,7 @@ msgstr ""
#. type: Plain text
#: en/user_customization-contents.ssi:2 en/user_customization-overview.ssi:2
-msgid "B~ Customizing contents"
+msgid ":B~ Customizing contents"
msgstr ""
#. type: Plain text
diff --git a/manual/po/pt_BR/user_examples.ssi.po b/manual/po/pt_BR/user_examples.ssi.po
index 2f6115a..accfde6 100644
--- a/manual/po/pt_BR/user_examples.ssi.po
+++ b/manual/po/pt_BR/user_examples.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-11-04 16:34-0400\n"
+"POT-Creation-Date: 2010-11-27 09:40-0400\n"
"PO-Revision-Date: 2010-11-04 16:34-0400\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -17,9 +17,9 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#. type: Plain text
-#: en/about_manual.ssi:80 en/about_manual.ssi:88 en/about_manual.ssi:96
-#: en/about_manual.ssi:108 en/about_manual.ssi:121 en/about_manual.ssi:134
-#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
+#: en/about_manual.ssi:112 en/about_manual.ssi:125 en/about_manual.ssi:138
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
@@ -43,26 +43,30 @@ msgstr ""
#: 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_basics.ssi:142 en/user_basics.ssi:154 en/user_basics.ssi:162
+#: en/user_basics.ssi:170 en/user_basics.ssi:184 en/user_basics.ssi:192
+#: en/user_basics.ssi:202 en/user_basics.ssi:222 en/user_basics.ssi:255
+#: en/user_basics.ssi:271 en/user_basics.ssi:279 en/user_basics.ssi:299
+#: en/user_basics.ssi:324 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
#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
-#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
-#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
-#: en/user_customization-packages.ssi:103
-#: en/user_customization-packages.ssi:111
-#: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_examples.ssi:24
+#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
+#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
+#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
+#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:133
+#: en/user_customization-packages.ssi:143
+#: en/user_customization-packages.ssi:153
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:261
+#: en/user_customization-packages.ssi:273
+#: en/user_customization-packages.ssi:283 en/user_examples.ssi:12
+#: en/user_examples.ssi:27 en/user_examples.ssi:37 en/user_examples.ssi:75
#: en/user_installation.ssi:38 en/user_installation.ssi:46
#: en/user_installation.ssi:56 en/user_installation.ssi:64
#: en/user_installation.ssi:76 en/user_installation.ssi:84
@@ -75,9 +79,9 @@ msgid "code{"
msgstr "code{"
#. type: Plain text
-#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:121 en/about_manual.ssi:134 en/about_manual.ssi:142
+#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:165
#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
@@ -100,27 +104,31 @@ msgstr "code{"
#: 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_basics.ssi:122 en/user_basics.ssi:132 en/user_basics.ssi:148
+#: en/user_basics.ssi:158 en/user_basics.ssi:166 en/user_basics.ssi:174
+#: en/user_basics.ssi:188 en/user_basics.ssi:196 en/user_basics.ssi:206
+#: en/user_basics.ssi:247 en/user_basics.ssi:259 en/user_basics.ssi:275
+#: en/user_basics.ssi:283 en/user_basics.ssi:310 en/user_basics.ssi:349
#: 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
#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
-#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
-#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
-#: en/user_customization-packages.ssi:107
-#: en/user_customization-packages.ssi:115
-#: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:172
-#: en/user_customization-packages.ssi:182
-#: en/user_customization-packages.ssi:192
-#: en/user_customization-packages.ssi:202 en/user_examples.ssi:33
+#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
+#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
+#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
+#: en/user_customization-packages.ssi:125
+#: en/user_customization-packages.ssi:139
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:159
+#: en/user_customization-packages.ssi:169
+#: en/user_customization-packages.ssi:181
+#: en/user_customization-packages.ssi:197
+#: en/user_customization-packages.ssi:265
+#: en/user_customization-packages.ssi:277
+#: en/user_customization-packages.ssi:287 en/user_examples.ssi:17
+#: en/user_examples.ssi:31 en/user_examples.ssi:41 en/user_examples.ssi:84
#: en/user_installation.ssi:42 en/user_installation.ssi:50
#: en/user_installation.ssi:60 en/user_installation.ssi:72
#: en/user_installation.ssi:80 en/user_installation.ssi:88
@@ -133,95 +141,223 @@ msgid "}code"
msgstr "}code"
#. type: Plain text
-#: en/other_faq.ssi:85 en/other_faq.ssi:247 en/user_examples.ssi:26
+#: en/other_customization-bootup.ssi:8 en/other_customization-bootup.ssi:14
+#: en/other_customization-bootup.ssi:56 en/other_customization-bootup.ssi:60
+#: en/other_customization-bootup.ssi:64 en/other_customization-bootup.ssi:68
+#: en/other_live-environment.ssi:8 en/other_resources.ssi:8
+#: en/other_success-stories.ssi:7 en/user_examples.ssi:51
+#: en/user_examples.ssi:57
+msgid "FIXME"
+msgstr ""
+
+#. type: Plain text
+#: en/other_faq.ssi:85 en/other_faq.ssi:247 en/user_examples.ssi:77
msgid "#!/bin/sh"
msgstr ""
#. type: Plain text
#: en/user_examples.ssi:2
-msgid "B~ Examples"
+msgid ":B~ Examples"
msgstr ""
#. type: Plain text
#: en/user_examples.ssi:4
-msgid "1~ Use Case Builds"
+msgid "1~examples Examples"
msgstr ""
#. type: Plain text
#: en/user_examples.ssi:6
msgid ""
-"This chapter covers example builds for specific use cases with Debian Live."
+"This chapter covers example builds for specific use cases with Debian Live. "
+"If you are new to building your own Debian Live images, we recommend you "
+"first look at the three tutorials in sequence, as each one teaches new "
+"techniques that will help you use and understand the remaining examples."
msgstr ""
#. type: Plain text
#: en/user_examples.ssi:8
-msgid "2~ VNC Kiosk Client"
+msgid "2~using-the-examples Using the examples"
msgstr ""
#. type: Plain text
#: en/user_examples.ssi:10
+msgid ""
+"Note that for the sake of brevity, in all of these examples we do not "
+"specify a local mirror to use for the build. You can either add the options "
+"to #{lb config}# each time you use the command, or else establish a default "
+"for your build system by creating #{/etc/live/build.conf}# and putting your "
+"preferred mirror in it as in the following example:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:15
+msgid ""
+"LB_MIRROR_BOOTSTRAP=\"http://mirror/debian\" LB_MIRROR_CHROOT=\"http://"
+"mirror/debian\""
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:19
+msgid "2~tutorial-1 Tutorial 1: A standard image"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:21
+#, no-wrap
+msgid "*{Use case:}* Create a simple first image, learning the basics of live-build\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:23
+msgid ""
+"In this tutorial, we will build a default ISO hybrid Debian Live image "
+"containing only base packages (no Xorg) and some Debian Live support "
+"packages, as a first exercise in using live-build."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:25
+msgid "You can't get much simpler than this:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:29
+msgid "$ mkdir tutorial1 ; cd tutorial1 ; lb config"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:33
+msgid ""
+"Examine the contents of the #{config/}# directory if you wish. You will see "
+"stored here a skeletal configuration, ready to customize or, in this case, "
+"use immediately to build a default image."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:35
+msgid ""
+"Now, as superuser, build the image, saving a log as you build with #{tee}#."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:39
+msgid "# lb_build 2>&1 | tee binary.log"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:43
+msgid ""
+"Assuming all goes well, after a while, the current directory will contain #"
+"{binary-hybrid.iso}#. This ISO hybrid image can be booted directly in a "
+"virtual machine as described in {Testing an ISO image with Qemu}#testing-iso-"
+"with-qemu and {Testing an ISO image with virtualbox-ose}#testing-iso-with-"
+"virtualbox, or else imaged onto optical media or a USB flash device as "
+"described in {Burning an ISO image to a physical medium}#burning-iso-image "
+"and {Copying USB/HDD image to a USB stick}#copying-usb-hdd-image, "
+"respectively."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:45
+msgid "2~tutorial-2 Tutorial 2: A web browser utility"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:47
+#, no-wrap
+msgid "*{Use case}* Create a web browser utility image, learning how to apply customizations\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:49
+msgid ""
+"In this tutorial, we will create an image suitable for use as a web browser "
+"utility using a single extra repository, a single package list, a single "
+"extra package, and a single extra file, configured with your locale and "
+"keyboard preferences, thereby introducing the various ways you can customize "
+"Debian Live images."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:53
+msgid "2~tutorial-3 Tutorial 3: A personal travelling companion"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:55
+#, no-wrap
+msgid "*{Use case}* Create a project to build a personal travelling companion image, containing your favourite software to take with you on a USB stick wherever you go, and evolving in successive revisions as your needs and preferences change.\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:59
+msgid "2~ VNC Kiosk Client"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:61
msgid "Create an image with live-build to boot directly to a VNC server."
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:12
+#: en/user_examples.ssi:63
msgid "_* Make a build directory: #{$ mkdir vncBuild}#"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:14
+#: en/user_examples.ssi:65
msgid "_* Move to the build directory: #{$ cd vncBuild}#"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:16
+#: en/user_examples.ssi:67
msgid ""
"Example to config the build directory to include gdm metacity "
"xtightvncviewer: #{$ lb config --packages \"gdm3 metacity xtightvncviewer\"}#"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:18
+#: en/user_examples.ssi:69
msgid ""
"Create a folder /etc/skel folder for a custom .xsession for the default "
"user: #{$ mkdir -p config/chroot_local-includes/etc/skel}#"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:20
+#: en/user_examples.ssi:71
msgid ""
"Create the .xsession for the default user: #{$ touch config/chroot_local-"
"includes/etc/skel/.xsession}#"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:22
+#: en/user_examples.ssi:73
msgid ""
"Edit the .xsession file to launch metacity and start xvncviewer with "
"something similar to the below:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:29
+#: en/user_examples.ssi:80
msgid "/usr/bin/metacity & /usr/bin/vncviewer xxx.xxx.xxx.xxx:PORT"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:31
+#: en/user_examples.ssi:82
msgid "exit"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:35
+#: en/user_examples.ssi:86
msgid "_* Build the image: #{# lb build}#"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:37
+#: en/user_examples.ssi:88
msgid "_* Enjoy."
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:39
+#: en/user_examples.ssi:90
msgid "2~ Next Example FIXME"
msgstr ""
diff --git a/manual/po/ro/about_manual.ssi.po b/manual/po/ro/about_manual.ssi.po
index 9315c9b..7b242a6 100644
--- a/manual/po/ro/about_manual.ssi.po
+++ b/manual/po/ro/about_manual.ssi.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0~a8\n"
-"POT-Creation-Date: 2010-11-25 16:53+0100\n"
+"POT-Creation-Date: 2010-11-27 09:40-0400\n"
"PO-Revision-Date: 2010-10-23 10:34-0200\n"
"Last-Translator: Eugen Paiuc <linux51 at bluewin.ch>\n"
"Language-Team: none\n"
@@ -54,11 +54,37 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:10
+msgid "2~ For the impatient"
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:12
+msgid ""
+"While we believe that everything in this manual is important to at least "
+"some of our users, we realize it is a lot of material to cover and that you "
+"may wish to experience early success using the software before delving into "
+"the details. Therefore, we have provided three tutorials in the {Examples}"
+"#examples section designed to teach you image building and customization "
+"basics. Read {Using the examples}#using-the-examples first, followed by "
+"{Tutorial 1: A standard image}#tutorial-1, {Tutorial 2: A web browser "
+"utility}#tutorial-2 and finally {Tutorial 3: A personal travelling companion}"
+"#tutorial-3. By the end of these tutorials, you will have a taste of what "
+"can be done with Debian Live. We encourage you to return to more in-depth "
+"study of the manual, perhaps next reading {The basics}#the-basics, skimming "
+"or skipping {Building a netboot image}#building-netboot-image, and finishing "
+"by reading the {Customization overview}#customization-overview and the "
+"chapters that follow it. By this point, we hope you are thoroughly excited "
+"by what can be done with Debian Live and motivated to read the rest of the "
+"manual, cover-to-cover."
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:14
msgid "2~terms Terms"
msgstr "2~terms Termeni"
#. type: Plain text
-#: en/about_manual.ssi:12
+#: en/about_manual.ssi:16
msgid ""
"_* *{Live system}*: An operating system that can boot without installation "
"to a hard drive. Live systems do not alter local operating system(s) or file"
@@ -73,7 +99,7 @@ msgstr ""
"USB. Unele chiar pot porni prin retaua de net."
#. type: Plain text
-#: en/about_manual.ssi:14
+#: en/about_manual.ssi:18
msgid ""
"_* *{Debian Live}*: The Debian sub-project which maintains the live-boot, "
"live-build, live-config, and live-manual packages."
@@ -82,7 +108,7 @@ msgstr ""
"live-build, live-config, si live-manual."
#. type: Plain text
-#: en/about_manual.ssi:16
+#: en/about_manual.ssi:20
msgid ""
"_* *{Debian Live system}*: A live system that uses software from the Debian "
"operating system that may be booted from CDs, DVDs, USB sticks, over the "
@@ -95,19 +121,19 @@ msgstr ""
"parameter #{fetch=URL}#)."
#. type: Plain text
-#: en/about_manual.ssi:18
+#: en/about_manual.ssi:22
msgid "_* *{Host system}*: The environment used to create the live system."
msgstr ""
"_* *{Host system}*: Mediul folosit pentru crearea sistemului live pe un "
"sistem dat."
#. type: Plain text
-#: en/about_manual.ssi:20
+#: en/about_manual.ssi:24
msgid "_* *{Target system}*: The environment used to run the live system."
msgstr "_* *{Target system}*: Mediul folosit pentru rularea sistemului live."
#. type: Plain text
-#: en/about_manual.ssi:22
+#: en/about_manual.ssi:26
msgid ""
"_* *{live-boot}*: A collection of scripts used to boot live systems. live-"
"boot was formerly a part of live-initramfs."
@@ -116,7 +142,7 @@ msgstr ""
"live. live-boot a facul parte formal din live-initramfs."
#. type: Plain text
-#: en/about_manual.ssi:24
+#: en/about_manual.ssi:28
msgid ""
"_* *{live-build}*: A collection of scripts used to build customized Debian "
"Live systems. live-build was formerly known as live-helper, and even earlier "
@@ -127,7 +153,7 @@ msgstr ""
"inainte ca live-package."
#. type: Plain text
-#: en/about_manual.ssi:26
+#: en/about_manual.ssi:30
msgid ""
"_* *{live-config}*: A collection of scripts used to configure a live system "
"during the boot process. live-config was formerly a part of live-initramfs."
@@ -137,7 +163,7 @@ msgstr ""
"din live-initramfs."
#. type: Plain text
-#: en/about_manual.ssi:28
+#: en/about_manual.ssi:32
msgid ""
"_* *{live-manual}*: This document is maintained in a package called live-"
"manual."
@@ -145,7 +171,7 @@ msgstr ""
"_* *{live-manual}*: Acest document face parte din pachetul numit live-manual."
#. type: Plain text
-#: en/about_manual.ssi:30
+#: en/about_manual.ssi:34
msgid ""
"_* *{Debian Installer (d-i)}*: The official installation system for the "
"Debian distribution."
@@ -154,7 +180,7 @@ msgstr ""
"distributia Debian."
#. type: Plain text
-#: en/about_manual.ssi:32
+#: en/about_manual.ssi:36
msgid ""
"_* *{Boot parameters}*: Parameters that can be entered at the bootloader "
"prompt to influence the kernel or live-config."
@@ -163,7 +189,7 @@ msgstr ""
"ului care sa infuenteze kernelul sau live-config."
#. type: Plain text
-#: en/about_manual.ssi:34
+#: en/about_manual.ssi:38
msgid ""
"_* *{chroot}*: The chroot program, chroot(8), enables us to run different "
"instances of the GNU/Linux environment on a single system simultaneously "
@@ -174,7 +200,7 @@ msgstr ""
"necesita o repornire a sistemului."
#. type: Plain text
-#: en/about_manual.ssi:36
+#: en/about_manual.ssi:40
msgid ""
"_* *{Binary image}*: A file containing the live system, such as binary.iso "
"or binary.img."
@@ -183,7 +209,7 @@ msgstr ""
"binary.iso sau binary.img."
#. type: Plain text
-#: en/about_manual.ssi:38
+#: en/about_manual.ssi:42
msgid ""
"_* *{Target distribution}*: The distribution upon which your live system "
"will be based. This can differ from the distribution of your host system."
@@ -192,7 +218,7 @@ msgstr ""
"distributie poate fi diferita de cea a sistemului gazda."
#. type: Plain text
-#: en/about_manual.ssi:40
+#: en/about_manual.ssi:44
msgid ""
"_* *{Squeeze/Wheezy/Sid (stable/testing/unstable)}*: The stable distribution "
"contains the latest officially released distribution of Debian. The testing "
@@ -211,7 +237,7 @@ msgstr ""
"riscul ... ."
#. type: Plain text
-#: en/about_manual.ssi:42
+#: en/about_manual.ssi:46
msgid ""
"At the time of writing, Squeeze is the current stable release and Wheezy is "
"the current testing release. Sid will always be a synonym for the unstable "
@@ -222,82 +248,82 @@ msgstr ""
"unstable."
#. type: Plain text
-#: en/about_manual.ssi:44
+#: en/about_manual.ssi:48
msgid "2~ Authors"
msgstr "2~ Autori"
#. type: Plain text
-#: en/about_manual.ssi:46
+#: en/about_manual.ssi:50
msgid "A list of authors (in alphabetical order):"
msgstr "Lista autorilor (in ordine alfabetica):"
#. type: Plain text
-#: en/about_manual.ssi:48
+#: en/about_manual.ssi:52
msgid "_* Ben Armstrong"
msgstr "_* Ben Armstrong"
#. type: Plain text
-#: en/about_manual.ssi:50
+#: en/about_manual.ssi:54
msgid "_* Brendan Sleight"
msgstr "_* Brendan Sleight"
#. type: Plain text
-#: en/about_manual.ssi:52
+#: en/about_manual.ssi:56
msgid "_* Chris Lamb"
msgstr "_* Chris Lamb"
#. type: Plain text
-#: en/about_manual.ssi:54
+#: en/about_manual.ssi:58
msgid "_* Daniel Baumann"
msgstr "_* Daniel Baumann"
#. type: Plain text
-#: en/about_manual.ssi:56
+#: en/about_manual.ssi:60
msgid "_* Franklin Piat"
msgstr "_* Franklin Piat"
#. type: Plain text
-#: en/about_manual.ssi:58
+#: en/about_manual.ssi:62
msgid "_* Jonas Stein"
msgstr "_* Jonas Stein"
#. type: Plain text
-#: en/about_manual.ssi:60
+#: en/about_manual.ssi:64
msgid "_* Kai Hendry"
msgstr "_* Kai Hendry"
#. type: Plain text
-#: en/about_manual.ssi:62
+#: en/about_manual.ssi:66
msgid "_* Marco Amadori"
msgstr "_* Marco Amadori"
#. type: Plain text
-#: en/about_manual.ssi:64
+#: en/about_manual.ssi:68
msgid "_* Mathieu Geli"
msgstr "_* Mathieu Geli"
#. type: Plain text
-#: en/about_manual.ssi:66
+#: en/about_manual.ssi:70
msgid "_* Matthias Kirschner"
msgstr "_* Matthias Kirschner"
#. type: Plain text
-#: en/about_manual.ssi:68
+#: en/about_manual.ssi:72
msgid "_* Richard Nelson"
msgstr "_* Richard Nelson"
#. type: Plain text
-#: en/about_manual.ssi:70
+#: en/about_manual.ssi:74
msgid "_* Trent W. Buck"
msgstr "_* Trent W. Buck"
#. type: Plain text
-#: en/about_manual.ssi:72
+#: en/about_manual.ssi:76
msgid "2~ Contributing to this document"
msgstr "2~ Cum se poate contribui la acest document"
#. type: Plain text
-#: en/about_manual.ssi:74
+#: en/about_manual.ssi:78
msgid ""
"This manual is intended as a community project and all proposals for "
"improvements and contributions are extremely welcome. The preferred way to "
@@ -310,7 +336,7 @@ msgstr ""
"#contact pentru mai multe informatii."
#. type: Plain text
-#: en/about_manual.ssi:76
+#: en/about_manual.ssi:80
msgid ""
"When submitting a contribution, please clearly identify its copyright holder "
"and include the licensing statement. Note that to be accepted, the "
@@ -323,7 +349,7 @@ msgstr ""
"documentului , adica GPL version 3 or later."
#. type: Plain text
-#: en/about_manual.ssi:78
+#: en/about_manual.ssi:82
msgid ""
"The sources for this manual are maintained using the Git version control "
"system. You can checkout the latest copy by executing:"
@@ -332,9 +358,9 @@ msgstr ""
"ti checkout ultima copie prin executarea :"
#. type: Plain text
-#: en/about_manual.ssi:80 en/about_manual.ssi:88 en/about_manual.ssi:96
-#: en/about_manual.ssi:108 en/about_manual.ssi:121 en/about_manual.ssi:134
-#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
+#: en/about_manual.ssi:112 en/about_manual.ssi:125 en/about_manual.ssi:138
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
@@ -358,11 +384,11 @@ msgstr ""
#: 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_basics.ssi:142 en/user_basics.ssi:154 en/user_basics.ssi:162
+#: en/user_basics.ssi:170 en/user_basics.ssi:184 en/user_basics.ssi:192
+#: en/user_basics.ssi:202 en/user_basics.ssi:222 en/user_basics.ssi:255
+#: en/user_basics.ssi:271 en/user_basics.ssi:279 en/user_basics.ssi:299
+#: en/user_basics.ssi:324 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
@@ -370,16 +396,18 @@ msgstr ""
#: en/user_customization-internationalization.ssi:38
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:88
-#: en/user_customization-packages.ssi:127
-#: en/user_customization-packages.ssi:137
-#: en/user_customization-packages.ssi:147
-#: en/user_customization-packages.ssi:157
-#: en/user_customization-packages.ssi:171
-#: en/user_customization-packages.ssi:187
-#: en/user_customization-packages.ssi:255
-#: en/user_customization-packages.ssi:267
-#: en/user_customization-packages.ssi:277 en/user_examples.ssi:24
+#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
+#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:133
+#: en/user_customization-packages.ssi:143
+#: en/user_customization-packages.ssi:153
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:261
+#: en/user_customization-packages.ssi:273
+#: en/user_customization-packages.ssi:283 en/user_examples.ssi:12
+#: en/user_examples.ssi:27 en/user_examples.ssi:37 en/user_examples.ssi:75
#: en/user_installation.ssi:38 en/user_installation.ssi:46
#: en/user_installation.ssi:56 en/user_installation.ssi:64
#: en/user_installation.ssi:76 en/user_installation.ssi:84
@@ -392,14 +420,14 @@ msgid "code{"
msgstr "code{"
#. type: Plain text
-#: en/about_manual.ssi:82
+#: en/about_manual.ssi:86
msgid "$ git clone git://live.debian.net/git/live-manual.git"
msgstr "$ git clone git://live.debian.net/git/live-manual.git"
#. type: Plain text
-#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:121 en/about_manual.ssi:134 en/about_manual.ssi:142
+#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:165
#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
@@ -422,11 +450,11 @@ msgstr "$ git clone git://live.debian.net/git/live-manual.git"
#: 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_basics.ssi:122 en/user_basics.ssi:132 en/user_basics.ssi:148
+#: en/user_basics.ssi:158 en/user_basics.ssi:166 en/user_basics.ssi:174
+#: en/user_basics.ssi:188 en/user_basics.ssi:196 en/user_basics.ssi:206
+#: en/user_basics.ssi:247 en/user_basics.ssi:259 en/user_basics.ssi:275
+#: en/user_basics.ssi:283 en/user_basics.ssi:310 en/user_basics.ssi:349
#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
#: en/user_customization-contents.ssi:70
#: en/user_customization-internationalization.ssi:14
@@ -435,16 +463,18 @@ msgstr "$ git clone git://live.debian.net/git/live-manual.git"
#: en/user_customization-internationalization.ssi:42
#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
-#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:92
-#: en/user_customization-packages.ssi:133
-#: en/user_customization-packages.ssi:143
-#: en/user_customization-packages.ssi:153
-#: en/user_customization-packages.ssi:163
-#: en/user_customization-packages.ssi:175
-#: en/user_customization-packages.ssi:191
-#: en/user_customization-packages.ssi:259
-#: en/user_customization-packages.ssi:271
-#: en/user_customization-packages.ssi:281 en/user_examples.ssi:33
+#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
+#: en/user_customization-packages.ssi:125
+#: en/user_customization-packages.ssi:139
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:159
+#: en/user_customization-packages.ssi:169
+#: en/user_customization-packages.ssi:181
+#: en/user_customization-packages.ssi:197
+#: en/user_customization-packages.ssi:265
+#: en/user_customization-packages.ssi:277
+#: en/user_customization-packages.ssi:287 en/user_examples.ssi:17
+#: en/user_examples.ssi:31 en/user_examples.ssi:41 en/user_examples.ssi:84
#: en/user_installation.ssi:42 en/user_installation.ssi:50
#: en/user_installation.ssi:60 en/user_installation.ssi:72
#: en/user_installation.ssi:80 en/user_installation.ssi:88
@@ -457,7 +487,7 @@ msgid "}code"
msgstr "}code"
#. type: Plain text
-#: en/about_manual.ssi:86
+#: en/about_manual.ssi:90
msgid ""
"Prior to submission of your contribution, please preview your work. To "
"preview the live-manual, ensure the packages needed for building are "
@@ -468,12 +498,12 @@ msgstr ""
"pentru 'building' sunt instalate, prin executatea comenzii:"
#. type: Plain text
-#: en/about_manual.ssi:90
+#: en/about_manual.ssi:94
msgid "# apt-get install make po4a sisu-complete"
msgstr "# apt-get install make po4a sisu-complete"
#. type: Plain text
-#: en/about_manual.ssi:94
+#: en/about_manual.ssi:98
msgid ""
"You may build the live-manual from the top level directory of your git "
"checkout by executing:"
@@ -482,17 +512,17 @@ msgstr ""
"al dvs, prin executatea:"
#. type: Plain text
-#: en/about_manual.ssi:98
+#: en/about_manual.ssi:102
msgid "$ make build"
msgstr "$ make build"
#. type: Plain text
-#: en/about_manual.ssi:102
+#: en/about_manual.ssi:106
msgid "3~ Applying patches"
msgstr "3~ Aplicarea de patch-uri"
#. type: Plain text
-#: en/about_manual.ssi:104
+#: en/about_manual.ssi:108
msgid ""
"Directly commiting to the repository is possible by anyone. However, we ask "
"you to send bigger changes to the mailing list to discuss them first. In "
@@ -503,12 +533,12 @@ msgstr ""
"contibutiile la repository, pasii urmatori sunt necesari:"
#. type: Plain text
-#: en/about_manual.ssi:106
+#: en/about_manual.ssi:110
msgid "_* Fetch the public commit key:"
msgstr "_* Fetch the public commit key:"
#. type: Plain text
-#: en/about_manual.ssi:115
+#: en/about_manual.ssi:119
#, no-wrap
msgid ""
"$ mkdir -p ~/.ssh/identity.d\n"
@@ -526,12 +556,12 @@ msgstr ""
"$ chmod 0600 ~/.ssh/identity.d/gitosis at live.debian.net*\n"
#. type: Plain text
-#: en/about_manual.ssi:119
+#: en/about_manual.ssi:123
msgid "_* Add the following section to your openssh-client config:"
msgstr "_* Adaugati urmatoarea sectiuna la openssh-client config:"
#. type: Plain text
-#: en/about_manual.ssi:128
+#: en/about_manual.ssi:132
#, no-wrap
msgid ""
"$ cat >> ~/.ssh/config << EOF\n"
@@ -549,17 +579,17 @@ msgstr ""
"EOF\n"
#. type: Plain text
-#: en/about_manual.ssi:132
+#: en/about_manual.ssi:136
msgid "_* Checkout a clone of the manual through ssh:"
msgstr "_* Checkout un clon al manualului prin ssh:"
#. type: Plain text
-#: en/about_manual.ssi:136
+#: en/about_manual.ssi:140
msgid "$ git clone gitosis at live.debian.net:/live-manual.git"
msgstr "$ git clone gitosis at live.debian.net:/live-manual.git"
#. type: Plain text
-#: en/about_manual.ssi:140
+#: en/about_manual.ssi:144
msgid ""
"_* After editing the files in manual/en/, please call the 'commit' target in "
"the top level directory to sanitize the files and update the translation "
@@ -569,12 +599,12 @@ msgstr ""
"top level directory to sanitize the files and update the translation files:"
#. type: Plain text
-#: en/about_manual.ssi:144
+#: en/about_manual.ssi:148
msgid "$ make commit"
msgstr "$ make commit"
#. type: Plain text
-#: en/about_manual.ssi:148
+#: en/about_manual.ssi:152
msgid ""
"_* After sanitizing commit the changes. Write commit messages, that consist "
"of full useful sentences, starting with a capital letter and ending with a "
@@ -587,16 +617,16 @@ msgstr ""
"Correcting/':"
#. type: Plain text
-#: en/about_manual.ssi:152
+#: en/about_manual.ssi:156
msgid "$ git commit -a"
msgstr "$ git commit -a"
#. type: Plain text
-#: en/about_manual.ssi:156
+#: en/about_manual.ssi:160
msgid "_* Push the commit to the server:"
msgstr "_* Primite commit-ul la server:"
#. type: Plain text
-#: en/about_manual.ssi:160
+#: en/about_manual.ssi:164
msgid "$ git push"
msgstr "$ git push"
diff --git a/manual/po/ro/live-manual.ssm.po b/manual/po/ro/live-manual.ssm.po
index 9e9eff8..9792ac7 100644
--- a/manual/po/ro/live-manual.ssm.po
+++ b/manual/po/ro/live-manual.ssm.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-11-26 07:06-0400\n"
+"POT-Creation-Date: 2010-11-27 09:40-0400\n"
"PO-Revision-Date: 2010-10-23 00:04+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -46,7 +46,7 @@ msgstr ""
#, no-wrap
msgid ""
"@date:\n"
-" :published: 2010-11-26\n"
+" :published: 2010-11-27\n"
msgstr ""
#. type: Plain text
diff --git a/manual/po/ro/user_basics.ssi.po b/manual/po/ro/user_basics.ssi.po
index e038be8..8936776 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-11-01 06:47-0200\n"
+"POT-Creation-Date: 2010-11-27 09:40-0400\n"
"PO-Revision-Date: 2010-10-23 16:43+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -18,9 +18,9 @@ msgstr ""
"20)) ? 1 : 2;\n"
#. type: Plain text
-#: en/about_manual.ssi:80 en/about_manual.ssi:88 en/about_manual.ssi:96
-#: en/about_manual.ssi:108 en/about_manual.ssi:121 en/about_manual.ssi:134
-#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
+#: en/about_manual.ssi:112 en/about_manual.ssi:125 en/about_manual.ssi:138
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
@@ -40,38 +40,39 @@ msgstr ""
#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
#: en/other_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/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/other_procedures.ssi:58 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:142 en/user_basics.ssi:154 en/user_basics.ssi:162
+#: en/user_basics.ssi:170 en/user_basics.ssi:184 en/user_basics.ssi:192
+#: en/user_basics.ssi:202 en/user_basics.ssi:222 en/user_basics.ssi:255
+#: en/user_basics.ssi:271 en/user_basics.ssi:279 en/user_basics.ssi:299
+#: en/user_basics.ssi:324 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
#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
-#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
-#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
-#: en/user_customization-packages.ssi:103
-#: en/user_customization-packages.ssi:111
-#: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:104
-#: en/user_installation.ssi:118 en/user_installation.ssi:135
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
+#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
+#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
+#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:133
+#: en/user_customization-packages.ssi:143
+#: en/user_customization-packages.ssi:153
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:261
+#: en/user_customization-packages.ssi:273
+#: en/user_customization-packages.ssi:283 en/user_examples.ssi:12
+#: en/user_examples.ssi:27 en/user_examples.ssi:37 en/user_examples.ssi:75
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:76 en/user_installation.ssi:84
+#: en/user_installation.ssi:104 en/user_installation.ssi:118
+#: en/user_installation.ssi:135 en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:36
#: en/user_overview.ssi:80 en/user_overview.ssi:88
@@ -79,9 +80,9 @@ msgid "code{"
msgstr "code{"
#. type: Plain text
-#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:121 en/about_manual.ssi:134 en/about_manual.ssi:142
+#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:165
#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
@@ -101,37 +102,39 @@ msgstr "code{"
#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
-#: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
-#: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
-#: en/other_use-cases.ssi:137 en/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/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:148
+#: en/user_basics.ssi:158 en/user_basics.ssi:166 en/user_basics.ssi:174
+#: en/user_basics.ssi:188 en/user_basics.ssi:196 en/user_basics.ssi:206
+#: en/user_basics.ssi:247 en/user_basics.ssi:259 en/user_basics.ssi:275
+#: en/user_basics.ssi:283 en/user_basics.ssi:310 en/user_basics.ssi:349
+#: 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
#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
-#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
-#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
-#: en/user_customization-packages.ssi:107
-#: en/user_customization-packages.ssi:115
-#: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:172
-#: en/user_customization-packages.ssi:182
-#: en/user_customization-packages.ssi:192
-#: en/user_customization-packages.ssi:202 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:88 en/user_installation.ssi:108
-#: en/user_installation.ssi:123 en/user_installation.ssi:138
-#: en/user_managing_a_configuration.ssi:31
+#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
+#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
+#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
+#: en/user_customization-packages.ssi:125
+#: en/user_customization-packages.ssi:139
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:159
+#: en/user_customization-packages.ssi:169
+#: en/user_customization-packages.ssi:181
+#: en/user_customization-packages.ssi:197
+#: en/user_customization-packages.ssi:265
+#: en/user_customization-packages.ssi:277
+#: en/user_customization-packages.ssi:287 en/user_examples.ssi:17
+#: en/user_examples.ssi:31 en/user_examples.ssi:41 en/user_examples.ssi:84
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:72
+#: en/user_installation.ssi:80 en/user_installation.ssi:88
+#: en/user_installation.ssi:108 en/user_installation.ssi:123
+#: en/user_installation.ssi:138 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:74
#: en/user_overview.ssi:84 en/user_overview.ssi:92
@@ -145,14 +148,21 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:4
-msgid "1~ The basics"
+msgid "1~the-basics The basics"
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:6
msgid ""
"This chapter contains a brief overview of the build process and instructions "
-"for booting the various binary image types."
+"for using the default image type, #{iso-hybrid}# with a virtual machine, "
+"optical media or USB portable storage device. The chapter finishes with "
+"instructions for building and using a #{net}# type image, which is a bit "
+"more involved due to the setup required on the server. This is a slightly "
+"advanced topic for anyone who is not familiar already with netbooting, but "
+"is included here because once the setup is done, it is a very convenient way "
+"to test and deploy images for booting on the local network without the "
+"hassle of dealing with image media."
msgstr ""
#. type: Plain text
@@ -270,7 +280,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:44 en/user_basics.ssi:120 en/user_basics.ssi:202
+#: en/user_basics.ssi:44 en/user_basics.ssi:120 en/user_basics.ssi:204
msgid "# lb build"
msgstr ""
@@ -283,7 +293,7 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:50
-msgid "3~ Testing an ISO image with Qemu"
+msgid "3~testing-iso-with-qemu Testing an ISO image with Qemu"
msgstr ""
#. type: Plain text
@@ -292,7 +302,7 @@ msgid "Testing an ISO is simple:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:56 en/user_basics.ssi:142
+#: en/user_basics.ssi:56 en/user_basics.ssi:144
msgid "# apt-get install qemu"
msgstr ""
@@ -303,7 +313,7 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:62
-msgid "3~ Testing an ISO image with virtualbox-ose"
+msgid "3~testing-iso-with-virtualbox Testing an ISO image with virtualbox-ose"
msgstr ""
#. type: Plain text
@@ -344,7 +354,7 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:84
-msgid "3~ Burning an ISO image to a physical medium"
+msgid "3~burning-iso-image Burning an ISO image to a physical medium"
msgstr ""
#. type: Plain text
@@ -383,20 +393,20 @@ msgstr ""
#: 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 "
-"clean command}#lb-clean):"
+"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:104 en/user_basics.ssi:184
+#: en/user_basics.ssi:104 en/user_basics.ssi:186
msgid "$ lb clean --binary"
msgstr ""
#. type: Plain text
#: 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:"
+"Run the #{lb config}# command with the parameters to configure the #{config/}"
+"# hierarchy to create a USB/HDD image type:"
msgstr ""
#. type: Plain text
@@ -444,21 +454,28 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:138
-msgid "3~ Testing a USB/HDD image with Qemu"
+msgid ""
+"Note: As discussed earlier, this same process can be used for #{iso-hybrid}# "
+"type images, (suffixed #{-hybrid.iso}#,) but not #{iso}# type images."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:144
+#: en/user_basics.ssi:140
+msgid "3~testing-usb-hdd-with-qemu Testing a USB/HDD image with Qemu"
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:146
msgid "$ qemu -hda binary.img"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:148
+#: en/user_basics.ssi:150
msgid "3~ Using the space left on a USB stick"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:150
+#: en/user_basics.ssi:152
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}"
@@ -467,45 +484,45 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:154
+#: en/user_basics.ssi:156
msgid "# gparted ${USBSTICK}"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:158
+#: en/user_basics.ssi:160
msgid ""
"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:162
+#: en/user_basics.ssi:164
msgid "# mkfs.ext4 ${USBSTICK}"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:166
+#: en/user_basics.ssi:168
msgid "If you want to use this data partition with Windows, use FAT32."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:170
+#: en/user_basics.ssi:172
msgid "# mkfs.vfat -F 32"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:174
+#: en/user_basics.ssi:176
#, no-wrap
msgid "*{Remember: Every time you install a new binary.img on the stick, all data on the stick will be lost because the partition table is overwritten by the contents of the image.}*\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:176
-msgid "2~ Building a netboot image"
+#: en/user_basics.ssi:178
+msgid "2~building-netboot-image Building a netboot image"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:178
+#: en/user_basics.ssi:180
msgid ""
"The following sequence of commands will create a basic netboot image "
"containing the Debian standard system without X.org. It is suitable for "
@@ -513,28 +530,28 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:180
+#: en/user_basics.ssi:182
msgid ""
"Note: if you performed any previous examples, you will need to clean up your "
"working directory with the #{lb clean}# command:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:188
+#: en/user_basics.ssi:190
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:192
+#: en/user_basics.ssi:194
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:196
+#: en/user_basics.ssi:198
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 "
@@ -544,12 +561,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:198
+#: en/user_basics.ssi:200
msgid "Now build the image with the #{lb build}# command:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:206
+#: en/user_basics.ssi:208
msgid ""
"In a network boot, the client runs a small piece of software which usually "
"resides on the EPROM of the Ethernet card. This program sends a DHCP request "
@@ -560,7 +577,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:208
+#: en/user_basics.ssi:210
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/"
@@ -569,17 +586,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:210
+#: en/user_basics.ssi:212
msgid "We must now configure three services on the server to enable netboot."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:212
+#: en/user_basics.ssi:214
msgid "3~ DHCP server"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:214
+#: en/user_basics.ssi:216
msgid ""
"We must configure our network's DHCP server to be sure to give an IP address "
"to the netbooting client system, and to advertise the location of the PXE "
@@ -587,25 +604,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:216
+#: en/user_basics.ssi:218
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:218 en/user_customization-packages.ssi:153
+#: en/user_basics.ssi:220
msgid "% FIXME"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:222
+#: en/user_basics.ssi:224
#, 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:225
+#: en/user_basics.ssi:227
#, no-wrap
msgid ""
" # IP addresses available for guests\n"
@@ -613,7 +630,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:228
+#: en/user_basics.ssi:230
#, no-wrap
msgid ""
" # allow booting from the net\n"
@@ -621,7 +638,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:233
+#: en/user_basics.ssi:235
#, no-wrap
msgid ""
" # for net booting, server where the first file to be loaded (by TFTP\n"
@@ -631,7 +648,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:237
+#: en/user_basics.ssi:239
#, no-wrap
msgid ""
" # net boot configuration for guests with a PXE client:\n"
@@ -640,7 +657,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:240
+#: en/user_basics.ssi:242
#, no-wrap
msgid ""
" # PXE bootloader (first program to be loaded, by TFTP)\n"
@@ -648,7 +665,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:243
+#: en/user_basics.ssi:245
#, no-wrap
msgid ""
" }\n"
@@ -656,17 +673,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:247
+#: en/user_basics.ssi:249
msgid "3~ TFTP server"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:249
+#: en/user_basics.ssi:251
msgid "This serves the kernel and initial ramdisk to the system at run time."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:251
+#: en/user_basics.ssi:253
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 /"
@@ -674,22 +691,22 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:255
+#: en/user_basics.ssi:257
msgid "dpkg-reconfigure -plow tftpd-hpa"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:259
+#: en/user_basics.ssi:261
msgid "and fill in the new tftp server directory when being asked about it."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:261
+#: en/user_basics.ssi:263
msgid "3~ NFS server"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:263
+#: en/user_basics.ssi:265
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 "
@@ -697,35 +714,35 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:265
+#: en/user_basics.ssi:267
msgid "You need to install the nfs-kernel-server package."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:267
+#: en/user_basics.ssi:269
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:271
+#: en/user_basics.ssi:273
msgid "/srv/debian-live *(ro,async,no_root_squash,no_subtree_check)"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:275
+#: en/user_basics.ssi:277
msgid ""
"and tell the NFS server about this new export with the following command:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:279
+#: en/user_basics.ssi:281
msgid "# exportfs -rv"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:283
+#: en/user_basics.ssi:285
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 "
@@ -734,40 +751,40 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:285
+#: en/user_basics.ssi:287
msgid "3~ Netboot testing HowTo"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:287
+#: en/user_basics.ssi:289
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:289
+#: en/user_basics.ssi:291
msgid ""
"To make our life easier, we can use virtualization. There are two solutions."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:291
+#: en/user_basics.ssi:293
msgid "3~ Qemu"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:293
+#: en/user_basics.ssi:295
msgid "_* Install qemu, bridge-utils, sudo."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:295
+#: en/user_basics.ssi:297
msgid "Edit /etc/qemu-ifup:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:306
+#: en/user_basics.ssi:308
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...\" "
@@ -776,62 +793,62 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:310
+#: en/user_basics.ssi:312
msgid "Get, or build a grub-floppy-netboot (in the svn)."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:312
+#: en/user_basics.ssi:314
msgid "Launch qemu with \"-net nic,vlan=0 -net tap,vlan=0,ifname=tun0\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:314
+#: en/user_basics.ssi:316
msgid "3~ VMWare Player"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:316
+#: en/user_basics.ssi:318
msgid "_* Install VMWare Player (\"free as in beer\" edition)"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:318
+#: en/user_basics.ssi:320
msgid ""
"_* Create a PXETester directory, and create a text file called pxe.vwx inside"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:320
+#: en/user_basics.ssi:322
msgid "_* Paste this text inside:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:328
+#: en/user_basics.ssi:330
msgid ""
"#!/usr/bin/vmware config.version = \"8\" virtualHW.version = \"4\" memsize = "
"\"512\" MemAllowAutoScaleDown = \"FALSE\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:334
+#: en/user_basics.ssi:336
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:337
+#: en/user_basics.ssi:339
msgid "ethernet0.present = \"TRUE\" ethernet0.addressType = \"generated\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:340
+#: en/user_basics.ssi:342
msgid "displayName = \"Test Boot PXE\" guestOS = \"other\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:345
+#: en/user_basics.ssi:347
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 "
@@ -839,19 +856,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:349
+#: en/user_basics.ssi:351
msgid ""
"_* You can play with this configuration file (i.e. change memory limit to "
"256)"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:351
+#: en/user_basics.ssi:353
msgid ""
"_* Double click on this file (or run VMWare player and select this file)."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:352
+#: en/user_basics.ssi:354
msgid "_* When running just press space if that strange question comes up..."
msgstr ""
diff --git a/manual/po/ro/user_customization-contents.ssi.po b/manual/po/ro/user_customization-contents.ssi.po
index 5bde24d..25d4cd1 100644
--- a/manual/po/ro/user_customization-contents.ssi.po
+++ b/manual/po/ro/user_customization-contents.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-11-27 09:40-0400\n"
"PO-Revision-Date: 2010-10-23 16:43+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -18,9 +18,9 @@ msgstr ""
"20)) ? 1 : 2;\n"
#. type: Plain text
-#: en/about_manual.ssi:80 en/about_manual.ssi:88 en/about_manual.ssi:96
-#: en/about_manual.ssi:108 en/about_manual.ssi:121 en/about_manual.ssi:134
-#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
+#: en/about_manual.ssi:112 en/about_manual.ssi:125 en/about_manual.ssi:138
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
@@ -40,47 +40,49 @@ msgstr ""
#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
#: en/other_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/other_procedures.ssi:58 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:142 en/user_basics.ssi:154 en/user_basics.ssi:162
+#: en/user_basics.ssi:170 en/user_basics.ssi:184 en/user_basics.ssi:192
+#: en/user_basics.ssi:202 en/user_basics.ssi:222 en/user_basics.ssi:255
+#: en/user_basics.ssi:271 en/user_basics.ssi:279 en/user_basics.ssi:299
+#: en/user_basics.ssi:324 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
#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
-#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
-#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
-#: en/user_customization-packages.ssi:103
-#: en/user_customization-packages.ssi:111
-#: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:104
-#: en/user_installation.ssi:118 en/user_installation.ssi:135
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
+#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
+#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
+#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:133
+#: en/user_customization-packages.ssi:143
+#: en/user_customization-packages.ssi:153
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:261
+#: en/user_customization-packages.ssi:273
+#: en/user_customization-packages.ssi:283 en/user_examples.ssi:12
+#: en/user_examples.ssi:27 en/user_examples.ssi:37 en/user_examples.ssi:75
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:76 en/user_installation.ssi:84
+#: en/user_installation.ssi:104 en/user_installation.ssi:118
+#: en/user_installation.ssi:135 en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
-#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:46
-#: en/user_overview.ssi:90 en/user_overview.ssi:98
+#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:36
+#: en/user_overview.ssi:80 en/user_overview.ssi:88
msgid "code{"
msgstr "code{"
#. type: Plain text
-#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:121 en/about_manual.ssi:134 en/about_manual.ssi:142
+#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:165
#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
@@ -100,46 +102,48 @@ msgstr "code{"
#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
-#: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
-#: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
-#: en/other_use-cases.ssi:137 en/user_basics.ssi:38 en/user_basics.ssi: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/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:148
+#: en/user_basics.ssi:158 en/user_basics.ssi:166 en/user_basics.ssi:174
+#: en/user_basics.ssi:188 en/user_basics.ssi:196 en/user_basics.ssi:206
+#: en/user_basics.ssi:247 en/user_basics.ssi:259 en/user_basics.ssi:275
+#: en/user_basics.ssi:283 en/user_basics.ssi:310 en/user_basics.ssi:349
#: 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
#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
-#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
-#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
-#: en/user_customization-packages.ssi:107
-#: en/user_customization-packages.ssi:115
-#: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:172
-#: en/user_customization-packages.ssi:182
-#: en/user_customization-packages.ssi:192
-#: en/user_customization-packages.ssi:202 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:88 en/user_installation.ssi:108
-#: en/user_installation.ssi:123 en/user_installation.ssi:138
-#: en/user_managing_a_configuration.ssi:31
+#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
+#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
+#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
+#: en/user_customization-packages.ssi:125
+#: en/user_customization-packages.ssi:139
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:159
+#: en/user_customization-packages.ssi:169
+#: en/user_customization-packages.ssi:181
+#: en/user_customization-packages.ssi:197
+#: en/user_customization-packages.ssi:265
+#: en/user_customization-packages.ssi:277
+#: en/user_customization-packages.ssi:287 en/user_examples.ssi:17
+#: en/user_examples.ssi:31 en/user_examples.ssi:41 en/user_examples.ssi:84
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:72
+#: en/user_installation.ssi:80 en/user_installation.ssi:88
+#: en/user_installation.ssi:108 en/user_installation.ssi:123
+#: en/user_installation.ssi:138 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
-#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:84
-#: en/user_overview.ssi:94 en/user_overview.ssi:102
+#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:74
+#: en/user_overview.ssi:84 en/user_overview.ssi:92
msgid "}code"
msgstr "}code"
#. type: Plain text
#: en/user_customization-contents.ssi:2 en/user_customization-overview.ssi:2
-msgid "B~ Customizing contents"
+msgid ":B~ Customizing contents"
msgstr ""
#. type: Plain text
diff --git a/manual/po/ro/user_customization-internationalization.ssi.po b/manual/po/ro/user_customization-internationalization.ssi.po
index 148d727..43a0e38 100644
--- a/manual/po/ro/user_customization-internationalization.ssi.po
+++ b/manual/po/ro/user_customization-internationalization.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-28 09:15-0200\n"
+"POT-Creation-Date: 2010-11-27 09:40-0400\n"
"PO-Revision-Date: 2010-10-22 08:57-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -18,9 +18,9 @@ msgstr ""
"20)) ? 1 : 2;\n"
#. type: Plain text
-#: en/about_manual.ssi:80 en/about_manual.ssi:88 en/about_manual.ssi:96
-#: en/about_manual.ssi:108 en/about_manual.ssi:121 en/about_manual.ssi:134
-#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
+#: en/about_manual.ssi:112 en/about_manual.ssi:125 en/about_manual.ssi:138
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
@@ -40,48 +40,49 @@ msgstr ""
#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
#: en/other_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/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/other_procedures.ssi:58 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:142 en/user_basics.ssi:154 en/user_basics.ssi:162
+#: en/user_basics.ssi:170 en/user_basics.ssi:184 en/user_basics.ssi:192
+#: en/user_basics.ssi:202 en/user_basics.ssi:222 en/user_basics.ssi:255
+#: en/user_basics.ssi:271 en/user_basics.ssi:279 en/user_basics.ssi:299
+#: en/user_basics.ssi:324 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
#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
-#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
-#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
-#: en/user_customization-packages.ssi:103
-#: en/user_customization-packages.ssi:111
-#: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:104
-#: en/user_installation.ssi:118 en/user_installation.ssi:135
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
+#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
+#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
+#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:133
+#: en/user_customization-packages.ssi:143
+#: en/user_customization-packages.ssi:153
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:261
+#: en/user_customization-packages.ssi:273
+#: en/user_customization-packages.ssi:283 en/user_examples.ssi:12
+#: en/user_examples.ssi:27 en/user_examples.ssi:37 en/user_examples.ssi:75
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:76 en/user_installation.ssi:84
+#: en/user_installation.ssi:104 en/user_installation.ssi:118
+#: en/user_installation.ssi:135 en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
-#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:46
-#: en/user_overview.ssi:90 en/user_overview.ssi:98
+#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:36
+#: en/user_overview.ssi:80 en/user_overview.ssi:88
msgid "code{"
msgstr "code{"
#. type: Plain text
-#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:121 en/about_manual.ssi:134 en/about_manual.ssi:142
+#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:165
#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
@@ -101,46 +102,48 @@ msgstr "code{"
#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
-#: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
-#: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
-#: en/other_use-cases.ssi:137 en/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/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:148
+#: en/user_basics.ssi:158 en/user_basics.ssi:166 en/user_basics.ssi:174
+#: en/user_basics.ssi:188 en/user_basics.ssi:196 en/user_basics.ssi:206
+#: en/user_basics.ssi:247 en/user_basics.ssi:259 en/user_basics.ssi:275
+#: en/user_basics.ssi:283 en/user_basics.ssi:310 en/user_basics.ssi:349
+#: 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
#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
-#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
-#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
-#: en/user_customization-packages.ssi:107
-#: en/user_customization-packages.ssi:115
-#: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:172
-#: en/user_customization-packages.ssi:182
-#: en/user_customization-packages.ssi:192
-#: en/user_customization-packages.ssi:202 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:88 en/user_installation.ssi:108
-#: en/user_installation.ssi:123 en/user_installation.ssi:138
-#: en/user_managing_a_configuration.ssi:31
+#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
+#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
+#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
+#: en/user_customization-packages.ssi:125
+#: en/user_customization-packages.ssi:139
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:159
+#: en/user_customization-packages.ssi:169
+#: en/user_customization-packages.ssi:181
+#: en/user_customization-packages.ssi:197
+#: en/user_customization-packages.ssi:265
+#: en/user_customization-packages.ssi:277
+#: en/user_customization-packages.ssi:287 en/user_examples.ssi:17
+#: en/user_examples.ssi:31 en/user_examples.ssi:41 en/user_examples.ssi:84
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:72
+#: en/user_installation.ssi:80 en/user_installation.ssi:88
+#: en/user_installation.ssi:108 en/user_installation.ssi:123
+#: en/user_installation.ssi:138 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
-#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:84
-#: en/user_overview.ssi:94 en/user_overview.ssi:102
+#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:74
+#: en/user_overview.ssi:84 en/user_overview.ssi:92
msgid "}code"
msgstr "}code"
#. type: Plain text
#: en/user_customization-internationalization.ssi:2
-msgid "B~ Customizing locale and language"
+msgid ":B~ Customizing locale and language"
msgstr ""
#. type: Plain text
diff --git a/manual/po/ro/user_customization-overview.ssi.po b/manual/po/ro/user_customization-overview.ssi.po
index 83669bd..008b431 100644
--- a/manual/po/ro/user_customization-overview.ssi.po
+++ b/manual/po/ro/user_customization-overview.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-11-11 11:58-0400\n"
+"POT-Creation-Date: 2010-11-27 09:40-0400\n"
"PO-Revision-Date: 2010-10-22 08:57-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -19,7 +19,7 @@ msgstr ""
#. type: Plain text
#: en/user_customization-contents.ssi:2 en/user_customization-overview.ssi:2
-msgid "B~ Customizing contents"
+msgid ":B~ Customizing contents"
msgstr ""
#. type: Plain text
diff --git a/manual/po/ro/user_examples.ssi.po b/manual/po/ro/user_examples.ssi.po
index f9c2bc0..5a8d7b4 100644
--- a/manual/po/ro/user_examples.ssi.po
+++ b/manual/po/ro/user_examples.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-11-04 16:34-0400\n"
+"POT-Creation-Date: 2010-11-27 09:40-0400\n"
"PO-Revision-Date: 2010-11-04 16:34-0400\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -18,9 +18,9 @@ msgstr ""
"20)) ? 1 : 2;\n"
#. type: Plain text
-#: en/about_manual.ssi:80 en/about_manual.ssi:88 en/about_manual.ssi:96
-#: en/about_manual.ssi:108 en/about_manual.ssi:121 en/about_manual.ssi:134
-#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
+#: en/about_manual.ssi:112 en/about_manual.ssi:125 en/about_manual.ssi:138
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
@@ -44,26 +44,30 @@ msgstr ""
#: 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_basics.ssi:142 en/user_basics.ssi:154 en/user_basics.ssi:162
+#: en/user_basics.ssi:170 en/user_basics.ssi:184 en/user_basics.ssi:192
+#: en/user_basics.ssi:202 en/user_basics.ssi:222 en/user_basics.ssi:255
+#: en/user_basics.ssi:271 en/user_basics.ssi:279 en/user_basics.ssi:299
+#: en/user_basics.ssi:324 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
#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
-#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
-#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
-#: en/user_customization-packages.ssi:103
-#: en/user_customization-packages.ssi:111
-#: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_examples.ssi:24
+#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
+#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
+#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
+#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:133
+#: en/user_customization-packages.ssi:143
+#: en/user_customization-packages.ssi:153
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:261
+#: en/user_customization-packages.ssi:273
+#: en/user_customization-packages.ssi:283 en/user_examples.ssi:12
+#: en/user_examples.ssi:27 en/user_examples.ssi:37 en/user_examples.ssi:75
#: en/user_installation.ssi:38 en/user_installation.ssi:46
#: en/user_installation.ssi:56 en/user_installation.ssi:64
#: en/user_installation.ssi:76 en/user_installation.ssi:84
@@ -76,9 +80,9 @@ msgid "code{"
msgstr "code{"
#. type: Plain text
-#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:121 en/about_manual.ssi:134 en/about_manual.ssi:142
+#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:165
#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
@@ -101,27 +105,31 @@ msgstr "code{"
#: 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_basics.ssi:122 en/user_basics.ssi:132 en/user_basics.ssi:148
+#: en/user_basics.ssi:158 en/user_basics.ssi:166 en/user_basics.ssi:174
+#: en/user_basics.ssi:188 en/user_basics.ssi:196 en/user_basics.ssi:206
+#: en/user_basics.ssi:247 en/user_basics.ssi:259 en/user_basics.ssi:275
+#: en/user_basics.ssi:283 en/user_basics.ssi:310 en/user_basics.ssi:349
#: 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
#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
-#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
-#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
-#: en/user_customization-packages.ssi:107
-#: en/user_customization-packages.ssi:115
-#: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:172
-#: en/user_customization-packages.ssi:182
-#: en/user_customization-packages.ssi:192
-#: en/user_customization-packages.ssi:202 en/user_examples.ssi:33
+#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
+#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
+#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
+#: en/user_customization-packages.ssi:125
+#: en/user_customization-packages.ssi:139
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:159
+#: en/user_customization-packages.ssi:169
+#: en/user_customization-packages.ssi:181
+#: en/user_customization-packages.ssi:197
+#: en/user_customization-packages.ssi:265
+#: en/user_customization-packages.ssi:277
+#: en/user_customization-packages.ssi:287 en/user_examples.ssi:17
+#: en/user_examples.ssi:31 en/user_examples.ssi:41 en/user_examples.ssi:84
#: en/user_installation.ssi:42 en/user_installation.ssi:50
#: en/user_installation.ssi:60 en/user_installation.ssi:72
#: en/user_installation.ssi:80 en/user_installation.ssi:88
@@ -134,95 +142,223 @@ msgid "}code"
msgstr "}code"
#. type: Plain text
-#: en/other_faq.ssi:85 en/other_faq.ssi:247 en/user_examples.ssi:26
+#: en/other_customization-bootup.ssi:8 en/other_customization-bootup.ssi:14
+#: en/other_customization-bootup.ssi:56 en/other_customization-bootup.ssi:60
+#: en/other_customization-bootup.ssi:64 en/other_customization-bootup.ssi:68
+#: en/other_live-environment.ssi:8 en/other_resources.ssi:8
+#: en/other_success-stories.ssi:7 en/user_examples.ssi:51
+#: en/user_examples.ssi:57
+msgid "FIXME"
+msgstr ""
+
+#. type: Plain text
+#: en/other_faq.ssi:85 en/other_faq.ssi:247 en/user_examples.ssi:77
msgid "#!/bin/sh"
msgstr ""
#. type: Plain text
#: en/user_examples.ssi:2
-msgid "B~ Examples"
+msgid ":B~ Examples"
msgstr ""
#. type: Plain text
#: en/user_examples.ssi:4
-msgid "1~ Use Case Builds"
+msgid "1~examples Examples"
msgstr ""
#. type: Plain text
#: en/user_examples.ssi:6
msgid ""
-"This chapter covers example builds for specific use cases with Debian Live."
+"This chapter covers example builds for specific use cases with Debian Live. "
+"If you are new to building your own Debian Live images, we recommend you "
+"first look at the three tutorials in sequence, as each one teaches new "
+"techniques that will help you use and understand the remaining examples."
msgstr ""
#. type: Plain text
#: en/user_examples.ssi:8
-msgid "2~ VNC Kiosk Client"
+msgid "2~using-the-examples Using the examples"
msgstr ""
#. type: Plain text
#: en/user_examples.ssi:10
+msgid ""
+"Note that for the sake of brevity, in all of these examples we do not "
+"specify a local mirror to use for the build. You can either add the options "
+"to #{lb config}# each time you use the command, or else establish a default "
+"for your build system by creating #{/etc/live/build.conf}# and putting your "
+"preferred mirror in it as in the following example:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:15
+msgid ""
+"LB_MIRROR_BOOTSTRAP=\"http://mirror/debian\" LB_MIRROR_CHROOT=\"http://"
+"mirror/debian\""
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:19
+msgid "2~tutorial-1 Tutorial 1: A standard image"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:21
+#, no-wrap
+msgid "*{Use case:}* Create a simple first image, learning the basics of live-build\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:23
+msgid ""
+"In this tutorial, we will build a default ISO hybrid Debian Live image "
+"containing only base packages (no Xorg) and some Debian Live support "
+"packages, as a first exercise in using live-build."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:25
+msgid "You can't get much simpler than this:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:29
+msgid "$ mkdir tutorial1 ; cd tutorial1 ; lb config"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:33
+msgid ""
+"Examine the contents of the #{config/}# directory if you wish. You will see "
+"stored here a skeletal configuration, ready to customize or, in this case, "
+"use immediately to build a default image."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:35
+msgid ""
+"Now, as superuser, build the image, saving a log as you build with #{tee}#."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:39
+msgid "# lb_build 2>&1 | tee binary.log"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:43
+msgid ""
+"Assuming all goes well, after a while, the current directory will contain #"
+"{binary-hybrid.iso}#. This ISO hybrid image can be booted directly in a "
+"virtual machine as described in {Testing an ISO image with Qemu}#testing-iso-"
+"with-qemu and {Testing an ISO image with virtualbox-ose}#testing-iso-with-"
+"virtualbox, or else imaged onto optical media or a USB flash device as "
+"described in {Burning an ISO image to a physical medium}#burning-iso-image "
+"and {Copying USB/HDD image to a USB stick}#copying-usb-hdd-image, "
+"respectively."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:45
+msgid "2~tutorial-2 Tutorial 2: A web browser utility"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:47
+#, no-wrap
+msgid "*{Use case}* Create a web browser utility image, learning how to apply customizations\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:49
+msgid ""
+"In this tutorial, we will create an image suitable for use as a web browser "
+"utility using a single extra repository, a single package list, a single "
+"extra package, and a single extra file, configured with your locale and "
+"keyboard preferences, thereby introducing the various ways you can customize "
+"Debian Live images."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:53
+msgid "2~tutorial-3 Tutorial 3: A personal travelling companion"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:55
+#, no-wrap
+msgid "*{Use case}* Create a project to build a personal travelling companion image, containing your favourite software to take with you on a USB stick wherever you go, and evolving in successive revisions as your needs and preferences change.\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:59
+msgid "2~ VNC Kiosk Client"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:61
msgid "Create an image with live-build to boot directly to a VNC server."
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:12
+#: en/user_examples.ssi:63
msgid "_* Make a build directory: #{$ mkdir vncBuild}#"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:14
+#: en/user_examples.ssi:65
msgid "_* Move to the build directory: #{$ cd vncBuild}#"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:16
+#: en/user_examples.ssi:67
msgid ""
"Example to config the build directory to include gdm metacity "
"xtightvncviewer: #{$ lb config --packages \"gdm3 metacity xtightvncviewer\"}#"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:18
+#: en/user_examples.ssi:69
msgid ""
"Create a folder /etc/skel folder for a custom .xsession for the default "
"user: #{$ mkdir -p config/chroot_local-includes/etc/skel}#"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:20
+#: en/user_examples.ssi:71
msgid ""
"Create the .xsession for the default user: #{$ touch config/chroot_local-"
"includes/etc/skel/.xsession}#"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:22
+#: en/user_examples.ssi:73
msgid ""
"Edit the .xsession file to launch metacity and start xvncviewer with "
"something similar to the below:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:29
+#: en/user_examples.ssi:80
msgid "/usr/bin/metacity & /usr/bin/vncviewer xxx.xxx.xxx.xxx:PORT"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:31
+#: en/user_examples.ssi:82
msgid "exit"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:35
+#: en/user_examples.ssi:86
msgid "_* Build the image: #{# lb build}#"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:37
+#: en/user_examples.ssi:88
msgid "_* Enjoy."
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:39
+#: en/user_examples.ssi:90
msgid "2~ Next Example FIXME"
msgstr ""
diff --git a/manual/pot/about_manual.ssi.pot b/manual/pot/about_manual.ssi.pot
index 615a012..8ad7579 100644
--- a/manual/pot/about_manual.ssi.pot
+++ b/manual/pot/about_manual.ssi.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-11-25 16:53+0100\n"
+"POT-Creation-Date: 2010-11-27 09:40-0400\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"
@@ -48,12 +48,38 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:10
-msgid "2~terms Terms"
+msgid "2~ For the impatient"
msgstr ""
#. type: Plain text
#: en/about_manual.ssi:12
msgid ""
+"While we believe that everything in this manual is important to at least "
+"some of our users, we realize it is a lot of material to cover and that you "
+"may wish to experience early success using the software before delving into "
+"the details. Therefore, we have provided three tutorials in the {Examples}"
+"#examples section designed to teach you image building and customization "
+"basics. Read {Using the examples}#using-the-examples first, followed by "
+"{Tutorial 1: A standard image}#tutorial-1, {Tutorial 2: A web browser "
+"utility}#tutorial-2 and finally {Tutorial 3: A personal travelling companion}"
+"#tutorial-3. By the end of these tutorials, you will have a taste of what "
+"can be done with Debian Live. We encourage you to return to more in-depth "
+"study of the manual, perhaps next reading {The basics}#the-basics, skimming "
+"or skipping {Building a netboot image}#building-netboot-image, and finishing "
+"by reading the {Customization overview}#customization-overview and the "
+"chapters that follow it. By this point, we hope you are thoroughly excited "
+"by what can be done with Debian Live and motivated to read the rest of the "
+"manual, cover-to-cover."
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:14
+msgid "2~terms Terms"
+msgstr ""
+
+#. type: Plain text
+#: en/about_manual.ssi:16
+msgid ""
"_* *{Live system}*: An operating system that can boot without installation "
"to a hard drive. Live systems do not alter local operating system(s) or file"
"(s) already installed on the computer hard drive unless instructed to do so. "
@@ -62,14 +88,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:14
+#: en/about_manual.ssi:18
msgid ""
"_* *{Debian Live}*: The Debian sub-project which maintains the live-boot, "
"live-build, live-config, and live-manual packages."
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:16
+#: en/about_manual.ssi:20
msgid ""
"_* *{Debian Live system}*: A live system that uses software from the Debian "
"operating system that may be booted from CDs, DVDs, USB sticks, over the "
@@ -78,24 +104,24 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:18
+#: en/about_manual.ssi:22
msgid "_* *{Host system}*: The environment used to create the live system."
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:20
+#: en/about_manual.ssi:24
msgid "_* *{Target system}*: The environment used to run the live system."
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:22
+#: en/about_manual.ssi:26
msgid ""
"_* *{live-boot}*: A collection of scripts used to boot live systems. live-"
"boot was formerly a part of live-initramfs."
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:24
+#: en/about_manual.ssi:28
msgid ""
"_* *{live-build}*: A collection of scripts used to build customized Debian "
"Live systems. live-build was formerly known as live-helper, and even earlier "
@@ -103,35 +129,35 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:26
+#: en/about_manual.ssi:30
msgid ""
"_* *{live-config}*: A collection of scripts used to configure a live system "
"during the boot process. live-config was formerly a part of live-initramfs."
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:28
+#: en/about_manual.ssi:32
msgid ""
"_* *{live-manual}*: This document is maintained in a package called live-"
"manual."
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:30
+#: en/about_manual.ssi:34
msgid ""
"_* *{Debian Installer (d-i)}*: The official installation system for the "
"Debian distribution."
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:32
+#: en/about_manual.ssi:36
msgid ""
"_* *{Boot parameters}*: Parameters that can be entered at the bootloader "
"prompt to influence the kernel or live-config."
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:34
+#: en/about_manual.ssi:38
msgid ""
"_* *{chroot}*: The chroot program, chroot(8), enables us to run different "
"instances of the GNU/Linux environment on a single system simultaneously "
@@ -139,21 +165,21 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:36
+#: en/about_manual.ssi:40
msgid ""
"_* *{Binary image}*: A file containing the live system, such as binary.iso "
"or binary.img."
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:38
+#: en/about_manual.ssi:42
msgid ""
"_* *{Target distribution}*: The distribution upon which your live system "
"will be based. This can differ from the distribution of your host system."
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:40
+#: en/about_manual.ssi:44
msgid ""
"_* *{Squeeze/Wheezy/Sid (stable/testing/unstable)}*: The stable distribution "
"contains the latest officially released distribution of Debian. The testing "
@@ -165,7 +191,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:42
+#: en/about_manual.ssi:46
msgid ""
"At the time of writing, Squeeze is the current stable release and Wheezy is "
"the current testing release. Sid will always be a synonym for the unstable "
@@ -173,82 +199,82 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:44
+#: en/about_manual.ssi:48
msgid "2~ Authors"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:46
+#: en/about_manual.ssi:50
msgid "A list of authors (in alphabetical order):"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:48
+#: en/about_manual.ssi:52
msgid "_* Ben Armstrong"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:50
+#: en/about_manual.ssi:54
msgid "_* Brendan Sleight"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:52
+#: en/about_manual.ssi:56
msgid "_* Chris Lamb"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:54
+#: en/about_manual.ssi:58
msgid "_* Daniel Baumann"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:56
+#: en/about_manual.ssi:60
msgid "_* Franklin Piat"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:58
+#: en/about_manual.ssi:62
msgid "_* Jonas Stein"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:60
+#: en/about_manual.ssi:64
msgid "_* Kai Hendry"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:62
+#: en/about_manual.ssi:66
msgid "_* Marco Amadori"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:64
+#: en/about_manual.ssi:68
msgid "_* Mathieu Geli"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:66
+#: en/about_manual.ssi:70
msgid "_* Matthias Kirschner"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:68
+#: en/about_manual.ssi:72
msgid "_* Richard Nelson"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:70
+#: en/about_manual.ssi:74
msgid "_* Trent W. Buck"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:72
+#: en/about_manual.ssi:76
msgid "2~ Contributing to this document"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:74
+#: en/about_manual.ssi:78
msgid ""
"This manual is intended as a community project and all proposals for "
"improvements and contributions are extremely welcome. The preferred way to "
@@ -257,7 +283,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:76
+#: en/about_manual.ssi:80
msgid ""
"When submitting a contribution, please clearly identify its copyright holder "
"and include the licensing statement. Note that to be accepted, the "
@@ -266,16 +292,16 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:78
+#: en/about_manual.ssi:82
msgid ""
"The sources for this manual are maintained using the Git version control "
"system. You can checkout the latest copy by executing:"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:80 en/about_manual.ssi:88 en/about_manual.ssi:96
-#: en/about_manual.ssi:108 en/about_manual.ssi:121 en/about_manual.ssi:134
-#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
+#: en/about_manual.ssi:112 en/about_manual.ssi:125 en/about_manual.ssi:138
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
@@ -299,11 +325,11 @@ msgstr ""
#: 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_basics.ssi:142 en/user_basics.ssi:154 en/user_basics.ssi:162
+#: en/user_basics.ssi:170 en/user_basics.ssi:184 en/user_basics.ssi:192
+#: en/user_basics.ssi:202 en/user_basics.ssi:222 en/user_basics.ssi:255
+#: en/user_basics.ssi:271 en/user_basics.ssi:279 en/user_basics.ssi:299
+#: en/user_basics.ssi:324 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
@@ -311,16 +337,18 @@ msgstr ""
#: en/user_customization-internationalization.ssi:38
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:88
-#: en/user_customization-packages.ssi:127
-#: en/user_customization-packages.ssi:137
-#: en/user_customization-packages.ssi:147
-#: en/user_customization-packages.ssi:157
-#: en/user_customization-packages.ssi:171
-#: en/user_customization-packages.ssi:187
-#: en/user_customization-packages.ssi:255
-#: en/user_customization-packages.ssi:267
-#: en/user_customization-packages.ssi:277 en/user_examples.ssi:24
+#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
+#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:133
+#: en/user_customization-packages.ssi:143
+#: en/user_customization-packages.ssi:153
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:261
+#: en/user_customization-packages.ssi:273
+#: en/user_customization-packages.ssi:283 en/user_examples.ssi:12
+#: en/user_examples.ssi:27 en/user_examples.ssi:37 en/user_examples.ssi:75
#: en/user_installation.ssi:38 en/user_installation.ssi:46
#: en/user_installation.ssi:56 en/user_installation.ssi:64
#: en/user_installation.ssi:76 en/user_installation.ssi:84
@@ -333,14 +361,14 @@ msgid "code{"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:82
+#: en/about_manual.ssi:86
msgid "$ git clone git://live.debian.net/git/live-manual.git"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:121 en/about_manual.ssi:134 en/about_manual.ssi:142
+#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:165
#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
@@ -363,11 +391,11 @@ msgstr ""
#: 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_basics.ssi:122 en/user_basics.ssi:132 en/user_basics.ssi:148
+#: en/user_basics.ssi:158 en/user_basics.ssi:166 en/user_basics.ssi:174
+#: en/user_basics.ssi:188 en/user_basics.ssi:196 en/user_basics.ssi:206
+#: en/user_basics.ssi:247 en/user_basics.ssi:259 en/user_basics.ssi:275
+#: en/user_basics.ssi:283 en/user_basics.ssi:310 en/user_basics.ssi:349
#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
#: en/user_customization-contents.ssi:70
#: en/user_customization-internationalization.ssi:14
@@ -376,16 +404,18 @@ msgstr ""
#: en/user_customization-internationalization.ssi:42
#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
-#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:92
-#: en/user_customization-packages.ssi:133
-#: en/user_customization-packages.ssi:143
-#: en/user_customization-packages.ssi:153
-#: en/user_customization-packages.ssi:163
-#: en/user_customization-packages.ssi:175
-#: en/user_customization-packages.ssi:191
-#: en/user_customization-packages.ssi:259
-#: en/user_customization-packages.ssi:271
-#: en/user_customization-packages.ssi:281 en/user_examples.ssi:33
+#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
+#: en/user_customization-packages.ssi:125
+#: en/user_customization-packages.ssi:139
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:159
+#: en/user_customization-packages.ssi:169
+#: en/user_customization-packages.ssi:181
+#: en/user_customization-packages.ssi:197
+#: en/user_customization-packages.ssi:265
+#: en/user_customization-packages.ssi:277
+#: en/user_customization-packages.ssi:287 en/user_examples.ssi:17
+#: en/user_examples.ssi:31 en/user_examples.ssi:41 en/user_examples.ssi:84
#: en/user_installation.ssi:42 en/user_installation.ssi:50
#: en/user_installation.ssi:60 en/user_installation.ssi:72
#: en/user_installation.ssi:80 en/user_installation.ssi:88
@@ -398,7 +428,7 @@ msgid "}code"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:86
+#: en/about_manual.ssi:90
msgid ""
"Prior to submission of your contribution, please preview your work. To "
"preview the live-manual, ensure the packages needed for building are "
@@ -406,29 +436,29 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:90
+#: en/about_manual.ssi:94
msgid "# apt-get install make po4a sisu-complete"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:94
+#: en/about_manual.ssi:98
msgid ""
"You may build the live-manual from the top level directory of your git "
"checkout by executing:"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:98
+#: en/about_manual.ssi:102
msgid "$ make build"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:102
+#: en/about_manual.ssi:106
msgid "3~ Applying patches"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:104
+#: en/about_manual.ssi:108
msgid ""
"Directly commiting to the repository is possible by anyone. However, we ask "
"you to send bigger changes to the mailing list to discuss them first. In "
@@ -436,12 +466,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:106
+#: en/about_manual.ssi:110
msgid "_* Fetch the public commit key:"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:115
+#: en/about_manual.ssi:119
#, no-wrap
msgid ""
"$ mkdir -p ~/.ssh/identity.d\n"
@@ -453,12 +483,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:119
+#: en/about_manual.ssi:123
msgid "_* Add the following section to your openssh-client config:"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:128
+#: en/about_manual.ssi:132
#, no-wrap
msgid ""
"$ cat >> ~/.ssh/config << EOF\n"
@@ -470,17 +500,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:132
+#: en/about_manual.ssi:136
msgid "_* Checkout a clone of the manual through ssh:"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:136
+#: en/about_manual.ssi:140
msgid "$ git clone gitosis at live.debian.net:/live-manual.git"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:140
+#: en/about_manual.ssi:144
msgid ""
"_* After editing the files in manual/en/, please call the 'commit' target in "
"the top level directory to sanitize the files and update the translation "
@@ -488,12 +518,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:144
+#: en/about_manual.ssi:148
msgid "$ make commit"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:148
+#: en/about_manual.ssi:152
msgid ""
"_* After sanitizing commit the changes. Write commit messages, that consist "
"of full useful sentences, starting with a capital letter and ending with a "
@@ -502,16 +532,16 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:152
+#: en/about_manual.ssi:156
msgid "$ git commit -a"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:156
+#: en/about_manual.ssi:160
msgid "_* Push the commit to the server:"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:160
+#: en/about_manual.ssi:164
msgid "$ git push"
msgstr ""
diff --git a/manual/pot/live-manual.ssm.pot b/manual/pot/live-manual.ssm.pot
index e6b3ce9..e511a52 100644
--- a/manual/pot/live-manual.ssm.pot
+++ b/manual/pot/live-manual.ssm.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-11-26 07:06-0400\n"
+"POT-Creation-Date: 2010-11-27 09:40-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -45,7 +45,7 @@ msgstr ""
#, no-wrap
msgid ""
"@date:\n"
-" :published: 2010-11-26\n"
+" :published: 2010-11-27\n"
msgstr ""
#. type: Plain text
diff --git a/manual/pot/user_basics.ssi.pot b/manual/pot/user_basics.ssi.pot
index 26451b3..be44e64 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-11-01 06:47-0200\n"
+"POT-Creation-Date: 2010-11-27 09:40-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -17,9 +17,9 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#. type: Plain text
-#: en/about_manual.ssi:80 en/about_manual.ssi:88 en/about_manual.ssi:96
-#: en/about_manual.ssi:108 en/about_manual.ssi:121 en/about_manual.ssi:134
-#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
+#: en/about_manual.ssi:112 en/about_manual.ssi:125 en/about_manual.ssi:138
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
@@ -39,38 +39,39 @@ msgstr ""
#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
#: en/other_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/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/other_procedures.ssi:58 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:142 en/user_basics.ssi:154 en/user_basics.ssi:162
+#: en/user_basics.ssi:170 en/user_basics.ssi:184 en/user_basics.ssi:192
+#: en/user_basics.ssi:202 en/user_basics.ssi:222 en/user_basics.ssi:255
+#: en/user_basics.ssi:271 en/user_basics.ssi:279 en/user_basics.ssi:299
+#: en/user_basics.ssi:324 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
#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
-#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
-#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
-#: en/user_customization-packages.ssi:103
-#: en/user_customization-packages.ssi:111
-#: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:104
-#: en/user_installation.ssi:118 en/user_installation.ssi:135
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
+#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
+#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
+#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:133
+#: en/user_customization-packages.ssi:143
+#: en/user_customization-packages.ssi:153
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:261
+#: en/user_customization-packages.ssi:273
+#: en/user_customization-packages.ssi:283 en/user_examples.ssi:12
+#: en/user_examples.ssi:27 en/user_examples.ssi:37 en/user_examples.ssi:75
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:76 en/user_installation.ssi:84
+#: en/user_installation.ssi:104 en/user_installation.ssi:118
+#: en/user_installation.ssi:135 en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:36
#: en/user_overview.ssi:80 en/user_overview.ssi:88
@@ -78,9 +79,9 @@ msgid "code{"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:121 en/about_manual.ssi:134 en/about_manual.ssi:142
+#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:165
#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
@@ -100,37 +101,39 @@ msgstr ""
#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
-#: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
-#: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
-#: en/other_use-cases.ssi:137 en/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/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:148
+#: en/user_basics.ssi:158 en/user_basics.ssi:166 en/user_basics.ssi:174
+#: en/user_basics.ssi:188 en/user_basics.ssi:196 en/user_basics.ssi:206
+#: en/user_basics.ssi:247 en/user_basics.ssi:259 en/user_basics.ssi:275
+#: en/user_basics.ssi:283 en/user_basics.ssi:310 en/user_basics.ssi:349
+#: 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
#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
-#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
-#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
-#: en/user_customization-packages.ssi:107
-#: en/user_customization-packages.ssi:115
-#: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:172
-#: en/user_customization-packages.ssi:182
-#: en/user_customization-packages.ssi:192
-#: en/user_customization-packages.ssi:202 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:88 en/user_installation.ssi:108
-#: en/user_installation.ssi:123 en/user_installation.ssi:138
-#: en/user_managing_a_configuration.ssi:31
+#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
+#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
+#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
+#: en/user_customization-packages.ssi:125
+#: en/user_customization-packages.ssi:139
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:159
+#: en/user_customization-packages.ssi:169
+#: en/user_customization-packages.ssi:181
+#: en/user_customization-packages.ssi:197
+#: en/user_customization-packages.ssi:265
+#: en/user_customization-packages.ssi:277
+#: en/user_customization-packages.ssi:287 en/user_examples.ssi:17
+#: en/user_examples.ssi:31 en/user_examples.ssi:41 en/user_examples.ssi:84
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:72
+#: en/user_installation.ssi:80 en/user_installation.ssi:88
+#: en/user_installation.ssi:108 en/user_installation.ssi:123
+#: en/user_installation.ssi:138 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:74
#: en/user_overview.ssi:84 en/user_overview.ssi:92
@@ -144,14 +147,21 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:4
-msgid "1~ The basics"
+msgid "1~the-basics The basics"
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:6
msgid ""
"This chapter contains a brief overview of the build process and instructions "
-"for booting the various binary image types."
+"for using the default image type, #{iso-hybrid}# with a virtual machine, "
+"optical media or USB portable storage device. The chapter finishes with "
+"instructions for building and using a #{net}# type image, which is a bit "
+"more involved due to the setup required on the server. This is a slightly "
+"advanced topic for anyone who is not familiar already with netbooting, but "
+"is included here because once the setup is done, it is a very convenient way "
+"to test and deploy images for booting on the local network without the "
+"hassle of dealing with image media."
msgstr ""
#. type: Plain text
@@ -269,7 +279,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:44 en/user_basics.ssi:120 en/user_basics.ssi:202
+#: en/user_basics.ssi:44 en/user_basics.ssi:120 en/user_basics.ssi:204
msgid "# lb build"
msgstr ""
@@ -282,7 +292,7 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:50
-msgid "3~ Testing an ISO image with Qemu"
+msgid "3~testing-iso-with-qemu Testing an ISO image with Qemu"
msgstr ""
#. type: Plain text
@@ -291,7 +301,7 @@ msgid "Testing an ISO is simple:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:56 en/user_basics.ssi:142
+#: en/user_basics.ssi:56 en/user_basics.ssi:144
msgid "# apt-get install qemu"
msgstr ""
@@ -302,7 +312,7 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:62
-msgid "3~ Testing an ISO image with virtualbox-ose"
+msgid "3~testing-iso-with-virtualbox Testing an ISO image with virtualbox-ose"
msgstr ""
#. type: Plain text
@@ -343,7 +353,7 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:84
-msgid "3~ Burning an ISO image to a physical medium"
+msgid "3~burning-iso-image Burning an ISO image to a physical medium"
msgstr ""
#. type: Plain text
@@ -382,20 +392,20 @@ msgstr ""
#: 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 "
-"clean command}#lb-clean):"
+"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:104 en/user_basics.ssi:184
+#: en/user_basics.ssi:104 en/user_basics.ssi:186
msgid "$ lb clean --binary"
msgstr ""
#. type: Plain text
#: 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:"
+"Run the #{lb config}# command with the parameters to configure the #{config/}"
+"# hierarchy to create a USB/HDD image type:"
msgstr ""
#. type: Plain text
@@ -443,21 +453,28 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:138
-msgid "3~ Testing a USB/HDD image with Qemu"
+msgid ""
+"Note: As discussed earlier, this same process can be used for #{iso-hybrid}# "
+"type images, (suffixed #{-hybrid.iso}#,) but not #{iso}# type images."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:144
+#: en/user_basics.ssi:140
+msgid "3~testing-usb-hdd-with-qemu Testing a USB/HDD image with Qemu"
+msgstr ""
+
+#. type: Plain text
+#: en/user_basics.ssi:146
msgid "$ qemu -hda binary.img"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:148
+#: en/user_basics.ssi:150
msgid "3~ Using the space left on a USB stick"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:150
+#: en/user_basics.ssi:152
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}"
@@ -466,45 +483,45 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:154
+#: en/user_basics.ssi:156
msgid "# gparted ${USBSTICK}"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:158
+#: en/user_basics.ssi:160
msgid ""
"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:162
+#: en/user_basics.ssi:164
msgid "# mkfs.ext4 ${USBSTICK}"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:166
+#: en/user_basics.ssi:168
msgid "If you want to use this data partition with Windows, use FAT32."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:170
+#: en/user_basics.ssi:172
msgid "# mkfs.vfat -F 32"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:174
+#: en/user_basics.ssi:176
#, no-wrap
msgid "*{Remember: Every time you install a new binary.img on the stick, all data on the stick will be lost because the partition table is overwritten by the contents of the image.}*\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:176
-msgid "2~ Building a netboot image"
+#: en/user_basics.ssi:178
+msgid "2~building-netboot-image Building a netboot image"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:178
+#: en/user_basics.ssi:180
msgid ""
"The following sequence of commands will create a basic netboot image "
"containing the Debian standard system without X.org. It is suitable for "
@@ -512,28 +529,28 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:180
+#: en/user_basics.ssi:182
msgid ""
"Note: if you performed any previous examples, you will need to clean up your "
"working directory with the #{lb clean}# command:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:188
+#: en/user_basics.ssi:190
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:192
+#: en/user_basics.ssi:194
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:196
+#: en/user_basics.ssi:198
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 "
@@ -543,12 +560,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:198
+#: en/user_basics.ssi:200
msgid "Now build the image with the #{lb build}# command:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:206
+#: en/user_basics.ssi:208
msgid ""
"In a network boot, the client runs a small piece of software which usually "
"resides on the EPROM of the Ethernet card. This program sends a DHCP request "
@@ -559,7 +576,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:208
+#: en/user_basics.ssi:210
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/"
@@ -568,17 +585,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:210
+#: en/user_basics.ssi:212
msgid "We must now configure three services on the server to enable netboot."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:212
+#: en/user_basics.ssi:214
msgid "3~ DHCP server"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:214
+#: en/user_basics.ssi:216
msgid ""
"We must configure our network's DHCP server to be sure to give an IP address "
"to the netbooting client system, and to advertise the location of the PXE "
@@ -586,25 +603,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:216
+#: en/user_basics.ssi:218
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:218 en/user_customization-packages.ssi:153
+#: en/user_basics.ssi:220
msgid "% FIXME"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:222
+#: en/user_basics.ssi:224
#, 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:225
+#: en/user_basics.ssi:227
#, no-wrap
msgid ""
" # IP addresses available for guests\n"
@@ -612,7 +629,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:228
+#: en/user_basics.ssi:230
#, no-wrap
msgid ""
" # allow booting from the net\n"
@@ -620,7 +637,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:233
+#: en/user_basics.ssi:235
#, no-wrap
msgid ""
" # for net booting, server where the first file to be loaded (by TFTP\n"
@@ -630,7 +647,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:237
+#: en/user_basics.ssi:239
#, no-wrap
msgid ""
" # net boot configuration for guests with a PXE client:\n"
@@ -639,7 +656,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:240
+#: en/user_basics.ssi:242
#, no-wrap
msgid ""
" # PXE bootloader (first program to be loaded, by TFTP)\n"
@@ -647,7 +664,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:243
+#: en/user_basics.ssi:245
#, no-wrap
msgid ""
" }\n"
@@ -655,17 +672,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:247
+#: en/user_basics.ssi:249
msgid "3~ TFTP server"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:249
+#: en/user_basics.ssi:251
msgid "This serves the kernel and initial ramdisk to the system at run time."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:251
+#: en/user_basics.ssi:253
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 /"
@@ -673,22 +690,22 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:255
+#: en/user_basics.ssi:257
msgid "dpkg-reconfigure -plow tftpd-hpa"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:259
+#: en/user_basics.ssi:261
msgid "and fill in the new tftp server directory when being asked about it."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:261
+#: en/user_basics.ssi:263
msgid "3~ NFS server"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:263
+#: en/user_basics.ssi:265
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 "
@@ -696,35 +713,35 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:265
+#: en/user_basics.ssi:267
msgid "You need to install the nfs-kernel-server package."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:267
+#: en/user_basics.ssi:269
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:271
+#: en/user_basics.ssi:273
msgid "/srv/debian-live *(ro,async,no_root_squash,no_subtree_check)"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:275
+#: en/user_basics.ssi:277
msgid ""
"and tell the NFS server about this new export with the following command:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:279
+#: en/user_basics.ssi:281
msgid "# exportfs -rv"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:283
+#: en/user_basics.ssi:285
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 "
@@ -733,40 +750,40 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:285
+#: en/user_basics.ssi:287
msgid "3~ Netboot testing HowTo"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:287
+#: en/user_basics.ssi:289
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:289
+#: en/user_basics.ssi:291
msgid ""
"To make our life easier, we can use virtualization. There are two solutions."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:291
+#: en/user_basics.ssi:293
msgid "3~ Qemu"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:293
+#: en/user_basics.ssi:295
msgid "_* Install qemu, bridge-utils, sudo."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:295
+#: en/user_basics.ssi:297
msgid "Edit /etc/qemu-ifup:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:306
+#: en/user_basics.ssi:308
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...\" "
@@ -775,62 +792,62 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:310
+#: en/user_basics.ssi:312
msgid "Get, or build a grub-floppy-netboot (in the svn)."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:312
+#: en/user_basics.ssi:314
msgid "Launch qemu with \"-net nic,vlan=0 -net tap,vlan=0,ifname=tun0\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:314
+#: en/user_basics.ssi:316
msgid "3~ VMWare Player"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:316
+#: en/user_basics.ssi:318
msgid "_* Install VMWare Player (\"free as in beer\" edition)"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:318
+#: en/user_basics.ssi:320
msgid ""
"_* Create a PXETester directory, and create a text file called pxe.vwx inside"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:320
+#: en/user_basics.ssi:322
msgid "_* Paste this text inside:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:328
+#: en/user_basics.ssi:330
msgid ""
"#!/usr/bin/vmware config.version = \"8\" virtualHW.version = \"4\" memsize = "
"\"512\" MemAllowAutoScaleDown = \"FALSE\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:334
+#: en/user_basics.ssi:336
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:337
+#: en/user_basics.ssi:339
msgid "ethernet0.present = \"TRUE\" ethernet0.addressType = \"generated\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:340
+#: en/user_basics.ssi:342
msgid "displayName = \"Test Boot PXE\" guestOS = \"other\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:345
+#: en/user_basics.ssi:347
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 "
@@ -838,19 +855,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:349
+#: en/user_basics.ssi:351
msgid ""
"_* You can play with this configuration file (i.e. change memory limit to "
"256)"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:351
+#: en/user_basics.ssi:353
msgid ""
"_* Double click on this file (or run VMWare player and select this file)."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:352
+#: en/user_basics.ssi:354
msgid "_* When running just press space if that strange question comes up..."
msgstr ""
diff --git a/manual/pot/user_customization-contents.ssi.pot b/manual/pot/user_customization-contents.ssi.pot
index c4275ac..72d5ed3 100644
--- a/manual/pot/user_customization-contents.ssi.pot
+++ b/manual/pot/user_customization-contents.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-11-27 09:40-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -17,9 +17,9 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#. type: Plain text
-#: en/about_manual.ssi:80 en/about_manual.ssi:88 en/about_manual.ssi:96
-#: en/about_manual.ssi:108 en/about_manual.ssi:121 en/about_manual.ssi:134
-#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
+#: en/about_manual.ssi:112 en/about_manual.ssi:125 en/about_manual.ssi:138
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
@@ -39,47 +39,49 @@ msgstr ""
#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
#: en/other_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/other_procedures.ssi:58 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:142 en/user_basics.ssi:154 en/user_basics.ssi:162
+#: en/user_basics.ssi:170 en/user_basics.ssi:184 en/user_basics.ssi:192
+#: en/user_basics.ssi:202 en/user_basics.ssi:222 en/user_basics.ssi:255
+#: en/user_basics.ssi:271 en/user_basics.ssi:279 en/user_basics.ssi:299
+#: en/user_basics.ssi:324 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
#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
-#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
-#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
-#: en/user_customization-packages.ssi:103
-#: en/user_customization-packages.ssi:111
-#: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:104
-#: en/user_installation.ssi:118 en/user_installation.ssi:135
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
+#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
+#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
+#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:133
+#: en/user_customization-packages.ssi:143
+#: en/user_customization-packages.ssi:153
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:261
+#: en/user_customization-packages.ssi:273
+#: en/user_customization-packages.ssi:283 en/user_examples.ssi:12
+#: en/user_examples.ssi:27 en/user_examples.ssi:37 en/user_examples.ssi:75
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:76 en/user_installation.ssi:84
+#: en/user_installation.ssi:104 en/user_installation.ssi:118
+#: en/user_installation.ssi:135 en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
-#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:46
-#: en/user_overview.ssi:90 en/user_overview.ssi:98
+#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:36
+#: en/user_overview.ssi:80 en/user_overview.ssi:88
msgid "code{"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:121 en/about_manual.ssi:134 en/about_manual.ssi:142
+#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:165
#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
@@ -99,46 +101,48 @@ msgstr ""
#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
-#: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
-#: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
-#: en/other_use-cases.ssi:137 en/user_basics.ssi:38 en/user_basics.ssi: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/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:148
+#: en/user_basics.ssi:158 en/user_basics.ssi:166 en/user_basics.ssi:174
+#: en/user_basics.ssi:188 en/user_basics.ssi:196 en/user_basics.ssi:206
+#: en/user_basics.ssi:247 en/user_basics.ssi:259 en/user_basics.ssi:275
+#: en/user_basics.ssi:283 en/user_basics.ssi:310 en/user_basics.ssi:349
#: 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
#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
-#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
-#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
-#: en/user_customization-packages.ssi:107
-#: en/user_customization-packages.ssi:115
-#: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:172
-#: en/user_customization-packages.ssi:182
-#: en/user_customization-packages.ssi:192
-#: en/user_customization-packages.ssi:202 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:88 en/user_installation.ssi:108
-#: en/user_installation.ssi:123 en/user_installation.ssi:138
-#: en/user_managing_a_configuration.ssi:31
+#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
+#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
+#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
+#: en/user_customization-packages.ssi:125
+#: en/user_customization-packages.ssi:139
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:159
+#: en/user_customization-packages.ssi:169
+#: en/user_customization-packages.ssi:181
+#: en/user_customization-packages.ssi:197
+#: en/user_customization-packages.ssi:265
+#: en/user_customization-packages.ssi:277
+#: en/user_customization-packages.ssi:287 en/user_examples.ssi:17
+#: en/user_examples.ssi:31 en/user_examples.ssi:41 en/user_examples.ssi:84
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:72
+#: en/user_installation.ssi:80 en/user_installation.ssi:88
+#: en/user_installation.ssi:108 en/user_installation.ssi:123
+#: en/user_installation.ssi:138 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
-#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:84
-#: en/user_overview.ssi:94 en/user_overview.ssi:102
+#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:74
+#: en/user_overview.ssi:84 en/user_overview.ssi:92
msgid "}code"
msgstr ""
#. type: Plain text
#: en/user_customization-contents.ssi:2 en/user_customization-overview.ssi:2
-msgid "B~ Customizing contents"
+msgid ":B~ Customizing contents"
msgstr ""
#. type: Plain text
diff --git a/manual/pot/user_customization-internationalization.ssi.pot b/manual/pot/user_customization-internationalization.ssi.pot
index 7d6accb..136e237 100644
--- a/manual/pot/user_customization-internationalization.ssi.pot
+++ b/manual/pot/user_customization-internationalization.ssi.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-28 09:15-0200\n"
+"POT-Creation-Date: 2010-11-27 09:40-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -17,9 +17,9 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#. type: Plain text
-#: en/about_manual.ssi:80 en/about_manual.ssi:88 en/about_manual.ssi:96
-#: en/about_manual.ssi:108 en/about_manual.ssi:121 en/about_manual.ssi:134
-#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
+#: en/about_manual.ssi:112 en/about_manual.ssi:125 en/about_manual.ssi:138
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
@@ -39,48 +39,49 @@ msgstr ""
#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
#: en/other_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/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/other_procedures.ssi:58 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:142 en/user_basics.ssi:154 en/user_basics.ssi:162
+#: en/user_basics.ssi:170 en/user_basics.ssi:184 en/user_basics.ssi:192
+#: en/user_basics.ssi:202 en/user_basics.ssi:222 en/user_basics.ssi:255
+#: en/user_basics.ssi:271 en/user_basics.ssi:279 en/user_basics.ssi:299
+#: en/user_basics.ssi:324 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
#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
-#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
-#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
-#: en/user_customization-packages.ssi:103
-#: en/user_customization-packages.ssi:111
-#: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:104
-#: en/user_installation.ssi:118 en/user_installation.ssi:135
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
+#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
+#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
+#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:133
+#: en/user_customization-packages.ssi:143
+#: en/user_customization-packages.ssi:153
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:261
+#: en/user_customization-packages.ssi:273
+#: en/user_customization-packages.ssi:283 en/user_examples.ssi:12
+#: en/user_examples.ssi:27 en/user_examples.ssi:37 en/user_examples.ssi:75
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:76 en/user_installation.ssi:84
+#: en/user_installation.ssi:104 en/user_installation.ssi:118
+#: en/user_installation.ssi:135 en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
-#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:46
-#: en/user_overview.ssi:90 en/user_overview.ssi:98
+#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:36
+#: en/user_overview.ssi:80 en/user_overview.ssi:88
msgid "code{"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:121 en/about_manual.ssi:134 en/about_manual.ssi:142
+#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:165
#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
@@ -100,46 +101,48 @@ msgstr ""
#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
-#: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
-#: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
-#: en/other_use-cases.ssi:137 en/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/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:148
+#: en/user_basics.ssi:158 en/user_basics.ssi:166 en/user_basics.ssi:174
+#: en/user_basics.ssi:188 en/user_basics.ssi:196 en/user_basics.ssi:206
+#: en/user_basics.ssi:247 en/user_basics.ssi:259 en/user_basics.ssi:275
+#: en/user_basics.ssi:283 en/user_basics.ssi:310 en/user_basics.ssi:349
+#: 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
#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
-#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
-#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
-#: en/user_customization-packages.ssi:107
-#: en/user_customization-packages.ssi:115
-#: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:172
-#: en/user_customization-packages.ssi:182
-#: en/user_customization-packages.ssi:192
-#: en/user_customization-packages.ssi:202 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:88 en/user_installation.ssi:108
-#: en/user_installation.ssi:123 en/user_installation.ssi:138
-#: en/user_managing_a_configuration.ssi:31
+#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
+#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
+#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
+#: en/user_customization-packages.ssi:125
+#: en/user_customization-packages.ssi:139
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:159
+#: en/user_customization-packages.ssi:169
+#: en/user_customization-packages.ssi:181
+#: en/user_customization-packages.ssi:197
+#: en/user_customization-packages.ssi:265
+#: en/user_customization-packages.ssi:277
+#: en/user_customization-packages.ssi:287 en/user_examples.ssi:17
+#: en/user_examples.ssi:31 en/user_examples.ssi:41 en/user_examples.ssi:84
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:72
+#: en/user_installation.ssi:80 en/user_installation.ssi:88
+#: en/user_installation.ssi:108 en/user_installation.ssi:123
+#: en/user_installation.ssi:138 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
-#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:84
-#: en/user_overview.ssi:94 en/user_overview.ssi:102
+#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:74
+#: en/user_overview.ssi:84 en/user_overview.ssi:92
msgid "}code"
msgstr ""
#. type: Plain text
#: en/user_customization-internationalization.ssi:2
-msgid "B~ Customizing locale and language"
+msgid ":B~ Customizing locale and language"
msgstr ""
#. type: Plain text
diff --git a/manual/pot/user_customization-overview.ssi.pot b/manual/pot/user_customization-overview.ssi.pot
index afae677..b0c1404 100644
--- a/manual/pot/user_customization-overview.ssi.pot
+++ b/manual/pot/user_customization-overview.ssi.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-11-11 11:58-0400\n"
+"POT-Creation-Date: 2010-11-27 09:40-0400\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"
@@ -18,7 +18,7 @@ msgstr ""
#. type: Plain text
#: en/user_customization-contents.ssi:2 en/user_customization-overview.ssi:2
-msgid "B~ Customizing contents"
+msgid ":B~ Customizing contents"
msgstr ""
#. type: Plain text
diff --git a/manual/pot/user_examples.ssi.pot b/manual/pot/user_examples.ssi.pot
index 7494c39..897acbf 100644
--- a/manual/pot/user_examples.ssi.pot
+++ b/manual/pot/user_examples.ssi.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-11-04 16:34-0400\n"
+"POT-Creation-Date: 2010-11-27 09:40-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -17,9 +17,9 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#. type: Plain text
-#: en/about_manual.ssi:80 en/about_manual.ssi:88 en/about_manual.ssi:96
-#: en/about_manual.ssi:108 en/about_manual.ssi:121 en/about_manual.ssi:134
-#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
+#: en/about_manual.ssi:112 en/about_manual.ssi:125 en/about_manual.ssi:138
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
@@ -43,26 +43,30 @@ msgstr ""
#: 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_basics.ssi:142 en/user_basics.ssi:154 en/user_basics.ssi:162
+#: en/user_basics.ssi:170 en/user_basics.ssi:184 en/user_basics.ssi:192
+#: en/user_basics.ssi:202 en/user_basics.ssi:222 en/user_basics.ssi:255
+#: en/user_basics.ssi:271 en/user_basics.ssi:279 en/user_basics.ssi:299
+#: en/user_basics.ssi:324 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
#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
-#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
-#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
-#: en/user_customization-packages.ssi:103
-#: en/user_customization-packages.ssi:111
-#: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_examples.ssi:24
+#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
+#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
+#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
+#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:133
+#: en/user_customization-packages.ssi:143
+#: en/user_customization-packages.ssi:153
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:261
+#: en/user_customization-packages.ssi:273
+#: en/user_customization-packages.ssi:283 en/user_examples.ssi:12
+#: en/user_examples.ssi:27 en/user_examples.ssi:37 en/user_examples.ssi:75
#: en/user_installation.ssi:38 en/user_installation.ssi:46
#: en/user_installation.ssi:56 en/user_installation.ssi:64
#: en/user_installation.ssi:76 en/user_installation.ssi:84
@@ -75,9 +79,9 @@ msgid "code{"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:121 en/about_manual.ssi:134 en/about_manual.ssi:142
+#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:165
#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
@@ -100,27 +104,31 @@ msgstr ""
#: 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_basics.ssi:122 en/user_basics.ssi:132 en/user_basics.ssi:148
+#: en/user_basics.ssi:158 en/user_basics.ssi:166 en/user_basics.ssi:174
+#: en/user_basics.ssi:188 en/user_basics.ssi:196 en/user_basics.ssi:206
+#: en/user_basics.ssi:247 en/user_basics.ssi:259 en/user_basics.ssi:275
+#: en/user_basics.ssi:283 en/user_basics.ssi:310 en/user_basics.ssi:349
#: 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
#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
-#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
-#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
-#: en/user_customization-packages.ssi:107
-#: en/user_customization-packages.ssi:115
-#: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:172
-#: en/user_customization-packages.ssi:182
-#: en/user_customization-packages.ssi:192
-#: en/user_customization-packages.ssi:202 en/user_examples.ssi:33
+#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
+#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
+#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
+#: en/user_customization-packages.ssi:125
+#: en/user_customization-packages.ssi:139
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:159
+#: en/user_customization-packages.ssi:169
+#: en/user_customization-packages.ssi:181
+#: en/user_customization-packages.ssi:197
+#: en/user_customization-packages.ssi:265
+#: en/user_customization-packages.ssi:277
+#: en/user_customization-packages.ssi:287 en/user_examples.ssi:17
+#: en/user_examples.ssi:31 en/user_examples.ssi:41 en/user_examples.ssi:84
#: en/user_installation.ssi:42 en/user_installation.ssi:50
#: en/user_installation.ssi:60 en/user_installation.ssi:72
#: en/user_installation.ssi:80 en/user_installation.ssi:88
@@ -133,95 +141,223 @@ msgid "}code"
msgstr ""
#. type: Plain text
-#: en/other_faq.ssi:85 en/other_faq.ssi:247 en/user_examples.ssi:26
+#: en/other_customization-bootup.ssi:8 en/other_customization-bootup.ssi:14
+#: en/other_customization-bootup.ssi:56 en/other_customization-bootup.ssi:60
+#: en/other_customization-bootup.ssi:64 en/other_customization-bootup.ssi:68
+#: en/other_live-environment.ssi:8 en/other_resources.ssi:8
+#: en/other_success-stories.ssi:7 en/user_examples.ssi:51
+#: en/user_examples.ssi:57
+msgid "FIXME"
+msgstr ""
+
+#. type: Plain text
+#: en/other_faq.ssi:85 en/other_faq.ssi:247 en/user_examples.ssi:77
msgid "#!/bin/sh"
msgstr ""
#. type: Plain text
#: en/user_examples.ssi:2
-msgid "B~ Examples"
+msgid ":B~ Examples"
msgstr ""
#. type: Plain text
#: en/user_examples.ssi:4
-msgid "1~ Use Case Builds"
+msgid "1~examples Examples"
msgstr ""
#. type: Plain text
#: en/user_examples.ssi:6
msgid ""
-"This chapter covers example builds for specific use cases with Debian Live."
+"This chapter covers example builds for specific use cases with Debian Live. "
+"If you are new to building your own Debian Live images, we recommend you "
+"first look at the three tutorials in sequence, as each one teaches new "
+"techniques that will help you use and understand the remaining examples."
msgstr ""
#. type: Plain text
#: en/user_examples.ssi:8
-msgid "2~ VNC Kiosk Client"
+msgid "2~using-the-examples Using the examples"
msgstr ""
#. type: Plain text
#: en/user_examples.ssi:10
+msgid ""
+"Note that for the sake of brevity, in all of these examples we do not "
+"specify a local mirror to use for the build. You can either add the options "
+"to #{lb config}# each time you use the command, or else establish a default "
+"for your build system by creating #{/etc/live/build.conf}# and putting your "
+"preferred mirror in it as in the following example:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:15
+msgid ""
+"LB_MIRROR_BOOTSTRAP=\"http://mirror/debian\" LB_MIRROR_CHROOT=\"http://"
+"mirror/debian\""
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:19
+msgid "2~tutorial-1 Tutorial 1: A standard image"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:21
+#, no-wrap
+msgid "*{Use case:}* Create a simple first image, learning the basics of live-build\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:23
+msgid ""
+"In this tutorial, we will build a default ISO hybrid Debian Live image "
+"containing only base packages (no Xorg) and some Debian Live support "
+"packages, as a first exercise in using live-build."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:25
+msgid "You can't get much simpler than this:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:29
+msgid "$ mkdir tutorial1 ; cd tutorial1 ; lb config"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:33
+msgid ""
+"Examine the contents of the #{config/}# directory if you wish. You will see "
+"stored here a skeletal configuration, ready to customize or, in this case, "
+"use immediately to build a default image."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:35
+msgid ""
+"Now, as superuser, build the image, saving a log as you build with #{tee}#."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:39
+msgid "# lb_build 2>&1 | tee binary.log"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:43
+msgid ""
+"Assuming all goes well, after a while, the current directory will contain #"
+"{binary-hybrid.iso}#. This ISO hybrid image can be booted directly in a "
+"virtual machine as described in {Testing an ISO image with Qemu}#testing-iso-"
+"with-qemu and {Testing an ISO image with virtualbox-ose}#testing-iso-with-"
+"virtualbox, or else imaged onto optical media or a USB flash device as "
+"described in {Burning an ISO image to a physical medium}#burning-iso-image "
+"and {Copying USB/HDD image to a USB stick}#copying-usb-hdd-image, "
+"respectively."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:45
+msgid "2~tutorial-2 Tutorial 2: A web browser utility"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:47
+#, no-wrap
+msgid "*{Use case}* Create a web browser utility image, learning how to apply customizations\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:49
+msgid ""
+"In this tutorial, we will create an image suitable for use as a web browser "
+"utility using a single extra repository, a single package list, a single "
+"extra package, and a single extra file, configured with your locale and "
+"keyboard preferences, thereby introducing the various ways you can customize "
+"Debian Live images."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:53
+msgid "2~tutorial-3 Tutorial 3: A personal travelling companion"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:55
+#, no-wrap
+msgid "*{Use case}* Create a project to build a personal travelling companion image, containing your favourite software to take with you on a USB stick wherever you go, and evolving in successive revisions as your needs and preferences change.\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:59
+msgid "2~ VNC Kiosk Client"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:61
msgid "Create an image with live-build to boot directly to a VNC server."
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:12
+#: en/user_examples.ssi:63
msgid "_* Make a build directory: #{$ mkdir vncBuild}#"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:14
+#: en/user_examples.ssi:65
msgid "_* Move to the build directory: #{$ cd vncBuild}#"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:16
+#: en/user_examples.ssi:67
msgid ""
"Example to config the build directory to include gdm metacity "
"xtightvncviewer: #{$ lb config --packages \"gdm3 metacity xtightvncviewer\"}#"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:18
+#: en/user_examples.ssi:69
msgid ""
"Create a folder /etc/skel folder for a custom .xsession for the default "
"user: #{$ mkdir -p config/chroot_local-includes/etc/skel}#"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:20
+#: en/user_examples.ssi:71
msgid ""
"Create the .xsession for the default user: #{$ touch config/chroot_local-"
"includes/etc/skel/.xsession}#"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:22
+#: en/user_examples.ssi:73
msgid ""
"Edit the .xsession file to launch metacity and start xvncviewer with "
"something similar to the below:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:29
+#: en/user_examples.ssi:80
msgid "/usr/bin/metacity & /usr/bin/vncviewer xxx.xxx.xxx.xxx:PORT"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:31
+#: en/user_examples.ssi:82
msgid "exit"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:35
+#: en/user_examples.ssi:86
msgid "_* Build the image: #{# lb build}#"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:37
+#: en/user_examples.ssi:88
msgid "_* Enjoy."
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:39
+#: en/user_examples.ssi:90
msgid "2~ Next Example FIXME"
msgstr ""
diff --git a/manual/pt_BR/about_manual.ssi b/manual/pt_BR/about_manual.ssi
index 4e47b3e..084264f 100644
--- a/manual/pt_BR/about_manual.ssi
+++ b/manual/pt_BR/about_manual.ssi
@@ -14,6 +14,25 @@ executados como usuário não privilegiado e aqueles que requerem privilégios
de super usuário, os comandos são precididos por: #{$}# ou #{#}#
respectivamente. Esse simbolo não é parte do comando.
+2~ For the impatient
+
+While we believe that everything in this manual is important to at least
+some of our users, we realize it is a lot of material to cover and that you
+may wish to experience early success using the software before delving into
+the details. Therefore, we have provided three tutorials in the
+{Examples}#examples section designed to teach you image building and
+customization basics. Read {Using the examples}#using-the-examples first,
+followed by {Tutorial 1: A standard image}#tutorial-1, {Tutorial 2: A web
+browser utility}#tutorial-2 and finally {Tutorial 3: A personal travelling
+companion}#tutorial-3. By the end of these tutorials, you will have a taste
+of what can be done with Debian Live. We encourage you to return to more
+in-depth study of the manual, perhaps next reading {The basics}#the-basics,
+skimming or skipping {Building a netboot image}#building-netboot-image, and
+finishing by reading the {Customization overview}#customization-overview and
+the chapters that follow it. By this point, we hope you are thoroughly
+excited by what can be done with Debian Live and motivated to read the rest
+of the manual, cover-to-cover.
+
2~terms Terminologia
_* *{Live system}*: Um sistema operacional que pode inicializar sem
diff --git a/manual/pt_BR/live-manual.ssm b/manual/pt_BR/live-manual.ssm
index aff987f..92bd15d 100644
--- a/manual/pt_BR/live-manual.ssm
+++ b/manual/pt_BR/live-manual.ssm
@@ -9,7 +9,7 @@
:license: This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.<br><br>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.<br><br>You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/. <br><br>On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-3 file.
@date:
- :published: 2010-11-26
+ :published: 2010-11-27
@publisher: Debian Live Project <debian-live at lists.debian.org>
diff --git a/manual/pt_BR/user_basics.ssi b/manual/pt_BR/user_basics.ssi
index 303cdd7..eda6c9e 100644
--- a/manual/pt_BR/user_basics.ssi
+++ b/manual/pt_BR/user_basics.ssi
@@ -1,9 +1,16 @@
:B~ The basics
-1~ The basics
+1~the-basics The basics
This chapter contains a brief overview of the build process and instructions
-for booting the various binary image types.
+for using the default image type, #{iso-hybrid}# with a virtual machine,
+optical media or USB portable storage device. The chapter finishes with
+instructions for building and using a #{net}# type image, which is a bit
+more involved due to the setup required on the server. This is a slightly
+advanced topic for anyone who is not familiar already with netbooting, but
+is included here because once the setup is done, it is a very convenient way
+to test and deploy images for booting on the local network without the
+hassle of dealing with image media.
2~ What is a live system?
@@ -77,7 +84,7 @@ code{
This process can take a while, depending on the speed of your network
connection (see {The lb build command}#lb-build).
-3~ Testing an ISO image with Qemu
+3~testing-iso-with-qemu Testing an ISO image with Qemu
Testing an ISO is simple:
@@ -89,7 +96,7 @@ $ qemu -cdrom binary.iso
}code
-3~ Testing an ISO image with virtualbox-ose
+3~testing-iso-with-virtualbox Testing an ISO image with virtualbox-ose
In order to test the ISO with virtualbox-ose:
@@ -115,7 +122,7 @@ code{
}code
-3~ Burning an ISO image to a physical medium
+3~burning-iso-image Burning an ISO image to a physical medium
Burning an ISO image is easy:
@@ -138,8 +145,8 @@ 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
-clean command}#lb-clean):
+to clean up your working directory with the #{lb clean}# command (see {The
+lb clean command}#lb-clean):
code{
@@ -147,8 +154,8 @@ $ lb clean --binary
}code
-Run the #{lb config}# command with the parameters to configure the "config/"
-hierarchy to create a USB/HDD image type:
+Run the #{lb config}# command with the parameters to configure the
+#{config/}# hierarchy to create a USB/HDD image type:
code{
@@ -183,7 +190,10 @@ better yet, #{ls -l /dev/disk/by-id}#.
*{This will definitely overwrite any previous contents on your stick!}*
-3~ Testing a USB/HDD image with Qemu
+Note: As discussed earlier, this same process can be used for #{iso-hybrid}#
+type images, (suffixed #{-hybrid.iso}#,) but not #{iso}# type images.
+
+3~testing-usb-hdd-with-qemu Testing a USB/HDD image with Qemu
code{
@@ -225,7 +235,7 @@ code{
*{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
+2~building-netboot-image Building a netboot image
The following sequence of commands will create a basic netboot image
containing the Debian standard system without X.org. It is suitable for
diff --git a/manual/pt_BR/user_customization-contents.ssi b/manual/pt_BR/user_customization-contents.ssi
index df28e53..f8d01ce 100644
--- a/manual/pt_BR/user_customization-contents.ssi
+++ b/manual/pt_BR/user_customization-contents.ssi
@@ -1,4 +1,4 @@
-B~ Customizing contents
+:B~ Customizing contents
1~customizing-contents Customizing contents
diff --git a/manual/pt_BR/user_customization-internationalization.ssi b/manual/pt_BR/user_customization-internationalization.ssi
index b86f8f8..0288819 100644
--- a/manual/pt_BR/user_customization-internationalization.ssi
+++ b/manual/pt_BR/user_customization-internationalization.ssi
@@ -1,4 +1,4 @@
-B~ Customizing locale and language
+:B~ Customizing locale and language
1~customizing-locale-and-language Customizing locale and language
diff --git a/manual/pt_BR/user_customization-overview.ssi b/manual/pt_BR/user_customization-overview.ssi
index 44c6731..dfef318 100644
--- a/manual/pt_BR/user_customization-overview.ssi
+++ b/manual/pt_BR/user_customization-overview.ssi
@@ -1,4 +1,4 @@
-B~ Customizing contents
+:B~ Customizing contents
1~customization-overview Customization overview
diff --git a/manual/pt_BR/user_examples.ssi b/manual/pt_BR/user_examples.ssi
index 2567323..d265d54 100644
--- a/manual/pt_BR/user_examples.ssi
+++ b/manual/pt_BR/user_examples.ssi
@@ -1,8 +1,81 @@
-B~ Examples
+:B~ Examples
-1~ Use Case Builds
+1~examples Examples
-This chapter covers example builds for specific use cases with Debian Live.
+This chapter covers example builds for specific use cases with Debian
+Live. If you are new to building your own Debian Live images, we recommend
+you first look at the three tutorials in sequence, as each one teaches new
+techniques that will help you use and understand the remaining examples.
+
+2~using-the-examples Using the examples
+
+Note that for the sake of brevity, in all of these examples we do not
+specify a local mirror to use for the build. You can either add the options
+to #{lb config}# each time you use the command, or else establish a default
+for your build system by creating #{/etc/live/build.conf}# and putting your
+preferred mirror in it as in the following example:
+
+code{
+
+LB_MIRROR_BOOTSTRAP="http://mirror/debian"
+LB_MIRROR_CHROOT="http://mirror/debian"
+
+}code
+
+2~tutorial-1 Tutorial 1: A standard image
+
+*{Use case:}* Create a simple first image, learning the basics of live-build
+
+In this tutorial, we will build a default ISO hybrid Debian Live image
+containing only base packages (no Xorg) and some Debian Live support
+packages, as a first exercise in using live-build.
+
+You can't get much simpler than this:
+
+code{
+
+$ mkdir tutorial1 ; cd tutorial1 ; lb config
+
+}code
+
+Examine the contents of the #{config/}# directory if you wish. You will see
+stored here a skeletal configuration, ready to customize or, in this case,
+use immediately to build a default image.
+
+Now, as superuser, build the image, saving a log as you build with #{tee}#.
+
+code{
+
+# lb_build 2>&1 | tee binary.log
+
+}code
+
+Assuming all goes well, after a while, the current directory will contain
+#{binary-hybrid.iso}#. This ISO hybrid image can be booted directly in a
+virtual machine as described in {Testing an ISO image with
+Qemu}#testing-iso-with-qemu and {Testing an ISO image with
+virtualbox-ose}#testing-iso-with-virtualbox, or else imaged onto optical
+media or a USB flash device as described in {Burning an ISO image to a
+physical medium}#burning-iso-image and {Copying USB/HDD image to a USB
+stick}#copying-usb-hdd-image, respectively.
+
+2~tutorial-2 Tutorial 2: A web browser utility
+
+*{Use case}* Create a web browser utility image, learning how to apply customizations
+
+In this tutorial, we will create an image suitable for use as a web browser
+utility using a single extra repository, a single package list, a single
+extra package, and a single extra file, configured with your locale and
+keyboard preferences, thereby introducing the various ways you can customize
+Debian Live images.
+
+FIXME
+
+2~tutorial-3 Tutorial 3: A personal travelling companion
+
+*{Use case}* Create a project to build a personal travelling companion image, containing your favourite software to take with you on a USB stick wherever you go, and evolving in successive revisions as your needs and preferences change.
+
+FIXME
2~ VNC Kiosk Client
diff --git a/manual/ro/about_manual.ssi b/manual/ro/about_manual.ssi
index cc9c888..f1f1f35 100644
--- a/manual/ro/about_manual.ssi
+++ b/manual/ro/about_manual.ssi
@@ -12,6 +12,25 @@ privilegiu care poate fi obtinut fie prin comanda #{su}, sau #{sudo}. Pentru
a distinge intre acesti utilizatori se vor folosi #{$}# respectiv #{#}#
. Aceste simboluri nu fac parte din comenzi.
+2~ For the impatient
+
+While we believe that everything in this manual is important to at least
+some of our users, we realize it is a lot of material to cover and that you
+may wish to experience early success using the software before delving into
+the details. Therefore, we have provided three tutorials in the
+{Examples}#examples section designed to teach you image building and
+customization basics. Read {Using the examples}#using-the-examples first,
+followed by {Tutorial 1: A standard image}#tutorial-1, {Tutorial 2: A web
+browser utility}#tutorial-2 and finally {Tutorial 3: A personal travelling
+companion}#tutorial-3. By the end of these tutorials, you will have a taste
+of what can be done with Debian Live. We encourage you to return to more
+in-depth study of the manual, perhaps next reading {The basics}#the-basics,
+skimming or skipping {Building a netboot image}#building-netboot-image, and
+finishing by reading the {Customization overview}#customization-overview and
+the chapters that follow it. By this point, we hope you are thoroughly
+excited by what can be done with Debian Live and motivated to read the rest
+of the manual, cover-to-cover.
+
2~terms Termeni
_* *{Live system}*: Un sistem de operare care porneste fara a instala pe
diff --git a/manual/ro/live-manual.ssm b/manual/ro/live-manual.ssm
index aff987f..92bd15d 100644
--- a/manual/ro/live-manual.ssm
+++ b/manual/ro/live-manual.ssm
@@ -9,7 +9,7 @@
:license: This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.<br><br>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.<br><br>You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/. <br><br>On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-3 file.
@date:
- :published: 2010-11-26
+ :published: 2010-11-27
@publisher: Debian Live Project <debian-live at lists.debian.org>
diff --git a/manual/ro/user_basics.ssi b/manual/ro/user_basics.ssi
index 303cdd7..eda6c9e 100644
--- a/manual/ro/user_basics.ssi
+++ b/manual/ro/user_basics.ssi
@@ -1,9 +1,16 @@
:B~ The basics
-1~ The basics
+1~the-basics The basics
This chapter contains a brief overview of the build process and instructions
-for booting the various binary image types.
+for using the default image type, #{iso-hybrid}# with a virtual machine,
+optical media or USB portable storage device. The chapter finishes with
+instructions for building and using a #{net}# type image, which is a bit
+more involved due to the setup required on the server. This is a slightly
+advanced topic for anyone who is not familiar already with netbooting, but
+is included here because once the setup is done, it is a very convenient way
+to test and deploy images for booting on the local network without the
+hassle of dealing with image media.
2~ What is a live system?
@@ -77,7 +84,7 @@ code{
This process can take a while, depending on the speed of your network
connection (see {The lb build command}#lb-build).
-3~ Testing an ISO image with Qemu
+3~testing-iso-with-qemu Testing an ISO image with Qemu
Testing an ISO is simple:
@@ -89,7 +96,7 @@ $ qemu -cdrom binary.iso
}code
-3~ Testing an ISO image with virtualbox-ose
+3~testing-iso-with-virtualbox Testing an ISO image with virtualbox-ose
In order to test the ISO with virtualbox-ose:
@@ -115,7 +122,7 @@ code{
}code
-3~ Burning an ISO image to a physical medium
+3~burning-iso-image Burning an ISO image to a physical medium
Burning an ISO image is easy:
@@ -138,8 +145,8 @@ 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
-clean command}#lb-clean):
+to clean up your working directory with the #{lb clean}# command (see {The
+lb clean command}#lb-clean):
code{
@@ -147,8 +154,8 @@ $ lb clean --binary
}code
-Run the #{lb config}# command with the parameters to configure the "config/"
-hierarchy to create a USB/HDD image type:
+Run the #{lb config}# command with the parameters to configure the
+#{config/}# hierarchy to create a USB/HDD image type:
code{
@@ -183,7 +190,10 @@ better yet, #{ls -l /dev/disk/by-id}#.
*{This will definitely overwrite any previous contents on your stick!}*
-3~ Testing a USB/HDD image with Qemu
+Note: As discussed earlier, this same process can be used for #{iso-hybrid}#
+type images, (suffixed #{-hybrid.iso}#,) but not #{iso}# type images.
+
+3~testing-usb-hdd-with-qemu Testing a USB/HDD image with Qemu
code{
@@ -225,7 +235,7 @@ code{
*{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
+2~building-netboot-image Building a netboot image
The following sequence of commands will create a basic netboot image
containing the Debian standard system without X.org. It is suitable for
diff --git a/manual/ro/user_customization-contents.ssi b/manual/ro/user_customization-contents.ssi
index df28e53..f8d01ce 100644
--- a/manual/ro/user_customization-contents.ssi
+++ b/manual/ro/user_customization-contents.ssi
@@ -1,4 +1,4 @@
-B~ Customizing contents
+:B~ Customizing contents
1~customizing-contents Customizing contents
diff --git a/manual/ro/user_customization-internationalization.ssi b/manual/ro/user_customization-internationalization.ssi
index b86f8f8..0288819 100644
--- a/manual/ro/user_customization-internationalization.ssi
+++ b/manual/ro/user_customization-internationalization.ssi
@@ -1,4 +1,4 @@
-B~ Customizing locale and language
+:B~ Customizing locale and language
1~customizing-locale-and-language Customizing locale and language
diff --git a/manual/ro/user_customization-overview.ssi b/manual/ro/user_customization-overview.ssi
index 44c6731..dfef318 100644
--- a/manual/ro/user_customization-overview.ssi
+++ b/manual/ro/user_customization-overview.ssi
@@ -1,4 +1,4 @@
-B~ Customizing contents
+:B~ Customizing contents
1~customization-overview Customization overview
diff --git a/manual/ro/user_examples.ssi b/manual/ro/user_examples.ssi
index 2567323..d265d54 100644
--- a/manual/ro/user_examples.ssi
+++ b/manual/ro/user_examples.ssi
@@ -1,8 +1,81 @@
-B~ Examples
+:B~ Examples
-1~ Use Case Builds
+1~examples Examples
-This chapter covers example builds for specific use cases with Debian Live.
+This chapter covers example builds for specific use cases with Debian
+Live. If you are new to building your own Debian Live images, we recommend
+you first look at the three tutorials in sequence, as each one teaches new
+techniques that will help you use and understand the remaining examples.
+
+2~using-the-examples Using the examples
+
+Note that for the sake of brevity, in all of these examples we do not
+specify a local mirror to use for the build. You can either add the options
+to #{lb config}# each time you use the command, or else establish a default
+for your build system by creating #{/etc/live/build.conf}# and putting your
+preferred mirror in it as in the following example:
+
+code{
+
+LB_MIRROR_BOOTSTRAP="http://mirror/debian"
+LB_MIRROR_CHROOT="http://mirror/debian"
+
+}code
+
+2~tutorial-1 Tutorial 1: A standard image
+
+*{Use case:}* Create a simple first image, learning the basics of live-build
+
+In this tutorial, we will build a default ISO hybrid Debian Live image
+containing only base packages (no Xorg) and some Debian Live support
+packages, as a first exercise in using live-build.
+
+You can't get much simpler than this:
+
+code{
+
+$ mkdir tutorial1 ; cd tutorial1 ; lb config
+
+}code
+
+Examine the contents of the #{config/}# directory if you wish. You will see
+stored here a skeletal configuration, ready to customize or, in this case,
+use immediately to build a default image.
+
+Now, as superuser, build the image, saving a log as you build with #{tee}#.
+
+code{
+
+# lb_build 2>&1 | tee binary.log
+
+}code
+
+Assuming all goes well, after a while, the current directory will contain
+#{binary-hybrid.iso}#. This ISO hybrid image can be booted directly in a
+virtual machine as described in {Testing an ISO image with
+Qemu}#testing-iso-with-qemu and {Testing an ISO image with
+virtualbox-ose}#testing-iso-with-virtualbox, or else imaged onto optical
+media or a USB flash device as described in {Burning an ISO image to a
+physical medium}#burning-iso-image and {Copying USB/HDD image to a USB
+stick}#copying-usb-hdd-image, respectively.
+
+2~tutorial-2 Tutorial 2: A web browser utility
+
+*{Use case}* Create a web browser utility image, learning how to apply customizations
+
+In this tutorial, we will create an image suitable for use as a web browser
+utility using a single extra repository, a single package list, a single
+extra package, and a single extra file, configured with your locale and
+keyboard preferences, thereby introducing the various ways you can customize
+Debian Live images.
+
+FIXME
+
+2~tutorial-3 Tutorial 3: A personal travelling companion
+
+*{Use case}* Create a project to build a personal travelling companion image, containing your favourite software to take with you on a USB stick wherever you go, and evolving in successive revisions as your needs and preferences change.
+
+FIXME
2~ VNC Kiosk Client
--
live-manual
More information about the debian-live-changes
mailing list