[SCM] live-manual branch, debian, updated. debian/3.0_a10-1-39-g216427c

chals chals at altorricon.com
Tue Apr 3 07:21:41 UTC 2012 

The following commit has been merged in the debian branch:
commit 5613724c6d31b90d05db3d6aa7d52aa541038334
Author: chals <chals at altorricon.com>
Date:   Mon Feb 13 14:50:55 2012 +0100

    Updating to 3.x, architectures.

diff --git a/manual/de/live-manual.ssm b/manual/de/live-manual.ssm
index c89135d..d696015 100644
--- a/manual/de/live-manual.ssm
+++ b/manual/de/live-manual.ssm
@@ -9,7 +9,7 @@
  :license: Dieses Programm ist freie Software. Sie können es unter den Bedingungen der GNU General Public License, wie von der Free Software Foundation veröffentlicht, weitergeben und/oder modifizieren, entweder gemäss Version 3 der Lizenz oder (nach Ihrer Option) jeder späteren Version.<br><br>Die Veröffentlichung dieses Programms erfolgt in der Hoffnung, dass es Ihnen von Nutzen sein wird, aber OHNE IRGENDEINE GARANTIE, sogar ohne die implizite Garantie der MARKTREIFE oder der VERWENDBARKEIT FÜR EINEN BESTIMMTEN ZWECK. Details finden Sie in der GNU General Public License.<br><br>Sie sollten ein Exemplar der GNU General Public License zusammen mit diesem Programm erhalten haben. Falls nicht, siehe <http://www.gnu.org/licenses/>.<br><br>Der komplette Text der GNU General Public License kann in der Datei /usr/share/common-licenses/GPL-3 gefunden werden.
 
 @date:
- :published: 2012-02-11
+ :published: 2012-02-13
 
 @publisher: Debian Live Projekt <debian-live at lists.debian.org>
 
