[SCM] live-manual branch, debian, updated. debian/2.0.0-1-43-gbef1887
Ben Armstrong
synrg at debian.org
Sun Dec 19 14:09:20 UTC 2010
The following commit has been merged in the debian branch:
commit bef1887a3e0abf9df47946c8d5a172b48672520a
Author: Ben Armstrong <synrg at debian.org>
Date: Sun Dec 19 10:09:07 2010 -0400
Updating translation strings for basics, package customization and examples.
diff --git a/manual/de/user_basics.ssi b/manual/de/user_basics.ssi
index 3703714..b39c457 100644
--- a/manual/de/user_basics.ssi
+++ b/manual/de/user_basics.ssi
@@ -246,12 +246,12 @@ working directory with the #{lb clean}# command:
code{
-$ lb clean --binary
+# lb clean --binary
}code
-Run the #{lb config}# command with the parameters to configure the "config/"
-hierarchy to create our netboot image:
+Run the #{lb config}# command as follows to configure your image for
+netbooting:
code{
@@ -260,11 +260,12 @@ $ lb config -b net --net-root-path "/srv/debian-live" --net-root-server
}code
-In contrast with the ISO and USB/HDD images, netbooting does not support
-serving a filesystem image with the client, so the files must be served via
-NFS. The net-root-path and net-root-server options specify the location and
-server, respectively, of the NFS server where the filesytem image will be
-located at boot time.
+In contrast with the ISO and USB/HDD images, netbooting does not, itself,
+serve the filesystem image to the client, so the files must be served via
+NFS. The #{--net-root-path}# and #{--net-root-server}# options specify the
+location and server, respectively, of the NFS server where the filesytem
+image will be located at boot time. Make sure these are set to suitable
+values for your network and server.
Now build the image with the #{lb build}# command:
@@ -281,12 +282,13 @@ next step is getting a higher level bootloader via the TFTP protocol. That
could be pxelinux, GRUB, or even boot directly to an operating system like
Linux.
-For example, if you unpack the generated binary-net.tar.gz archive in the
-/srv/debian-live directory, you'll find the filesystem image in
-live/filesystem.squashfs and the kernel, initrd and pxelinux bootloader in
-tftpboot/debian-live/i386.
+For example, if you unpack the generated #{binary-net.tar.gz}# archive in
+the #{/srv/debian-live}# directory, you'll find the filesystem image in
+#{live/filesystem.squashfs}# and the kernel, initrd and pxelinux bootloader
+in #{tftpboot/debian-live/i386}#.
-We must now configure three services on the server to enable netboot.
+We must now configure three services on the server to enable netboot: the
+DHCP server, the TFTP server and the NFS server.
3~ DHCP server
@@ -295,7 +297,7 @@ to the netbooting client system, and to advertise the location of the PXE
bootloader.
Here is an example for inspiration, written for the ISC DHCP server
-#{isc-dhcp-server}# in the /etc/dhcp/dhcpd.conf configuration file;
+#{isc-dhcp-server}# in the #{/etc/dhcp/dhcpd.conf}# configuration file:
code{
@@ -323,12 +325,12 @@ subnet 192.168.0.0 netmask 255.255.255.0 {
This serves the kernel and initial ramdisk to the system at run time.
You should install the tftpd-hpa package. It can serve all files contained
-inside a root directory, usually /srv/tftp. To let it serve files inside
-/srv/debian-live/tftpboot, run as root the following command:
+inside a root directory, usually #{/srv/tftp}#. To let it serve files inside
+#{/srv/debian-live/tftpboot}#, run as root the following command:
code{
-dpkg-reconfigure -plow tftpd-hpa
+# dpkg-reconfigure -plow tftpd-hpa
}code
@@ -340,10 +342,10 @@ Once the guest computer has downloaded and booted a Linux kernel and loaded
its initrd, it will try to mount the Live filesystem image through a NFS
server.
-You need to install the nfs-kernel-server package.
+You need to install the #{nfs-kernel-server}# package.
Then, make the filesystem image available through NFS by adding a line like
-the following to /etc/exports:
+the following to #{/etc/exports}#:
code{
@@ -375,9 +377,9 @@ To make our life easier, we can use virtualization. There are two solutions.
3~ Qemu
-_* Install qemu, bridge-utils, sudo.
+_* Install #{qemu}#, #{bridge-utils}#, #{sudo}#.
-Edit /etc/qemu-ifup:
+Edit #{/etc/qemu-ifup}#:
code{
@@ -388,15 +390,15 @@ code{
}code
-Get, or build a grub-floppy-netboot (in the svn).
+Get, or build a #{grub-floppy-netboot}# (in the svn).
-Launch qemu with "-net nic,vlan=0 -net tap,vlan=0,ifname=tun0"
+Launch #{qemu}# with "#{-net nic,vlan=0 -net tap,vlan=0,ifname=tun0}#"
3~ VMWare Player
_* Install VMWare Player ("free as in beer" edition)
-_* Create a PXETester directory, and create a text file called pxe.vwx
+_* Create a PXETester directory, and create a text file called #{pxe.vwx}#
inside
_* Paste this text inside:
diff --git a/manual/de/user_customization-packages.ssi b/manual/de/user_customization-packages.ssi
index 97d65cc..f2aeba5 100644
--- a/manual/de/user_customization-packages.ssi
+++ b/manual/de/user_customization-packages.ssi
@@ -508,13 +508,17 @@ $ lb config --apt-recommends false
}code
-The tradeoff here is that recommended packages are defined as "packages that
-would be found together with this one in all but unusual installations"
-(Debian Policy Manual, §7.2). This may lead to some packages that you
-actually need being omitted, so we suggest you review the difference this
-makes to your packages list (see the #{binary.packages}# file generated by
-#{lb build}#) and re-include in your list any missing packages that you
-still want installed.
+The tradeoff here is that if you don't install recommended packages for a
+given package, that is, "packages that would be found together with this one
+in all but unusual installations" (Debian Policy Manual, §7.2), some
+packages that you actually need may be omitted. Therefore, we suggest you
+review the difference turning off recommends makes to your packages list
+(see the #{binary.packages}# file generated by #{lb build}#) and re-include
+in your list any missing packages that you still want
+installed. Alternatively, if you find you only want a small number of
+recommended packages left out, leave recommends enabled and set a negative
+APT pin priority on selected packages to prevent them from being installed,
+as explained in {APT pinning}#apt-pinning.
3~ Passing options to apt or aptitude
@@ -546,3 +550,16 @@ Package: * Pin: release n=sid Pin-Priority: 1 END
}code
+Negative pin priorities will prevent a package from being installed, as in
+the case where you do not want a package that is recommended by another
+package. Suppose you are building a GNOME image but don't want the user
+prompted to store wifi passwords in the keyring, so you want to omit the
+recommended #{gnome-keyring}# package. This can be done by adding the
+following stanza to #{config/chroot_apt/preferences}#:
+
+code{
+
+Package: gnome-keyring Pin: version * Pin-Priority: -1
+
+}code
+
diff --git a/manual/de/user_examples.ssi b/manual/de/user_examples.ssi
index 79b45d2..f9c2f60 100644
--- a/manual/de/user_examples.ssi
+++ b/manual/de/user_examples.ssi
@@ -226,35 +226,40 @@ cases drawn from the collected experiences of users of Debian Live.
*{Use case:}* Create an image with live-build to boot directly to a VNC server.
-_* Make a build directory: #{$ mkdir vncBuild}#
+Make a build directory and create a skeletal configuration in it, including
+#{gdm3}#, #{metacity}# and #{xtightvncviewer}#:
-_* Move to the build directory: #{$ cd vncBuild}#
-
-Example to config the build directory to include gdm metacity
-xtightvncviewer: #{$ lb config --packages "gdm3 metacity xtightvncviewer"}#
+code{
-Create a folder /etc/skel folder for a custom .xsession for the default
-user: #{$ mkdir -p config/chroot_local-includes/etc/skel}#
+$ mkdir vnc_kiosk_client $ cd vnc_kiosk_client $ lb config -p standard-x11
+--packages "gdm3 metacity xtightvncviewer"
-Create the .xsession for the default user: #{$ touch
-config/chroot_local-includes/etc/skel/.xsession}#
+}code
-Edit the .xsession file to launch metacity and start xvncviewer with
-something similar to the below:
+Create the directory #{/etc/skel}# and put a custom #{.xsession}# in it for
+the default user that will launch metacity and start xvncviewer, connecting
+to port #{5901}# on a server at #{192.168.1.2}#:
code{
-#!/bin/sh
+$ mkdir -p config/chroot_local-includes/etc/skel $ cat
+config/chroot_local-includes/etc/skel/.xsession <<END #!/bin/sh
-/usr/bin/metacity & /usr/bin/vncviewer xxx.xxx.xxx.xxx:PORT
+/usr/bin/metacity & /usr/bin/xvncviewer 192.168.1.2:1
-exit
+exit END
}code
-_* Build the image: #{# lb build}#
+Build the image:
+
+code{
+
+# lb build
+
+}code
-_* Enjoy.
+Enjoy.
2~ A base image for a 128M USB key
diff --git a/manual/fr/user_basics.ssi b/manual/fr/user_basics.ssi
index 3703714..b39c457 100644
--- a/manual/fr/user_basics.ssi
+++ b/manual/fr/user_basics.ssi
@@ -246,12 +246,12 @@ working directory with the #{lb clean}# command:
code{
-$ lb clean --binary
+# lb clean --binary
}code
-Run the #{lb config}# command with the parameters to configure the "config/"
-hierarchy to create our netboot image:
+Run the #{lb config}# command as follows to configure your image for
+netbooting:
code{
@@ -260,11 +260,12 @@ $ lb config -b net --net-root-path "/srv/debian-live" --net-root-server
}code
-In contrast with the ISO and USB/HDD images, netbooting does not support
-serving a filesystem image with the client, so the files must be served via
-NFS. The net-root-path and net-root-server options specify the location and
-server, respectively, of the NFS server where the filesytem image will be
-located at boot time.
+In contrast with the ISO and USB/HDD images, netbooting does not, itself,
+serve the filesystem image to the client, so the files must be served via
+NFS. The #{--net-root-path}# and #{--net-root-server}# options specify the
+location and server, respectively, of the NFS server where the filesytem
+image will be located at boot time. Make sure these are set to suitable
+values for your network and server.
Now build the image with the #{lb build}# command:
@@ -281,12 +282,13 @@ next step is getting a higher level bootloader via the TFTP protocol. That
could be pxelinux, GRUB, or even boot directly to an operating system like
Linux.
-For example, if you unpack the generated binary-net.tar.gz archive in the
-/srv/debian-live directory, you'll find the filesystem image in
-live/filesystem.squashfs and the kernel, initrd and pxelinux bootloader in
-tftpboot/debian-live/i386.
+For example, if you unpack the generated #{binary-net.tar.gz}# archive in
+the #{/srv/debian-live}# directory, you'll find the filesystem image in
+#{live/filesystem.squashfs}# and the kernel, initrd and pxelinux bootloader
+in #{tftpboot/debian-live/i386}#.
-We must now configure three services on the server to enable netboot.
+We must now configure three services on the server to enable netboot: the
+DHCP server, the TFTP server and the NFS server.
3~ DHCP server
@@ -295,7 +297,7 @@ to the netbooting client system, and to advertise the location of the PXE
bootloader.
Here is an example for inspiration, written for the ISC DHCP server
-#{isc-dhcp-server}# in the /etc/dhcp/dhcpd.conf configuration file;
+#{isc-dhcp-server}# in the #{/etc/dhcp/dhcpd.conf}# configuration file:
code{
@@ -323,12 +325,12 @@ subnet 192.168.0.0 netmask 255.255.255.0 {
This serves the kernel and initial ramdisk to the system at run time.
You should install the tftpd-hpa package. It can serve all files contained
-inside a root directory, usually /srv/tftp. To let it serve files inside
-/srv/debian-live/tftpboot, run as root the following command:
+inside a root directory, usually #{/srv/tftp}#. To let it serve files inside
+#{/srv/debian-live/tftpboot}#, run as root the following command:
code{
-dpkg-reconfigure -plow tftpd-hpa
+# dpkg-reconfigure -plow tftpd-hpa
}code
@@ -340,10 +342,10 @@ Once the guest computer has downloaded and booted a Linux kernel and loaded
its initrd, it will try to mount the Live filesystem image through a NFS
server.
-You need to install the nfs-kernel-server package.
+You need to install the #{nfs-kernel-server}# package.
Then, make the filesystem image available through NFS by adding a line like
-the following to /etc/exports:
+the following to #{/etc/exports}#:
code{
@@ -375,9 +377,9 @@ To make our life easier, we can use virtualization. There are two solutions.
3~ Qemu
-_* Install qemu, bridge-utils, sudo.
+_* Install #{qemu}#, #{bridge-utils}#, #{sudo}#.
-Edit /etc/qemu-ifup:
+Edit #{/etc/qemu-ifup}#:
code{
@@ -388,15 +390,15 @@ code{
}code
-Get, or build a grub-floppy-netboot (in the svn).
+Get, or build a #{grub-floppy-netboot}# (in the svn).
-Launch qemu with "-net nic,vlan=0 -net tap,vlan=0,ifname=tun0"
+Launch #{qemu}# with "#{-net nic,vlan=0 -net tap,vlan=0,ifname=tun0}#"
3~ VMWare Player
_* Install VMWare Player ("free as in beer" edition)
-_* Create a PXETester directory, and create a text file called pxe.vwx
+_* Create a PXETester directory, and create a text file called #{pxe.vwx}#
inside
_* Paste this text inside:
diff --git a/manual/fr/user_customization-packages.ssi b/manual/fr/user_customization-packages.ssi
index 97d65cc..f2aeba5 100644
--- a/manual/fr/user_customization-packages.ssi
+++ b/manual/fr/user_customization-packages.ssi
@@ -508,13 +508,17 @@ $ lb config --apt-recommends false
}code
-The tradeoff here is that recommended packages are defined as "packages that
-would be found together with this one in all but unusual installations"
-(Debian Policy Manual, §7.2). This may lead to some packages that you
-actually need being omitted, so we suggest you review the difference this
-makes to your packages list (see the #{binary.packages}# file generated by
-#{lb build}#) and re-include in your list any missing packages that you
-still want installed.
+The tradeoff here is that if you don't install recommended packages for a
+given package, that is, "packages that would be found together with this one
+in all but unusual installations" (Debian Policy Manual, §7.2), some
+packages that you actually need may be omitted. Therefore, we suggest you
+review the difference turning off recommends makes to your packages list
+(see the #{binary.packages}# file generated by #{lb build}#) and re-include
+in your list any missing packages that you still want
+installed. Alternatively, if you find you only want a small number of
+recommended packages left out, leave recommends enabled and set a negative
+APT pin priority on selected packages to prevent them from being installed,
+as explained in {APT pinning}#apt-pinning.
3~ Passing options to apt or aptitude
@@ -546,3 +550,16 @@ Package: * Pin: release n=sid Pin-Priority: 1 END
}code
+Negative pin priorities will prevent a package from being installed, as in
+the case where you do not want a package that is recommended by another
+package. Suppose you are building a GNOME image but don't want the user
+prompted to store wifi passwords in the keyring, so you want to omit the
+recommended #{gnome-keyring}# package. This can be done by adding the
+following stanza to #{config/chroot_apt/preferences}#:
+
+code{
+
+Package: gnome-keyring Pin: version * Pin-Priority: -1
+
+}code
+
diff --git a/manual/fr/user_examples.ssi b/manual/fr/user_examples.ssi
index 79b45d2..f9c2f60 100644
--- a/manual/fr/user_examples.ssi
+++ b/manual/fr/user_examples.ssi
@@ -226,35 +226,40 @@ cases drawn from the collected experiences of users of Debian Live.
*{Use case:}* Create an image with live-build to boot directly to a VNC server.
-_* Make a build directory: #{$ mkdir vncBuild}#
+Make a build directory and create a skeletal configuration in it, including
+#{gdm3}#, #{metacity}# and #{xtightvncviewer}#:
-_* Move to the build directory: #{$ cd vncBuild}#
-
-Example to config the build directory to include gdm metacity
-xtightvncviewer: #{$ lb config --packages "gdm3 metacity xtightvncviewer"}#
+code{
-Create a folder /etc/skel folder for a custom .xsession for the default
-user: #{$ mkdir -p config/chroot_local-includes/etc/skel}#
+$ mkdir vnc_kiosk_client $ cd vnc_kiosk_client $ lb config -p standard-x11
+--packages "gdm3 metacity xtightvncviewer"
-Create the .xsession for the default user: #{$ touch
-config/chroot_local-includes/etc/skel/.xsession}#
+}code
-Edit the .xsession file to launch metacity and start xvncviewer with
-something similar to the below:
+Create the directory #{/etc/skel}# and put a custom #{.xsession}# in it for
+the default user that will launch metacity and start xvncviewer, connecting
+to port #{5901}# on a server at #{192.168.1.2}#:
code{
-#!/bin/sh
+$ mkdir -p config/chroot_local-includes/etc/skel $ cat
+config/chroot_local-includes/etc/skel/.xsession <<END #!/bin/sh
-/usr/bin/metacity & /usr/bin/vncviewer xxx.xxx.xxx.xxx:PORT
+/usr/bin/metacity & /usr/bin/xvncviewer 192.168.1.2:1
-exit
+exit END
}code
-_* Build the image: #{# lb build}#
+Build the image:
+
+code{
+
+# lb build
+
+}code
-_* Enjoy.
+Enjoy.
2~ A base image for a 128M USB key
diff --git a/manual/it/user_basics.ssi b/manual/it/user_basics.ssi
index 5becfec..fca1772 100644
--- a/manual/it/user_basics.ssi
+++ b/manual/it/user_basics.ssi
@@ -258,12 +258,12 @@ la directory di lavoro con il comando #{lb clean}#:
code{
-$ lb clean --binary
+# lb clean --binary
}code
-Lanciare il comando #{lb config}# con i parametri atti a configurare la
-struttura "config/" per creare la nostra immagine netboot:
+Run the #{lb config}# command as follows to configure your image for
+netbooting:
code{
@@ -272,11 +272,12 @@ $ lb config -b net --net-root-path "/srv/debian-live" --net-root-server
}code
-Diversamente dalle immagini ISO e USB/HDD, il boot via rete non fornisce
-un'immagine del filesytem al client, perciò i file devono essere forniti via
-NFS. Le opzioni net-root-path e net-root-server specificano,
-rispettivamente, il percorso e il server del server NFS dove l'immagine del
-filesystem sarà situata all'avvio.
+In contrast with the ISO and USB/HDD images, netbooting does not, itself,
+serve the filesystem image to the client, so the files must be served via
+NFS. The #{--net-root-path}# and #{--net-root-server}# options specify the
+location and server, respectively, of the NFS server where the filesytem
+image will be located at boot time. Make sure these are set to suitable
+values for your network and server.
Si crei ora l'immagine con il comando #{lb build}#:
@@ -294,12 +295,13 @@ di di livello superiore attraverso il protocollo TFTP. Questi potrebbe
essere pxelinux, GRUB, o anche avviare direttamente un sistema operativo
come Linux.
-Per esempio, estraendo l'archivio generato binary-net.tar.gz nella directory
-/srv/debian-live, si troverà l'immagine del filesystem in
-live/filesystem.squashfs mentre il kernel, initrd ed il bootloader pxelinux
-in tftpboot/debian-live/i386.
+For example, if you unpack the generated #{binary-net.tar.gz}# archive in
+the #{/srv/debian-live}# directory, you'll find the filesystem image in
+#{live/filesystem.squashfs}# and the kernel, initrd and pxelinux bootloader
+in #{tftpboot/debian-live/i386}#.
-Per abilitare l'avvio tramite rete vanno ora configurati tre servizi.
+We must now configure three services on the server to enable netboot: the
+DHCP server, the TFTP server and the NFS server.
3~ Server DHCP
@@ -307,8 +309,8 @@ Si deve configurare il server DHCP della rete per essere sicuri di fornire
un indirizzo IP al sistema client che si avvia tramite rete, e notificare la
posizione del bootloader PXE.
-Ecco un esempio, scritto per un server DHCP ISC #{isc-dhcp-server}# nel file
-di configurazione /etc/dhcp/dhcpd.conf;
+Here is an example for inspiration, written for the ISC DHCP server
+#{isc-dhcp-server}# in the #{/etc/dhcp/dhcpd.conf}# configuration file:
code{
@@ -335,14 +337,13 @@ subnet 192.168.0.0 netmask 255.255.255.0 {
Fornisce al sistema il kernel e il ramdisk iniziale in fase di esecuzione.
-Si installi il pacchetto tftpd-hpa, che mette a disposizione tutti i file
-contenuti in una directory root, di solito /srv/tftp. Affinché si possa
-disporre dei file contenuti in /srv/debian-live/tftpboot, eseguire il
-seguente comando come utente root:
+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
+#{/srv/debian-live/tftpboot}#, run as root the following command:
code{
-dpkg-reconfigure -plow tftpd-hpa
+# dpkg-reconfigure -plow tftpd-hpa
}code
@@ -354,10 +355,10 @@ Una volta che il computer ospite ha scaricato e avviato un kernel Linux e
caricato il suo initrd, cercherà di montare l'immagine del filesystem Live
tramite un server NFS.
-Bisogna installare il pacchetto nfs-kernel-server.
+You need to install the #{nfs-kernel-server}# package.
-Quindi, rendere disponibile l'immagine del filesystem via NFS aggiungendo
-una riga come la seguente in /etc/exports:
+Then, make the filesystem image available through NFS by adding a line like
+the following to #{/etc/exports}#:
code{
@@ -391,9 +392,9 @@ soluzioni.
3~ Qemu
-_* Installare qemu, bridge-utils, sudo.
+_* Install #{qemu}#, #{bridge-utils}#, #{sudo}#.
-Modificare /etc/qemu-ifup:
+Edit #{/etc/qemu-ifup}#:
code{
@@ -404,16 +405,16 @@ code{
}code
-Procurarsi o compilare grub-floppy-netboot (su svn).
+Get, or build a #{grub-floppy-netboot}# (in the svn).
-Lanciare qemu con "-net nic,vlan=0 -net tap,vlan=0,ifname=tun0"
+Launch #{qemu}# with "#{-net nic,vlan=0 -net tap,vlan=0,ifname=tun0}#"
3~ VMWare Player
_* Installare VMWare Player (edizione "free as in beer")
-_* Creare una directory PXETester, e crearvi all'interno un file di testo
-chiamato pxe.vmx
+_* Create a PXETester directory, and create a text file called #{pxe.vwx}#
+inside
_* Vi si copi dentro questo testo:
diff --git a/manual/it/user_customization-packages.ssi b/manual/it/user_customization-packages.ssi
index 0c3348d..c2c797a 100644
--- a/manual/it/user_customization-packages.ssi
+++ b/manual/it/user_customization-packages.ssi
@@ -523,13 +523,17 @@ $ lb config --apt-recommends false
}code
-The tradeoff here is that recommended packages are defined as "packages that
-would be found together with this one in all but unusual installations"
-(Debian Policy Manual, §7.2). This may lead to some packages that you
-actually need being omitted, so we suggest you review the difference this
-makes to your packages list (see the #{binary.packages}# file generated by
-#{lb build}#) and re-include in your list any missing packages that you
-still want installed.
+The tradeoff here is that if you don't install recommended packages for a
+given package, that is, "packages that would be found together with this one
+in all but unusual installations" (Debian Policy Manual, §7.2), some
+packages that you actually need may be omitted. Therefore, we suggest you
+review the difference turning off recommends makes to your packages list
+(see the #{binary.packages}# file generated by #{lb build}#) and re-include
+in your list any missing packages that you still want
+installed. Alternatively, if you find you only want a small number of
+recommended packages left out, leave recommends enabled and set a negative
+APT pin priority on selected packages to prevent them from being installed,
+as explained in {APT pinning}#apt-pinning.
3~ Passare opzioni ad apt o aptitude
@@ -561,3 +565,16 @@ Package: * Pin: release n=sid Pin-Priority: 1 END
}code
+Negative pin priorities will prevent a package from being installed, as in
+the case where you do not want a package that is recommended by another
+package. Suppose you are building a GNOME image but don't want the user
+prompted to store wifi passwords in the keyring, so you want to omit the
+recommended #{gnome-keyring}# package. This can be done by adding the
+following stanza to #{config/chroot_apt/preferences}#:
+
+code{
+
+Package: gnome-keyring Pin: version * Pin-Priority: -1
+
+}code
+
diff --git a/manual/it/user_examples.ssi b/manual/it/user_examples.ssi
index 116acef..faa763f 100644
--- a/manual/it/user_examples.ssi
+++ b/manual/it/user_examples.ssi
@@ -238,36 +238,40 @@ utenti Debian Live.
*{Caso d'uso:}* creare un'immagine con live-build per avviare direttamente un server VNC.
-_* Creare una directory di lavoro: #{$ mkdir vncBuild}#
+Make a build directory and create a skeletal configuration in it, including
+#{gdm3}#, #{metacity}# and #{xtightvncviewer}#:
-_* Spostarsi nella directory: #{$ cd vncBuild}#
-
-Esempio per configurare la directory di costruzione per includere gdm
-metacity xtightvncviewer: #{$ lb config --packages "gdm3 metacity
-xtightvncviewer"}#
+code{
-Creare una directory /etc/skel per un .xsession personalizzato per l'utente
-predefinito: #{$ mkdir -p config/chroot_local-includes/etc/skel}#
+$ mkdir vnc_kiosk_client $ cd vnc_kiosk_client $ lb config -p standard-x11
+--packages "gdm3 metacity xtightvncviewer"
-Creare il file .xsession per l'utente: #{$ touch
-config/chroot_local-includes/etc/skel/.xsession}#
+}code
-Modificare il file .xsession per lanciare metacity e xvncviewer con qualcosa
-simile a quanto segue:
+Create the directory #{/etc/skel}# and put a custom #{.xsession}# in it for
+the default user that will launch metacity and start xvncviewer, connecting
+to port #{5901}# on a server at #{192.168.1.2}#:
code{
-#!/bin/sh
+$ mkdir -p config/chroot_local-includes/etc/skel $ cat
+config/chroot_local-includes/etc/skel/.xsession <<END #!/bin/sh
-/usr/bin/metacity & /usr/bin/vncviewer xxx.xxx.xxx.xxx:PORT
+/usr/bin/metacity & /usr/bin/xvncviewer 192.168.1.2:1
-exit
+exit END
}code
-_* Costruire l'immagine: #{# lb build}#
+Build the image:
+
+code{
+
+# lb build
+
+}code
-_* Buon divertimento.
+Enjoy.
2~ Un'immagine base per una chiavetta USB da 128M
diff --git a/manual/po/de/user_basics.ssi.po b/manual/po/de/user_basics.ssi.po
index e6958a2..e39af56 100644
--- a/manual/po/de/user_basics.ssi.po
+++ b/manual/po/de/user_basics.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2010-12-17 13:44+0100\n"
+"POT-Creation-Date: 2010-12-19 10:06-0400\n"
"PO-Revision-Date: 2010-10-03 20:30+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -54,7 +54,8 @@ msgstr ""
#: en/user_customization-packages.ssi:291
#: en/user_customization-packages.ssi:303
#: en/user_customization-packages.ssi:313
-#: en/user_customization-packages.ssi:331 en/user_customization-runtime.ssi:14
+#: en/user_customization-packages.ssi:331
+#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
#: en/user_customization-runtime.ssi:50 en/user_customization-runtime.ssi:58
#: en/user_customization-runtime.ssi:66 en/user_customization-runtime.ssi:86
@@ -63,15 +64,15 @@ msgstr ""
#: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
#: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
-#: en/user_examples.ssi:162 en/user_examples.ssi:188 en/user_examples.ssi:209
-#: en/user_examples.ssi:217 en/user_examples.ssi:235 en/user_examples.ssi:243
-#: en/user_examples.ssi:256 en/user_examples.ssi:271
-#: en/user_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi:74 en/user_installation.ssi:82
-#: en/user_installation.ssi:90 en/user_installation.ssi:114
-#: en/user_installation.ssi:129 en/user_installation.ssi:146
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_examples.ssi:162 en/user_examples.ssi:178 en/user_examples.ssi:188
+#: en/user_examples.ssi:204 en/user_examples.ssi:218 en/user_examples.ssi:226
+#: en/user_examples.ssi:244 en/user_examples.ssi:252 en/user_examples.ssi:265
+#: en/user_examples.ssi:280 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:74
+#: en/user_installation.ssi:82 en/user_installation.ssi:90
+#: en/user_installation.ssi:114 en/user_installation.ssi:129
+#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
@@ -117,7 +118,8 @@ msgstr ""
#: en/user_customization-packages.ssi:295
#: en/user_customization-packages.ssi:307
#: en/user_customization-packages.ssi:317
-#: en/user_customization-packages.ssi:344 en/user_customization-runtime.ssi:18
+#: en/user_customization-packages.ssi:344
+#: en/user_customization-packages.ssi:354 en/user_customization-runtime.ssi:18
#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:46
#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:62
#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:90
@@ -126,15 +128,15 @@ msgstr ""
#: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
#: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
#: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
-#: en/user_examples.ssi:166 en/user_examples.ssi:197 en/user_examples.ssi:213
-#: en/user_examples.ssi:221 en/user_examples.ssi:239 en/user_examples.ssi:252
-#: en/user_examples.ssi:267 en/user_examples.ssi:285
-#: en/user_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi:70
-#: en/user_installation.ssi:78 en/user_installation.ssi:86
-#: en/user_installation.ssi:94 en/user_installation.ssi:119
-#: en/user_installation.ssi:136 en/user_installation.ssi:150
-#: en/user_managing_a_configuration.ssi:31
+#: en/user_examples.ssi:166 en/user_examples.ssi:184 en/user_examples.ssi:200
+#: en/user_examples.ssi:208 en/user_examples.ssi:222 en/user_examples.ssi:230
+#: en/user_examples.ssi:248 en/user_examples.ssi:261 en/user_examples.ssi:276
+#: en/user_examples.ssi:294 en/user_installation.ssi:42
+#: en/user_installation.ssi:50 en/user_installation.ssi:60
+#: en/user_installation.ssi:70 en/user_installation.ssi:78
+#: en/user_installation.ssi:86 en/user_installation.ssi:94
+#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: en/user_installation.ssi:150 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
@@ -279,7 +281,7 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:42 en/user_basics.ssi:118 en/user_basics.ssi:202
-#: en/user_examples.ssi:109 en/user_examples.ssi:156
+#: en/user_examples.ssi:109 en/user_examples.ssi:156 en/user_examples.ssi:206
msgid "# lb build"
msgstr ""
@@ -397,7 +399,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:102 en/user_basics.ssi:184
+#: en/user_basics.ssi:102
msgid "$ lb clean --binary"
msgstr ""
@@ -536,10 +538,15 @@ msgid ""
msgstr ""
#. type: Plain text
+#: en/user_basics.ssi:184
+msgid "# lb clean --binary"
+msgstr ""
+
+#. type: Plain text
#: en/user_basics.ssi:188
msgid ""
-"Run the #{lb config}# command with the parameters to configure the \"config/"
-"\" hierarchy to create our netboot image:"
+"Run the #{lb config}# command as follows to configure your image for "
+"netbooting:"
msgstr ""
#. type: Plain text
@@ -552,11 +559,12 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:196
msgid ""
-"In contrast with the ISO and USB/HDD images, netbooting does not support "
-"serving a filesystem image with the client, so the files must be served via "
-"NFS. The net-root-path and net-root-server options specify the location and "
-"server, respectively, of the NFS server where the filesytem image will be "
-"located at boot time."
+"In contrast with the ISO and USB/HDD images, netbooting does not, itself, "
+"serve the filesystem image to the client, so the files must be served via "
+"NFS. The #{--net-root-path}# and #{--net-root-server}# options specify the "
+"location and server, respectively, of the NFS server where the filesytem "
+"image will be located at boot time. Make sure these are set to suitable "
+"values for your network and server."
msgstr ""
#. type: Plain text
@@ -573,15 +581,17 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:208
msgid ""
-"For example, if you unpack the generated binary-net.tar.gz archive in the /"
-"srv/debian-live directory, you'll find the filesystem image in live/"
-"filesystem.squashfs and the kernel, initrd and pxelinux bootloader in "
-"tftpboot/debian-live/i386."
+"For example, if you unpack the generated #{binary-net.tar.gz}# archive in "
+"the #{/srv/debian-live}# directory, you'll find the filesystem image in #"
+"{live/filesystem.squashfs}# and the kernel, initrd and pxelinux bootloader "
+"in #{tftpboot/debian-live/i386}#."
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:210
-msgid "We must now configure three services on the server to enable netboot."
+msgid ""
+"We must now configure three services on the server to enable netboot: the "
+"DHCP server, the TFTP server and the NFS server."
msgstr ""
#. type: Plain text
@@ -601,7 +611,7 @@ msgstr ""
#: en/user_basics.ssi:216
msgid ""
"Here is an example for inspiration, written for the ISC DHCP server #{isc-"
-"dhcp-server}# in the /etc/dhcp/dhcpd.conf configuration file;"
+"dhcp-server}# in the #{/etc/dhcp/dhcpd.conf}# configuration file:"
msgstr ""
#. type: Plain text
@@ -656,13 +666,13 @@ msgstr ""
#: en/user_basics.ssi:244
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 /"
-"srv/debian-live/tftpboot, run as root the following command:"
+"inside a root directory, usually #{/srv/tftp}#. To let it serve files inside "
+"#{/srv/debian-live/tftpboot}#, run as root the following command:"
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:248
-msgid "dpkg-reconfigure -plow tftpd-hpa"
+msgid "# dpkg-reconfigure -plow tftpd-hpa"
msgstr ""
#. type: Plain text
@@ -685,14 +695,14 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:258
-msgid "You need to install the nfs-kernel-server package."
+msgid "You need to install the #{nfs-kernel-server}# package."
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:260
msgid ""
"Then, make the filesystem image available through NFS by adding a line like "
-"the following to /etc/exports:"
+"the following to #{/etc/exports}#:"
msgstr ""
#. type: Plain text
@@ -747,12 +757,12 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:286
-msgid "_* Install qemu, bridge-utils, sudo."
+msgid "_* Install #{qemu}#, #{bridge-utils}#, #{sudo}#."
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:288
-msgid "Edit /etc/qemu-ifup:"
+msgid "Edit #{/etc/qemu-ifup}#:"
msgstr ""
#. type: Plain text
@@ -766,12 +776,13 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:303
-msgid "Get, or build a grub-floppy-netboot (in the svn)."
+msgid "Get, or build a #{grub-floppy-netboot}# (in the svn)."
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:305
-msgid "Launch qemu with \"-net nic,vlan=0 -net tap,vlan=0,ifname=tun0\""
+msgid ""
+"Launch #{qemu}# with \"#{-net nic,vlan=0 -net tap,vlan=0,ifname=tun0}#\""
msgstr ""
#. type: Plain text
@@ -787,7 +798,8 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:311
msgid ""
-"_* Create a PXETester directory, and create a text file called pxe.vwx inside"
+"_* Create a PXETester directory, and create a text file called #{pxe.vwx}# "
+"inside"
msgstr ""
#. type: Plain text
diff --git a/manual/po/de/user_customization-packages.ssi.po b/manual/po/de/user_customization-packages.ssi.po
index f5ef70f..38dad2b 100644
--- a/manual/po/de/user_customization-packages.ssi.po
+++ b/manual/po/de/user_customization-packages.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2010-12-14 15:35-0400\n"
+"POT-Creation-Date: 2010-12-19 10:06-0400\n"
"PO-Revision-Date: 2010-10-03 20:30+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -32,10 +32,12 @@ msgstr ""
#: en/user_basics.ssi:116 en/user_basics.ssi:126 en/user_basics.ssi:140
#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
#: en/user_basics.ssi:182 en/user_basics.ssi:190 en/user_basics.ssi:200
-#: en/user_basics.ssi: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_basics.ssi:218 en/user_basics.ssi:246 en/user_basics.ssi:262
+#: en/user_basics.ssi:270 en/user_basics.ssi:290 en/user_basics.ssi:315
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
+#: en/user_customization-installer.ssi:32
+#: en/user_customization-installer.ssi:42
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:53
#: en/user_customization-packages.ssi:66 en/user_customization-packages.ssi:80
@@ -52,7 +54,8 @@ msgstr ""
#: en/user_customization-packages.ssi:291
#: en/user_customization-packages.ssi:303
#: en/user_customization-packages.ssi:313
-#: en/user_customization-packages.ssi:331 en/user_customization-runtime.ssi:14
+#: en/user_customization-packages.ssi:331
+#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
#: en/user_customization-runtime.ssi:50 en/user_customization-runtime.ssi:58
#: en/user_customization-runtime.ssi:66 en/user_customization-runtime.ssi:86
@@ -61,15 +64,15 @@ msgstr ""
#: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
#: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
-#: en/user_examples.ssi:162 en/user_examples.ssi:188 en/user_examples.ssi:209
-#: en/user_examples.ssi:217 en/user_examples.ssi:235 en/user_examples.ssi:243
-#: en/user_examples.ssi:256 en/user_examples.ssi:271
-#: en/user_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi:74 en/user_installation.ssi:82
-#: en/user_installation.ssi:90 en/user_installation.ssi:114
-#: en/user_installation.ssi:129 en/user_installation.ssi:146
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_examples.ssi:162 en/user_examples.ssi:178 en/user_examples.ssi:188
+#: en/user_examples.ssi:204 en/user_examples.ssi:218 en/user_examples.ssi:226
+#: en/user_examples.ssi:244 en/user_examples.ssi:252 en/user_examples.ssi:265
+#: en/user_examples.ssi:280 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:74
+#: en/user_installation.ssi:82 en/user_installation.ssi:90
+#: en/user_installation.ssi:114 en/user_installation.ssi:129
+#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
@@ -93,10 +96,12 @@ msgstr ""
#: en/user_basics.ssi:120 en/user_basics.ssi:130 en/user_basics.ssi:146
#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
#: en/user_basics.ssi:186 en/user_basics.ssi:194 en/user_basics.ssi:204
-#: en/user_basics.ssi: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:238 en/user_basics.ssi:250 en/user_basics.ssi:266
+#: en/user_basics.ssi:274 en/user_basics.ssi:301 en/user_basics.ssi:340
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
+#: en/user_customization-installer.ssi:36
+#: en/user_customization-installer.ssi:46
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:58
#: en/user_customization-packages.ssi:70 en/user_customization-packages.ssi:84
@@ -113,7 +118,8 @@ msgstr ""
#: en/user_customization-packages.ssi:295
#: en/user_customization-packages.ssi:307
#: en/user_customization-packages.ssi:317
-#: en/user_customization-packages.ssi:344 en/user_customization-runtime.ssi:18
+#: en/user_customization-packages.ssi:344
+#: en/user_customization-packages.ssi:354 en/user_customization-runtime.ssi:18
#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:46
#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:62
#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:90
@@ -122,15 +128,15 @@ msgstr ""
#: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
#: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
#: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
-#: en/user_examples.ssi:166 en/user_examples.ssi:197 en/user_examples.ssi:213
-#: en/user_examples.ssi:221 en/user_examples.ssi:239 en/user_examples.ssi:252
-#: en/user_examples.ssi:267 en/user_examples.ssi:285
-#: en/user_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi:70
-#: en/user_installation.ssi:78 en/user_installation.ssi:86
-#: en/user_installation.ssi:94 en/user_installation.ssi:119
-#: en/user_installation.ssi:136 en/user_installation.ssi:150
-#: en/user_managing_a_configuration.ssi:31
+#: en/user_examples.ssi:166 en/user_examples.ssi:184 en/user_examples.ssi:200
+#: en/user_examples.ssi:208 en/user_examples.ssi:222 en/user_examples.ssi:230
+#: en/user_examples.ssi:248 en/user_examples.ssi:261 en/user_examples.ssi:276
+#: en/user_examples.ssi:294 en/user_installation.ssi:42
+#: en/user_installation.ssi:50 en/user_installation.ssi:60
+#: en/user_installation.ssi:70 en/user_installation.ssi:78
+#: en/user_installation.ssi:86 en/user_installation.ssi:94
+#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: en/user_installation.ssi:150 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
@@ -988,13 +994,17 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:319
msgid ""
-"The tradeoff here is that recommended packages are defined as \"packages "
-"that would be found together with this one in all but unusual installations"
-"\" (Debian Policy Manual, 7.2). This may lead to some packages that you "
-"actually need being omitted, so we suggest you review the difference this "
-"makes to your packages list (see the #{binary.packages}# file generated by #"
-"{lb build}#) and re-include in your list any missing packages that you still "
-"want installed."
+"The tradeoff here is that if you don't install recommended packages for a "
+"given package, that is, \"packages that would be found together with this "
+"one in all but unusual installations\" (Debian Policy Manual, 7.2), some "
+"packages that you actually need may be omitted. Therefore, we suggest you "
+"review the difference turning off recommends makes to your packages list "
+"(see the #{binary.packages}# file generated by #{lb build}#) and re-include "
+"in your list any missing packages that you still want installed. "
+"Alternatively, if you find you only want a small number of recommended "
+"packages left out, leave recommends enabled and set a negative APT pin "
+"priority on selected packages to prevent them from being installed, as "
+"explained in {APT pinning}#apt-pinning."
msgstr ""
#. type: Plain text
@@ -1047,3 +1057,19 @@ msgstr ""
#: en/user_customization-packages.ssi:342
msgid "Package: * Pin: release n=sid Pin-Priority: 1 END"
msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:346
+msgid ""
+"Negative pin priorities will prevent a package from being installed, as in "
+"the case where you do not want a package that is recommended by another "
+"package. Suppose you are building a GNOME image but don't want the user "
+"prompted to store wifi passwords in the keyring, so you want to omit the "
+"recommended #{gnome-keyring}# package. This can be done by adding the "
+"following stanza to #{config/chroot_apt/preferences}#:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:352
+msgid "Package: gnome-keyring Pin: version * Pin-Priority: -1"
+msgstr ""
diff --git a/manual/po/de/user_examples.ssi.po b/manual/po/de/user_examples.ssi.po
index bd0f71f..3e3b2fe 100644
--- a/manual/po/de/user_examples.ssi.po
+++ b/manual/po/de/user_examples.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2010-12-16 21:32-0400\n"
+"POT-Creation-Date: 2010-12-19 10:06-0400\n"
"PO-Revision-Date: 2010-11-04 16:34-0400\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -37,8 +37,8 @@ msgstr ""
#: en/user_basics.ssi:116 en/user_basics.ssi:126 en/user_basics.ssi:140
#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
#: en/user_basics.ssi:182 en/user_basics.ssi:190 en/user_basics.ssi:200
-#: en/user_basics.ssi: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_basics.ssi:218 en/user_basics.ssi:246 en/user_basics.ssi:262
+#: en/user_basics.ssi:270 en/user_basics.ssi:290 en/user_basics.ssi:315
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
@@ -59,7 +59,8 @@ msgstr ""
#: en/user_customization-packages.ssi:291
#: en/user_customization-packages.ssi:303
#: en/user_customization-packages.ssi:313
-#: en/user_customization-packages.ssi:331 en/user_customization-runtime.ssi:14
+#: en/user_customization-packages.ssi:331
+#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
#: en/user_customization-runtime.ssi:50 en/user_customization-runtime.ssi:58
#: en/user_customization-runtime.ssi:66 en/user_customization-runtime.ssi:86
@@ -68,15 +69,15 @@ msgstr ""
#: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
#: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
-#: en/user_examples.ssi:162 en/user_examples.ssi:188 en/user_examples.ssi:209
-#: en/user_examples.ssi:217 en/user_examples.ssi:235 en/user_examples.ssi:243
-#: en/user_examples.ssi:256 en/user_examples.ssi:271
-#: en/user_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi:74 en/user_installation.ssi:82
-#: en/user_installation.ssi:90 en/user_installation.ssi:114
-#: en/user_installation.ssi:129 en/user_installation.ssi:146
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_examples.ssi:162 en/user_examples.ssi:178 en/user_examples.ssi:188
+#: en/user_examples.ssi:204 en/user_examples.ssi:218 en/user_examples.ssi:226
+#: en/user_examples.ssi:244 en/user_examples.ssi:252 en/user_examples.ssi:265
+#: en/user_examples.ssi:280 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:74
+#: en/user_installation.ssi:82 en/user_installation.ssi:90
+#: en/user_installation.ssi:114 en/user_installation.ssi:129
+#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
@@ -100,8 +101,8 @@ msgstr ""
#: en/user_basics.ssi:120 en/user_basics.ssi:130 en/user_basics.ssi:146
#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
#: en/user_basics.ssi:186 en/user_basics.ssi:194 en/user_basics.ssi:204
-#: en/user_basics.ssi: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:238 en/user_basics.ssi:250 en/user_basics.ssi:266
+#: en/user_basics.ssi:274 en/user_basics.ssi:301 en/user_basics.ssi:340
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:36
@@ -122,7 +123,8 @@ msgstr ""
#: en/user_customization-packages.ssi:295
#: en/user_customization-packages.ssi:307
#: en/user_customization-packages.ssi:317
-#: en/user_customization-packages.ssi:344 en/user_customization-runtime.ssi:18
+#: en/user_customization-packages.ssi:344
+#: en/user_customization-packages.ssi:354 en/user_customization-runtime.ssi:18
#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:46
#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:62
#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:90
@@ -131,15 +133,15 @@ msgstr ""
#: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
#: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
#: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
-#: en/user_examples.ssi:166 en/user_examples.ssi:197 en/user_examples.ssi:213
-#: en/user_examples.ssi:221 en/user_examples.ssi:239 en/user_examples.ssi:252
-#: en/user_examples.ssi:267 en/user_examples.ssi:285
-#: en/user_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi:70
-#: en/user_installation.ssi:78 en/user_installation.ssi:86
-#: en/user_installation.ssi:94 en/user_installation.ssi:119
-#: en/user_installation.ssi:136 en/user_installation.ssi:150
-#: en/user_managing_a_configuration.ssi:31
+#: en/user_examples.ssi:166 en/user_examples.ssi:184 en/user_examples.ssi:200
+#: en/user_examples.ssi:208 en/user_examples.ssi:222 en/user_examples.ssi:230
+#: en/user_examples.ssi:248 en/user_examples.ssi:261 en/user_examples.ssi:276
+#: en/user_examples.ssi:294 en/user_installation.ssi:42
+#: en/user_installation.ssi:50 en/user_installation.ssi:60
+#: en/user_installation.ssi:70 en/user_installation.ssi:78
+#: en/user_installation.ssi:86 en/user_installation.ssi:94
+#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: en/user_installation.ssi:150 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
@@ -149,7 +151,7 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:42 en/user_basics.ssi:118 en/user_basics.ssi:202
-#: en/user_examples.ssi:109 en/user_examples.ssi:156
+#: en/user_examples.ssi:109 en/user_examples.ssi:156 en/user_examples.ssi:206
msgid "# lb build"
msgstr ""
@@ -244,7 +246,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:42 en/user_examples.ssi:66 en/user_examples.ssi:219
+#: en/user_examples.ssi:42 en/user_examples.ssi:66 en/user_examples.ssi:228
msgid "# lb build 2>&1 | tee binary.log"
msgstr ""
@@ -347,7 +349,7 @@ msgid "Edit #{auto/config}# to read as follows:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:92 en/user_examples.ssi:141 en/user_examples.ssi:190
+#: en/user_examples.ssi:92 en/user_examples.ssi:141
msgid "#!/bin/sh"
msgstr ""
@@ -491,75 +493,66 @@ msgstr ""
#. type: Plain text
#: en/user_examples.ssi:176
-msgid "_* Make a build directory: #{$ mkdir vncBuild}#"
-msgstr ""
-
-#. type: Plain text
-#: en/user_examples.ssi:178
-msgid "_* Move to the build directory: #{$ cd vncBuild}#"
-msgstr ""
-
-#. type: Plain text
-#: en/user_examples.ssi:180
msgid ""
-"Example to config the build directory to include gdm metacity "
-"xtightvncviewer: #{$ lb config --packages \"gdm3 metacity xtightvncviewer\"}#"
+"Make a build directory and create a skeletal configuration in it, including #"
+"{gdm3}#, #{metacity}# and #{xtightvncviewer}#:"
msgstr ""
#. type: Plain text
#: en/user_examples.ssi:182
msgid ""
-"Create a folder /etc/skel folder for a custom .xsession for the default "
-"user: #{$ mkdir -p config/chroot_local-includes/etc/skel}#"
+"$ mkdir vnc_kiosk_client $ cd vnc_kiosk_client $ lb config -p standard-x11 --"
+"packages \"gdm3 metacity xtightvncviewer\""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:184
+#: en/user_examples.ssi:186
msgid ""
-"Create the .xsession for the default user: #{$ touch config/chroot_local-"
-"includes/etc/skel/.xsession}#"
+"Create the directory #{/etc/skel}# and put a custom #{.xsession}# in it for "
+"the default user that will launch metacity and start xvncviewer, connecting "
+"to port #{5901}# on a server at #{192.168.1.2}#:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:186
+#: en/user_examples.ssi:192
msgid ""
-"Edit the .xsession file to launch metacity and start xvncviewer with "
-"something similar to the below:"
+"$ mkdir -p config/chroot_local-includes/etc/skel $ cat config/chroot_local-"
+"includes/etc/skel/.xsession <<END #!/bin/sh"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:193
-msgid "/usr/bin/metacity & /usr/bin/vncviewer xxx.xxx.xxx.xxx:PORT"
+#: en/user_examples.ssi:195
+msgid "/usr/bin/metacity & /usr/bin/xvncviewer 192.168.1.2:1"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:195
-msgid "exit"
+#: en/user_examples.ssi:198
+msgid "exit END"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:199
-msgid "_* Build the image: #{# lb build}#"
+#: en/user_examples.ssi:202
+msgid "Build the image:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:201
-msgid "_* Enjoy."
+#: en/user_examples.ssi:210
+msgid "Enjoy."
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:203
+#: en/user_examples.ssi:212
msgid "2~ A base image for a 128M USB key"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:205
+#: en/user_examples.ssi:214
#, no-wrap
msgid "*{Use case:}* Create a standard image with some components removed in order to fit on a 128M USB key with space left over to use as you see fit.\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:207
+#: en/user_examples.ssi:216
msgid ""
"When optimizing an image to fit a certain media size, you need to understand "
"the tradeoffs you are making between size and functionality. In this "
@@ -573,19 +566,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:211
+#: en/user_examples.ssi:220
msgid ""
"$ lb config -k 486 -p minimal --binary-indices false --memtest none --apt-"
"recommends false --includes none"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:215
+#: en/user_examples.ssi:224
msgid "Now, build the image in the usual way:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:223
+#: en/user_examples.ssi:232
msgid ""
"On the author's system at time of writing, the above configuration produced "
"a 78Mbyte image. This compares favourably with the 166Mbyte image produced "
@@ -593,7 +586,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:225
+#: en/user_examples.ssi:234
msgid ""
"The biggest space-saver here, compared to building a standard image on an #"
"{i386}# architecture system, is to select only the #{486}# kernel flavour "
@@ -611,18 +604,18 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:227
+#: en/user_examples.ssi:236
msgid "2~ A localized KDE desktop and installer"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:229
+#: en/user_examples.ssi:238
#, no-wrap
msgid "*{Use case:}* Create a KDE desktop image, localized for Brazilian Portuguese and including an installer.\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:231
+#: en/user_examples.ssi:240
msgid ""
"We want to make an iso-hybrid image for i386 architecture using our "
"preferred desktop, in this case KDE, containing all of the same packages "
@@ -630,7 +623,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:233
+#: en/user_examples.ssi:242
msgid ""
"Our initial problem is the discovery of the names of the appropriate tasks. "
"Currently, live-build cannot help with this. While we might get lucky and "
@@ -640,17 +633,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:237
+#: en/user_examples.ssi:246
msgid "# apt-get install dctrl-tools tasksel-data"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:241
+#: en/user_examples.ssi:250
msgid "Now we can search for the appropriate tasks, first with:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:250
+#: en/user_examples.ssi:259
#, no-wrap
msgid ""
"$ grep-dctrl -FTest-lang pt_BR /usr/share/tasksel/debian-tasks.desc -sTask,Description\n"
@@ -662,14 +655,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:254
+#: en/user_examples.ssi:263
msgid ""
"By this command, we discover the task is called, plainly enough, brazilian-"
"portuguese. Now to find the related tasks:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:261
+#: en/user_examples.ssi:270
#, no-wrap
msgid ""
"$ grep-dctrl -FEnhances brazilian-portuguese /usr/share/tasksel/debian-tasks.desc -sTask,Description\n"
@@ -679,7 +672,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:265
+#: en/user_examples.ssi:274
#, no-wrap
msgid ""
"Task: brazilian-portuguese-kde-desktop\n"
@@ -688,7 +681,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:269
+#: en/user_examples.ssi:278
msgid ""
"We will use the experimental #{--language}# option, as live-build happens to "
"include #{syslinux}# templates for pt_BR (see {Desktop and language tasks}"
@@ -698,7 +691,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:283
+#: en/user_examples.ssi:292
#, no-wrap
msgid ""
"$ mkdir live-pt_BR-kde\n"
@@ -715,7 +708,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:287
+#: en/user_examples.ssi:296
msgid ""
"Note that we have included the #{debian-installer-launcher}# package to "
"launch the installer from the live desktop, and have also specified the 486 "
diff --git a/manual/po/fr/user_basics.ssi.po b/manual/po/fr/user_basics.ssi.po
index 1dc0647..8521ede 100644
--- a/manual/po/fr/user_basics.ssi.po
+++ b/manual/po/fr/user_basics.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2010-12-17 13:44+0100\n"
+"POT-Creation-Date: 2010-12-19 10:06-0400\n"
"PO-Revision-Date: 2010-10-20 06:53-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -54,7 +54,8 @@ msgstr ""
#: en/user_customization-packages.ssi:291
#: en/user_customization-packages.ssi:303
#: en/user_customization-packages.ssi:313
-#: en/user_customization-packages.ssi:331 en/user_customization-runtime.ssi:14
+#: en/user_customization-packages.ssi:331
+#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
#: en/user_customization-runtime.ssi:50 en/user_customization-runtime.ssi:58
#: en/user_customization-runtime.ssi:66 en/user_customization-runtime.ssi:86
@@ -63,15 +64,15 @@ msgstr ""
#: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
#: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
-#: en/user_examples.ssi:162 en/user_examples.ssi:188 en/user_examples.ssi:209
-#: en/user_examples.ssi:217 en/user_examples.ssi:235 en/user_examples.ssi:243
-#: en/user_examples.ssi:256 en/user_examples.ssi:271
-#: en/user_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi:74 en/user_installation.ssi:82
-#: en/user_installation.ssi:90 en/user_installation.ssi:114
-#: en/user_installation.ssi:129 en/user_installation.ssi:146
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_examples.ssi:162 en/user_examples.ssi:178 en/user_examples.ssi:188
+#: en/user_examples.ssi:204 en/user_examples.ssi:218 en/user_examples.ssi:226
+#: en/user_examples.ssi:244 en/user_examples.ssi:252 en/user_examples.ssi:265
+#: en/user_examples.ssi:280 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:74
+#: en/user_installation.ssi:82 en/user_installation.ssi:90
+#: en/user_installation.ssi:114 en/user_installation.ssi:129
+#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
@@ -117,7 +118,8 @@ msgstr "code{"
#: en/user_customization-packages.ssi:295
#: en/user_customization-packages.ssi:307
#: en/user_customization-packages.ssi:317
-#: en/user_customization-packages.ssi:344 en/user_customization-runtime.ssi:18
+#: en/user_customization-packages.ssi:344
+#: en/user_customization-packages.ssi:354 en/user_customization-runtime.ssi:18
#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:46
#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:62
#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:90
@@ -126,15 +128,15 @@ msgstr "code{"
#: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
#: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
#: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
-#: en/user_examples.ssi:166 en/user_examples.ssi:197 en/user_examples.ssi:213
-#: en/user_examples.ssi:221 en/user_examples.ssi:239 en/user_examples.ssi:252
-#: en/user_examples.ssi:267 en/user_examples.ssi:285
-#: en/user_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi:70
-#: en/user_installation.ssi:78 en/user_installation.ssi:86
-#: en/user_installation.ssi:94 en/user_installation.ssi:119
-#: en/user_installation.ssi:136 en/user_installation.ssi:150
-#: en/user_managing_a_configuration.ssi:31
+#: en/user_examples.ssi:166 en/user_examples.ssi:184 en/user_examples.ssi:200
+#: en/user_examples.ssi:208 en/user_examples.ssi:222 en/user_examples.ssi:230
+#: en/user_examples.ssi:248 en/user_examples.ssi:261 en/user_examples.ssi:276
+#: en/user_examples.ssi:294 en/user_installation.ssi:42
+#: en/user_installation.ssi:50 en/user_installation.ssi:60
+#: en/user_installation.ssi:70 en/user_installation.ssi:78
+#: en/user_installation.ssi:86 en/user_installation.ssi:94
+#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: en/user_installation.ssi:150 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
@@ -279,7 +281,7 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:42 en/user_basics.ssi:118 en/user_basics.ssi:202
-#: en/user_examples.ssi:109 en/user_examples.ssi:156
+#: en/user_examples.ssi:109 en/user_examples.ssi:156 en/user_examples.ssi:206
msgid "# lb build"
msgstr ""
@@ -397,7 +399,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:102 en/user_basics.ssi:184
+#: en/user_basics.ssi:102
msgid "$ lb clean --binary"
msgstr ""
@@ -536,10 +538,15 @@ msgid ""
msgstr ""
#. type: Plain text
+#: en/user_basics.ssi:184
+msgid "# lb clean --binary"
+msgstr ""
+
+#. type: Plain text
#: en/user_basics.ssi:188
msgid ""
-"Run the #{lb config}# command with the parameters to configure the \"config/"
-"\" hierarchy to create our netboot image:"
+"Run the #{lb config}# command as follows to configure your image for "
+"netbooting:"
msgstr ""
#. type: Plain text
@@ -552,11 +559,12 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:196
msgid ""
-"In contrast with the ISO and USB/HDD images, netbooting does not support "
-"serving a filesystem image with the client, so the files must be served via "
-"NFS. The net-root-path and net-root-server options specify the location and "
-"server, respectively, of the NFS server where the filesytem image will be "
-"located at boot time."
+"In contrast with the ISO and USB/HDD images, netbooting does not, itself, "
+"serve the filesystem image to the client, so the files must be served via "
+"NFS. The #{--net-root-path}# and #{--net-root-server}# options specify the "
+"location and server, respectively, of the NFS server where the filesytem "
+"image will be located at boot time. Make sure these are set to suitable "
+"values for your network and server."
msgstr ""
#. type: Plain text
@@ -573,15 +581,17 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:208
msgid ""
-"For example, if you unpack the generated binary-net.tar.gz archive in the /"
-"srv/debian-live directory, you'll find the filesystem image in live/"
-"filesystem.squashfs and the kernel, initrd and pxelinux bootloader in "
-"tftpboot/debian-live/i386."
+"For example, if you unpack the generated #{binary-net.tar.gz}# archive in "
+"the #{/srv/debian-live}# directory, you'll find the filesystem image in #"
+"{live/filesystem.squashfs}# and the kernel, initrd and pxelinux bootloader "
+"in #{tftpboot/debian-live/i386}#."
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:210
-msgid "We must now configure three services on the server to enable netboot."
+msgid ""
+"We must now configure three services on the server to enable netboot: the "
+"DHCP server, the TFTP server and the NFS server."
msgstr ""
#. type: Plain text
@@ -601,7 +611,7 @@ msgstr ""
#: en/user_basics.ssi:216
msgid ""
"Here is an example for inspiration, written for the ISC DHCP server #{isc-"
-"dhcp-server}# in the /etc/dhcp/dhcpd.conf configuration file;"
+"dhcp-server}# in the #{/etc/dhcp/dhcpd.conf}# configuration file:"
msgstr ""
#. type: Plain text
@@ -656,13 +666,13 @@ msgstr ""
#: en/user_basics.ssi:244
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 /"
-"srv/debian-live/tftpboot, run as root the following command:"
+"inside a root directory, usually #{/srv/tftp}#. To let it serve files inside "
+"#{/srv/debian-live/tftpboot}#, run as root the following command:"
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:248
-msgid "dpkg-reconfigure -plow tftpd-hpa"
+msgid "# dpkg-reconfigure -plow tftpd-hpa"
msgstr ""
#. type: Plain text
@@ -685,14 +695,14 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:258
-msgid "You need to install the nfs-kernel-server package."
+msgid "You need to install the #{nfs-kernel-server}# package."
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:260
msgid ""
"Then, make the filesystem image available through NFS by adding a line like "
-"the following to /etc/exports:"
+"the following to #{/etc/exports}#:"
msgstr ""
#. type: Plain text
@@ -747,12 +757,12 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:286
-msgid "_* Install qemu, bridge-utils, sudo."
+msgid "_* Install #{qemu}#, #{bridge-utils}#, #{sudo}#."
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:288
-msgid "Edit /etc/qemu-ifup:"
+msgid "Edit #{/etc/qemu-ifup}#:"
msgstr ""
#. type: Plain text
@@ -766,12 +776,13 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:303
-msgid "Get, or build a grub-floppy-netboot (in the svn)."
+msgid "Get, or build a #{grub-floppy-netboot}# (in the svn)."
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:305
-msgid "Launch qemu with \"-net nic,vlan=0 -net tap,vlan=0,ifname=tun0\""
+msgid ""
+"Launch #{qemu}# with \"#{-net nic,vlan=0 -net tap,vlan=0,ifname=tun0}#\""
msgstr ""
#. type: Plain text
@@ -787,7 +798,8 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:311
msgid ""
-"_* Create a PXETester directory, and create a text file called pxe.vwx inside"
+"_* Create a PXETester directory, and create a text file called #{pxe.vwx}# "
+"inside"
msgstr ""
#. type: Plain text
diff --git a/manual/po/fr/user_customization-packages.ssi.po b/manual/po/fr/user_customization-packages.ssi.po
index e5d8833..556483c 100644
--- a/manual/po/fr/user_customization-packages.ssi.po
+++ b/manual/po/fr/user_customization-packages.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2010-12-14 15:35-0400\n"
+"POT-Creation-Date: 2010-12-19 10:06-0400\n"
"PO-Revision-Date: 2010-10-16 14:45-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -32,10 +32,12 @@ msgstr ""
#: en/user_basics.ssi:116 en/user_basics.ssi:126 en/user_basics.ssi:140
#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
#: en/user_basics.ssi:182 en/user_basics.ssi:190 en/user_basics.ssi:200
-#: en/user_basics.ssi: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_basics.ssi:218 en/user_basics.ssi:246 en/user_basics.ssi:262
+#: en/user_basics.ssi:270 en/user_basics.ssi:290 en/user_basics.ssi:315
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
+#: en/user_customization-installer.ssi:32
+#: en/user_customization-installer.ssi:42
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:53
#: en/user_customization-packages.ssi:66 en/user_customization-packages.ssi:80
@@ -52,7 +54,8 @@ msgstr ""
#: en/user_customization-packages.ssi:291
#: en/user_customization-packages.ssi:303
#: en/user_customization-packages.ssi:313
-#: en/user_customization-packages.ssi:331 en/user_customization-runtime.ssi:14
+#: en/user_customization-packages.ssi:331
+#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
#: en/user_customization-runtime.ssi:50 en/user_customization-runtime.ssi:58
#: en/user_customization-runtime.ssi:66 en/user_customization-runtime.ssi:86
@@ -61,15 +64,15 @@ msgstr ""
#: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
#: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
-#: en/user_examples.ssi:162 en/user_examples.ssi:188 en/user_examples.ssi:209
-#: en/user_examples.ssi:217 en/user_examples.ssi:235 en/user_examples.ssi:243
-#: en/user_examples.ssi:256 en/user_examples.ssi:271
-#: en/user_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi:74 en/user_installation.ssi:82
-#: en/user_installation.ssi:90 en/user_installation.ssi:114
-#: en/user_installation.ssi:129 en/user_installation.ssi:146
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_examples.ssi:162 en/user_examples.ssi:178 en/user_examples.ssi:188
+#: en/user_examples.ssi:204 en/user_examples.ssi:218 en/user_examples.ssi:226
+#: en/user_examples.ssi:244 en/user_examples.ssi:252 en/user_examples.ssi:265
+#: en/user_examples.ssi:280 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:74
+#: en/user_installation.ssi:82 en/user_installation.ssi:90
+#: en/user_installation.ssi:114 en/user_installation.ssi:129
+#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
@@ -93,10 +96,12 @@ msgstr "code{"
#: en/user_basics.ssi:120 en/user_basics.ssi:130 en/user_basics.ssi:146
#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
#: en/user_basics.ssi:186 en/user_basics.ssi:194 en/user_basics.ssi:204
-#: en/user_basics.ssi: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:238 en/user_basics.ssi:250 en/user_basics.ssi:266
+#: en/user_basics.ssi:274 en/user_basics.ssi:301 en/user_basics.ssi:340
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
+#: en/user_customization-installer.ssi:36
+#: en/user_customization-installer.ssi:46
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:58
#: en/user_customization-packages.ssi:70 en/user_customization-packages.ssi:84
@@ -113,7 +118,8 @@ msgstr "code{"
#: en/user_customization-packages.ssi:295
#: en/user_customization-packages.ssi:307
#: en/user_customization-packages.ssi:317
-#: en/user_customization-packages.ssi:344 en/user_customization-runtime.ssi:18
+#: en/user_customization-packages.ssi:344
+#: en/user_customization-packages.ssi:354 en/user_customization-runtime.ssi:18
#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:46
#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:62
#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:90
@@ -122,15 +128,15 @@ msgstr "code{"
#: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
#: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
#: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
-#: en/user_examples.ssi:166 en/user_examples.ssi:197 en/user_examples.ssi:213
-#: en/user_examples.ssi:221 en/user_examples.ssi:239 en/user_examples.ssi:252
-#: en/user_examples.ssi:267 en/user_examples.ssi:285
-#: en/user_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi:70
-#: en/user_installation.ssi:78 en/user_installation.ssi:86
-#: en/user_installation.ssi:94 en/user_installation.ssi:119
-#: en/user_installation.ssi:136 en/user_installation.ssi:150
-#: en/user_managing_a_configuration.ssi:31
+#: en/user_examples.ssi:166 en/user_examples.ssi:184 en/user_examples.ssi:200
+#: en/user_examples.ssi:208 en/user_examples.ssi:222 en/user_examples.ssi:230
+#: en/user_examples.ssi:248 en/user_examples.ssi:261 en/user_examples.ssi:276
+#: en/user_examples.ssi:294 en/user_installation.ssi:42
+#: en/user_installation.ssi:50 en/user_installation.ssi:60
+#: en/user_installation.ssi:70 en/user_installation.ssi:78
+#: en/user_installation.ssi:86 en/user_installation.ssi:94
+#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: en/user_installation.ssi:150 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
@@ -988,13 +994,17 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:319
msgid ""
-"The tradeoff here is that recommended packages are defined as \"packages "
-"that would be found together with this one in all but unusual installations"
-"\" (Debian Policy Manual, 7.2). This may lead to some packages that you "
-"actually need being omitted, so we suggest you review the difference this "
-"makes to your packages list (see the #{binary.packages}# file generated by #"
-"{lb build}#) and re-include in your list any missing packages that you still "
-"want installed."
+"The tradeoff here is that if you don't install recommended packages for a "
+"given package, that is, \"packages that would be found together with this "
+"one in all but unusual installations\" (Debian Policy Manual, 7.2), some "
+"packages that you actually need may be omitted. Therefore, we suggest you "
+"review the difference turning off recommends makes to your packages list "
+"(see the #{binary.packages}# file generated by #{lb build}#) and re-include "
+"in your list any missing packages that you still want installed. "
+"Alternatively, if you find you only want a small number of recommended "
+"packages left out, leave recommends enabled and set a negative APT pin "
+"priority on selected packages to prevent them from being installed, as "
+"explained in {APT pinning}#apt-pinning."
msgstr ""
#. type: Plain text
@@ -1047,3 +1057,19 @@ msgstr ""
#: en/user_customization-packages.ssi:342
msgid "Package: * Pin: release n=sid Pin-Priority: 1 END"
msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:346
+msgid ""
+"Negative pin priorities will prevent a package from being installed, as in "
+"the case where you do not want a package that is recommended by another "
+"package. Suppose you are building a GNOME image but don't want the user "
+"prompted to store wifi passwords in the keyring, so you want to omit the "
+"recommended #{gnome-keyring}# package. This can be done by adding the "
+"following stanza to #{config/chroot_apt/preferences}#:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:352
+msgid "Package: gnome-keyring Pin: version * Pin-Priority: -1"
+msgstr ""
diff --git a/manual/po/fr/user_examples.ssi.po b/manual/po/fr/user_examples.ssi.po
index 2c6fed7..e66e790 100644
--- a/manual/po/fr/user_examples.ssi.po
+++ b/manual/po/fr/user_examples.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2010-12-16 21:32-0400\n"
+"POT-Creation-Date: 2010-12-19 10:06-0400\n"
"PO-Revision-Date: 2010-11-04 16:34-0400\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -37,8 +37,8 @@ msgstr ""
#: en/user_basics.ssi:116 en/user_basics.ssi:126 en/user_basics.ssi:140
#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
#: en/user_basics.ssi:182 en/user_basics.ssi:190 en/user_basics.ssi:200
-#: en/user_basics.ssi: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_basics.ssi:218 en/user_basics.ssi:246 en/user_basics.ssi:262
+#: en/user_basics.ssi:270 en/user_basics.ssi:290 en/user_basics.ssi:315
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
@@ -59,7 +59,8 @@ msgstr ""
#: en/user_customization-packages.ssi:291
#: en/user_customization-packages.ssi:303
#: en/user_customization-packages.ssi:313
-#: en/user_customization-packages.ssi:331 en/user_customization-runtime.ssi:14
+#: en/user_customization-packages.ssi:331
+#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
#: en/user_customization-runtime.ssi:50 en/user_customization-runtime.ssi:58
#: en/user_customization-runtime.ssi:66 en/user_customization-runtime.ssi:86
@@ -68,15 +69,15 @@ msgstr ""
#: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
#: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
-#: en/user_examples.ssi:162 en/user_examples.ssi:188 en/user_examples.ssi:209
-#: en/user_examples.ssi:217 en/user_examples.ssi:235 en/user_examples.ssi:243
-#: en/user_examples.ssi:256 en/user_examples.ssi:271
-#: en/user_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi:74 en/user_installation.ssi:82
-#: en/user_installation.ssi:90 en/user_installation.ssi:114
-#: en/user_installation.ssi:129 en/user_installation.ssi:146
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_examples.ssi:162 en/user_examples.ssi:178 en/user_examples.ssi:188
+#: en/user_examples.ssi:204 en/user_examples.ssi:218 en/user_examples.ssi:226
+#: en/user_examples.ssi:244 en/user_examples.ssi:252 en/user_examples.ssi:265
+#: en/user_examples.ssi:280 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:74
+#: en/user_installation.ssi:82 en/user_installation.ssi:90
+#: en/user_installation.ssi:114 en/user_installation.ssi:129
+#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
@@ -100,8 +101,8 @@ msgstr "code{"
#: en/user_basics.ssi:120 en/user_basics.ssi:130 en/user_basics.ssi:146
#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
#: en/user_basics.ssi:186 en/user_basics.ssi:194 en/user_basics.ssi:204
-#: en/user_basics.ssi: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:238 en/user_basics.ssi:250 en/user_basics.ssi:266
+#: en/user_basics.ssi:274 en/user_basics.ssi:301 en/user_basics.ssi:340
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:36
@@ -122,7 +123,8 @@ msgstr "code{"
#: en/user_customization-packages.ssi:295
#: en/user_customization-packages.ssi:307
#: en/user_customization-packages.ssi:317
-#: en/user_customization-packages.ssi:344 en/user_customization-runtime.ssi:18
+#: en/user_customization-packages.ssi:344
+#: en/user_customization-packages.ssi:354 en/user_customization-runtime.ssi:18
#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:46
#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:62
#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:90
@@ -131,15 +133,15 @@ msgstr "code{"
#: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
#: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
#: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
-#: en/user_examples.ssi:166 en/user_examples.ssi:197 en/user_examples.ssi:213
-#: en/user_examples.ssi:221 en/user_examples.ssi:239 en/user_examples.ssi:252
-#: en/user_examples.ssi:267 en/user_examples.ssi:285
-#: en/user_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi:70
-#: en/user_installation.ssi:78 en/user_installation.ssi:86
-#: en/user_installation.ssi:94 en/user_installation.ssi:119
-#: en/user_installation.ssi:136 en/user_installation.ssi:150
-#: en/user_managing_a_configuration.ssi:31
+#: en/user_examples.ssi:166 en/user_examples.ssi:184 en/user_examples.ssi:200
+#: en/user_examples.ssi:208 en/user_examples.ssi:222 en/user_examples.ssi:230
+#: en/user_examples.ssi:248 en/user_examples.ssi:261 en/user_examples.ssi:276
+#: en/user_examples.ssi:294 en/user_installation.ssi:42
+#: en/user_installation.ssi:50 en/user_installation.ssi:60
+#: en/user_installation.ssi:70 en/user_installation.ssi:78
+#: en/user_installation.ssi:86 en/user_installation.ssi:94
+#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: en/user_installation.ssi:150 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
@@ -149,7 +151,7 @@ msgstr "}code"
#. type: Plain text
#: en/user_basics.ssi:42 en/user_basics.ssi:118 en/user_basics.ssi:202
-#: en/user_examples.ssi:109 en/user_examples.ssi:156
+#: en/user_examples.ssi:109 en/user_examples.ssi:156 en/user_examples.ssi:206
msgid "# lb build"
msgstr ""
@@ -244,7 +246,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:42 en/user_examples.ssi:66 en/user_examples.ssi:219
+#: en/user_examples.ssi:42 en/user_examples.ssi:66 en/user_examples.ssi:228
msgid "# lb build 2>&1 | tee binary.log"
msgstr ""
@@ -347,7 +349,7 @@ msgid "Edit #{auto/config}# to read as follows:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:92 en/user_examples.ssi:141 en/user_examples.ssi:190
+#: en/user_examples.ssi:92 en/user_examples.ssi:141
msgid "#!/bin/sh"
msgstr ""
@@ -491,75 +493,66 @@ msgstr ""
#. type: Plain text
#: en/user_examples.ssi:176
-msgid "_* Make a build directory: #{$ mkdir vncBuild}#"
-msgstr ""
-
-#. type: Plain text
-#: en/user_examples.ssi:178
-msgid "_* Move to the build directory: #{$ cd vncBuild}#"
-msgstr ""
-
-#. type: Plain text
-#: en/user_examples.ssi:180
msgid ""
-"Example to config the build directory to include gdm metacity "
-"xtightvncviewer: #{$ lb config --packages \"gdm3 metacity xtightvncviewer\"}#"
+"Make a build directory and create a skeletal configuration in it, including #"
+"{gdm3}#, #{metacity}# and #{xtightvncviewer}#:"
msgstr ""
#. type: Plain text
#: en/user_examples.ssi:182
msgid ""
-"Create a folder /etc/skel folder for a custom .xsession for the default "
-"user: #{$ mkdir -p config/chroot_local-includes/etc/skel}#"
+"$ mkdir vnc_kiosk_client $ cd vnc_kiosk_client $ lb config -p standard-x11 --"
+"packages \"gdm3 metacity xtightvncviewer\""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:184
+#: en/user_examples.ssi:186
msgid ""
-"Create the .xsession for the default user: #{$ touch config/chroot_local-"
-"includes/etc/skel/.xsession}#"
+"Create the directory #{/etc/skel}# and put a custom #{.xsession}# in it for "
+"the default user that will launch metacity and start xvncviewer, connecting "
+"to port #{5901}# on a server at #{192.168.1.2}#:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:186
+#: en/user_examples.ssi:192
msgid ""
-"Edit the .xsession file to launch metacity and start xvncviewer with "
-"something similar to the below:"
+"$ mkdir -p config/chroot_local-includes/etc/skel $ cat config/chroot_local-"
+"includes/etc/skel/.xsession <<END #!/bin/sh"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:193
-msgid "/usr/bin/metacity & /usr/bin/vncviewer xxx.xxx.xxx.xxx:PORT"
+#: en/user_examples.ssi:195
+msgid "/usr/bin/metacity & /usr/bin/xvncviewer 192.168.1.2:1"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:195
-msgid "exit"
+#: en/user_examples.ssi:198
+msgid "exit END"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:199
-msgid "_* Build the image: #{# lb build}#"
+#: en/user_examples.ssi:202
+msgid "Build the image:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:201
-msgid "_* Enjoy."
+#: en/user_examples.ssi:210
+msgid "Enjoy."
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:203
+#: en/user_examples.ssi:212
msgid "2~ A base image for a 128M USB key"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:205
+#: en/user_examples.ssi:214
#, no-wrap
msgid "*{Use case:}* Create a standard image with some components removed in order to fit on a 128M USB key with space left over to use as you see fit.\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:207
+#: en/user_examples.ssi:216
msgid ""
"When optimizing an image to fit a certain media size, you need to understand "
"the tradeoffs you are making between size and functionality. In this "
@@ -573,19 +566,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:211
+#: en/user_examples.ssi:220
msgid ""
"$ lb config -k 486 -p minimal --binary-indices false --memtest none --apt-"
"recommends false --includes none"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:215
+#: en/user_examples.ssi:224
msgid "Now, build the image in the usual way:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:223
+#: en/user_examples.ssi:232
msgid ""
"On the author's system at time of writing, the above configuration produced "
"a 78Mbyte image. This compares favourably with the 166Mbyte image produced "
@@ -593,7 +586,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:225
+#: en/user_examples.ssi:234
msgid ""
"The biggest space-saver here, compared to building a standard image on an #"
"{i386}# architecture system, is to select only the #{486}# kernel flavour "
@@ -611,18 +604,18 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:227
+#: en/user_examples.ssi:236
msgid "2~ A localized KDE desktop and installer"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:229
+#: en/user_examples.ssi:238
#, no-wrap
msgid "*{Use case:}* Create a KDE desktop image, localized for Brazilian Portuguese and including an installer.\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:231
+#: en/user_examples.ssi:240
msgid ""
"We want to make an iso-hybrid image for i386 architecture using our "
"preferred desktop, in this case KDE, containing all of the same packages "
@@ -630,7 +623,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:233
+#: en/user_examples.ssi:242
msgid ""
"Our initial problem is the discovery of the names of the appropriate tasks. "
"Currently, live-build cannot help with this. While we might get lucky and "
@@ -640,17 +633,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:237
+#: en/user_examples.ssi:246
msgid "# apt-get install dctrl-tools tasksel-data"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:241
+#: en/user_examples.ssi:250
msgid "Now we can search for the appropriate tasks, first with:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:250
+#: en/user_examples.ssi:259
#, no-wrap
msgid ""
"$ grep-dctrl -FTest-lang pt_BR /usr/share/tasksel/debian-tasks.desc -sTask,Description\n"
@@ -662,14 +655,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:254
+#: en/user_examples.ssi:263
msgid ""
"By this command, we discover the task is called, plainly enough, brazilian-"
"portuguese. Now to find the related tasks:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:261
+#: en/user_examples.ssi:270
#, no-wrap
msgid ""
"$ grep-dctrl -FEnhances brazilian-portuguese /usr/share/tasksel/debian-tasks.desc -sTask,Description\n"
@@ -679,7 +672,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:265
+#: en/user_examples.ssi:274
#, no-wrap
msgid ""
"Task: brazilian-portuguese-kde-desktop\n"
@@ -688,7 +681,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:269
+#: en/user_examples.ssi:278
msgid ""
"We will use the experimental #{--language}# option, as live-build happens to "
"include #{syslinux}# templates for pt_BR (see {Desktop and language tasks}"
@@ -698,7 +691,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:283
+#: en/user_examples.ssi:292
#, no-wrap
msgid ""
"$ mkdir live-pt_BR-kde\n"
@@ -715,7 +708,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:287
+#: en/user_examples.ssi:296
msgid ""
"Note that we have included the #{debian-installer-launcher}# package to "
"launch the installer from the live desktop, and have also specified the 486 "
diff --git a/manual/po/it/user_basics.ssi.po b/manual/po/it/user_basics.ssi.po
index 1b35de6..6936930 100644
--- a/manual/po/it/user_basics.ssi.po
+++ b/manual/po/it/user_basics.ssi.po
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2010-12-17 13:44+0100\n"
+"POT-Creation-Date: 2010-12-19 10:06-0400\n"
"PO-Revision-Date: 2010-12-17 17:38+0100\n"
"Last-Translator: lillo sciascia <lillosciascia at gmail.com>\n"
"Language-Team: Italian <tp at lists.linux.it>\n"
@@ -56,7 +56,8 @@ msgstr ""
#: en/user_customization-packages.ssi:291
#: en/user_customization-packages.ssi:303
#: en/user_customization-packages.ssi:313
-#: en/user_customization-packages.ssi:331 en/user_customization-runtime.ssi:14
+#: en/user_customization-packages.ssi:331
+#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
#: en/user_customization-runtime.ssi:50 en/user_customization-runtime.ssi:58
#: en/user_customization-runtime.ssi:66 en/user_customization-runtime.ssi:86
@@ -65,15 +66,15 @@ msgstr ""
#: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
#: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
-#: en/user_examples.ssi:162 en/user_examples.ssi:188 en/user_examples.ssi:209
-#: en/user_examples.ssi:217 en/user_examples.ssi:235 en/user_examples.ssi:243
-#: en/user_examples.ssi:256 en/user_examples.ssi:271
-#: en/user_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi:74 en/user_installation.ssi:82
-#: en/user_installation.ssi:90 en/user_installation.ssi:114
-#: en/user_installation.ssi:129 en/user_installation.ssi:146
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_examples.ssi:162 en/user_examples.ssi:178 en/user_examples.ssi:188
+#: en/user_examples.ssi:204 en/user_examples.ssi:218 en/user_examples.ssi:226
+#: en/user_examples.ssi:244 en/user_examples.ssi:252 en/user_examples.ssi:265
+#: en/user_examples.ssi:280 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:74
+#: en/user_installation.ssi:82 en/user_installation.ssi:90
+#: en/user_installation.ssi:114 en/user_installation.ssi:129
+#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
@@ -119,7 +120,8 @@ msgstr "code{"
#: en/user_customization-packages.ssi:295
#: en/user_customization-packages.ssi:307
#: en/user_customization-packages.ssi:317
-#: en/user_customization-packages.ssi:344 en/user_customization-runtime.ssi:18
+#: en/user_customization-packages.ssi:344
+#: en/user_customization-packages.ssi:354 en/user_customization-runtime.ssi:18
#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:46
#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:62
#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:90
@@ -128,15 +130,15 @@ msgstr "code{"
#: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
#: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
#: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
-#: en/user_examples.ssi:166 en/user_examples.ssi:197 en/user_examples.ssi:213
-#: en/user_examples.ssi:221 en/user_examples.ssi:239 en/user_examples.ssi:252
-#: en/user_examples.ssi:267 en/user_examples.ssi:285
-#: en/user_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi:70
-#: en/user_installation.ssi:78 en/user_installation.ssi:86
-#: en/user_installation.ssi:94 en/user_installation.ssi:119
-#: en/user_installation.ssi:136 en/user_installation.ssi:150
-#: en/user_managing_a_configuration.ssi:31
+#: en/user_examples.ssi:166 en/user_examples.ssi:184 en/user_examples.ssi:200
+#: en/user_examples.ssi:208 en/user_examples.ssi:222 en/user_examples.ssi:230
+#: en/user_examples.ssi:248 en/user_examples.ssi:261 en/user_examples.ssi:276
+#: en/user_examples.ssi:294 en/user_installation.ssi:42
+#: en/user_installation.ssi:50 en/user_installation.ssi:60
+#: en/user_installation.ssi:70 en/user_installation.ssi:78
+#: en/user_installation.ssi:86 en/user_installation.ssi:94
+#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: en/user_installation.ssi:150 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
@@ -339,7 +341,7 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:42 en/user_basics.ssi:118 en/user_basics.ssi:202
-#: en/user_examples.ssi:109 en/user_examples.ssi:156
+#: en/user_examples.ssi:109 en/user_examples.ssi:156 en/user_examples.ssi:206
msgid "# lb build"
msgstr "# lb build"
@@ -477,7 +479,7 @@ msgstr ""
"comando lb clean}#lb-clean):"
#. type: Plain text
-#: en/user_basics.ssi:102 en/user_basics.ssi:184
+#: en/user_basics.ssi:102
msgid "$ lb clean --binary"
msgstr "$ lb clean --binary"
@@ -640,10 +642,21 @@ msgstr ""
"la directory di lavoro con il comando #{lb clean}#:"
#. type: Plain text
+#: en/user_basics.ssi:184
+#, fuzzy
+#| msgid "$ lb clean --binary"
+msgid "# lb clean --binary"
+msgstr "$ lb clean --binary"
+
+#. type: Plain text
#: en/user_basics.ssi:188
+#, fuzzy
+#| msgid ""
+#| "Run the #{lb config}# command with the parameters to configure the "
+#| "\"config/\" hierarchy to create our netboot image:"
msgid ""
-"Run the #{lb config}# command with the parameters to configure the \"config/"
-"\" hierarchy to create our netboot image:"
+"Run the #{lb config}# command as follows to configure your image for "
+"netbooting:"
msgstr ""
"Lanciare il comando #{lb config}# con i parametri atti a configurare la "
"struttura \"config/\" per creare la nostra immagine netboot:"
@@ -659,12 +672,20 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:196
+#, fuzzy
+#| 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 NFS. The net-root-path and net-root-server options specify the "
+#| "location and server, respectively, of the NFS server where the filesytem "
+#| "image will be located at boot time."
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 "
-"NFS. The net-root-path and net-root-server options specify the location and "
-"server, respectively, of the NFS server where the filesytem image will be "
-"located at boot time."
+"In contrast with the ISO and USB/HDD images, netbooting does not, itself, "
+"serve the filesystem image to the client, so the files must be served via "
+"NFS. The #{--net-root-path}# and #{--net-root-server}# options specify the "
+"location and server, respectively, of the NFS server where the filesytem "
+"image will be located at boot time. Make sure these are set to suitable "
+"values for your network and server."
msgstr ""
"Diversamente dalle immagini ISO e USB/HDD, il boot via rete non fornisce "
"un'immagine del filesytem al client, perciò i file devono essere forniti via "
@@ -692,11 +713,17 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:208
+#, fuzzy
+#| msgid ""
+#| "For example, if you unpack the generated binary-net.tar.gz archive in "
+#| "the /srv/debian-live directory, you'll find the filesystem image in live/"
+#| "filesystem.squashfs and the kernel, initrd and pxelinux bootloader in "
+#| "tftpboot/debian-live/i386."
msgid ""
-"For example, if you unpack the generated binary-net.tar.gz archive in the /"
-"srv/debian-live directory, you'll find the filesystem image in live/"
-"filesystem.squashfs and the kernel, initrd and pxelinux bootloader in "
-"tftpboot/debian-live/i386."
+"For example, if you unpack the generated #{binary-net.tar.gz}# archive in "
+"the #{/srv/debian-live}# directory, you'll find the filesystem image in #"
+"{live/filesystem.squashfs}# and the kernel, initrd and pxelinux bootloader "
+"in #{tftpboot/debian-live/i386}#."
msgstr ""
"Per esempio, estraendo l'archivio generato binary-net.tar.gz nella "
"directory /srv/debian-live, si troverà l'immagine del filesystem in live/"
@@ -705,7 +732,12 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:210
-msgid "We must now configure three services on the server to enable netboot."
+#, fuzzy
+#| msgid ""
+#| "We must now configure three services on the server to enable netboot."
+msgid ""
+"We must now configure three services on the server to enable netboot: the "
+"DHCP server, the TFTP server and the NFS server."
msgstr "Per abilitare l'avvio tramite rete vanno ora configurati tre servizi."
#. type: Plain text
@@ -726,9 +758,13 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:216
+#, fuzzy
+#| msgid ""
+#| "Here is an example for inspiration, written for the ISC DHCP server #{isc-"
+#| "dhcp-server}# in the /etc/dhcp/dhcpd.conf configuration file;"
msgid ""
"Here is an example for inspiration, written for the ISC DHCP server #{isc-"
-"dhcp-server}# in the /etc/dhcp/dhcpd.conf configuration file;"
+"dhcp-server}# in the #{/etc/dhcp/dhcpd.conf}# configuration file:"
msgstr ""
"Ecco un esempio, scritto per un server DHCP ISC #{isc-dhcp-server}# nel file "
"di configurazione /etc/dhcp/dhcpd.conf;"
@@ -791,10 +827,15 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:244
+#, fuzzy
+#| 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 /srv/debian-live/tftpboot, run as root the following command:"
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 /"
-"srv/debian-live/tftpboot, run as root the following command:"
+"inside a root directory, usually #{/srv/tftp}#. To let it serve files inside "
+"#{/srv/debian-live/tftpboot}#, run as root the following command:"
msgstr ""
"Si installi il pacchetto tftpd-hpa, che mette a disposizione tutti i file "
"contenuti in una directory root, di solito /srv/tftp. Affinché si possa "
@@ -803,7 +844,9 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:248
-msgid "dpkg-reconfigure -plow tftpd-hpa"
+#, fuzzy
+#| msgid "dpkg-reconfigure -plow tftpd-hpa"
+msgid "# dpkg-reconfigure -plow tftpd-hpa"
msgstr "dpkg-reconfigure -plow tftpd-hpa"
#. type: Plain text
@@ -829,14 +872,20 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:258
-msgid "You need to install the nfs-kernel-server package."
+#, fuzzy
+#| msgid "You need to install the nfs-kernel-server package."
+msgid "You need to install the #{nfs-kernel-server}# package."
msgstr "Bisogna installare il pacchetto nfs-kernel-server."
#. type: Plain text
#: en/user_basics.ssi:260
+#, fuzzy
+#| msgid ""
+#| "Then, make the filesystem image available through NFS by adding a line "
+#| "like the following to /etc/exports:"
msgid ""
"Then, make the filesystem image available through NFS by adding a line like "
-"the following to /etc/exports:"
+"the following to #{/etc/exports}#:"
msgstr ""
"Quindi, rendere disponibile l'immagine del filesystem via NFS aggiungendo "
"una riga come la seguente in /etc/exports:"
@@ -904,12 +953,16 @@ msgstr "3~ Qemu"
#. type: Plain text
#: en/user_basics.ssi:286
-msgid "_* Install qemu, bridge-utils, sudo."
+#, fuzzy
+#| msgid "_* Install qemu, bridge-utils, sudo."
+msgid "_* Install #{qemu}#, #{bridge-utils}#, #{sudo}#."
msgstr "_* Installare qemu, bridge-utils, sudo."
#. type: Plain text
#: en/user_basics.ssi:288
-msgid "Edit /etc/qemu-ifup:"
+#, fuzzy
+#| msgid "Edit /etc/qemu-ifup:"
+msgid "Edit #{/etc/qemu-ifup}#:"
msgstr "Modificare /etc/qemu-ifup:"
#. type: Plain text
@@ -927,12 +980,17 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:303
-msgid "Get, or build a grub-floppy-netboot (in the svn)."
+#, fuzzy
+#| msgid "Get, or build a grub-floppy-netboot (in the svn)."
+msgid "Get, or build a #{grub-floppy-netboot}# (in the svn)."
msgstr "Procurarsi o compilare grub-floppy-netboot (su svn)."
#. type: Plain text
#: en/user_basics.ssi:305
-msgid "Launch qemu with \"-net nic,vlan=0 -net tap,vlan=0,ifname=tun0\""
+#, fuzzy
+#| msgid "Launch qemu with \"-net nic,vlan=0 -net tap,vlan=0,ifname=tun0\""
+msgid ""
+"Launch #{qemu}# with \"#{-net nic,vlan=0 -net tap,vlan=0,ifname=tun0}#\""
msgstr "Lanciare qemu con \"-net nic,vlan=0 -net tap,vlan=0,ifname=tun0\""
#. type: Plain text
@@ -947,8 +1005,13 @@ msgstr "_* Installare VMWare Player (edizione \"free as in beer\")"
#. type: Plain text
#: en/user_basics.ssi:311
+#, fuzzy
+#| msgid ""
+#| "_* Create a PXETester directory, and create a text file called pxe.vwx "
+#| "inside"
msgid ""
-"_* Create a PXETester directory, and create a text file called pxe.vwx inside"
+"_* Create a PXETester directory, and create a text file called #{pxe.vwx}# "
+"inside"
msgstr ""
"_* Creare una directory PXETester, e crearvi all'interno un file di testo "
"chiamato pxe.vmx"
diff --git a/manual/po/it/user_customization-packages.ssi.po b/manual/po/it/user_customization-packages.ssi.po
index 7d089a3..c55f522 100644
--- a/manual/po/it/user_customization-packages.ssi.po
+++ b/manual/po/it/user_customization-packages.ssi.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0~a12\n"
-"POT-Creation-Date: 2010-12-14 15:35-0400\n"
+"POT-Creation-Date: 2010-12-19 10:06-0400\n"
"PO-Revision-Date: 2010-12-17 22:07+0100\n"
"Last-Translator: lillo sciascia <lillosciascia at gmail.com>\n"
"Language-Team: Italian <tp at lists.linux.it>\n"
@@ -33,10 +33,12 @@ msgstr ""
#: en/user_basics.ssi:116 en/user_basics.ssi:126 en/user_basics.ssi:140
#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
#: en/user_basics.ssi:182 en/user_basics.ssi:190 en/user_basics.ssi:200
-#: en/user_basics.ssi: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_basics.ssi:218 en/user_basics.ssi:246 en/user_basics.ssi:262
+#: en/user_basics.ssi:270 en/user_basics.ssi:290 en/user_basics.ssi:315
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
+#: en/user_customization-installer.ssi:32
+#: en/user_customization-installer.ssi:42
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:53
#: en/user_customization-packages.ssi:66 en/user_customization-packages.ssi:80
@@ -53,7 +55,8 @@ msgstr ""
#: en/user_customization-packages.ssi:291
#: en/user_customization-packages.ssi:303
#: en/user_customization-packages.ssi:313
-#: en/user_customization-packages.ssi:331 en/user_customization-runtime.ssi:14
+#: en/user_customization-packages.ssi:331
+#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
#: en/user_customization-runtime.ssi:50 en/user_customization-runtime.ssi:58
#: en/user_customization-runtime.ssi:66 en/user_customization-runtime.ssi:86
@@ -62,15 +65,15 @@ msgstr ""
#: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
#: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
-#: en/user_examples.ssi:162 en/user_examples.ssi:188 en/user_examples.ssi:209
-#: en/user_examples.ssi:217 en/user_examples.ssi:235 en/user_examples.ssi:243
-#: en/user_examples.ssi:256 en/user_examples.ssi:271
-#: en/user_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi:74 en/user_installation.ssi:82
-#: en/user_installation.ssi:90 en/user_installation.ssi:114
-#: en/user_installation.ssi:129 en/user_installation.ssi:146
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_examples.ssi:162 en/user_examples.ssi:178 en/user_examples.ssi:188
+#: en/user_examples.ssi:204 en/user_examples.ssi:218 en/user_examples.ssi:226
+#: en/user_examples.ssi:244 en/user_examples.ssi:252 en/user_examples.ssi:265
+#: en/user_examples.ssi:280 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:74
+#: en/user_installation.ssi:82 en/user_installation.ssi:90
+#: en/user_installation.ssi:114 en/user_installation.ssi:129
+#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
@@ -94,10 +97,12 @@ msgstr "code{"
#: en/user_basics.ssi:120 en/user_basics.ssi:130 en/user_basics.ssi:146
#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
#: en/user_basics.ssi:186 en/user_basics.ssi:194 en/user_basics.ssi:204
-#: en/user_basics.ssi: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:238 en/user_basics.ssi:250 en/user_basics.ssi:266
+#: en/user_basics.ssi:274 en/user_basics.ssi:301 en/user_basics.ssi:340
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
+#: en/user_customization-installer.ssi:36
+#: en/user_customization-installer.ssi:46
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:58
#: en/user_customization-packages.ssi:70 en/user_customization-packages.ssi:84
@@ -114,7 +119,8 @@ msgstr "code{"
#: en/user_customization-packages.ssi:295
#: en/user_customization-packages.ssi:307
#: en/user_customization-packages.ssi:317
-#: en/user_customization-packages.ssi:344 en/user_customization-runtime.ssi:18
+#: en/user_customization-packages.ssi:344
+#: en/user_customization-packages.ssi:354 en/user_customization-runtime.ssi:18
#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:46
#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:62
#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:90
@@ -123,15 +129,15 @@ msgstr "code{"
#: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
#: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
#: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
-#: en/user_examples.ssi:166 en/user_examples.ssi:197 en/user_examples.ssi:213
-#: en/user_examples.ssi:221 en/user_examples.ssi:239 en/user_examples.ssi:252
-#: en/user_examples.ssi:267 en/user_examples.ssi:285
-#: en/user_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi:70
-#: en/user_installation.ssi:78 en/user_installation.ssi:86
-#: en/user_installation.ssi:94 en/user_installation.ssi:119
-#: en/user_installation.ssi:136 en/user_installation.ssi:150
-#: en/user_managing_a_configuration.ssi:31
+#: en/user_examples.ssi:166 en/user_examples.ssi:184 en/user_examples.ssi:200
+#: en/user_examples.ssi:208 en/user_examples.ssi:222 en/user_examples.ssi:230
+#: en/user_examples.ssi:248 en/user_examples.ssi:261 en/user_examples.ssi:276
+#: en/user_examples.ssi:294 en/user_installation.ssi:42
+#: en/user_installation.ssi:50 en/user_installation.ssi:60
+#: en/user_installation.ssi:70 en/user_installation.ssi:78
+#: en/user_installation.ssi:86 en/user_installation.ssi:94
+#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: en/user_installation.ssi:150 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
@@ -1282,13 +1288,17 @@ msgstr "$ lb config --apt-recommends false"
#| "packages}# file generated by #{lb build}#) and re-include in your list "
#| "any missing packages that you still want installed."
msgid ""
-"The tradeoff here is that recommended packages are defined as \"packages "
-"that would be found together with this one in all but unusual installations"
-"\" (Debian Policy Manual, 7.2). This may lead to some packages that you "
-"actually need being omitted, so we suggest you review the difference this "
-"makes to your packages list (see the #{binary.packages}# file generated by #"
-"{lb build}#) and re-include in your list any missing packages that you still "
-"want installed."
+"The tradeoff here is that if you don't install recommended packages for a "
+"given package, that is, \"packages that would be found together with this "
+"one in all but unusual installations\" (Debian Policy Manual, 7.2), some "
+"packages that you actually need may be omitted. Therefore, we suggest you "
+"review the difference turning off recommends makes to your packages list "
+"(see the #{binary.packages}# file generated by #{lb build}#) and re-include "
+"in your list any missing packages that you still want installed. "
+"Alternatively, if you find you only want a small number of recommended "
+"packages left out, leave recommends enabled and set a negative APT pin "
+"priority on selected packages to prevent them from being installed, as "
+"explained in {APT pinning}#apt-pinning."
msgstr ""
"Qui il compromesso è dato dal fatto che i pacchetti raccomandati sono "
"definiti come \"pacchetti che si trovano assieme a questo eccetto in "
@@ -1364,3 +1374,21 @@ msgstr ""
#: en/user_customization-packages.ssi:342
msgid "Package: * Pin: release n=sid Pin-Priority: 1 END"
msgstr "Package: * Pin: release n=sid Pin-Priority: 1 END"
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:346
+msgid ""
+"Negative pin priorities will prevent a package from being installed, as in "
+"the case where you do not want a package that is recommended by another "
+"package. Suppose you are building a GNOME image but don't want the user "
+"prompted to store wifi passwords in the keyring, so you want to omit the "
+"recommended #{gnome-keyring}# package. This can be done by adding the "
+"following stanza to #{config/chroot_apt/preferences}#:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:352
+#, fuzzy
+#| msgid "Package: * Pin: release n=sid Pin-Priority: 1 END"
+msgid "Package: gnome-keyring Pin: version * Pin-Priority: -1"
+msgstr "Package: * Pin: release n=sid Pin-Priority: 1 END"
diff --git a/manual/po/it/user_examples.ssi.po b/manual/po/it/user_examples.ssi.po
index 933b4b9..7cc50c4 100644
--- a/manual/po/it/user_examples.ssi.po
+++ b/manual/po/it/user_examples.ssi.po
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2010-12-16 21:32-0400\n"
+"POT-Creation-Date: 2010-12-19 10:06-0400\n"
"PO-Revision-Date: 2010-12-18 16:10+0100\n"
"Last-Translator: skizzhg <skizzhg at gmx.com>\n"
"Language-Team: Italian <tp at lists.linux.it>\n"
@@ -39,8 +39,8 @@ msgstr ":B~ Esempi"
#: en/user_basics.ssi:116 en/user_basics.ssi:126 en/user_basics.ssi:140
#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
#: en/user_basics.ssi:182 en/user_basics.ssi:190 en/user_basics.ssi:200
-#: en/user_basics.ssi: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_basics.ssi:218 en/user_basics.ssi:246 en/user_basics.ssi:262
+#: en/user_basics.ssi:270 en/user_basics.ssi:290 en/user_basics.ssi:315
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
@@ -61,7 +61,8 @@ msgstr ":B~ Esempi"
#: en/user_customization-packages.ssi:291
#: en/user_customization-packages.ssi:303
#: en/user_customization-packages.ssi:313
-#: en/user_customization-packages.ssi:331 en/user_customization-runtime.ssi:14
+#: en/user_customization-packages.ssi:331
+#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
#: en/user_customization-runtime.ssi:50 en/user_customization-runtime.ssi:58
#: en/user_customization-runtime.ssi:66 en/user_customization-runtime.ssi:86
@@ -70,15 +71,15 @@ msgstr ":B~ Esempi"
#: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
#: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
-#: en/user_examples.ssi:162 en/user_examples.ssi:188 en/user_examples.ssi:209
-#: en/user_examples.ssi:217 en/user_examples.ssi:235 en/user_examples.ssi:243
-#: en/user_examples.ssi:256 en/user_examples.ssi:271
-#: en/user_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi:74 en/user_installation.ssi:82
-#: en/user_installation.ssi:90 en/user_installation.ssi:114
-#: en/user_installation.ssi:129 en/user_installation.ssi:146
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_examples.ssi:162 en/user_examples.ssi:178 en/user_examples.ssi:188
+#: en/user_examples.ssi:204 en/user_examples.ssi:218 en/user_examples.ssi:226
+#: en/user_examples.ssi:244 en/user_examples.ssi:252 en/user_examples.ssi:265
+#: en/user_examples.ssi:280 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:74
+#: en/user_installation.ssi:82 en/user_installation.ssi:90
+#: en/user_installation.ssi:114 en/user_installation.ssi:129
+#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
@@ -102,8 +103,8 @@ msgstr "code{"
#: en/user_basics.ssi:120 en/user_basics.ssi:130 en/user_basics.ssi:146
#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
#: en/user_basics.ssi:186 en/user_basics.ssi:194 en/user_basics.ssi:204
-#: en/user_basics.ssi: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:238 en/user_basics.ssi:250 en/user_basics.ssi:266
+#: en/user_basics.ssi:274 en/user_basics.ssi:301 en/user_basics.ssi:340
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:36
@@ -124,7 +125,8 @@ msgstr "code{"
#: en/user_customization-packages.ssi:295
#: en/user_customization-packages.ssi:307
#: en/user_customization-packages.ssi:317
-#: en/user_customization-packages.ssi:344 en/user_customization-runtime.ssi:18
+#: en/user_customization-packages.ssi:344
+#: en/user_customization-packages.ssi:354 en/user_customization-runtime.ssi:18
#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:46
#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:62
#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:90
@@ -133,15 +135,15 @@ msgstr "code{"
#: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
#: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
#: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
-#: en/user_examples.ssi:166 en/user_examples.ssi:197 en/user_examples.ssi:213
-#: en/user_examples.ssi:221 en/user_examples.ssi:239 en/user_examples.ssi:252
-#: en/user_examples.ssi:267 en/user_examples.ssi:285
-#: en/user_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi:70
-#: en/user_installation.ssi:78 en/user_installation.ssi:86
-#: en/user_installation.ssi:94 en/user_installation.ssi:119
-#: en/user_installation.ssi:136 en/user_installation.ssi:150
-#: en/user_managing_a_configuration.ssi:31
+#: en/user_examples.ssi:166 en/user_examples.ssi:184 en/user_examples.ssi:200
+#: en/user_examples.ssi:208 en/user_examples.ssi:222 en/user_examples.ssi:230
+#: en/user_examples.ssi:248 en/user_examples.ssi:261 en/user_examples.ssi:276
+#: en/user_examples.ssi:294 en/user_installation.ssi:42
+#: en/user_installation.ssi:50 en/user_installation.ssi:60
+#: en/user_installation.ssi:70 en/user_installation.ssi:78
+#: en/user_installation.ssi:86 en/user_installation.ssi:94
+#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: en/user_installation.ssi:150 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
@@ -151,7 +153,7 @@ msgstr "}code"
#. type: Plain text
#: en/user_basics.ssi:42 en/user_basics.ssi:118 en/user_basics.ssi:202
-#: en/user_examples.ssi:109 en/user_examples.ssi:156
+#: en/user_examples.ssi:109 en/user_examples.ssi:156 en/user_examples.ssi:206
msgid "# lb build"
msgstr "# lb build"
@@ -272,7 +274,7 @@ msgstr ""
"Ora, come super-utente, si generi l'immagine, salvando un log con #{tee}#."
#. type: Plain text
-#: en/user_examples.ssi:42 en/user_examples.ssi:66 en/user_examples.ssi:219
+#: en/user_examples.ssi:42 en/user_examples.ssi:66 en/user_examples.ssi:228
msgid "# lb build 2>&1 | tee binary.log"
msgstr "# lb build 2>&1 | tee binary.log"
@@ -408,7 +410,7 @@ msgid "Edit #{auto/config}# to read as follows:"
msgstr "Modificare #{auto/config}# come segue:"
#. type: Plain text
-#: en/user_examples.ssi:92 en/user_examples.ssi:141 en/user_examples.ssi:190
+#: en/user_examples.ssi:92 en/user_examples.ssi:141
msgid "#!/bin/sh"
msgstr "#!/bin/sh"
@@ -599,84 +601,80 @@ msgstr "*{Caso d'uso:}* creare un'immagine con live-build per avviare direttamen
#. type: Plain text
#: en/user_examples.ssi:176
-msgid "_* Make a build directory: #{$ mkdir vncBuild}#"
-msgstr "_* Creare una directory di lavoro: #{$ mkdir vncBuild}#"
-
-#. type: Plain text
-#: en/user_examples.ssi:178
-msgid "_* Move to the build directory: #{$ cd vncBuild}#"
-msgstr "_* Spostarsi nella directory: #{$ cd vncBuild}#"
-
-#. type: Plain text
-#: en/user_examples.ssi:180
msgid ""
-"Example to config the build directory to include gdm metacity "
-"xtightvncviewer: #{$ lb config --packages \"gdm3 metacity xtightvncviewer\"}#"
+"Make a build directory and create a skeletal configuration in it, including #"
+"{gdm3}#, #{metacity}# and #{xtightvncviewer}#:"
msgstr ""
-"Esempio per configurare la directory di costruzione per includere gdm "
-"metacity xtightvncviewer: #{$ lb config --packages \"gdm3 metacity "
-"xtightvncviewer\"}#"
#. type: Plain text
#: en/user_examples.ssi:182
msgid ""
-"Create a folder /etc/skel folder for a custom .xsession for the default "
-"user: #{$ mkdir -p config/chroot_local-includes/etc/skel}#"
+"$ mkdir vnc_kiosk_client $ cd vnc_kiosk_client $ lb config -p standard-x11 --"
+"packages \"gdm3 metacity xtightvncviewer\""
msgstr ""
-"Creare una directory /etc/skel per un .xsession personalizzato per l'utente "
-"predefinito: #{$ mkdir -p config/chroot_local-includes/etc/skel}#"
#. type: Plain text
-#: en/user_examples.ssi:184
+#: en/user_examples.ssi:186
msgid ""
-"Create the .xsession for the default user: #{$ touch config/chroot_local-"
-"includes/etc/skel/.xsession}#"
+"Create the directory #{/etc/skel}# and put a custom #{.xsession}# in it for "
+"the default user that will launch metacity and start xvncviewer, connecting "
+"to port #{5901}# on a server at #{192.168.1.2}#:"
msgstr ""
-"Creare il file .xsession per l'utente: #{$ touch config/chroot_local-"
-"includes/etc/skel/.xsession}#"
#. type: Plain text
-#: en/user_examples.ssi:186
+#: en/user_examples.ssi:192
+#, fuzzy
+#| msgid ""
+#| "$ mkdir -p config/chroot_local-includes/var/www $ cp /path/to/my/index."
+#| "html config/chroot_local-includes/var/www"
msgid ""
-"Edit the .xsession file to launch metacity and start xvncviewer with "
-"something similar to the below:"
+"$ mkdir -p config/chroot_local-includes/etc/skel $ cat config/chroot_local-"
+"includes/etc/skel/.xsession <<END #!/bin/sh"
msgstr ""
-"Modificare il file .xsession per lanciare metacity e xvncviewer con qualcosa "
-"simile a quanto segue:"
+"$ mkdir -p config/chroot_local-includes/var/www $ cp /path/to/my/index.html "
+"config/chroot_local-includes/var/www"
#. type: Plain text
-#: en/user_examples.ssi:193
-msgid "/usr/bin/metacity & /usr/bin/vncviewer xxx.xxx.xxx.xxx:PORT"
+#: en/user_examples.ssi:195
+#, fuzzy
+#| msgid "/usr/bin/metacity & /usr/bin/vncviewer xxx.xxx.xxx.xxx:PORT"
+msgid "/usr/bin/metacity & /usr/bin/xvncviewer 192.168.1.2:1"
msgstr "/usr/bin/metacity & /usr/bin/vncviewer xxx.xxx.xxx.xxx:PORT"
#. type: Plain text
-#: en/user_examples.ssi:195
-msgid "exit"
+#: en/user_examples.ssi:198
+#, fuzzy
+#| msgid "exit"
+msgid "exit END"
msgstr "exit"
#. type: Plain text
-#: en/user_examples.ssi:199
-msgid "_* Build the image: #{# lb build}#"
-msgstr "_* Costruire l'immagine: #{# lb build}#"
+#: en/user_examples.ssi:202
+#, fuzzy
+#| msgid "Now, build the image:"
+msgid "Build the image:"
+msgstr "Costruire quindi l'immagine:"
#. type: Plain text
-#: en/user_examples.ssi:201
-msgid "_* Enjoy."
+#: en/user_examples.ssi:210
+#, fuzzy
+#| msgid "_* Enjoy."
+msgid "Enjoy."
msgstr "_* Buon divertimento."
#. type: Plain text
-#: en/user_examples.ssi:203
+#: en/user_examples.ssi:212
msgid "2~ A base image for a 128M USB key"
msgstr "2~ Un'immagine base per una chiavetta USB da 128M"
#. type: Plain text
-#: en/user_examples.ssi:205
+#: en/user_examples.ssi:214
#, no-wrap
msgid "*{Use case:}* Create a standard image with some components removed in order to fit on a 128M USB key with space left over to use as you see fit.\n"
msgstr "*{Caso d'uso:}* creare un'immagine standard rimuovendo alcuni componenti affinché stia su una chiavetta USB da 128M con lo spazio che rimane da usare come meglio si crede.\n"
#. type: Plain text
-#: en/user_examples.ssi:207
+#: en/user_examples.ssi:216
msgid ""
"When optimizing an image to fit a certain media size, you need to understand "
"the tradeoffs you are making between size and functionality. In this "
@@ -699,7 +697,7 @@ msgstr ""
"{important}# che molto probabilmente produrrà un sistema live danneggiato."
#. type: Plain text
-#: en/user_examples.ssi:211
+#: en/user_examples.ssi:220
msgid ""
"$ lb config -k 486 -p minimal --binary-indices false --memtest none --apt-"
"recommends false --includes none"
@@ -708,12 +706,12 @@ msgstr ""
"recommends false --includes none"
#. type: Plain text
-#: en/user_examples.ssi:215
+#: en/user_examples.ssi:224
msgid "Now, build the image in the usual way:"
msgstr "Costruire quindi l'immagine nel modo consueto:"
#. type: Plain text
-#: en/user_examples.ssi:223
+#: en/user_examples.ssi:232
msgid ""
"On the author's system at time of writing, the above configuration produced "
"a 78Mbyte image. This compares favourably with the 166Mbyte image produced "
@@ -724,7 +722,7 @@ msgstr ""
"prodotta dalla configurazione predefinita nel {Tutorial 1}#tutorial-1."
#. type: Plain text
-#: en/user_examples.ssi:225
+#: en/user_examples.ssi:234
msgid ""
"The biggest space-saver here, compared to building a standard image on an #"
"{i386}# architecture system, is to select only the #{486}# kernel flavour "
@@ -754,18 +752,18 @@ msgstr ""
"se le funzionalità sacrificate con ciascuna ottimizzazione valgono la pena."
#. type: Plain text
-#: en/user_examples.ssi:227
+#: en/user_examples.ssi:236
msgid "2~ A localized KDE desktop and installer"
msgstr "2~ Un desktop KDE localizzato e l'installer"
#. type: Plain text
-#: en/user_examples.ssi:229
+#: en/user_examples.ssi:238
#, no-wrap
msgid "*{Use case:}* Create a KDE desktop image, localized for Brazilian Portuguese and including an installer.\n"
msgstr "*{Caso d'uso:}* creare un'immagine con il desktop KDE, localizzato per il Brasiliano Portoghese che includa l'installatore.\n"
#. type: Plain text
-#: en/user_examples.ssi:231
+#: en/user_examples.ssi:240
msgid ""
"We want to make an iso-hybrid image for i386 architecture using our "
"preferred desktop, in this case KDE, containing all of the same packages "
@@ -777,7 +775,7 @@ msgstr ""
"KDE."
#. type: Plain text
-#: en/user_examples.ssi:233
+#: en/user_examples.ssi:242
msgid ""
"Our initial problem is the discovery of the names of the appropriate tasks. "
"Currently, live-build cannot help with this. While we might get lucky and "
@@ -792,17 +790,17 @@ msgstr ""
"di avere entrambi questi pacchetti:"
#. type: Plain text
-#: en/user_examples.ssi:237
+#: en/user_examples.ssi:246
msgid "# apt-get install dctrl-tools tasksel-data"
msgstr "# apt-get install dctrl-tools tasksel-data"
#. type: Plain text
-#: en/user_examples.ssi:241
+#: en/user_examples.ssi:250
msgid "Now we can search for the appropriate tasks, first with:"
msgstr "Ora si possono cercare i task appropriati:"
#. type: Plain text
-#: en/user_examples.ssi:250
+#: en/user_examples.ssi:259
#, no-wrap
msgid ""
"$ grep-dctrl -FTest-lang pt_BR /usr/share/tasksel/debian-tasks.desc -sTask,Description\n"
@@ -820,7 +818,7 @@ msgstr ""
" to use Debian.\n"
#. type: Plain text
-#: en/user_examples.ssi:254
+#: en/user_examples.ssi:263
msgid ""
"By this command, we discover the task is called, plainly enough, brazilian-"
"portuguese. Now to find the related tasks:"
@@ -829,7 +827,7 @@ msgstr ""
"chiaramente, brazilian-portuguese. Ora per trovare i task correlati:"
#. type: Plain text
-#: en/user_examples.ssi:261
+#: en/user_examples.ssi:270
#, no-wrap
msgid ""
"$ grep-dctrl -FEnhances brazilian-portuguese /usr/share/tasksel/debian-tasks.desc -sTask,Description\n"
@@ -843,7 +841,7 @@ msgstr ""
" This task localises the desktop in Brasilian Portuguese.\n"
#. type: Plain text
-#: en/user_examples.ssi:265
+#: en/user_examples.ssi:274
#, no-wrap
msgid ""
"Task: brazilian-portuguese-kde-desktop\n"
@@ -855,7 +853,7 @@ msgstr ""
" This task localises the KDE desktop in Brazilian Portuguese.\n"
#. type: Plain text
-#: en/user_examples.ssi:269
+#: en/user_examples.ssi:278
msgid ""
"We will use the experimental #{--language}# option, as live-build happens to "
"include #{syslinux}# templates for pt_BR (see {Desktop and language tasks}"
@@ -870,7 +868,7 @@ msgstr ""
"mettiamo insieme i pezzi:"
#. type: Plain text
-#: en/user_examples.ssi:283
+#: en/user_examples.ssi:292
#, no-wrap
msgid ""
"$ mkdir live-pt_BR-kde\n"
@@ -898,7 +896,7 @@ msgstr ""
" --packages debian-installer-launcher\n"
#. type: Plain text
-#: en/user_examples.ssi:287
+#: en/user_examples.ssi:296
msgid ""
"Note that we have included the #{debian-installer-launcher}# package to "
"launch the installer from the live desktop, and have also specified the 486 "
diff --git a/manual/po/pt_BR/user_basics.ssi.po b/manual/po/pt_BR/user_basics.ssi.po
index 8f58fe8..f0b147e 100644
--- a/manual/po/pt_BR/user_basics.ssi.po
+++ b/manual/po/pt_BR/user_basics.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2010-12-17 13:44+0100\n"
+"POT-Creation-Date: 2010-12-19 10:06-0400\n"
"PO-Revision-Date: 2010-10-20 06:53-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -54,7 +54,8 @@ msgstr ""
#: en/user_customization-packages.ssi:291
#: en/user_customization-packages.ssi:303
#: en/user_customization-packages.ssi:313
-#: en/user_customization-packages.ssi:331 en/user_customization-runtime.ssi:14
+#: en/user_customization-packages.ssi:331
+#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
#: en/user_customization-runtime.ssi:50 en/user_customization-runtime.ssi:58
#: en/user_customization-runtime.ssi:66 en/user_customization-runtime.ssi:86
@@ -63,15 +64,15 @@ msgstr ""
#: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
#: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
-#: en/user_examples.ssi:162 en/user_examples.ssi:188 en/user_examples.ssi:209
-#: en/user_examples.ssi:217 en/user_examples.ssi:235 en/user_examples.ssi:243
-#: en/user_examples.ssi:256 en/user_examples.ssi:271
-#: en/user_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi:74 en/user_installation.ssi:82
-#: en/user_installation.ssi:90 en/user_installation.ssi:114
-#: en/user_installation.ssi:129 en/user_installation.ssi:146
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_examples.ssi:162 en/user_examples.ssi:178 en/user_examples.ssi:188
+#: en/user_examples.ssi:204 en/user_examples.ssi:218 en/user_examples.ssi:226
+#: en/user_examples.ssi:244 en/user_examples.ssi:252 en/user_examples.ssi:265
+#: en/user_examples.ssi:280 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:74
+#: en/user_installation.ssi:82 en/user_installation.ssi:90
+#: en/user_installation.ssi:114 en/user_installation.ssi:129
+#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
@@ -117,7 +118,8 @@ msgstr "code{"
#: en/user_customization-packages.ssi:295
#: en/user_customization-packages.ssi:307
#: en/user_customization-packages.ssi:317
-#: en/user_customization-packages.ssi:344 en/user_customization-runtime.ssi:18
+#: en/user_customization-packages.ssi:344
+#: en/user_customization-packages.ssi:354 en/user_customization-runtime.ssi:18
#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:46
#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:62
#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:90
@@ -126,15 +128,15 @@ msgstr "code{"
#: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
#: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
#: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
-#: en/user_examples.ssi:166 en/user_examples.ssi:197 en/user_examples.ssi:213
-#: en/user_examples.ssi:221 en/user_examples.ssi:239 en/user_examples.ssi:252
-#: en/user_examples.ssi:267 en/user_examples.ssi:285
-#: en/user_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi:70
-#: en/user_installation.ssi:78 en/user_installation.ssi:86
-#: en/user_installation.ssi:94 en/user_installation.ssi:119
-#: en/user_installation.ssi:136 en/user_installation.ssi:150
-#: en/user_managing_a_configuration.ssi:31
+#: en/user_examples.ssi:166 en/user_examples.ssi:184 en/user_examples.ssi:200
+#: en/user_examples.ssi:208 en/user_examples.ssi:222 en/user_examples.ssi:230
+#: en/user_examples.ssi:248 en/user_examples.ssi:261 en/user_examples.ssi:276
+#: en/user_examples.ssi:294 en/user_installation.ssi:42
+#: en/user_installation.ssi:50 en/user_installation.ssi:60
+#: en/user_installation.ssi:70 en/user_installation.ssi:78
+#: en/user_installation.ssi:86 en/user_installation.ssi:94
+#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: en/user_installation.ssi:150 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
@@ -279,7 +281,7 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:42 en/user_basics.ssi:118 en/user_basics.ssi:202
-#: en/user_examples.ssi:109 en/user_examples.ssi:156
+#: en/user_examples.ssi:109 en/user_examples.ssi:156 en/user_examples.ssi:206
msgid "# lb build"
msgstr ""
@@ -397,7 +399,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:102 en/user_basics.ssi:184
+#: en/user_basics.ssi:102
msgid "$ lb clean --binary"
msgstr ""
@@ -536,10 +538,15 @@ msgid ""
msgstr ""
#. type: Plain text
+#: en/user_basics.ssi:184
+msgid "# lb clean --binary"
+msgstr ""
+
+#. type: Plain text
#: en/user_basics.ssi:188
msgid ""
-"Run the #{lb config}# command with the parameters to configure the \"config/"
-"\" hierarchy to create our netboot image:"
+"Run the #{lb config}# command as follows to configure your image for "
+"netbooting:"
msgstr ""
#. type: Plain text
@@ -552,11 +559,12 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:196
msgid ""
-"In contrast with the ISO and USB/HDD images, netbooting does not support "
-"serving a filesystem image with the client, so the files must be served via "
-"NFS. The net-root-path and net-root-server options specify the location and "
-"server, respectively, of the NFS server where the filesytem image will be "
-"located at boot time."
+"In contrast with the ISO and USB/HDD images, netbooting does not, itself, "
+"serve the filesystem image to the client, so the files must be served via "
+"NFS. The #{--net-root-path}# and #{--net-root-server}# options specify the "
+"location and server, respectively, of the NFS server where the filesytem "
+"image will be located at boot time. Make sure these are set to suitable "
+"values for your network and server."
msgstr ""
#. type: Plain text
@@ -573,15 +581,17 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:208
msgid ""
-"For example, if you unpack the generated binary-net.tar.gz archive in the /"
-"srv/debian-live directory, you'll find the filesystem image in live/"
-"filesystem.squashfs and the kernel, initrd and pxelinux bootloader in "
-"tftpboot/debian-live/i386."
+"For example, if you unpack the generated #{binary-net.tar.gz}# archive in "
+"the #{/srv/debian-live}# directory, you'll find the filesystem image in #"
+"{live/filesystem.squashfs}# and the kernel, initrd and pxelinux bootloader "
+"in #{tftpboot/debian-live/i386}#."
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:210
-msgid "We must now configure three services on the server to enable netboot."
+msgid ""
+"We must now configure three services on the server to enable netboot: the "
+"DHCP server, the TFTP server and the NFS server."
msgstr ""
#. type: Plain text
@@ -601,7 +611,7 @@ msgstr ""
#: en/user_basics.ssi:216
msgid ""
"Here is an example for inspiration, written for the ISC DHCP server #{isc-"
-"dhcp-server}# in the /etc/dhcp/dhcpd.conf configuration file;"
+"dhcp-server}# in the #{/etc/dhcp/dhcpd.conf}# configuration file:"
msgstr ""
#. type: Plain text
@@ -656,13 +666,13 @@ msgstr ""
#: en/user_basics.ssi:244
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 /"
-"srv/debian-live/tftpboot, run as root the following command:"
+"inside a root directory, usually #{/srv/tftp}#. To let it serve files inside "
+"#{/srv/debian-live/tftpboot}#, run as root the following command:"
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:248
-msgid "dpkg-reconfigure -plow tftpd-hpa"
+msgid "# dpkg-reconfigure -plow tftpd-hpa"
msgstr ""
#. type: Plain text
@@ -685,14 +695,14 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:258
-msgid "You need to install the nfs-kernel-server package."
+msgid "You need to install the #{nfs-kernel-server}# package."
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:260
msgid ""
"Then, make the filesystem image available through NFS by adding a line like "
-"the following to /etc/exports:"
+"the following to #{/etc/exports}#:"
msgstr ""
#. type: Plain text
@@ -747,12 +757,12 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:286
-msgid "_* Install qemu, bridge-utils, sudo."
+msgid "_* Install #{qemu}#, #{bridge-utils}#, #{sudo}#."
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:288
-msgid "Edit /etc/qemu-ifup:"
+msgid "Edit #{/etc/qemu-ifup}#:"
msgstr ""
#. type: Plain text
@@ -766,12 +776,13 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:303
-msgid "Get, or build a grub-floppy-netboot (in the svn)."
+msgid "Get, or build a #{grub-floppy-netboot}# (in the svn)."
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:305
-msgid "Launch qemu with \"-net nic,vlan=0 -net tap,vlan=0,ifname=tun0\""
+msgid ""
+"Launch #{qemu}# with \"#{-net nic,vlan=0 -net tap,vlan=0,ifname=tun0}#\""
msgstr ""
#. type: Plain text
@@ -787,7 +798,8 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:311
msgid ""
-"_* Create a PXETester directory, and create a text file called pxe.vwx inside"
+"_* Create a PXETester directory, and create a text file called #{pxe.vwx}# "
+"inside"
msgstr ""
#. type: Plain text
diff --git a/manual/po/pt_BR/user_customization-packages.ssi.po b/manual/po/pt_BR/user_customization-packages.ssi.po
index 8afefee..2d053f2 100644
--- a/manual/po/pt_BR/user_customization-packages.ssi.po
+++ b/manual/po/pt_BR/user_customization-packages.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2010-12-14 15:35-0400\n"
+"POT-Creation-Date: 2010-12-19 10:06-0400\n"
"PO-Revision-Date: 2010-10-22 08:58-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -32,10 +32,12 @@ msgstr ""
#: en/user_basics.ssi:116 en/user_basics.ssi:126 en/user_basics.ssi:140
#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
#: en/user_basics.ssi:182 en/user_basics.ssi:190 en/user_basics.ssi:200
-#: en/user_basics.ssi: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_basics.ssi:218 en/user_basics.ssi:246 en/user_basics.ssi:262
+#: en/user_basics.ssi:270 en/user_basics.ssi:290 en/user_basics.ssi:315
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
+#: en/user_customization-installer.ssi:32
+#: en/user_customization-installer.ssi:42
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:53
#: en/user_customization-packages.ssi:66 en/user_customization-packages.ssi:80
@@ -52,7 +54,8 @@ msgstr ""
#: en/user_customization-packages.ssi:291
#: en/user_customization-packages.ssi:303
#: en/user_customization-packages.ssi:313
-#: en/user_customization-packages.ssi:331 en/user_customization-runtime.ssi:14
+#: en/user_customization-packages.ssi:331
+#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
#: en/user_customization-runtime.ssi:50 en/user_customization-runtime.ssi:58
#: en/user_customization-runtime.ssi:66 en/user_customization-runtime.ssi:86
@@ -61,15 +64,15 @@ msgstr ""
#: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
#: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
-#: en/user_examples.ssi:162 en/user_examples.ssi:188 en/user_examples.ssi:209
-#: en/user_examples.ssi:217 en/user_examples.ssi:235 en/user_examples.ssi:243
-#: en/user_examples.ssi:256 en/user_examples.ssi:271
-#: en/user_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi:74 en/user_installation.ssi:82
-#: en/user_installation.ssi:90 en/user_installation.ssi:114
-#: en/user_installation.ssi:129 en/user_installation.ssi:146
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_examples.ssi:162 en/user_examples.ssi:178 en/user_examples.ssi:188
+#: en/user_examples.ssi:204 en/user_examples.ssi:218 en/user_examples.ssi:226
+#: en/user_examples.ssi:244 en/user_examples.ssi:252 en/user_examples.ssi:265
+#: en/user_examples.ssi:280 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:74
+#: en/user_installation.ssi:82 en/user_installation.ssi:90
+#: en/user_installation.ssi:114 en/user_installation.ssi:129
+#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
@@ -93,10 +96,12 @@ msgstr "code{"
#: en/user_basics.ssi:120 en/user_basics.ssi:130 en/user_basics.ssi:146
#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
#: en/user_basics.ssi:186 en/user_basics.ssi:194 en/user_basics.ssi:204
-#: en/user_basics.ssi: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:238 en/user_basics.ssi:250 en/user_basics.ssi:266
+#: en/user_basics.ssi:274 en/user_basics.ssi:301 en/user_basics.ssi:340
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
+#: en/user_customization-installer.ssi:36
+#: en/user_customization-installer.ssi:46
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:58
#: en/user_customization-packages.ssi:70 en/user_customization-packages.ssi:84
@@ -113,7 +118,8 @@ msgstr "code{"
#: en/user_customization-packages.ssi:295
#: en/user_customization-packages.ssi:307
#: en/user_customization-packages.ssi:317
-#: en/user_customization-packages.ssi:344 en/user_customization-runtime.ssi:18
+#: en/user_customization-packages.ssi:344
+#: en/user_customization-packages.ssi:354 en/user_customization-runtime.ssi:18
#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:46
#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:62
#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:90
@@ -122,15 +128,15 @@ msgstr "code{"
#: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
#: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
#: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
-#: en/user_examples.ssi:166 en/user_examples.ssi:197 en/user_examples.ssi:213
-#: en/user_examples.ssi:221 en/user_examples.ssi:239 en/user_examples.ssi:252
-#: en/user_examples.ssi:267 en/user_examples.ssi:285
-#: en/user_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi:70
-#: en/user_installation.ssi:78 en/user_installation.ssi:86
-#: en/user_installation.ssi:94 en/user_installation.ssi:119
-#: en/user_installation.ssi:136 en/user_installation.ssi:150
-#: en/user_managing_a_configuration.ssi:31
+#: en/user_examples.ssi:166 en/user_examples.ssi:184 en/user_examples.ssi:200
+#: en/user_examples.ssi:208 en/user_examples.ssi:222 en/user_examples.ssi:230
+#: en/user_examples.ssi:248 en/user_examples.ssi:261 en/user_examples.ssi:276
+#: en/user_examples.ssi:294 en/user_installation.ssi:42
+#: en/user_installation.ssi:50 en/user_installation.ssi:60
+#: en/user_installation.ssi:70 en/user_installation.ssi:78
+#: en/user_installation.ssi:86 en/user_installation.ssi:94
+#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: en/user_installation.ssi:150 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
@@ -988,13 +994,17 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:319
msgid ""
-"The tradeoff here is that recommended packages are defined as \"packages "
-"that would be found together with this one in all but unusual installations"
-"\" (Debian Policy Manual, 7.2). This may lead to some packages that you "
-"actually need being omitted, so we suggest you review the difference this "
-"makes to your packages list (see the #{binary.packages}# file generated by #"
-"{lb build}#) and re-include in your list any missing packages that you still "
-"want installed."
+"The tradeoff here is that if you don't install recommended packages for a "
+"given package, that is, \"packages that would be found together with this "
+"one in all but unusual installations\" (Debian Policy Manual, 7.2), some "
+"packages that you actually need may be omitted. Therefore, we suggest you "
+"review the difference turning off recommends makes to your packages list "
+"(see the #{binary.packages}# file generated by #{lb build}#) and re-include "
+"in your list any missing packages that you still want installed. "
+"Alternatively, if you find you only want a small number of recommended "
+"packages left out, leave recommends enabled and set a negative APT pin "
+"priority on selected packages to prevent them from being installed, as "
+"explained in {APT pinning}#apt-pinning."
msgstr ""
#. type: Plain text
@@ -1047,3 +1057,19 @@ msgstr ""
#: en/user_customization-packages.ssi:342
msgid "Package: * Pin: release n=sid Pin-Priority: 1 END"
msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:346
+msgid ""
+"Negative pin priorities will prevent a package from being installed, as in "
+"the case where you do not want a package that is recommended by another "
+"package. Suppose you are building a GNOME image but don't want the user "
+"prompted to store wifi passwords in the keyring, so you want to omit the "
+"recommended #{gnome-keyring}# package. This can be done by adding the "
+"following stanza to #{config/chroot_apt/preferences}#:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:352
+msgid "Package: gnome-keyring Pin: version * Pin-Priority: -1"
+msgstr ""
diff --git a/manual/po/pt_BR/user_examples.ssi.po b/manual/po/pt_BR/user_examples.ssi.po
index 6c03508..78e780c 100644
--- a/manual/po/pt_BR/user_examples.ssi.po
+++ b/manual/po/pt_BR/user_examples.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2010-12-16 21:32-0400\n"
+"POT-Creation-Date: 2010-12-19 10:06-0400\n"
"PO-Revision-Date: 2010-11-04 16:34-0400\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -37,8 +37,8 @@ msgstr ""
#: en/user_basics.ssi:116 en/user_basics.ssi:126 en/user_basics.ssi:140
#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
#: en/user_basics.ssi:182 en/user_basics.ssi:190 en/user_basics.ssi:200
-#: en/user_basics.ssi: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_basics.ssi:218 en/user_basics.ssi:246 en/user_basics.ssi:262
+#: en/user_basics.ssi:270 en/user_basics.ssi:290 en/user_basics.ssi:315
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
@@ -59,7 +59,8 @@ msgstr ""
#: en/user_customization-packages.ssi:291
#: en/user_customization-packages.ssi:303
#: en/user_customization-packages.ssi:313
-#: en/user_customization-packages.ssi:331 en/user_customization-runtime.ssi:14
+#: en/user_customization-packages.ssi:331
+#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
#: en/user_customization-runtime.ssi:50 en/user_customization-runtime.ssi:58
#: en/user_customization-runtime.ssi:66 en/user_customization-runtime.ssi:86
@@ -68,15 +69,15 @@ msgstr ""
#: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
#: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
-#: en/user_examples.ssi:162 en/user_examples.ssi:188 en/user_examples.ssi:209
-#: en/user_examples.ssi:217 en/user_examples.ssi:235 en/user_examples.ssi:243
-#: en/user_examples.ssi:256 en/user_examples.ssi:271
-#: en/user_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi:74 en/user_installation.ssi:82
-#: en/user_installation.ssi:90 en/user_installation.ssi:114
-#: en/user_installation.ssi:129 en/user_installation.ssi:146
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_examples.ssi:162 en/user_examples.ssi:178 en/user_examples.ssi:188
+#: en/user_examples.ssi:204 en/user_examples.ssi:218 en/user_examples.ssi:226
+#: en/user_examples.ssi:244 en/user_examples.ssi:252 en/user_examples.ssi:265
+#: en/user_examples.ssi:280 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:74
+#: en/user_installation.ssi:82 en/user_installation.ssi:90
+#: en/user_installation.ssi:114 en/user_installation.ssi:129
+#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
@@ -100,8 +101,8 @@ msgstr "code{"
#: en/user_basics.ssi:120 en/user_basics.ssi:130 en/user_basics.ssi:146
#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
#: en/user_basics.ssi:186 en/user_basics.ssi:194 en/user_basics.ssi:204
-#: en/user_basics.ssi: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:238 en/user_basics.ssi:250 en/user_basics.ssi:266
+#: en/user_basics.ssi:274 en/user_basics.ssi:301 en/user_basics.ssi:340
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:36
@@ -122,7 +123,8 @@ msgstr "code{"
#: en/user_customization-packages.ssi:295
#: en/user_customization-packages.ssi:307
#: en/user_customization-packages.ssi:317
-#: en/user_customization-packages.ssi:344 en/user_customization-runtime.ssi:18
+#: en/user_customization-packages.ssi:344
+#: en/user_customization-packages.ssi:354 en/user_customization-runtime.ssi:18
#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:46
#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:62
#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:90
@@ -131,15 +133,15 @@ msgstr "code{"
#: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
#: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
#: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
-#: en/user_examples.ssi:166 en/user_examples.ssi:197 en/user_examples.ssi:213
-#: en/user_examples.ssi:221 en/user_examples.ssi:239 en/user_examples.ssi:252
-#: en/user_examples.ssi:267 en/user_examples.ssi:285
-#: en/user_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi:70
-#: en/user_installation.ssi:78 en/user_installation.ssi:86
-#: en/user_installation.ssi:94 en/user_installation.ssi:119
-#: en/user_installation.ssi:136 en/user_installation.ssi:150
-#: en/user_managing_a_configuration.ssi:31
+#: en/user_examples.ssi:166 en/user_examples.ssi:184 en/user_examples.ssi:200
+#: en/user_examples.ssi:208 en/user_examples.ssi:222 en/user_examples.ssi:230
+#: en/user_examples.ssi:248 en/user_examples.ssi:261 en/user_examples.ssi:276
+#: en/user_examples.ssi:294 en/user_installation.ssi:42
+#: en/user_installation.ssi:50 en/user_installation.ssi:60
+#: en/user_installation.ssi:70 en/user_installation.ssi:78
+#: en/user_installation.ssi:86 en/user_installation.ssi:94
+#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: en/user_installation.ssi:150 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
@@ -149,7 +151,7 @@ msgstr "}code"
#. type: Plain text
#: en/user_basics.ssi:42 en/user_basics.ssi:118 en/user_basics.ssi:202
-#: en/user_examples.ssi:109 en/user_examples.ssi:156
+#: en/user_examples.ssi:109 en/user_examples.ssi:156 en/user_examples.ssi:206
msgid "# lb build"
msgstr ""
@@ -244,7 +246,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:42 en/user_examples.ssi:66 en/user_examples.ssi:219
+#: en/user_examples.ssi:42 en/user_examples.ssi:66 en/user_examples.ssi:228
msgid "# lb build 2>&1 | tee binary.log"
msgstr ""
@@ -347,7 +349,7 @@ msgid "Edit #{auto/config}# to read as follows:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:92 en/user_examples.ssi:141 en/user_examples.ssi:190
+#: en/user_examples.ssi:92 en/user_examples.ssi:141
msgid "#!/bin/sh"
msgstr ""
@@ -491,75 +493,66 @@ msgstr ""
#. type: Plain text
#: en/user_examples.ssi:176
-msgid "_* Make a build directory: #{$ mkdir vncBuild}#"
-msgstr ""
-
-#. type: Plain text
-#: en/user_examples.ssi:178
-msgid "_* Move to the build directory: #{$ cd vncBuild}#"
-msgstr ""
-
-#. type: Plain text
-#: en/user_examples.ssi:180
msgid ""
-"Example to config the build directory to include gdm metacity "
-"xtightvncviewer: #{$ lb config --packages \"gdm3 metacity xtightvncviewer\"}#"
+"Make a build directory and create a skeletal configuration in it, including #"
+"{gdm3}#, #{metacity}# and #{xtightvncviewer}#:"
msgstr ""
#. type: Plain text
#: en/user_examples.ssi:182
msgid ""
-"Create a folder /etc/skel folder for a custom .xsession for the default "
-"user: #{$ mkdir -p config/chroot_local-includes/etc/skel}#"
+"$ mkdir vnc_kiosk_client $ cd vnc_kiosk_client $ lb config -p standard-x11 --"
+"packages \"gdm3 metacity xtightvncviewer\""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:184
+#: en/user_examples.ssi:186
msgid ""
-"Create the .xsession for the default user: #{$ touch config/chroot_local-"
-"includes/etc/skel/.xsession}#"
+"Create the directory #{/etc/skel}# and put a custom #{.xsession}# in it for "
+"the default user that will launch metacity and start xvncviewer, connecting "
+"to port #{5901}# on a server at #{192.168.1.2}#:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:186
+#: en/user_examples.ssi:192
msgid ""
-"Edit the .xsession file to launch metacity and start xvncviewer with "
-"something similar to the below:"
+"$ mkdir -p config/chroot_local-includes/etc/skel $ cat config/chroot_local-"
+"includes/etc/skel/.xsession <<END #!/bin/sh"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:193
-msgid "/usr/bin/metacity & /usr/bin/vncviewer xxx.xxx.xxx.xxx:PORT"
+#: en/user_examples.ssi:195
+msgid "/usr/bin/metacity & /usr/bin/xvncviewer 192.168.1.2:1"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:195
-msgid "exit"
+#: en/user_examples.ssi:198
+msgid "exit END"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:199
-msgid "_* Build the image: #{# lb build}#"
+#: en/user_examples.ssi:202
+msgid "Build the image:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:201
-msgid "_* Enjoy."
+#: en/user_examples.ssi:210
+msgid "Enjoy."
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:203
+#: en/user_examples.ssi:212
msgid "2~ A base image for a 128M USB key"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:205
+#: en/user_examples.ssi:214
#, no-wrap
msgid "*{Use case:}* Create a standard image with some components removed in order to fit on a 128M USB key with space left over to use as you see fit.\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:207
+#: en/user_examples.ssi:216
msgid ""
"When optimizing an image to fit a certain media size, you need to understand "
"the tradeoffs you are making between size and functionality. In this "
@@ -573,19 +566,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:211
+#: en/user_examples.ssi:220
msgid ""
"$ lb config -k 486 -p minimal --binary-indices false --memtest none --apt-"
"recommends false --includes none"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:215
+#: en/user_examples.ssi:224
msgid "Now, build the image in the usual way:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:223
+#: en/user_examples.ssi:232
msgid ""
"On the author's system at time of writing, the above configuration produced "
"a 78Mbyte image. This compares favourably with the 166Mbyte image produced "
@@ -593,7 +586,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:225
+#: en/user_examples.ssi:234
msgid ""
"The biggest space-saver here, compared to building a standard image on an #"
"{i386}# architecture system, is to select only the #{486}# kernel flavour "
@@ -611,18 +604,18 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:227
+#: en/user_examples.ssi:236
msgid "2~ A localized KDE desktop and installer"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:229
+#: en/user_examples.ssi:238
#, no-wrap
msgid "*{Use case:}* Create a KDE desktop image, localized for Brazilian Portuguese and including an installer.\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:231
+#: en/user_examples.ssi:240
msgid ""
"We want to make an iso-hybrid image for i386 architecture using our "
"preferred desktop, in this case KDE, containing all of the same packages "
@@ -630,7 +623,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:233
+#: en/user_examples.ssi:242
msgid ""
"Our initial problem is the discovery of the names of the appropriate tasks. "
"Currently, live-build cannot help with this. While we might get lucky and "
@@ -640,17 +633,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:237
+#: en/user_examples.ssi:246
msgid "# apt-get install dctrl-tools tasksel-data"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:241
+#: en/user_examples.ssi:250
msgid "Now we can search for the appropriate tasks, first with:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:250
+#: en/user_examples.ssi:259
#, no-wrap
msgid ""
"$ grep-dctrl -FTest-lang pt_BR /usr/share/tasksel/debian-tasks.desc -sTask,Description\n"
@@ -662,14 +655,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:254
+#: en/user_examples.ssi:263
msgid ""
"By this command, we discover the task is called, plainly enough, brazilian-"
"portuguese. Now to find the related tasks:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:261
+#: en/user_examples.ssi:270
#, no-wrap
msgid ""
"$ grep-dctrl -FEnhances brazilian-portuguese /usr/share/tasksel/debian-tasks.desc -sTask,Description\n"
@@ -679,7 +672,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:265
+#: en/user_examples.ssi:274
#, no-wrap
msgid ""
"Task: brazilian-portuguese-kde-desktop\n"
@@ -688,7 +681,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:269
+#: en/user_examples.ssi:278
msgid ""
"We will use the experimental #{--language}# option, as live-build happens to "
"include #{syslinux}# templates for pt_BR (see {Desktop and language tasks}"
@@ -698,7 +691,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:283
+#: en/user_examples.ssi:292
#, no-wrap
msgid ""
"$ mkdir live-pt_BR-kde\n"
@@ -715,7 +708,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:287
+#: en/user_examples.ssi:296
msgid ""
"Note that we have included the #{debian-installer-launcher}# package to "
"launch the installer from the live desktop, and have also specified the 486 "
diff --git a/manual/po/ro/user_basics.ssi.po b/manual/po/ro/user_basics.ssi.po
index 46f0e79..31ae82f 100644
--- a/manual/po/ro/user_basics.ssi.po
+++ b/manual/po/ro/user_basics.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2010-12-17 13:44+0100\n"
+"POT-Creation-Date: 2010-12-19 10:06-0400\n"
"PO-Revision-Date: 2010-10-23 16:43+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -55,7 +55,8 @@ msgstr ""
#: en/user_customization-packages.ssi:291
#: en/user_customization-packages.ssi:303
#: en/user_customization-packages.ssi:313
-#: en/user_customization-packages.ssi:331 en/user_customization-runtime.ssi:14
+#: en/user_customization-packages.ssi:331
+#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
#: en/user_customization-runtime.ssi:50 en/user_customization-runtime.ssi:58
#: en/user_customization-runtime.ssi:66 en/user_customization-runtime.ssi:86
@@ -64,15 +65,15 @@ msgstr ""
#: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
#: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
-#: en/user_examples.ssi:162 en/user_examples.ssi:188 en/user_examples.ssi:209
-#: en/user_examples.ssi:217 en/user_examples.ssi:235 en/user_examples.ssi:243
-#: en/user_examples.ssi:256 en/user_examples.ssi:271
-#: en/user_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi:74 en/user_installation.ssi:82
-#: en/user_installation.ssi:90 en/user_installation.ssi:114
-#: en/user_installation.ssi:129 en/user_installation.ssi:146
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_examples.ssi:162 en/user_examples.ssi:178 en/user_examples.ssi:188
+#: en/user_examples.ssi:204 en/user_examples.ssi:218 en/user_examples.ssi:226
+#: en/user_examples.ssi:244 en/user_examples.ssi:252 en/user_examples.ssi:265
+#: en/user_examples.ssi:280 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:74
+#: en/user_installation.ssi:82 en/user_installation.ssi:90
+#: en/user_installation.ssi:114 en/user_installation.ssi:129
+#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
@@ -118,7 +119,8 @@ msgstr "code{"
#: en/user_customization-packages.ssi:295
#: en/user_customization-packages.ssi:307
#: en/user_customization-packages.ssi:317
-#: en/user_customization-packages.ssi:344 en/user_customization-runtime.ssi:18
+#: en/user_customization-packages.ssi:344
+#: en/user_customization-packages.ssi:354 en/user_customization-runtime.ssi:18
#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:46
#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:62
#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:90
@@ -127,15 +129,15 @@ msgstr "code{"
#: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
#: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
#: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
-#: en/user_examples.ssi:166 en/user_examples.ssi:197 en/user_examples.ssi:213
-#: en/user_examples.ssi:221 en/user_examples.ssi:239 en/user_examples.ssi:252
-#: en/user_examples.ssi:267 en/user_examples.ssi:285
-#: en/user_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi:70
-#: en/user_installation.ssi:78 en/user_installation.ssi:86
-#: en/user_installation.ssi:94 en/user_installation.ssi:119
-#: en/user_installation.ssi:136 en/user_installation.ssi:150
-#: en/user_managing_a_configuration.ssi:31
+#: en/user_examples.ssi:166 en/user_examples.ssi:184 en/user_examples.ssi:200
+#: en/user_examples.ssi:208 en/user_examples.ssi:222 en/user_examples.ssi:230
+#: en/user_examples.ssi:248 en/user_examples.ssi:261 en/user_examples.ssi:276
+#: en/user_examples.ssi:294 en/user_installation.ssi:42
+#: en/user_installation.ssi:50 en/user_installation.ssi:60
+#: en/user_installation.ssi:70 en/user_installation.ssi:78
+#: en/user_installation.ssi:86 en/user_installation.ssi:94
+#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: en/user_installation.ssi:150 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
@@ -280,7 +282,7 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:42 en/user_basics.ssi:118 en/user_basics.ssi:202
-#: en/user_examples.ssi:109 en/user_examples.ssi:156
+#: en/user_examples.ssi:109 en/user_examples.ssi:156 en/user_examples.ssi:206
msgid "# lb build"
msgstr ""
@@ -398,7 +400,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:102 en/user_basics.ssi:184
+#: en/user_basics.ssi:102
msgid "$ lb clean --binary"
msgstr ""
@@ -537,10 +539,15 @@ msgid ""
msgstr ""
#. type: Plain text
+#: en/user_basics.ssi:184
+msgid "# lb clean --binary"
+msgstr ""
+
+#. type: Plain text
#: en/user_basics.ssi:188
msgid ""
-"Run the #{lb config}# command with the parameters to configure the \"config/"
-"\" hierarchy to create our netboot image:"
+"Run the #{lb config}# command as follows to configure your image for "
+"netbooting:"
msgstr ""
#. type: Plain text
@@ -553,11 +560,12 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:196
msgid ""
-"In contrast with the ISO and USB/HDD images, netbooting does not support "
-"serving a filesystem image with the client, so the files must be served via "
-"NFS. The net-root-path and net-root-server options specify the location and "
-"server, respectively, of the NFS server where the filesytem image will be "
-"located at boot time."
+"In contrast with the ISO and USB/HDD images, netbooting does not, itself, "
+"serve the filesystem image to the client, so the files must be served via "
+"NFS. The #{--net-root-path}# and #{--net-root-server}# options specify the "
+"location and server, respectively, of the NFS server where the filesytem "
+"image will be located at boot time. Make sure these are set to suitable "
+"values for your network and server."
msgstr ""
#. type: Plain text
@@ -574,15 +582,17 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:208
msgid ""
-"For example, if you unpack the generated binary-net.tar.gz archive in the /"
-"srv/debian-live directory, you'll find the filesystem image in live/"
-"filesystem.squashfs and the kernel, initrd and pxelinux bootloader in "
-"tftpboot/debian-live/i386."
+"For example, if you unpack the generated #{binary-net.tar.gz}# archive in "
+"the #{/srv/debian-live}# directory, you'll find the filesystem image in #"
+"{live/filesystem.squashfs}# and the kernel, initrd and pxelinux bootloader "
+"in #{tftpboot/debian-live/i386}#."
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:210
-msgid "We must now configure three services on the server to enable netboot."
+msgid ""
+"We must now configure three services on the server to enable netboot: the "
+"DHCP server, the TFTP server and the NFS server."
msgstr ""
#. type: Plain text
@@ -602,7 +612,7 @@ msgstr ""
#: en/user_basics.ssi:216
msgid ""
"Here is an example for inspiration, written for the ISC DHCP server #{isc-"
-"dhcp-server}# in the /etc/dhcp/dhcpd.conf configuration file;"
+"dhcp-server}# in the #{/etc/dhcp/dhcpd.conf}# configuration file:"
msgstr ""
#. type: Plain text
@@ -657,13 +667,13 @@ msgstr ""
#: en/user_basics.ssi:244
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 /"
-"srv/debian-live/tftpboot, run as root the following command:"
+"inside a root directory, usually #{/srv/tftp}#. To let it serve files inside "
+"#{/srv/debian-live/tftpboot}#, run as root the following command:"
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:248
-msgid "dpkg-reconfigure -plow tftpd-hpa"
+msgid "# dpkg-reconfigure -plow tftpd-hpa"
msgstr ""
#. type: Plain text
@@ -686,14 +696,14 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:258
-msgid "You need to install the nfs-kernel-server package."
+msgid "You need to install the #{nfs-kernel-server}# package."
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:260
msgid ""
"Then, make the filesystem image available through NFS by adding a line like "
-"the following to /etc/exports:"
+"the following to #{/etc/exports}#:"
msgstr ""
#. type: Plain text
@@ -748,12 +758,12 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:286
-msgid "_* Install qemu, bridge-utils, sudo."
+msgid "_* Install #{qemu}#, #{bridge-utils}#, #{sudo}#."
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:288
-msgid "Edit /etc/qemu-ifup:"
+msgid "Edit #{/etc/qemu-ifup}#:"
msgstr ""
#. type: Plain text
@@ -767,12 +777,13 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:303
-msgid "Get, or build a grub-floppy-netboot (in the svn)."
+msgid "Get, or build a #{grub-floppy-netboot}# (in the svn)."
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:305
-msgid "Launch qemu with \"-net nic,vlan=0 -net tap,vlan=0,ifname=tun0\""
+msgid ""
+"Launch #{qemu}# with \"#{-net nic,vlan=0 -net tap,vlan=0,ifname=tun0}#\""
msgstr ""
#. type: Plain text
@@ -788,7 +799,8 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:311
msgid ""
-"_* Create a PXETester directory, and create a text file called pxe.vwx inside"
+"_* Create a PXETester directory, and create a text file called #{pxe.vwx}# "
+"inside"
msgstr ""
#. type: Plain text
diff --git a/manual/po/ro/user_customization-packages.ssi.po b/manual/po/ro/user_customization-packages.ssi.po
index f186b79..cc38dda 100644
--- a/manual/po/ro/user_customization-packages.ssi.po
+++ b/manual/po/ro/user_customization-packages.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2010-12-14 15:35-0400\n"
+"POT-Creation-Date: 2010-12-19 10:06-0400\n"
"PO-Revision-Date: 2010-10-22 08:58-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -33,10 +33,12 @@ msgstr ""
#: en/user_basics.ssi:116 en/user_basics.ssi:126 en/user_basics.ssi:140
#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
#: en/user_basics.ssi:182 en/user_basics.ssi:190 en/user_basics.ssi:200
-#: en/user_basics.ssi: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_basics.ssi:218 en/user_basics.ssi:246 en/user_basics.ssi:262
+#: en/user_basics.ssi:270 en/user_basics.ssi:290 en/user_basics.ssi:315
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
+#: en/user_customization-installer.ssi:32
+#: en/user_customization-installer.ssi:42
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:53
#: en/user_customization-packages.ssi:66 en/user_customization-packages.ssi:80
@@ -53,7 +55,8 @@ msgstr ""
#: en/user_customization-packages.ssi:291
#: en/user_customization-packages.ssi:303
#: en/user_customization-packages.ssi:313
-#: en/user_customization-packages.ssi:331 en/user_customization-runtime.ssi:14
+#: en/user_customization-packages.ssi:331
+#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
#: en/user_customization-runtime.ssi:50 en/user_customization-runtime.ssi:58
#: en/user_customization-runtime.ssi:66 en/user_customization-runtime.ssi:86
@@ -62,15 +65,15 @@ msgstr ""
#: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
#: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
-#: en/user_examples.ssi:162 en/user_examples.ssi:188 en/user_examples.ssi:209
-#: en/user_examples.ssi:217 en/user_examples.ssi:235 en/user_examples.ssi:243
-#: en/user_examples.ssi:256 en/user_examples.ssi:271
-#: en/user_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi:74 en/user_installation.ssi:82
-#: en/user_installation.ssi:90 en/user_installation.ssi:114
-#: en/user_installation.ssi:129 en/user_installation.ssi:146
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_examples.ssi:162 en/user_examples.ssi:178 en/user_examples.ssi:188
+#: en/user_examples.ssi:204 en/user_examples.ssi:218 en/user_examples.ssi:226
+#: en/user_examples.ssi:244 en/user_examples.ssi:252 en/user_examples.ssi:265
+#: en/user_examples.ssi:280 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:74
+#: en/user_installation.ssi:82 en/user_installation.ssi:90
+#: en/user_installation.ssi:114 en/user_installation.ssi:129
+#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
@@ -94,10 +97,12 @@ msgstr "code{"
#: en/user_basics.ssi:120 en/user_basics.ssi:130 en/user_basics.ssi:146
#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
#: en/user_basics.ssi:186 en/user_basics.ssi:194 en/user_basics.ssi:204
-#: en/user_basics.ssi: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:238 en/user_basics.ssi:250 en/user_basics.ssi:266
+#: en/user_basics.ssi:274 en/user_basics.ssi:301 en/user_basics.ssi:340
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
+#: en/user_customization-installer.ssi:36
+#: en/user_customization-installer.ssi:46
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:58
#: en/user_customization-packages.ssi:70 en/user_customization-packages.ssi:84
@@ -114,7 +119,8 @@ msgstr "code{"
#: en/user_customization-packages.ssi:295
#: en/user_customization-packages.ssi:307
#: en/user_customization-packages.ssi:317
-#: en/user_customization-packages.ssi:344 en/user_customization-runtime.ssi:18
+#: en/user_customization-packages.ssi:344
+#: en/user_customization-packages.ssi:354 en/user_customization-runtime.ssi:18
#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:46
#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:62
#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:90
@@ -123,15 +129,15 @@ msgstr "code{"
#: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
#: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
#: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
-#: en/user_examples.ssi:166 en/user_examples.ssi:197 en/user_examples.ssi:213
-#: en/user_examples.ssi:221 en/user_examples.ssi:239 en/user_examples.ssi:252
-#: en/user_examples.ssi:267 en/user_examples.ssi:285
-#: en/user_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi:70
-#: en/user_installation.ssi:78 en/user_installation.ssi:86
-#: en/user_installation.ssi:94 en/user_installation.ssi:119
-#: en/user_installation.ssi:136 en/user_installation.ssi:150
-#: en/user_managing_a_configuration.ssi:31
+#: en/user_examples.ssi:166 en/user_examples.ssi:184 en/user_examples.ssi:200
+#: en/user_examples.ssi:208 en/user_examples.ssi:222 en/user_examples.ssi:230
+#: en/user_examples.ssi:248 en/user_examples.ssi:261 en/user_examples.ssi:276
+#: en/user_examples.ssi:294 en/user_installation.ssi:42
+#: en/user_installation.ssi:50 en/user_installation.ssi:60
+#: en/user_installation.ssi:70 en/user_installation.ssi:78
+#: en/user_installation.ssi:86 en/user_installation.ssi:94
+#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: en/user_installation.ssi:150 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
@@ -989,13 +995,17 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:319
msgid ""
-"The tradeoff here is that recommended packages are defined as \"packages "
-"that would be found together with this one in all but unusual installations"
-"\" (Debian Policy Manual, 7.2). This may lead to some packages that you "
-"actually need being omitted, so we suggest you review the difference this "
-"makes to your packages list (see the #{binary.packages}# file generated by #"
-"{lb build}#) and re-include in your list any missing packages that you still "
-"want installed."
+"The tradeoff here is that if you don't install recommended packages for a "
+"given package, that is, \"packages that would be found together with this "
+"one in all but unusual installations\" (Debian Policy Manual, 7.2), some "
+"packages that you actually need may be omitted. Therefore, we suggest you "
+"review the difference turning off recommends makes to your packages list "
+"(see the #{binary.packages}# file generated by #{lb build}#) and re-include "
+"in your list any missing packages that you still want installed. "
+"Alternatively, if you find you only want a small number of recommended "
+"packages left out, leave recommends enabled and set a negative APT pin "
+"priority on selected packages to prevent them from being installed, as "
+"explained in {APT pinning}#apt-pinning."
msgstr ""
#. type: Plain text
@@ -1048,3 +1058,19 @@ msgstr ""
#: en/user_customization-packages.ssi:342
msgid "Package: * Pin: release n=sid Pin-Priority: 1 END"
msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:346
+msgid ""
+"Negative pin priorities will prevent a package from being installed, as in "
+"the case where you do not want a package that is recommended by another "
+"package. Suppose you are building a GNOME image but don't want the user "
+"prompted to store wifi passwords in the keyring, so you want to omit the "
+"recommended #{gnome-keyring}# package. This can be done by adding the "
+"following stanza to #{config/chroot_apt/preferences}#:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:352
+msgid "Package: gnome-keyring Pin: version * Pin-Priority: -1"
+msgstr ""
diff --git a/manual/po/ro/user_examples.ssi.po b/manual/po/ro/user_examples.ssi.po
index 43c310f..71e8fcd 100644
--- a/manual/po/ro/user_examples.ssi.po
+++ b/manual/po/ro/user_examples.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2010-12-16 21:32-0400\n"
+"POT-Creation-Date: 2010-12-19 10:06-0400\n"
"PO-Revision-Date: 2010-11-04 16:34-0400\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -38,8 +38,8 @@ msgstr ""
#: en/user_basics.ssi:116 en/user_basics.ssi:126 en/user_basics.ssi:140
#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
#: en/user_basics.ssi:182 en/user_basics.ssi:190 en/user_basics.ssi:200
-#: en/user_basics.ssi: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_basics.ssi:218 en/user_basics.ssi:246 en/user_basics.ssi:262
+#: en/user_basics.ssi:270 en/user_basics.ssi:290 en/user_basics.ssi:315
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
@@ -60,7 +60,8 @@ msgstr ""
#: en/user_customization-packages.ssi:291
#: en/user_customization-packages.ssi:303
#: en/user_customization-packages.ssi:313
-#: en/user_customization-packages.ssi:331 en/user_customization-runtime.ssi:14
+#: en/user_customization-packages.ssi:331
+#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
#: en/user_customization-runtime.ssi:50 en/user_customization-runtime.ssi:58
#: en/user_customization-runtime.ssi:66 en/user_customization-runtime.ssi:86
@@ -69,15 +70,15 @@ msgstr ""
#: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
#: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
-#: en/user_examples.ssi:162 en/user_examples.ssi:188 en/user_examples.ssi:209
-#: en/user_examples.ssi:217 en/user_examples.ssi:235 en/user_examples.ssi:243
-#: en/user_examples.ssi:256 en/user_examples.ssi:271
-#: en/user_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi:74 en/user_installation.ssi:82
-#: en/user_installation.ssi:90 en/user_installation.ssi:114
-#: en/user_installation.ssi:129 en/user_installation.ssi:146
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_examples.ssi:162 en/user_examples.ssi:178 en/user_examples.ssi:188
+#: en/user_examples.ssi:204 en/user_examples.ssi:218 en/user_examples.ssi:226
+#: en/user_examples.ssi:244 en/user_examples.ssi:252 en/user_examples.ssi:265
+#: en/user_examples.ssi:280 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:74
+#: en/user_installation.ssi:82 en/user_installation.ssi:90
+#: en/user_installation.ssi:114 en/user_installation.ssi:129
+#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
@@ -101,8 +102,8 @@ msgstr "code{"
#: en/user_basics.ssi:120 en/user_basics.ssi:130 en/user_basics.ssi:146
#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
#: en/user_basics.ssi:186 en/user_basics.ssi:194 en/user_basics.ssi:204
-#: en/user_basics.ssi: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:238 en/user_basics.ssi:250 en/user_basics.ssi:266
+#: en/user_basics.ssi:274 en/user_basics.ssi:301 en/user_basics.ssi:340
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:36
@@ -123,7 +124,8 @@ msgstr "code{"
#: en/user_customization-packages.ssi:295
#: en/user_customization-packages.ssi:307
#: en/user_customization-packages.ssi:317
-#: en/user_customization-packages.ssi:344 en/user_customization-runtime.ssi:18
+#: en/user_customization-packages.ssi:344
+#: en/user_customization-packages.ssi:354 en/user_customization-runtime.ssi:18
#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:46
#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:62
#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:90
@@ -132,15 +134,15 @@ msgstr "code{"
#: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
#: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
#: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
-#: en/user_examples.ssi:166 en/user_examples.ssi:197 en/user_examples.ssi:213
-#: en/user_examples.ssi:221 en/user_examples.ssi:239 en/user_examples.ssi:252
-#: en/user_examples.ssi:267 en/user_examples.ssi:285
-#: en/user_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi:70
-#: en/user_installation.ssi:78 en/user_installation.ssi:86
-#: en/user_installation.ssi:94 en/user_installation.ssi:119
-#: en/user_installation.ssi:136 en/user_installation.ssi:150
-#: en/user_managing_a_configuration.ssi:31
+#: en/user_examples.ssi:166 en/user_examples.ssi:184 en/user_examples.ssi:200
+#: en/user_examples.ssi:208 en/user_examples.ssi:222 en/user_examples.ssi:230
+#: en/user_examples.ssi:248 en/user_examples.ssi:261 en/user_examples.ssi:276
+#: en/user_examples.ssi:294 en/user_installation.ssi:42
+#: en/user_installation.ssi:50 en/user_installation.ssi:60
+#: en/user_installation.ssi:70 en/user_installation.ssi:78
+#: en/user_installation.ssi:86 en/user_installation.ssi:94
+#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: en/user_installation.ssi:150 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
@@ -150,7 +152,7 @@ msgstr "}code"
#. type: Plain text
#: en/user_basics.ssi:42 en/user_basics.ssi:118 en/user_basics.ssi:202
-#: en/user_examples.ssi:109 en/user_examples.ssi:156
+#: en/user_examples.ssi:109 en/user_examples.ssi:156 en/user_examples.ssi:206
msgid "# lb build"
msgstr ""
@@ -245,7 +247,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:42 en/user_examples.ssi:66 en/user_examples.ssi:219
+#: en/user_examples.ssi:42 en/user_examples.ssi:66 en/user_examples.ssi:228
msgid "# lb build 2>&1 | tee binary.log"
msgstr ""
@@ -348,7 +350,7 @@ msgid "Edit #{auto/config}# to read as follows:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:92 en/user_examples.ssi:141 en/user_examples.ssi:190
+#: en/user_examples.ssi:92 en/user_examples.ssi:141
msgid "#!/bin/sh"
msgstr ""
@@ -492,75 +494,66 @@ msgstr ""
#. type: Plain text
#: en/user_examples.ssi:176
-msgid "_* Make a build directory: #{$ mkdir vncBuild}#"
-msgstr ""
-
-#. type: Plain text
-#: en/user_examples.ssi:178
-msgid "_* Move to the build directory: #{$ cd vncBuild}#"
-msgstr ""
-
-#. type: Plain text
-#: en/user_examples.ssi:180
msgid ""
-"Example to config the build directory to include gdm metacity "
-"xtightvncviewer: #{$ lb config --packages \"gdm3 metacity xtightvncviewer\"}#"
+"Make a build directory and create a skeletal configuration in it, including #"
+"{gdm3}#, #{metacity}# and #{xtightvncviewer}#:"
msgstr ""
#. type: Plain text
#: en/user_examples.ssi:182
msgid ""
-"Create a folder /etc/skel folder for a custom .xsession for the default "
-"user: #{$ mkdir -p config/chroot_local-includes/etc/skel}#"
+"$ mkdir vnc_kiosk_client $ cd vnc_kiosk_client $ lb config -p standard-x11 --"
+"packages \"gdm3 metacity xtightvncviewer\""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:184
+#: en/user_examples.ssi:186
msgid ""
-"Create the .xsession for the default user: #{$ touch config/chroot_local-"
-"includes/etc/skel/.xsession}#"
+"Create the directory #{/etc/skel}# and put a custom #{.xsession}# in it for "
+"the default user that will launch metacity and start xvncviewer, connecting "
+"to port #{5901}# on a server at #{192.168.1.2}#:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:186
+#: en/user_examples.ssi:192
msgid ""
-"Edit the .xsession file to launch metacity and start xvncviewer with "
-"something similar to the below:"
+"$ mkdir -p config/chroot_local-includes/etc/skel $ cat config/chroot_local-"
+"includes/etc/skel/.xsession <<END #!/bin/sh"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:193
-msgid "/usr/bin/metacity & /usr/bin/vncviewer xxx.xxx.xxx.xxx:PORT"
+#: en/user_examples.ssi:195
+msgid "/usr/bin/metacity & /usr/bin/xvncviewer 192.168.1.2:1"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:195
-msgid "exit"
+#: en/user_examples.ssi:198
+msgid "exit END"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:199
-msgid "_* Build the image: #{# lb build}#"
+#: en/user_examples.ssi:202
+msgid "Build the image:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:201
-msgid "_* Enjoy."
+#: en/user_examples.ssi:210
+msgid "Enjoy."
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:203
+#: en/user_examples.ssi:212
msgid "2~ A base image for a 128M USB key"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:205
+#: en/user_examples.ssi:214
#, no-wrap
msgid "*{Use case:}* Create a standard image with some components removed in order to fit on a 128M USB key with space left over to use as you see fit.\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:207
+#: en/user_examples.ssi:216
msgid ""
"When optimizing an image to fit a certain media size, you need to understand "
"the tradeoffs you are making between size and functionality. In this "
@@ -574,19 +567,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:211
+#: en/user_examples.ssi:220
msgid ""
"$ lb config -k 486 -p minimal --binary-indices false --memtest none --apt-"
"recommends false --includes none"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:215
+#: en/user_examples.ssi:224
msgid "Now, build the image in the usual way:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:223
+#: en/user_examples.ssi:232
msgid ""
"On the author's system at time of writing, the above configuration produced "
"a 78Mbyte image. This compares favourably with the 166Mbyte image produced "
@@ -594,7 +587,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:225
+#: en/user_examples.ssi:234
msgid ""
"The biggest space-saver here, compared to building a standard image on an #"
"{i386}# architecture system, is to select only the #{486}# kernel flavour "
@@ -612,18 +605,18 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:227
+#: en/user_examples.ssi:236
msgid "2~ A localized KDE desktop and installer"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:229
+#: en/user_examples.ssi:238
#, no-wrap
msgid "*{Use case:}* Create a KDE desktop image, localized for Brazilian Portuguese and including an installer.\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:231
+#: en/user_examples.ssi:240
msgid ""
"We want to make an iso-hybrid image for i386 architecture using our "
"preferred desktop, in this case KDE, containing all of the same packages "
@@ -631,7 +624,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:233
+#: en/user_examples.ssi:242
msgid ""
"Our initial problem is the discovery of the names of the appropriate tasks. "
"Currently, live-build cannot help with this. While we might get lucky and "
@@ -641,17 +634,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:237
+#: en/user_examples.ssi:246
msgid "# apt-get install dctrl-tools tasksel-data"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:241
+#: en/user_examples.ssi:250
msgid "Now we can search for the appropriate tasks, first with:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:250
+#: en/user_examples.ssi:259
#, no-wrap
msgid ""
"$ grep-dctrl -FTest-lang pt_BR /usr/share/tasksel/debian-tasks.desc -sTask,Description\n"
@@ -663,14 +656,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:254
+#: en/user_examples.ssi:263
msgid ""
"By this command, we discover the task is called, plainly enough, brazilian-"
"portuguese. Now to find the related tasks:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:261
+#: en/user_examples.ssi:270
#, no-wrap
msgid ""
"$ grep-dctrl -FEnhances brazilian-portuguese /usr/share/tasksel/debian-tasks.desc -sTask,Description\n"
@@ -680,7 +673,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:265
+#: en/user_examples.ssi:274
#, no-wrap
msgid ""
"Task: brazilian-portuguese-kde-desktop\n"
@@ -689,7 +682,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:269
+#: en/user_examples.ssi:278
msgid ""
"We will use the experimental #{--language}# option, as live-build happens to "
"include #{syslinux}# templates for pt_BR (see {Desktop and language tasks}"
@@ -699,7 +692,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:283
+#: en/user_examples.ssi:292
#, no-wrap
msgid ""
"$ mkdir live-pt_BR-kde\n"
@@ -716,7 +709,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:287
+#: en/user_examples.ssi:296
msgid ""
"Note that we have included the #{debian-installer-launcher}# package to "
"launch the installer from the live desktop, and have also specified the 486 "
diff --git a/manual/pot/user_basics.ssi.pot b/manual/pot/user_basics.ssi.pot
index cf5ed24..713a168 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-12-17 13:44+0100\n"
+"POT-Creation-Date: 2010-12-19 10:06-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"
@@ -54,7 +54,8 @@ msgstr ""
#: en/user_customization-packages.ssi:291
#: en/user_customization-packages.ssi:303
#: en/user_customization-packages.ssi:313
-#: en/user_customization-packages.ssi:331 en/user_customization-runtime.ssi:14
+#: en/user_customization-packages.ssi:331
+#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
#: en/user_customization-runtime.ssi:50 en/user_customization-runtime.ssi:58
#: en/user_customization-runtime.ssi:66 en/user_customization-runtime.ssi:86
@@ -63,15 +64,15 @@ msgstr ""
#: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
#: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
-#: en/user_examples.ssi:162 en/user_examples.ssi:188 en/user_examples.ssi:209
-#: en/user_examples.ssi:217 en/user_examples.ssi:235 en/user_examples.ssi:243
-#: en/user_examples.ssi:256 en/user_examples.ssi:271
-#: en/user_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi:74 en/user_installation.ssi:82
-#: en/user_installation.ssi:90 en/user_installation.ssi:114
-#: en/user_installation.ssi:129 en/user_installation.ssi:146
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_examples.ssi:162 en/user_examples.ssi:178 en/user_examples.ssi:188
+#: en/user_examples.ssi:204 en/user_examples.ssi:218 en/user_examples.ssi:226
+#: en/user_examples.ssi:244 en/user_examples.ssi:252 en/user_examples.ssi:265
+#: en/user_examples.ssi:280 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:74
+#: en/user_installation.ssi:82 en/user_installation.ssi:90
+#: en/user_installation.ssi:114 en/user_installation.ssi:129
+#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
@@ -117,7 +118,8 @@ msgstr ""
#: en/user_customization-packages.ssi:295
#: en/user_customization-packages.ssi:307
#: en/user_customization-packages.ssi:317
-#: en/user_customization-packages.ssi:344 en/user_customization-runtime.ssi:18
+#: en/user_customization-packages.ssi:344
+#: en/user_customization-packages.ssi:354 en/user_customization-runtime.ssi:18
#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:46
#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:62
#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:90
@@ -126,15 +128,15 @@ msgstr ""
#: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
#: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
#: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
-#: en/user_examples.ssi:166 en/user_examples.ssi:197 en/user_examples.ssi:213
-#: en/user_examples.ssi:221 en/user_examples.ssi:239 en/user_examples.ssi:252
-#: en/user_examples.ssi:267 en/user_examples.ssi:285
-#: en/user_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi:70
-#: en/user_installation.ssi:78 en/user_installation.ssi:86
-#: en/user_installation.ssi:94 en/user_installation.ssi:119
-#: en/user_installation.ssi:136 en/user_installation.ssi:150
-#: en/user_managing_a_configuration.ssi:31
+#: en/user_examples.ssi:166 en/user_examples.ssi:184 en/user_examples.ssi:200
+#: en/user_examples.ssi:208 en/user_examples.ssi:222 en/user_examples.ssi:230
+#: en/user_examples.ssi:248 en/user_examples.ssi:261 en/user_examples.ssi:276
+#: en/user_examples.ssi:294 en/user_installation.ssi:42
+#: en/user_installation.ssi:50 en/user_installation.ssi:60
+#: en/user_installation.ssi:70 en/user_installation.ssi:78
+#: en/user_installation.ssi:86 en/user_installation.ssi:94
+#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: en/user_installation.ssi:150 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
@@ -279,7 +281,7 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:42 en/user_basics.ssi:118 en/user_basics.ssi:202
-#: en/user_examples.ssi:109 en/user_examples.ssi:156
+#: en/user_examples.ssi:109 en/user_examples.ssi:156 en/user_examples.ssi:206
msgid "# lb build"
msgstr ""
@@ -397,7 +399,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:102 en/user_basics.ssi:184
+#: en/user_basics.ssi:102
msgid "$ lb clean --binary"
msgstr ""
@@ -536,10 +538,15 @@ msgid ""
msgstr ""
#. type: Plain text
+#: en/user_basics.ssi:184
+msgid "# lb clean --binary"
+msgstr ""
+
+#. type: Plain text
#: en/user_basics.ssi:188
msgid ""
-"Run the #{lb config}# command with the parameters to configure the \"config/"
-"\" hierarchy to create our netboot image:"
+"Run the #{lb config}# command as follows to configure your image for "
+"netbooting:"
msgstr ""
#. type: Plain text
@@ -552,11 +559,12 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:196
msgid ""
-"In contrast with the ISO and USB/HDD images, netbooting does not support "
-"serving a filesystem image with the client, so the files must be served via "
-"NFS. The net-root-path and net-root-server options specify the location and "
-"server, respectively, of the NFS server where the filesytem image will be "
-"located at boot time."
+"In contrast with the ISO and USB/HDD images, netbooting does not, itself, "
+"serve the filesystem image to the client, so the files must be served via "
+"NFS. The #{--net-root-path}# and #{--net-root-server}# options specify the "
+"location and server, respectively, of the NFS server where the filesytem "
+"image will be located at boot time. Make sure these are set to suitable "
+"values for your network and server."
msgstr ""
#. type: Plain text
@@ -573,15 +581,17 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:208
msgid ""
-"For example, if you unpack the generated binary-net.tar.gz archive in the /"
-"srv/debian-live directory, you'll find the filesystem image in live/"
-"filesystem.squashfs and the kernel, initrd and pxelinux bootloader in "
-"tftpboot/debian-live/i386."
+"For example, if you unpack the generated #{binary-net.tar.gz}# archive in "
+"the #{/srv/debian-live}# directory, you'll find the filesystem image in #"
+"{live/filesystem.squashfs}# and the kernel, initrd and pxelinux bootloader "
+"in #{tftpboot/debian-live/i386}#."
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:210
-msgid "We must now configure three services on the server to enable netboot."
+msgid ""
+"We must now configure three services on the server to enable netboot: the "
+"DHCP server, the TFTP server and the NFS server."
msgstr ""
#. type: Plain text
@@ -601,7 +611,7 @@ msgstr ""
#: en/user_basics.ssi:216
msgid ""
"Here is an example for inspiration, written for the ISC DHCP server #{isc-"
-"dhcp-server}# in the /etc/dhcp/dhcpd.conf configuration file;"
+"dhcp-server}# in the #{/etc/dhcp/dhcpd.conf}# configuration file:"
msgstr ""
#. type: Plain text
@@ -656,13 +666,13 @@ msgstr ""
#: en/user_basics.ssi:244
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 /"
-"srv/debian-live/tftpboot, run as root the following command:"
+"inside a root directory, usually #{/srv/tftp}#. To let it serve files inside "
+"#{/srv/debian-live/tftpboot}#, run as root the following command:"
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:248
-msgid "dpkg-reconfigure -plow tftpd-hpa"
+msgid "# dpkg-reconfigure -plow tftpd-hpa"
msgstr ""
#. type: Plain text
@@ -685,14 +695,14 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:258
-msgid "You need to install the nfs-kernel-server package."
+msgid "You need to install the #{nfs-kernel-server}# package."
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:260
msgid ""
"Then, make the filesystem image available through NFS by adding a line like "
-"the following to /etc/exports:"
+"the following to #{/etc/exports}#:"
msgstr ""
#. type: Plain text
@@ -747,12 +757,12 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:286
-msgid "_* Install qemu, bridge-utils, sudo."
+msgid "_* Install #{qemu}#, #{bridge-utils}#, #{sudo}#."
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:288
-msgid "Edit /etc/qemu-ifup:"
+msgid "Edit #{/etc/qemu-ifup}#:"
msgstr ""
#. type: Plain text
@@ -766,12 +776,13 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:303
-msgid "Get, or build a grub-floppy-netboot (in the svn)."
+msgid "Get, or build a #{grub-floppy-netboot}# (in the svn)."
msgstr ""
#. type: Plain text
#: en/user_basics.ssi:305
-msgid "Launch qemu with \"-net nic,vlan=0 -net tap,vlan=0,ifname=tun0\""
+msgid ""
+"Launch #{qemu}# with \"#{-net nic,vlan=0 -net tap,vlan=0,ifname=tun0}#\""
msgstr ""
#. type: Plain text
@@ -787,7 +798,8 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:311
msgid ""
-"_* Create a PXETester directory, and create a text file called pxe.vwx inside"
+"_* Create a PXETester directory, and create a text file called #{pxe.vwx}# "
+"inside"
msgstr ""
#. type: Plain text
diff --git a/manual/pot/user_customization-packages.ssi.pot b/manual/pot/user_customization-packages.ssi.pot
index 917e5d8..6191b12 100644
--- a/manual/pot/user_customization-packages.ssi.pot
+++ b/manual/pot/user_customization-packages.ssi.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-12-14 15:35-0400\n"
+"POT-Creation-Date: 2010-12-19 10:06-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"
@@ -32,10 +32,12 @@ msgstr ""
#: en/user_basics.ssi:116 en/user_basics.ssi:126 en/user_basics.ssi:140
#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
#: en/user_basics.ssi:182 en/user_basics.ssi:190 en/user_basics.ssi:200
-#: en/user_basics.ssi: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_basics.ssi:218 en/user_basics.ssi:246 en/user_basics.ssi:262
+#: en/user_basics.ssi:270 en/user_basics.ssi:290 en/user_basics.ssi:315
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
+#: en/user_customization-installer.ssi:32
+#: en/user_customization-installer.ssi:42
#: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
#: en/user_customization-packages.ssi:40 en/user_customization-packages.ssi:53
#: en/user_customization-packages.ssi:66 en/user_customization-packages.ssi:80
@@ -52,7 +54,8 @@ msgstr ""
#: en/user_customization-packages.ssi:291
#: en/user_customization-packages.ssi:303
#: en/user_customization-packages.ssi:313
-#: en/user_customization-packages.ssi:331 en/user_customization-runtime.ssi:14
+#: en/user_customization-packages.ssi:331
+#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
#: en/user_customization-runtime.ssi:50 en/user_customization-runtime.ssi:58
#: en/user_customization-runtime.ssi:66 en/user_customization-runtime.ssi:86
@@ -61,15 +64,15 @@ msgstr ""
#: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
#: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
-#: en/user_examples.ssi:162 en/user_examples.ssi:188 en/user_examples.ssi:209
-#: en/user_examples.ssi:217 en/user_examples.ssi:235 en/user_examples.ssi:243
-#: en/user_examples.ssi:256 en/user_examples.ssi:271
-#: en/user_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi:74 en/user_installation.ssi:82
-#: en/user_installation.ssi:90 en/user_installation.ssi:114
-#: en/user_installation.ssi:129 en/user_installation.ssi:146
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_examples.ssi:162 en/user_examples.ssi:178 en/user_examples.ssi:188
+#: en/user_examples.ssi:204 en/user_examples.ssi:218 en/user_examples.ssi:226
+#: en/user_examples.ssi:244 en/user_examples.ssi:252 en/user_examples.ssi:265
+#: en/user_examples.ssi:280 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:74
+#: en/user_installation.ssi:82 en/user_installation.ssi:90
+#: en/user_installation.ssi:114 en/user_installation.ssi:129
+#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
@@ -93,10 +96,12 @@ msgstr ""
#: en/user_basics.ssi:120 en/user_basics.ssi:130 en/user_basics.ssi:146
#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
#: en/user_basics.ssi:186 en/user_basics.ssi:194 en/user_basics.ssi:204
-#: en/user_basics.ssi: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:238 en/user_basics.ssi:250 en/user_basics.ssi:266
+#: en/user_basics.ssi:274 en/user_basics.ssi:301 en/user_basics.ssi:340
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
+#: en/user_customization-installer.ssi:36
+#: en/user_customization-installer.ssi:46
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:58
#: en/user_customization-packages.ssi:70 en/user_customization-packages.ssi:84
@@ -113,7 +118,8 @@ msgstr ""
#: en/user_customization-packages.ssi:295
#: en/user_customization-packages.ssi:307
#: en/user_customization-packages.ssi:317
-#: en/user_customization-packages.ssi:344 en/user_customization-runtime.ssi:18
+#: en/user_customization-packages.ssi:344
+#: en/user_customization-packages.ssi:354 en/user_customization-runtime.ssi:18
#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:46
#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:62
#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:90
@@ -122,15 +128,15 @@ msgstr ""
#: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
#: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
#: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
-#: en/user_examples.ssi:166 en/user_examples.ssi:197 en/user_examples.ssi:213
-#: en/user_examples.ssi:221 en/user_examples.ssi:239 en/user_examples.ssi:252
-#: en/user_examples.ssi:267 en/user_examples.ssi:285
-#: en/user_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi:70
-#: en/user_installation.ssi:78 en/user_installation.ssi:86
-#: en/user_installation.ssi:94 en/user_installation.ssi:119
-#: en/user_installation.ssi:136 en/user_installation.ssi:150
-#: en/user_managing_a_configuration.ssi:31
+#: en/user_examples.ssi:166 en/user_examples.ssi:184 en/user_examples.ssi:200
+#: en/user_examples.ssi:208 en/user_examples.ssi:222 en/user_examples.ssi:230
+#: en/user_examples.ssi:248 en/user_examples.ssi:261 en/user_examples.ssi:276
+#: en/user_examples.ssi:294 en/user_installation.ssi:42
+#: en/user_installation.ssi:50 en/user_installation.ssi:60
+#: en/user_installation.ssi:70 en/user_installation.ssi:78
+#: en/user_installation.ssi:86 en/user_installation.ssi:94
+#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: en/user_installation.ssi:150 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
@@ -988,13 +994,17 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:319
msgid ""
-"The tradeoff here is that recommended packages are defined as \"packages "
-"that would be found together with this one in all but unusual installations"
-"\" (Debian Policy Manual, 7.2). This may lead to some packages that you "
-"actually need being omitted, so we suggest you review the difference this "
-"makes to your packages list (see the #{binary.packages}# file generated by #"
-"{lb build}#) and re-include in your list any missing packages that you still "
-"want installed."
+"The tradeoff here is that if you don't install recommended packages for a "
+"given package, that is, \"packages that would be found together with this "
+"one in all but unusual installations\" (Debian Policy Manual, 7.2), some "
+"packages that you actually need may be omitted. Therefore, we suggest you "
+"review the difference turning off recommends makes to your packages list "
+"(see the #{binary.packages}# file generated by #{lb build}#) and re-include "
+"in your list any missing packages that you still want installed. "
+"Alternatively, if you find you only want a small number of recommended "
+"packages left out, leave recommends enabled and set a negative APT pin "
+"priority on selected packages to prevent them from being installed, as "
+"explained in {APT pinning}#apt-pinning."
msgstr ""
#. type: Plain text
@@ -1047,3 +1057,19 @@ msgstr ""
#: en/user_customization-packages.ssi:342
msgid "Package: * Pin: release n=sid Pin-Priority: 1 END"
msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:346
+msgid ""
+"Negative pin priorities will prevent a package from being installed, as in "
+"the case where you do not want a package that is recommended by another "
+"package. Suppose you are building a GNOME image but don't want the user "
+"prompted to store wifi passwords in the keyring, so you want to omit the "
+"recommended #{gnome-keyring}# package. This can be done by adding the "
+"following stanza to #{config/chroot_apt/preferences}#:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:352
+msgid "Package: gnome-keyring Pin: version * Pin-Priority: -1"
+msgstr ""
diff --git a/manual/pot/user_examples.ssi.pot b/manual/pot/user_examples.ssi.pot
index fc00519..665c7c6 100644
--- a/manual/pot/user_examples.ssi.pot
+++ b/manual/pot/user_examples.ssi.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-12-16 21:32-0400\n"
+"POT-Creation-Date: 2010-12-19 10:06-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"
@@ -37,8 +37,8 @@ msgstr ""
#: en/user_basics.ssi:116 en/user_basics.ssi:126 en/user_basics.ssi:140
#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
#: en/user_basics.ssi:182 en/user_basics.ssi:190 en/user_basics.ssi:200
-#: en/user_basics.ssi: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_basics.ssi:218 en/user_basics.ssi:246 en/user_basics.ssi:262
+#: en/user_basics.ssi:270 en/user_basics.ssi:290 en/user_basics.ssi:315
#: en/user_customization-contents.ssi:26 en/user_customization-contents.ssi:35
#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:66
#: en/user_customization-installer.ssi:32
@@ -59,7 +59,8 @@ msgstr ""
#: en/user_customization-packages.ssi:291
#: en/user_customization-packages.ssi:303
#: en/user_customization-packages.ssi:313
-#: en/user_customization-packages.ssi:331 en/user_customization-runtime.ssi:14
+#: en/user_customization-packages.ssi:331
+#: en/user_customization-packages.ssi:348 en/user_customization-runtime.ssi:14
#: en/user_customization-runtime.ssi:32 en/user_customization-runtime.ssi:42
#: en/user_customization-runtime.ssi:50 en/user_customization-runtime.ssi:58
#: en/user_customization-runtime.ssi:66 en/user_customization-runtime.ssi:86
@@ -68,15 +69,15 @@ msgstr ""
#: en/user_examples.ssi:54 en/user_examples.ssi:64 en/user_examples.ssi:80
#: en/user_examples.ssi:90 en/user_examples.ssi:107 en/user_examples.ssi:117
#: en/user_examples.ssi:131 en/user_examples.ssi:139 en/user_examples.ssi:154
-#: en/user_examples.ssi:162 en/user_examples.ssi:188 en/user_examples.ssi:209
-#: en/user_examples.ssi:217 en/user_examples.ssi:235 en/user_examples.ssi:243
-#: en/user_examples.ssi:256 en/user_examples.ssi:271
-#: en/user_installation.ssi:38 en/user_installation.ssi:46
-#: en/user_installation.ssi:56 en/user_installation.ssi:64
-#: en/user_installation.ssi:74 en/user_installation.ssi:82
-#: en/user_installation.ssi:90 en/user_installation.ssi:114
-#: en/user_installation.ssi:129 en/user_installation.ssi:146
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_examples.ssi:162 en/user_examples.ssi:178 en/user_examples.ssi:188
+#: en/user_examples.ssi:204 en/user_examples.ssi:218 en/user_examples.ssi:226
+#: en/user_examples.ssi:244 en/user_examples.ssi:252 en/user_examples.ssi:265
+#: en/user_examples.ssi:280 en/user_installation.ssi:38
+#: en/user_installation.ssi:46 en/user_installation.ssi:56
+#: en/user_installation.ssi:64 en/user_installation.ssi:74
+#: en/user_installation.ssi:82 en/user_installation.ssi:90
+#: en/user_installation.ssi:114 en/user_installation.ssi:129
+#: en/user_installation.ssi:146 en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47
#: en/user_managing_a_configuration.ssi:56 en/user_overview.ssi:36
@@ -100,8 +101,8 @@ msgstr ""
#: en/user_basics.ssi:120 en/user_basics.ssi:130 en/user_basics.ssi:146
#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
#: en/user_basics.ssi:186 en/user_basics.ssi:194 en/user_basics.ssi:204
-#: en/user_basics.ssi: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:238 en/user_basics.ssi:250 en/user_basics.ssi:266
+#: en/user_basics.ssi:274 en/user_basics.ssi:301 en/user_basics.ssi:340
#: en/user_customization-contents.ssi:31 en/user_customization-contents.ssi:46
#: en/user_customization-contents.ssi:58 en/user_customization-contents.ssi:70
#: en/user_customization-installer.ssi:36
@@ -122,7 +123,8 @@ msgstr ""
#: en/user_customization-packages.ssi:295
#: en/user_customization-packages.ssi:307
#: en/user_customization-packages.ssi:317
-#: en/user_customization-packages.ssi:344 en/user_customization-runtime.ssi:18
+#: en/user_customization-packages.ssi:344
+#: en/user_customization-packages.ssi:354 en/user_customization-runtime.ssi:18
#: en/user_customization-runtime.ssi:36 en/user_customization-runtime.ssi:46
#: en/user_customization-runtime.ssi:54 en/user_customization-runtime.ssi:62
#: en/user_customization-runtime.ssi:70 en/user_customization-runtime.ssi:90
@@ -131,15 +133,15 @@ msgstr ""
#: en/user_examples.ssi:58 en/user_examples.ssi:68 en/user_examples.ssi:86
#: en/user_examples.ssi:101 en/user_examples.ssi:111 en/user_examples.ssi:123
#: en/user_examples.ssi:135 en/user_examples.ssi:150 en/user_examples.ssi:158
-#: en/user_examples.ssi:166 en/user_examples.ssi:197 en/user_examples.ssi:213
-#: en/user_examples.ssi:221 en/user_examples.ssi:239 en/user_examples.ssi:252
-#: en/user_examples.ssi:267 en/user_examples.ssi:285
-#: en/user_installation.ssi:42 en/user_installation.ssi:50
-#: en/user_installation.ssi:60 en/user_installation.ssi:70
-#: en/user_installation.ssi:78 en/user_installation.ssi:86
-#: en/user_installation.ssi:94 en/user_installation.ssi:119
-#: en/user_installation.ssi:136 en/user_installation.ssi:150
-#: en/user_managing_a_configuration.ssi:31
+#: en/user_examples.ssi:166 en/user_examples.ssi:184 en/user_examples.ssi:200
+#: en/user_examples.ssi:208 en/user_examples.ssi:222 en/user_examples.ssi:230
+#: en/user_examples.ssi:248 en/user_examples.ssi:261 en/user_examples.ssi:276
+#: en/user_examples.ssi:294 en/user_installation.ssi:42
+#: en/user_installation.ssi:50 en/user_installation.ssi:60
+#: en/user_installation.ssi:70 en/user_installation.ssi:78
+#: en/user_installation.ssi:86 en/user_installation.ssi:94
+#: en/user_installation.ssi:119 en/user_installation.ssi:136
+#: en/user_installation.ssi:150 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52
#: en/user_managing_a_configuration.ssi:60 en/user_overview.ssi:74
@@ -149,7 +151,7 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:42 en/user_basics.ssi:118 en/user_basics.ssi:202
-#: en/user_examples.ssi:109 en/user_examples.ssi:156
+#: en/user_examples.ssi:109 en/user_examples.ssi:156 en/user_examples.ssi:206
msgid "# lb build"
msgstr ""
@@ -244,7 +246,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:42 en/user_examples.ssi:66 en/user_examples.ssi:219
+#: en/user_examples.ssi:42 en/user_examples.ssi:66 en/user_examples.ssi:228
msgid "# lb build 2>&1 | tee binary.log"
msgstr ""
@@ -347,7 +349,7 @@ msgid "Edit #{auto/config}# to read as follows:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:92 en/user_examples.ssi:141 en/user_examples.ssi:190
+#: en/user_examples.ssi:92 en/user_examples.ssi:141
msgid "#!/bin/sh"
msgstr ""
@@ -491,75 +493,66 @@ msgstr ""
#. type: Plain text
#: en/user_examples.ssi:176
-msgid "_* Make a build directory: #{$ mkdir vncBuild}#"
-msgstr ""
-
-#. type: Plain text
-#: en/user_examples.ssi:178
-msgid "_* Move to the build directory: #{$ cd vncBuild}#"
-msgstr ""
-
-#. type: Plain text
-#: en/user_examples.ssi:180
msgid ""
-"Example to config the build directory to include gdm metacity "
-"xtightvncviewer: #{$ lb config --packages \"gdm3 metacity xtightvncviewer\"}#"
+"Make a build directory and create a skeletal configuration in it, including #"
+"{gdm3}#, #{metacity}# and #{xtightvncviewer}#:"
msgstr ""
#. type: Plain text
#: en/user_examples.ssi:182
msgid ""
-"Create a folder /etc/skel folder for a custom .xsession for the default "
-"user: #{$ mkdir -p config/chroot_local-includes/etc/skel}#"
+"$ mkdir vnc_kiosk_client $ cd vnc_kiosk_client $ lb config -p standard-x11 --"
+"packages \"gdm3 metacity xtightvncviewer\""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:184
+#: en/user_examples.ssi:186
msgid ""
-"Create the .xsession for the default user: #{$ touch config/chroot_local-"
-"includes/etc/skel/.xsession}#"
+"Create the directory #{/etc/skel}# and put a custom #{.xsession}# in it for "
+"the default user that will launch metacity and start xvncviewer, connecting "
+"to port #{5901}# on a server at #{192.168.1.2}#:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:186
+#: en/user_examples.ssi:192
msgid ""
-"Edit the .xsession file to launch metacity and start xvncviewer with "
-"something similar to the below:"
+"$ mkdir -p config/chroot_local-includes/etc/skel $ cat config/chroot_local-"
+"includes/etc/skel/.xsession <<END #!/bin/sh"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:193
-msgid "/usr/bin/metacity & /usr/bin/vncviewer xxx.xxx.xxx.xxx:PORT"
+#: en/user_examples.ssi:195
+msgid "/usr/bin/metacity & /usr/bin/xvncviewer 192.168.1.2:1"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:195
-msgid "exit"
+#: en/user_examples.ssi:198
+msgid "exit END"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:199
-msgid "_* Build the image: #{# lb build}#"
+#: en/user_examples.ssi:202
+msgid "Build the image:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:201
-msgid "_* Enjoy."
+#: en/user_examples.ssi:210
+msgid "Enjoy."
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:203
+#: en/user_examples.ssi:212
msgid "2~ A base image for a 128M USB key"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:205
+#: en/user_examples.ssi:214
#, no-wrap
msgid "*{Use case:}* Create a standard image with some components removed in order to fit on a 128M USB key with space left over to use as you see fit.\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:207
+#: en/user_examples.ssi:216
msgid ""
"When optimizing an image to fit a certain media size, you need to understand "
"the tradeoffs you are making between size and functionality. In this "
@@ -573,19 +566,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:211
+#: en/user_examples.ssi:220
msgid ""
"$ lb config -k 486 -p minimal --binary-indices false --memtest none --apt-"
"recommends false --includes none"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:215
+#: en/user_examples.ssi:224
msgid "Now, build the image in the usual way:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:223
+#: en/user_examples.ssi:232
msgid ""
"On the author's system at time of writing, the above configuration produced "
"a 78Mbyte image. This compares favourably with the 166Mbyte image produced "
@@ -593,7 +586,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:225
+#: en/user_examples.ssi:234
msgid ""
"The biggest space-saver here, compared to building a standard image on an #"
"{i386}# architecture system, is to select only the #{486}# kernel flavour "
@@ -611,18 +604,18 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:227
+#: en/user_examples.ssi:236
msgid "2~ A localized KDE desktop and installer"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:229
+#: en/user_examples.ssi:238
#, no-wrap
msgid "*{Use case:}* Create a KDE desktop image, localized for Brazilian Portuguese and including an installer.\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:231
+#: en/user_examples.ssi:240
msgid ""
"We want to make an iso-hybrid image for i386 architecture using our "
"preferred desktop, in this case KDE, containing all of the same packages "
@@ -630,7 +623,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:233
+#: en/user_examples.ssi:242
msgid ""
"Our initial problem is the discovery of the names of the appropriate tasks. "
"Currently, live-build cannot help with this. While we might get lucky and "
@@ -640,17 +633,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:237
+#: en/user_examples.ssi:246
msgid "# apt-get install dctrl-tools tasksel-data"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:241
+#: en/user_examples.ssi:250
msgid "Now we can search for the appropriate tasks, first with:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:250
+#: en/user_examples.ssi:259
#, no-wrap
msgid ""
"$ grep-dctrl -FTest-lang pt_BR /usr/share/tasksel/debian-tasks.desc -sTask,Description\n"
@@ -662,14 +655,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:254
+#: en/user_examples.ssi:263
msgid ""
"By this command, we discover the task is called, plainly enough, brazilian-"
"portuguese. Now to find the related tasks:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:261
+#: en/user_examples.ssi:270
#, no-wrap
msgid ""
"$ grep-dctrl -FEnhances brazilian-portuguese /usr/share/tasksel/debian-tasks.desc -sTask,Description\n"
@@ -679,7 +672,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:265
+#: en/user_examples.ssi:274
#, no-wrap
msgid ""
"Task: brazilian-portuguese-kde-desktop\n"
@@ -688,7 +681,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:269
+#: en/user_examples.ssi:278
msgid ""
"We will use the experimental #{--language}# option, as live-build happens to "
"include #{syslinux}# templates for pt_BR (see {Desktop and language tasks}"
@@ -698,7 +691,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:283
+#: en/user_examples.ssi:292
#, no-wrap
msgid ""
"$ mkdir live-pt_BR-kde\n"
@@ -715,7 +708,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:287
+#: en/user_examples.ssi:296
msgid ""
"Note that we have included the #{debian-installer-launcher}# package to "
"launch the installer from the live desktop, and have also specified the 486 "
diff --git a/manual/pt_BR/user_basics.ssi b/manual/pt_BR/user_basics.ssi
index 3703714..b39c457 100644
--- a/manual/pt_BR/user_basics.ssi
+++ b/manual/pt_BR/user_basics.ssi
@@ -246,12 +246,12 @@ working directory with the #{lb clean}# command:
code{
-$ lb clean --binary
+# lb clean --binary
}code
-Run the #{lb config}# command with the parameters to configure the "config/"
-hierarchy to create our netboot image:
+Run the #{lb config}# command as follows to configure your image for
+netbooting:
code{
@@ -260,11 +260,12 @@ $ lb config -b net --net-root-path "/srv/debian-live" --net-root-server
}code
-In contrast with the ISO and USB/HDD images, netbooting does not support
-serving a filesystem image with the client, so the files must be served via
-NFS. The net-root-path and net-root-server options specify the location and
-server, respectively, of the NFS server where the filesytem image will be
-located at boot time.
+In contrast with the ISO and USB/HDD images, netbooting does not, itself,
+serve the filesystem image to the client, so the files must be served via
+NFS. The #{--net-root-path}# and #{--net-root-server}# options specify the
+location and server, respectively, of the NFS server where the filesytem
+image will be located at boot time. Make sure these are set to suitable
+values for your network and server.
Now build the image with the #{lb build}# command:
@@ -281,12 +282,13 @@ next step is getting a higher level bootloader via the TFTP protocol. That
could be pxelinux, GRUB, or even boot directly to an operating system like
Linux.
-For example, if you unpack the generated binary-net.tar.gz archive in the
-/srv/debian-live directory, you'll find the filesystem image in
-live/filesystem.squashfs and the kernel, initrd and pxelinux bootloader in
-tftpboot/debian-live/i386.
+For example, if you unpack the generated #{binary-net.tar.gz}# archive in
+the #{/srv/debian-live}# directory, you'll find the filesystem image in
+#{live/filesystem.squashfs}# and the kernel, initrd and pxelinux bootloader
+in #{tftpboot/debian-live/i386}#.
-We must now configure three services on the server to enable netboot.
+We must now configure three services on the server to enable netboot: the
+DHCP server, the TFTP server and the NFS server.
3~ DHCP server
@@ -295,7 +297,7 @@ to the netbooting client system, and to advertise the location of the PXE
bootloader.
Here is an example for inspiration, written for the ISC DHCP server
-#{isc-dhcp-server}# in the /etc/dhcp/dhcpd.conf configuration file;
+#{isc-dhcp-server}# in the #{/etc/dhcp/dhcpd.conf}# configuration file:
code{
@@ -323,12 +325,12 @@ subnet 192.168.0.0 netmask 255.255.255.0 {
This serves the kernel and initial ramdisk to the system at run time.
You should install the tftpd-hpa package. It can serve all files contained
-inside a root directory, usually /srv/tftp. To let it serve files inside
-/srv/debian-live/tftpboot, run as root the following command:
+inside a root directory, usually #{/srv/tftp}#. To let it serve files inside
+#{/srv/debian-live/tftpboot}#, run as root the following command:
code{
-dpkg-reconfigure -plow tftpd-hpa
+# dpkg-reconfigure -plow tftpd-hpa
}code
@@ -340,10 +342,10 @@ Once the guest computer has downloaded and booted a Linux kernel and loaded
its initrd, it will try to mount the Live filesystem image through a NFS
server.
-You need to install the nfs-kernel-server package.
+You need to install the #{nfs-kernel-server}# package.
Then, make the filesystem image available through NFS by adding a line like
-the following to /etc/exports:
+the following to #{/etc/exports}#:
code{
@@ -375,9 +377,9 @@ To make our life easier, we can use virtualization. There are two solutions.
3~ Qemu
-_* Install qemu, bridge-utils, sudo.
+_* Install #{qemu}#, #{bridge-utils}#, #{sudo}#.
-Edit /etc/qemu-ifup:
+Edit #{/etc/qemu-ifup}#:
code{
@@ -388,15 +390,15 @@ code{
}code
-Get, or build a grub-floppy-netboot (in the svn).
+Get, or build a #{grub-floppy-netboot}# (in the svn).
-Launch qemu with "-net nic,vlan=0 -net tap,vlan=0,ifname=tun0"
+Launch #{qemu}# with "#{-net nic,vlan=0 -net tap,vlan=0,ifname=tun0}#"
3~ VMWare Player
_* Install VMWare Player ("free as in beer" edition)
-_* Create a PXETester directory, and create a text file called pxe.vwx
+_* Create a PXETester directory, and create a text file called #{pxe.vwx}#
inside
_* Paste this text inside:
diff --git a/manual/pt_BR/user_customization-packages.ssi b/manual/pt_BR/user_customization-packages.ssi
index 97d65cc..f2aeba5 100644
--- a/manual/pt_BR/user_customization-packages.ssi
+++ b/manual/pt_BR/user_customization-packages.ssi
@@ -508,13 +508,17 @@ $ lb config --apt-recommends false
}code
-The tradeoff here is that recommended packages are defined as "packages that
-would be found together with this one in all but unusual installations"
-(Debian Policy Manual, §7.2). This may lead to some packages that you
-actually need being omitted, so we suggest you review the difference this
-makes to your packages list (see the #{binary.packages}# file generated by
-#{lb build}#) and re-include in your list any missing packages that you
-still want installed.
+The tradeoff here is that if you don't install recommended packages for a
+given package, that is, "packages that would be found together with this one
+in all but unusual installations" (Debian Policy Manual, §7.2), some
+packages that you actually need may be omitted. Therefore, we suggest you
+review the difference turning off recommends makes to your packages list
+(see the #{binary.packages}# file generated by #{lb build}#) and re-include
+in your list any missing packages that you still want
+installed. Alternatively, if you find you only want a small number of
+recommended packages left out, leave recommends enabled and set a negative
+APT pin priority on selected packages to prevent them from being installed,
+as explained in {APT pinning}#apt-pinning.
3~ Passing options to apt or aptitude
@@ -546,3 +550,16 @@ Package: * Pin: release n=sid Pin-Priority: 1 END
}code
+Negative pin priorities will prevent a package from being installed, as in
+the case where you do not want a package that is recommended by another
+package. Suppose you are building a GNOME image but don't want the user
+prompted to store wifi passwords in the keyring, so you want to omit the
+recommended #{gnome-keyring}# package. This can be done by adding the
+following stanza to #{config/chroot_apt/preferences}#:
+
+code{
+
+Package: gnome-keyring Pin: version * Pin-Priority: -1
+
+}code
+
diff --git a/manual/pt_BR/user_examples.ssi b/manual/pt_BR/user_examples.ssi
index 79b45d2..f9c2f60 100644
--- a/manual/pt_BR/user_examples.ssi
+++ b/manual/pt_BR/user_examples.ssi
@@ -226,35 +226,40 @@ cases drawn from the collected experiences of users of Debian Live.
*{Use case:}* Create an image with live-build to boot directly to a VNC server.
-_* Make a build directory: #{$ mkdir vncBuild}#
+Make a build directory and create a skeletal configuration in it, including
+#{gdm3}#, #{metacity}# and #{xtightvncviewer}#:
-_* Move to the build directory: #{$ cd vncBuild}#
-
-Example to config the build directory to include gdm metacity
-xtightvncviewer: #{$ lb config --packages "gdm3 metacity xtightvncviewer"}#
+code{
-Create a folder /etc/skel folder for a custom .xsession for the default
-user: #{$ mkdir -p config/chroot_local-includes/etc/skel}#
+$ mkdir vnc_kiosk_client $ cd vnc_kiosk_client $ lb config -p standard-x11
+--packages "gdm3 metacity xtightvncviewer"
-Create the .xsession for the default user: #{$ touch
-config/chroot_local-includes/etc/skel/.xsession}#
+}code
-Edit the .xsession file to launch metacity and start xvncviewer with
-something similar to the below:
+Create the directory #{/etc/skel}# and put a custom #{.xsession}# in it for
+the default user that will launch metacity and start xvncviewer, connecting
+to port #{5901}# on a server at #{192.168.1.2}#:
code{
-#!/bin/sh
+$ mkdir -p config/chroot_local-includes/etc/skel $ cat
+config/chroot_local-includes/etc/skel/.xsession <<END #!/bin/sh
-/usr/bin/metacity & /usr/bin/vncviewer xxx.xxx.xxx.xxx:PORT
+/usr/bin/metacity & /usr/bin/xvncviewer 192.168.1.2:1
-exit
+exit END
}code
-_* Build the image: #{# lb build}#
+Build the image:
+
+code{
+
+# lb build
+
+}code
-_* Enjoy.
+Enjoy.
2~ A base image for a 128M USB key
diff --git a/manual/ro/user_basics.ssi b/manual/ro/user_basics.ssi
index 3703714..b39c457 100644
--- a/manual/ro/user_basics.ssi
+++ b/manual/ro/user_basics.ssi
@@ -246,12 +246,12 @@ working directory with the #{lb clean}# command:
code{
-$ lb clean --binary
+# lb clean --binary
}code
-Run the #{lb config}# command with the parameters to configure the "config/"
-hierarchy to create our netboot image:
+Run the #{lb config}# command as follows to configure your image for
+netbooting:
code{
@@ -260,11 +260,12 @@ $ lb config -b net --net-root-path "/srv/debian-live" --net-root-server
}code
-In contrast with the ISO and USB/HDD images, netbooting does not support
-serving a filesystem image with the client, so the files must be served via
-NFS. The net-root-path and net-root-server options specify the location and
-server, respectively, of the NFS server where the filesytem image will be
-located at boot time.
+In contrast with the ISO and USB/HDD images, netbooting does not, itself,
+serve the filesystem image to the client, so the files must be served via
+NFS. The #{--net-root-path}# and #{--net-root-server}# options specify the
+location and server, respectively, of the NFS server where the filesytem
+image will be located at boot time. Make sure these are set to suitable
+values for your network and server.
Now build the image with the #{lb build}# command:
@@ -281,12 +282,13 @@ next step is getting a higher level bootloader via the TFTP protocol. That
could be pxelinux, GRUB, or even boot directly to an operating system like
Linux.
-For example, if you unpack the generated binary-net.tar.gz archive in the
-/srv/debian-live directory, you'll find the filesystem image in
-live/filesystem.squashfs and the kernel, initrd and pxelinux bootloader in
-tftpboot/debian-live/i386.
+For example, if you unpack the generated #{binary-net.tar.gz}# archive in
+the #{/srv/debian-live}# directory, you'll find the filesystem image in
+#{live/filesystem.squashfs}# and the kernel, initrd and pxelinux bootloader
+in #{tftpboot/debian-live/i386}#.
-We must now configure three services on the server to enable netboot.
+We must now configure three services on the server to enable netboot: the
+DHCP server, the TFTP server and the NFS server.
3~ DHCP server
@@ -295,7 +297,7 @@ to the netbooting client system, and to advertise the location of the PXE
bootloader.
Here is an example for inspiration, written for the ISC DHCP server
-#{isc-dhcp-server}# in the /etc/dhcp/dhcpd.conf configuration file;
+#{isc-dhcp-server}# in the #{/etc/dhcp/dhcpd.conf}# configuration file:
code{
@@ -323,12 +325,12 @@ subnet 192.168.0.0 netmask 255.255.255.0 {
This serves the kernel and initial ramdisk to the system at run time.
You should install the tftpd-hpa package. It can serve all files contained
-inside a root directory, usually /srv/tftp. To let it serve files inside
-/srv/debian-live/tftpboot, run as root the following command:
+inside a root directory, usually #{/srv/tftp}#. To let it serve files inside
+#{/srv/debian-live/tftpboot}#, run as root the following command:
code{
-dpkg-reconfigure -plow tftpd-hpa
+# dpkg-reconfigure -plow tftpd-hpa
}code
@@ -340,10 +342,10 @@ Once the guest computer has downloaded and booted a Linux kernel and loaded
its initrd, it will try to mount the Live filesystem image through a NFS
server.
-You need to install the nfs-kernel-server package.
+You need to install the #{nfs-kernel-server}# package.
Then, make the filesystem image available through NFS by adding a line like
-the following to /etc/exports:
+the following to #{/etc/exports}#:
code{
@@ -375,9 +377,9 @@ To make our life easier, we can use virtualization. There are two solutions.
3~ Qemu
-_* Install qemu, bridge-utils, sudo.
+_* Install #{qemu}#, #{bridge-utils}#, #{sudo}#.
-Edit /etc/qemu-ifup:
+Edit #{/etc/qemu-ifup}#:
code{
@@ -388,15 +390,15 @@ code{
}code
-Get, or build a grub-floppy-netboot (in the svn).
+Get, or build a #{grub-floppy-netboot}# (in the svn).
-Launch qemu with "-net nic,vlan=0 -net tap,vlan=0,ifname=tun0"
+Launch #{qemu}# with "#{-net nic,vlan=0 -net tap,vlan=0,ifname=tun0}#"
3~ VMWare Player
_* Install VMWare Player ("free as in beer" edition)
-_* Create a PXETester directory, and create a text file called pxe.vwx
+_* Create a PXETester directory, and create a text file called #{pxe.vwx}#
inside
_* Paste this text inside:
diff --git a/manual/ro/user_customization-packages.ssi b/manual/ro/user_customization-packages.ssi
index 97d65cc..f2aeba5 100644
--- a/manual/ro/user_customization-packages.ssi
+++ b/manual/ro/user_customization-packages.ssi
@@ -508,13 +508,17 @@ $ lb config --apt-recommends false
}code
-The tradeoff here is that recommended packages are defined as "packages that
-would be found together with this one in all but unusual installations"
-(Debian Policy Manual, §7.2). This may lead to some packages that you
-actually need being omitted, so we suggest you review the difference this
-makes to your packages list (see the #{binary.packages}# file generated by
-#{lb build}#) and re-include in your list any missing packages that you
-still want installed.
+The tradeoff here is that if you don't install recommended packages for a
+given package, that is, "packages that would be found together with this one
+in all but unusual installations" (Debian Policy Manual, §7.2), some
+packages that you actually need may be omitted. Therefore, we suggest you
+review the difference turning off recommends makes to your packages list
+(see the #{binary.packages}# file generated by #{lb build}#) and re-include
+in your list any missing packages that you still want
+installed. Alternatively, if you find you only want a small number of
+recommended packages left out, leave recommends enabled and set a negative
+APT pin priority on selected packages to prevent them from being installed,
+as explained in {APT pinning}#apt-pinning.
3~ Passing options to apt or aptitude
@@ -546,3 +550,16 @@ Package: * Pin: release n=sid Pin-Priority: 1 END
}code
+Negative pin priorities will prevent a package from being installed, as in
+the case where you do not want a package that is recommended by another
+package. Suppose you are building a GNOME image but don't want the user
+prompted to store wifi passwords in the keyring, so you want to omit the
+recommended #{gnome-keyring}# package. This can be done by adding the
+following stanza to #{config/chroot_apt/preferences}#:
+
+code{
+
+Package: gnome-keyring Pin: version * Pin-Priority: -1
+
+}code
+
diff --git a/manual/ro/user_examples.ssi b/manual/ro/user_examples.ssi
index 79b45d2..f9c2f60 100644
--- a/manual/ro/user_examples.ssi
+++ b/manual/ro/user_examples.ssi
@@ -226,35 +226,40 @@ cases drawn from the collected experiences of users of Debian Live.
*{Use case:}* Create an image with live-build to boot directly to a VNC server.
-_* Make a build directory: #{$ mkdir vncBuild}#
+Make a build directory and create a skeletal configuration in it, including
+#{gdm3}#, #{metacity}# and #{xtightvncviewer}#:
-_* Move to the build directory: #{$ cd vncBuild}#
-
-Example to config the build directory to include gdm metacity
-xtightvncviewer: #{$ lb config --packages "gdm3 metacity xtightvncviewer"}#
+code{
-Create a folder /etc/skel folder for a custom .xsession for the default
-user: #{$ mkdir -p config/chroot_local-includes/etc/skel}#
+$ mkdir vnc_kiosk_client $ cd vnc_kiosk_client $ lb config -p standard-x11
+--packages "gdm3 metacity xtightvncviewer"
-Create the .xsession for the default user: #{$ touch
-config/chroot_local-includes/etc/skel/.xsession}#
+}code
-Edit the .xsession file to launch metacity and start xvncviewer with
-something similar to the below:
+Create the directory #{/etc/skel}# and put a custom #{.xsession}# in it for
+the default user that will launch metacity and start xvncviewer, connecting
+to port #{5901}# on a server at #{192.168.1.2}#:
code{
-#!/bin/sh
+$ mkdir -p config/chroot_local-includes/etc/skel $ cat
+config/chroot_local-includes/etc/skel/.xsession <<END #!/bin/sh
-/usr/bin/metacity & /usr/bin/vncviewer xxx.xxx.xxx.xxx:PORT
+/usr/bin/metacity & /usr/bin/xvncviewer 192.168.1.2:1
-exit
+exit END
}code
-_* Build the image: #{# lb build}#
+Build the image:
+
+code{
+
+# lb build
+
+}code
-_* Enjoy.
+Enjoy.
2~ A base image for a 128M USB key
--
live-manual
More information about the debian-live-changes
mailing list