[SCM] live-manual branch, debian, updated. debian/2.0_a10-1-12-g104a3a5
Ben Armstrong
synrg at debian.org
Sat Nov 27 23:57:50 UTC 2010
The following commit has been merged in the debian branch:
commit 104a3a58aa8d14b14950dcf3f2e7297d103429c7
Author: Ben Armstrong <synrg at debian.org>
Date: Sat Nov 27 19:57:16 2010 -0400
Adding third tutorial, introducing live image project management.
diff --git a/manual/de/user_examples.ssi b/manual/de/user_examples.ssi
index 1214813..ea2b5b3 100644
--- a/manual/de/user_examples.ssi
+++ b/manual/de/user_examples.ssi
@@ -80,7 +80,8 @@ configuration for the web browser in
support packages for viewing various kinds of web content, but we leave this
as an exercise for the reader.
-Build the image, keeping a log as in {Tutorial 1}#tutorial-1:
+Build the image, again as superuser, keeping a log as in {Tutorial
+1}#tutorial-1:
code{
@@ -88,11 +89,130 @@ code{
}code
+Again, verify the image is OK and test, as in {Tutorial 1}#tutorial-1.
+
2~tutorial-3 Tutorial 3: A personalized image
*{Use case}* Create a project to build a personalized image, containing your favourite software to take with you on a USB stick wherever you go, and evolving in successive revisions as your needs and preferences change.
-FIXME
+Since we will be changing our personalized image over a number of revisions,
+and we want to track those changes, trying things experimentally and
+possibly reverting them if things don't work out, we will keep our
+configuration in the popular #{git}# version control system. We will also
+use the best practice of autoconfiguration via #{auto}# scripts as described
+in {Managing a configuration}#managing-a-configuration.
+
+3~ First revision
+
+code{
+
+$ mkdir -p tutorial3/auto $ cp /usr/share/live/examples/auto/*
+tutorial3/auto/ $ cd tutorial3
+
+}code
+
+Edit #{auto/config}# to read as follows:
+
+code{
+
+#!/bin/sh
+
+lb config noauto \
+ --architecture i386 \
+ --linux-flavours 686 \
+ --packages-lists lxde \
+ --packages "iceweasel xchat" \
+ "${@}"
+
+}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}# 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:
+
+code{
+
+# lb build
+
+}code
+
+Note that unlike in the first two tutorials, we no longer have to type
+#{2>&1 | tee binary.log}# as that is now included in #{auto/build}#.
+
+Once you've tested the image (as in {Tutorial 1}#tutorial-1) and are
+satisfied it works, it's time to initialize our #{git}# repository, adding
+only the auto scripts we just created, and then make the first commit:
+
+code{
+
+$ git init $ git add auto $ git commit -a -m "Initial import."
+
+}code
+
+3~ Second revision
+
+In this revision, we're going to clean up from the first build, add the
+#{vlc}# package to our configuration, rebuild, test and commit.
+
+The #{lb clean}# command will clean up all generated files from the previous
+build except for the cache, which saves having to re-download packages. This
+ensures that the subsequent #{lb build}# will re-run all stages to
+regenerate the files from our new configuration.
+
+code{
+
+# lb clean
+
+}code
+
+Now edit #{auto/config}# to add the #{vlc}# package:
+
+code{
+
+#!/bin/sh
+
+lb config noauto \
+ --architecture i386 \
+ --linux-flavours 686 \
+ --packages-lists lxde \
+ --packages "iceweasel xchat vlc" \
+ "${@}"
+
+}code
+
+Build again:
+
+code{
+
+# lb build
+
+}code
+
+Test, and when you're satisfied, commit the next revision:
+
+code{
+
+$ git commit -a -m "Adding vlc media player."
+
+}code
+
+Of course, more complicated changes to the configuration are possible,
+perhaps adding files in subdirectories of #{config/}#. When you commit new
+revisions, just take care not to hand edit or commit the top-level files in
+#{config}# containing #{LB_*}# variables, as these are build products, too,
+and are always cleaned up by #{lb clean}# and re-created with #{lb config}#
+via their respective #{auto}# scripts.
+
+We've come to the end of our tutorial series. While many more kinds of
+customization are possible, even just using the few features explored in
+these simple examples, an almost infinite variety of different images can be
+created. The remaining examples in this section cover several other use
+cases drawn from the collected experiences of users of Debian Live.
2~ A VNC Kiosk Client
diff --git a/manual/de/user_managing_a_configuration.ssi b/manual/de/user_managing_a_configuration.ssi
index bc03008..ab5b6c1 100644
--- a/manual/de/user_managing_a_configuration.ssi
+++ b/manual/de/user_managing_a_configuration.ssi
@@ -49,8 +49,8 @@ code{
#!/bin/sh
lb config noauto \
- --architecture i386 \
- ${@}
+ --packages-lists "standard" \
+ "${@}"
}code
@@ -59,7 +59,7 @@ auto/clean
code{
#!/bin/sh
-lb clean noauto ${@}
+lb clean noauto "${@}"
rm -f config/binary config/bootstrap \
config/chroot config/common config/source
rm -f binary.log
@@ -70,14 +70,13 @@ auto/build
code{
-#!/bin/sh lb build noauto ${@} 2>&1 | tee binary.log
+#!/bin/sh lb build noauto "${@}" 2>&1 | tee binary.log
}code
-Edit auto/config, changing or adding any options as you see fit. In the
-example above, --architecture is set to i386 so that when the image is built
-on an amd64 system, it will not default to building amd64 images. Change
-this to an appropriate value for your image (or delete it if you want to use
-the default) and add any additional options in continuation lines that
-follow.
+Edit #{auto/config}#, changing or adding any options as you see fit. In the
+example above, #{--packages-lists standard}# is set to the default
+value. Change this to an appropriate value for your image (or delete it if
+you want to use the default) and add any additional options in continuation
+lines that follow.
diff --git a/manual/en/user_examples.ssi b/manual/en/user_examples.ssi
index 9bf8f66..8a4bf66 100644
--- a/manual/en/user_examples.ssi
+++ b/manual/en/user_examples.ssi
@@ -55,7 +55,7 @@ mkdir tutorial2 ; cd tutorial2 ; lb config -p lxde --packages iceweasel
Our choice of LXDE for this example reflects our desire to provide a minimal desktop environment, since the focus of the image is the single use we have in mind, the web browser. We could go even further and provide a default configuration for the web browser in #{config/chroot_local-includes/etc/iceweasel/profile/}#, or additional support packages for viewing various kinds of web content, but we leave this as an exercise for the reader.
-Build the image, keeping a log as in {Tutorial 1}#tutorial-1:
+Build the image, again as superuser, keeping a log as in {Tutorial 1}#tutorial-1:
code{
@@ -63,11 +63,107 @@ code{
}code
+Again, verify the image is OK and test, as in {Tutorial 1}#tutorial-1.
+
2~tutorial-3 Tutorial 3: A personalized image
*{Use case}* Create a project to build a personalized image, containing your favourite software to take with you on a USB stick wherever you go, and evolving in successive revisions as your needs and preferences change.
-FIXME
+Since we will be changing our personalized image over a number of revisions, and we want to track those changes, trying things experimentally and possibly reverting them if things don't work out, we will keep our configuration in the popular #{git}# version control system. We will also use the best practice of autoconfiguration via #{auto}# scripts as described in {Managing a configuration}#managing-a-configuration.
+
+3~ First revision
+
+code{
+
+$ mkdir -p tutorial3/auto
+$ cp /usr/share/live/examples/auto/* tutorial3/auto/
+$ cd tutorial3
+
+}code
+
+Edit #{auto/config}# to read as follows:
+
+code{
+
+#!/bin/sh
+
+lb config noauto \
+ --architecture i386 \
+ --linux-flavours 686 \
+ --packages-lists lxde \
+ --packages "iceweasel xchat" \
+ "${@}"
+
+}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}# 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:
+
+code{
+
+# lb build
+
+}code
+
+Note that unlike in the first two tutorials, we no longer have to type #{2>&1 | tee binary.log}# as that is now included in #{auto/build}#.
+
+Once you've tested the image (as in {Tutorial 1}#tutorial-1) and are satisfied it works, it's time to initialize our #{git}# repository, adding only the auto scripts we just created, and then make the first commit:
+
+code{
+
+$ git init
+$ git add auto
+$ git commit -a -m "Initial import."
+
+}code
+
+3~ Second revision
+
+In this revision, we're going to clean up from the first build, add the #{vlc}# package to our configuration, rebuild, test and commit.
+
+The #{lb clean}# command will clean up all generated files from the previous build except for the cache, which saves having to re-download packages. This ensures that the subsequent #{lb build}# will re-run all stages to regenerate the files from our new configuration.
+
+code{
+
+# lb clean
+
+}code
+
+Now edit #{auto/config}# to add the #{vlc}# package:
+
+code{
+
+#!/bin/sh
+
+lb config noauto \
+ --architecture i386 \
+ --linux-flavours 686 \
+ --packages-lists lxde \
+ --packages "iceweasel xchat vlc" \
+ "${@}"
+
+}code
+
+Build again:
+
+code{
+
+# lb build
+
+}code
+
+Test, and when you're satisfied, commit the next revision:
+
+code{
+
+$ git commit -a -m "Adding vlc media player."
+
+}code
+
+Of course, more complicated changes to the configuration are possible, perhaps adding files in subdirectories of #{config/}#. When you commit new revisions, just take care not to hand edit or commit the top-level files in #{config}# containing #{LB_*}# variables, as these are build products, too, and are always cleaned up by #{lb clean}# and re-created with #{lb config}# via their respective #{auto}# scripts.
+
+We've come to the end of our tutorial series. While many more kinds of customization are possible, even just using the few features explored in these simple examples, an almost infinite variety of different images can be created. The remaining examples in this section cover several other use cases drawn from the collected experiences of users of Debian Live.
2~ A VNC Kiosk Client
diff --git a/manual/en/user_managing_a_configuration.ssi b/manual/en/user_managing_a_configuration.ssi
index 7c68d73..2beb2a0 100644
--- a/manual/en/user_managing_a_configuration.ssi
+++ b/manual/en/user_managing_a_configuration.ssi
@@ -24,8 +24,8 @@ code{
#!/bin/sh
lb config noauto \
- --architecture i386 \
- ${@}
+ --packages-lists "standard" \
+ "${@}"
}code
@@ -34,7 +34,7 @@ auto/clean
code{
#!/bin/sh
-lb clean noauto ${@}
+lb clean noauto "${@}"
rm -f config/binary config/bootstrap \
config/chroot config/common config/source
rm -f binary.log
@@ -46,9 +46,9 @@ auto/build
code{
#!/bin/sh
-lb build noauto ${@} 2>&1 | tee binary.log
+lb build noauto "${@}" 2>&1 | tee binary.log
}code
-Edit auto/config, changing or adding any options as you see fit. In the example above, --architecture is set to i386 so that when the image is built on an amd64 system, it will not default to building amd64 images. Change this to an appropriate value for your image (or delete it if you want to use the default) and add any additional options in continuation lines that follow.
+Edit #{auto/config}#, changing or adding any options as you see fit. In the example above, #{--packages-lists standard}# is set to the default value. Change this to an appropriate value for your image (or delete it if you want to use the default) and add any additional options in continuation lines that follow.
diff --git a/manual/fr/user_examples.ssi b/manual/fr/user_examples.ssi
index 1214813..ea2b5b3 100644
--- a/manual/fr/user_examples.ssi
+++ b/manual/fr/user_examples.ssi
@@ -80,7 +80,8 @@ configuration for the web browser in
support packages for viewing various kinds of web content, but we leave this
as an exercise for the reader.
-Build the image, keeping a log as in {Tutorial 1}#tutorial-1:
+Build the image, again as superuser, keeping a log as in {Tutorial
+1}#tutorial-1:
code{
@@ -88,11 +89,130 @@ code{
}code
+Again, verify the image is OK and test, as in {Tutorial 1}#tutorial-1.
+
2~tutorial-3 Tutorial 3: A personalized image
*{Use case}* Create a project to build a personalized image, containing your favourite software to take with you on a USB stick wherever you go, and evolving in successive revisions as your needs and preferences change.
-FIXME
+Since we will be changing our personalized image over a number of revisions,
+and we want to track those changes, trying things experimentally and
+possibly reverting them if things don't work out, we will keep our
+configuration in the popular #{git}# version control system. We will also
+use the best practice of autoconfiguration via #{auto}# scripts as described
+in {Managing a configuration}#managing-a-configuration.
+
+3~ First revision
+
+code{
+
+$ mkdir -p tutorial3/auto $ cp /usr/share/live/examples/auto/*
+tutorial3/auto/ $ cd tutorial3
+
+}code
+
+Edit #{auto/config}# to read as follows:
+
+code{
+
+#!/bin/sh
+
+lb config noauto \
+ --architecture i386 \
+ --linux-flavours 686 \
+ --packages-lists lxde \
+ --packages "iceweasel xchat" \
+ "${@}"
+
+}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}# 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:
+
+code{
+
+# lb build
+
+}code
+
+Note that unlike in the first two tutorials, we no longer have to type
+#{2>&1 | tee binary.log}# as that is now included in #{auto/build}#.
+
+Once you've tested the image (as in {Tutorial 1}#tutorial-1) and are
+satisfied it works, it's time to initialize our #{git}# repository, adding
+only the auto scripts we just created, and then make the first commit:
+
+code{
+
+$ git init $ git add auto $ git commit -a -m "Initial import."
+
+}code
+
+3~ Second revision
+
+In this revision, we're going to clean up from the first build, add the
+#{vlc}# package to our configuration, rebuild, test and commit.
+
+The #{lb clean}# command will clean up all generated files from the previous
+build except for the cache, which saves having to re-download packages. This
+ensures that the subsequent #{lb build}# will re-run all stages to
+regenerate the files from our new configuration.
+
+code{
+
+# lb clean
+
+}code
+
+Now edit #{auto/config}# to add the #{vlc}# package:
+
+code{
+
+#!/bin/sh
+
+lb config noauto \
+ --architecture i386 \
+ --linux-flavours 686 \
+ --packages-lists lxde \
+ --packages "iceweasel xchat vlc" \
+ "${@}"
+
+}code
+
+Build again:
+
+code{
+
+# lb build
+
+}code
+
+Test, and when you're satisfied, commit the next revision:
+
+code{
+
+$ git commit -a -m "Adding vlc media player."
+
+}code
+
+Of course, more complicated changes to the configuration are possible,
+perhaps adding files in subdirectories of #{config/}#. When you commit new
+revisions, just take care not to hand edit or commit the top-level files in
+#{config}# containing #{LB_*}# variables, as these are build products, too,
+and are always cleaned up by #{lb clean}# and re-created with #{lb config}#
+via their respective #{auto}# scripts.
+
+We've come to the end of our tutorial series. While many more kinds of
+customization are possible, even just using the few features explored in
+these simple examples, an almost infinite variety of different images can be
+created. The remaining examples in this section cover several other use
+cases drawn from the collected experiences of users of Debian Live.
2~ A VNC Kiosk Client
diff --git a/manual/fr/user_managing_a_configuration.ssi b/manual/fr/user_managing_a_configuration.ssi
index bc03008..ab5b6c1 100644
--- a/manual/fr/user_managing_a_configuration.ssi
+++ b/manual/fr/user_managing_a_configuration.ssi
@@ -49,8 +49,8 @@ code{
#!/bin/sh
lb config noauto \
- --architecture i386 \
- ${@}
+ --packages-lists "standard" \
+ "${@}"
}code
@@ -59,7 +59,7 @@ auto/clean
code{
#!/bin/sh
-lb clean noauto ${@}
+lb clean noauto "${@}"
rm -f config/binary config/bootstrap \
config/chroot config/common config/source
rm -f binary.log
@@ -70,14 +70,13 @@ auto/build
code{
-#!/bin/sh lb build noauto ${@} 2>&1 | tee binary.log
+#!/bin/sh lb build noauto "${@}" 2>&1 | tee binary.log
}code
-Edit auto/config, changing or adding any options as you see fit. In the
-example above, --architecture is set to i386 so that when the image is built
-on an amd64 system, it will not default to building amd64 images. Change
-this to an appropriate value for your image (or delete it if you want to use
-the default) and add any additional options in continuation lines that
-follow.
+Edit #{auto/config}#, changing or adding any options as you see fit. In the
+example above, #{--packages-lists standard}# is set to the default
+value. Change this to an appropriate value for your image (or delete it if
+you want to use the default) and add any additional options in continuation
+lines that follow.
diff --git a/manual/po/de/user_examples.ssi.po b/manual/po/de/user_examples.ssi.po
index 7e40a9f..7de645b 100644
--- a/manual/po/de/user_examples.ssi.po
+++ b/manual/po/de/user_examples.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-11-27 12:48-0400\n"
+"POT-Creation-Date: 2010-11-27 19:55-0400\n"
"PO-Revision-Date: 2010-11-04 16:34-0400\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -67,13 +67,15 @@ msgstr ""
#: en/user_customization-packages.ssi:273
#: en/user_customization-packages.ssi:283 en/user_examples.ssi:12
#: en/user_examples.ssi:27 en/user_examples.ssi:37 en/user_examples.ssi:51
-#: en/user_examples.ssi:61 en/user_examples.ssi:89 en/user_examples.ssi:110
-#: en/user_examples.ssi:118 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:104
-#: en/user_installation.ssi:118 en/user_installation.ssi:135
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_examples.ssi:61 en/user_examples.ssi:77 en/user_examples.ssi:87
+#: en/user_examples.ssi:104 en/user_examples.ssi:114 en/user_examples.ssi:128
+#: en/user_examples.ssi:136 en/user_examples.ssi:151 en/user_examples.ssi:159
+#: en/user_examples.ssi:185 en/user_examples.ssi:206 en/user_examples.ssi:214
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:76 en/user_installation.ssi:84
+#: en/user_installation.ssi:104 en/user_installation.ssi:118
+#: en/user_installation.ssi:135 en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:36
#: en/user_overview.ssi:80 en/user_overview.ssi:88
@@ -131,13 +133,15 @@ msgstr ""
#: en/user_customization-packages.ssi:277
#: en/user_customization-packages.ssi:287 en/user_examples.ssi:17
#: en/user_examples.ssi:31 en/user_examples.ssi:41 en/user_examples.ssi:55
-#: en/user_examples.ssi:65 en/user_examples.ssi:98 en/user_examples.ssi:114
-#: en/user_examples.ssi:122 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:88 en/user_installation.ssi:108
-#: en/user_installation.ssi:123 en/user_installation.ssi:138
-#: en/user_managing_a_configuration.ssi:31
+#: en/user_examples.ssi:65 en/user_examples.ssi:83 en/user_examples.ssi:98
+#: en/user_examples.ssi:108 en/user_examples.ssi:120 en/user_examples.ssi:132
+#: en/user_examples.ssi:147 en/user_examples.ssi:155 en/user_examples.ssi:163
+#: en/user_examples.ssi:194 en/user_examples.ssi:210 en/user_examples.ssi:218
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:72
+#: en/user_installation.ssi:80 en/user_installation.ssi:88
+#: en/user_installation.ssi:108 en/user_installation.ssi:123
+#: en/user_installation.ssi:138 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:74
#: en/user_overview.ssi:84 en/user_overview.ssi:92
@@ -145,17 +149,15 @@ msgid "}code"
msgstr ""
#. type: Plain text
-#: en/other_customization-bootup.ssi:8 en/other_customization-bootup.ssi:14
-#: en/other_customization-bootup.ssi:56 en/other_customization-bootup.ssi:60
-#: en/other_customization-bootup.ssi:64 en/other_customization-bootup.ssi:68
-#: en/other_live-environment.ssi:8 en/other_resources.ssi:8
-#: en/other_success-stories.ssi:7 en/user_examples.ssi:71
-msgid "FIXME"
+#: en/other_faq.ssi:85 en/other_faq.ssi:247 en/user_examples.ssi:89
+#: en/user_examples.ssi:138 en/user_examples.ssi:187
+msgid "#!/bin/sh"
msgstr ""
#. type: Plain text
-#: en/other_faq.ssi:85 en/other_faq.ssi:247 en/user_examples.ssi:91
-msgid "#!/bin/sh"
+#: en/user_basics.ssi:44 en/user_basics.ssi:120 en/user_basics.ssi:204
+#: en/user_examples.ssi:106 en/user_examples.ssi:153
+msgid "# lb build"
msgstr ""
#. type: Plain text
@@ -296,106 +298,268 @@ msgstr ""
#. type: Plain text
#: en/user_examples.ssi:59
-msgid "Build the image, keeping a log as in {Tutorial 1}#tutorial-1:"
+msgid ""
+"Build the image, again as superuser, keeping a log as in {Tutorial 1}"
+"#tutorial-1:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:63 en/user_examples.ssi:120
+#: en/user_examples.ssi:63 en/user_examples.ssi:216
msgid "# lb build 2>&1 | tee binary.log"
msgstr ""
#. type: Plain text
#: en/user_examples.ssi:67
-msgid "2~tutorial-3 Tutorial 3: A personalized image"
+msgid "Again, verify the image is OK and test, as in {Tutorial 1}#tutorial-1."
msgstr ""
#. type: Plain text
#: en/user_examples.ssi:69
+msgid "2~tutorial-3 Tutorial 3: A personalized image"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:71
#, no-wrap
msgid "*{Use case}* Create a project to build a personalized image, containing your favourite software to take with you on a USB stick wherever you go, and evolving in successive revisions as your needs and preferences change.\n"
msgstr ""
#. type: Plain text
#: en/user_examples.ssi:73
-msgid "2~ A VNC Kiosk Client"
+msgid ""
+"Since we will be changing our personalized image over a number of revisions, "
+"and we want to track those changes, trying things experimentally and "
+"possibly reverting them if things don't work out, we will keep our "
+"configuration in the popular #{git}# version control system. We will also "
+"use the best practice of autoconfiguration via #{auto}# scripts as described "
+"in {Managing a configuration}#managing-a-configuration."
msgstr ""
#. type: Plain text
#: en/user_examples.ssi:75
+msgid "3~ First revision"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:81
+msgid ""
+"$ mkdir -p tutorial3/auto $ cp /usr/share/live/examples/auto/* tutorial3/"
+"auto/ $ cd tutorial3"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:85
+msgid "Edit #{auto/config}# to read as follows:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:96
+#, no-wrap
+msgid ""
+"lb config noauto \\\n"
+" --architecture i386 \\\n"
+" --linux-flavours 686 \\\n"
+" --packages-lists lxde \\\n"
+" --packages \"iceweasel xchat\" \\\n"
+" \"${@}\"\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:100
+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}# 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}#."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:102
+msgid "Now, build the image:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:110
+msgid ""
+"Note that unlike in the first two tutorials, we no longer have to type #"
+"{2>&1 | tee binary.log}# as that is now included in #{auto/build}#."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:112
+msgid ""
+"Once you've tested the image (as in {Tutorial 1}#tutorial-1) and are "
+"satisfied it works, it's time to initialize our #{git}# repository, adding "
+"only the auto scripts we just created, and then make the first commit:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:118
+msgid "$ git init $ git add auto $ git commit -a -m \"Initial import.\""
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:122
+msgid "3~ Second revision"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:124
+msgid ""
+"In this revision, we're going to clean up from the first build, add the #"
+"{vlc}# package to our configuration, rebuild, test and commit."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:126
+msgid ""
+"The #{lb clean}# command will clean up all generated files from the previous "
+"build except for the cache, which saves having to re-download packages. This "
+"ensures that the subsequent #{lb build}# will re-run all stages to "
+"regenerate the files from our new configuration."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:130
+msgid "# lb clean"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:134
+msgid "Now edit #{auto/config}# to add the #{vlc}# package:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:145
+#, no-wrap
+msgid ""
+"lb config noauto \\\n"
+" --architecture i386 \\\n"
+" --linux-flavours 686 \\\n"
+" --packages-lists lxde \\\n"
+" --packages \"iceweasel xchat vlc\" \\\n"
+" \"${@}\"\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:149
+msgid "Build again:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:157
+msgid "Test, and when you're satisfied, commit the next revision:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:161
+msgid "$ git commit -a -m \"Adding vlc media player.\""
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:165
+msgid ""
+"Of course, more complicated changes to the configuration are possible, "
+"perhaps adding files in subdirectories of #{config/}#. When you commit new "
+"revisions, just take care not to hand edit or commit the top-level files in #"
+"{config}# containing #{LB_*}# variables, as these are build products, too, "
+"and are always cleaned up by #{lb clean}# and re-created with #{lb config}# "
+"via their respective #{auto}# scripts."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:167
+msgid ""
+"We've come to the end of our tutorial series. While many more kinds of "
+"customization are possible, even just using the few features explored in "
+"these simple examples, an almost infinite variety of different images can be "
+"created. The remaining examples in this section cover several other use "
+"cases drawn from the collected experiences of users of Debian Live."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:169
+msgid "2~ A VNC Kiosk Client"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:171
msgid "Create an image with live-build to boot directly to a VNC server."
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:77
+#: en/user_examples.ssi:173
msgid "_* Make a build directory: #{$ mkdir vncBuild}#"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:79
+#: en/user_examples.ssi:175
msgid "_* Move to the build directory: #{$ cd vncBuild}#"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:81
+#: en/user_examples.ssi:177
msgid ""
"Example to config the build directory to include gdm metacity "
"xtightvncviewer: #{$ lb config --packages \"gdm3 metacity xtightvncviewer\"}#"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:83
+#: en/user_examples.ssi:179
msgid ""
"Create a folder /etc/skel folder for a custom .xsession for the default "
"user: #{$ mkdir -p config/chroot_local-includes/etc/skel}#"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:85
+#: en/user_examples.ssi:181
msgid ""
"Create the .xsession for the default user: #{$ touch config/chroot_local-"
"includes/etc/skel/.xsession}#"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:87
+#: en/user_examples.ssi:183
msgid ""
"Edit the .xsession file to launch metacity and start xvncviewer with "
"something similar to the below:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:94
+#: en/user_examples.ssi:190
msgid "/usr/bin/metacity & /usr/bin/vncviewer xxx.xxx.xxx.xxx:PORT"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:96
+#: en/user_examples.ssi:192
msgid "exit"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:100
+#: en/user_examples.ssi:196
msgid "_* Build the image: #{# lb build}#"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:102
+#: en/user_examples.ssi:198
msgid "_* Enjoy."
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:104
+#: en/user_examples.ssi:200
msgid "2~ A base image for a 128M USB key"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:106
+#: en/user_examples.ssi:202
#, no-wrap
msgid "*{Use case}* Create a standard image with some components removed in order to fit on a 128M USB key with space left over to use as you see fit.\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:108
+#: en/user_examples.ssi:204
msgid ""
"When optimizing an image to fit a certain media size, you need to understand "
"the tradeoffs you are making between size and functionality. In this "
@@ -409,19 +573,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:112
+#: en/user_examples.ssi:208
msgid ""
"$ lb config -k 486 -p minimal --binary-indices false --memtest none --apt-"
"recommends false --includes none"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:116
+#: en/user_examples.ssi:212
msgid "Now, build the image in the usual way:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:124
+#: en/user_examples.ssi:220
msgid ""
"On the author's system at time of writing, the above configuration produced "
"a 78Mbyte image. This compares favourably with the 166Mbyte image produced "
@@ -429,7 +593,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:126
+#: en/user_examples.ssi:222
msgid ""
"The biggest space-saver here, compared to building a standard image on an #"
"{i386}# architecture system, is to select only the #{486}# kernel flavour "
diff --git a/manual/po/de/user_managing_a_configuration.ssi.po b/manual/po/de/user_managing_a_configuration.ssi.po
index 416e9eb..291ee10 100644
--- a/manual/po/de/user_managing_a_configuration.ssi.po
+++ b/manual/po/de/user_managing_a_configuration.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-28 16:34-0200\n"
+"POT-Creation-Date: 2010-11-27 19:55-0400\n"
"PO-Revision-Date: 2010-10-13 17:00+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -17,9 +17,9 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. type: Plain text
-#: en/about_manual.ssi:80 en/about_manual.ssi:88 en/about_manual.ssi:96
-#: en/about_manual.ssi:108 en/about_manual.ssi:121 en/about_manual.ssi:134
-#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
+#: en/about_manual.ssi:112 en/about_manual.ssi:125 en/about_manual.ssi:138
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
@@ -39,38 +39,43 @@ msgstr ""
#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
-#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
-#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
-#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111
-#: en/project_bugs.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
-#: en/user_basics.ssi:54 en/user_basics.ssi:66 en/user_basics.ssi:78
-#: en/user_basics.ssi:88 en/user_basics.ssi:102 en/user_basics.ssi:110
-#: en/user_basics.ssi:118 en/user_basics.ssi:128 en/user_basics.ssi:140
-#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
-#: en/user_basics.ssi:182 en/user_basics.ssi:190 en/user_basics.ssi:200
-#: en/user_basics.ssi:220 en/user_basics.ssi:253 en/user_basics.ssi:269
-#: en/user_basics.ssi:277 en/user_basics.ssi:297 en/user_basics.ssi:322
-#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
-#: en/user_customization-contents.ssi:66
+#: en/other_procedures.ssi:58 en/project_bugs.ssi:58 en/user_basics.ssi:32
+#: en/user_basics.ssi:42 en/user_basics.ssi:54 en/user_basics.ssi:66
+#: en/user_basics.ssi:78 en/user_basics.ssi:88 en/user_basics.ssi:102
+#: en/user_basics.ssi:110 en/user_basics.ssi:118 en/user_basics.ssi:128
+#: en/user_basics.ssi:142 en/user_basics.ssi:154 en/user_basics.ssi:162
+#: en/user_basics.ssi:170 en/user_basics.ssi:184 en/user_basics.ssi:192
+#: en/user_basics.ssi:202 en/user_basics.ssi:222 en/user_basics.ssi:255
+#: en/user_basics.ssi:271 en/user_basics.ssi:279 en/user_basics.ssi:299
+#: en/user_basics.ssi:324 en/user_customization-contents.ssi:34
+#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
#: en/user_customization-internationalization.ssi:10
#: en/user_customization-internationalization.ssi:18
#: en/user_customization-internationalization.ssi:26
#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
-#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
-#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
-#: en/user_customization-packages.ssi:103
-#: en/user_customization-packages.ssi:111
-#: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:104
-#: en/user_installation.ssi:118 en/user_installation.ssi:135
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
+#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
+#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
+#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:133
+#: en/user_customization-packages.ssi:143
+#: en/user_customization-packages.ssi:153
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:261
+#: en/user_customization-packages.ssi:273
+#: en/user_customization-packages.ssi:283 en/user_examples.ssi:12
+#: en/user_examples.ssi:27 en/user_examples.ssi:37 en/user_examples.ssi:51
+#: en/user_examples.ssi:61 en/user_examples.ssi:77 en/user_examples.ssi:87
+#: en/user_examples.ssi:104 en/user_examples.ssi:114 en/user_examples.ssi:128
+#: en/user_examples.ssi:136 en/user_examples.ssi:151 en/user_examples.ssi:159
+#: en/user_examples.ssi:185 en/user_examples.ssi:206 en/user_examples.ssi:214
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:76 en/user_installation.ssi:84
+#: en/user_installation.ssi:104 en/user_installation.ssi:118
+#: en/user_installation.ssi:135 en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:36
#: en/user_overview.ssi:80 en/user_overview.ssi:88
@@ -78,9 +83,9 @@ msgid "code{"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:121 en/about_manual.ssi:134 en/about_manual.ssi:142
+#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:165
#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
@@ -100,37 +105,43 @@ msgstr ""
#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
-#: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
-#: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
-#: en/other_use-cases.ssi:137 en/project_bugs.ssi:62 en/user_basics.ssi:36
-#: en/user_basics.ssi:46 en/user_basics.ssi:60 en/user_basics.ssi:72
-#: en/user_basics.ssi:82 en/user_basics.ssi:94 en/user_basics.ssi:106
-#: en/user_basics.ssi:114 en/user_basics.ssi:122 en/user_basics.ssi:132
-#: en/user_basics.ssi:146 en/user_basics.ssi:156 en/user_basics.ssi:164
-#: en/user_basics.ssi:172 en/user_basics.ssi:186 en/user_basics.ssi:194
-#: en/user_basics.ssi:204 en/user_basics.ssi:245 en/user_basics.ssi:257
-#: en/user_basics.ssi:273 en/user_basics.ssi:281 en/user_basics.ssi:308
-#: en/user_basics.ssi:347 en/user_customization-contents.ssi:39
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
+#: en/project_bugs.ssi:62 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:60 en/user_basics.ssi:72 en/user_basics.ssi:82
+#: en/user_basics.ssi:94 en/user_basics.ssi:106 en/user_basics.ssi:114
+#: en/user_basics.ssi:122 en/user_basics.ssi:132 en/user_basics.ssi:148
+#: en/user_basics.ssi:158 en/user_basics.ssi:166 en/user_basics.ssi:174
+#: en/user_basics.ssi:188 en/user_basics.ssi:196 en/user_basics.ssi:206
+#: en/user_basics.ssi:247 en/user_basics.ssi:259 en/user_basics.ssi:275
+#: en/user_basics.ssi:283 en/user_basics.ssi:310 en/user_basics.ssi:349
+#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:70
#: en/user_customization-internationalization.ssi:14
#: en/user_customization-internationalization.ssi:22
#: en/user_customization-internationalization.ssi:30
#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
-#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
-#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
-#: en/user_customization-packages.ssi:107
-#: en/user_customization-packages.ssi:115
-#: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:172
-#: en/user_customization-packages.ssi:182
-#: en/user_customization-packages.ssi:192
-#: en/user_customization-packages.ssi:202 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:88 en/user_installation.ssi:108
-#: en/user_installation.ssi:123 en/user_installation.ssi:138
-#: en/user_managing_a_configuration.ssi:31
+#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
+#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
+#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
+#: en/user_customization-packages.ssi:125
+#: en/user_customization-packages.ssi:139
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:159
+#: en/user_customization-packages.ssi:169
+#: en/user_customization-packages.ssi:181
+#: en/user_customization-packages.ssi:197
+#: en/user_customization-packages.ssi:265
+#: en/user_customization-packages.ssi:277
+#: en/user_customization-packages.ssi:287 en/user_examples.ssi:17
+#: en/user_examples.ssi:31 en/user_examples.ssi:41 en/user_examples.ssi:55
+#: en/user_examples.ssi:65 en/user_examples.ssi:83 en/user_examples.ssi:98
+#: en/user_examples.ssi:108 en/user_examples.ssi:120 en/user_examples.ssi:132
+#: en/user_examples.ssi:147 en/user_examples.ssi:155 en/user_examples.ssi:163
+#: en/user_examples.ssi:194 en/user_examples.ssi:210 en/user_examples.ssi:218
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:72
+#: en/user_installation.ssi:80 en/user_installation.ssi:88
+#: en/user_installation.ssi:108 en/user_installation.ssi:123
+#: en/user_installation.ssi:138 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:74
#: en/user_overview.ssi:84 en/user_overview.ssi:92
@@ -229,8 +240,8 @@ msgstr ""
msgid ""
"#!/bin/sh\n"
"lb config noauto \\\n"
-"\t--architecture i386 \\\n"
-"\t${@}\n"
+"\t--packages-lists \"standard\" \\\n"
+"\t\"${@}\"\n"
msgstr ""
#. type: Plain text
@@ -243,7 +254,7 @@ msgstr ""
#, no-wrap
msgid ""
"#!/bin/sh\n"
-"lb clean noauto ${@}\n"
+"lb clean noauto \"${@}\"\n"
"rm -f config/binary config/bootstrap \\\n"
"\tconfig/chroot config/common config/source\n"
"rm -f binary.log\n"
@@ -256,16 +267,15 @@ msgstr ""
#. type: Plain text
#: en/user_managing_a_configuration.ssi:50
-msgid "#!/bin/sh lb build noauto ${@} 2>&1 | tee binary.log"
+msgid "#!/bin/sh lb build noauto \"${@}\" 2>&1 | tee binary.log"
msgstr ""
#. type: Plain text
#: en/user_managing_a_configuration.ssi:54
msgid ""
-"Edit auto/config, changing or adding any options as you see fit. In the "
-"example above, --architecture is set to i386 so that when the image is built "
-"on an amd64 system, it will not default to building amd64 images. Change "
-"this to an appropriate value for your image (or delete it if you want to use "
-"the default) and add any additional options in continuation lines that "
-"follow."
+"Edit #{auto/config}#, changing or adding any options as you see fit. In the "
+"example above, #{--packages-lists standard}# is set to the default value. "
+"Change this to an appropriate value for your image (or delete it if you want "
+"to use the default) and add any additional options in continuation lines "
+"that follow."
msgstr ""
diff --git a/manual/po/fr/user_examples.ssi.po b/manual/po/fr/user_examples.ssi.po
index be7ad81..ca00f94 100644
--- a/manual/po/fr/user_examples.ssi.po
+++ b/manual/po/fr/user_examples.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-11-27 12:48-0400\n"
+"POT-Creation-Date: 2010-11-27 19:55-0400\n"
"PO-Revision-Date: 2010-11-04 16:34-0400\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -67,13 +67,15 @@ msgstr ""
#: en/user_customization-packages.ssi:273
#: en/user_customization-packages.ssi:283 en/user_examples.ssi:12
#: en/user_examples.ssi:27 en/user_examples.ssi:37 en/user_examples.ssi:51
-#: en/user_examples.ssi:61 en/user_examples.ssi:89 en/user_examples.ssi:110
-#: en/user_examples.ssi:118 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:104
-#: en/user_installation.ssi:118 en/user_installation.ssi:135
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_examples.ssi:61 en/user_examples.ssi:77 en/user_examples.ssi:87
+#: en/user_examples.ssi:104 en/user_examples.ssi:114 en/user_examples.ssi:128
+#: en/user_examples.ssi:136 en/user_examples.ssi:151 en/user_examples.ssi:159
+#: en/user_examples.ssi:185 en/user_examples.ssi:206 en/user_examples.ssi:214
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:76 en/user_installation.ssi:84
+#: en/user_installation.ssi:104 en/user_installation.ssi:118
+#: en/user_installation.ssi:135 en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:36
#: en/user_overview.ssi:80 en/user_overview.ssi:88
@@ -131,13 +133,15 @@ msgstr "code{"
#: en/user_customization-packages.ssi:277
#: en/user_customization-packages.ssi:287 en/user_examples.ssi:17
#: en/user_examples.ssi:31 en/user_examples.ssi:41 en/user_examples.ssi:55
-#: en/user_examples.ssi:65 en/user_examples.ssi:98 en/user_examples.ssi:114
-#: en/user_examples.ssi:122 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:88 en/user_installation.ssi:108
-#: en/user_installation.ssi:123 en/user_installation.ssi:138
-#: en/user_managing_a_configuration.ssi:31
+#: en/user_examples.ssi:65 en/user_examples.ssi:83 en/user_examples.ssi:98
+#: en/user_examples.ssi:108 en/user_examples.ssi:120 en/user_examples.ssi:132
+#: en/user_examples.ssi:147 en/user_examples.ssi:155 en/user_examples.ssi:163
+#: en/user_examples.ssi:194 en/user_examples.ssi:210 en/user_examples.ssi:218
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:72
+#: en/user_installation.ssi:80 en/user_installation.ssi:88
+#: en/user_installation.ssi:108 en/user_installation.ssi:123
+#: en/user_installation.ssi:138 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:74
#: en/user_overview.ssi:84 en/user_overview.ssi:92
@@ -145,17 +149,15 @@ msgid "}code"
msgstr "}code"
#. type: Plain text
-#: en/other_customization-bootup.ssi:8 en/other_customization-bootup.ssi:14
-#: en/other_customization-bootup.ssi:56 en/other_customization-bootup.ssi:60
-#: en/other_customization-bootup.ssi:64 en/other_customization-bootup.ssi:68
-#: en/other_live-environment.ssi:8 en/other_resources.ssi:8
-#: en/other_success-stories.ssi:7 en/user_examples.ssi:71
-msgid "FIXME"
+#: en/other_faq.ssi:85 en/other_faq.ssi:247 en/user_examples.ssi:89
+#: en/user_examples.ssi:138 en/user_examples.ssi:187
+msgid "#!/bin/sh"
msgstr ""
#. type: Plain text
-#: en/other_faq.ssi:85 en/other_faq.ssi:247 en/user_examples.ssi:91
-msgid "#!/bin/sh"
+#: en/user_basics.ssi:44 en/user_basics.ssi:120 en/user_basics.ssi:204
+#: en/user_examples.ssi:106 en/user_examples.ssi:153
+msgid "# lb build"
msgstr ""
#. type: Plain text
@@ -296,106 +298,268 @@ msgstr ""
#. type: Plain text
#: en/user_examples.ssi:59
-msgid "Build the image, keeping a log as in {Tutorial 1}#tutorial-1:"
+msgid ""
+"Build the image, again as superuser, keeping a log as in {Tutorial 1}"
+"#tutorial-1:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:63 en/user_examples.ssi:120
+#: en/user_examples.ssi:63 en/user_examples.ssi:216
msgid "# lb build 2>&1 | tee binary.log"
msgstr ""
#. type: Plain text
#: en/user_examples.ssi:67
-msgid "2~tutorial-3 Tutorial 3: A personalized image"
+msgid "Again, verify the image is OK and test, as in {Tutorial 1}#tutorial-1."
msgstr ""
#. type: Plain text
#: en/user_examples.ssi:69
+msgid "2~tutorial-3 Tutorial 3: A personalized image"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:71
#, no-wrap
msgid "*{Use case}* Create a project to build a personalized image, containing your favourite software to take with you on a USB stick wherever you go, and evolving in successive revisions as your needs and preferences change.\n"
msgstr ""
#. type: Plain text
#: en/user_examples.ssi:73
-msgid "2~ A VNC Kiosk Client"
+msgid ""
+"Since we will be changing our personalized image over a number of revisions, "
+"and we want to track those changes, trying things experimentally and "
+"possibly reverting them if things don't work out, we will keep our "
+"configuration in the popular #{git}# version control system. We will also "
+"use the best practice of autoconfiguration via #{auto}# scripts as described "
+"in {Managing a configuration}#managing-a-configuration."
msgstr ""
#. type: Plain text
#: en/user_examples.ssi:75
+msgid "3~ First revision"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:81
+msgid ""
+"$ mkdir -p tutorial3/auto $ cp /usr/share/live/examples/auto/* tutorial3/"
+"auto/ $ cd tutorial3"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:85
+msgid "Edit #{auto/config}# to read as follows:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:96
+#, no-wrap
+msgid ""
+"lb config noauto \\\n"
+" --architecture i386 \\\n"
+" --linux-flavours 686 \\\n"
+" --packages-lists lxde \\\n"
+" --packages \"iceweasel xchat\" \\\n"
+" \"${@}\"\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:100
+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}# 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}#."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:102
+msgid "Now, build the image:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:110
+msgid ""
+"Note that unlike in the first two tutorials, we no longer have to type #"
+"{2>&1 | tee binary.log}# as that is now included in #{auto/build}#."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:112
+msgid ""
+"Once you've tested the image (as in {Tutorial 1}#tutorial-1) and are "
+"satisfied it works, it's time to initialize our #{git}# repository, adding "
+"only the auto scripts we just created, and then make the first commit:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:118
+msgid "$ git init $ git add auto $ git commit -a -m \"Initial import.\""
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:122
+msgid "3~ Second revision"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:124
+msgid ""
+"In this revision, we're going to clean up from the first build, add the #"
+"{vlc}# package to our configuration, rebuild, test and commit."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:126
+msgid ""
+"The #{lb clean}# command will clean up all generated files from the previous "
+"build except for the cache, which saves having to re-download packages. This "
+"ensures that the subsequent #{lb build}# will re-run all stages to "
+"regenerate the files from our new configuration."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:130
+msgid "# lb clean"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:134
+msgid "Now edit #{auto/config}# to add the #{vlc}# package:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:145
+#, no-wrap
+msgid ""
+"lb config noauto \\\n"
+" --architecture i386 \\\n"
+" --linux-flavours 686 \\\n"
+" --packages-lists lxde \\\n"
+" --packages \"iceweasel xchat vlc\" \\\n"
+" \"${@}\"\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:149
+msgid "Build again:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:157
+msgid "Test, and when you're satisfied, commit the next revision:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:161
+msgid "$ git commit -a -m \"Adding vlc media player.\""
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:165
+msgid ""
+"Of course, more complicated changes to the configuration are possible, "
+"perhaps adding files in subdirectories of #{config/}#. When you commit new "
+"revisions, just take care not to hand edit or commit the top-level files in #"
+"{config}# containing #{LB_*}# variables, as these are build products, too, "
+"and are always cleaned up by #{lb clean}# and re-created with #{lb config}# "
+"via their respective #{auto}# scripts."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:167
+msgid ""
+"We've come to the end of our tutorial series. While many more kinds of "
+"customization are possible, even just using the few features explored in "
+"these simple examples, an almost infinite variety of different images can be "
+"created. The remaining examples in this section cover several other use "
+"cases drawn from the collected experiences of users of Debian Live."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:169
+msgid "2~ A VNC Kiosk Client"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:171
msgid "Create an image with live-build to boot directly to a VNC server."
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:77
+#: en/user_examples.ssi:173
msgid "_* Make a build directory: #{$ mkdir vncBuild}#"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:79
+#: en/user_examples.ssi:175
msgid "_* Move to the build directory: #{$ cd vncBuild}#"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:81
+#: en/user_examples.ssi:177
msgid ""
"Example to config the build directory to include gdm metacity "
"xtightvncviewer: #{$ lb config --packages \"gdm3 metacity xtightvncviewer\"}#"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:83
+#: en/user_examples.ssi:179
msgid ""
"Create a folder /etc/skel folder for a custom .xsession for the default "
"user: #{$ mkdir -p config/chroot_local-includes/etc/skel}#"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:85
+#: en/user_examples.ssi:181
msgid ""
"Create the .xsession for the default user: #{$ touch config/chroot_local-"
"includes/etc/skel/.xsession}#"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:87
+#: en/user_examples.ssi:183
msgid ""
"Edit the .xsession file to launch metacity and start xvncviewer with "
"something similar to the below:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:94
+#: en/user_examples.ssi:190
msgid "/usr/bin/metacity & /usr/bin/vncviewer xxx.xxx.xxx.xxx:PORT"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:96
+#: en/user_examples.ssi:192
msgid "exit"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:100
+#: en/user_examples.ssi:196
msgid "_* Build the image: #{# lb build}#"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:102
+#: en/user_examples.ssi:198
msgid "_* Enjoy."
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:104
+#: en/user_examples.ssi:200
msgid "2~ A base image for a 128M USB key"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:106
+#: en/user_examples.ssi:202
#, no-wrap
msgid "*{Use case}* Create a standard image with some components removed in order to fit on a 128M USB key with space left over to use as you see fit.\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:108
+#: en/user_examples.ssi:204
msgid ""
"When optimizing an image to fit a certain media size, you need to understand "
"the tradeoffs you are making between size and functionality. In this "
@@ -409,19 +573,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:112
+#: en/user_examples.ssi:208
msgid ""
"$ lb config -k 486 -p minimal --binary-indices false --memtest none --apt-"
"recommends false --includes none"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:116
+#: en/user_examples.ssi:212
msgid "Now, build the image in the usual way:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:124
+#: en/user_examples.ssi:220
msgid ""
"On the author's system at time of writing, the above configuration produced "
"a 78Mbyte image. This compares favourably with the 166Mbyte image produced "
@@ -429,7 +593,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:126
+#: en/user_examples.ssi:222
msgid ""
"The biggest space-saver here, compared to building a standard image on an #"
"{i386}# architecture system, is to select only the #{486}# kernel flavour "
diff --git a/manual/po/fr/user_managing_a_configuration.ssi.po b/manual/po/fr/user_managing_a_configuration.ssi.po
index a2ca66a..f3c43e2 100644
--- a/manual/po/fr/user_managing_a_configuration.ssi.po
+++ b/manual/po/fr/user_managing_a_configuration.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-28 16:34-0200\n"
+"POT-Creation-Date: 2010-11-27 19:55-0400\n"
"PO-Revision-Date: 2010-10-13 17:00+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -17,9 +17,9 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#. type: Plain text
-#: en/about_manual.ssi:80 en/about_manual.ssi:88 en/about_manual.ssi:96
-#: en/about_manual.ssi:108 en/about_manual.ssi:121 en/about_manual.ssi:134
-#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
+#: en/about_manual.ssi:112 en/about_manual.ssi:125 en/about_manual.ssi:138
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
@@ -39,38 +39,43 @@ msgstr ""
#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
-#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
-#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
-#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111
-#: en/project_bugs.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
-#: en/user_basics.ssi:54 en/user_basics.ssi:66 en/user_basics.ssi:78
-#: en/user_basics.ssi:88 en/user_basics.ssi:102 en/user_basics.ssi:110
-#: en/user_basics.ssi:118 en/user_basics.ssi:128 en/user_basics.ssi:140
-#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
-#: en/user_basics.ssi:182 en/user_basics.ssi:190 en/user_basics.ssi:200
-#: en/user_basics.ssi:220 en/user_basics.ssi:253 en/user_basics.ssi:269
-#: en/user_basics.ssi:277 en/user_basics.ssi:297 en/user_basics.ssi:322
-#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
-#: en/user_customization-contents.ssi:66
+#: en/other_procedures.ssi:58 en/project_bugs.ssi:58 en/user_basics.ssi:32
+#: en/user_basics.ssi:42 en/user_basics.ssi:54 en/user_basics.ssi:66
+#: en/user_basics.ssi:78 en/user_basics.ssi:88 en/user_basics.ssi:102
+#: en/user_basics.ssi:110 en/user_basics.ssi:118 en/user_basics.ssi:128
+#: en/user_basics.ssi:142 en/user_basics.ssi:154 en/user_basics.ssi:162
+#: en/user_basics.ssi:170 en/user_basics.ssi:184 en/user_basics.ssi:192
+#: en/user_basics.ssi:202 en/user_basics.ssi:222 en/user_basics.ssi:255
+#: en/user_basics.ssi:271 en/user_basics.ssi:279 en/user_basics.ssi:299
+#: en/user_basics.ssi:324 en/user_customization-contents.ssi:34
+#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
#: en/user_customization-internationalization.ssi:10
#: en/user_customization-internationalization.ssi:18
#: en/user_customization-internationalization.ssi:26
#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
-#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
-#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
-#: en/user_customization-packages.ssi:103
-#: en/user_customization-packages.ssi:111
-#: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:104
-#: en/user_installation.ssi:118 en/user_installation.ssi:135
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
+#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
+#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
+#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:133
+#: en/user_customization-packages.ssi:143
+#: en/user_customization-packages.ssi:153
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:261
+#: en/user_customization-packages.ssi:273
+#: en/user_customization-packages.ssi:283 en/user_examples.ssi:12
+#: en/user_examples.ssi:27 en/user_examples.ssi:37 en/user_examples.ssi:51
+#: en/user_examples.ssi:61 en/user_examples.ssi:77 en/user_examples.ssi:87
+#: en/user_examples.ssi:104 en/user_examples.ssi:114 en/user_examples.ssi:128
+#: en/user_examples.ssi:136 en/user_examples.ssi:151 en/user_examples.ssi:159
+#: en/user_examples.ssi:185 en/user_examples.ssi:206 en/user_examples.ssi:214
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:76 en/user_installation.ssi:84
+#: en/user_installation.ssi:104 en/user_installation.ssi:118
+#: en/user_installation.ssi:135 en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:36
#: en/user_overview.ssi:80 en/user_overview.ssi:88
@@ -78,9 +83,9 @@ msgid "code{"
msgstr "code{"
#. type: Plain text
-#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:121 en/about_manual.ssi:134 en/about_manual.ssi:142
+#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:165
#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
@@ -100,37 +105,43 @@ msgstr "code{"
#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
-#: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
-#: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
-#: en/other_use-cases.ssi:137 en/project_bugs.ssi:62 en/user_basics.ssi:36
-#: en/user_basics.ssi:46 en/user_basics.ssi:60 en/user_basics.ssi:72
-#: en/user_basics.ssi:82 en/user_basics.ssi:94 en/user_basics.ssi:106
-#: en/user_basics.ssi:114 en/user_basics.ssi:122 en/user_basics.ssi:132
-#: en/user_basics.ssi:146 en/user_basics.ssi:156 en/user_basics.ssi:164
-#: en/user_basics.ssi:172 en/user_basics.ssi:186 en/user_basics.ssi:194
-#: en/user_basics.ssi:204 en/user_basics.ssi:245 en/user_basics.ssi:257
-#: en/user_basics.ssi:273 en/user_basics.ssi:281 en/user_basics.ssi:308
-#: en/user_basics.ssi:347 en/user_customization-contents.ssi:39
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
+#: en/project_bugs.ssi:62 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:60 en/user_basics.ssi:72 en/user_basics.ssi:82
+#: en/user_basics.ssi:94 en/user_basics.ssi:106 en/user_basics.ssi:114
+#: en/user_basics.ssi:122 en/user_basics.ssi:132 en/user_basics.ssi:148
+#: en/user_basics.ssi:158 en/user_basics.ssi:166 en/user_basics.ssi:174
+#: en/user_basics.ssi:188 en/user_basics.ssi:196 en/user_basics.ssi:206
+#: en/user_basics.ssi:247 en/user_basics.ssi:259 en/user_basics.ssi:275
+#: en/user_basics.ssi:283 en/user_basics.ssi:310 en/user_basics.ssi:349
+#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:70
#: en/user_customization-internationalization.ssi:14
#: en/user_customization-internationalization.ssi:22
#: en/user_customization-internationalization.ssi:30
#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
-#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
-#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
-#: en/user_customization-packages.ssi:107
-#: en/user_customization-packages.ssi:115
-#: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:172
-#: en/user_customization-packages.ssi:182
-#: en/user_customization-packages.ssi:192
-#: en/user_customization-packages.ssi:202 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:88 en/user_installation.ssi:108
-#: en/user_installation.ssi:123 en/user_installation.ssi:138
-#: en/user_managing_a_configuration.ssi:31
+#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
+#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
+#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
+#: en/user_customization-packages.ssi:125
+#: en/user_customization-packages.ssi:139
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:159
+#: en/user_customization-packages.ssi:169
+#: en/user_customization-packages.ssi:181
+#: en/user_customization-packages.ssi:197
+#: en/user_customization-packages.ssi:265
+#: en/user_customization-packages.ssi:277
+#: en/user_customization-packages.ssi:287 en/user_examples.ssi:17
+#: en/user_examples.ssi:31 en/user_examples.ssi:41 en/user_examples.ssi:55
+#: en/user_examples.ssi:65 en/user_examples.ssi:83 en/user_examples.ssi:98
+#: en/user_examples.ssi:108 en/user_examples.ssi:120 en/user_examples.ssi:132
+#: en/user_examples.ssi:147 en/user_examples.ssi:155 en/user_examples.ssi:163
+#: en/user_examples.ssi:194 en/user_examples.ssi:210 en/user_examples.ssi:218
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:72
+#: en/user_installation.ssi:80 en/user_installation.ssi:88
+#: en/user_installation.ssi:108 en/user_installation.ssi:123
+#: en/user_installation.ssi:138 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:74
#: en/user_overview.ssi:84 en/user_overview.ssi:92
@@ -229,8 +240,8 @@ msgstr ""
msgid ""
"#!/bin/sh\n"
"lb config noauto \\\n"
-"\t--architecture i386 \\\n"
-"\t${@}\n"
+"\t--packages-lists \"standard\" \\\n"
+"\t\"${@}\"\n"
msgstr ""
#. type: Plain text
@@ -243,7 +254,7 @@ msgstr ""
#, no-wrap
msgid ""
"#!/bin/sh\n"
-"lb clean noauto ${@}\n"
+"lb clean noauto \"${@}\"\n"
"rm -f config/binary config/bootstrap \\\n"
"\tconfig/chroot config/common config/source\n"
"rm -f binary.log\n"
@@ -256,16 +267,15 @@ msgstr ""
#. type: Plain text
#: en/user_managing_a_configuration.ssi:50
-msgid "#!/bin/sh lb build noauto ${@} 2>&1 | tee binary.log"
+msgid "#!/bin/sh lb build noauto \"${@}\" 2>&1 | tee binary.log"
msgstr ""
#. type: Plain text
#: en/user_managing_a_configuration.ssi:54
msgid ""
-"Edit auto/config, changing or adding any options as you see fit. In the "
-"example above, --architecture is set to i386 so that when the image is built "
-"on an amd64 system, it will not default to building amd64 images. Change "
-"this to an appropriate value for your image (or delete it if you want to use "
-"the default) and add any additional options in continuation lines that "
-"follow."
+"Edit #{auto/config}#, changing or adding any options as you see fit. In the "
+"example above, #{--packages-lists standard}# is set to the default value. "
+"Change this to an appropriate value for your image (or delete it if you want "
+"to use the default) and add any additional options in continuation lines "
+"that follow."
msgstr ""
diff --git a/manual/po/pt_BR/user_examples.ssi.po b/manual/po/pt_BR/user_examples.ssi.po
index 138b81e..5139267 100644
--- a/manual/po/pt_BR/user_examples.ssi.po
+++ b/manual/po/pt_BR/user_examples.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-11-27 12:48-0400\n"
+"POT-Creation-Date: 2010-11-27 19:55-0400\n"
"PO-Revision-Date: 2010-11-04 16:34-0400\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -67,13 +67,15 @@ msgstr ""
#: en/user_customization-packages.ssi:273
#: en/user_customization-packages.ssi:283 en/user_examples.ssi:12
#: en/user_examples.ssi:27 en/user_examples.ssi:37 en/user_examples.ssi:51
-#: en/user_examples.ssi:61 en/user_examples.ssi:89 en/user_examples.ssi:110
-#: en/user_examples.ssi:118 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:104
-#: en/user_installation.ssi:118 en/user_installation.ssi:135
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_examples.ssi:61 en/user_examples.ssi:77 en/user_examples.ssi:87
+#: en/user_examples.ssi:104 en/user_examples.ssi:114 en/user_examples.ssi:128
+#: en/user_examples.ssi:136 en/user_examples.ssi:151 en/user_examples.ssi:159
+#: en/user_examples.ssi:185 en/user_examples.ssi:206 en/user_examples.ssi:214
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:76 en/user_installation.ssi:84
+#: en/user_installation.ssi:104 en/user_installation.ssi:118
+#: en/user_installation.ssi:135 en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:36
#: en/user_overview.ssi:80 en/user_overview.ssi:88
@@ -131,13 +133,15 @@ msgstr "code{"
#: en/user_customization-packages.ssi:277
#: en/user_customization-packages.ssi:287 en/user_examples.ssi:17
#: en/user_examples.ssi:31 en/user_examples.ssi:41 en/user_examples.ssi:55
-#: en/user_examples.ssi:65 en/user_examples.ssi:98 en/user_examples.ssi:114
-#: en/user_examples.ssi:122 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:88 en/user_installation.ssi:108
-#: en/user_installation.ssi:123 en/user_installation.ssi:138
-#: en/user_managing_a_configuration.ssi:31
+#: en/user_examples.ssi:65 en/user_examples.ssi:83 en/user_examples.ssi:98
+#: en/user_examples.ssi:108 en/user_examples.ssi:120 en/user_examples.ssi:132
+#: en/user_examples.ssi:147 en/user_examples.ssi:155 en/user_examples.ssi:163
+#: en/user_examples.ssi:194 en/user_examples.ssi:210 en/user_examples.ssi:218
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:72
+#: en/user_installation.ssi:80 en/user_installation.ssi:88
+#: en/user_installation.ssi:108 en/user_installation.ssi:123
+#: en/user_installation.ssi:138 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:74
#: en/user_overview.ssi:84 en/user_overview.ssi:92
@@ -145,17 +149,15 @@ msgid "}code"
msgstr "}code"
#. type: Plain text
-#: en/other_customization-bootup.ssi:8 en/other_customization-bootup.ssi:14
-#: en/other_customization-bootup.ssi:56 en/other_customization-bootup.ssi:60
-#: en/other_customization-bootup.ssi:64 en/other_customization-bootup.ssi:68
-#: en/other_live-environment.ssi:8 en/other_resources.ssi:8
-#: en/other_success-stories.ssi:7 en/user_examples.ssi:71
-msgid "FIXME"
+#: en/other_faq.ssi:85 en/other_faq.ssi:247 en/user_examples.ssi:89
+#: en/user_examples.ssi:138 en/user_examples.ssi:187
+msgid "#!/bin/sh"
msgstr ""
#. type: Plain text
-#: en/other_faq.ssi:85 en/other_faq.ssi:247 en/user_examples.ssi:91
-msgid "#!/bin/sh"
+#: en/user_basics.ssi:44 en/user_basics.ssi:120 en/user_basics.ssi:204
+#: en/user_examples.ssi:106 en/user_examples.ssi:153
+msgid "# lb build"
msgstr ""
#. type: Plain text
@@ -296,106 +298,268 @@ msgstr ""
#. type: Plain text
#: en/user_examples.ssi:59
-msgid "Build the image, keeping a log as in {Tutorial 1}#tutorial-1:"
+msgid ""
+"Build the image, again as superuser, keeping a log as in {Tutorial 1}"
+"#tutorial-1:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:63 en/user_examples.ssi:120
+#: en/user_examples.ssi:63 en/user_examples.ssi:216
msgid "# lb build 2>&1 | tee binary.log"
msgstr ""
#. type: Plain text
#: en/user_examples.ssi:67
-msgid "2~tutorial-3 Tutorial 3: A personalized image"
+msgid "Again, verify the image is OK and test, as in {Tutorial 1}#tutorial-1."
msgstr ""
#. type: Plain text
#: en/user_examples.ssi:69
+msgid "2~tutorial-3 Tutorial 3: A personalized image"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:71
#, no-wrap
msgid "*{Use case}* Create a project to build a personalized image, containing your favourite software to take with you on a USB stick wherever you go, and evolving in successive revisions as your needs and preferences change.\n"
msgstr ""
#. type: Plain text
#: en/user_examples.ssi:73
-msgid "2~ A VNC Kiosk Client"
+msgid ""
+"Since we will be changing our personalized image over a number of revisions, "
+"and we want to track those changes, trying things experimentally and "
+"possibly reverting them if things don't work out, we will keep our "
+"configuration in the popular #{git}# version control system. We will also "
+"use the best practice of autoconfiguration via #{auto}# scripts as described "
+"in {Managing a configuration}#managing-a-configuration."
msgstr ""
#. type: Plain text
#: en/user_examples.ssi:75
+msgid "3~ First revision"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:81
+msgid ""
+"$ mkdir -p tutorial3/auto $ cp /usr/share/live/examples/auto/* tutorial3/"
+"auto/ $ cd tutorial3"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:85
+msgid "Edit #{auto/config}# to read as follows:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:96
+#, no-wrap
+msgid ""
+"lb config noauto \\\n"
+" --architecture i386 \\\n"
+" --linux-flavours 686 \\\n"
+" --packages-lists lxde \\\n"
+" --packages \"iceweasel xchat\" \\\n"
+" \"${@}\"\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:100
+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}# 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}#."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:102
+msgid "Now, build the image:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:110
+msgid ""
+"Note that unlike in the first two tutorials, we no longer have to type #"
+"{2>&1 | tee binary.log}# as that is now included in #{auto/build}#."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:112
+msgid ""
+"Once you've tested the image (as in {Tutorial 1}#tutorial-1) and are "
+"satisfied it works, it's time to initialize our #{git}# repository, adding "
+"only the auto scripts we just created, and then make the first commit:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:118
+msgid "$ git init $ git add auto $ git commit -a -m \"Initial import.\""
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:122
+msgid "3~ Second revision"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:124
+msgid ""
+"In this revision, we're going to clean up from the first build, add the #"
+"{vlc}# package to our configuration, rebuild, test and commit."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:126
+msgid ""
+"The #{lb clean}# command will clean up all generated files from the previous "
+"build except for the cache, which saves having to re-download packages. This "
+"ensures that the subsequent #{lb build}# will re-run all stages to "
+"regenerate the files from our new configuration."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:130
+msgid "# lb clean"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:134
+msgid "Now edit #{auto/config}# to add the #{vlc}# package:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:145
+#, no-wrap
+msgid ""
+"lb config noauto \\\n"
+" --architecture i386 \\\n"
+" --linux-flavours 686 \\\n"
+" --packages-lists lxde \\\n"
+" --packages \"iceweasel xchat vlc\" \\\n"
+" \"${@}\"\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:149
+msgid "Build again:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:157
+msgid "Test, and when you're satisfied, commit the next revision:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:161
+msgid "$ git commit -a -m \"Adding vlc media player.\""
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:165
+msgid ""
+"Of course, more complicated changes to the configuration are possible, "
+"perhaps adding files in subdirectories of #{config/}#. When you commit new "
+"revisions, just take care not to hand edit or commit the top-level files in #"
+"{config}# containing #{LB_*}# variables, as these are build products, too, "
+"and are always cleaned up by #{lb clean}# and re-created with #{lb config}# "
+"via their respective #{auto}# scripts."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:167
+msgid ""
+"We've come to the end of our tutorial series. While many more kinds of "
+"customization are possible, even just using the few features explored in "
+"these simple examples, an almost infinite variety of different images can be "
+"created. The remaining examples in this section cover several other use "
+"cases drawn from the collected experiences of users of Debian Live."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:169
+msgid "2~ A VNC Kiosk Client"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:171
msgid "Create an image with live-build to boot directly to a VNC server."
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:77
+#: en/user_examples.ssi:173
msgid "_* Make a build directory: #{$ mkdir vncBuild}#"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:79
+#: en/user_examples.ssi:175
msgid "_* Move to the build directory: #{$ cd vncBuild}#"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:81
+#: en/user_examples.ssi:177
msgid ""
"Example to config the build directory to include gdm metacity "
"xtightvncviewer: #{$ lb config --packages \"gdm3 metacity xtightvncviewer\"}#"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:83
+#: en/user_examples.ssi:179
msgid ""
"Create a folder /etc/skel folder for a custom .xsession for the default "
"user: #{$ mkdir -p config/chroot_local-includes/etc/skel}#"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:85
+#: en/user_examples.ssi:181
msgid ""
"Create the .xsession for the default user: #{$ touch config/chroot_local-"
"includes/etc/skel/.xsession}#"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:87
+#: en/user_examples.ssi:183
msgid ""
"Edit the .xsession file to launch metacity and start xvncviewer with "
"something similar to the below:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:94
+#: en/user_examples.ssi:190
msgid "/usr/bin/metacity & /usr/bin/vncviewer xxx.xxx.xxx.xxx:PORT"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:96
+#: en/user_examples.ssi:192
msgid "exit"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:100
+#: en/user_examples.ssi:196
msgid "_* Build the image: #{# lb build}#"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:102
+#: en/user_examples.ssi:198
msgid "_* Enjoy."
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:104
+#: en/user_examples.ssi:200
msgid "2~ A base image for a 128M USB key"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:106
+#: en/user_examples.ssi:202
#, no-wrap
msgid "*{Use case}* Create a standard image with some components removed in order to fit on a 128M USB key with space left over to use as you see fit.\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:108
+#: en/user_examples.ssi:204
msgid ""
"When optimizing an image to fit a certain media size, you need to understand "
"the tradeoffs you are making between size and functionality. In this "
@@ -409,19 +573,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:112
+#: en/user_examples.ssi:208
msgid ""
"$ lb config -k 486 -p minimal --binary-indices false --memtest none --apt-"
"recommends false --includes none"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:116
+#: en/user_examples.ssi:212
msgid "Now, build the image in the usual way:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:124
+#: en/user_examples.ssi:220
msgid ""
"On the author's system at time of writing, the above configuration produced "
"a 78Mbyte image. This compares favourably with the 166Mbyte image produced "
@@ -429,7 +593,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:126
+#: en/user_examples.ssi:222
msgid ""
"The biggest space-saver here, compared to building a standard image on an #"
"{i386}# architecture system, is to select only the #{486}# kernel flavour "
diff --git a/manual/po/pt_BR/user_managing_a_configuration.ssi.po b/manual/po/pt_BR/user_managing_a_configuration.ssi.po
index dc370cb..5bf2c97 100644
--- a/manual/po/pt_BR/user_managing_a_configuration.ssi.po
+++ b/manual/po/pt_BR/user_managing_a_configuration.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-28 16:34-0200\n"
+"POT-Creation-Date: 2010-11-27 19:55-0400\n"
"PO-Revision-Date: 2010-10-13 17:00+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -17,9 +17,9 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#. type: Plain text
-#: en/about_manual.ssi:80 en/about_manual.ssi:88 en/about_manual.ssi:96
-#: en/about_manual.ssi:108 en/about_manual.ssi:121 en/about_manual.ssi:134
-#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
+#: en/about_manual.ssi:112 en/about_manual.ssi:125 en/about_manual.ssi:138
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
@@ -39,38 +39,43 @@ msgstr ""
#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
-#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
-#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
-#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111
-#: en/project_bugs.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
-#: en/user_basics.ssi:54 en/user_basics.ssi:66 en/user_basics.ssi:78
-#: en/user_basics.ssi:88 en/user_basics.ssi:102 en/user_basics.ssi:110
-#: en/user_basics.ssi:118 en/user_basics.ssi:128 en/user_basics.ssi:140
-#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
-#: en/user_basics.ssi:182 en/user_basics.ssi:190 en/user_basics.ssi:200
-#: en/user_basics.ssi:220 en/user_basics.ssi:253 en/user_basics.ssi:269
-#: en/user_basics.ssi:277 en/user_basics.ssi:297 en/user_basics.ssi:322
-#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
-#: en/user_customization-contents.ssi:66
+#: en/other_procedures.ssi:58 en/project_bugs.ssi:58 en/user_basics.ssi:32
+#: en/user_basics.ssi:42 en/user_basics.ssi:54 en/user_basics.ssi:66
+#: en/user_basics.ssi:78 en/user_basics.ssi:88 en/user_basics.ssi:102
+#: en/user_basics.ssi:110 en/user_basics.ssi:118 en/user_basics.ssi:128
+#: en/user_basics.ssi:142 en/user_basics.ssi:154 en/user_basics.ssi:162
+#: en/user_basics.ssi:170 en/user_basics.ssi:184 en/user_basics.ssi:192
+#: en/user_basics.ssi:202 en/user_basics.ssi:222 en/user_basics.ssi:255
+#: en/user_basics.ssi:271 en/user_basics.ssi:279 en/user_basics.ssi:299
+#: en/user_basics.ssi:324 en/user_customization-contents.ssi:34
+#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
#: en/user_customization-internationalization.ssi:10
#: en/user_customization-internationalization.ssi:18
#: en/user_customization-internationalization.ssi:26
#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
-#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
-#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
-#: en/user_customization-packages.ssi:103
-#: en/user_customization-packages.ssi:111
-#: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:104
-#: en/user_installation.ssi:118 en/user_installation.ssi:135
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
+#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
+#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
+#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:133
+#: en/user_customization-packages.ssi:143
+#: en/user_customization-packages.ssi:153
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:261
+#: en/user_customization-packages.ssi:273
+#: en/user_customization-packages.ssi:283 en/user_examples.ssi:12
+#: en/user_examples.ssi:27 en/user_examples.ssi:37 en/user_examples.ssi:51
+#: en/user_examples.ssi:61 en/user_examples.ssi:77 en/user_examples.ssi:87
+#: en/user_examples.ssi:104 en/user_examples.ssi:114 en/user_examples.ssi:128
+#: en/user_examples.ssi:136 en/user_examples.ssi:151 en/user_examples.ssi:159
+#: en/user_examples.ssi:185 en/user_examples.ssi:206 en/user_examples.ssi:214
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:76 en/user_installation.ssi:84
+#: en/user_installation.ssi:104 en/user_installation.ssi:118
+#: en/user_installation.ssi:135 en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:36
#: en/user_overview.ssi:80 en/user_overview.ssi:88
@@ -78,9 +83,9 @@ msgid "code{"
msgstr "code{"
#. type: Plain text
-#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:121 en/about_manual.ssi:134 en/about_manual.ssi:142
+#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:165
#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
@@ -100,37 +105,43 @@ msgstr "code{"
#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
-#: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
-#: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
-#: en/other_use-cases.ssi:137 en/project_bugs.ssi:62 en/user_basics.ssi:36
-#: en/user_basics.ssi:46 en/user_basics.ssi:60 en/user_basics.ssi:72
-#: en/user_basics.ssi:82 en/user_basics.ssi:94 en/user_basics.ssi:106
-#: en/user_basics.ssi:114 en/user_basics.ssi:122 en/user_basics.ssi:132
-#: en/user_basics.ssi:146 en/user_basics.ssi:156 en/user_basics.ssi:164
-#: en/user_basics.ssi:172 en/user_basics.ssi:186 en/user_basics.ssi:194
-#: en/user_basics.ssi:204 en/user_basics.ssi:245 en/user_basics.ssi:257
-#: en/user_basics.ssi:273 en/user_basics.ssi:281 en/user_basics.ssi:308
-#: en/user_basics.ssi:347 en/user_customization-contents.ssi:39
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
+#: en/project_bugs.ssi:62 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:60 en/user_basics.ssi:72 en/user_basics.ssi:82
+#: en/user_basics.ssi:94 en/user_basics.ssi:106 en/user_basics.ssi:114
+#: en/user_basics.ssi:122 en/user_basics.ssi:132 en/user_basics.ssi:148
+#: en/user_basics.ssi:158 en/user_basics.ssi:166 en/user_basics.ssi:174
+#: en/user_basics.ssi:188 en/user_basics.ssi:196 en/user_basics.ssi:206
+#: en/user_basics.ssi:247 en/user_basics.ssi:259 en/user_basics.ssi:275
+#: en/user_basics.ssi:283 en/user_basics.ssi:310 en/user_basics.ssi:349
+#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:70
#: en/user_customization-internationalization.ssi:14
#: en/user_customization-internationalization.ssi:22
#: en/user_customization-internationalization.ssi:30
#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
-#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
-#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
-#: en/user_customization-packages.ssi:107
-#: en/user_customization-packages.ssi:115
-#: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:172
-#: en/user_customization-packages.ssi:182
-#: en/user_customization-packages.ssi:192
-#: en/user_customization-packages.ssi:202 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:88 en/user_installation.ssi:108
-#: en/user_installation.ssi:123 en/user_installation.ssi:138
-#: en/user_managing_a_configuration.ssi:31
+#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
+#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
+#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
+#: en/user_customization-packages.ssi:125
+#: en/user_customization-packages.ssi:139
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:159
+#: en/user_customization-packages.ssi:169
+#: en/user_customization-packages.ssi:181
+#: en/user_customization-packages.ssi:197
+#: en/user_customization-packages.ssi:265
+#: en/user_customization-packages.ssi:277
+#: en/user_customization-packages.ssi:287 en/user_examples.ssi:17
+#: en/user_examples.ssi:31 en/user_examples.ssi:41 en/user_examples.ssi:55
+#: en/user_examples.ssi:65 en/user_examples.ssi:83 en/user_examples.ssi:98
+#: en/user_examples.ssi:108 en/user_examples.ssi:120 en/user_examples.ssi:132
+#: en/user_examples.ssi:147 en/user_examples.ssi:155 en/user_examples.ssi:163
+#: en/user_examples.ssi:194 en/user_examples.ssi:210 en/user_examples.ssi:218
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:72
+#: en/user_installation.ssi:80 en/user_installation.ssi:88
+#: en/user_installation.ssi:108 en/user_installation.ssi:123
+#: en/user_installation.ssi:138 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:74
#: en/user_overview.ssi:84 en/user_overview.ssi:92
@@ -229,8 +240,8 @@ msgstr ""
msgid ""
"#!/bin/sh\n"
"lb config noauto \\\n"
-"\t--architecture i386 \\\n"
-"\t${@}\n"
+"\t--packages-lists \"standard\" \\\n"
+"\t\"${@}\"\n"
msgstr ""
#. type: Plain text
@@ -243,7 +254,7 @@ msgstr ""
#, no-wrap
msgid ""
"#!/bin/sh\n"
-"lb clean noauto ${@}\n"
+"lb clean noauto \"${@}\"\n"
"rm -f config/binary config/bootstrap \\\n"
"\tconfig/chroot config/common config/source\n"
"rm -f binary.log\n"
@@ -256,16 +267,15 @@ msgstr ""
#. type: Plain text
#: en/user_managing_a_configuration.ssi:50
-msgid "#!/bin/sh lb build noauto ${@} 2>&1 | tee binary.log"
+msgid "#!/bin/sh lb build noauto \"${@}\" 2>&1 | tee binary.log"
msgstr ""
#. type: Plain text
#: en/user_managing_a_configuration.ssi:54
msgid ""
-"Edit auto/config, changing or adding any options as you see fit. In the "
-"example above, --architecture is set to i386 so that when the image is built "
-"on an amd64 system, it will not default to building amd64 images. Change "
-"this to an appropriate value for your image (or delete it if you want to use "
-"the default) and add any additional options in continuation lines that "
-"follow."
+"Edit #{auto/config}#, changing or adding any options as you see fit. In the "
+"example above, #{--packages-lists standard}# is set to the default value. "
+"Change this to an appropriate value for your image (or delete it if you want "
+"to use the default) and add any additional options in continuation lines "
+"that follow."
msgstr ""
diff --git a/manual/po/ro/user_examples.ssi.po b/manual/po/ro/user_examples.ssi.po
index 9192984..aab9e92 100644
--- a/manual/po/ro/user_examples.ssi.po
+++ b/manual/po/ro/user_examples.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-11-27 12:48-0400\n"
+"POT-Creation-Date: 2010-11-27 19:55-0400\n"
"PO-Revision-Date: 2010-11-04 16:34-0400\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -68,13 +68,15 @@ msgstr ""
#: en/user_customization-packages.ssi:273
#: en/user_customization-packages.ssi:283 en/user_examples.ssi:12
#: en/user_examples.ssi:27 en/user_examples.ssi:37 en/user_examples.ssi:51
-#: en/user_examples.ssi:61 en/user_examples.ssi:89 en/user_examples.ssi:110
-#: en/user_examples.ssi:118 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:104
-#: en/user_installation.ssi:118 en/user_installation.ssi:135
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_examples.ssi:61 en/user_examples.ssi:77 en/user_examples.ssi:87
+#: en/user_examples.ssi:104 en/user_examples.ssi:114 en/user_examples.ssi:128
+#: en/user_examples.ssi:136 en/user_examples.ssi:151 en/user_examples.ssi:159
+#: en/user_examples.ssi:185 en/user_examples.ssi:206 en/user_examples.ssi:214
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:76 en/user_installation.ssi:84
+#: en/user_installation.ssi:104 en/user_installation.ssi:118
+#: en/user_installation.ssi:135 en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:36
#: en/user_overview.ssi:80 en/user_overview.ssi:88
@@ -132,13 +134,15 @@ msgstr "code{"
#: en/user_customization-packages.ssi:277
#: en/user_customization-packages.ssi:287 en/user_examples.ssi:17
#: en/user_examples.ssi:31 en/user_examples.ssi:41 en/user_examples.ssi:55
-#: en/user_examples.ssi:65 en/user_examples.ssi:98 en/user_examples.ssi:114
-#: en/user_examples.ssi:122 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:88 en/user_installation.ssi:108
-#: en/user_installation.ssi:123 en/user_installation.ssi:138
-#: en/user_managing_a_configuration.ssi:31
+#: en/user_examples.ssi:65 en/user_examples.ssi:83 en/user_examples.ssi:98
+#: en/user_examples.ssi:108 en/user_examples.ssi:120 en/user_examples.ssi:132
+#: en/user_examples.ssi:147 en/user_examples.ssi:155 en/user_examples.ssi:163
+#: en/user_examples.ssi:194 en/user_examples.ssi:210 en/user_examples.ssi:218
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:72
+#: en/user_installation.ssi:80 en/user_installation.ssi:88
+#: en/user_installation.ssi:108 en/user_installation.ssi:123
+#: en/user_installation.ssi:138 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:74
#: en/user_overview.ssi:84 en/user_overview.ssi:92
@@ -146,17 +150,15 @@ msgid "}code"
msgstr "}code"
#. type: Plain text
-#: en/other_customization-bootup.ssi:8 en/other_customization-bootup.ssi:14
-#: en/other_customization-bootup.ssi:56 en/other_customization-bootup.ssi:60
-#: en/other_customization-bootup.ssi:64 en/other_customization-bootup.ssi:68
-#: en/other_live-environment.ssi:8 en/other_resources.ssi:8
-#: en/other_success-stories.ssi:7 en/user_examples.ssi:71
-msgid "FIXME"
+#: en/other_faq.ssi:85 en/other_faq.ssi:247 en/user_examples.ssi:89
+#: en/user_examples.ssi:138 en/user_examples.ssi:187
+msgid "#!/bin/sh"
msgstr ""
#. type: Plain text
-#: en/other_faq.ssi:85 en/other_faq.ssi:247 en/user_examples.ssi:91
-msgid "#!/bin/sh"
+#: en/user_basics.ssi:44 en/user_basics.ssi:120 en/user_basics.ssi:204
+#: en/user_examples.ssi:106 en/user_examples.ssi:153
+msgid "# lb build"
msgstr ""
#. type: Plain text
@@ -297,106 +299,268 @@ msgstr ""
#. type: Plain text
#: en/user_examples.ssi:59
-msgid "Build the image, keeping a log as in {Tutorial 1}#tutorial-1:"
+msgid ""
+"Build the image, again as superuser, keeping a log as in {Tutorial 1}"
+"#tutorial-1:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:63 en/user_examples.ssi:120
+#: en/user_examples.ssi:63 en/user_examples.ssi:216
msgid "# lb build 2>&1 | tee binary.log"
msgstr ""
#. type: Plain text
#: en/user_examples.ssi:67
-msgid "2~tutorial-3 Tutorial 3: A personalized image"
+msgid "Again, verify the image is OK and test, as in {Tutorial 1}#tutorial-1."
msgstr ""
#. type: Plain text
#: en/user_examples.ssi:69
+msgid "2~tutorial-3 Tutorial 3: A personalized image"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:71
#, no-wrap
msgid "*{Use case}* Create a project to build a personalized image, containing your favourite software to take with you on a USB stick wherever you go, and evolving in successive revisions as your needs and preferences change.\n"
msgstr ""
#. type: Plain text
#: en/user_examples.ssi:73
-msgid "2~ A VNC Kiosk Client"
+msgid ""
+"Since we will be changing our personalized image over a number of revisions, "
+"and we want to track those changes, trying things experimentally and "
+"possibly reverting them if things don't work out, we will keep our "
+"configuration in the popular #{git}# version control system. We will also "
+"use the best practice of autoconfiguration via #{auto}# scripts as described "
+"in {Managing a configuration}#managing-a-configuration."
msgstr ""
#. type: Plain text
#: en/user_examples.ssi:75
+msgid "3~ First revision"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:81
+msgid ""
+"$ mkdir -p tutorial3/auto $ cp /usr/share/live/examples/auto/* tutorial3/"
+"auto/ $ cd tutorial3"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:85
+msgid "Edit #{auto/config}# to read as follows:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:96
+#, no-wrap
+msgid ""
+"lb config noauto \\\n"
+" --architecture i386 \\\n"
+" --linux-flavours 686 \\\n"
+" --packages-lists lxde \\\n"
+" --packages \"iceweasel xchat\" \\\n"
+" \"${@}\"\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:100
+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}# 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}#."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:102
+msgid "Now, build the image:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:110
+msgid ""
+"Note that unlike in the first two tutorials, we no longer have to type #"
+"{2>&1 | tee binary.log}# as that is now included in #{auto/build}#."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:112
+msgid ""
+"Once you've tested the image (as in {Tutorial 1}#tutorial-1) and are "
+"satisfied it works, it's time to initialize our #{git}# repository, adding "
+"only the auto scripts we just created, and then make the first commit:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:118
+msgid "$ git init $ git add auto $ git commit -a -m \"Initial import.\""
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:122
+msgid "3~ Second revision"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:124
+msgid ""
+"In this revision, we're going to clean up from the first build, add the #"
+"{vlc}# package to our configuration, rebuild, test and commit."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:126
+msgid ""
+"The #{lb clean}# command will clean up all generated files from the previous "
+"build except for the cache, which saves having to re-download packages. This "
+"ensures that the subsequent #{lb build}# will re-run all stages to "
+"regenerate the files from our new configuration."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:130
+msgid "# lb clean"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:134
+msgid "Now edit #{auto/config}# to add the #{vlc}# package:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:145
+#, no-wrap
+msgid ""
+"lb config noauto \\\n"
+" --architecture i386 \\\n"
+" --linux-flavours 686 \\\n"
+" --packages-lists lxde \\\n"
+" --packages \"iceweasel xchat vlc\" \\\n"
+" \"${@}\"\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:149
+msgid "Build again:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:157
+msgid "Test, and when you're satisfied, commit the next revision:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:161
+msgid "$ git commit -a -m \"Adding vlc media player.\""
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:165
+msgid ""
+"Of course, more complicated changes to the configuration are possible, "
+"perhaps adding files in subdirectories of #{config/}#. When you commit new "
+"revisions, just take care not to hand edit or commit the top-level files in #"
+"{config}# containing #{LB_*}# variables, as these are build products, too, "
+"and are always cleaned up by #{lb clean}# and re-created with #{lb config}# "
+"via their respective #{auto}# scripts."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:167
+msgid ""
+"We've come to the end of our tutorial series. While many more kinds of "
+"customization are possible, even just using the few features explored in "
+"these simple examples, an almost infinite variety of different images can be "
+"created. The remaining examples in this section cover several other use "
+"cases drawn from the collected experiences of users of Debian Live."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:169
+msgid "2~ A VNC Kiosk Client"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:171
msgid "Create an image with live-build to boot directly to a VNC server."
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:77
+#: en/user_examples.ssi:173
msgid "_* Make a build directory: #{$ mkdir vncBuild}#"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:79
+#: en/user_examples.ssi:175
msgid "_* Move to the build directory: #{$ cd vncBuild}#"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:81
+#: en/user_examples.ssi:177
msgid ""
"Example to config the build directory to include gdm metacity "
"xtightvncviewer: #{$ lb config --packages \"gdm3 metacity xtightvncviewer\"}#"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:83
+#: en/user_examples.ssi:179
msgid ""
"Create a folder /etc/skel folder for a custom .xsession for the default "
"user: #{$ mkdir -p config/chroot_local-includes/etc/skel}#"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:85
+#: en/user_examples.ssi:181
msgid ""
"Create the .xsession for the default user: #{$ touch config/chroot_local-"
"includes/etc/skel/.xsession}#"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:87
+#: en/user_examples.ssi:183
msgid ""
"Edit the .xsession file to launch metacity and start xvncviewer with "
"something similar to the below:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:94
+#: en/user_examples.ssi:190
msgid "/usr/bin/metacity & /usr/bin/vncviewer xxx.xxx.xxx.xxx:PORT"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:96
+#: en/user_examples.ssi:192
msgid "exit"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:100
+#: en/user_examples.ssi:196
msgid "_* Build the image: #{# lb build}#"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:102
+#: en/user_examples.ssi:198
msgid "_* Enjoy."
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:104
+#: en/user_examples.ssi:200
msgid "2~ A base image for a 128M USB key"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:106
+#: en/user_examples.ssi:202
#, no-wrap
msgid "*{Use case}* Create a standard image with some components removed in order to fit on a 128M USB key with space left over to use as you see fit.\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:108
+#: en/user_examples.ssi:204
msgid ""
"When optimizing an image to fit a certain media size, you need to understand "
"the tradeoffs you are making between size and functionality. In this "
@@ -410,19 +574,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:112
+#: en/user_examples.ssi:208
msgid ""
"$ lb config -k 486 -p minimal --binary-indices false --memtest none --apt-"
"recommends false --includes none"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:116
+#: en/user_examples.ssi:212
msgid "Now, build the image in the usual way:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:124
+#: en/user_examples.ssi:220
msgid ""
"On the author's system at time of writing, the above configuration produced "
"a 78Mbyte image. This compares favourably with the 166Mbyte image produced "
@@ -430,7 +594,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:126
+#: en/user_examples.ssi:222
msgid ""
"The biggest space-saver here, compared to building a standard image on an #"
"{i386}# architecture system, is to select only the #{486}# kernel flavour "
diff --git a/manual/po/ro/user_managing_a_configuration.ssi.po b/manual/po/ro/user_managing_a_configuration.ssi.po
index 6c3247f..4d701a8 100644
--- a/manual/po/ro/user_managing_a_configuration.ssi.po
+++ b/manual/po/ro/user_managing_a_configuration.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-28 16:34-0200\n"
+"POT-Creation-Date: 2010-11-27 19:55-0400\n"
"PO-Revision-Date: 2010-10-13 17:00+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -18,9 +18,9 @@ msgstr ""
"20)) ? 1 : 2;\n"
#. type: Plain text
-#: en/about_manual.ssi:80 en/about_manual.ssi:88 en/about_manual.ssi:96
-#: en/about_manual.ssi:108 en/about_manual.ssi:121 en/about_manual.ssi:134
-#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
+#: en/about_manual.ssi:112 en/about_manual.ssi:125 en/about_manual.ssi:138
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
@@ -40,38 +40,43 @@ msgstr ""
#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
-#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
-#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
-#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111
-#: en/project_bugs.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
-#: en/user_basics.ssi:54 en/user_basics.ssi:66 en/user_basics.ssi:78
-#: en/user_basics.ssi:88 en/user_basics.ssi:102 en/user_basics.ssi:110
-#: en/user_basics.ssi:118 en/user_basics.ssi:128 en/user_basics.ssi:140
-#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
-#: en/user_basics.ssi:182 en/user_basics.ssi:190 en/user_basics.ssi:200
-#: en/user_basics.ssi:220 en/user_basics.ssi:253 en/user_basics.ssi:269
-#: en/user_basics.ssi:277 en/user_basics.ssi:297 en/user_basics.ssi:322
-#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
-#: en/user_customization-contents.ssi:66
+#: en/other_procedures.ssi:58 en/project_bugs.ssi:58 en/user_basics.ssi:32
+#: en/user_basics.ssi:42 en/user_basics.ssi:54 en/user_basics.ssi:66
+#: en/user_basics.ssi:78 en/user_basics.ssi:88 en/user_basics.ssi:102
+#: en/user_basics.ssi:110 en/user_basics.ssi:118 en/user_basics.ssi:128
+#: en/user_basics.ssi:142 en/user_basics.ssi:154 en/user_basics.ssi:162
+#: en/user_basics.ssi:170 en/user_basics.ssi:184 en/user_basics.ssi:192
+#: en/user_basics.ssi:202 en/user_basics.ssi:222 en/user_basics.ssi:255
+#: en/user_basics.ssi:271 en/user_basics.ssi:279 en/user_basics.ssi:299
+#: en/user_basics.ssi:324 en/user_customization-contents.ssi:34
+#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
#: en/user_customization-internationalization.ssi:10
#: en/user_customization-internationalization.ssi:18
#: en/user_customization-internationalization.ssi:26
#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
-#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
-#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
-#: en/user_customization-packages.ssi:103
-#: en/user_customization-packages.ssi:111
-#: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:104
-#: en/user_installation.ssi:118 en/user_installation.ssi:135
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
+#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
+#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
+#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:133
+#: en/user_customization-packages.ssi:143
+#: en/user_customization-packages.ssi:153
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:261
+#: en/user_customization-packages.ssi:273
+#: en/user_customization-packages.ssi:283 en/user_examples.ssi:12
+#: en/user_examples.ssi:27 en/user_examples.ssi:37 en/user_examples.ssi:51
+#: en/user_examples.ssi:61 en/user_examples.ssi:77 en/user_examples.ssi:87
+#: en/user_examples.ssi:104 en/user_examples.ssi:114 en/user_examples.ssi:128
+#: en/user_examples.ssi:136 en/user_examples.ssi:151 en/user_examples.ssi:159
+#: en/user_examples.ssi:185 en/user_examples.ssi:206 en/user_examples.ssi:214
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:76 en/user_installation.ssi:84
+#: en/user_installation.ssi:104 en/user_installation.ssi:118
+#: en/user_installation.ssi:135 en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:36
#: en/user_overview.ssi:80 en/user_overview.ssi:88
@@ -79,9 +84,9 @@ msgid "code{"
msgstr "code{"
#. type: Plain text
-#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:121 en/about_manual.ssi:134 en/about_manual.ssi:142
+#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:165
#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
@@ -101,37 +106,43 @@ msgstr "code{"
#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
-#: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
-#: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
-#: en/other_use-cases.ssi:137 en/project_bugs.ssi:62 en/user_basics.ssi:36
-#: en/user_basics.ssi:46 en/user_basics.ssi:60 en/user_basics.ssi:72
-#: en/user_basics.ssi:82 en/user_basics.ssi:94 en/user_basics.ssi:106
-#: en/user_basics.ssi:114 en/user_basics.ssi:122 en/user_basics.ssi:132
-#: en/user_basics.ssi:146 en/user_basics.ssi:156 en/user_basics.ssi:164
-#: en/user_basics.ssi:172 en/user_basics.ssi:186 en/user_basics.ssi:194
-#: en/user_basics.ssi:204 en/user_basics.ssi:245 en/user_basics.ssi:257
-#: en/user_basics.ssi:273 en/user_basics.ssi:281 en/user_basics.ssi:308
-#: en/user_basics.ssi:347 en/user_customization-contents.ssi:39
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
+#: en/project_bugs.ssi:62 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:60 en/user_basics.ssi:72 en/user_basics.ssi:82
+#: en/user_basics.ssi:94 en/user_basics.ssi:106 en/user_basics.ssi:114
+#: en/user_basics.ssi:122 en/user_basics.ssi:132 en/user_basics.ssi:148
+#: en/user_basics.ssi:158 en/user_basics.ssi:166 en/user_basics.ssi:174
+#: en/user_basics.ssi:188 en/user_basics.ssi:196 en/user_basics.ssi:206
+#: en/user_basics.ssi:247 en/user_basics.ssi:259 en/user_basics.ssi:275
+#: en/user_basics.ssi:283 en/user_basics.ssi:310 en/user_basics.ssi:349
+#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:70
#: en/user_customization-internationalization.ssi:14
#: en/user_customization-internationalization.ssi:22
#: en/user_customization-internationalization.ssi:30
#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
-#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
-#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
-#: en/user_customization-packages.ssi:107
-#: en/user_customization-packages.ssi:115
-#: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:172
-#: en/user_customization-packages.ssi:182
-#: en/user_customization-packages.ssi:192
-#: en/user_customization-packages.ssi:202 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:88 en/user_installation.ssi:108
-#: en/user_installation.ssi:123 en/user_installation.ssi:138
-#: en/user_managing_a_configuration.ssi:31
+#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
+#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
+#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
+#: en/user_customization-packages.ssi:125
+#: en/user_customization-packages.ssi:139
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:159
+#: en/user_customization-packages.ssi:169
+#: en/user_customization-packages.ssi:181
+#: en/user_customization-packages.ssi:197
+#: en/user_customization-packages.ssi:265
+#: en/user_customization-packages.ssi:277
+#: en/user_customization-packages.ssi:287 en/user_examples.ssi:17
+#: en/user_examples.ssi:31 en/user_examples.ssi:41 en/user_examples.ssi:55
+#: en/user_examples.ssi:65 en/user_examples.ssi:83 en/user_examples.ssi:98
+#: en/user_examples.ssi:108 en/user_examples.ssi:120 en/user_examples.ssi:132
+#: en/user_examples.ssi:147 en/user_examples.ssi:155 en/user_examples.ssi:163
+#: en/user_examples.ssi:194 en/user_examples.ssi:210 en/user_examples.ssi:218
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:72
+#: en/user_installation.ssi:80 en/user_installation.ssi:88
+#: en/user_installation.ssi:108 en/user_installation.ssi:123
+#: en/user_installation.ssi:138 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:74
#: en/user_overview.ssi:84 en/user_overview.ssi:92
@@ -230,8 +241,8 @@ msgstr ""
msgid ""
"#!/bin/sh\n"
"lb config noauto \\\n"
-"\t--architecture i386 \\\n"
-"\t${@}\n"
+"\t--packages-lists \"standard\" \\\n"
+"\t\"${@}\"\n"
msgstr ""
#. type: Plain text
@@ -244,7 +255,7 @@ msgstr ""
#, no-wrap
msgid ""
"#!/bin/sh\n"
-"lb clean noauto ${@}\n"
+"lb clean noauto \"${@}\"\n"
"rm -f config/binary config/bootstrap \\\n"
"\tconfig/chroot config/common config/source\n"
"rm -f binary.log\n"
@@ -257,16 +268,15 @@ msgstr ""
#. type: Plain text
#: en/user_managing_a_configuration.ssi:50
-msgid "#!/bin/sh lb build noauto ${@} 2>&1 | tee binary.log"
+msgid "#!/bin/sh lb build noauto \"${@}\" 2>&1 | tee binary.log"
msgstr ""
#. type: Plain text
#: en/user_managing_a_configuration.ssi:54
msgid ""
-"Edit auto/config, changing or adding any options as you see fit. In the "
-"example above, --architecture is set to i386 so that when the image is built "
-"on an amd64 system, it will not default to building amd64 images. Change "
-"this to an appropriate value for your image (or delete it if you want to use "
-"the default) and add any additional options in continuation lines that "
-"follow."
+"Edit #{auto/config}#, changing or adding any options as you see fit. In the "
+"example above, #{--packages-lists standard}# is set to the default value. "
+"Change this to an appropriate value for your image (or delete it if you want "
+"to use the default) and add any additional options in continuation lines "
+"that follow."
msgstr ""
diff --git a/manual/pot/user_examples.ssi.pot b/manual/pot/user_examples.ssi.pot
index 58227c7..0ad515a 100644
--- a/manual/pot/user_examples.ssi.pot
+++ b/manual/pot/user_examples.ssi.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-11-27 12:48-0400\n"
+"POT-Creation-Date: 2010-11-27 19:55-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -67,13 +67,15 @@ msgstr ""
#: en/user_customization-packages.ssi:273
#: en/user_customization-packages.ssi:283 en/user_examples.ssi:12
#: en/user_examples.ssi:27 en/user_examples.ssi:37 en/user_examples.ssi:51
-#: en/user_examples.ssi:61 en/user_examples.ssi:89 en/user_examples.ssi:110
-#: en/user_examples.ssi:118 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:104
-#: en/user_installation.ssi:118 en/user_installation.ssi:135
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_examples.ssi:61 en/user_examples.ssi:77 en/user_examples.ssi:87
+#: en/user_examples.ssi:104 en/user_examples.ssi:114 en/user_examples.ssi:128
+#: en/user_examples.ssi:136 en/user_examples.ssi:151 en/user_examples.ssi:159
+#: en/user_examples.ssi:185 en/user_examples.ssi:206 en/user_examples.ssi:214
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:76 en/user_installation.ssi:84
+#: en/user_installation.ssi:104 en/user_installation.ssi:118
+#: en/user_installation.ssi:135 en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:36
#: en/user_overview.ssi:80 en/user_overview.ssi:88
@@ -131,13 +133,15 @@ msgstr ""
#: en/user_customization-packages.ssi:277
#: en/user_customization-packages.ssi:287 en/user_examples.ssi:17
#: en/user_examples.ssi:31 en/user_examples.ssi:41 en/user_examples.ssi:55
-#: en/user_examples.ssi:65 en/user_examples.ssi:98 en/user_examples.ssi:114
-#: en/user_examples.ssi:122 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:88 en/user_installation.ssi:108
-#: en/user_installation.ssi:123 en/user_installation.ssi:138
-#: en/user_managing_a_configuration.ssi:31
+#: en/user_examples.ssi:65 en/user_examples.ssi:83 en/user_examples.ssi:98
+#: en/user_examples.ssi:108 en/user_examples.ssi:120 en/user_examples.ssi:132
+#: en/user_examples.ssi:147 en/user_examples.ssi:155 en/user_examples.ssi:163
+#: en/user_examples.ssi:194 en/user_examples.ssi:210 en/user_examples.ssi:218
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:72
+#: en/user_installation.ssi:80 en/user_installation.ssi:88
+#: en/user_installation.ssi:108 en/user_installation.ssi:123
+#: en/user_installation.ssi:138 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:74
#: en/user_overview.ssi:84 en/user_overview.ssi:92
@@ -145,17 +149,15 @@ msgid "}code"
msgstr ""
#. type: Plain text
-#: en/other_customization-bootup.ssi:8 en/other_customization-bootup.ssi:14
-#: en/other_customization-bootup.ssi:56 en/other_customization-bootup.ssi:60
-#: en/other_customization-bootup.ssi:64 en/other_customization-bootup.ssi:68
-#: en/other_live-environment.ssi:8 en/other_resources.ssi:8
-#: en/other_success-stories.ssi:7 en/user_examples.ssi:71
-msgid "FIXME"
+#: en/other_faq.ssi:85 en/other_faq.ssi:247 en/user_examples.ssi:89
+#: en/user_examples.ssi:138 en/user_examples.ssi:187
+msgid "#!/bin/sh"
msgstr ""
#. type: Plain text
-#: en/other_faq.ssi:85 en/other_faq.ssi:247 en/user_examples.ssi:91
-msgid "#!/bin/sh"
+#: en/user_basics.ssi:44 en/user_basics.ssi:120 en/user_basics.ssi:204
+#: en/user_examples.ssi:106 en/user_examples.ssi:153
+msgid "# lb build"
msgstr ""
#. type: Plain text
@@ -296,106 +298,268 @@ msgstr ""
#. type: Plain text
#: en/user_examples.ssi:59
-msgid "Build the image, keeping a log as in {Tutorial 1}#tutorial-1:"
+msgid ""
+"Build the image, again as superuser, keeping a log as in {Tutorial 1}"
+"#tutorial-1:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:63 en/user_examples.ssi:120
+#: en/user_examples.ssi:63 en/user_examples.ssi:216
msgid "# lb build 2>&1 | tee binary.log"
msgstr ""
#. type: Plain text
#: en/user_examples.ssi:67
-msgid "2~tutorial-3 Tutorial 3: A personalized image"
+msgid "Again, verify the image is OK and test, as in {Tutorial 1}#tutorial-1."
msgstr ""
#. type: Plain text
#: en/user_examples.ssi:69
+msgid "2~tutorial-3 Tutorial 3: A personalized image"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:71
#, no-wrap
msgid "*{Use case}* Create a project to build a personalized image, containing your favourite software to take with you on a USB stick wherever you go, and evolving in successive revisions as your needs and preferences change.\n"
msgstr ""
#. type: Plain text
#: en/user_examples.ssi:73
-msgid "2~ A VNC Kiosk Client"
+msgid ""
+"Since we will be changing our personalized image over a number of revisions, "
+"and we want to track those changes, trying things experimentally and "
+"possibly reverting them if things don't work out, we will keep our "
+"configuration in the popular #{git}# version control system. We will also "
+"use the best practice of autoconfiguration via #{auto}# scripts as described "
+"in {Managing a configuration}#managing-a-configuration."
msgstr ""
#. type: Plain text
#: en/user_examples.ssi:75
+msgid "3~ First revision"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:81
+msgid ""
+"$ mkdir -p tutorial3/auto $ cp /usr/share/live/examples/auto/* tutorial3/"
+"auto/ $ cd tutorial3"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:85
+msgid "Edit #{auto/config}# to read as follows:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:96
+#, no-wrap
+msgid ""
+"lb config noauto \\\n"
+" --architecture i386 \\\n"
+" --linux-flavours 686 \\\n"
+" --packages-lists lxde \\\n"
+" --packages \"iceweasel xchat\" \\\n"
+" \"${@}\"\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:100
+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}# 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}#."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:102
+msgid "Now, build the image:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:110
+msgid ""
+"Note that unlike in the first two tutorials, we no longer have to type #"
+"{2>&1 | tee binary.log}# as that is now included in #{auto/build}#."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:112
+msgid ""
+"Once you've tested the image (as in {Tutorial 1}#tutorial-1) and are "
+"satisfied it works, it's time to initialize our #{git}# repository, adding "
+"only the auto scripts we just created, and then make the first commit:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:118
+msgid "$ git init $ git add auto $ git commit -a -m \"Initial import.\""
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:122
+msgid "3~ Second revision"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:124
+msgid ""
+"In this revision, we're going to clean up from the first build, add the #"
+"{vlc}# package to our configuration, rebuild, test and commit."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:126
+msgid ""
+"The #{lb clean}# command will clean up all generated files from the previous "
+"build except for the cache, which saves having to re-download packages. This "
+"ensures that the subsequent #{lb build}# will re-run all stages to "
+"regenerate the files from our new configuration."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:130
+msgid "# lb clean"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:134
+msgid "Now edit #{auto/config}# to add the #{vlc}# package:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:145
+#, no-wrap
+msgid ""
+"lb config noauto \\\n"
+" --architecture i386 \\\n"
+" --linux-flavours 686 \\\n"
+" --packages-lists lxde \\\n"
+" --packages \"iceweasel xchat vlc\" \\\n"
+" \"${@}\"\n"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:149
+msgid "Build again:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:157
+msgid "Test, and when you're satisfied, commit the next revision:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:161
+msgid "$ git commit -a -m \"Adding vlc media player.\""
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:165
+msgid ""
+"Of course, more complicated changes to the configuration are possible, "
+"perhaps adding files in subdirectories of #{config/}#. When you commit new "
+"revisions, just take care not to hand edit or commit the top-level files in #"
+"{config}# containing #{LB_*}# variables, as these are build products, too, "
+"and are always cleaned up by #{lb clean}# and re-created with #{lb config}# "
+"via their respective #{auto}# scripts."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:167
+msgid ""
+"We've come to the end of our tutorial series. While many more kinds of "
+"customization are possible, even just using the few features explored in "
+"these simple examples, an almost infinite variety of different images can be "
+"created. The remaining examples in this section cover several other use "
+"cases drawn from the collected experiences of users of Debian Live."
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:169
+msgid "2~ A VNC Kiosk Client"
+msgstr ""
+
+#. type: Plain text
+#: en/user_examples.ssi:171
msgid "Create an image with live-build to boot directly to a VNC server."
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:77
+#: en/user_examples.ssi:173
msgid "_* Make a build directory: #{$ mkdir vncBuild}#"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:79
+#: en/user_examples.ssi:175
msgid "_* Move to the build directory: #{$ cd vncBuild}#"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:81
+#: en/user_examples.ssi:177
msgid ""
"Example to config the build directory to include gdm metacity "
"xtightvncviewer: #{$ lb config --packages \"gdm3 metacity xtightvncviewer\"}#"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:83
+#: en/user_examples.ssi:179
msgid ""
"Create a folder /etc/skel folder for a custom .xsession for the default "
"user: #{$ mkdir -p config/chroot_local-includes/etc/skel}#"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:85
+#: en/user_examples.ssi:181
msgid ""
"Create the .xsession for the default user: #{$ touch config/chroot_local-"
"includes/etc/skel/.xsession}#"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:87
+#: en/user_examples.ssi:183
msgid ""
"Edit the .xsession file to launch metacity and start xvncviewer with "
"something similar to the below:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:94
+#: en/user_examples.ssi:190
msgid "/usr/bin/metacity & /usr/bin/vncviewer xxx.xxx.xxx.xxx:PORT"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:96
+#: en/user_examples.ssi:192
msgid "exit"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:100
+#: en/user_examples.ssi:196
msgid "_* Build the image: #{# lb build}#"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:102
+#: en/user_examples.ssi:198
msgid "_* Enjoy."
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:104
+#: en/user_examples.ssi:200
msgid "2~ A base image for a 128M USB key"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:106
+#: en/user_examples.ssi:202
#, no-wrap
msgid "*{Use case}* Create a standard image with some components removed in order to fit on a 128M USB key with space left over to use as you see fit.\n"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:108
+#: en/user_examples.ssi:204
msgid ""
"When optimizing an image to fit a certain media size, you need to understand "
"the tradeoffs you are making between size and functionality. In this "
@@ -409,19 +573,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:112
+#: en/user_examples.ssi:208
msgid ""
"$ lb config -k 486 -p minimal --binary-indices false --memtest none --apt-"
"recommends false --includes none"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:116
+#: en/user_examples.ssi:212
msgid "Now, build the image in the usual way:"
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:124
+#: en/user_examples.ssi:220
msgid ""
"On the author's system at time of writing, the above configuration produced "
"a 78Mbyte image. This compares favourably with the 166Mbyte image produced "
@@ -429,7 +593,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_examples.ssi:126
+#: en/user_examples.ssi:222
msgid ""
"The biggest space-saver here, compared to building a standard image on an #"
"{i386}# architecture system, is to select only the #{486}# kernel flavour "
diff --git a/manual/pot/user_managing_a_configuration.ssi.pot b/manual/pot/user_managing_a_configuration.ssi.pot
index 1872562..f4ae9ea 100644
--- a/manual/pot/user_managing_a_configuration.ssi.pot
+++ b/manual/pot/user_managing_a_configuration.ssi.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-28 16:34-0200\n"
+"POT-Creation-Date: 2010-11-27 19:55-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -17,9 +17,9 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#. type: Plain text
-#: en/about_manual.ssi:80 en/about_manual.ssi:88 en/about_manual.ssi:96
-#: en/about_manual.ssi:108 en/about_manual.ssi:121 en/about_manual.ssi:134
-#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
+#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
+#: en/about_manual.ssi:112 en/about_manual.ssi:125 en/about_manual.ssi:138
+#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:162
#: en/other_coding-style.ssi:28 en/other_coding-style.ssi:38
#: en/other_coding-style.ssi:51 en/other_coding-style.ssi:61
#: en/other_coding-style.ssi:88 en/other_coding-style.ssi:96
@@ -39,38 +39,43 @@ msgstr ""
#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
-#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
-#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
-#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111
-#: en/project_bugs.ssi:58 en/user_basics.ssi:32 en/user_basics.ssi:42
-#: en/user_basics.ssi:54 en/user_basics.ssi:66 en/user_basics.ssi:78
-#: en/user_basics.ssi:88 en/user_basics.ssi:102 en/user_basics.ssi:110
-#: en/user_basics.ssi:118 en/user_basics.ssi:128 en/user_basics.ssi:140
-#: en/user_basics.ssi:152 en/user_basics.ssi:160 en/user_basics.ssi:168
-#: en/user_basics.ssi:182 en/user_basics.ssi:190 en/user_basics.ssi:200
-#: en/user_basics.ssi:220 en/user_basics.ssi:253 en/user_basics.ssi:269
-#: en/user_basics.ssi:277 en/user_basics.ssi:297 en/user_basics.ssi:322
-#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
-#: en/user_customization-contents.ssi:66
+#: en/other_procedures.ssi:58 en/project_bugs.ssi:58 en/user_basics.ssi:32
+#: en/user_basics.ssi:42 en/user_basics.ssi:54 en/user_basics.ssi:66
+#: en/user_basics.ssi:78 en/user_basics.ssi:88 en/user_basics.ssi:102
+#: en/user_basics.ssi:110 en/user_basics.ssi:118 en/user_basics.ssi:128
+#: en/user_basics.ssi:142 en/user_basics.ssi:154 en/user_basics.ssi:162
+#: en/user_basics.ssi:170 en/user_basics.ssi:184 en/user_basics.ssi:192
+#: en/user_basics.ssi:202 en/user_basics.ssi:222 en/user_basics.ssi:255
+#: en/user_basics.ssi:271 en/user_basics.ssi:279 en/user_basics.ssi:299
+#: en/user_basics.ssi:324 en/user_customization-contents.ssi:34
+#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
#: en/user_customization-internationalization.ssi:10
#: en/user_customization-internationalization.ssi:18
#: en/user_customization-internationalization.ssi:26
#: en/user_customization-internationalization.ssi:38
-#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
-#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
-#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
-#: en/user_customization-packages.ssi:103
-#: en/user_customization-packages.ssi:111
-#: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
-#: en/user_installation.ssi:46 en/user_installation.ssi:56
-#: en/user_installation.ssi:64 en/user_installation.ssi:76
-#: en/user_installation.ssi:84 en/user_installation.ssi:104
-#: en/user_installation.ssi:118 en/user_installation.ssi:135
-#: en/user_managing_a_configuration.ssi:24
+#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
+#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
+#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:90
+#: en/user_customization-packages.ssi:120
+#: en/user_customization-packages.ssi:133
+#: en/user_customization-packages.ssi:143
+#: en/user_customization-packages.ssi:153
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:261
+#: en/user_customization-packages.ssi:273
+#: en/user_customization-packages.ssi:283 en/user_examples.ssi:12
+#: en/user_examples.ssi:27 en/user_examples.ssi:37 en/user_examples.ssi:51
+#: en/user_examples.ssi:61 en/user_examples.ssi:77 en/user_examples.ssi:87
+#: en/user_examples.ssi:104 en/user_examples.ssi:114 en/user_examples.ssi:128
+#: en/user_examples.ssi:136 en/user_examples.ssi:151 en/user_examples.ssi:159
+#: en/user_examples.ssi:185 en/user_examples.ssi:206 en/user_examples.ssi:214
+#: en/user_installation.ssi:38 en/user_installation.ssi:46
+#: en/user_installation.ssi:56 en/user_installation.ssi:64
+#: en/user_installation.ssi:76 en/user_installation.ssi:84
+#: en/user_installation.ssi:104 en/user_installation.ssi:118
+#: en/user_installation.ssi:135 en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:36
#: en/user_overview.ssi:80 en/user_overview.ssi:88
@@ -78,9 +83,9 @@ msgid "code{"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:84 en/about_manual.ssi:92 en/about_manual.ssi:100
-#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
+#: en/about_manual.ssi:88 en/about_manual.ssi:96 en/about_manual.ssi:104
+#: en/about_manual.ssi:121 en/about_manual.ssi:134 en/about_manual.ssi:142
+#: en/about_manual.ssi:150 en/about_manual.ssi:158 en/about_manual.ssi:165
#: en/other_coding-style.ssi:34 en/other_coding-style.ssi:45
#: en/other_coding-style.ssi:57 en/other_coding-style.ssi:68
#: en/other_coding-style.ssi:92 en/other_coding-style.ssi:100
@@ -100,37 +105,43 @@ msgstr ""
#: en/other_live-environment.ssi:120 en/other_live-environment.ssi:129
#: en/other_live-environment.ssi:138 en/other_procedures.ssi:16
#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
-#: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
-#: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
-#: en/other_use-cases.ssi:137 en/project_bugs.ssi:62 en/user_basics.ssi:36
-#: en/user_basics.ssi:46 en/user_basics.ssi:60 en/user_basics.ssi:72
-#: en/user_basics.ssi:82 en/user_basics.ssi:94 en/user_basics.ssi:106
-#: en/user_basics.ssi:114 en/user_basics.ssi:122 en/user_basics.ssi:132
-#: en/user_basics.ssi:146 en/user_basics.ssi:156 en/user_basics.ssi:164
-#: en/user_basics.ssi:172 en/user_basics.ssi:186 en/user_basics.ssi:194
-#: en/user_basics.ssi:204 en/user_basics.ssi:245 en/user_basics.ssi:257
-#: en/user_basics.ssi:273 en/user_basics.ssi:281 en/user_basics.ssi:308
-#: en/user_basics.ssi:347 en/user_customization-contents.ssi:39
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
+#: en/project_bugs.ssi:62 en/user_basics.ssi:36 en/user_basics.ssi:46
+#: en/user_basics.ssi:60 en/user_basics.ssi:72 en/user_basics.ssi:82
+#: en/user_basics.ssi:94 en/user_basics.ssi:106 en/user_basics.ssi:114
+#: en/user_basics.ssi:122 en/user_basics.ssi:132 en/user_basics.ssi:148
+#: en/user_basics.ssi:158 en/user_basics.ssi:166 en/user_basics.ssi:174
+#: en/user_basics.ssi:188 en/user_basics.ssi:196 en/user_basics.ssi:206
+#: en/user_basics.ssi:247 en/user_basics.ssi:259 en/user_basics.ssi:275
+#: en/user_basics.ssi:283 en/user_basics.ssi:310 en/user_basics.ssi:349
+#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:70
#: en/user_customization-internationalization.ssi:14
#: en/user_customization-internationalization.ssi:22
#: en/user_customization-internationalization.ssi:30
#: en/user_customization-internationalization.ssi:42
-#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
-#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
-#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
-#: en/user_customization-packages.ssi:107
-#: en/user_customization-packages.ssi:115
-#: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:172
-#: en/user_customization-packages.ssi:182
-#: en/user_customization-packages.ssi:192
-#: en/user_customization-packages.ssi:202 en/user_installation.ssi:42
-#: en/user_installation.ssi:50 en/user_installation.ssi:60
-#: en/user_installation.ssi:72 en/user_installation.ssi:80
-#: en/user_installation.ssi:88 en/user_installation.ssi:108
-#: en/user_installation.ssi:123 en/user_installation.ssi:138
-#: en/user_managing_a_configuration.ssi:31
+#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
+#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
+#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:94
+#: en/user_customization-packages.ssi:125
+#: en/user_customization-packages.ssi:139
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:159
+#: en/user_customization-packages.ssi:169
+#: en/user_customization-packages.ssi:181
+#: en/user_customization-packages.ssi:197
+#: en/user_customization-packages.ssi:265
+#: en/user_customization-packages.ssi:277
+#: en/user_customization-packages.ssi:287 en/user_examples.ssi:17
+#: en/user_examples.ssi:31 en/user_examples.ssi:41 en/user_examples.ssi:55
+#: en/user_examples.ssi:65 en/user_examples.ssi:83 en/user_examples.ssi:98
+#: en/user_examples.ssi:108 en/user_examples.ssi:120 en/user_examples.ssi:132
+#: en/user_examples.ssi:147 en/user_examples.ssi:155 en/user_examples.ssi:163
+#: en/user_examples.ssi:194 en/user_examples.ssi:210 en/user_examples.ssi:218
+#: en/user_installation.ssi:42 en/user_installation.ssi:50
+#: en/user_installation.ssi:60 en/user_installation.ssi:72
+#: en/user_installation.ssi:80 en/user_installation.ssi:88
+#: en/user_installation.ssi:108 en/user_installation.ssi:123
+#: en/user_installation.ssi:138 en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:74
#: en/user_overview.ssi:84 en/user_overview.ssi:92
@@ -229,8 +240,8 @@ msgstr ""
msgid ""
"#!/bin/sh\n"
"lb config noauto \\\n"
-"\t--architecture i386 \\\n"
-"\t${@}\n"
+"\t--packages-lists \"standard\" \\\n"
+"\t\"${@}\"\n"
msgstr ""
#. type: Plain text
@@ -243,7 +254,7 @@ msgstr ""
#, no-wrap
msgid ""
"#!/bin/sh\n"
-"lb clean noauto ${@}\n"
+"lb clean noauto \"${@}\"\n"
"rm -f config/binary config/bootstrap \\\n"
"\tconfig/chroot config/common config/source\n"
"rm -f binary.log\n"
@@ -256,16 +267,15 @@ msgstr ""
#. type: Plain text
#: en/user_managing_a_configuration.ssi:50
-msgid "#!/bin/sh lb build noauto ${@} 2>&1 | tee binary.log"
+msgid "#!/bin/sh lb build noauto \"${@}\" 2>&1 | tee binary.log"
msgstr ""
#. type: Plain text
#: en/user_managing_a_configuration.ssi:54
msgid ""
-"Edit auto/config, changing or adding any options as you see fit. In the "
-"example above, --architecture is set to i386 so that when the image is built "
-"on an amd64 system, it will not default to building amd64 images. Change "
-"this to an appropriate value for your image (or delete it if you want to use "
-"the default) and add any additional options in continuation lines that "
-"follow."
+"Edit #{auto/config}#, changing or adding any options as you see fit. In the "
+"example above, #{--packages-lists standard}# is set to the default value. "
+"Change this to an appropriate value for your image (or delete it if you want "
+"to use the default) and add any additional options in continuation lines "
+"that follow."
msgstr ""
diff --git a/manual/pt_BR/user_examples.ssi b/manual/pt_BR/user_examples.ssi
index 1214813..ea2b5b3 100644
--- a/manual/pt_BR/user_examples.ssi
+++ b/manual/pt_BR/user_examples.ssi
@@ -80,7 +80,8 @@ configuration for the web browser in
support packages for viewing various kinds of web content, but we leave this
as an exercise for the reader.
-Build the image, keeping a log as in {Tutorial 1}#tutorial-1:
+Build the image, again as superuser, keeping a log as in {Tutorial
+1}#tutorial-1:
code{
@@ -88,11 +89,130 @@ code{
}code
+Again, verify the image is OK and test, as in {Tutorial 1}#tutorial-1.
+
2~tutorial-3 Tutorial 3: A personalized image
*{Use case}* Create a project to build a personalized image, containing your favourite software to take with you on a USB stick wherever you go, and evolving in successive revisions as your needs and preferences change.
-FIXME
+Since we will be changing our personalized image over a number of revisions,
+and we want to track those changes, trying things experimentally and
+possibly reverting them if things don't work out, we will keep our
+configuration in the popular #{git}# version control system. We will also
+use the best practice of autoconfiguration via #{auto}# scripts as described
+in {Managing a configuration}#managing-a-configuration.
+
+3~ First revision
+
+code{
+
+$ mkdir -p tutorial3/auto $ cp /usr/share/live/examples/auto/*
+tutorial3/auto/ $ cd tutorial3
+
+}code
+
+Edit #{auto/config}# to read as follows:
+
+code{
+
+#!/bin/sh
+
+lb config noauto \
+ --architecture i386 \
+ --linux-flavours 686 \
+ --packages-lists lxde \
+ --packages "iceweasel xchat" \
+ "${@}"
+
+}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}# 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:
+
+code{
+
+# lb build
+
+}code
+
+Note that unlike in the first two tutorials, we no longer have to type
+#{2>&1 | tee binary.log}# as that is now included in #{auto/build}#.
+
+Once you've tested the image (as in {Tutorial 1}#tutorial-1) and are
+satisfied it works, it's time to initialize our #{git}# repository, adding
+only the auto scripts we just created, and then make the first commit:
+
+code{
+
+$ git init $ git add auto $ git commit -a -m "Initial import."
+
+}code
+
+3~ Second revision
+
+In this revision, we're going to clean up from the first build, add the
+#{vlc}# package to our configuration, rebuild, test and commit.
+
+The #{lb clean}# command will clean up all generated files from the previous
+build except for the cache, which saves having to re-download packages. This
+ensures that the subsequent #{lb build}# will re-run all stages to
+regenerate the files from our new configuration.
+
+code{
+
+# lb clean
+
+}code
+
+Now edit #{auto/config}# to add the #{vlc}# package:
+
+code{
+
+#!/bin/sh
+
+lb config noauto \
+ --architecture i386 \
+ --linux-flavours 686 \
+ --packages-lists lxde \
+ --packages "iceweasel xchat vlc" \
+ "${@}"
+
+}code
+
+Build again:
+
+code{
+
+# lb build
+
+}code
+
+Test, and when you're satisfied, commit the next revision:
+
+code{
+
+$ git commit -a -m "Adding vlc media player."
+
+}code
+
+Of course, more complicated changes to the configuration are possible,
+perhaps adding files in subdirectories of #{config/}#. When you commit new
+revisions, just take care not to hand edit or commit the top-level files in
+#{config}# containing #{LB_*}# variables, as these are build products, too,
+and are always cleaned up by #{lb clean}# and re-created with #{lb config}#
+via their respective #{auto}# scripts.
+
+We've come to the end of our tutorial series. While many more kinds of
+customization are possible, even just using the few features explored in
+these simple examples, an almost infinite variety of different images can be
+created. The remaining examples in this section cover several other use
+cases drawn from the collected experiences of users of Debian Live.
2~ A VNC Kiosk Client
diff --git a/manual/pt_BR/user_managing_a_configuration.ssi b/manual/pt_BR/user_managing_a_configuration.ssi
index bc03008..ab5b6c1 100644
--- a/manual/pt_BR/user_managing_a_configuration.ssi
+++ b/manual/pt_BR/user_managing_a_configuration.ssi
@@ -49,8 +49,8 @@ code{
#!/bin/sh
lb config noauto \
- --architecture i386 \
- ${@}
+ --packages-lists "standard" \
+ "${@}"
}code
@@ -59,7 +59,7 @@ auto/clean
code{
#!/bin/sh
-lb clean noauto ${@}
+lb clean noauto "${@}"
rm -f config/binary config/bootstrap \
config/chroot config/common config/source
rm -f binary.log
@@ -70,14 +70,13 @@ auto/build
code{
-#!/bin/sh lb build noauto ${@} 2>&1 | tee binary.log
+#!/bin/sh lb build noauto "${@}" 2>&1 | tee binary.log
}code
-Edit auto/config, changing or adding any options as you see fit. In the
-example above, --architecture is set to i386 so that when the image is built
-on an amd64 system, it will not default to building amd64 images. Change
-this to an appropriate value for your image (or delete it if you want to use
-the default) and add any additional options in continuation lines that
-follow.
+Edit #{auto/config}#, changing or adding any options as you see fit. In the
+example above, #{--packages-lists standard}# is set to the default
+value. Change this to an appropriate value for your image (or delete it if
+you want to use the default) and add any additional options in continuation
+lines that follow.
diff --git a/manual/ro/user_examples.ssi b/manual/ro/user_examples.ssi
index 1214813..ea2b5b3 100644
--- a/manual/ro/user_examples.ssi
+++ b/manual/ro/user_examples.ssi
@@ -80,7 +80,8 @@ configuration for the web browser in
support packages for viewing various kinds of web content, but we leave this
as an exercise for the reader.
-Build the image, keeping a log as in {Tutorial 1}#tutorial-1:
+Build the image, again as superuser, keeping a log as in {Tutorial
+1}#tutorial-1:
code{
@@ -88,11 +89,130 @@ code{
}code
+Again, verify the image is OK and test, as in {Tutorial 1}#tutorial-1.
+
2~tutorial-3 Tutorial 3: A personalized image
*{Use case}* Create a project to build a personalized image, containing your favourite software to take with you on a USB stick wherever you go, and evolving in successive revisions as your needs and preferences change.
-FIXME
+Since we will be changing our personalized image over a number of revisions,
+and we want to track those changes, trying things experimentally and
+possibly reverting them if things don't work out, we will keep our
+configuration in the popular #{git}# version control system. We will also
+use the best practice of autoconfiguration via #{auto}# scripts as described
+in {Managing a configuration}#managing-a-configuration.
+
+3~ First revision
+
+code{
+
+$ mkdir -p tutorial3/auto $ cp /usr/share/live/examples/auto/*
+tutorial3/auto/ $ cd tutorial3
+
+}code
+
+Edit #{auto/config}# to read as follows:
+
+code{
+
+#!/bin/sh
+
+lb config noauto \
+ --architecture i386 \
+ --linux-flavours 686 \
+ --packages-lists lxde \
+ --packages "iceweasel xchat" \
+ "${@}"
+
+}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}# 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:
+
+code{
+
+# lb build
+
+}code
+
+Note that unlike in the first two tutorials, we no longer have to type
+#{2>&1 | tee binary.log}# as that is now included in #{auto/build}#.
+
+Once you've tested the image (as in {Tutorial 1}#tutorial-1) and are
+satisfied it works, it's time to initialize our #{git}# repository, adding
+only the auto scripts we just created, and then make the first commit:
+
+code{
+
+$ git init $ git add auto $ git commit -a -m "Initial import."
+
+}code
+
+3~ Second revision
+
+In this revision, we're going to clean up from the first build, add the
+#{vlc}# package to our configuration, rebuild, test and commit.
+
+The #{lb clean}# command will clean up all generated files from the previous
+build except for the cache, which saves having to re-download packages. This
+ensures that the subsequent #{lb build}# will re-run all stages to
+regenerate the files from our new configuration.
+
+code{
+
+# lb clean
+
+}code
+
+Now edit #{auto/config}# to add the #{vlc}# package:
+
+code{
+
+#!/bin/sh
+
+lb config noauto \
+ --architecture i386 \
+ --linux-flavours 686 \
+ --packages-lists lxde \
+ --packages "iceweasel xchat vlc" \
+ "${@}"
+
+}code
+
+Build again:
+
+code{
+
+# lb build
+
+}code
+
+Test, and when you're satisfied, commit the next revision:
+
+code{
+
+$ git commit -a -m "Adding vlc media player."
+
+}code
+
+Of course, more complicated changes to the configuration are possible,
+perhaps adding files in subdirectories of #{config/}#. When you commit new
+revisions, just take care not to hand edit or commit the top-level files in
+#{config}# containing #{LB_*}# variables, as these are build products, too,
+and are always cleaned up by #{lb clean}# and re-created with #{lb config}#
+via their respective #{auto}# scripts.
+
+We've come to the end of our tutorial series. While many more kinds of
+customization are possible, even just using the few features explored in
+these simple examples, an almost infinite variety of different images can be
+created. The remaining examples in this section cover several other use
+cases drawn from the collected experiences of users of Debian Live.
2~ A VNC Kiosk Client
diff --git a/manual/ro/user_managing_a_configuration.ssi b/manual/ro/user_managing_a_configuration.ssi
index bc03008..ab5b6c1 100644
--- a/manual/ro/user_managing_a_configuration.ssi
+++ b/manual/ro/user_managing_a_configuration.ssi
@@ -49,8 +49,8 @@ code{
#!/bin/sh
lb config noauto \
- --architecture i386 \
- ${@}
+ --packages-lists "standard" \
+ "${@}"
}code
@@ -59,7 +59,7 @@ auto/clean
code{
#!/bin/sh
-lb clean noauto ${@}
+lb clean noauto "${@}"
rm -f config/binary config/bootstrap \
config/chroot config/common config/source
rm -f binary.log
@@ -70,14 +70,13 @@ auto/build
code{
-#!/bin/sh lb build noauto ${@} 2>&1 | tee binary.log
+#!/bin/sh lb build noauto "${@}" 2>&1 | tee binary.log
}code
-Edit auto/config, changing or adding any options as you see fit. In the
-example above, --architecture is set to i386 so that when the image is built
-on an amd64 system, it will not default to building amd64 images. Change
-this to an appropriate value for your image (or delete it if you want to use
-the default) and add any additional options in continuation lines that
-follow.
+Edit #{auto/config}#, changing or adding any options as you see fit. In the
+example above, #{--packages-lists standard}# is set to the default
+value. Change this to an appropriate value for your image (or delete it if
+you want to use the default) and add any additional options in continuation
+lines that follow.
--
live-manual
More information about the debian-live-changes
mailing list