diff --git a/manual/de/user_customization-installer.ssi b/manual/de/user_customization-installer.ssi
index d8d0c17..a8b01b5 100644
--- a/manual/de/user_customization-installer.ssi
+++ b/manual/de/user_customization-installer.ssi
@@ -52,7 +52,7 @@ architecture. For example:
 
 code{
 
- $ lb config --architecture i386 --linux-flavours 486 \
+ $ lb config --architectures i386 --linux-flavours 486 \
      --debian-installer live
  $ echo debian-installer-launcher >> config/package-lists/my.list.chroot
 
diff --git a/manual/de/user_customization-packages.ssi b/manual/de/user_customization-packages.ssi
index 01fd8c2..9035a7f 100644
--- a/manual/de/user_customization-packages.ssi
+++ b/manual/de/user_customization-packages.ssi
@@ -226,26 +226,26 @@ the #{LB_}# prefix) may be used in conditional statements in package
 lists. Generally, this means any #{lb config}# option uppercased and with
 dashes changed to underscores. But in practice, it is only the ones that
 influence package selection that make sense, such as #{DISTRIBUTION}#,
-#{ARCHITECTURE}# or #{ARCHIVE_AREAS}#.
+#{ARCHITECTURES}# or #{ARCHIVE_AREAS}#.
 
-For example, to install #{ia32-libs}# if the #{--architecture amd64}# is
+For example, to install #{ia32-libs}# if the #{--architectures amd64}# is
 specified:
 
 code{
 
- #if ARCHITECTURE amd64
+ #if ARCHITECTURES amd64
  ia32-libs
  #endif
 
 }code
 
 You may test for any one of a number of values, e.g. to install
-#{memtest86+}# if either #{--architecture i386}# or #{--architecture amd64}#
-is specified:
+#{memtest86+}# if either #{--architectures i386}# or #{--architectures
+amd64}# is specified:
 
 code{
 
- #if ARCHITECTURE i386 amd64
+ #if ARCHITECTURES i386 amd64
  memtest86+
  #endif
 
@@ -267,7 +267,7 @@ A conditional may surround an #{#include}# directive:
 
 code{
 
- #if ARCHITECTURE amd64
+ #if ARCHITECTURES amd64
  #include <gnome-full>
  #endif
 
diff --git a/manual/de/user_examples.ssi b/manual/de/user_examples.ssi
index 1faee91..a87a36f 100644
--- a/manual/de/user_examples.ssi
+++ b/manual/de/user_examples.ssi
@@ -131,7 +131,7 @@ code{
  #!/bin/sh
 
  lb config noauto \
-     --architecture i386 \
+     --architectures i386 \
      --linux-flavours 686-pae \
      --package-lists lxde \
      "${@}"
@@ -146,7 +146,7 @@ code{
 
 }code
 
-First, #{--architecture i386}# ensures that on our #{amd64}# build system,
+First, #{--architectures i386}# ensures that on our #{amd64}# build system,
 we build a 32-bit version suitable for use on most machines. Second, we use
 #{--linux-flavours 686-pae}# because we don't anticipate using this image on
 much older systems. Third, we've chosen the #{lxde}# package list to give us
diff --git a/manual/en/live-manual.ssm b/manual/en/live-manual.ssm
index 9ce345f..cb4265e 100644
--- a/manual/en/live-manual.ssm
+++ b/manual/en/live-manual.ssm
@@ -9,7 +9,7 @@
  :license: This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.<br><br>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.<br><br>You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/. <br><br>The complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-3 file.
 
 @date:
- :published: 2012-02-11
+ :published: 2012-02-13
 
 @publisher: Debian Live Project <debian-live at lists.debian.org>
 
diff --git a/manual/en/user_customization-installer.ssi b/manual/en/user_customization-installer.ssi
index 6a8e934..62a9ed9 100644
--- a/manual/en/user_customization-installer.ssi
+++ b/manual/en/user_customization-installer.ssi
@@ -30,7 +30,7 @@ Note that by default, live-build does not include Debian Installer images in the
 
 code{
 
- $ lb config --architecture i386 --linux-flavours 486 \
+ $ lb config --architectures i386 --linux-flavours 486 \
      --debian-installer live
  $ echo debian-installer-launcher >> config/package-lists/my.list.chroot
 
diff --git a/manual/en/user_customization-packages.ssi b/manual/en/user_customization-packages.ssi
index e7b277d..c3b10ac 100644
--- a/manual/en/user_customization-packages.ssi
+++ b/manual/en/user_customization-packages.ssi
@@ -132,23 +132,23 @@ code{
 
 3~ Using conditionals inside package lists
 
-Any of the live-build configuration variables stored in #{config/*}# (minus the #{LB_}# prefix) may be used in conditional statements in package lists. Generally, this means any #{lb config}# option uppercased and with dashes changed to underscores. But in practice, it is only the ones that influence package selection that make sense, such as #{DISTRIBUTION}#, #{ARCHITECTURE}# or #{ARCHIVE_AREAS}#.
+Any of the live-build configuration variables stored in #{config/*}# (minus the #{LB_}# prefix) may be used in conditional statements in package lists. Generally, this means any #{lb config}# option uppercased and with dashes changed to underscores. But in practice, it is only the ones that influence package selection that make sense, such as #{DISTRIBUTION}#, #{ARCHITECTURES}# or #{ARCHIVE_AREAS}#.
 
-For example, to install #{ia32-libs}# if the #{--architecture amd64}# is specified:
+For example, to install #{ia32-libs}# if the #{--architectures amd64}# is specified:
 
 code{
 
- #if ARCHITECTURE amd64
+ #if ARCHITECTURES amd64
  ia32-libs
  #endif
 
 }code
 
-You may test for any one of a number of values, e.g. to install #{memtest86+}# if either #{--architecture i386}# or #{--architecture amd64}# is specified:
+You may test for any one of a number of values, e.g. to install #{memtest86+}# if either #{--architectures i386}# or #{--architectures amd64}# is specified:
 
 code{
 
- #if ARCHITECTURE i386 amd64
+ #if ARCHITECTURES i386 amd64
  memtest86+
  #endif
 
@@ -168,7 +168,7 @@ A conditional may surround an #{#include}# directive:
 
 code{
 
- #if ARCHITECTURE amd64
+ #if ARCHITECTURES amd64
  #include <gnome-full>
  #endif
 
diff --git a/manual/en/user_examples.ssi b/manual/en/user_examples.ssi
index 834ef3f..17835e8 100644
--- a/manual/en/user_examples.ssi
+++ b/manual/en/user_examples.ssi
@@ -94,7 +94,7 @@ code{
  #!/bin/sh
 
  lb config noauto \
-     --architecture i386 \
+     --architectures i386 \
      --linux-flavours 686-pae \
      --package-lists lxde \
      "${@}"
@@ -109,7 +109,7 @@ code{
 
 }code
 
-First, #{--architecture i386}# ensures that on our #{amd64}# build system, we build a 32-bit version suitable for use on most machines. Second, we use #{--linux-flavours 686-pae}# because we don't anticipate using this image on much older systems. Third, we've chosen the #{lxde}# package list to give us a minimal desktop. And finally, we have added two initial favourite packages: #{iceweasel}# and #{xchat}#.
+First, #{--architectures i386}# ensures that on our #{amd64}# build system, we build a 32-bit version suitable for use on most machines. Second, we use #{--linux-flavours 686-pae}# because we don't anticipate using this image on much older systems. Third, we've chosen the #{lxde}# package list to give us a minimal desktop. And finally, we have added two initial favourite packages: #{iceweasel}# and #{xchat}#.
 
 Now, build the image:
 
diff --git a/manual/es/live-manual.ssm b/manual/es/live-manual.ssm
index 74e0452..1cee376 100644
--- a/manual/es/live-manual.ssm
+++ b/manual/es/live-manual.ssm
@@ -9,7 +9,7 @@
  :license: Este programa es software libre: puede ser redistribuido y/o modificado bajo los términos de la GNU General Public License publicada por la Free Software Foundation, bien de la versión 3 de la Licencia, o (a su elección) cualquier versión posterior. <br><br> Este programa se distribuye con la esperanza de que sea útil, pero SIN NINGUNA GARANTÍA, incluso sin la garantía implícita de COMERCIALIZACIÓN o IDONEIDAD PARA UN PROPÓSITO PARTICULAR. Consulte la GNU General Public License para más detalles. <br><br> Debería haber recibido una copia de la General Public License GNU junto con este programa. Si no, vea http://www.gnu.org/licenses/. <br><br> El texto completo de la GNU Licencia Pública General se pueden encontrar en /usr/share/common-licenses/GPL-3
 
 @date:
- :published: 2012-02-11
+ :published: 2012-02-13
 
 @publisher: Debian Live Project <debian-live at lists.debian.org>
 
diff --git a/manual/es/user_customization-installer.ssi b/manual/es/user_customization-installer.ssi
index 104741b..7506e4b 100644
--- a/manual/es/user_customization-installer.ssi
+++ b/manual/es/user_customization-installer.ssi
@@ -55,7 +55,7 @@ kernel que utiliza #{d-i}# en la arquitectura especificada. Por ejemplo:
 
 code{
 
- $ lb config --architecture i386 --linux-flavours 486 \
+ $ lb config --architectures i386 --linux-flavours 486 \
      --debian-installer live
  $ echo debian-installer-launcher >> config/package-lists/my.list.chroot
 
diff --git a/manual/es/user_customization-packages.ssi b/manual/es/user_customization-packages.ssi
index e9f742c..b0177ce 100644
--- a/manual/es/user_customization-packages.ssi
+++ b/manual/es/user_customization-packages.ssi
@@ -248,34 +248,31 @@ code{
 
 3~ Utilización de condiciones dentro de las listas de paquetes
 
-En las sentencias condicionales de las listas de paquetes pueden utilizarse
-cualquier variable disponible en #{config/*}# (excepto las que tienen el
-prefijo #{LB_}#). En general esto significa que puede utilizarse cualquier
-opción válida para #{lb config}# cambiando las letras minúsculas por
-mayúsculas y los guiones por subrayados. En la práctica solamente tiene
-sentido utilizar aquellas variables relacionadas con la selección de
-paquetes, como pueden ser #{DISTRIBUTION}#, #{ARCHITECTURE}# o
-#{ARCHIVE_AREAS}#.
-
-Por ejemplo, para instalar el paquete #{ia32-libs}# si se ha especificado la
-arquitectura amd64 (#{--architecture amd64}#) se puede utilizar:
+Any of the live-build configuration variables stored in #{config/*}# (minus
+the #{LB_}# prefix) may be used in conditional statements in package
+lists. Generally, this means any #{lb config}# option uppercased and with
+dashes changed to underscores. But in practice, it is only the ones that
+influence package selection that make sense, such as #{DISTRIBUTION}#,
+#{ARCHITECTURES}# or #{ARCHIVE_AREAS}#.
+
+For example, to install #{ia32-libs}# if the #{--architectures amd64}# is
+specified:
 
 code{
 
- #if ARCHITECTURE amd64
+ #if ARCHITECTURES amd64
  ia32-libs
  #endif
 
 }code
 
-En la expresión condicional pueden utilizarse varios valores. Por ejemplo
-para instalar el paquete #{memtest86+}# si la arquitectura es i386
-(#{--architecture i386}#) o es amd64 (#{--architecture amd64}#) se puede
-especificar:
+You may test for any one of a number of values, e.g. to install
+#{memtest86+}# if either #{--architectures i386}# or #{--architectures
+amd64}# is specified:
 
 code{
 
- #if ARCHITECTURE i386 amd64
+ #if ARCHITECTURES i386 amd64
  memtest86+
  #endif
 
@@ -298,7 +295,7 @@ Es habitual que una condición incluya una directiva «include»:
 
 code{
 
- #if ARCHITECTURE amd64
+ #if ARCHITECTURES amd64
  #include <gnome-full>
  #endif
 
diff --git a/manual/es/user_examples.ssi b/manual/es/user_examples.ssi
index 2850ecc..7dfa328 100644
--- a/manual/es/user_examples.ssi
+++ b/manual/es/user_examples.ssi
@@ -141,7 +141,7 @@ code{
  #!/bin/sh
 
  lb config noauto \
-     --architecture i386 \
+     --architectures i386 \
      --linux-flavours 686-pae \
      --package-lists lxde \
      "${@}"
@@ -156,13 +156,12 @@ code{
 
 }code
 
-En primer lugar con #{--architecture i386}# se asegura de que en nuestro
-sistema de creación #{amd64}# se crea una versión de 32-bits adecuada para
-ser usada en la mayoría de máquinas. En segundo lugar, se usa
-#{--linux-flavours 686-pae}# porque no se espera usar esta imagen en
-sistemas mucho más viejos. En tercer lugar se elige la lista de paquetes
-#{lxde}# para proporcionar un escritorio mínimo. Y, por último, se añaden
-dos paquetes iniciales favoritos: #{iceweasel}# y #{xchat}#.
+First, #{--architectures i386}# ensures that on our #{amd64}# build system,
+we build a 32-bit version suitable for use on most machines. Second, we use
+#{--linux-flavours 686-pae}# because we don't anticipate using this image on
+much older systems. Third, we've chosen the #{lxde}# package list to give us
+a minimal desktop. And finally, we have added two initial favourite
+packages: #{iceweasel}# and #{xchat}#.
 
 Ahora, crear la imagen:
 
diff --git a/manual/fr/live-manual.ssm b/manual/fr/live-manual.ssm
index 2225f0e..ec3a3d7 100644
--- a/manual/fr/live-manual.ssm
+++ b/manual/fr/live-manual.ssm
@@ -9,7 +9,7 @@
  :license: Ce programme est un logiciel libre; vous pouvez le redistribuer ou le modifier suivant les termes de la Licence Générale Publique GNU telle que publiée par la Free Software Foundation: soit la version 3 de cette licence, soit (à votre gré) toute version ultérieure.<br><br>Ce programme est distribué dans l’espoir qu’il vous sera utile, mais SANS AUCUNE GARANTIE: sans même la garantie implicite de COMMERCIALISABILITÉ ni d’ADÉQUATION À UN OBJECTIF PARTICULIER. Consultez la Licence Générale Publique GNU pour plus de détails.<br><br>Vous devriez avoir reçu une copie de la Licence Générale Publique GNU avec ce programme ; si ce n’est pas le cas, consultez http://www.gnu.org/licenses/. <br><br>Le texte complet de la Licence Générale Publique GNU peut être trouvé dans le fichier / usr/share/common-licenses/GPL-3
 
 @date:
- :published: 2012-02-11
+ :published: 2012-02-13
 
 @publisher: Debian Live Project <debian-live at lists.debian.org>
 
diff --git a/manual/fr/user_customization-installer.ssi b/manual/fr/user_customization-installer.ssi
index 59d6724..2fdb856 100644
--- a/manual/fr/user_customization-installer.ssi
+++ b/manual/fr/user_customization-installer.ssi
@@ -54,7 +54,7 @@ bureau" fonctionne le noyau du système live doit correspondre au noyau que
 
 code{
 
- $ lb config --architecture i386 --linux-flavours 486 \
+ $ lb config --architectures i386 --linux-flavours 486 \
      --debian-installer live
  $ echo debian-installer-launcher >> config/package-lists/my.list.chroot
 
diff --git a/manual/fr/user_customization-packages.ssi b/manual/fr/user_customization-packages.ssi
index 5f68aec..43b7436 100644
--- a/manual/fr/user_customization-packages.ssi
+++ b/manual/fr/user_customization-packages.ssi
@@ -242,32 +242,31 @@ code{
 
 3~ Utilisant des conditionnels dans les listes de paquets
 
-Toutes les variables de configuration de live-build stockées dans
-#{config/*}# (sans le préfixe #{LB_}#) peuvent être utilisés dans
-instructions conditionnelles dans les listes de paquets. Généralement, cela
-signifie une option #{lb config}# majuscule et avec tirets changées en
-caractères de soulignement. Mais en pratique, c'est seulement ceux qui
-influencent lasélection des paquets qui font sens, comme #{DISTRIBUTION}#,
-#{ARCHITECTURE}# ou #{ARCHIVE_AREAS}#.
+Any of the live-build configuration variables stored in #{config/*}# (minus
+the #{LB_}# prefix) may be used in conditional statements in package
+lists. Generally, this means any #{lb config}# option uppercased and with
+dashes changed to underscores. But in practice, it is only the ones that
+influence package selection that make sense, such as #{DISTRIBUTION}#,
+#{ARCHITECTURES}# or #{ARCHIVE_AREAS}#.
 
-Par exemple, pour installer #{ia32-libs}# si la #{--architecture amd64}# est
-spécifié:
+For example, to install #{ia32-libs}# if the #{--architectures amd64}# is
+specified:
 
 code{
 
- #if ARCHITECTURE amd64
+ #if ARCHITECTURES amd64
  ia32-libs
  #endif
 
 }code
 
-Vous pouvez tester pour un certain nombre de valeurs, par exemple pour
-installer #{memtest86+}# si #{--architecture i386}# ou #{--architecture
-amd64}# est spécifié:
+You may test for any one of a number of values, e.g. to install
+#{memtest86+}# if either #{--architectures i386}# or #{--architectures
+amd64}# is specified:
 
 code{
 
- #if ARCHITECTURE i386 amd64
+ #if ARCHITECTURES i386 amd64
  memtest86+
  #endif
 
@@ -289,7 +288,7 @@ Un conditionnel peut entourer une directive #{#include}#:
 
 code{
 
- #if ARCHITECTURE amd64
+ #if ARCHITECTURES amd64
  #include <gnome-full>
  #endif
 
diff --git a/manual/fr/user_examples.ssi b/manual/fr/user_examples.ssi
index fb9dfd1..71690bd 100644
--- a/manual/fr/user_examples.ssi
+++ b/manual/fr/user_examples.ssi
@@ -141,7 +141,7 @@ code{
  #!/bin/sh
 
  lb config noauto \
-     --architecture i386 \
+     --architectures i386 \
      --linux-flavours 686-pae \
      --package-lists lxde \
      "${@}"
@@ -156,14 +156,12 @@ code{
 
 }code
 
-Tout d'abord, #{--architecture i386}# assure que sur notre système de
-construction #{amd64}#, nous construisons une version 32 bits qui peut être
-utilisé sur la plupart des machines. Deuxièmement, nous utilisons
-#{--linux-flavours 686-pae}# parce que nous ne prévoyons pas utiliser cette
-image sur des systèmes beaucoup plus anciens. Troisièmement, nous avons
-choisi la liste des paquets #{lxde}# pour nous donner un bureau minimal. Et
-enfin, nous avons ajouté deux premiers paquets préférés: #{iceweasel}# et
-#{xchat}#.
+First, #{--architectures i386}# ensures that on our #{amd64}# build system,
+we build a 32-bit version suitable for use on most machines. Second, we use
+#{--linux-flavours 686-pae}# because we don't anticipate using this image on
+much older systems. Third, we've chosen the #{lxde}# package list to give us
+a minimal desktop. And finally, we have added two initial favourite
+packages: #{iceweasel}# and #{xchat}#.
 
 Maintenant, construire l'image:
 
diff --git a/manual/it/live-manual.ssm b/manual/it/live-manual.ssm
index 4f417a0..25e61ea 100644
--- a/manual/it/live-manual.ssm
+++ b/manual/it/live-manual.ssm
@@ -9,7 +9,7 @@
  :license: Questo programma è software libero: è possibile ridistribuirlo e modificarlo secondo i termini della GNU General Public License come pubblicata dalla Free Software Foundation, sia la versione 3 della licenza o (a scelta) una versione successiva.<br><br>Questo programma è distribuito nella speranza che possa essere utile, ma SENZA ALCUNA GARANZIA, nemmeno la garanzia implicita di COMMERCIABILITÀ o IDONEITÀ PER UN PARTICOLARE SCOPO. Vedere la GNU General Public License per ulteriori dettagli.<br><br>Si dovrebbe aver ricevuto una copia della GNU General Public License con questo programma. In caso contrario, vedere http://www.gnu.org/licenses/. <br><br>Il testo completo della GNU General Public License può essere trovato nel file /usr/share/common-licenses/GPL-3.
 
 @date:
- :published: 2012-02-11
+ :published: 2012-02-13
 
 @publisher: Debian Live Project <debian-live at lists.debian.org>
 
diff --git a/manual/it/user_customization-installer.ssi b/manual/it/user_customization-installer.ssi
index f9294a4..e1ebe0a 100644
--- a/manual/it/user_customization-installer.ssi
+++ b/manual/it/user_customization-installer.ssi
@@ -52,7 +52,7 @@ l'architettura specificata. Per esempio:
 
 code{
 
- $ lb config --architecture i386 --linux-flavours 486 \
+ $ lb config --architectures i386 --linux-flavours 486 \
      --debian-installer live
  $ echo debian-installer-launcher >> config/package-lists/my.list.chroot
 
diff --git a/manual/it/user_customization-packages.ssi b/manual/it/user_customization-packages.ssi
index 665e559..f88d736 100644
--- a/manual/it/user_customization-packages.ssi
+++ b/manual/it/user_customization-packages.ssi
@@ -232,32 +232,31 @@ code{
 
 3~ Usare condizioni all'interno degli elenchi di pacchetti
 
-Ognuna delle variabili di configurazione di live-build situate in
-#{config/*}# (senza il prefisso #{LB_}#) possono essere utilizzate per
-istruzioni condizionali nell'elenco dei pacchetti. In genere questo
-significa qualsiasi opzione di #{lb config}# in maiuscolo e con trattini
-cambiati in trattini bassi; ma in pratica è la sola ad influenzare la
-selezione dei pacchetti che abbia senso, come #{DISTRIBUTION}#,
-#{ARCHITECTURE}# o #{ARCHIVE_AREAS}#.
+Any of the live-build configuration variables stored in #{config/*}# (minus
+the #{LB_}# prefix) may be used in conditional statements in package
+lists. Generally, this means any #{lb config}# option uppercased and with
+dashes changed to underscores. But in practice, it is only the ones that
+influence package selection that make sense, such as #{DISTRIBUTION}#,
+#{ARCHITECTURES}# or #{ARCHIVE_AREAS}#.
 
-Per esempio, per installare #{ia32-libs}# se è specificata #{--architecture
-amd64}#:
+For example, to install #{ia32-libs}# if the #{--architectures amd64}# is
+specified:
 
 code{
 
- #if ARCHITECTURE amd64
+ #if ARCHITECTURES amd64
  ia32-libs
  #endif
 
 }code
 
-Si può verificare per ognuna di una serie di valori, ad esempio per
-installare #{memtest86+}# specificando sia #{--architecture i386}# sia
-#{--architecture amd64}#:
+You may test for any one of a number of values, e.g. to install
+#{memtest86+}# if either #{--architectures i386}# or #{--architectures
+amd64}# is specified:
 
 code{
 
- #if ARCHITECTURE i386 amd64
+ #if ARCHITECTURES i386 amd64
  memtest86+
  #endif
 
@@ -279,7 +278,7 @@ Una condizione può coinvolegere una direttiva #{#include}#:
 
 code{
 
- #if ARCHITECTURE amd64
+ #if ARCHITECTURES amd64
  #include <gnome-full>
  #endif
 
diff --git a/manual/it/user_examples.ssi b/manual/it/user_examples.ssi
index 4c632d8..648b9e7 100644
--- a/manual/it/user_examples.ssi
+++ b/manual/it/user_examples.ssi
@@ -137,7 +137,7 @@ code{
  #!/bin/sh
 
  lb config noauto \
-     --architecture i386 \
+     --architectures i386 \
      --linux-flavours 686-pae \
      --package-lists lxde \
      "${@}"
@@ -152,13 +152,12 @@ code{
 
 }code
 
-Per prima cosa, #{--architecture i386}# assicura che sul nostro sistema
-#{amd64}# costruiamo una versione a 32-bit utilizzabile sulla maggior parte
-delle macchine. In secondo luogo, usiamo #{--linux-flavours 686-pae}# dato
-che non prevediamo di usare questa immagine su sistemi troppo vecchi. Terzo,
-abbiamo scelto la lista di pacchetti #{lxde}# per avere un desktop
-minimale. Infine, abbiamo aggiunto due pacchetti preferiti per cominciare:
-#{iceweasel}# e #{xchat}#.
+First, #{--architectures i386}# ensures that on our #{amd64}# build system,
+we build a 32-bit version suitable for use on most machines. Second, we use
+#{--linux-flavours 686-pae}# because we don't anticipate using this image on
+much older systems. Third, we've chosen the #{lxde}# package list to give us
+a minimal desktop. And finally, we have added two initial favourite
+packages: #{iceweasel}# and #{xchat}#.
 
 Costruire quindi l'immagine:
 
diff --git a/manual/po/de/live-manual.ssm.po b/manual/po/de/live-manual.ssm.po
index a1cbd4e..caf29ce 100644
--- a/manual/po/de/live-manual.ssm.po
+++ b/manual/po/de/live-manual.ssm.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-02-11 16:42+0100\n"
+"POT-Creation-Date: 2012-02-13 14:44+0100\n"
 "PO-Revision-Date: 2011-04-23 14:15+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -48,7 +48,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 "@date:\n"
-" :published: 2012-02-11\n"
+" :published: 2012-02-13\n"
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/po/de/user_customization-installer.ssi.po b/manual/po/de/user_customization-installer.ssi.po
index 2c9c46d..2ca62fe 100644
--- a/manual/po/de/user_customization-installer.ssi.po
+++ b/manual/po/de/user_customization-installer.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2011-11-07 21:19-0400\n"
+"POT-Creation-Date: 2012-02-13 14:44+0100\n"
 "PO-Revision-Date: 2011-04-23 14:15+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -18,24 +18,27 @@ msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:146 en/about_manual.ssi:157 en/about_manual.ssi:165
-#: en/about_manual.ssi:173 en/project_bugs.ssi:60
+#: en/about_manual.ssi:108 en/about_manual.ssi:116 en/about_manual.ssi:124
+#: en/about_manual.ssi:136 en/about_manual.ssi:149 en/about_manual.ssi:162
+#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/about_manual.ssi:189
+#: en/about_manual.ssi:197 en/project_bugs.ssi:60
 #: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
 #: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
 #: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
 #: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
 #: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
-#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
-#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
-#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
-#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
-#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
-#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
-#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
-#: 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/project_procedures.ssi:58 en/style_guide.ssi:124 en/user_basics.ssi:32
+#: en/user_basics.ssi:42 en/user_basics.ssi:58 en/user_basics.ssi:73
+#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:128
+#: en/user_basics.ssi:140 en/user_basics.ssi:152 en/user_basics.ssi:160
+#: en/user_basics.ssi:168 en/user_basics.ssi:184 en/user_basics.ssi:194
+#: en/user_basics.ssi:202 en/user_basics.ssi:218 en/user_basics.ssi:226
+#: en/user_basics.ssi:236 en/user_basics.ssi:254 en/user_basics.ssi:282
+#: en/user_basics.ssi:298 en/user_basics.ssi:306 en/user_basics.ssi:326
+#: en/user_basics.ssi:351 en/user_customization-binary.ssi:16
+#: en/user_customization-binary.ssi:27 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:44
 #: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -83,24 +86,27 @@ msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
-#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
-#: en/about_manual.ssi:151 en/about_manual.ssi:161 en/about_manual.ssi:169
-#: en/about_manual.ssi:177 en/project_bugs.ssi:64
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:145 en/about_manual.ssi:158 en/about_manual.ssi:167
+#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
+#: en/about_manual.ssi:201 en/project_bugs.ssi:64
 #: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
 #: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
 #: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
 #: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
 #: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/user_basics.ssi:36 en/user_basics.ssi:46
-#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
-#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
-#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
-#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
-#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
-#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
-#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
-#: 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/project_procedures.ssi:131 en/style_guide.ssi:128 en/user_basics.ssi:36
+#: en/user_basics.ssi:46 en/user_basics.ssi:64 en/user_basics.ssi:77
+#: en/user_basics.ssi:112 en/user_basics.ssi:120 en/user_basics.ssi:134
+#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
+#: en/user_basics.ssi:172 en/user_basics.ssi:188 en/user_basics.ssi:198
+#: en/user_basics.ssi:206 en/user_basics.ssi:222 en/user_basics.ssi:230
+#: en/user_basics.ssi:240 en/user_basics.ssi:274 en/user_basics.ssi:286
+#: en/user_basics.ssi:302 en/user_basics.ssi:310 en/user_basics.ssi:337
+#: en/user_basics.ssi:376 en/user_customization-binary.ssi:23
+#: en/user_customization-binary.ssi:33 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:38
 #: en/user_customization-installer.ssi:49
 #: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -258,7 +264,7 @@ msgstr ""
 #: en/user_customization-installer.ssi:36
 #, no-wrap
 msgid ""
-" $ lb config --architecture i386 --linux-flavours 486 \\\n"
+" $ lb config --architectures i386 --linux-flavours 486 \\\n"
 "     --debian-installer live\n"
 " $ echo debian-installer-launcher >> config/package-lists/my.list.chroot\n"
 msgstr ""
diff --git a/manual/po/de/user_customization-packages.ssi.po b/manual/po/de/user_customization-packages.ssi.po
index cac34dd..224c811 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 VERSION\n"
-"POT-Creation-Date: 2012-01-18 18:00-0400\n"
+"POT-Creation-Date: 2012-02-13 14:44+0100\n"
 "PO-Revision-Date: 2011-04-23 14:15+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -18,25 +18,27 @@ msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:146 en/about_manual.ssi:157 en/about_manual.ssi:165
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/project_bugs.ssi:60
+#: en/about_manual.ssi:108 en/about_manual.ssi:116 en/about_manual.ssi:124
+#: en/about_manual.ssi:136 en/about_manual.ssi:149 en/about_manual.ssi:162
+#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/about_manual.ssi:189
+#: en/about_manual.ssi:197 en/project_bugs.ssi:60
 #: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
 #: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
 #: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
 #: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
 #: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
-#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
-#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
-#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
-#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
-#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
-#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
-#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
-#: en/user_customization-binary.ssi:16 en/user_customization-binary.ssi:27
-#: 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/project_procedures.ssi:58 en/style_guide.ssi:124 en/user_basics.ssi:32
+#: en/user_basics.ssi:42 en/user_basics.ssi:58 en/user_basics.ssi:73
+#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:128
+#: en/user_basics.ssi:140 en/user_basics.ssi:152 en/user_basics.ssi:160
+#: en/user_basics.ssi:168 en/user_basics.ssi:184 en/user_basics.ssi:194
+#: en/user_basics.ssi:202 en/user_basics.ssi:218 en/user_basics.ssi:226
+#: en/user_basics.ssi:236 en/user_basics.ssi:254 en/user_basics.ssi:282
+#: en/user_basics.ssi:298 en/user_basics.ssi:306 en/user_basics.ssi:326
+#: en/user_basics.ssi:351 en/user_customization-binary.ssi:16
+#: en/user_customization-binary.ssi:27 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:44
 #: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -84,25 +86,27 @@ msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
-#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
-#: en/about_manual.ssi:151 en/about_manual.ssi:161 en/about_manual.ssi:169
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/project_bugs.ssi:64
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:145 en/about_manual.ssi:158 en/about_manual.ssi:167
+#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
+#: en/about_manual.ssi:201 en/project_bugs.ssi:64
 #: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
 #: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
 #: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
 #: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
 #: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/user_basics.ssi:36 en/user_basics.ssi:46
-#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
-#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
-#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
-#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
-#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
-#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
-#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
-#: en/user_customization-binary.ssi:23 en/user_customization-binary.ssi:33
-#: 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/project_procedures.ssi:131 en/style_guide.ssi:128 en/user_basics.ssi:36
+#: en/user_basics.ssi:46 en/user_basics.ssi:64 en/user_basics.ssi:77
+#: en/user_basics.ssi:112 en/user_basics.ssi:120 en/user_basics.ssi:134
+#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
+#: en/user_basics.ssi:172 en/user_basics.ssi:188 en/user_basics.ssi:198
+#: en/user_basics.ssi:206 en/user_basics.ssi:222 en/user_basics.ssi:230
+#: en/user_basics.ssi:240 en/user_basics.ssi:274 en/user_basics.ssi:286
+#: en/user_basics.ssi:302 en/user_basics.ssi:310 en/user_basics.ssi:337
+#: en/user_basics.ssi:376 en/user_customization-binary.ssi:23
+#: en/user_customization-binary.ssi:33 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:38
 #: en/user_customization-installer.ssi:49
 #: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -530,14 +534,14 @@ msgid ""
 "the #{LB_}# prefix) may be used in conditional statements in package lists. "
 "Generally, this means any #{lb config}# option uppercased and with dashes "
 "changed to underscores. But in practice, it is only the ones that influence "
-"package selection that make sense, such as #{DISTRIBUTION}#, #{ARCHITECTURE}"
+"package selection that make sense, such as #{DISTRIBUTION}#, #{ARCHITECTURES}"
 "# or #{ARCHIVE_AREAS}#."
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:138
 msgid ""
-"For example, to install #{ia32-libs}# if the #{--architecture amd64}# is "
+"For example, to install #{ia32-libs}# if the #{--architectures amd64}# is "
 "specified:"
 msgstr ""
 
@@ -545,7 +549,7 @@ msgstr ""
 #: en/user_customization-packages.ssi:144
 #, no-wrap
 msgid ""
-" #if ARCHITECTURE amd64\n"
+" #if ARCHITECTURES amd64\n"
 " ia32-libs\n"
 " #endif\n"
 msgstr ""
@@ -554,14 +558,15 @@ msgstr ""
 #: en/user_customization-packages.ssi:148
 msgid ""
 "You may test for any one of a number of values, e.g. to install #{memtest86+}"
-"# if either #{--architecture i386}# or #{--architecture amd64}# is specified:"
+"# if either #{--architectures i386}# or #{--architectures amd64}# is "
+"specified:"
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:154
 #, no-wrap
 msgid ""
-" #if ARCHITECTURE i386 amd64\n"
+" #if ARCHITECTURES i386 amd64\n"
 " memtest86+\n"
 " #endif\n"
 msgstr ""
@@ -592,7 +597,7 @@ msgstr ""
 #: en/user_customization-packages.ssi:174
 #, no-wrap
 msgid ""
-" #if ARCHITECTURE amd64\n"
+" #if ARCHITECTURES amd64\n"
 " #include <gnome-full>\n"
 " #endif\n"
 msgstr ""
diff --git a/manual/po/de/user_examples.ssi.po b/manual/po/de/user_examples.ssi.po
index b2a9535..75705a5 100644
--- a/manual/po/de/user_examples.ssi.po
+++ b/manual/po/de/user_examples.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-01-18 18:00-0400\n"
+"POT-Creation-Date: 2012-02-13 14:44+0100\n"
 "PO-Revision-Date: 2011-04-23 14:15+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -23,25 +23,27 @@ msgstr ":B~ Beispiele"
 
 #. type: Plain text
 #: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:146 en/about_manual.ssi:157 en/about_manual.ssi:165
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/project_bugs.ssi:60
+#: en/about_manual.ssi:108 en/about_manual.ssi:116 en/about_manual.ssi:124
+#: en/about_manual.ssi:136 en/about_manual.ssi:149 en/about_manual.ssi:162
+#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/about_manual.ssi:189
+#: en/about_manual.ssi:197 en/project_bugs.ssi:60
 #: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
 #: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
 #: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
 #: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
 #: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
-#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
-#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
-#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
-#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
-#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
-#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
-#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
-#: en/user_customization-binary.ssi:16 en/user_customization-binary.ssi:27
-#: 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/project_procedures.ssi:58 en/style_guide.ssi:124 en/user_basics.ssi:32
+#: en/user_basics.ssi:42 en/user_basics.ssi:58 en/user_basics.ssi:73
+#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:128
+#: en/user_basics.ssi:140 en/user_basics.ssi:152 en/user_basics.ssi:160
+#: en/user_basics.ssi:168 en/user_basics.ssi:184 en/user_basics.ssi:194
+#: en/user_basics.ssi:202 en/user_basics.ssi:218 en/user_basics.ssi:226
+#: en/user_basics.ssi:236 en/user_basics.ssi:254 en/user_basics.ssi:282
+#: en/user_basics.ssi:298 en/user_basics.ssi:306 en/user_basics.ssi:326
+#: en/user_basics.ssi:351 en/user_customization-binary.ssi:16
+#: en/user_customization-binary.ssi:27 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:44
 #: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -89,25 +91,27 @@ msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
-#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
-#: en/about_manual.ssi:151 en/about_manual.ssi:161 en/about_manual.ssi:169
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/project_bugs.ssi:64
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:145 en/about_manual.ssi:158 en/about_manual.ssi:167
+#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
+#: en/about_manual.ssi:201 en/project_bugs.ssi:64
 #: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
 #: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
 #: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
 #: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
 #: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/user_basics.ssi:36 en/user_basics.ssi:46
-#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
-#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
-#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
-#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
-#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
-#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
-#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
-#: en/user_customization-binary.ssi:23 en/user_customization-binary.ssi:33
-#: 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/project_procedures.ssi:131 en/style_guide.ssi:128 en/user_basics.ssi:36
+#: en/user_basics.ssi:46 en/user_basics.ssi:64 en/user_basics.ssi:77
+#: en/user_basics.ssi:112 en/user_basics.ssi:120 en/user_basics.ssi:134
+#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
+#: en/user_basics.ssi:172 en/user_basics.ssi:188 en/user_basics.ssi:198
+#: en/user_basics.ssi:206 en/user_basics.ssi:222 en/user_basics.ssi:230
+#: en/user_basics.ssi:240 en/user_basics.ssi:274 en/user_basics.ssi:286
+#: en/user_basics.ssi:302 en/user_basics.ssi:310 en/user_basics.ssi:337
+#: en/user_basics.ssi:376 en/user_customization-binary.ssi:23
+#: en/user_customization-binary.ssi:33 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:38
 #: en/user_customization-installer.ssi:49
 #: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -376,7 +380,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 " lb config noauto \\\n"
-"     --architecture i386 \\\n"
+"     --architectures i386 \\\n"
 "     --linux-flavours 686-pae \\\n"
 "     --package-lists lxde \\\n"
 "     \"${@}\"\n"
@@ -396,7 +400,7 @@ msgstr ""
 #. type: Plain text
 #: en/user_examples.ssi:113
 msgid ""
-"First, #{--architecture i386}# ensures that on our #{amd64}# build system, "
+"First, #{--architectures i386}# ensures that on our #{amd64}# build system, "
 "we build a 32-bit version suitable for use on most machines. Second, we use #"
 "{--linux-flavours 686-pae}# because we don't anticipate using this image on "
 "much older systems. Third, we've chosen the #{lxde}# package list to give us "
diff --git a/manual/po/es/live-manual.ssm.po b/manual/po/es/live-manual.ssm.po
index edf97fb..3af509d 100644
--- a/manual/po/es/live-manual.ssm.po
+++ b/manual/po/es/live-manual.ssm.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-02-11 16:42+0100\n"
+"POT-Creation-Date: 2012-02-13 14:44+0100\n"
 "PO-Revision-Date: 2011-03-12 08:00-0000\n"
 "Last-Translator: José Luis Zabalza and Carlos Zuferri «chals» "
 "<jlz.3008 at gmail.com> <chals at altorricon.com\n"
@@ -53,7 +53,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 "@date:\n"
-" :published: 2012-02-11\n"
+" :published: 2012-02-13\n"
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/po/es/user_customization-installer.ssi.po b/manual/po/es/user_customization-installer.ssi.po
index 78f677f..b0a7096 100644
--- a/manual/po/es/user_customization-installer.ssi.po
+++ b/manual/po/es/user_customization-installer.ssi.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2011-11-07 21:19-0400\n"
+"POT-Creation-Date: 2012-02-13 14:44+0100\n"
 "PO-Revision-Date: 2011-11-08 14:21+0100\n"
 "Last-Translator: José Luis Zabalza and Carlos Zuferri «chals» "
 "<jlz.3008 at gmail.com> <chals at altorricon.com>\n"
@@ -25,24 +25,27 @@ msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:146 en/about_manual.ssi:157 en/about_manual.ssi:165
-#: en/about_manual.ssi:173 en/project_bugs.ssi:60
+#: en/about_manual.ssi:108 en/about_manual.ssi:116 en/about_manual.ssi:124
+#: en/about_manual.ssi:136 en/about_manual.ssi:149 en/about_manual.ssi:162
+#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/about_manual.ssi:189
+#: en/about_manual.ssi:197 en/project_bugs.ssi:60
 #: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
 #: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
 #: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
 #: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
 #: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
-#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
-#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
-#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
-#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
-#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
-#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
-#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
-#: 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/project_procedures.ssi:58 en/style_guide.ssi:124 en/user_basics.ssi:32
+#: en/user_basics.ssi:42 en/user_basics.ssi:58 en/user_basics.ssi:73
+#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:128
+#: en/user_basics.ssi:140 en/user_basics.ssi:152 en/user_basics.ssi:160
+#: en/user_basics.ssi:168 en/user_basics.ssi:184 en/user_basics.ssi:194
+#: en/user_basics.ssi:202 en/user_basics.ssi:218 en/user_basics.ssi:226
+#: en/user_basics.ssi:236 en/user_basics.ssi:254 en/user_basics.ssi:282
+#: en/user_basics.ssi:298 en/user_basics.ssi:306 en/user_basics.ssi:326
+#: en/user_basics.ssi:351 en/user_customization-binary.ssi:16
+#: en/user_customization-binary.ssi:27 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:44
 #: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -90,24 +93,27 @@ msgstr "code{"
 
 #. type: Plain text
 #: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
-#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
-#: en/about_manual.ssi:151 en/about_manual.ssi:161 en/about_manual.ssi:169
-#: en/about_manual.ssi:177 en/project_bugs.ssi:64
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:145 en/about_manual.ssi:158 en/about_manual.ssi:167
+#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
+#: en/about_manual.ssi:201 en/project_bugs.ssi:64
 #: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
 #: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
 #: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
 #: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
 #: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/user_basics.ssi:36 en/user_basics.ssi:46
-#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
-#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
-#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
-#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
-#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
-#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
-#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
-#: 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/project_procedures.ssi:131 en/style_guide.ssi:128 en/user_basics.ssi:36
+#: en/user_basics.ssi:46 en/user_basics.ssi:64 en/user_basics.ssi:77
+#: en/user_basics.ssi:112 en/user_basics.ssi:120 en/user_basics.ssi:134
+#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
+#: en/user_basics.ssi:172 en/user_basics.ssi:188 en/user_basics.ssi:198
+#: en/user_basics.ssi:206 en/user_basics.ssi:222 en/user_basics.ssi:230
+#: en/user_basics.ssi:240 en/user_basics.ssi:274 en/user_basics.ssi:286
+#: en/user_basics.ssi:302 en/user_basics.ssi:310 en/user_basics.ssi:337
+#: en/user_basics.ssi:376 en/user_customization-binary.ssi:23
+#: en/user_customization-binary.ssi:33 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:38
 #: en/user_customization-installer.ssi:49
 #: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -296,9 +302,13 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-installer.ssi:36
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| " $ lb config --architecture i386 --linux-flavours 486 \\\n"
+#| "     --debian-installer live\n"
+#| " $ echo debian-installer-launcher >> config/package-lists/my.list.chroot\n"
 msgid ""
-" $ lb config --architecture i386 --linux-flavours 486 \\\n"
+" $ lb config --architectures i386 --linux-flavours 486 \\\n"
 "     --debian-installer live\n"
 " $ echo debian-installer-launcher >> config/package-lists/my.list.chroot\n"
 msgstr ""
diff --git a/manual/po/es/user_customization-packages.ssi.po b/manual/po/es/user_customization-packages.ssi.po
index f8b8356..ef9b51c 100644
--- a/manual/po/es/user_customization-packages.ssi.po
+++ b/manual/po/es/user_customization-packages.ssi.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-01-18 18:00-0400\n"
+"POT-Creation-Date: 2012-02-13 14:44+0100\n"
 "PO-Revision-Date: 2012-01-18 23:32+0100\n"
 "Last-Translator: José Luis Zabalza and Carlos Zuferri «chals» "
 "<jlz.3008 at gmail.com> <chals at altorricon.com>\n"
@@ -25,25 +25,27 @@ msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:146 en/about_manual.ssi:157 en/about_manual.ssi:165
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/project_bugs.ssi:60
+#: en/about_manual.ssi:108 en/about_manual.ssi:116 en/about_manual.ssi:124
+#: en/about_manual.ssi:136 en/about_manual.ssi:149 en/about_manual.ssi:162
+#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/about_manual.ssi:189
+#: en/about_manual.ssi:197 en/project_bugs.ssi:60
 #: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
 #: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
 #: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
 #: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
 #: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
-#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
-#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
-#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
-#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
-#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
-#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
-#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
-#: en/user_customization-binary.ssi:16 en/user_customization-binary.ssi:27
-#: 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/project_procedures.ssi:58 en/style_guide.ssi:124 en/user_basics.ssi:32
+#: en/user_basics.ssi:42 en/user_basics.ssi:58 en/user_basics.ssi:73
+#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:128
+#: en/user_basics.ssi:140 en/user_basics.ssi:152 en/user_basics.ssi:160
+#: en/user_basics.ssi:168 en/user_basics.ssi:184 en/user_basics.ssi:194
+#: en/user_basics.ssi:202 en/user_basics.ssi:218 en/user_basics.ssi:226
+#: en/user_basics.ssi:236 en/user_basics.ssi:254 en/user_basics.ssi:282
+#: en/user_basics.ssi:298 en/user_basics.ssi:306 en/user_basics.ssi:326
+#: en/user_basics.ssi:351 en/user_customization-binary.ssi:16
+#: en/user_customization-binary.ssi:27 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:44
 #: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -91,25 +93,27 @@ msgstr "code{"
 
 #. type: Plain text
 #: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
-#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
-#: en/about_manual.ssi:151 en/about_manual.ssi:161 en/about_manual.ssi:169
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/project_bugs.ssi:64
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:145 en/about_manual.ssi:158 en/about_manual.ssi:167
+#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
+#: en/about_manual.ssi:201 en/project_bugs.ssi:64
 #: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
 #: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
 #: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
 #: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
 #: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/user_basics.ssi:36 en/user_basics.ssi:46
-#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
-#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
-#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
-#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
-#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
-#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
-#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
-#: en/user_customization-binary.ssi:23 en/user_customization-binary.ssi:33
-#: 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/project_procedures.ssi:131 en/style_guide.ssi:128 en/user_basics.ssi:36
+#: en/user_basics.ssi:46 en/user_basics.ssi:64 en/user_basics.ssi:77
+#: en/user_basics.ssi:112 en/user_basics.ssi:120 en/user_basics.ssi:134
+#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
+#: en/user_basics.ssi:172 en/user_basics.ssi:188 en/user_basics.ssi:198
+#: en/user_basics.ssi:206 en/user_basics.ssi:222 en/user_basics.ssi:230
+#: en/user_basics.ssi:240 en/user_basics.ssi:274 en/user_basics.ssi:286
+#: en/user_basics.ssi:302 en/user_basics.ssi:310 en/user_basics.ssi:337
+#: en/user_basics.ssi:376 en/user_customization-binary.ssi:23
+#: en/user_customization-binary.ssi:33 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:38
 #: en/user_customization-installer.ssi:49
 #: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -677,12 +681,20 @@ msgstr "3~ Utilización de condiciones dentro de las listas de paquetes"
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:136
+#, fuzzy
+#| msgid ""
+#| "Any of the live-build configuration variables stored in #{config/*}# "
+#| "(minus the #{LB_}# prefix) may be used in conditional statements in "
+#| "package lists. Generally, this means any #{lb config}# option uppercased "
+#| "and with dashes changed to underscores. But in practice, it is only the "
+#| "ones that influence package selection that make sense, such as #"
+#| "{DISTRIBUTION}#, #{ARCHITECTURE}# or #{ARCHIVE_AREAS}#."
 msgid ""
 "Any of the live-build configuration variables stored in #{config/*}# (minus "
 "the #{LB_}# prefix) may be used in conditional statements in package lists. "
 "Generally, this means any #{lb config}# option uppercased and with dashes "
 "changed to underscores. But in practice, it is only the ones that influence "
-"package selection that make sense, such as #{DISTRIBUTION}#, #{ARCHITECTURE}"
+"package selection that make sense, such as #{DISTRIBUTION}#, #{ARCHITECTURES}"
 "# or #{ARCHIVE_AREAS}#."
 msgstr ""
 "En las sentencias condicionales de las listas de paquetes pueden utilizarse "
@@ -696,8 +708,12 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:138
+#, fuzzy
+#| msgid ""
+#| "For example, to install #{ia32-libs}# if the #{--architecture amd64}# is "
+#| "specified:"
 msgid ""
-"For example, to install #{ia32-libs}# if the #{--architecture amd64}# is "
+"For example, to install #{ia32-libs}# if the #{--architectures amd64}# is "
 "specified:"
 msgstr ""
 "Por ejemplo, para instalar el paquete #{ia32-libs}# si se ha especificado la "
@@ -705,9 +721,13 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:144
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| " #if ARCHITECTURE amd64\n"
+#| " ia32-libs\n"
+#| " #endif\n"
 msgid ""
-" #if ARCHITECTURE amd64\n"
+" #if ARCHITECTURES amd64\n"
 " ia32-libs\n"
 " #endif\n"
 msgstr ""
@@ -717,9 +737,15 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:148
+#, fuzzy
+#| msgid ""
+#| "You may test for any one of a number of values, e.g. to install #"
+#| "{memtest86+}# if either #{--architecture i386}# or #{--architecture amd64}"
+#| "# is specified:"
 msgid ""
 "You may test for any one of a number of values, e.g. to install #{memtest86+}"
-"# if either #{--architecture i386}# or #{--architecture amd64}# is specified:"
+"# if either #{--architectures i386}# or #{--architectures amd64}# is "
+"specified:"
 msgstr ""
 "En la expresión condicional pueden utilizarse varios valores. Por ejemplo "
 "para instalar el paquete #{memtest86+}# si la arquitectura es i386 (#{--"
@@ -728,9 +754,13 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:154
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| " #if ARCHITECTURE i386 amd64\n"
+#| " memtest86+\n"
+#| " #endif\n"
 msgid ""
-" #if ARCHITECTURE i386 amd64\n"
+" #if ARCHITECTURES i386 amd64\n"
 " memtest86+\n"
 " #endif\n"
 msgstr ""
@@ -769,9 +799,13 @@ msgstr "Es habitual que una condición incluya una directiva «include»:"
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:174
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| " #if ARCHITECTURE amd64\n"
+#| " #include <gnome-full>\n"
+#| " #endif\n"
 msgid ""
-" #if ARCHITECTURE amd64\n"
+" #if ARCHITECTURES amd64\n"
 " #include <gnome-full>\n"
 " #endif\n"
 msgstr ""
diff --git a/manual/po/es/user_examples.ssi.po b/manual/po/es/user_examples.ssi.po
index 17e80d3..49fc014 100644
--- a/manual/po/es/user_examples.ssi.po
+++ b/manual/po/es/user_examples.ssi.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-01-18 18:00-0400\n"
+"POT-Creation-Date: 2012-02-13 14:44+0100\n"
 "PO-Revision-Date: 2012-01-18 23:24+0100\n"
 "Last-Translator: José Luis Zabalza and Carlos Zuferri «chals» "
 "<jlz.3008 at gmail.com> <chals at altorricon.com>\n"
@@ -28,25 +28,27 @@ msgstr ":B~ Ejemplos"
 
 #. type: Plain text
 #: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:146 en/about_manual.ssi:157 en/about_manual.ssi:165
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/project_bugs.ssi:60
+#: en/about_manual.ssi:108 en/about_manual.ssi:116 en/about_manual.ssi:124
+#: en/about_manual.ssi:136 en/about_manual.ssi:149 en/about_manual.ssi:162
+#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/about_manual.ssi:189
+#: en/about_manual.ssi:197 en/project_bugs.ssi:60
 #: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
 #: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
 #: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
 #: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
 #: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
-#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
-#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
-#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
-#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
-#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
-#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
-#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
-#: en/user_customization-binary.ssi:16 en/user_customization-binary.ssi:27
-#: 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/project_procedures.ssi:58 en/style_guide.ssi:124 en/user_basics.ssi:32
+#: en/user_basics.ssi:42 en/user_basics.ssi:58 en/user_basics.ssi:73
+#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:128
+#: en/user_basics.ssi:140 en/user_basics.ssi:152 en/user_basics.ssi:160
+#: en/user_basics.ssi:168 en/user_basics.ssi:184 en/user_basics.ssi:194
+#: en/user_basics.ssi:202 en/user_basics.ssi:218 en/user_basics.ssi:226
+#: en/user_basics.ssi:236 en/user_basics.ssi:254 en/user_basics.ssi:282
+#: en/user_basics.ssi:298 en/user_basics.ssi:306 en/user_basics.ssi:326
+#: en/user_basics.ssi:351 en/user_customization-binary.ssi:16
+#: en/user_customization-binary.ssi:27 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:44
 #: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -94,25 +96,27 @@ msgstr "code{"
 
 #. type: Plain text
 #: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
-#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
-#: en/about_manual.ssi:151 en/about_manual.ssi:161 en/about_manual.ssi:169
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/project_bugs.ssi:64
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:145 en/about_manual.ssi:158 en/about_manual.ssi:167
+#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
+#: en/about_manual.ssi:201 en/project_bugs.ssi:64
 #: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
 #: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
 #: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
 #: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
 #: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/user_basics.ssi:36 en/user_basics.ssi:46
-#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
-#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
-#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
-#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
-#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
-#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
-#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
-#: en/user_customization-binary.ssi:23 en/user_customization-binary.ssi:33
-#: 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/project_procedures.ssi:131 en/style_guide.ssi:128 en/user_basics.ssi:36
+#: en/user_basics.ssi:46 en/user_basics.ssi:64 en/user_basics.ssi:77
+#: en/user_basics.ssi:112 en/user_basics.ssi:120 en/user_basics.ssi:134
+#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
+#: en/user_basics.ssi:172 en/user_basics.ssi:188 en/user_basics.ssi:198
+#: en/user_basics.ssi:206 en/user_basics.ssi:222 en/user_basics.ssi:230
+#: en/user_basics.ssi:240 en/user_basics.ssi:274 en/user_basics.ssi:286
+#: en/user_basics.ssi:302 en/user_basics.ssi:310 en/user_basics.ssi:337
+#: en/user_basics.ssi:376 en/user_customization-binary.ssi:23
+#: en/user_customization-binary.ssi:33 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:38
 #: en/user_customization-installer.ssi:49
 #: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -446,10 +450,16 @@ msgstr "Editar #{auto/config}# del siguiente modo:"
 
 #. type: Plain text
 #: en/user_examples.ssi:101
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| " lb config noauto \\\n"
+#| "     --architecture i386 \\\n"
+#| "     --linux-flavours 686-pae \\\n"
+#| "     --package-lists lxde \\\n"
+#| "     \"${@}\"\n"
 msgid ""
 " lb config noauto \\\n"
-"     --architecture i386 \\\n"
+"     --architectures i386 \\\n"
 "     --linux-flavours 686-pae \\\n"
 "     --package-lists lxde \\\n"
 "     \"${@}\"\n"
@@ -473,8 +483,16 @@ msgstr " $ echo \"iceweasel xchat\" >> config/package-lists/my.list.chroot\n"
 
 #. type: Plain text
 #: en/user_examples.ssi:113
-msgid ""
-"First, #{--architecture i386}# ensures that on our #{amd64}# build system, "
+#, fuzzy
+#| msgid ""
+#| "First, #{--architecture i386}# ensures that on our #{amd64}# build "
+#| "system, we build a 32-bit version suitable for use on most machines. "
+#| "Second, we use #{--linux-flavours 686-pae}# because we don't anticipate "
+#| "using this image on much older systems. Third, we've chosen the #{lxde}# "
+#| "package list to give us a minimal desktop. And finally, we have added two "
+#| "initial favourite packages: #{iceweasel}# and #{xchat}#."
+msgid ""
+"First, #{--architectures i386}# ensures that on our #{amd64}# build system, "
 "we build a 32-bit version suitable for use on most machines. Second, we use #"
 "{--linux-flavours 686-pae}# because we don't anticipate using this image on "
 "much older systems. Third, we've chosen the #{lxde}# package list to give us "
diff --git a/manual/po/fr/live-manual.ssm.po b/manual/po/fr/live-manual.ssm.po
index 28cf96f..bc3d392 100644
--- a/manual/po/fr/live-manual.ssm.po
+++ b/manual/po/fr/live-manual.ssm.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-02-11 16:42+0100\n"
+"POT-Creation-Date: 2012-02-13 14:44+0100\n"
 "PO-Revision-Date: 2011-06-19 16:32+0200\n"
 "Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
 "Language-Team:  <debian-live at lists.debian.org>\n"
@@ -49,7 +49,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 "@date:\n"
-" :published: 2012-02-11\n"
+" :published: 2012-02-13\n"
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/po/fr/user_customization-installer.ssi.po b/manual/po/fr/user_customization-installer.ssi.po
index deb3ba3..75922e9 100644
--- a/manual/po/fr/user_customization-installer.ssi.po
+++ b/manual/po/fr/user_customization-installer.ssi.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-11-07 21:19-0400\n"
+"POT-Creation-Date: 2012-02-13 14:44+0100\n"
 "PO-Revision-Date: 2011-11-08 14:55+0100\n"
 "Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
 "Language-Team:  <debian-live at lists.debian.org>\n"
@@ -19,24 +19,27 @@ msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:146 en/about_manual.ssi:157 en/about_manual.ssi:165
-#: en/about_manual.ssi:173 en/project_bugs.ssi:60
+#: en/about_manual.ssi:108 en/about_manual.ssi:116 en/about_manual.ssi:124
+#: en/about_manual.ssi:136 en/about_manual.ssi:149 en/about_manual.ssi:162
+#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/about_manual.ssi:189
+#: en/about_manual.ssi:197 en/project_bugs.ssi:60
 #: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
 #: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
 #: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
 #: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
 #: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
-#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
-#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
-#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
-#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
-#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
-#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
-#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
-#: 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/project_procedures.ssi:58 en/style_guide.ssi:124 en/user_basics.ssi:32
+#: en/user_basics.ssi:42 en/user_basics.ssi:58 en/user_basics.ssi:73
+#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:128
+#: en/user_basics.ssi:140 en/user_basics.ssi:152 en/user_basics.ssi:160
+#: en/user_basics.ssi:168 en/user_basics.ssi:184 en/user_basics.ssi:194
+#: en/user_basics.ssi:202 en/user_basics.ssi:218 en/user_basics.ssi:226
+#: en/user_basics.ssi:236 en/user_basics.ssi:254 en/user_basics.ssi:282
+#: en/user_basics.ssi:298 en/user_basics.ssi:306 en/user_basics.ssi:326
+#: en/user_basics.ssi:351 en/user_customization-binary.ssi:16
+#: en/user_customization-binary.ssi:27 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:44
 #: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -84,24 +87,27 @@ msgstr "code{"
 
 #. type: Plain text
 #: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
-#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
-#: en/about_manual.ssi:151 en/about_manual.ssi:161 en/about_manual.ssi:169
-#: en/about_manual.ssi:177 en/project_bugs.ssi:64
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:145 en/about_manual.ssi:158 en/about_manual.ssi:167
+#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
+#: en/about_manual.ssi:201 en/project_bugs.ssi:64
 #: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
 #: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
 #: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
 #: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
 #: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/user_basics.ssi:36 en/user_basics.ssi:46
-#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
-#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
-#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
-#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
-#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
-#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
-#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
-#: 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/project_procedures.ssi:131 en/style_guide.ssi:128 en/user_basics.ssi:36
+#: en/user_basics.ssi:46 en/user_basics.ssi:64 en/user_basics.ssi:77
+#: en/user_basics.ssi:112 en/user_basics.ssi:120 en/user_basics.ssi:134
+#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
+#: en/user_basics.ssi:172 en/user_basics.ssi:188 en/user_basics.ssi:198
+#: en/user_basics.ssi:206 en/user_basics.ssi:222 en/user_basics.ssi:230
+#: en/user_basics.ssi:240 en/user_basics.ssi:274 en/user_basics.ssi:286
+#: en/user_basics.ssi:302 en/user_basics.ssi:310 en/user_basics.ssi:337
+#: en/user_basics.ssi:376 en/user_customization-binary.ssi:23
+#: en/user_customization-binary.ssi:33 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:38
 #: en/user_customization-installer.ssi:49
 #: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -291,7 +297,7 @@ msgstr ""
 #: en/user_customization-installer.ssi:36
 #, no-wrap
 msgid ""
-" $ lb config --architecture i386 --linux-flavours 486 \\\n"
+" $ lb config --architectures i386 --linux-flavours 486 \\\n"
 "     --debian-installer live\n"
 " $ echo debian-installer-launcher >> config/package-lists/my.list.chroot\n"
 msgstr ""
diff --git a/manual/po/fr/user_customization-packages.ssi.po b/manual/po/fr/user_customization-packages.ssi.po
index 25d0720..d6be390 100644
--- a/manual/po/fr/user_customization-packages.ssi.po
+++ b/manual/po/fr/user_customization-packages.ssi.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-01-18 18:00-0400\n"
+"POT-Creation-Date: 2012-02-13 14:44+0100\n"
 "PO-Revision-Date: 2012-01-18 23:41+0100\n"
 "Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
 "Language-Team:  <debian-live at lists.debian.org>\n"
@@ -19,25 +19,27 @@ msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:146 en/about_manual.ssi:157 en/about_manual.ssi:165
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/project_bugs.ssi:60
+#: en/about_manual.ssi:108 en/about_manual.ssi:116 en/about_manual.ssi:124
+#: en/about_manual.ssi:136 en/about_manual.ssi:149 en/about_manual.ssi:162
+#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/about_manual.ssi:189
+#: en/about_manual.ssi:197 en/project_bugs.ssi:60
 #: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
 #: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
 #: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
 #: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
 #: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
-#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
-#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
-#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
-#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
-#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
-#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
-#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
-#: en/user_customization-binary.ssi:16 en/user_customization-binary.ssi:27
-#: 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/project_procedures.ssi:58 en/style_guide.ssi:124 en/user_basics.ssi:32
+#: en/user_basics.ssi:42 en/user_basics.ssi:58 en/user_basics.ssi:73
+#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:128
+#: en/user_basics.ssi:140 en/user_basics.ssi:152 en/user_basics.ssi:160
+#: en/user_basics.ssi:168 en/user_basics.ssi:184 en/user_basics.ssi:194
+#: en/user_basics.ssi:202 en/user_basics.ssi:218 en/user_basics.ssi:226
+#: en/user_basics.ssi:236 en/user_basics.ssi:254 en/user_basics.ssi:282
+#: en/user_basics.ssi:298 en/user_basics.ssi:306 en/user_basics.ssi:326
+#: en/user_basics.ssi:351 en/user_customization-binary.ssi:16
+#: en/user_customization-binary.ssi:27 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:44
 #: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -85,25 +87,27 @@ msgstr "code{"
 
 #. type: Plain text
 #: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
-#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
-#: en/about_manual.ssi:151 en/about_manual.ssi:161 en/about_manual.ssi:169
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/project_bugs.ssi:64
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:145 en/about_manual.ssi:158 en/about_manual.ssi:167
+#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
+#: en/about_manual.ssi:201 en/project_bugs.ssi:64
 #: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
 #: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
 #: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
 #: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
 #: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/user_basics.ssi:36 en/user_basics.ssi:46
-#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
-#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
-#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
-#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
-#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
-#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
-#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
-#: en/user_customization-binary.ssi:23 en/user_customization-binary.ssi:33
-#: 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/project_procedures.ssi:131 en/style_guide.ssi:128 en/user_basics.ssi:36
+#: en/user_basics.ssi:46 en/user_basics.ssi:64 en/user_basics.ssi:77
+#: en/user_basics.ssi:112 en/user_basics.ssi:120 en/user_basics.ssi:134
+#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
+#: en/user_basics.ssi:172 en/user_basics.ssi:188 en/user_basics.ssi:198
+#: en/user_basics.ssi:206 en/user_basics.ssi:222 en/user_basics.ssi:230
+#: en/user_basics.ssi:240 en/user_basics.ssi:274 en/user_basics.ssi:286
+#: en/user_basics.ssi:302 en/user_basics.ssi:310 en/user_basics.ssi:337
+#: en/user_basics.ssi:376 en/user_customization-binary.ssi:23
+#: en/user_customization-binary.ssi:33 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:38
 #: en/user_customization-installer.ssi:49
 #: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -656,12 +660,20 @@ msgstr "3~ Utilisant des conditionnels dans les listes de paquets"
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:136
+#, fuzzy
+#| msgid ""
+#| "Any of the live-build configuration variables stored in #{config/*}# "
+#| "(minus the #{LB_}# prefix) may be used in conditional statements in "
+#| "package lists. Generally, this means any #{lb config}# option uppercased "
+#| "and with dashes changed to underscores. But in practice, it is only the "
+#| "ones that influence package selection that make sense, such as #"
+#| "{DISTRIBUTION}#, #{ARCHITECTURE}# or #{ARCHIVE_AREAS}#."
 msgid ""
 "Any of the live-build configuration variables stored in #{config/*}# (minus "
 "the #{LB_}# prefix) may be used in conditional statements in package lists. "
 "Generally, this means any #{lb config}# option uppercased and with dashes "
 "changed to underscores. But in practice, it is only the ones that influence "
-"package selection that make sense, such as #{DISTRIBUTION}#, #{ARCHITECTURE}"
+"package selection that make sense, such as #{DISTRIBUTION}#, #{ARCHITECTURES}"
 "# or #{ARCHIVE_AREAS}#."
 msgstr ""
 "Toutes les variables de configuration de live-build stockées dans #{config/*}"
@@ -674,8 +686,12 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:138
+#, fuzzy
+#| msgid ""
+#| "For example, to install #{ia32-libs}# if the #{--architecture amd64}# is "
+#| "specified:"
 msgid ""
-"For example, to install #{ia32-libs}# if the #{--architecture amd64}# is "
+"For example, to install #{ia32-libs}# if the #{--architectures amd64}# is "
 "specified:"
 msgstr ""
 "Par exemple, pour installer #{ia32-libs}# si la #{--architecture amd64}# est "
@@ -685,16 +701,22 @@ msgstr ""
 #: en/user_customization-packages.ssi:144
 #, no-wrap
 msgid ""
-" #if ARCHITECTURE amd64\n"
+" #if ARCHITECTURES amd64\n"
 " ia32-libs\n"
 " #endif\n"
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:148
+#, fuzzy
+#| msgid ""
+#| "You may test for any one of a number of values, e.g. to install #"
+#| "{memtest86+}# if either #{--architecture i386}# or #{--architecture amd64}"
+#| "# is specified:"
 msgid ""
 "You may test for any one of a number of values, e.g. to install #{memtest86+}"
-"# if either #{--architecture i386}# or #{--architecture amd64}# is specified:"
+"# if either #{--architectures i386}# or #{--architectures amd64}# is "
+"specified:"
 msgstr ""
 "Vous pouvez tester pour un certain nombre de valeurs, par exemple pour "
 "installer #{memtest86+}# si #{--architecture i386}# ou #{--architecture "
@@ -704,7 +726,7 @@ msgstr ""
 #: en/user_customization-packages.ssi:154
 #, no-wrap
 msgid ""
-" #if ARCHITECTURE i386 amd64\n"
+" #if ARCHITECTURES i386 amd64\n"
 " memtest86+\n"
 " #endif\n"
 msgstr ""
@@ -738,7 +760,7 @@ msgstr "Un conditionnel peut entourer une directive #{#include}#:"
 #: en/user_customization-packages.ssi:174
 #, no-wrap
 msgid ""
-" #if ARCHITECTURE amd64\n"
+" #if ARCHITECTURES amd64\n"
 " #include <gnome-full>\n"
 " #endif\n"
 msgstr ""
diff --git a/manual/po/fr/user_examples.ssi.po b/manual/po/fr/user_examples.ssi.po
index 1264370..4157915 100644
--- a/manual/po/fr/user_examples.ssi.po
+++ b/manual/po/fr/user_examples.ssi.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-01-18 18:00-0400\n"
+"POT-Creation-Date: 2012-02-13 14:44+0100\n"
 "PO-Revision-Date: 2012-01-18 23:35+0100\n"
 "Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
 "Language-Team:  <debian-live at lists.debian.org>\n"
@@ -24,25 +24,27 @@ msgstr ":B~ Exemples"
 
 #. type: Plain text
 #: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:146 en/about_manual.ssi:157 en/about_manual.ssi:165
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/project_bugs.ssi:60
+#: en/about_manual.ssi:108 en/about_manual.ssi:116 en/about_manual.ssi:124
+#: en/about_manual.ssi:136 en/about_manual.ssi:149 en/about_manual.ssi:162
+#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/about_manual.ssi:189
+#: en/about_manual.ssi:197 en/project_bugs.ssi:60
 #: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
 #: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
 #: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
 #: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
 #: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
-#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
-#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
-#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
-#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
-#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
-#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
-#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
-#: en/user_customization-binary.ssi:16 en/user_customization-binary.ssi:27
-#: 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/project_procedures.ssi:58 en/style_guide.ssi:124 en/user_basics.ssi:32
+#: en/user_basics.ssi:42 en/user_basics.ssi:58 en/user_basics.ssi:73
+#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:128
+#: en/user_basics.ssi:140 en/user_basics.ssi:152 en/user_basics.ssi:160
+#: en/user_basics.ssi:168 en/user_basics.ssi:184 en/user_basics.ssi:194
+#: en/user_basics.ssi:202 en/user_basics.ssi:218 en/user_basics.ssi:226
+#: en/user_basics.ssi:236 en/user_basics.ssi:254 en/user_basics.ssi:282
+#: en/user_basics.ssi:298 en/user_basics.ssi:306 en/user_basics.ssi:326
+#: en/user_basics.ssi:351 en/user_customization-binary.ssi:16
+#: en/user_customization-binary.ssi:27 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:44
 #: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -90,25 +92,27 @@ msgstr "code{"
 
 #. type: Plain text
 #: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
-#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
-#: en/about_manual.ssi:151 en/about_manual.ssi:161 en/about_manual.ssi:169
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/project_bugs.ssi:64
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:145 en/about_manual.ssi:158 en/about_manual.ssi:167
+#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
+#: en/about_manual.ssi:201 en/project_bugs.ssi:64
 #: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
 #: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
 #: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
 #: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
 #: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/user_basics.ssi:36 en/user_basics.ssi:46
-#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
-#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
-#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
-#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
-#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
-#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
-#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
-#: en/user_customization-binary.ssi:23 en/user_customization-binary.ssi:33
-#: 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/project_procedures.ssi:131 en/style_guide.ssi:128 en/user_basics.ssi:36
+#: en/user_basics.ssi:46 en/user_basics.ssi:64 en/user_basics.ssi:77
+#: en/user_basics.ssi:112 en/user_basics.ssi:120 en/user_basics.ssi:134
+#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
+#: en/user_basics.ssi:172 en/user_basics.ssi:188 en/user_basics.ssi:198
+#: en/user_basics.ssi:206 en/user_basics.ssi:222 en/user_basics.ssi:230
+#: en/user_basics.ssi:240 en/user_basics.ssi:274 en/user_basics.ssi:286
+#: en/user_basics.ssi:302 en/user_basics.ssi:310 en/user_basics.ssi:337
+#: en/user_basics.ssi:376 en/user_customization-binary.ssi:23
+#: en/user_customization-binary.ssi:33 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:38
 #: en/user_customization-installer.ssi:49
 #: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -434,7 +438,7 @@ msgstr "Éditer #{auto/config}# pour lire comme suit: "
 #, no-wrap
 msgid ""
 " lb config noauto \\\n"
-"     --architecture i386 \\\n"
+"     --architectures i386 \\\n"
 "     --linux-flavours 686-pae \\\n"
 "     --package-lists lxde \\\n"
 "     \"${@}\"\n"
@@ -453,8 +457,16 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_examples.ssi:113
-msgid ""
-"First, #{--architecture i386}# ensures that on our #{amd64}# build system, "
+#, fuzzy
+#| msgid ""
+#| "First, #{--architecture i386}# ensures that on our #{amd64}# build "
+#| "system, we build a 32-bit version suitable for use on most machines. "
+#| "Second, we use #{--linux-flavours 686-pae}# because we don't anticipate "
+#| "using this image on much older systems. Third, we've chosen the #{lxde}# "
+#| "package list to give us a minimal desktop. And finally, we have added two "
+#| "initial favourite packages: #{iceweasel}# and #{xchat}#."
+msgid ""
+"First, #{--architectures i386}# ensures that on our #{amd64}# build system, "
 "we build a 32-bit version suitable for use on most machines. Second, we use #"
 "{--linux-flavours 686-pae}# because we don't anticipate using this image on "
 "much older systems. Third, we've chosen the #{lxde}# package list to give us "
diff --git a/manual/po/it/live-manual.ssm.po b/manual/po/it/live-manual.ssm.po
index 659b284..ed44ec3 100644
--- a/manual/po/it/live-manual.ssm.po
+++ b/manual/po/it/live-manual.ssm.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-02-11 16:42+0100\n"
+"POT-Creation-Date: 2012-02-13 14:44+0100\n"
 "PO-Revision-Date: 2011-03-11 10:33+0100\n"
 "Last-Translator: skizzhg <skizzhg at gmx.com>\n"
 "Language-Team: Italian <tp at lists.linux.it>\n"
@@ -49,7 +49,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 "@date:\n"
-" :published: 2012-02-11\n"
+" :published: 2012-02-13\n"
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/po/it/user_customization-installer.ssi.po b/manual/po/it/user_customization-installer.ssi.po
index fddc1be..b99e0af 100644
--- a/manual/po/it/user_customization-installer.ssi.po
+++ b/manual/po/it/user_customization-installer.ssi.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-11-07 21:19-0400\n"
+"POT-Creation-Date: 2012-02-13 14:44+0100\n"
 "PO-Revision-Date: 2011-12-06 00:05+0100\n"
 "Last-Translator: skizzhg <skizzhg at gmx.com>\n"
 "Language-Team: Italian <tp at lists.linux.it>\n"
@@ -19,24 +19,27 @@ msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:146 en/about_manual.ssi:157 en/about_manual.ssi:165
-#: en/about_manual.ssi:173 en/project_bugs.ssi:60
+#: en/about_manual.ssi:108 en/about_manual.ssi:116 en/about_manual.ssi:124
+#: en/about_manual.ssi:136 en/about_manual.ssi:149 en/about_manual.ssi:162
+#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/about_manual.ssi:189
+#: en/about_manual.ssi:197 en/project_bugs.ssi:60
 #: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
 #: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
 #: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
 #: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
 #: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
-#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
-#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
-#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
-#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
-#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
-#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
-#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
-#: 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/project_procedures.ssi:58 en/style_guide.ssi:124 en/user_basics.ssi:32
+#: en/user_basics.ssi:42 en/user_basics.ssi:58 en/user_basics.ssi:73
+#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:128
+#: en/user_basics.ssi:140 en/user_basics.ssi:152 en/user_basics.ssi:160
+#: en/user_basics.ssi:168 en/user_basics.ssi:184 en/user_basics.ssi:194
+#: en/user_basics.ssi:202 en/user_basics.ssi:218 en/user_basics.ssi:226
+#: en/user_basics.ssi:236 en/user_basics.ssi:254 en/user_basics.ssi:282
+#: en/user_basics.ssi:298 en/user_basics.ssi:306 en/user_basics.ssi:326
+#: en/user_basics.ssi:351 en/user_customization-binary.ssi:16
+#: en/user_customization-binary.ssi:27 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:44
 #: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -84,24 +87,27 @@ msgstr "code{"
 
 #. type: Plain text
 #: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
-#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
-#: en/about_manual.ssi:151 en/about_manual.ssi:161 en/about_manual.ssi:169
-#: en/about_manual.ssi:177 en/project_bugs.ssi:64
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:145 en/about_manual.ssi:158 en/about_manual.ssi:167
+#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
+#: en/about_manual.ssi:201 en/project_bugs.ssi:64
 #: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
 #: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
 #: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
 #: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
 #: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/user_basics.ssi:36 en/user_basics.ssi:46
-#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
-#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
-#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
-#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
-#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
-#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
-#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
-#: 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/project_procedures.ssi:131 en/style_guide.ssi:128 en/user_basics.ssi:36
+#: en/user_basics.ssi:46 en/user_basics.ssi:64 en/user_basics.ssi:77
+#: en/user_basics.ssi:112 en/user_basics.ssi:120 en/user_basics.ssi:134
+#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
+#: en/user_basics.ssi:172 en/user_basics.ssi:188 en/user_basics.ssi:198
+#: en/user_basics.ssi:206 en/user_basics.ssi:222 en/user_basics.ssi:230
+#: en/user_basics.ssi:240 en/user_basics.ssi:274 en/user_basics.ssi:286
+#: en/user_basics.ssi:302 en/user_basics.ssi:310 en/user_basics.ssi:337
+#: en/user_basics.ssi:376 en/user_customization-binary.ssi:23
+#: en/user_customization-binary.ssi:33 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:38
 #: en/user_customization-installer.ssi:49
 #: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -289,7 +295,7 @@ msgstr ""
 #: en/user_customization-installer.ssi:36
 #, no-wrap
 msgid ""
-" $ lb config --architecture i386 --linux-flavours 486 \\\n"
+" $ lb config --architectures i386 --linux-flavours 486 \\\n"
 "     --debian-installer live\n"
 " $ echo debian-installer-launcher >> config/package-lists/my.list.chroot\n"
 msgstr ""
diff --git a/manual/po/it/user_customization-packages.ssi.po b/manual/po/it/user_customization-packages.ssi.po
index d308afd..36436af 100644
--- a/manual/po/it/user_customization-packages.ssi.po
+++ b/manual/po/it/user_customization-packages.ssi.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0~a12\n"
-"POT-Creation-Date: 2012-01-18 18:00-0400\n"
+"POT-Creation-Date: 2012-02-13 14:44+0100\n"
 "PO-Revision-Date: 2012-02-06 18:35+0100\n"
 "Last-Translator: skizzhg <skizzhg at gmx.com>\n"
 "Language-Team: Italian <tp at lists.linux.it>\n"
@@ -20,25 +20,27 @@ msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:146 en/about_manual.ssi:157 en/about_manual.ssi:165
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/project_bugs.ssi:60
+#: en/about_manual.ssi:108 en/about_manual.ssi:116 en/about_manual.ssi:124
+#: en/about_manual.ssi:136 en/about_manual.ssi:149 en/about_manual.ssi:162
+#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/about_manual.ssi:189
+#: en/about_manual.ssi:197 en/project_bugs.ssi:60
 #: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
 #: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
 #: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
 #: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
 #: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
-#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
-#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
-#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
-#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
-#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
-#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
-#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
-#: en/user_customization-binary.ssi:16 en/user_customization-binary.ssi:27
-#: 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/project_procedures.ssi:58 en/style_guide.ssi:124 en/user_basics.ssi:32
+#: en/user_basics.ssi:42 en/user_basics.ssi:58 en/user_basics.ssi:73
+#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:128
+#: en/user_basics.ssi:140 en/user_basics.ssi:152 en/user_basics.ssi:160
+#: en/user_basics.ssi:168 en/user_basics.ssi:184 en/user_basics.ssi:194
+#: en/user_basics.ssi:202 en/user_basics.ssi:218 en/user_basics.ssi:226
+#: en/user_basics.ssi:236 en/user_basics.ssi:254 en/user_basics.ssi:282
+#: en/user_basics.ssi:298 en/user_basics.ssi:306 en/user_basics.ssi:326
+#: en/user_basics.ssi:351 en/user_customization-binary.ssi:16
+#: en/user_customization-binary.ssi:27 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:44
 #: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -86,25 +88,27 @@ msgstr "code{"
 
 #. type: Plain text
 #: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
-#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
-#: en/about_manual.ssi:151 en/about_manual.ssi:161 en/about_manual.ssi:169
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/project_bugs.ssi:64
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:145 en/about_manual.ssi:158 en/about_manual.ssi:167
+#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
+#: en/about_manual.ssi:201 en/project_bugs.ssi:64
 #: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
 #: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
 #: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
 #: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
 #: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/user_basics.ssi:36 en/user_basics.ssi:46
-#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
-#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
-#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
-#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
-#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
-#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
-#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
-#: en/user_customization-binary.ssi:23 en/user_customization-binary.ssi:33
-#: 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/project_procedures.ssi:131 en/style_guide.ssi:128 en/user_basics.ssi:36
+#: en/user_basics.ssi:46 en/user_basics.ssi:64 en/user_basics.ssi:77
+#: en/user_basics.ssi:112 en/user_basics.ssi:120 en/user_basics.ssi:134
+#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
+#: en/user_basics.ssi:172 en/user_basics.ssi:188 en/user_basics.ssi:198
+#: en/user_basics.ssi:206 en/user_basics.ssi:222 en/user_basics.ssi:230
+#: en/user_basics.ssi:240 en/user_basics.ssi:274 en/user_basics.ssi:286
+#: en/user_basics.ssi:302 en/user_basics.ssi:310 en/user_basics.ssi:337
+#: en/user_basics.ssi:376 en/user_customization-binary.ssi:23
+#: en/user_customization-binary.ssi:33 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:38
 #: en/user_customization-installer.ssi:49
 #: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -645,12 +649,20 @@ msgstr "3~ Usare condizioni all'interno degli elenchi di pacchetti"
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:136
+#, fuzzy
+#| msgid ""
+#| "Any of the live-build configuration variables stored in #{config/*}# "
+#| "(minus the #{LB_}# prefix) may be used in conditional statements in "
+#| "package lists. Generally, this means any #{lb config}# option uppercased "
+#| "and with dashes changed to underscores. But in practice, it is only the "
+#| "ones that influence package selection that make sense, such as #"
+#| "{DISTRIBUTION}#, #{ARCHITECTURE}# or #{ARCHIVE_AREAS}#."
 msgid ""
 "Any of the live-build configuration variables stored in #{config/*}# (minus "
 "the #{LB_}# prefix) may be used in conditional statements in package lists. "
 "Generally, this means any #{lb config}# option uppercased and with dashes "
 "changed to underscores. But in practice, it is only the ones that influence "
-"package selection that make sense, such as #{DISTRIBUTION}#, #{ARCHITECTURE}"
+"package selection that make sense, such as #{DISTRIBUTION}#, #{ARCHITECTURES}"
 "# or #{ARCHIVE_AREAS}#."
 msgstr ""
 "Ognuna delle variabili di configurazione di live-build situate in #{config/*}"
@@ -662,8 +674,12 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:138
+#, fuzzy
+#| msgid ""
+#| "For example, to install #{ia32-libs}# if the #{--architecture amd64}# is "
+#| "specified:"
 msgid ""
-"For example, to install #{ia32-libs}# if the #{--architecture amd64}# is "
+"For example, to install #{ia32-libs}# if the #{--architectures amd64}# is "
 "specified:"
 msgstr ""
 "Per esempio, per installare #{ia32-libs}# se è specificata #{--architecture "
@@ -673,16 +689,22 @@ msgstr ""
 #: en/user_customization-packages.ssi:144
 #, no-wrap
 msgid ""
-" #if ARCHITECTURE amd64\n"
+" #if ARCHITECTURES amd64\n"
 " ia32-libs\n"
 " #endif\n"
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:148
+#, fuzzy
+#| msgid ""
+#| "You may test for any one of a number of values, e.g. to install #"
+#| "{memtest86+}# if either #{--architecture i386}# or #{--architecture amd64}"
+#| "# is specified:"
 msgid ""
 "You may test for any one of a number of values, e.g. to install #{memtest86+}"
-"# if either #{--architecture i386}# or #{--architecture amd64}# is specified:"
+"# if either #{--architectures i386}# or #{--architectures amd64}# is "
+"specified:"
 msgstr ""
 "Si può verificare per ognuna di una serie di valori, ad esempio per "
 "installare #{memtest86+}# specificando sia #{--architecture i386}# sia #{--"
@@ -692,7 +714,7 @@ msgstr ""
 #: en/user_customization-packages.ssi:154
 #, no-wrap
 msgid ""
-" #if ARCHITECTURE i386 amd64\n"
+" #if ARCHITECTURES i386 amd64\n"
 " memtest86+\n"
 " #endif\n"
 msgstr ""
@@ -726,7 +748,7 @@ msgstr "Una condizione può coinvolegere una direttiva #{#include}#:"
 #: en/user_customization-packages.ssi:174
 #, no-wrap
 msgid ""
-" #if ARCHITECTURE amd64\n"
+" #if ARCHITECTURES amd64\n"
 " #include <gnome-full>\n"
 " #endif\n"
 msgstr ""
diff --git a/manual/po/it/user_examples.ssi.po b/manual/po/it/user_examples.ssi.po
index 99ec522..ec2a573 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: 2012-01-18 18:00-0400\n"
+"POT-Creation-Date: 2012-02-13 14:44+0100\n"
 "PO-Revision-Date: 2012-02-06 18:43+0100\n"
 "Last-Translator: skizzhg <skizzhg at gmx.com>\n"
 "Language-Team: Italian <tp at lists.linux.it>\n"
@@ -25,25 +25,27 @@ msgstr ":B~ Esempi"
 
 #. type: Plain text
 #: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:146 en/about_manual.ssi:157 en/about_manual.ssi:165
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/project_bugs.ssi:60
+#: en/about_manual.ssi:108 en/about_manual.ssi:116 en/about_manual.ssi:124
+#: en/about_manual.ssi:136 en/about_manual.ssi:149 en/about_manual.ssi:162
+#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/about_manual.ssi:189
+#: en/about_manual.ssi:197 en/project_bugs.ssi:60
 #: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
 #: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
 #: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
 #: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
 #: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
-#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
-#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
-#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
-#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
-#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
-#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
-#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
-#: en/user_customization-binary.ssi:16 en/user_customization-binary.ssi:27
-#: 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/project_procedures.ssi:58 en/style_guide.ssi:124 en/user_basics.ssi:32
+#: en/user_basics.ssi:42 en/user_basics.ssi:58 en/user_basics.ssi:73
+#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:128
+#: en/user_basics.ssi:140 en/user_basics.ssi:152 en/user_basics.ssi:160
+#: en/user_basics.ssi:168 en/user_basics.ssi:184 en/user_basics.ssi:194
+#: en/user_basics.ssi:202 en/user_basics.ssi:218 en/user_basics.ssi:226
+#: en/user_basics.ssi:236 en/user_basics.ssi:254 en/user_basics.ssi:282
+#: en/user_basics.ssi:298 en/user_basics.ssi:306 en/user_basics.ssi:326
+#: en/user_basics.ssi:351 en/user_customization-binary.ssi:16
+#: en/user_customization-binary.ssi:27 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:44
 #: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -91,25 +93,27 @@ msgstr "code{"
 
 #. type: Plain text
 #: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
-#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
-#: en/about_manual.ssi:151 en/about_manual.ssi:161 en/about_manual.ssi:169
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/project_bugs.ssi:64
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:145 en/about_manual.ssi:158 en/about_manual.ssi:167
+#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
+#: en/about_manual.ssi:201 en/project_bugs.ssi:64
 #: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
 #: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
 #: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
 #: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
 #: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/user_basics.ssi:36 en/user_basics.ssi:46
-#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
-#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
-#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
-#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
-#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
-#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
-#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
-#: en/user_customization-binary.ssi:23 en/user_customization-binary.ssi:33
-#: 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/project_procedures.ssi:131 en/style_guide.ssi:128 en/user_basics.ssi:36
+#: en/user_basics.ssi:46 en/user_basics.ssi:64 en/user_basics.ssi:77
+#: en/user_basics.ssi:112 en/user_basics.ssi:120 en/user_basics.ssi:134
+#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
+#: en/user_basics.ssi:172 en/user_basics.ssi:188 en/user_basics.ssi:198
+#: en/user_basics.ssi:206 en/user_basics.ssi:222 en/user_basics.ssi:230
+#: en/user_basics.ssi:240 en/user_basics.ssi:274 en/user_basics.ssi:286
+#: en/user_basics.ssi:302 en/user_basics.ssi:310 en/user_basics.ssi:337
+#: en/user_basics.ssi:376 en/user_customization-binary.ssi:23
+#: en/user_customization-binary.ssi:33 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:38
 #: en/user_customization-installer.ssi:49
 #: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -433,7 +437,7 @@ msgstr "Modificare #{auto/config}# come segue:"
 #, no-wrap
 msgid ""
 " lb config noauto \\\n"
-"     --architecture i386 \\\n"
+"     --architectures i386 \\\n"
 "     --linux-flavours 686-pae \\\n"
 "     --package-lists lxde \\\n"
 "     \"${@}\"\n"
@@ -452,8 +456,16 @@ msgstr ""
 
 #. type: Plain text
 #: en/user_examples.ssi:113
-msgid ""
-"First, #{--architecture i386}# ensures that on our #{amd64}# build system, "
+#, fuzzy
+#| msgid ""
+#| "First, #{--architecture i386}# ensures that on our #{amd64}# build "
+#| "system, we build a 32-bit version suitable for use on most machines. "
+#| "Second, we use #{--linux-flavours 686-pae}# because we don't anticipate "
+#| "using this image on much older systems. Third, we've chosen the #{lxde}# "
+#| "package list to give us a minimal desktop. And finally, we have added two "
+#| "initial favourite packages: #{iceweasel}# and #{xchat}#."
+msgid ""
+"First, #{--architectures i386}# ensures that on our #{amd64}# build system, "
 "we build a 32-bit version suitable for use on most machines. Second, we use #"
 "{--linux-flavours 686-pae}# because we don't anticipate using this image on "
 "much older systems. Third, we've chosen the #{lxde}# package list to give us "
diff --git a/manual/po/pt_BR/live-manual.ssm.po b/manual/po/pt_BR/live-manual.ssm.po
index d5dc43b..cf863ec 100644
--- a/manual/po/pt_BR/live-manual.ssm.po
+++ b/manual/po/pt_BR/live-manual.ssm.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-02-11 16:42+0100\n"
+"POT-Creation-Date: 2012-02-13 14:44+0100\n"
 "PO-Revision-Date: 2010-10-22 07:52-0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -45,7 +45,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 "@date:\n"
-" :published: 2012-02-11\n"
+" :published: 2012-02-13\n"
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/po/pt_BR/user_customization-installer.ssi.po b/manual/po/pt_BR/user_customization-installer.ssi.po
index ee1681c..db46a0e 100644
--- a/manual/po/pt_BR/user_customization-installer.ssi.po
+++ b/manual/po/pt_BR/user_customization-installer.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-11-07 21:19-0400\n"
+"POT-Creation-Date: 2012-02-13 14:44+0100\n"
 "PO-Revision-Date: 2010-11-30 10:53+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -18,24 +18,27 @@ msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:146 en/about_manual.ssi:157 en/about_manual.ssi:165
-#: en/about_manual.ssi:173 en/project_bugs.ssi:60
+#: en/about_manual.ssi:108 en/about_manual.ssi:116 en/about_manual.ssi:124
+#: en/about_manual.ssi:136 en/about_manual.ssi:149 en/about_manual.ssi:162
+#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/about_manual.ssi:189
+#: en/about_manual.ssi:197 en/project_bugs.ssi:60
 #: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
 #: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
 #: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
 #: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
 #: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
-#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
-#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
-#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
-#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
-#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
-#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
-#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
-#: 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/project_procedures.ssi:58 en/style_guide.ssi:124 en/user_basics.ssi:32
+#: en/user_basics.ssi:42 en/user_basics.ssi:58 en/user_basics.ssi:73
+#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:128
+#: en/user_basics.ssi:140 en/user_basics.ssi:152 en/user_basics.ssi:160
+#: en/user_basics.ssi:168 en/user_basics.ssi:184 en/user_basics.ssi:194
+#: en/user_basics.ssi:202 en/user_basics.ssi:218 en/user_basics.ssi:226
+#: en/user_basics.ssi:236 en/user_basics.ssi:254 en/user_basics.ssi:282
+#: en/user_basics.ssi:298 en/user_basics.ssi:306 en/user_basics.ssi:326
+#: en/user_basics.ssi:351 en/user_customization-binary.ssi:16
+#: en/user_customization-binary.ssi:27 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:44
 #: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -83,24 +86,27 @@ msgstr "code{"
 
 #. type: Plain text
 #: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
-#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
-#: en/about_manual.ssi:151 en/about_manual.ssi:161 en/about_manual.ssi:169
-#: en/about_manual.ssi:177 en/project_bugs.ssi:64
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:145 en/about_manual.ssi:158 en/about_manual.ssi:167
+#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
+#: en/about_manual.ssi:201 en/project_bugs.ssi:64
 #: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
 #: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
 #: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
 #: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
 #: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/user_basics.ssi:36 en/user_basics.ssi:46
-#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
-#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
-#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
-#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
-#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
-#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
-#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
-#: 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/project_procedures.ssi:131 en/style_guide.ssi:128 en/user_basics.ssi:36
+#: en/user_basics.ssi:46 en/user_basics.ssi:64 en/user_basics.ssi:77
+#: en/user_basics.ssi:112 en/user_basics.ssi:120 en/user_basics.ssi:134
+#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
+#: en/user_basics.ssi:172 en/user_basics.ssi:188 en/user_basics.ssi:198
+#: en/user_basics.ssi:206 en/user_basics.ssi:222 en/user_basics.ssi:230
+#: en/user_basics.ssi:240 en/user_basics.ssi:274 en/user_basics.ssi:286
+#: en/user_basics.ssi:302 en/user_basics.ssi:310 en/user_basics.ssi:337
+#: en/user_basics.ssi:376 en/user_customization-binary.ssi:23
+#: en/user_customization-binary.ssi:33 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:38
 #: en/user_customization-installer.ssi:49
 #: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -258,7 +264,7 @@ msgstr ""
 #: en/user_customization-installer.ssi:36
 #, no-wrap
 msgid ""
-" $ lb config --architecture i386 --linux-flavours 486 \\\n"
+" $ lb config --architectures i386 --linux-flavours 486 \\\n"
 "     --debian-installer live\n"
 " $ echo debian-installer-launcher >> config/package-lists/my.list.chroot\n"
 msgstr ""
diff --git a/manual/po/pt_BR/user_customization-packages.ssi.po b/manual/po/pt_BR/user_customization-packages.ssi.po
index 78fff44..8f9e0dc 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: 2012-01-18 18:00-0400\n"
+"POT-Creation-Date: 2012-02-13 14:44+0100\n"
 "PO-Revision-Date: 2010-10-22 08:58-0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -18,25 +18,27 @@ msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:146 en/about_manual.ssi:157 en/about_manual.ssi:165
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/project_bugs.ssi:60
+#: en/about_manual.ssi:108 en/about_manual.ssi:116 en/about_manual.ssi:124
+#: en/about_manual.ssi:136 en/about_manual.ssi:149 en/about_manual.ssi:162
+#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/about_manual.ssi:189
+#: en/about_manual.ssi:197 en/project_bugs.ssi:60
 #: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
 #: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
 #: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
 #: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
 #: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
-#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
-#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
-#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
-#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
-#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
-#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
-#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
-#: en/user_customization-binary.ssi:16 en/user_customization-binary.ssi:27
-#: 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/project_procedures.ssi:58 en/style_guide.ssi:124 en/user_basics.ssi:32
+#: en/user_basics.ssi:42 en/user_basics.ssi:58 en/user_basics.ssi:73
+#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:128
+#: en/user_basics.ssi:140 en/user_basics.ssi:152 en/user_basics.ssi:160
+#: en/user_basics.ssi:168 en/user_basics.ssi:184 en/user_basics.ssi:194
+#: en/user_basics.ssi:202 en/user_basics.ssi:218 en/user_basics.ssi:226
+#: en/user_basics.ssi:236 en/user_basics.ssi:254 en/user_basics.ssi:282
+#: en/user_basics.ssi:298 en/user_basics.ssi:306 en/user_basics.ssi:326
+#: en/user_basics.ssi:351 en/user_customization-binary.ssi:16
+#: en/user_customization-binary.ssi:27 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:44
 #: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -84,25 +86,27 @@ msgstr "code{"
 
 #. type: Plain text
 #: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
-#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
-#: en/about_manual.ssi:151 en/about_manual.ssi:161 en/about_manual.ssi:169
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/project_bugs.ssi:64
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:145 en/about_manual.ssi:158 en/about_manual.ssi:167
+#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
+#: en/about_manual.ssi:201 en/project_bugs.ssi:64
 #: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
 #: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
 #: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
 #: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
 #: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/user_basics.ssi:36 en/user_basics.ssi:46
-#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
-#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
-#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
-#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
-#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
-#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
-#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
-#: en/user_customization-binary.ssi:23 en/user_customization-binary.ssi:33
-#: 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/project_procedures.ssi:131 en/style_guide.ssi:128 en/user_basics.ssi:36
+#: en/user_basics.ssi:46 en/user_basics.ssi:64 en/user_basics.ssi:77
+#: en/user_basics.ssi:112 en/user_basics.ssi:120 en/user_basics.ssi:134
+#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
+#: en/user_basics.ssi:172 en/user_basics.ssi:188 en/user_basics.ssi:198
+#: en/user_basics.ssi:206 en/user_basics.ssi:222 en/user_basics.ssi:230
+#: en/user_basics.ssi:240 en/user_basics.ssi:274 en/user_basics.ssi:286
+#: en/user_basics.ssi:302 en/user_basics.ssi:310 en/user_basics.ssi:337
+#: en/user_basics.ssi:376 en/user_customization-binary.ssi:23
+#: en/user_customization-binary.ssi:33 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:38
 #: en/user_customization-installer.ssi:49
 #: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -530,14 +534,14 @@ msgid ""
 "the #{LB_}# prefix) may be used in conditional statements in package lists. "
 "Generally, this means any #{lb config}# option uppercased and with dashes "
 "changed to underscores. But in practice, it is only the ones that influence "
-"package selection that make sense, such as #{DISTRIBUTION}#, #{ARCHITECTURE}"
+"package selection that make sense, such as #{DISTRIBUTION}#, #{ARCHITECTURES}"
 "# or #{ARCHIVE_AREAS}#."
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:138
 msgid ""
-"For example, to install #{ia32-libs}# if the #{--architecture amd64}# is "
+"For example, to install #{ia32-libs}# if the #{--architectures amd64}# is "
 "specified:"
 msgstr ""
 
@@ -545,7 +549,7 @@ msgstr ""
 #: en/user_customization-packages.ssi:144
 #, no-wrap
 msgid ""
-" #if ARCHITECTURE amd64\n"
+" #if ARCHITECTURES amd64\n"
 " ia32-libs\n"
 " #endif\n"
 msgstr ""
@@ -554,14 +558,15 @@ msgstr ""
 #: en/user_customization-packages.ssi:148
 msgid ""
 "You may test for any one of a number of values, e.g. to install #{memtest86+}"
-"# if either #{--architecture i386}# or #{--architecture amd64}# is specified:"
+"# if either #{--architectures i386}# or #{--architectures amd64}# is "
+"specified:"
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:154
 #, no-wrap
 msgid ""
-" #if ARCHITECTURE i386 amd64\n"
+" #if ARCHITECTURES i386 amd64\n"
 " memtest86+\n"
 " #endif\n"
 msgstr ""
@@ -592,7 +597,7 @@ msgstr ""
 #: en/user_customization-packages.ssi:174
 #, no-wrap
 msgid ""
-" #if ARCHITECTURE amd64\n"
+" #if ARCHITECTURES amd64\n"
 " #include <gnome-full>\n"
 " #endif\n"
 msgstr ""
diff --git a/manual/po/pt_BR/user_examples.ssi.po b/manual/po/pt_BR/user_examples.ssi.po
index fc4ec25..f3f1f51 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: 2012-01-18 18:00-0400\n"
+"POT-Creation-Date: 2012-02-13 14:44+0100\n"
 "PO-Revision-Date: 2010-11-04 16:34-0400\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -23,25 +23,27 @@ msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:146 en/about_manual.ssi:157 en/about_manual.ssi:165
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/project_bugs.ssi:60
+#: en/about_manual.ssi:108 en/about_manual.ssi:116 en/about_manual.ssi:124
+#: en/about_manual.ssi:136 en/about_manual.ssi:149 en/about_manual.ssi:162
+#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/about_manual.ssi:189
+#: en/about_manual.ssi:197 en/project_bugs.ssi:60
 #: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
 #: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
 #: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
 #: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
 #: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
-#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
-#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
-#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
-#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
-#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
-#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
-#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
-#: en/user_customization-binary.ssi:16 en/user_customization-binary.ssi:27
-#: 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/project_procedures.ssi:58 en/style_guide.ssi:124 en/user_basics.ssi:32
+#: en/user_basics.ssi:42 en/user_basics.ssi:58 en/user_basics.ssi:73
+#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:128
+#: en/user_basics.ssi:140 en/user_basics.ssi:152 en/user_basics.ssi:160
+#: en/user_basics.ssi:168 en/user_basics.ssi:184 en/user_basics.ssi:194
+#: en/user_basics.ssi:202 en/user_basics.ssi:218 en/user_basics.ssi:226
+#: en/user_basics.ssi:236 en/user_basics.ssi:254 en/user_basics.ssi:282
+#: en/user_basics.ssi:298 en/user_basics.ssi:306 en/user_basics.ssi:326
+#: en/user_basics.ssi:351 en/user_customization-binary.ssi:16
+#: en/user_customization-binary.ssi:27 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:44
 #: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -89,25 +91,27 @@ msgstr "code{"
 
 #. type: Plain text
 #: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
-#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
-#: en/about_manual.ssi:151 en/about_manual.ssi:161 en/about_manual.ssi:169
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/project_bugs.ssi:64
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:145 en/about_manual.ssi:158 en/about_manual.ssi:167
+#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
+#: en/about_manual.ssi:201 en/project_bugs.ssi:64
 #: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
 #: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
 #: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
 #: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
 #: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/user_basics.ssi:36 en/user_basics.ssi:46
-#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
-#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
-#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
-#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
-#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
-#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
-#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
-#: en/user_customization-binary.ssi:23 en/user_customization-binary.ssi:33
-#: 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/project_procedures.ssi:131 en/style_guide.ssi:128 en/user_basics.ssi:36
+#: en/user_basics.ssi:46 en/user_basics.ssi:64 en/user_basics.ssi:77
+#: en/user_basics.ssi:112 en/user_basics.ssi:120 en/user_basics.ssi:134
+#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
+#: en/user_basics.ssi:172 en/user_basics.ssi:188 en/user_basics.ssi:198
+#: en/user_basics.ssi:206 en/user_basics.ssi:222 en/user_basics.ssi:230
+#: en/user_basics.ssi:240 en/user_basics.ssi:274 en/user_basics.ssi:286
+#: en/user_basics.ssi:302 en/user_basics.ssi:310 en/user_basics.ssi:337
+#: en/user_basics.ssi:376 en/user_customization-binary.ssi:23
+#: en/user_customization-binary.ssi:33 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:38
 #: en/user_customization-installer.ssi:49
 #: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -376,7 +380,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 " lb config noauto \\\n"
-"     --architecture i386 \\\n"
+"     --architectures i386 \\\n"
 "     --linux-flavours 686-pae \\\n"
 "     --package-lists lxde \\\n"
 "     \"${@}\"\n"
@@ -396,7 +400,7 @@ msgstr ""
 #. type: Plain text
 #: en/user_examples.ssi:113
 msgid ""
-"First, #{--architecture i386}# ensures that on our #{amd64}# build system, "
+"First, #{--architectures i386}# ensures that on our #{amd64}# build system, "
 "we build a 32-bit version suitable for use on most machines. Second, we use #"
 "{--linux-flavours 686-pae}# because we don't anticipate using this image on "
 "much older systems. Third, we've chosen the #{lxde}# package list to give us "
diff --git a/manual/po/ro/live-manual.ssm.po b/manual/po/ro/live-manual.ssm.po
index c7ebb99..470aa87 100644
--- a/manual/po/ro/live-manual.ssm.po
+++ b/manual/po/ro/live-manual.ssm.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2012-02-11 16:42+0100\n"
+"POT-Creation-Date: 2012-02-13 14:44+0100\n"
 "PO-Revision-Date: 2010-10-23 00:04+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -46,7 +46,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 "@date:\n"
-" :published: 2012-02-11\n"
+" :published: 2012-02-13\n"
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/po/ro/user_customization-installer.ssi.po b/manual/po/ro/user_customization-installer.ssi.po
index fb410bf..4ed1083 100644
--- a/manual/po/ro/user_customization-installer.ssi.po
+++ b/manual/po/ro/user_customization-installer.ssi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual 2.0.0\n"
-"POT-Creation-Date: 2011-11-07 21:19-0400\n"
+"POT-Creation-Date: 2012-02-13 14:44+0100\n"
 "PO-Revision-Date: 2010-11-30 10:53+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -19,24 +19,27 @@ msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:146 en/about_manual.ssi:157 en/about_manual.ssi:165
-#: en/about_manual.ssi:173 en/project_bugs.ssi:60
+#: en/about_manual.ssi:108 en/about_manual.ssi:116 en/about_manual.ssi:124
+#: en/about_manual.ssi:136 en/about_manual.ssi:149 en/about_manual.ssi:162
+#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/about_manual.ssi:189
+#: en/about_manual.ssi:197 en/project_bugs.ssi:60
 #: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
 #: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
 #: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
 #: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
 #: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
-#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
-#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
-#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
-#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
-#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
-#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
-#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
-#: 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/project_procedures.ssi:58 en/style_guide.ssi:124 en/user_basics.ssi:32
+#: en/user_basics.ssi:42 en/user_basics.ssi:58 en/user_basics.ssi:73
+#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:128
+#: en/user_basics.ssi:140 en/user_basics.ssi:152 en/user_basics.ssi:160
+#: en/user_basics.ssi:168 en/user_basics.ssi:184 en/user_basics.ssi:194
+#: en/user_basics.ssi:202 en/user_basics.ssi:218 en/user_basics.ssi:226
+#: en/user_basics.ssi:236 en/user_basics.ssi:254 en/user_basics.ssi:282
+#: en/user_basics.ssi:298 en/user_basics.ssi:306 en/user_basics.ssi:326
+#: en/user_basics.ssi:351 en/user_customization-binary.ssi:16
+#: en/user_customization-binary.ssi:27 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:44
 #: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -84,24 +87,27 @@ msgstr "code{"
 
 #. type: Plain text
 #: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
-#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
-#: en/about_manual.ssi:151 en/about_manual.ssi:161 en/about_manual.ssi:169
-#: en/about_manual.ssi:177 en/project_bugs.ssi:64
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:145 en/about_manual.ssi:158 en/about_manual.ssi:167
+#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
+#: en/about_manual.ssi:201 en/project_bugs.ssi:64
 #: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
 #: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
 #: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
 #: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
 #: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/user_basics.ssi:36 en/user_basics.ssi:46
-#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
-#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
-#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
-#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
-#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
-#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
-#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
-#: 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/project_procedures.ssi:131 en/style_guide.ssi:128 en/user_basics.ssi:36
+#: en/user_basics.ssi:46 en/user_basics.ssi:64 en/user_basics.ssi:77
+#: en/user_basics.ssi:112 en/user_basics.ssi:120 en/user_basics.ssi:134
+#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
+#: en/user_basics.ssi:172 en/user_basics.ssi:188 en/user_basics.ssi:198
+#: en/user_basics.ssi:206 en/user_basics.ssi:222 en/user_basics.ssi:230
+#: en/user_basics.ssi:240 en/user_basics.ssi:274 en/user_basics.ssi:286
+#: en/user_basics.ssi:302 en/user_basics.ssi:310 en/user_basics.ssi:337
+#: en/user_basics.ssi:376 en/user_customization-binary.ssi:23
+#: en/user_customization-binary.ssi:33 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:38
 #: en/user_customization-installer.ssi:49
 #: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -259,7 +265,7 @@ msgstr ""
 #: en/user_customization-installer.ssi:36
 #, no-wrap
 msgid ""
-" $ lb config --architecture i386 --linux-flavours 486 \\\n"
+" $ lb config --architectures i386 --linux-flavours 486 \\\n"
 "     --debian-installer live\n"
 " $ echo debian-installer-launcher >> config/package-lists/my.list.chroot\n"
 msgstr ""
diff --git a/manual/po/ro/user_customization-packages.ssi.po b/manual/po/ro/user_customization-packages.ssi.po
index 841b5b1..d8b2096 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: 2012-01-18 18:00-0400\n"
+"POT-Creation-Date: 2012-02-13 14:44+0100\n"
 "PO-Revision-Date: 2010-10-22 08:58-0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -19,25 +19,27 @@ msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:146 en/about_manual.ssi:157 en/about_manual.ssi:165
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/project_bugs.ssi:60
+#: en/about_manual.ssi:108 en/about_manual.ssi:116 en/about_manual.ssi:124
+#: en/about_manual.ssi:136 en/about_manual.ssi:149 en/about_manual.ssi:162
+#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/about_manual.ssi:189
+#: en/about_manual.ssi:197 en/project_bugs.ssi:60
 #: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
 #: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
 #: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
 #: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
 #: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
-#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
-#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
-#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
-#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
-#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
-#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
-#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
-#: en/user_customization-binary.ssi:16 en/user_customization-binary.ssi:27
-#: 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/project_procedures.ssi:58 en/style_guide.ssi:124 en/user_basics.ssi:32
+#: en/user_basics.ssi:42 en/user_basics.ssi:58 en/user_basics.ssi:73
+#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:128
+#: en/user_basics.ssi:140 en/user_basics.ssi:152 en/user_basics.ssi:160
+#: en/user_basics.ssi:168 en/user_basics.ssi:184 en/user_basics.ssi:194
+#: en/user_basics.ssi:202 en/user_basics.ssi:218 en/user_basics.ssi:226
+#: en/user_basics.ssi:236 en/user_basics.ssi:254 en/user_basics.ssi:282
+#: en/user_basics.ssi:298 en/user_basics.ssi:306 en/user_basics.ssi:326
+#: en/user_basics.ssi:351 en/user_customization-binary.ssi:16
+#: en/user_customization-binary.ssi:27 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:44
 #: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -85,25 +87,27 @@ msgstr "code{"
 
 #. type: Plain text
 #: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
-#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
-#: en/about_manual.ssi:151 en/about_manual.ssi:161 en/about_manual.ssi:169
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/project_bugs.ssi:64
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:145 en/about_manual.ssi:158 en/about_manual.ssi:167
+#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
+#: en/about_manual.ssi:201 en/project_bugs.ssi:64
 #: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
 #: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
 #: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
 #: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
 #: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/user_basics.ssi:36 en/user_basics.ssi:46
-#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
-#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
-#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
-#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
-#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
-#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
-#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
-#: en/user_customization-binary.ssi:23 en/user_customization-binary.ssi:33
-#: 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/project_procedures.ssi:131 en/style_guide.ssi:128 en/user_basics.ssi:36
+#: en/user_basics.ssi:46 en/user_basics.ssi:64 en/user_basics.ssi:77
+#: en/user_basics.ssi:112 en/user_basics.ssi:120 en/user_basics.ssi:134
+#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
+#: en/user_basics.ssi:172 en/user_basics.ssi:188 en/user_basics.ssi:198
+#: en/user_basics.ssi:206 en/user_basics.ssi:222 en/user_basics.ssi:230
+#: en/user_basics.ssi:240 en/user_basics.ssi:274 en/user_basics.ssi:286
+#: en/user_basics.ssi:302 en/user_basics.ssi:310 en/user_basics.ssi:337
+#: en/user_basics.ssi:376 en/user_customization-binary.ssi:23
+#: en/user_customization-binary.ssi:33 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:38
 #: en/user_customization-installer.ssi:49
 #: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -531,14 +535,14 @@ msgid ""
 "the #{LB_}# prefix) may be used in conditional statements in package lists. "
 "Generally, this means any #{lb config}# option uppercased and with dashes "
 "changed to underscores. But in practice, it is only the ones that influence "
-"package selection that make sense, such as #{DISTRIBUTION}#, #{ARCHITECTURE}"
+"package selection that make sense, such as #{DISTRIBUTION}#, #{ARCHITECTURES}"
 "# or #{ARCHIVE_AREAS}#."
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:138
 msgid ""
-"For example, to install #{ia32-libs}# if the #{--architecture amd64}# is "
+"For example, to install #{ia32-libs}# if the #{--architectures amd64}# is "
 "specified:"
 msgstr ""
 
@@ -546,7 +550,7 @@ msgstr ""
 #: en/user_customization-packages.ssi:144
 #, no-wrap
 msgid ""
-" #if ARCHITECTURE amd64\n"
+" #if ARCHITECTURES amd64\n"
 " ia32-libs\n"
 " #endif\n"
 msgstr ""
@@ -555,14 +559,15 @@ msgstr ""
 #: en/user_customization-packages.ssi:148
 msgid ""
 "You may test for any one of a number of values, e.g. to install #{memtest86+}"
-"# if either #{--architecture i386}# or #{--architecture amd64}# is specified:"
+"# if either #{--architectures i386}# or #{--architectures amd64}# is "
+"specified:"
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:154
 #, no-wrap
 msgid ""
-" #if ARCHITECTURE i386 amd64\n"
+" #if ARCHITECTURES i386 amd64\n"
 " memtest86+\n"
 " #endif\n"
 msgstr ""
@@ -593,7 +598,7 @@ msgstr ""
 #: en/user_customization-packages.ssi:174
 #, no-wrap
 msgid ""
-" #if ARCHITECTURE amd64\n"
+" #if ARCHITECTURES amd64\n"
 " #include <gnome-full>\n"
 " #endif\n"
 msgstr ""
diff --git a/manual/po/ro/user_examples.ssi.po b/manual/po/ro/user_examples.ssi.po
index 392faf8..d463d5d 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: 2012-01-18 18:00-0400\n"
+"POT-Creation-Date: 2012-02-13 14:44+0100\n"
 "PO-Revision-Date: 2010-11-04 16:34-0400\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -24,25 +24,27 @@ msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:146 en/about_manual.ssi:157 en/about_manual.ssi:165
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/project_bugs.ssi:60
+#: en/about_manual.ssi:108 en/about_manual.ssi:116 en/about_manual.ssi:124
+#: en/about_manual.ssi:136 en/about_manual.ssi:149 en/about_manual.ssi:162
+#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/about_manual.ssi:189
+#: en/about_manual.ssi:197 en/project_bugs.ssi:60
 #: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
 #: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
 #: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
 #: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
 #: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
-#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
-#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
-#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
-#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
-#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
-#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
-#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
-#: en/user_customization-binary.ssi:16 en/user_customization-binary.ssi:27
-#: 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/project_procedures.ssi:58 en/style_guide.ssi:124 en/user_basics.ssi:32
+#: en/user_basics.ssi:42 en/user_basics.ssi:58 en/user_basics.ssi:73
+#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:128
+#: en/user_basics.ssi:140 en/user_basics.ssi:152 en/user_basics.ssi:160
+#: en/user_basics.ssi:168 en/user_basics.ssi:184 en/user_basics.ssi:194
+#: en/user_basics.ssi:202 en/user_basics.ssi:218 en/user_basics.ssi:226
+#: en/user_basics.ssi:236 en/user_basics.ssi:254 en/user_basics.ssi:282
+#: en/user_basics.ssi:298 en/user_basics.ssi:306 en/user_basics.ssi:326
+#: en/user_basics.ssi:351 en/user_customization-binary.ssi:16
+#: en/user_customization-binary.ssi:27 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:44
 #: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -90,25 +92,27 @@ msgstr "code{"
 
 #. type: Plain text
 #: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
-#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
-#: en/about_manual.ssi:151 en/about_manual.ssi:161 en/about_manual.ssi:169
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/project_bugs.ssi:64
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:145 en/about_manual.ssi:158 en/about_manual.ssi:167
+#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
+#: en/about_manual.ssi:201 en/project_bugs.ssi:64
 #: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
 #: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
 #: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
 #: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
 #: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/user_basics.ssi:36 en/user_basics.ssi:46
-#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
-#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
-#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
-#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
-#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
-#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
-#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
-#: en/user_customization-binary.ssi:23 en/user_customization-binary.ssi:33
-#: 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/project_procedures.ssi:131 en/style_guide.ssi:128 en/user_basics.ssi:36
+#: en/user_basics.ssi:46 en/user_basics.ssi:64 en/user_basics.ssi:77
+#: en/user_basics.ssi:112 en/user_basics.ssi:120 en/user_basics.ssi:134
+#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
+#: en/user_basics.ssi:172 en/user_basics.ssi:188 en/user_basics.ssi:198
+#: en/user_basics.ssi:206 en/user_basics.ssi:222 en/user_basics.ssi:230
+#: en/user_basics.ssi:240 en/user_basics.ssi:274 en/user_basics.ssi:286
+#: en/user_basics.ssi:302 en/user_basics.ssi:310 en/user_basics.ssi:337
+#: en/user_basics.ssi:376 en/user_customization-binary.ssi:23
+#: en/user_customization-binary.ssi:33 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:38
 #: en/user_customization-installer.ssi:49
 #: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -377,7 +381,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 " lb config noauto \\\n"
-"     --architecture i386 \\\n"
+"     --architectures i386 \\\n"
 "     --linux-flavours 686-pae \\\n"
 "     --package-lists lxde \\\n"
 "     \"${@}\"\n"
@@ -397,7 +401,7 @@ msgstr ""
 #. type: Plain text
 #: en/user_examples.ssi:113
 msgid ""
-"First, #{--architecture i386}# ensures that on our #{amd64}# build system, "
+"First, #{--architectures i386}# ensures that on our #{amd64}# build system, "
 "we build a 32-bit version suitable for use on most machines. Second, we use #"
 "{--linux-flavours 686-pae}# because we don't anticipate using this image on "
 "much older systems. Third, we've chosen the #{lxde}# package list to give us "
diff --git a/manual/pot/live-manual.ssm.pot b/manual/pot/live-manual.ssm.pot
index 733b096..a35d380 100644
--- a/manual/pot/live-manual.ssm.pot
+++ b/manual/pot/live-manual.ssm.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2012-02-11 16:42+0100\n"
+"POT-Creation-Date: 2012-02-13 14:44+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -45,7 +45,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 "@date:\n"
-" :published: 2012-02-11\n"
+" :published: 2012-02-13\n"
 msgstr ""
 
 #. type: Plain text
diff --git a/manual/pot/user_customization-installer.ssi.pot b/manual/pot/user_customization-installer.ssi.pot
index 019df52..95d8ab7 100644
--- a/manual/pot/user_customization-installer.ssi.pot
+++ b/manual/pot/user_customization-installer.ssi.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2011-11-07 21:19-0400\n"
+"POT-Creation-Date: 2012-02-13 14:44+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -18,24 +18,27 @@ msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:146 en/about_manual.ssi:157 en/about_manual.ssi:165
-#: en/about_manual.ssi:173 en/project_bugs.ssi:60
+#: en/about_manual.ssi:108 en/about_manual.ssi:116 en/about_manual.ssi:124
+#: en/about_manual.ssi:136 en/about_manual.ssi:149 en/about_manual.ssi:162
+#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/about_manual.ssi:189
+#: en/about_manual.ssi:197 en/project_bugs.ssi:60
 #: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
 #: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
 #: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
 #: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
 #: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
-#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
-#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
-#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
-#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
-#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
-#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
-#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
-#: 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/project_procedures.ssi:58 en/style_guide.ssi:124 en/user_basics.ssi:32
+#: en/user_basics.ssi:42 en/user_basics.ssi:58 en/user_basics.ssi:73
+#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:128
+#: en/user_basics.ssi:140 en/user_basics.ssi:152 en/user_basics.ssi:160
+#: en/user_basics.ssi:168 en/user_basics.ssi:184 en/user_basics.ssi:194
+#: en/user_basics.ssi:202 en/user_basics.ssi:218 en/user_basics.ssi:226
+#: en/user_basics.ssi:236 en/user_basics.ssi:254 en/user_basics.ssi:282
+#: en/user_basics.ssi:298 en/user_basics.ssi:306 en/user_basics.ssi:326
+#: en/user_basics.ssi:351 en/user_customization-binary.ssi:16
+#: en/user_customization-binary.ssi:27 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:44
 #: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -83,24 +86,27 @@ msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
-#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
-#: en/about_manual.ssi:151 en/about_manual.ssi:161 en/about_manual.ssi:169
-#: en/about_manual.ssi:177 en/project_bugs.ssi:64
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:145 en/about_manual.ssi:158 en/about_manual.ssi:167
+#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
+#: en/about_manual.ssi:201 en/project_bugs.ssi:64
 #: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
 #: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
 #: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
 #: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
 #: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/user_basics.ssi:36 en/user_basics.ssi:46
-#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
-#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
-#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
-#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
-#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
-#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
-#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
-#: 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/project_procedures.ssi:131 en/style_guide.ssi:128 en/user_basics.ssi:36
+#: en/user_basics.ssi:46 en/user_basics.ssi:64 en/user_basics.ssi:77
+#: en/user_basics.ssi:112 en/user_basics.ssi:120 en/user_basics.ssi:134
+#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
+#: en/user_basics.ssi:172 en/user_basics.ssi:188 en/user_basics.ssi:198
+#: en/user_basics.ssi:206 en/user_basics.ssi:222 en/user_basics.ssi:230
+#: en/user_basics.ssi:240 en/user_basics.ssi:274 en/user_basics.ssi:286
+#: en/user_basics.ssi:302 en/user_basics.ssi:310 en/user_basics.ssi:337
+#: en/user_basics.ssi:376 en/user_customization-binary.ssi:23
+#: en/user_customization-binary.ssi:33 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:38
 #: en/user_customization-installer.ssi:49
 #: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -258,7 +264,7 @@ msgstr ""
 #: en/user_customization-installer.ssi:36
 #, no-wrap
 msgid ""
-" $ lb config --architecture i386 --linux-flavours 486 \\\n"
+" $ lb config --architectures i386 --linux-flavours 486 \\\n"
 "     --debian-installer live\n"
 " $ echo debian-installer-launcher >> config/package-lists/my.list.chroot\n"
 msgstr ""
diff --git a/manual/pot/user_customization-packages.ssi.pot b/manual/pot/user_customization-packages.ssi.pot
index 4c7f56a..abfa7a4 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: 2012-01-18 18:00-0400\n"
+"POT-Creation-Date: 2012-02-13 14:44+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -18,25 +18,27 @@ msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:146 en/about_manual.ssi:157 en/about_manual.ssi:165
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/project_bugs.ssi:60
+#: en/about_manual.ssi:108 en/about_manual.ssi:116 en/about_manual.ssi:124
+#: en/about_manual.ssi:136 en/about_manual.ssi:149 en/about_manual.ssi:162
+#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/about_manual.ssi:189
+#: en/about_manual.ssi:197 en/project_bugs.ssi:60
 #: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
 #: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
 #: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
 #: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
 #: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
-#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
-#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
-#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
-#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
-#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
-#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
-#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
-#: en/user_customization-binary.ssi:16 en/user_customization-binary.ssi:27
-#: 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/project_procedures.ssi:58 en/style_guide.ssi:124 en/user_basics.ssi:32
+#: en/user_basics.ssi:42 en/user_basics.ssi:58 en/user_basics.ssi:73
+#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:128
+#: en/user_basics.ssi:140 en/user_basics.ssi:152 en/user_basics.ssi:160
+#: en/user_basics.ssi:168 en/user_basics.ssi:184 en/user_basics.ssi:194
+#: en/user_basics.ssi:202 en/user_basics.ssi:218 en/user_basics.ssi:226
+#: en/user_basics.ssi:236 en/user_basics.ssi:254 en/user_basics.ssi:282
+#: en/user_basics.ssi:298 en/user_basics.ssi:306 en/user_basics.ssi:326
+#: en/user_basics.ssi:351 en/user_customization-binary.ssi:16
+#: en/user_customization-binary.ssi:27 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:44
 #: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -84,25 +86,27 @@ msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
-#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
-#: en/about_manual.ssi:151 en/about_manual.ssi:161 en/about_manual.ssi:169
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/project_bugs.ssi:64
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:145 en/about_manual.ssi:158 en/about_manual.ssi:167
+#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
+#: en/about_manual.ssi:201 en/project_bugs.ssi:64
 #: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
 #: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
 #: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
 #: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
 #: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/user_basics.ssi:36 en/user_basics.ssi:46
-#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
-#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
-#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
-#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
-#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
-#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
-#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
-#: en/user_customization-binary.ssi:23 en/user_customization-binary.ssi:33
-#: 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/project_procedures.ssi:131 en/style_guide.ssi:128 en/user_basics.ssi:36
+#: en/user_basics.ssi:46 en/user_basics.ssi:64 en/user_basics.ssi:77
+#: en/user_basics.ssi:112 en/user_basics.ssi:120 en/user_basics.ssi:134
+#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
+#: en/user_basics.ssi:172 en/user_basics.ssi:188 en/user_basics.ssi:198
+#: en/user_basics.ssi:206 en/user_basics.ssi:222 en/user_basics.ssi:230
+#: en/user_basics.ssi:240 en/user_basics.ssi:274 en/user_basics.ssi:286
+#: en/user_basics.ssi:302 en/user_basics.ssi:310 en/user_basics.ssi:337
+#: en/user_basics.ssi:376 en/user_customization-binary.ssi:23
+#: en/user_customization-binary.ssi:33 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:38
 #: en/user_customization-installer.ssi:49
 #: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -530,14 +534,14 @@ msgid ""
 "the #{LB_}# prefix) may be used in conditional statements in package lists. "
 "Generally, this means any #{lb config}# option uppercased and with dashes "
 "changed to underscores. But in practice, it is only the ones that influence "
-"package selection that make sense, such as #{DISTRIBUTION}#, #{ARCHITECTURE}"
+"package selection that make sense, such as #{DISTRIBUTION}#, #{ARCHITECTURES}"
 "# or #{ARCHIVE_AREAS}#."
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:138
 msgid ""
-"For example, to install #{ia32-libs}# if the #{--architecture amd64}# is "
+"For example, to install #{ia32-libs}# if the #{--architectures amd64}# is "
 "specified:"
 msgstr ""
 
@@ -545,7 +549,7 @@ msgstr ""
 #: en/user_customization-packages.ssi:144
 #, no-wrap
 msgid ""
-" #if ARCHITECTURE amd64\n"
+" #if ARCHITECTURES amd64\n"
 " ia32-libs\n"
 " #endif\n"
 msgstr ""
@@ -554,14 +558,15 @@ msgstr ""
 #: en/user_customization-packages.ssi:148
 msgid ""
 "You may test for any one of a number of values, e.g. to install #{memtest86+}"
-"# if either #{--architecture i386}# or #{--architecture amd64}# is specified:"
+"# if either #{--architectures i386}# or #{--architectures amd64}# is "
+"specified:"
 msgstr ""
 
 #. type: Plain text
 #: en/user_customization-packages.ssi:154
 #, no-wrap
 msgid ""
-" #if ARCHITECTURE i386 amd64\n"
+" #if ARCHITECTURES i386 amd64\n"
 " memtest86+\n"
 " #endif\n"
 msgstr ""
@@ -592,7 +597,7 @@ msgstr ""
 #: en/user_customization-packages.ssi:174
 #, no-wrap
 msgid ""
-" #if ARCHITECTURE amd64\n"
+" #if ARCHITECTURES amd64\n"
 " #include <gnome-full>\n"
 " #endif\n"
 msgstr ""
diff --git a/manual/pot/user_examples.ssi.pot b/manual/pot/user_examples.ssi.pot
index b14bce3..57ea9e9 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: 2012-01-18 18:00-0400\n"
+"POT-Creation-Date: 2012-02-13 14:44+0100\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"
@@ -23,25 +23,27 @@ msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:108 en/about_manual.ssi:120 en/about_manual.ssi:133
-#: en/about_manual.ssi:146 en/about_manual.ssi:157 en/about_manual.ssi:165
-#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/project_bugs.ssi:60
+#: en/about_manual.ssi:108 en/about_manual.ssi:116 en/about_manual.ssi:124
+#: en/about_manual.ssi:136 en/about_manual.ssi:149 en/about_manual.ssi:162
+#: en/about_manual.ssi:173 en/about_manual.ssi:181 en/about_manual.ssi:189
+#: en/about_manual.ssi:197 en/project_bugs.ssi:60
 #: en/project_coding-style.ssi:28 en/project_coding-style.ssi:38
 #: en/project_coding-style.ssi:51 en/project_coding-style.ssi:61
 #: en/project_coding-style.ssi:92 en/project_coding-style.ssi:100
 #: en/project_coding-style.ssi:110 en/project_coding-style.ssi:121
 #: en/project_procedures.ssi:12 en/project_procedures.ssi:46
-#: en/project_procedures.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
-#: en/user_basics.ssi:58 en/user_basics.ssi:73 en/user_basics.ssi:108
-#: en/user_basics.ssi:116 en/user_basics.ssi:128 en/user_basics.ssi:140
-#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
-#: en/user_basics.ssi:184 en/user_basics.ssi:194 en/user_basics.ssi:202
-#: en/user_basics.ssi:218 en/user_basics.ssi:226 en/user_basics.ssi:236
-#: en/user_basics.ssi:254 en/user_basics.ssi:282 en/user_basics.ssi:298
-#: en/user_basics.ssi:306 en/user_basics.ssi:326 en/user_basics.ssi:351
-#: en/user_customization-binary.ssi:16 en/user_customization-binary.ssi:27
-#: 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/project_procedures.ssi:58 en/style_guide.ssi:124 en/user_basics.ssi:32
+#: en/user_basics.ssi:42 en/user_basics.ssi:58 en/user_basics.ssi:73
+#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:128
+#: en/user_basics.ssi:140 en/user_basics.ssi:152 en/user_basics.ssi:160
+#: en/user_basics.ssi:168 en/user_basics.ssi:184 en/user_basics.ssi:194
+#: en/user_basics.ssi:202 en/user_basics.ssi:218 en/user_basics.ssi:226
+#: en/user_basics.ssi:236 en/user_basics.ssi:254 en/user_basics.ssi:282
+#: en/user_basics.ssi:298 en/user_basics.ssi:306 en/user_basics.ssi:326
+#: en/user_basics.ssi:351 en/user_customization-binary.ssi:16
+#: en/user_customization-binary.ssi:27 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:44
 #: en/user_customization-packages.ssi:14 en/user_customization-packages.ssi:22
@@ -89,25 +91,27 @@ msgstr ""
 
 #. type: Plain text
 #: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
-#: en/about_manual.ssi:112 en/about_manual.ssi:129 en/about_manual.ssi:142
-#: en/about_manual.ssi:151 en/about_manual.ssi:161 en/about_manual.ssi:169
-#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/project_bugs.ssi:64
+#: en/about_manual.ssi:112 en/about_manual.ssi:120 en/about_manual.ssi:128
+#: en/about_manual.ssi:145 en/about_manual.ssi:158 en/about_manual.ssi:167
+#: en/about_manual.ssi:177 en/about_manual.ssi:185 en/about_manual.ssi:193
+#: en/about_manual.ssi:201 en/project_bugs.ssi:64
 #: en/project_coding-style.ssi:34 en/project_coding-style.ssi:45
 #: en/project_coding-style.ssi:57 en/project_coding-style.ssi:68
 #: en/project_coding-style.ssi:96 en/project_coding-style.ssi:104
 #: en/project_coding-style.ssi:117 en/project_coding-style.ssi:128
 #: en/project_procedures.ssi:16 en/project_procedures.ssi:54
-#: en/project_procedures.ssi:131 en/user_basics.ssi:36 en/user_basics.ssi:46
-#: en/user_basics.ssi:64 en/user_basics.ssi:77 en/user_basics.ssi:112
-#: en/user_basics.ssi:120 en/user_basics.ssi:134 en/user_basics.ssi:144
-#: en/user_basics.ssi:156 en/user_basics.ssi:164 en/user_basics.ssi:172
-#: en/user_basics.ssi:188 en/user_basics.ssi:198 en/user_basics.ssi:206
-#: en/user_basics.ssi:222 en/user_basics.ssi:230 en/user_basics.ssi:240
-#: en/user_basics.ssi:274 en/user_basics.ssi:286 en/user_basics.ssi:302
-#: en/user_basics.ssi:310 en/user_basics.ssi:337 en/user_basics.ssi:376
-#: en/user_customization-binary.ssi:23 en/user_customization-binary.ssi:33
-#: 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/project_procedures.ssi:131 en/style_guide.ssi:128 en/user_basics.ssi:36
+#: en/user_basics.ssi:46 en/user_basics.ssi:64 en/user_basics.ssi:77
+#: en/user_basics.ssi:112 en/user_basics.ssi:120 en/user_basics.ssi:134
+#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
+#: en/user_basics.ssi:172 en/user_basics.ssi:188 en/user_basics.ssi:198
+#: en/user_basics.ssi:206 en/user_basics.ssi:222 en/user_basics.ssi:230
+#: en/user_basics.ssi:240 en/user_basics.ssi:274 en/user_basics.ssi:286
+#: en/user_basics.ssi:302 en/user_basics.ssi:310 en/user_basics.ssi:337
+#: en/user_basics.ssi:376 en/user_customization-binary.ssi:23
+#: en/user_customization-binary.ssi:33 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:38
 #: en/user_customization-installer.ssi:49
 #: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:26
@@ -376,7 +380,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 " lb config noauto \\\n"
-"     --architecture i386 \\\n"
+"     --architectures i386 \\\n"
 "     --linux-flavours 686-pae \\\n"
 "     --package-lists lxde \\\n"
 "     \"${@}\"\n"
@@ -396,7 +400,7 @@ msgstr ""
 #. type: Plain text
 #: en/user_examples.ssi:113
 msgid ""
-"First, #{--architecture i386}# ensures that on our #{amd64}# build system, "
+"First, #{--architectures i386}# ensures that on our #{amd64}# build system, "
 "we build a 32-bit version suitable for use on most machines. Second, we use #"
 "{--linux-flavours 686-pae}# because we don't anticipate using this image on "
 "much older systems. Third, we've chosen the #{lxde}# package list to give us "
diff --git a/manual/pt_BR/live-manual.ssm b/manual/pt_BR/live-manual.ssm
index 9ce345f..cb4265e 100644
--- a/manual/pt_BR/live-manual.ssm
+++ b/manual/pt_BR/live-manual.ssm
@@ -9,7 +9,7 @@
  :license: This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.<br><br>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.<br><br>You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/. <br><br>The complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-3 file.
 
 @date:
- :published: 2012-02-11
+ :published: 2012-02-13
 
 @publisher: Debian Live Project <debian-live at lists.debian.org>
 
diff --git a/manual/pt_BR/user_customization-installer.ssi b/manual/pt_BR/user_customization-installer.ssi
index d8d0c17..a8b01b5 100644
--- a/manual/pt_BR/user_customization-installer.ssi
+++ b/manual/pt_BR/user_customization-installer.ssi
@@ -52,7 +52,7 @@ architecture. For example:
 
 code{
 
- $ lb config --architecture i386 --linux-flavours 486 \
+ $ lb config --architectures i386 --linux-flavours 486 \
      --debian-installer live
  $ echo debian-installer-launcher >> config/package-lists/my.list.chroot
 
diff --git a/manual/pt_BR/user_customization-packages.ssi b/manual/pt_BR/user_customization-packages.ssi
index 01fd8c2..9035a7f 100644
--- a/manual/pt_BR/user_customization-packages.ssi
+++ b/manual/pt_BR/user_customization-packages.ssi
@@ -226,26 +226,26 @@ the #{LB_}# prefix) may be used in conditional statements in package
 lists. Generally, this means any #{lb config}# option uppercased and with
 dashes changed to underscores. But in practice, it is only the ones that
 influence package selection that make sense, such as #{DISTRIBUTION}#,
-#{ARCHITECTURE}# or #{ARCHIVE_AREAS}#.
+#{ARCHITECTURES}# or #{ARCHIVE_AREAS}#.
 
-For example, to install #{ia32-libs}# if the #{--architecture amd64}# is
+For example, to install #{ia32-libs}# if the #{--architectures amd64}# is
 specified:
 
 code{
 
- #if ARCHITECTURE amd64
+ #if ARCHITECTURES amd64
  ia32-libs
  #endif
 
 }code
 
 You may test for any one of a number of values, e.g. to install
-#{memtest86+}# if either #{--architecture i386}# or #{--architecture amd64}#
-is specified:
+#{memtest86+}# if either #{--architectures i386}# or #{--architectures
+amd64}# is specified:
 
 code{
 
- #if ARCHITECTURE i386 amd64
+ #if ARCHITECTURES i386 amd64
  memtest86+
  #endif
 
@@ -267,7 +267,7 @@ A conditional may surround an #{#include}# directive:
 
 code{
 
- #if ARCHITECTURE amd64
+ #if ARCHITECTURES amd64
  #include <gnome-full>
  #endif
 
diff --git a/manual/pt_BR/user_examples.ssi b/manual/pt_BR/user_examples.ssi
index 56c8726..428c580 100644
--- a/manual/pt_BR/user_examples.ssi
+++ b/manual/pt_BR/user_examples.ssi
@@ -131,7 +131,7 @@ code{
  #!/bin/sh
 
  lb config noauto \
-     --architecture i386 \
+     --architectures i386 \
      --linux-flavours 686-pae \
      --package-lists lxde \
      "${@}"
@@ -146,7 +146,7 @@ code{
 
 }code
 
-First, #{--architecture i386}# ensures that on our #{amd64}# build system,
+First, #{--architectures i386}# ensures that on our #{amd64}# build system,
 we build a 32-bit version suitable for use on most machines. Second, we use
 #{--linux-flavours 686-pae}# because we don't anticipate using this image on
 much older systems. Third, we've chosen the #{lxde}# package list to give us
diff --git a/manual/ro/live-manual.ssm b/manual/ro/live-manual.ssm
index 9ce345f..cb4265e 100644
--- a/manual/ro/live-manual.ssm
+++ b/manual/ro/live-manual.ssm
@@ -9,7 +9,7 @@
  :license: This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.<br><br>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.<br><br>You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/. <br><br>The complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-3 file.
 
 @date:
- :published: 2012-02-11
+ :published: 2012-02-13
 
 @publisher: Debian Live Project <debian-live at lists.debian.org>
 
diff --git a/manual/ro/user_customization-installer.ssi b/manual/ro/user_customization-installer.ssi
index d8d0c17..a8b01b5 100644
--- a/manual/ro/user_customization-installer.ssi
+++ b/manual/ro/user_customization-installer.ssi
@@ -52,7 +52,7 @@ architecture. For example:
 
 code{
 
- $ lb config --architecture i386 --linux-flavours 486 \
+ $ lb config --architectures i386 --linux-flavours 486 \
      --debian-installer live
  $ echo debian-installer-launcher >> config/package-lists/my.list.chroot
 
diff --git a/manual/ro/user_customization-packages.ssi b/manual/ro/user_customization-packages.ssi
index 01fd8c2..9035a7f 100644
--- a/manual/ro/user_customization-packages.ssi
+++ b/manual/ro/user_customization-packages.ssi
@@ -226,26 +226,26 @@ the #{LB_}# prefix) may be used in conditional statements in package
 lists. Generally, this means any #{lb config}# option uppercased and with
 dashes changed to underscores. But in practice, it is only the ones that
 influence package selection that make sense, such as #{DISTRIBUTION}#,
-#{ARCHITECTURE}# or #{ARCHIVE_AREAS}#.
+#{ARCHITECTURES}# or #{ARCHIVE_AREAS}#.
 
-For example, to install #{ia32-libs}# if the #{--architecture amd64}# is
+For example, to install #{ia32-libs}# if the #{--architectures amd64}# is
 specified:
 
 code{
 
- #if ARCHITECTURE amd64
+ #if ARCHITECTURES amd64
  ia32-libs
  #endif
 
 }code
 
 You may test for any one of a number of values, e.g. to install
-#{memtest86+}# if either #{--architecture i386}# or #{--architecture amd64}#
-is specified:
+#{memtest86+}# if either #{--architectures i386}# or #{--architectures
+amd64}# is specified:
 
 code{
 
- #if ARCHITECTURE i386 amd64
+ #if ARCHITECTURES i386 amd64
  memtest86+
  #endif
 
@@ -267,7 +267,7 @@ A conditional may surround an #{#include}# directive:
 
 code{
 
- #if ARCHITECTURE amd64
+ #if ARCHITECTURES amd64
  #include <gnome-full>
  #endif
 
diff --git a/manual/ro/user_examples.ssi b/manual/ro/user_examples.ssi
index 56c8726..428c580 100644
--- a/manual/ro/user_examples.ssi
+++ b/manual/ro/user_examples.ssi
@@ -131,7 +131,7 @@ code{
  #!/bin/sh
 
  lb config noauto \
-     --architecture i386 \
+     --architectures i386 \
      --linux-flavours 686-pae \
      --package-lists lxde \
      "${@}"
@@ -146,7 +146,7 @@ code{
 
 }code
 
-First, #{--architecture i386}# ensures that on our #{amd64}# build system,
+First, #{--architectures i386}# ensures that on our #{amd64}# build system,
 we build a 32-bit version suitable for use on most machines. Second, we use
 #{--linux-flavours 686-pae}# because we don't anticipate using this image on
 much older systems. Third, we've chosen the #{lxde}# package list to give us

-- 
live-manual

More information about the debian-live-changes mailing list