[SCM] live-manual branch, debian, updated. debian/2.0_a8-1-39-gdb1920a
Ben Armstrong
synrg at debian.org
Fri Oct 22 23:52:14 UTC 2010
The following commit has been merged in the debian branch:
commit b6b6f1e3e155ac13c237f8b27d8c143b478da792
Author: Ben Armstrong <synrg at debian.org>
Date: Fri Oct 22 20:42:02 2010 -0300
Adding more references.
diff --git a/manual/de/about_manual.ssi b/manual/de/about_manual.ssi
index 9a0aa9e..3b69378 100644
--- a/manual/de/about_manual.ssi
+++ b/manual/de/about_manual.ssi
@@ -14,7 +14,7 @@ unprivileged user and those requiring superuser privileges, commands are
prepended by #{$}# or #{#}# respectively. This symbol is not a part of the
command.
-2~ Terms
+2~terms Terms
_* *{Live system}*: An operating system that can boot without installation
to a hard drive. Live systems do not alter local operating system(s) or
diff --git a/manual/de/user_basics.ssi b/manual/de/user_basics.ssi
index 94336f1..aef09b7 100644
--- a/manual/de/user_basics.ssi
+++ b/manual/de/user_basics.ssi
@@ -10,9 +10,7 @@ containing instructions on how to boot the various binary image types.
A live system usually means an operating system booted on a computer from a
removable medium (such as CD-ROM, USB stick, or network), ready to use
without any installation on the usual drive(s), with an auto-configuration
-done at runtime (see terms).
-
-% FIXME: <xref linkend="terms"/>
+done at runtime (see {Terms}#terms ).
With Debian Live, it's a Debian GNU/Linux operating system, built for one of
the supported architectures (currently amd64, i386, powerpc and sparc). It
@@ -65,9 +63,7 @@ $ lb config
}code
By passing no parameters to #{lb config}# we indicated that we wish to use
-the defaults (see lb-config).
-
-% FIXME: <xref linkend="lb-config"/>
+the defaults (see {The lb config command}#lb-config ).
Now that we have a "config/" hierarchy, we may build the image with the lb
build command:
@@ -79,9 +75,7 @@ code{
}code
This process can take a while, depending on the speed of your network
-connection (see lb-build).
-
-% FIXME: <xref linkend="lb-build"/>
+connection (see {The lb build command}#lb-build ).
3~ Testing an ISO image with Qemu
@@ -144,9 +138,8 @@ booting from USB sticks, USB hard drives, and various other portable storage
devices.
Note if you created an iso image with the previous example, you will need to
-clean up your working directory with the #{lb clean} command (see lb-clean):
-
-% FIXME: <xref linkend="lb-clean"/>
+clean up your working directory with the #{lb clean} command (see {The lb
+clean command}#lb-clean ):
code{
diff --git a/manual/de/user_installation.ssi b/manual/de/user_installation.ssi
index 0bbef7d..9869ff4 100644
--- a/manual/de/user_installation.ssi
+++ b/manual/de/user_installation.ssi
@@ -101,9 +101,7 @@ are available on http://live.debian.net/debian/.
3~ Using a customized live-boot
To modify the code you can follow the process below. Please ensure you are
-familiar with the terms mentioned in terms.
-
-% FIXME: <xref linkend="terms"/>
+familiar with the terms mentioned in {Terms}#terms .
_* Checkout the live-boot source
diff --git a/manual/en/about_manual.ssi b/manual/en/about_manual.ssi
index 5a3ef6b..3e06d2e 100644
--- a/manual/en/about_manual.ssi
+++ b/manual/en/about_manual.ssi
@@ -6,7 +6,7 @@ The main goal of this manual is to serve as a single access point to all documen
Some of the commands mentioned in the text must be executed with superuser privileges which can be obtained by becoming the root user via #{su}# or by using #{sudo}#. To distinguish between commands which may be executed by an unprivileged user and those requiring superuser privileges, commands are prepended by #{$}# or #{#}# respectively. This symbol is not a part of the command.
-2~ Terms
+2~terms Terms
_* *{Live system}*: An operating system that can boot without installation to a hard drive. Live systems do not alter local operating system(s) or file(s) already installed on the computer hard drive unless instructed to do so. Live systems are typically booted from media such as CDs, DVDs or USB sticks. Some may also boot over the network.
diff --git a/manual/en/user_basics.ssi b/manual/en/user_basics.ssi
index e928176..4590f82 100644
--- a/manual/en/user_basics.ssi
+++ b/manual/en/user_basics.ssi
@@ -6,9 +6,7 @@ This chapter contains a brief overview of the build process as well as containin
2~ What is a live system?
-A live system usually means an operating system booted on a computer from a removable medium (such as CD-ROM, USB stick, or network), ready to use without any installation on the usual drive(s), with an auto-configuration done at runtime (see terms).
-
-% FIXME: <xref linkend="terms"/>
+A live system usually means an operating system booted on a computer from a removable medium (such as CD-ROM, USB stick, or network), ready to use without any installation on the usual drive(s), with an auto-configuration done at runtime (see {Terms}#terms ).
With Debian Live, it's a Debian GNU/Linux operating system, built for one of the supported architectures (currently amd64, i386, powerpc and sparc). It is made from following parts:
@@ -38,9 +36,7 @@ $ lb config
}code
-By passing no parameters to #{lb config}# we indicated that we wish to use the defaults (see lb-config).
-
-% FIXME: <xref linkend="lb-config"/>
+By passing no parameters to #{lb config}# we indicated that we wish to use the defaults (see {The lb config command}#lb-config ).
Now that we have a "config/" hierarchy, we may build the image with the lb build command:
@@ -50,9 +46,7 @@ code{
}code
-This process can take a while, depending on the speed of your network connection (see lb-build).
-
-% FIXME: <xref linkend="lb-build"/>
+This process can take a while, depending on the speed of your network connection (see {The lb build command}#lb-build ).
3~ Testing an ISO image with Qemu
@@ -106,9 +100,7 @@ $ wodim binary.iso
The following sequence of commands will create a basic USB/HDD image containing just the Debian standard system without X.org. It is suitable for booting from USB sticks, USB hard drives, and various other portable storage devices.
-Note if you created an iso image with the previous example, you will need to clean up your working directory with the #{lb clean} command (see lb-clean):
-
-% FIXME: <xref linkend="lb-clean"/>
+Note if you created an iso image with the previous example, you will need to clean up your working directory with the #{lb clean} command (see {The lb clean command}#lb-clean ):
code{
diff --git a/manual/en/user_installation.ssi b/manual/en/user_installation.ssi
index b9cf2f3..7e246b7 100644
--- a/manual/en/user_installation.ssi
+++ b/manual/en/user_installation.ssi
@@ -96,9 +96,7 @@ If you do not wish to build or install live-build from source, you can use snaps
3~ Using a customized live-boot
-To modify the code you can follow the process below. Please ensure you are familiar with the terms mentioned in terms.
-
-% FIXME: <xref linkend="terms"/>
+To modify the code you can follow the process below. Please ensure you are familiar with the terms mentioned in {Terms}#terms .
_* Checkout the live-boot source
diff --git a/manual/fr/user_basics.ssi b/manual/fr/user_basics.ssi
index 94336f1..aef09b7 100644
--- a/manual/fr/user_basics.ssi
+++ b/manual/fr/user_basics.ssi
@@ -10,9 +10,7 @@ containing instructions on how to boot the various binary image types.
A live system usually means an operating system booted on a computer from a
removable medium (such as CD-ROM, USB stick, or network), ready to use
without any installation on the usual drive(s), with an auto-configuration
-done at runtime (see terms).
-
-% FIXME: <xref linkend="terms"/>
+done at runtime (see {Terms}#terms ).
With Debian Live, it's a Debian GNU/Linux operating system, built for one of
the supported architectures (currently amd64, i386, powerpc and sparc). It
@@ -65,9 +63,7 @@ $ lb config
}code
By passing no parameters to #{lb config}# we indicated that we wish to use
-the defaults (see lb-config).
-
-% FIXME: <xref linkend="lb-config"/>
+the defaults (see {The lb config command}#lb-config ).
Now that we have a "config/" hierarchy, we may build the image with the lb
build command:
@@ -79,9 +75,7 @@ code{
}code
This process can take a while, depending on the speed of your network
-connection (see lb-build).
-
-% FIXME: <xref linkend="lb-build"/>
+connection (see {The lb build command}#lb-build ).
3~ Testing an ISO image with Qemu
@@ -144,9 +138,8 @@ booting from USB sticks, USB hard drives, and various other portable storage
devices.
Note if you created an iso image with the previous example, you will need to
-clean up your working directory with the #{lb clean} command (see lb-clean):
-
-% FIXME: <xref linkend="lb-clean"/>
+clean up your working directory with the #{lb clean} command (see {The lb
+clean command}#lb-clean ):
code{
diff --git a/manual/fr/user_installation.ssi b/manual/fr/user_installation.ssi
index 0bbef7d..9869ff4 100644
--- a/manual/fr/user_installation.ssi
+++ b/manual/fr/user_installation.ssi
@@ -101,9 +101,7 @@ are available on http://live.debian.net/debian/.
3~ Using a customized live-boot
To modify the code you can follow the process below. Please ensure you are
-familiar with the terms mentioned in terms.
-
-% FIXME: <xref linkend="terms"/>
+familiar with the terms mentioned in {Terms}#terms .
_* Checkout the live-boot source
diff --git a/manual/po/de/about_manual.ssi.po b/manual/po/de/about_manual.ssi.po
index 121c3d9..e5f634b 100644
--- a/manual/po/de/about_manual.ssi.po
+++ b/manual/po/de/about_manual.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-22 08:45-0200\n"
+"POT-Creation-Date: 2010-10-22 20:34-0200\n"
"PO-Revision-Date: 2010-10-22 08:36-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -48,7 +48,7 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:10
-msgid "2~ Terms"
+msgid "2~terms Terms"
msgstr ""
#. type: Plain text
@@ -297,15 +297,15 @@ msgstr ""
#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
-#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111 en/user_basics.ssi:36
-#: en/user_basics.ssi:48 en/user_basics.ssi:62 en/user_basics.ssi:74
-#: en/user_basics.ssi:86 en/user_basics.ssi:98 en/user_basics.ssi:114
-#: en/user_basics.ssi:122 en/user_basics.ssi:130 en/user_basics.ssi:140
-#: en/user_basics.ssi:152 en/user_basics.ssi:164 en/user_basics.ssi:172
-#: en/user_basics.ssi:180 en/user_basics.ssi:194 en/user_basics.ssi:202
-#: en/user_basics.ssi:212 en/user_basics.ssi:232 en/user_basics.ssi:265
-#: en/user_basics.ssi:281 en/user_basics.ssi:289 en/user_basics.ssi:309
-#: en/user_basics.ssi:334 en/user_customization-contents.ssi:34
+#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111 en/user_basics.ssi:34
+#: en/user_basics.ssi:44 en/user_basics.ssi:56 en/user_basics.ssi:68
+#: en/user_basics.ssi:80 en/user_basics.ssi:92 en/user_basics.ssi:106
+#: en/user_basics.ssi:114 en/user_basics.ssi:122 en/user_basics.ssi:132
+#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
+#: en/user_basics.ssi:172 en/user_basics.ssi:186 en/user_basics.ssi:194
+#: en/user_basics.ssi:204 en/user_basics.ssi:224 en/user_basics.ssi:257
+#: en/user_basics.ssi:273 en/user_basics.ssi:281 en/user_basics.ssi:301
+#: en/user_basics.ssi:326 en/user_customization-contents.ssi:34
#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
#: en/user_customization-internationalization.ssi:10
#: en/user_customization-internationalization.ssi:18
@@ -323,8 +323,8 @@ msgstr ""
#: 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:106
-#: en/user_installation.ssi:120 en/user_installation.ssi:137
+#: en/user_installation.ssi:84 en/user_installation.ssi:104
+#: en/user_installation.ssi:118 en/user_installation.ssi:135
#: en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:46
@@ -362,14 +362,14 @@ msgstr ""
#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
#: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
#: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
-#: en/other_use-cases.ssi:137 en/user_basics.ssi:40 en/user_basics.ssi:52
-#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:92
-#: en/user_basics.ssi:104 en/user_basics.ssi:118 en/user_basics.ssi:126
-#: en/user_basics.ssi:134 en/user_basics.ssi:144 en/user_basics.ssi:158
-#: en/user_basics.ssi:168 en/user_basics.ssi:176 en/user_basics.ssi:184
-#: en/user_basics.ssi:198 en/user_basics.ssi:206 en/user_basics.ssi:216
-#: en/user_basics.ssi:257 en/user_basics.ssi:269 en/user_basics.ssi:285
-#: en/user_basics.ssi:293 en/user_basics.ssi:320 en/user_basics.ssi:359
+#: en/other_use-cases.ssi:137 en/user_basics.ssi:38 en/user_basics.ssi:48
+#: en/user_basics.ssi:62 en/user_basics.ssi:72 en/user_basics.ssi:86
+#: en/user_basics.ssi:98 en/user_basics.ssi:110 en/user_basics.ssi:118
+#: en/user_basics.ssi:126 en/user_basics.ssi:136 en/user_basics.ssi:150
+#: en/user_basics.ssi:160 en/user_basics.ssi:168 en/user_basics.ssi:176
+#: en/user_basics.ssi:190 en/user_basics.ssi:198 en/user_basics.ssi:208
+#: en/user_basics.ssi:249 en/user_basics.ssi:261 en/user_basics.ssi:277
+#: en/user_basics.ssi:285 en/user_basics.ssi:312 en/user_basics.ssi:351
#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
#: en/user_customization-contents.ssi:70
#: en/user_customization-internationalization.ssi:14
@@ -388,8 +388,8 @@ msgstr ""
#: 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:110
-#: en/user_installation.ssi:125 en/user_installation.ssi:140
+#: en/user_installation.ssi:88 en/user_installation.ssi:108
+#: en/user_installation.ssi:123 en/user_installation.ssi:138
#: en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:84
diff --git a/manual/po/de/user_basics.ssi.po b/manual/po/de/user_basics.ssi.po
index 388ddd5..a36669f 100644
--- a/manual/po/de/user_basics.ssi.po
+++ b/manual/po/de/user_basics.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-20 06:53-0200\n"
+"POT-Creation-Date: 2010-10-22 20:34-0200\n"
"PO-Revision-Date: 2010-10-03 20:30+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -17,9 +17,9 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. type: Plain text
-#: en/about_manual.ssi:83 en/about_manual.ssi:91 en/about_manual.ssi:99
-#: en/about_manual.ssi:111 en/about_manual.ssi:124 en/about_manual.ssi:137
-#: en/about_manual.ssi:145 en/about_manual.ssi:153 en/about_manual.ssi:161
+#: 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/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
@@ -41,15 +41,15 @@ msgstr ""
#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
-#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111 en/user_basics.ssi:36
-#: en/user_basics.ssi:48 en/user_basics.ssi:62 en/user_basics.ssi:74
-#: en/user_basics.ssi:86 en/user_basics.ssi:98 en/user_basics.ssi:114
-#: en/user_basics.ssi:122 en/user_basics.ssi:130 en/user_basics.ssi:140
-#: en/user_basics.ssi:152 en/user_basics.ssi:164 en/user_basics.ssi:172
-#: en/user_basics.ssi:180 en/user_basics.ssi:194 en/user_basics.ssi:202
-#: en/user_basics.ssi:212 en/user_basics.ssi:232 en/user_basics.ssi:265
-#: en/user_basics.ssi:281 en/user_basics.ssi:289 en/user_basics.ssi:309
-#: en/user_basics.ssi:334 en/user_customization-contents.ssi:34
+#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111 en/user_basics.ssi:34
+#: en/user_basics.ssi:44 en/user_basics.ssi:56 en/user_basics.ssi:68
+#: en/user_basics.ssi:80 en/user_basics.ssi:92 en/user_basics.ssi:106
+#: en/user_basics.ssi:114 en/user_basics.ssi:122 en/user_basics.ssi:132
+#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
+#: en/user_basics.ssi:172 en/user_basics.ssi:186 en/user_basics.ssi:194
+#: en/user_basics.ssi:204 en/user_basics.ssi:224 en/user_basics.ssi:257
+#: en/user_basics.ssi:273 en/user_basics.ssi:281 en/user_basics.ssi:301
+#: en/user_basics.ssi:326 en/user_customization-contents.ssi:34
#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
#: en/user_customization-internationalization.ssi:10
#: en/user_customization-internationalization.ssi:18
@@ -67,19 +67,19 @@ msgstr ""
#: 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:106
-#: en/user_installation.ssi:120 en/user_installation.ssi:137
+#: 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:60
-#: en/user_overview.ssi:104 en/user_overview.ssi:112
+#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:46
+#: en/user_overview.ssi:90 en/user_overview.ssi:98
msgid "code{"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:87 en/about_manual.ssi:95 en/about_manual.ssi:103
-#: en/about_manual.ssi:120 en/about_manual.ssi:133 en/about_manual.ssi:141
-#: en/about_manual.ssi:149 en/about_manual.ssi:157 en/about_manual.ssi:164
+#: 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/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,14 +101,14 @@ msgstr ""
#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
#: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
#: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
-#: en/other_use-cases.ssi:137 en/user_basics.ssi:40 en/user_basics.ssi:52
-#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:92
-#: en/user_basics.ssi:104 en/user_basics.ssi:118 en/user_basics.ssi:126
-#: en/user_basics.ssi:134 en/user_basics.ssi:144 en/user_basics.ssi:158
-#: en/user_basics.ssi:168 en/user_basics.ssi:176 en/user_basics.ssi:184
-#: en/user_basics.ssi:198 en/user_basics.ssi:206 en/user_basics.ssi:216
-#: en/user_basics.ssi:257 en/user_basics.ssi:269 en/user_basics.ssi:285
-#: en/user_basics.ssi:293 en/user_basics.ssi:320 en/user_basics.ssi:359
+#: en/other_use-cases.ssi:137 en/user_basics.ssi:38 en/user_basics.ssi:48
+#: en/user_basics.ssi:62 en/user_basics.ssi:72 en/user_basics.ssi:86
+#: en/user_basics.ssi:98 en/user_basics.ssi:110 en/user_basics.ssi:118
+#: en/user_basics.ssi:126 en/user_basics.ssi:136 en/user_basics.ssi:150
+#: en/user_basics.ssi:160 en/user_basics.ssi:168 en/user_basics.ssi:176
+#: en/user_basics.ssi:190 en/user_basics.ssi:198 en/user_basics.ssi:208
+#: en/user_basics.ssi:249 en/user_basics.ssi:261 en/user_basics.ssi:277
+#: en/user_basics.ssi:285 en/user_basics.ssi:312 en/user_basics.ssi:351
#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
#: en/user_customization-contents.ssi:70
#: en/user_customization-internationalization.ssi:14
@@ -127,12 +127,12 @@ msgstr ""
#: 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:110
-#: en/user_installation.ssi:125 en/user_installation.ssi:140
+#: 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:98
-#: en/user_overview.ssi:108 en/user_overview.ssi:116
+#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:84
+#: en/user_overview.ssi:94 en/user_overview.ssi:102
msgid "}code"
msgstr ""
@@ -164,17 +164,11 @@ msgid ""
"A live system usually means an operating system booted on a computer from a "
"removable medium (such as CD-ROM, USB stick, or network), ready to use "
"without any installation on the usual drive(s), with an auto-configuration "
-"done at runtime (see terms)."
+"done at runtime (see {Terms}#terms )."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:12 en/user_customization-contents.ssi:26
-#: en/user_installation.ssi:102
-msgid "% FIXME: <xref linkend=\"terms\"/>"
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:14
+#: en/user_basics.ssi:12
msgid ""
"With Debian Live, it's a Debian GNU/Linux operating system, built for one of "
"the supported architectures (currently amd64, i386, powerpc and sparc). It "
@@ -182,17 +176,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:16
+#: en/user_basics.ssi:14
msgid "_* Linux kernel"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:18
+#: en/user_basics.ssi:16
msgid "_* The Linux image, usually named #{vmlinuz*}#"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:20
+#: en/user_basics.ssi:18
msgid ""
"_* *{Initial RAM disk image (initrd)}*: RAM disk setup for the Linux boot, "
"containing modules possibly needed to mount the filesystem's image and some "
@@ -200,7 +194,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:22
+#: en/user_basics.ssi:20
msgid ""
"_* *{System image}*: The operating systems filesystem image. The SquashFS "
"compressed filesystem is used to minimize the Debian Live image size. Note "
@@ -211,12 +205,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:24
+#: en/user_basics.ssi:22
msgid "% FIXME: <xref linkend=\"persistence\"/>"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:26
+#: en/user_basics.ssi:24
msgid ""
"_* *{Bootloader}*: A small piece of code, crafted to boot up from the chosen "
"media, possibly presenting a prompt or menu to allow selection of options/"
@@ -230,7 +224,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:28
+#: en/user_basics.ssi:26
msgid ""
"_* live-build will build the system image from your specifications, setup a "
"Linux kernel and its initrd, a bootloader to run them, all in one media-"
@@ -238,12 +232,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:30
+#: en/user_basics.ssi:28
msgid "2~ First steps: building an ISO image"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:32
+#: en/user_basics.ssi:30
msgid ""
"The following sequence of commands, provided by live-build, will create a "
"basic ISO image containing just the Debian standard system without X.org. It "
@@ -251,104 +245,94 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:34
+#: en/user_basics.ssi:32
msgid ""
"First, we run the #{lb config}# command which will create a \"config/\" "
"hierarchy in the current directory for use by other commands:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:38
+#: en/user_basics.ssi:36
msgid "$ lb config"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:42
+#: en/user_basics.ssi:40
msgid ""
"By passing no parameters to #{lb config}# we indicated that we wish to use "
-"the defaults (see lb-config)."
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:44 en/user_overview.ssi:22 en/user_overview.ssi:42
-msgid "% FIXME: <xref linkend=\"lb-config\"/>"
+"the defaults (see {The lb config command}#lb-config )."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:46
+#: en/user_basics.ssi:42
msgid ""
"Now that we have a \"config/\" hierarchy, we may build the image with the lb "
"build command:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:50 en/user_basics.ssi:132 en/user_basics.ssi:214
+#: en/user_basics.ssi:46 en/user_basics.ssi:124 en/user_basics.ssi:206
msgid "# lb build"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:54
+#: en/user_basics.ssi:50
msgid ""
"This process can take a while, depending on the speed of your network "
-"connection (see lb-build)."
+"connection (see {The lb build command}#lb-build )."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:56 en/user_overview.ssi:46
-msgid "% FIXME: <xref linkend=\"lb-build\"/>"
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:58
+#: en/user_basics.ssi:52
msgid "3~ Testing an ISO image with Qemu"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:60
+#: en/user_basics.ssi:54
msgid "Testing an ISO is simple:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:64 en/user_basics.ssi:154
+#: en/user_basics.ssi:58 en/user_basics.ssi:146
msgid "# apt-get install qemu"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:66
+#: en/user_basics.ssi:60
msgid "$ qemu -cdrom binary.iso"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:70
+#: en/user_basics.ssi:64
msgid "3~ Testing an ISO image with virtualbox-ose"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:72
+#: en/user_basics.ssi:66
msgid "In order to test the ISO with virtualbox-ose:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:76
+#: en/user_basics.ssi:70
msgid "# apt-get install virtualbox-ose"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:80
+#: en/user_basics.ssi:74
msgid ""
"and either install #{virtualbox-ose-source}# or #{virtualbox-ose-dkms}# to "
"build the required kernel modules to run virtualbox-ose."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:82
+#: en/user_basics.ssi:76
msgid ""
"After successful installation, virtualbox can be e.g. found in the GNOME "
"menu under 'Applications/System Tools/VirtualBox OSE'."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:84
+#: en/user_basics.ssi:78
msgid ""
"Please consider including of following packages onto the live image to "
"achieve higher resolution of the display when booting the live image in "
@@ -358,38 +342,38 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:90
+#: en/user_basics.ssi:84
msgid ""
"virtualbox-ose-guest-dkms virtualbox-ose-guest-utils virtualbox-ose-guest-x11"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:94
+#: en/user_basics.ssi:88
msgid "3~ Burning an ISO image to a physical medium"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:96
+#: en/user_basics.ssi:90
msgid "Burning an ISO image is easy:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:100
+#: en/user_basics.ssi:94
msgid "# apt-get install wodim"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:102
+#: en/user_basics.ssi:96
msgid "$ wodim binary.iso"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:106
+#: en/user_basics.ssi:100
msgid "2~ Building an USB/HDD image"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:108
+#: en/user_basics.ssi:102
msgid ""
"The following sequence of commands will create a basic USB/HDD image "
"containing just the Debian standard system without X.org. It is suitable for "
@@ -398,46 +382,42 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:110
+#: en/user_basics.ssi:104
msgid ""
"Note if you created an iso image with the previous example, you will need to "
-"clean up your working directory with the #{lb clean} command (see lb-clean):"
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:112
-msgid "% FIXME: <xref linkend=\"lb-clean\"/>"
+"clean up your working directory with the #{lb clean} command (see {The lb "
+"clean command}#lb-clean ):"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:116 en/user_basics.ssi:196
+#: en/user_basics.ssi:108 en/user_basics.ssi:188
msgid "$ lb clean --binary"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:120
+#: en/user_basics.ssi:112
msgid ""
"Run the #{lb config}# command with the parameters to configure the \"config/"
"\" hierarchy to create a USB/HDD image type:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:124
+#: en/user_basics.ssi:116
msgid "$ lb config -b usb-hdd"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:128
+#: en/user_basics.ssi:120
msgid "Now build the image with the #{lb build} command:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:136
+#: en/user_basics.ssi:128
msgid "3~ Copying USB/HDD image to a USB stick"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:138
+#: en/user_basics.ssi:130
msgid ""
"The generated binary image contains a VFAT partition and the syslinux "
"bootloader, ready to be directly written on an USB stick. Plug in an USB "
@@ -445,12 +425,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:142
+#: en/user_basics.ssi:134
msgid "$ dd if=binary.img of=${USBSTICK}"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:146
+#: en/user_basics.ssi:138
msgid ""
"where #{${USBSTICK}}# is the device file of your key, like #{/dev/sdb}# (not "
"a partition like #{/dev/sdb1}#!); you can find the right device name by "
@@ -458,28 +438,28 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:148
+#: en/user_basics.ssi:140
#, no-wrap
msgid "*{This will definitely overwrite any previous contents on your stick!}*\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:150
+#: en/user_basics.ssi:142
msgid "3~ Testing a USB/HDD image with Qemu"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:156
+#: en/user_basics.ssi:148
msgid "$ qemu -hda binary.img"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:160
+#: en/user_basics.ssi:152
msgid "3~ Using the space left on a USB stick"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:162
+#: en/user_basics.ssi:154
msgid ""
"If you want to use the remaining free space after you have installed the "
"binary.img, you can use a partitioning tool such as #{gparted}# or #{parted}"
@@ -488,45 +468,45 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:166
+#: en/user_basics.ssi:158
msgid "# gparted ${USBSTICK}"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:170
+#: en/user_basics.ssi:162
msgid ""
"Ater the creation of the partition you have to create a filsystem on it. One "
"possible choice would be ext4."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:174
+#: en/user_basics.ssi:166
msgid "# mkfs.ext4 ${USBSTICK}"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:178
+#: en/user_basics.ssi:170
msgid "If you want to use this data partition with Windows, use FAT32."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:182
+#: en/user_basics.ssi:174
msgid "# mkfs.vfat -F 32"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:186
+#: en/user_basics.ssi:178
#, no-wrap
msgid "*{Remember: Every time you install a new binary.img on the stick, all your data will be lost because the image includes a complete partition table.}*\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:188
+#: en/user_basics.ssi:180
msgid "2~ Building a netboot image"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:190
+#: en/user_basics.ssi:182
msgid ""
"The following sequence of commands will create a basic netboot image "
"containing the Debian standard system without X.org. It is suitable for "
@@ -534,28 +514,28 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:192
+#: en/user_basics.ssi:184
msgid ""
"Note if you performed any previous examples, you will need to clean up your "
"working directory with the #{lb clean}# command:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:200
+#: en/user_basics.ssi:192
msgid ""
"Run the #{lb config}# command with the parameters to configure the \"config/"
"\" hierarchy to create our netboot image:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:204
+#: en/user_basics.ssi:196
msgid ""
"$ lb config -b net --net-root-path \"/srv/debian-live\" --net-root-server "
"\"192.168.0.1\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:208
+#: en/user_basics.ssi:200
msgid ""
"In contrast with the ISO and USB hdd images, netbooting does not support "
"serving a filesystem image with the client so the files must be served via "
@@ -565,12 +545,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:210
+#: en/user_basics.ssi:202
msgid "Now build the image with the #{lb build}# command:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:218
+#: en/user_basics.ssi:210
msgid ""
"In a network boot the client runs a small piece of software, which usually "
"resides on the EPROM of the Ethernet card. This program sends a DHCP request "
@@ -581,7 +561,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:220
+#: en/user_basics.ssi:212
msgid ""
"For example, if you unpack the generated binary-net.tar.gz archive in the /"
"srv/debian-live directory, you'll find the filesystem image in live/"
@@ -590,17 +570,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:222
+#: en/user_basics.ssi:214
msgid "We must now configure three services on the server to enable netboot."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:224
+#: en/user_basics.ssi:216
msgid "3~ DHCP server"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:226
+#: en/user_basics.ssi:218
msgid ""
"We must configure our network's DHCP server to be sure to give an IP address "
"to the computer netbooting, and to advertise the location of the PXE "
@@ -608,25 +588,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:228
+#: en/user_basics.ssi:220
msgid ""
"Here is an example for inspiration, written for the ISC DHCP server #{isc-"
"dhcp-server}# in the /etc/dhcp/dhcpd.conf configuration file;"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:230 en/user_customization-packages.ssi:153
+#: en/user_basics.ssi:222 en/user_customization-packages.ssi:153
msgid "% FIXME"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:234
+#: en/user_basics.ssi:226
#, no-wrap
msgid "subnet 192.168.1.0 netmask 255.255.255.0 { # 192.168.1.0/24\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:237
+#: en/user_basics.ssi:229
#, no-wrap
msgid ""
" # IP addresses available for guests\n"
@@ -634,7 +614,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:240
+#: en/user_basics.ssi:232
#, no-wrap
msgid ""
" # allow booting from the net\n"
@@ -642,7 +622,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:245
+#: en/user_basics.ssi:237
#, no-wrap
msgid ""
" # for net booting, server where the first file to be loaded (by TFTP\n"
@@ -652,7 +632,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:249
+#: en/user_basics.ssi:241
#, no-wrap
msgid ""
" # net boot configuration for guests with a PXE client:\n"
@@ -661,7 +641,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:252
+#: en/user_basics.ssi:244
#, no-wrap
msgid ""
" # PXE boot loader (first program to be loaded, by TFTP)\n"
@@ -669,7 +649,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:255
+#: en/user_basics.ssi:247
#, no-wrap
msgid ""
" }\n"
@@ -677,17 +657,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:259
+#: en/user_basics.ssi:251
msgid "3~ TFTP server"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:261
+#: en/user_basics.ssi:253
msgid "This serves the kernel and initial ramdisk to the system at run-time."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:263
+#: en/user_basics.ssi:255
msgid ""
"You should install the tftpd-hpa package. It can serve all files contained "
"inside a root directory, usually /srv/tftp. To let it serve files inside /"
@@ -695,22 +675,22 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:267
+#: en/user_basics.ssi:259
msgid "dpkg-reconfigure -plow tftpd-hpa"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:271
+#: en/user_basics.ssi:263
msgid "and fill in the new tftp server directory when being asked about it."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:273
+#: en/user_basics.ssi:265
msgid "3~ NFS server"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:275
+#: en/user_basics.ssi:267
msgid ""
"Once the guest computer has downloaded and booted a Linux kernel and loaded "
"its initrd, it will try to mount the Live filesystem image through a NFS "
@@ -718,35 +698,35 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:277
+#: en/user_basics.ssi:269
msgid "You need to install the nfs-kernel-server package."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:279
+#: en/user_basics.ssi:271
msgid ""
"Then, make the filesystem image available through NFS by adding a line like "
"the following to /etc/exports:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:283
+#: en/user_basics.ssi:275
msgid "/srv/debian-live *(ro,async,no_root_squash,no_subtree_check)"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:287
+#: en/user_basics.ssi:279
msgid ""
"and tell the NFS server about this new export with the following command:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:291
+#: en/user_basics.ssi:283
msgid "# exportfs -rv"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:295
+#: en/user_basics.ssi:287
msgid ""
"Setting up these three services can be a little tricky. You might need some "
"patience to get all of them working together. The Debian Installer Manual's "
@@ -755,40 +735,40 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:297
+#: en/user_basics.ssi:289
msgid "3~ Netboot testing HowTo"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:299
+#: en/user_basics.ssi:291
msgid ""
"Netboot image creation is made easy with live-build magic, but testing the "
"images on physical machines can be really time consuming."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:301
+#: en/user_basics.ssi:293
msgid ""
"To make our life easier, we can use virtualization. There are two solutions."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:303
+#: en/user_basics.ssi:295
msgid "3~ Qemu"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:305
+#: en/user_basics.ssi:297
msgid "_* Install qemu, bridge-utils, sudo."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:307
+#: en/user_basics.ssi:299
msgid "Edit /etc/qemu-ifup:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:318
+#: en/user_basics.ssi:310
msgid ""
"#!/bin/sh sudo -p \"Password for $0:\" /sbin/ifconfig $1 172.20.0.1 echo "
"\"Executing /etc/qemu-ifup\" echo \"Bringing up $1 for bridged mode...\" "
@@ -797,62 +777,62 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:322
+#: en/user_basics.ssi:314
msgid "Get, or build a grub-floppy-netboot (in the svn)."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:324
+#: en/user_basics.ssi:316
msgid "Launch qemu with \"-net nic,vlan=0 -net tap,vlan=0,ifname=tun0\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:326
+#: en/user_basics.ssi:318
msgid "3~ VMWare Player"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:328
+#: en/user_basics.ssi:320
msgid "_* Install VMWare Player (\"free as in beer\" edition)"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:330
+#: en/user_basics.ssi:322
msgid ""
"_* Create a PXETester directory, and create a text file called pxe.vwx inside"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:332
+#: en/user_basics.ssi:324
msgid "_* Paste this text inside:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:340
+#: en/user_basics.ssi:332
msgid ""
"#!/usr/bin/vmware config.version = \"8\" virtualHW.version = \"4\" memsize = "
"\"512\" MemAllowAutoScaleDown = \"FALSE\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:346
+#: en/user_basics.ssi:338
msgid ""
"ide0:0.present = \"FALSE\" ide1:0.present = \"FALSE\" floppy0.present = "
"\"FALSE\" sound.present = \"FALSE\" tools.remindInstall = \"FALSE\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:349
+#: en/user_basics.ssi:341
msgid "ethernet0.present = \"TRUE\" ethernet0.addressType = \"generated\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:352
+#: en/user_basics.ssi:344
msgid "displayName = \"Test Boot PXE\" guestOS = \"other\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:357
+#: en/user_basics.ssi:349
msgid ""
"ethernet0.generatedAddress = \"00:0c:29:8d:71:3b\" uuid.location = \"56 4d "
"83 72 5c c4 de 3f-ae 9e 07 91 1d 8d 71 3b\" uuid.bios = \"56 4d 83 72 5c c4 "
@@ -860,19 +840,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:361
+#: en/user_basics.ssi:353
msgid ""
"_* You can play with this configuration file (i.e. change memory limit to "
"256)"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:363
+#: en/user_basics.ssi:355
msgid ""
"_* Double click on this file (or run VMWare player and selecet this file)."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:364
+#: en/user_basics.ssi:356
msgid "_* When running just press space if that strange question comes up..."
msgstr ""
diff --git a/manual/po/de/user_customization-contents.ssi.po b/manual/po/de/user_customization-contents.ssi.po
index d4788fd..acd7808 100644
--- a/manual/po/de/user_customization-contents.ssi.po
+++ b/manual/po/de/user_customization-contents.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-22 07:52-0200\n"
+"POT-Creation-Date: 2010-10-22 20:34-0200\n"
"PO-Revision-Date: 2010-10-03 20:30+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -41,15 +41,15 @@ msgstr ""
#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
-#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111 en/user_basics.ssi:36
-#: en/user_basics.ssi:48 en/user_basics.ssi:62 en/user_basics.ssi:74
-#: en/user_basics.ssi:86 en/user_basics.ssi:98 en/user_basics.ssi:114
-#: en/user_basics.ssi:122 en/user_basics.ssi:130 en/user_basics.ssi:140
-#: en/user_basics.ssi:152 en/user_basics.ssi:164 en/user_basics.ssi:172
-#: en/user_basics.ssi:180 en/user_basics.ssi:194 en/user_basics.ssi:202
-#: en/user_basics.ssi:212 en/user_basics.ssi:232 en/user_basics.ssi:265
-#: en/user_basics.ssi:281 en/user_basics.ssi:289 en/user_basics.ssi:309
-#: en/user_basics.ssi:334 en/user_customization-contents.ssi:34
+#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111 en/user_basics.ssi:34
+#: en/user_basics.ssi:44 en/user_basics.ssi:56 en/user_basics.ssi:68
+#: en/user_basics.ssi:80 en/user_basics.ssi:92 en/user_basics.ssi:106
+#: en/user_basics.ssi:114 en/user_basics.ssi:122 en/user_basics.ssi:132
+#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
+#: en/user_basics.ssi:172 en/user_basics.ssi:186 en/user_basics.ssi:194
+#: en/user_basics.ssi:204 en/user_basics.ssi:224 en/user_basics.ssi:257
+#: en/user_basics.ssi:273 en/user_basics.ssi:281 en/user_basics.ssi:301
+#: en/user_basics.ssi:326 en/user_customization-contents.ssi:34
#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
#: en/user_customization-internationalization.ssi:10
#: en/user_customization-internationalization.ssi:18
@@ -67,8 +67,8 @@ msgstr ""
#: 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:106
-#: en/user_installation.ssi:120 en/user_installation.ssi:137
+#: en/user_installation.ssi:84 en/user_installation.ssi:104
+#: en/user_installation.ssi:118 en/user_installation.ssi:135
#: en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:46
@@ -101,14 +101,14 @@ msgstr ""
#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
#: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
#: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
-#: en/other_use-cases.ssi:137 en/user_basics.ssi:40 en/user_basics.ssi:52
-#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:92
-#: en/user_basics.ssi:104 en/user_basics.ssi:118 en/user_basics.ssi:126
-#: en/user_basics.ssi:134 en/user_basics.ssi:144 en/user_basics.ssi:158
-#: en/user_basics.ssi:168 en/user_basics.ssi:176 en/user_basics.ssi:184
-#: en/user_basics.ssi:198 en/user_basics.ssi:206 en/user_basics.ssi:216
-#: en/user_basics.ssi:257 en/user_basics.ssi:269 en/user_basics.ssi:285
-#: en/user_basics.ssi:293 en/user_basics.ssi:320 en/user_basics.ssi:359
+#: en/other_use-cases.ssi:137 en/user_basics.ssi:38 en/user_basics.ssi:48
+#: en/user_basics.ssi:62 en/user_basics.ssi:72 en/user_basics.ssi:86
+#: en/user_basics.ssi:98 en/user_basics.ssi:110 en/user_basics.ssi:118
+#: en/user_basics.ssi:126 en/user_basics.ssi:136 en/user_basics.ssi:150
+#: en/user_basics.ssi:160 en/user_basics.ssi:168 en/user_basics.ssi:176
+#: en/user_basics.ssi:190 en/user_basics.ssi:198 en/user_basics.ssi:208
+#: en/user_basics.ssi:249 en/user_basics.ssi:261 en/user_basics.ssi:277
+#: en/user_basics.ssi:285 en/user_basics.ssi:312 en/user_basics.ssi:351
#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
#: en/user_customization-contents.ssi:70
#: en/user_customization-internationalization.ssi:14
@@ -127,8 +127,8 @@ msgstr ""
#: 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:110
-#: en/user_installation.ssi:125 en/user_installation.ssi:140
+#: en/user_installation.ssi:88 en/user_installation.ssi:108
+#: en/user_installation.ssi:123 en/user_installation.ssi:138
#: en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:84
@@ -137,12 +137,6 @@ msgid "}code"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:12 en/user_customization-contents.ssi:26
-#: en/user_installation.ssi:102
-msgid "% FIXME: <xref linkend=\"terms\"/>"
-msgstr ""
-
-#. type: Plain text
#: en/user_customization-contents.ssi:2 en/user_customization-overview.ssi:2
msgid "B~ Customizing contents"
msgstr ""
@@ -215,6 +209,11 @@ msgid ""
msgstr ""
#. type: Plain text
+#: en/user_customization-contents.ssi:26
+msgid "% FIXME: <xref linkend=\"terms\"/>"
+msgstr ""
+
+#. type: Plain text
#: en/user_customization-contents.ssi:28
msgid "3~ Live/chroot local includes"
msgstr ""
diff --git a/manual/po/de/user_installation.ssi.po b/manual/po/de/user_installation.ssi.po
index cc642c2..9bb4ca5 100644
--- a/manual/po/de/user_installation.ssi.po
+++ b/manual/po/de/user_installation.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-16 20:36-0200\n"
+"POT-Creation-Date: 2010-10-22 20:34-0200\n"
"PO-Revision-Date: 2010-10-03 20:30+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -17,9 +17,9 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. type: Plain text
-#: en/about_manual.ssi:83 en/about_manual.ssi:91 en/about_manual.ssi:99
-#: en/about_manual.ssi:111 en/about_manual.ssi:124 en/about_manual.ssi:137
-#: en/about_manual.ssi:145 en/about_manual.ssi:153 en/about_manual.ssi:161
+#: 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/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
@@ -41,15 +41,15 @@ msgstr ""
#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
-#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111 en/user_basics.ssi:36
-#: en/user_basics.ssi:48 en/user_basics.ssi:62 en/user_basics.ssi:74
-#: en/user_basics.ssi:86 en/user_basics.ssi:98 en/user_basics.ssi:114
-#: en/user_basics.ssi:122 en/user_basics.ssi:130 en/user_basics.ssi:140
-#: en/user_basics.ssi:152 en/user_basics.ssi:164 en/user_basics.ssi:172
-#: en/user_basics.ssi:180 en/user_basics.ssi:194 en/user_basics.ssi:202
-#: en/user_basics.ssi:212 en/user_basics.ssi:232 en/user_basics.ssi:265
-#: en/user_basics.ssi:281 en/user_basics.ssi:289 en/user_basics.ssi:309
-#: en/user_basics.ssi:334 en/user_customization-contents.ssi:34
+#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111 en/user_basics.ssi:34
+#: en/user_basics.ssi:44 en/user_basics.ssi:56 en/user_basics.ssi:68
+#: en/user_basics.ssi:80 en/user_basics.ssi:92 en/user_basics.ssi:106
+#: en/user_basics.ssi:114 en/user_basics.ssi:122 en/user_basics.ssi:132
+#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
+#: en/user_basics.ssi:172 en/user_basics.ssi:186 en/user_basics.ssi:194
+#: en/user_basics.ssi:204 en/user_basics.ssi:224 en/user_basics.ssi:257
+#: en/user_basics.ssi:273 en/user_basics.ssi:281 en/user_basics.ssi:301
+#: en/user_basics.ssi:326 en/user_customization-contents.ssi:34
#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
#: en/user_customization-internationalization.ssi:10
#: en/user_customization-internationalization.ssi:18
@@ -67,19 +67,19 @@ msgstr ""
#: 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:106
-#: en/user_installation.ssi:120 en/user_installation.ssi:137
+#: 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:60
-#: en/user_overview.ssi:104 en/user_overview.ssi:112
+#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:46
+#: en/user_overview.ssi:90 en/user_overview.ssi:98
msgid "code{"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:87 en/about_manual.ssi:95 en/about_manual.ssi:103
-#: en/about_manual.ssi:120 en/about_manual.ssi:133 en/about_manual.ssi:141
-#: en/about_manual.ssi:149 en/about_manual.ssi:157 en/about_manual.ssi:164
+#: 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/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,14 +101,14 @@ msgstr ""
#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
#: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
#: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
-#: en/other_use-cases.ssi:137 en/user_basics.ssi:40 en/user_basics.ssi:52
-#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:92
-#: en/user_basics.ssi:104 en/user_basics.ssi:118 en/user_basics.ssi:126
-#: en/user_basics.ssi:134 en/user_basics.ssi:144 en/user_basics.ssi:158
-#: en/user_basics.ssi:168 en/user_basics.ssi:176 en/user_basics.ssi:184
-#: en/user_basics.ssi:198 en/user_basics.ssi:206 en/user_basics.ssi:216
-#: en/user_basics.ssi:257 en/user_basics.ssi:285 en/user_basics.ssi:293
-#: en/user_basics.ssi:320 en/user_basics.ssi:359
+#: en/other_use-cases.ssi:137 en/user_basics.ssi:38 en/user_basics.ssi:48
+#: en/user_basics.ssi:62 en/user_basics.ssi:72 en/user_basics.ssi:86
+#: en/user_basics.ssi:98 en/user_basics.ssi:110 en/user_basics.ssi:118
+#: en/user_basics.ssi:126 en/user_basics.ssi:136 en/user_basics.ssi:150
+#: en/user_basics.ssi:160 en/user_basics.ssi:168 en/user_basics.ssi:176
+#: en/user_basics.ssi:190 en/user_basics.ssi:198 en/user_basics.ssi:208
+#: en/user_basics.ssi:249 en/user_basics.ssi:261 en/user_basics.ssi:277
+#: en/user_basics.ssi:285 en/user_basics.ssi:312 en/user_basics.ssi:351
#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
#: en/user_customization-contents.ssi:70
#: en/user_customization-internationalization.ssi:14
@@ -127,22 +127,16 @@ msgstr ""
#: 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:110
-#: en/user_installation.ssi:125 en/user_installation.ssi:140
+#: 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:98
-#: en/user_overview.ssi:108 en/user_overview.ssi:116
+#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:84
+#: en/user_overview.ssi:94 en/user_overview.ssi:102
msgid "}code"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:12 en/user_customization-contents.ssi:26
-#: en/user_installation.ssi:102
-msgid "% FIXME: <xref linkend=\"terms\"/>"
-msgstr ""
-
-#. type: Plain text
#: en/user_installation.ssi:2
msgid ":B~ Installation"
msgstr ""
@@ -337,26 +331,26 @@ msgstr ""
#: en/user_installation.ssi:100
msgid ""
"To modify the code you can follow the process below. Please ensure you are "
-"familiar with the terms mentioned in terms."
+"familiar with the terms mentioned in {Terms}#terms ."
msgstr ""
#. type: Plain text
-#: en/user_installation.ssi:104
+#: en/user_installation.ssi:102
msgid "_* Checkout the live-boot source"
msgstr ""
#. type: Plain text
-#: en/user_installation.ssi:108
+#: en/user_installation.ssi:106
msgid "$ git clone git://live.debian.net/git/live-boot.git"
msgstr ""
#. type: Plain text
-#: en/user_installation.ssi:112
+#: en/user_installation.ssi:110
msgid "_* Make changes to your local copy"
msgstr ""
#. type: Plain text
-#: en/user_installation.ssi:114
+#: en/user_installation.ssi:112
msgid ""
"And beware that if you want to add your pre-init script in live-bottom, you "
"should name it without dashes '-', e.g: call it \"99new_feature\" and not "
@@ -364,12 +358,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_installation.ssi:116
+#: en/user_installation.ssi:114
msgid "_* Build a live-boot .deb"
msgstr ""
#. type: Plain text
-#: en/user_installation.ssi:118
+#: en/user_installation.ssi:116
msgid ""
"You must build either on your target distribution or in a chroot containing "
"your target platform: this means if your target is Squeeze then you should "
@@ -380,17 +374,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_installation.ssi:123
+#: en/user_installation.ssi:121
msgid "$ cd live-boot $ dpkg-buildpackage -rfakeroot -b -uc -us"
msgstr ""
#. type: Plain text
-#: en/user_installation.ssi:127
+#: en/user_installation.ssi:125
msgid "_* Use the generated live-boot .deb"
msgstr ""
#. type: Plain text
-#: en/user_installation.ssi:129
+#: en/user_installation.ssi:127
msgid ""
"As live-boot is installed by live-build system, installing the package in "
"the host system is not sufficient: you should treat the generated .deb like "
@@ -399,19 +393,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_installation.ssi:131
+#: en/user_installation.ssi:129
msgid ""
"% FIXME: <xref linkend=\"custom-packages\"/> <xref linkend=\"custom-packages-"
"apt\"/>"
msgstr ""
#. type: Plain text
-#: en/user_installation.ssi:133
+#: en/user_installation.ssi:131
msgid "3~ Using live-boot snapshots"
msgstr ""
#. type: Plain text
-#: en/user_installation.ssi:135
+#: en/user_installation.ssi:133
msgid ""
"You can let live-build automatically use the latest snapshot of live-boot by "
"configuring a third-party repository in your live-build configuration "
@@ -420,6 +414,6 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_installation.ssi:139
+#: en/user_installation.ssi:137
msgid "lb config --repository live.debian.net"
msgstr ""
diff --git a/manual/po/fr/about_manual.ssi.po b/manual/po/fr/about_manual.ssi.po
index b3fc1df..9093c67 100644
--- a/manual/po/fr/about_manual.ssi.po
+++ b/manual/po/fr/about_manual.ssi.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual 2.0~a8\n"
-"POT-Creation-Date: 2010-10-22 08:45-0200\n"
+"POT-Creation-Date: 2010-10-22 20:34-0200\n"
"PO-Revision-Date: 2010-10-21 19:15+0100\n"
"Last-Translator: Christophe Siraut <chris at tobald.eu.org>\n"
"Language-Team: none\n"
@@ -58,7 +58,7 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:10
-msgid "2~ Terms"
+msgid "2~terms Terms"
msgstr "2~ Terminologie"
#. type: Plain text
@@ -359,15 +359,15 @@ msgstr ""
#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
-#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111 en/user_basics.ssi:36
-#: en/user_basics.ssi:48 en/user_basics.ssi:62 en/user_basics.ssi:74
-#: en/user_basics.ssi:86 en/user_basics.ssi:98 en/user_basics.ssi:114
-#: en/user_basics.ssi:122 en/user_basics.ssi:130 en/user_basics.ssi:140
-#: en/user_basics.ssi:152 en/user_basics.ssi:164 en/user_basics.ssi:172
-#: en/user_basics.ssi:180 en/user_basics.ssi:194 en/user_basics.ssi:202
-#: en/user_basics.ssi:212 en/user_basics.ssi:232 en/user_basics.ssi:265
-#: en/user_basics.ssi:281 en/user_basics.ssi:289 en/user_basics.ssi:309
-#: en/user_basics.ssi:334 en/user_customization-contents.ssi:34
+#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111 en/user_basics.ssi:34
+#: en/user_basics.ssi:44 en/user_basics.ssi:56 en/user_basics.ssi:68
+#: en/user_basics.ssi:80 en/user_basics.ssi:92 en/user_basics.ssi:106
+#: en/user_basics.ssi:114 en/user_basics.ssi:122 en/user_basics.ssi:132
+#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
+#: en/user_basics.ssi:172 en/user_basics.ssi:186 en/user_basics.ssi:194
+#: en/user_basics.ssi:204 en/user_basics.ssi:224 en/user_basics.ssi:257
+#: en/user_basics.ssi:273 en/user_basics.ssi:281 en/user_basics.ssi:301
+#: en/user_basics.ssi:326 en/user_customization-contents.ssi:34
#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
#: en/user_customization-internationalization.ssi:10
#: en/user_customization-internationalization.ssi:18
@@ -385,8 +385,8 @@ msgstr ""
#: 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:106
-#: en/user_installation.ssi:120 en/user_installation.ssi:137
+#: en/user_installation.ssi:84 en/user_installation.ssi:104
+#: en/user_installation.ssi:118 en/user_installation.ssi:135
#: en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:46
@@ -424,14 +424,14 @@ msgstr "$ git clone git://live.debian.net/git/live-manual.git"
#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
#: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
#: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
-#: en/other_use-cases.ssi:137 en/user_basics.ssi:40 en/user_basics.ssi:52
-#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:92
-#: en/user_basics.ssi:104 en/user_basics.ssi:118 en/user_basics.ssi:126
-#: en/user_basics.ssi:134 en/user_basics.ssi:144 en/user_basics.ssi:158
-#: en/user_basics.ssi:168 en/user_basics.ssi:176 en/user_basics.ssi:184
-#: en/user_basics.ssi:198 en/user_basics.ssi:206 en/user_basics.ssi:216
-#: en/user_basics.ssi:257 en/user_basics.ssi:269 en/user_basics.ssi:285
-#: en/user_basics.ssi:293 en/user_basics.ssi:320 en/user_basics.ssi:359
+#: en/other_use-cases.ssi:137 en/user_basics.ssi:38 en/user_basics.ssi:48
+#: en/user_basics.ssi:62 en/user_basics.ssi:72 en/user_basics.ssi:86
+#: en/user_basics.ssi:98 en/user_basics.ssi:110 en/user_basics.ssi:118
+#: en/user_basics.ssi:126 en/user_basics.ssi:136 en/user_basics.ssi:150
+#: en/user_basics.ssi:160 en/user_basics.ssi:168 en/user_basics.ssi:176
+#: en/user_basics.ssi:190 en/user_basics.ssi:198 en/user_basics.ssi:208
+#: en/user_basics.ssi:249 en/user_basics.ssi:261 en/user_basics.ssi:277
+#: en/user_basics.ssi:285 en/user_basics.ssi:312 en/user_basics.ssi:351
#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
#: en/user_customization-contents.ssi:70
#: en/user_customization-internationalization.ssi:14
@@ -450,8 +450,8 @@ msgstr "$ git clone git://live.debian.net/git/live-manual.git"
#: 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:110
-#: en/user_installation.ssi:125 en/user_installation.ssi:140
+#: en/user_installation.ssi:88 en/user_installation.ssi:108
+#: en/user_installation.ssi:123 en/user_installation.ssi:138
#: en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:84
diff --git a/manual/po/fr/user_basics.ssi.po b/manual/po/fr/user_basics.ssi.po
index 4d8a4c4..80a3527 100644
--- a/manual/po/fr/user_basics.ssi.po
+++ b/manual/po/fr/user_basics.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-20 06:53-0200\n"
+"POT-Creation-Date: 2010-10-22 20:34-0200\n"
"PO-Revision-Date: 2010-10-20 06:53-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -17,9 +17,9 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#. type: Plain text
-#: en/about_manual.ssi:83 en/about_manual.ssi:91 en/about_manual.ssi:99
-#: en/about_manual.ssi:111 en/about_manual.ssi:124 en/about_manual.ssi:137
-#: en/about_manual.ssi:145 en/about_manual.ssi:153 en/about_manual.ssi:161
+#: 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/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
@@ -41,15 +41,15 @@ msgstr ""
#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
-#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111 en/user_basics.ssi:36
-#: en/user_basics.ssi:48 en/user_basics.ssi:62 en/user_basics.ssi:74
-#: en/user_basics.ssi:86 en/user_basics.ssi:98 en/user_basics.ssi:114
-#: en/user_basics.ssi:122 en/user_basics.ssi:130 en/user_basics.ssi:140
-#: en/user_basics.ssi:152 en/user_basics.ssi:164 en/user_basics.ssi:172
-#: en/user_basics.ssi:180 en/user_basics.ssi:194 en/user_basics.ssi:202
-#: en/user_basics.ssi:212 en/user_basics.ssi:232 en/user_basics.ssi:265
-#: en/user_basics.ssi:281 en/user_basics.ssi:289 en/user_basics.ssi:309
-#: en/user_basics.ssi:334 en/user_customization-contents.ssi:34
+#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111 en/user_basics.ssi:34
+#: en/user_basics.ssi:44 en/user_basics.ssi:56 en/user_basics.ssi:68
+#: en/user_basics.ssi:80 en/user_basics.ssi:92 en/user_basics.ssi:106
+#: en/user_basics.ssi:114 en/user_basics.ssi:122 en/user_basics.ssi:132
+#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
+#: en/user_basics.ssi:172 en/user_basics.ssi:186 en/user_basics.ssi:194
+#: en/user_basics.ssi:204 en/user_basics.ssi:224 en/user_basics.ssi:257
+#: en/user_basics.ssi:273 en/user_basics.ssi:281 en/user_basics.ssi:301
+#: en/user_basics.ssi:326 en/user_customization-contents.ssi:34
#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
#: en/user_customization-internationalization.ssi:10
#: en/user_customization-internationalization.ssi:18
@@ -67,19 +67,19 @@ msgstr ""
#: 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:106
-#: en/user_installation.ssi:120 en/user_installation.ssi:137
+#: 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:60
-#: en/user_overview.ssi:104 en/user_overview.ssi:112
+#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:46
+#: en/user_overview.ssi:90 en/user_overview.ssi:98
msgid "code{"
msgstr "code{"
#. type: Plain text
-#: en/about_manual.ssi:87 en/about_manual.ssi:95 en/about_manual.ssi:103
-#: en/about_manual.ssi:120 en/about_manual.ssi:133 en/about_manual.ssi:141
-#: en/about_manual.ssi:149 en/about_manual.ssi:157 en/about_manual.ssi:164
+#: 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/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,14 +101,14 @@ msgstr "code{"
#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
#: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
#: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
-#: en/other_use-cases.ssi:137 en/user_basics.ssi:40 en/user_basics.ssi:52
-#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:92
-#: en/user_basics.ssi:104 en/user_basics.ssi:118 en/user_basics.ssi:126
-#: en/user_basics.ssi:134 en/user_basics.ssi:144 en/user_basics.ssi:158
-#: en/user_basics.ssi:168 en/user_basics.ssi:176 en/user_basics.ssi:184
-#: en/user_basics.ssi:198 en/user_basics.ssi:206 en/user_basics.ssi:216
-#: en/user_basics.ssi:257 en/user_basics.ssi:269 en/user_basics.ssi:285
-#: en/user_basics.ssi:293 en/user_basics.ssi:320 en/user_basics.ssi:359
+#: en/other_use-cases.ssi:137 en/user_basics.ssi:38 en/user_basics.ssi:48
+#: en/user_basics.ssi:62 en/user_basics.ssi:72 en/user_basics.ssi:86
+#: en/user_basics.ssi:98 en/user_basics.ssi:110 en/user_basics.ssi:118
+#: en/user_basics.ssi:126 en/user_basics.ssi:136 en/user_basics.ssi:150
+#: en/user_basics.ssi:160 en/user_basics.ssi:168 en/user_basics.ssi:176
+#: en/user_basics.ssi:190 en/user_basics.ssi:198 en/user_basics.ssi:208
+#: en/user_basics.ssi:249 en/user_basics.ssi:261 en/user_basics.ssi:277
+#: en/user_basics.ssi:285 en/user_basics.ssi:312 en/user_basics.ssi:351
#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
#: en/user_customization-contents.ssi:70
#: en/user_customization-internationalization.ssi:14
@@ -127,12 +127,12 @@ msgstr "code{"
#: 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:110
-#: en/user_installation.ssi:125 en/user_installation.ssi:140
+#: 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:98
-#: en/user_overview.ssi:108 en/user_overview.ssi:116
+#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:84
+#: en/user_overview.ssi:94 en/user_overview.ssi:102
msgid "}code"
msgstr "}code"
@@ -164,17 +164,11 @@ msgid ""
"A live system usually means an operating system booted on a computer from a "
"removable medium (such as CD-ROM, USB stick, or network), ready to use "
"without any installation on the usual drive(s), with an auto-configuration "
-"done at runtime (see terms)."
+"done at runtime (see {Terms}#terms )."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:12 en/user_customization-contents.ssi:26
-#: en/user_installation.ssi:102
-msgid "% FIXME: <xref linkend=\"terms\"/>"
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:14
+#: en/user_basics.ssi:12
msgid ""
"With Debian Live, it's a Debian GNU/Linux operating system, built for one of "
"the supported architectures (currently amd64, i386, powerpc and sparc). It "
@@ -182,17 +176,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:16
+#: en/user_basics.ssi:14
msgid "_* Linux kernel"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:18
+#: en/user_basics.ssi:16
msgid "_* The Linux image, usually named #{vmlinuz*}#"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:20
+#: en/user_basics.ssi:18
msgid ""
"_* *{Initial RAM disk image (initrd)}*: RAM disk setup for the Linux boot, "
"containing modules possibly needed to mount the filesystem's image and some "
@@ -200,7 +194,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:22
+#: en/user_basics.ssi:20
msgid ""
"_* *{System image}*: The operating systems filesystem image. The SquashFS "
"compressed filesystem is used to minimize the Debian Live image size. Note "
@@ -211,12 +205,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:24
+#: en/user_basics.ssi:22
msgid "% FIXME: <xref linkend=\"persistence\"/>"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:26
+#: en/user_basics.ssi:24
msgid ""
"_* *{Bootloader}*: A small piece of code, crafted to boot up from the chosen "
"media, possibly presenting a prompt or menu to allow selection of options/"
@@ -230,7 +224,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:28
+#: en/user_basics.ssi:26
msgid ""
"_* live-build will build the system image from your specifications, setup a "
"Linux kernel and its initrd, a bootloader to run them, all in one media-"
@@ -238,12 +232,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:30
+#: en/user_basics.ssi:28
msgid "2~ First steps: building an ISO image"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:32
+#: en/user_basics.ssi:30
msgid ""
"The following sequence of commands, provided by live-build, will create a "
"basic ISO image containing just the Debian standard system without X.org. It "
@@ -251,104 +245,94 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:34
+#: en/user_basics.ssi:32
msgid ""
"First, we run the #{lb config}# command which will create a \"config/\" "
"hierarchy in the current directory for use by other commands:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:38
+#: en/user_basics.ssi:36
msgid "$ lb config"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:42
+#: en/user_basics.ssi:40
msgid ""
"By passing no parameters to #{lb config}# we indicated that we wish to use "
-"the defaults (see lb-config)."
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:44 en/user_overview.ssi:22 en/user_overview.ssi:42
-msgid "% FIXME: <xref linkend=\"lb-config\"/>"
+"the defaults (see {The lb config command}#lb-config )."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:46
+#: en/user_basics.ssi:42
msgid ""
"Now that we have a \"config/\" hierarchy, we may build the image with the lb "
"build command:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:50 en/user_basics.ssi:132 en/user_basics.ssi:214
+#: en/user_basics.ssi:46 en/user_basics.ssi:124 en/user_basics.ssi:206
msgid "# lb build"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:54
+#: en/user_basics.ssi:50
msgid ""
"This process can take a while, depending on the speed of your network "
-"connection (see lb-build)."
+"connection (see {The lb build command}#lb-build )."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:56 en/user_overview.ssi:46
-msgid "% FIXME: <xref linkend=\"lb-build\"/>"
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:58
+#: en/user_basics.ssi:52
msgid "3~ Testing an ISO image with Qemu"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:60
+#: en/user_basics.ssi:54
msgid "Testing an ISO is simple:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:64 en/user_basics.ssi:154
+#: en/user_basics.ssi:58 en/user_basics.ssi:146
msgid "# apt-get install qemu"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:66
+#: en/user_basics.ssi:60
msgid "$ qemu -cdrom binary.iso"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:70
+#: en/user_basics.ssi:64
msgid "3~ Testing an ISO image with virtualbox-ose"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:72
+#: en/user_basics.ssi:66
msgid "In order to test the ISO with virtualbox-ose:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:76
+#: en/user_basics.ssi:70
msgid "# apt-get install virtualbox-ose"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:80
+#: en/user_basics.ssi:74
msgid ""
"and either install #{virtualbox-ose-source}# or #{virtualbox-ose-dkms}# to "
"build the required kernel modules to run virtualbox-ose."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:82
+#: en/user_basics.ssi:76
msgid ""
"After successful installation, virtualbox can be e.g. found in the GNOME "
"menu under 'Applications/System Tools/VirtualBox OSE'."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:84
+#: en/user_basics.ssi:78
msgid ""
"Please consider including of following packages onto the live image to "
"achieve higher resolution of the display when booting the live image in "
@@ -358,38 +342,38 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:90
+#: en/user_basics.ssi:84
msgid ""
"virtualbox-ose-guest-dkms virtualbox-ose-guest-utils virtualbox-ose-guest-x11"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:94
+#: en/user_basics.ssi:88
msgid "3~ Burning an ISO image to a physical medium"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:96
+#: en/user_basics.ssi:90
msgid "Burning an ISO image is easy:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:100
+#: en/user_basics.ssi:94
msgid "# apt-get install wodim"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:102
+#: en/user_basics.ssi:96
msgid "$ wodim binary.iso"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:106
+#: en/user_basics.ssi:100
msgid "2~ Building an USB/HDD image"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:108
+#: en/user_basics.ssi:102
msgid ""
"The following sequence of commands will create a basic USB/HDD image "
"containing just the Debian standard system without X.org. It is suitable for "
@@ -398,46 +382,42 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:110
+#: en/user_basics.ssi:104
msgid ""
"Note if you created an iso image with the previous example, you will need to "
-"clean up your working directory with the #{lb clean} command (see lb-clean):"
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:112
-msgid "% FIXME: <xref linkend=\"lb-clean\"/>"
+"clean up your working directory with the #{lb clean} command (see {The lb "
+"clean command}#lb-clean ):"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:116 en/user_basics.ssi:196
+#: en/user_basics.ssi:108 en/user_basics.ssi:188
msgid "$ lb clean --binary"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:120
+#: en/user_basics.ssi:112
msgid ""
"Run the #{lb config}# command with the parameters to configure the \"config/"
"\" hierarchy to create a USB/HDD image type:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:124
+#: en/user_basics.ssi:116
msgid "$ lb config -b usb-hdd"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:128
+#: en/user_basics.ssi:120
msgid "Now build the image with the #{lb build} command:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:136
+#: en/user_basics.ssi:128
msgid "3~ Copying USB/HDD image to a USB stick"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:138
+#: en/user_basics.ssi:130
msgid ""
"The generated binary image contains a VFAT partition and the syslinux "
"bootloader, ready to be directly written on an USB stick. Plug in an USB "
@@ -445,12 +425,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:142
+#: en/user_basics.ssi:134
msgid "$ dd if=binary.img of=${USBSTICK}"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:146
+#: en/user_basics.ssi:138
msgid ""
"where #{${USBSTICK}}# is the device file of your key, like #{/dev/sdb}# (not "
"a partition like #{/dev/sdb1}#!); you can find the right device name by "
@@ -458,28 +438,28 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:148
+#: en/user_basics.ssi:140
#, no-wrap
msgid "*{This will definitely overwrite any previous contents on your stick!}*\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:150
+#: en/user_basics.ssi:142
msgid "3~ Testing a USB/HDD image with Qemu"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:156
+#: en/user_basics.ssi:148
msgid "$ qemu -hda binary.img"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:160
+#: en/user_basics.ssi:152
msgid "3~ Using the space left on a USB stick"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:162
+#: en/user_basics.ssi:154
msgid ""
"If you want to use the remaining free space after you have installed the "
"binary.img, you can use a partitioning tool such as #{gparted}# or #{parted}"
@@ -488,45 +468,45 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:166
+#: en/user_basics.ssi:158
msgid "# gparted ${USBSTICK}"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:170
+#: en/user_basics.ssi:162
msgid ""
"Ater the creation of the partition you have to create a filsystem on it. One "
"possible choice would be ext4."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:174
+#: en/user_basics.ssi:166
msgid "# mkfs.ext4 ${USBSTICK}"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:178
+#: en/user_basics.ssi:170
msgid "If you want to use this data partition with Windows, use FAT32."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:182
+#: en/user_basics.ssi:174
msgid "# mkfs.vfat -F 32"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:186
+#: en/user_basics.ssi:178
#, no-wrap
msgid "*{Remember: Every time you install a new binary.img on the stick, all your data will be lost because the image includes a complete partition table.}*\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:188
+#: en/user_basics.ssi:180
msgid "2~ Building a netboot image"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:190
+#: en/user_basics.ssi:182
msgid ""
"The following sequence of commands will create a basic netboot image "
"containing the Debian standard system without X.org. It is suitable for "
@@ -534,28 +514,28 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:192
+#: en/user_basics.ssi:184
msgid ""
"Note if you performed any previous examples, you will need to clean up your "
"working directory with the #{lb clean}# command:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:200
+#: en/user_basics.ssi:192
msgid ""
"Run the #{lb config}# command with the parameters to configure the \"config/"
"\" hierarchy to create our netboot image:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:204
+#: en/user_basics.ssi:196
msgid ""
"$ lb config -b net --net-root-path \"/srv/debian-live\" --net-root-server "
"\"192.168.0.1\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:208
+#: en/user_basics.ssi:200
msgid ""
"In contrast with the ISO and USB hdd images, netbooting does not support "
"serving a filesystem image with the client so the files must be served via "
@@ -565,12 +545,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:210
+#: en/user_basics.ssi:202
msgid "Now build the image with the #{lb build}# command:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:218
+#: en/user_basics.ssi:210
msgid ""
"In a network boot the client runs a small piece of software, which usually "
"resides on the EPROM of the Ethernet card. This program sends a DHCP request "
@@ -581,7 +561,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:220
+#: en/user_basics.ssi:212
msgid ""
"For example, if you unpack the generated binary-net.tar.gz archive in the /"
"srv/debian-live directory, you'll find the filesystem image in live/"
@@ -590,17 +570,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:222
+#: en/user_basics.ssi:214
msgid "We must now configure three services on the server to enable netboot."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:224
+#: en/user_basics.ssi:216
msgid "3~ DHCP server"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:226
+#: en/user_basics.ssi:218
msgid ""
"We must configure our network's DHCP server to be sure to give an IP address "
"to the computer netbooting, and to advertise the location of the PXE "
@@ -608,25 +588,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:228
+#: en/user_basics.ssi:220
msgid ""
"Here is an example for inspiration, written for the ISC DHCP server #{isc-"
"dhcp-server}# in the /etc/dhcp/dhcpd.conf configuration file;"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:230 en/user_customization-packages.ssi:153
+#: en/user_basics.ssi:222 en/user_customization-packages.ssi:153
msgid "% FIXME"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:234
+#: en/user_basics.ssi:226
#, no-wrap
msgid "subnet 192.168.1.0 netmask 255.255.255.0 { # 192.168.1.0/24\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:237
+#: en/user_basics.ssi:229
#, no-wrap
msgid ""
" # IP addresses available for guests\n"
@@ -634,7 +614,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:240
+#: en/user_basics.ssi:232
#, no-wrap
msgid ""
" # allow booting from the net\n"
@@ -642,7 +622,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:245
+#: en/user_basics.ssi:237
#, no-wrap
msgid ""
" # for net booting, server where the first file to be loaded (by TFTP\n"
@@ -652,7 +632,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:249
+#: en/user_basics.ssi:241
#, no-wrap
msgid ""
" # net boot configuration for guests with a PXE client:\n"
@@ -661,7 +641,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:252
+#: en/user_basics.ssi:244
#, no-wrap
msgid ""
" # PXE boot loader (first program to be loaded, by TFTP)\n"
@@ -669,7 +649,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:255
+#: en/user_basics.ssi:247
#, no-wrap
msgid ""
" }\n"
@@ -677,17 +657,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:259
+#: en/user_basics.ssi:251
msgid "3~ TFTP server"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:261
+#: en/user_basics.ssi:253
msgid "This serves the kernel and initial ramdisk to the system at run-time."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:263
+#: en/user_basics.ssi:255
msgid ""
"You should install the tftpd-hpa package. It can serve all files contained "
"inside a root directory, usually /srv/tftp. To let it serve files inside /"
@@ -695,22 +675,22 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:267
+#: en/user_basics.ssi:259
msgid "dpkg-reconfigure -plow tftpd-hpa"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:271
+#: en/user_basics.ssi:263
msgid "and fill in the new tftp server directory when being asked about it."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:273
+#: en/user_basics.ssi:265
msgid "3~ NFS server"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:275
+#: en/user_basics.ssi:267
msgid ""
"Once the guest computer has downloaded and booted a Linux kernel and loaded "
"its initrd, it will try to mount the Live filesystem image through a NFS "
@@ -718,35 +698,35 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:277
+#: en/user_basics.ssi:269
msgid "You need to install the nfs-kernel-server package."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:279
+#: en/user_basics.ssi:271
msgid ""
"Then, make the filesystem image available through NFS by adding a line like "
"the following to /etc/exports:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:283
+#: en/user_basics.ssi:275
msgid "/srv/debian-live *(ro,async,no_root_squash,no_subtree_check)"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:287
+#: en/user_basics.ssi:279
msgid ""
"and tell the NFS server about this new export with the following command:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:291
+#: en/user_basics.ssi:283
msgid "# exportfs -rv"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:295
+#: en/user_basics.ssi:287
msgid ""
"Setting up these three services can be a little tricky. You might need some "
"patience to get all of them working together. The Debian Installer Manual's "
@@ -755,40 +735,40 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:297
+#: en/user_basics.ssi:289
msgid "3~ Netboot testing HowTo"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:299
+#: en/user_basics.ssi:291
msgid ""
"Netboot image creation is made easy with live-build magic, but testing the "
"images on physical machines can be really time consuming."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:301
+#: en/user_basics.ssi:293
msgid ""
"To make our life easier, we can use virtualization. There are two solutions."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:303
+#: en/user_basics.ssi:295
msgid "3~ Qemu"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:305
+#: en/user_basics.ssi:297
msgid "_* Install qemu, bridge-utils, sudo."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:307
+#: en/user_basics.ssi:299
msgid "Edit /etc/qemu-ifup:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:318
+#: en/user_basics.ssi:310
msgid ""
"#!/bin/sh sudo -p \"Password for $0:\" /sbin/ifconfig $1 172.20.0.1 echo "
"\"Executing /etc/qemu-ifup\" echo \"Bringing up $1 for bridged mode...\" "
@@ -797,62 +777,62 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:322
+#: en/user_basics.ssi:314
msgid "Get, or build a grub-floppy-netboot (in the svn)."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:324
+#: en/user_basics.ssi:316
msgid "Launch qemu with \"-net nic,vlan=0 -net tap,vlan=0,ifname=tun0\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:326
+#: en/user_basics.ssi:318
msgid "3~ VMWare Player"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:328
+#: en/user_basics.ssi:320
msgid "_* Install VMWare Player (\"free as in beer\" edition)"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:330
+#: en/user_basics.ssi:322
msgid ""
"_* Create a PXETester directory, and create a text file called pxe.vwx inside"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:332
+#: en/user_basics.ssi:324
msgid "_* Paste this text inside:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:340
+#: en/user_basics.ssi:332
msgid ""
"#!/usr/bin/vmware config.version = \"8\" virtualHW.version = \"4\" memsize = "
"\"512\" MemAllowAutoScaleDown = \"FALSE\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:346
+#: en/user_basics.ssi:338
msgid ""
"ide0:0.present = \"FALSE\" ide1:0.present = \"FALSE\" floppy0.present = "
"\"FALSE\" sound.present = \"FALSE\" tools.remindInstall = \"FALSE\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:349
+#: en/user_basics.ssi:341
msgid "ethernet0.present = \"TRUE\" ethernet0.addressType = \"generated\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:352
+#: en/user_basics.ssi:344
msgid "displayName = \"Test Boot PXE\" guestOS = \"other\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:357
+#: en/user_basics.ssi:349
msgid ""
"ethernet0.generatedAddress = \"00:0c:29:8d:71:3b\" uuid.location = \"56 4d "
"83 72 5c c4 de 3f-ae 9e 07 91 1d 8d 71 3b\" uuid.bios = \"56 4d 83 72 5c c4 "
@@ -860,19 +840,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:361
+#: en/user_basics.ssi:353
msgid ""
"_* You can play with this configuration file (i.e. change memory limit to "
"256)"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:363
+#: en/user_basics.ssi:355
msgid ""
"_* Double click on this file (or run VMWare player and selecet this file)."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:364
+#: en/user_basics.ssi:356
msgid "_* When running just press space if that strange question comes up..."
msgstr ""
diff --git a/manual/po/fr/user_customization-contents.ssi.po b/manual/po/fr/user_customization-contents.ssi.po
index 9acb92e..036037a 100644
--- a/manual/po/fr/user_customization-contents.ssi.po
+++ b/manual/po/fr/user_customization-contents.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-22 07:52-0200\n"
+"POT-Creation-Date: 2010-10-22 20:34-0200\n"
"PO-Revision-Date: 2010-10-16 14:45-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -41,15 +41,15 @@ msgstr ""
#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
-#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111 en/user_basics.ssi:36
-#: en/user_basics.ssi:48 en/user_basics.ssi:62 en/user_basics.ssi:74
-#: en/user_basics.ssi:86 en/user_basics.ssi:98 en/user_basics.ssi:114
-#: en/user_basics.ssi:122 en/user_basics.ssi:130 en/user_basics.ssi:140
-#: en/user_basics.ssi:152 en/user_basics.ssi:164 en/user_basics.ssi:172
-#: en/user_basics.ssi:180 en/user_basics.ssi:194 en/user_basics.ssi:202
-#: en/user_basics.ssi:212 en/user_basics.ssi:232 en/user_basics.ssi:265
-#: en/user_basics.ssi:281 en/user_basics.ssi:289 en/user_basics.ssi:309
-#: en/user_basics.ssi:334 en/user_customization-contents.ssi:34
+#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111 en/user_basics.ssi:34
+#: en/user_basics.ssi:44 en/user_basics.ssi:56 en/user_basics.ssi:68
+#: en/user_basics.ssi:80 en/user_basics.ssi:92 en/user_basics.ssi:106
+#: en/user_basics.ssi:114 en/user_basics.ssi:122 en/user_basics.ssi:132
+#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
+#: en/user_basics.ssi:172 en/user_basics.ssi:186 en/user_basics.ssi:194
+#: en/user_basics.ssi:204 en/user_basics.ssi:224 en/user_basics.ssi:257
+#: en/user_basics.ssi:273 en/user_basics.ssi:281 en/user_basics.ssi:301
+#: en/user_basics.ssi:326 en/user_customization-contents.ssi:34
#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
#: en/user_customization-internationalization.ssi:10
#: en/user_customization-internationalization.ssi:18
@@ -67,8 +67,8 @@ msgstr ""
#: 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:106
-#: en/user_installation.ssi:120 en/user_installation.ssi:137
+#: en/user_installation.ssi:84 en/user_installation.ssi:104
+#: en/user_installation.ssi:118 en/user_installation.ssi:135
#: en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:46
@@ -101,14 +101,14 @@ msgstr "code{"
#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
#: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
#: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
-#: en/other_use-cases.ssi:137 en/user_basics.ssi:40 en/user_basics.ssi:52
-#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:92
-#: en/user_basics.ssi:104 en/user_basics.ssi:118 en/user_basics.ssi:126
-#: en/user_basics.ssi:134 en/user_basics.ssi:144 en/user_basics.ssi:158
-#: en/user_basics.ssi:168 en/user_basics.ssi:176 en/user_basics.ssi:184
-#: en/user_basics.ssi:198 en/user_basics.ssi:206 en/user_basics.ssi:216
-#: en/user_basics.ssi:257 en/user_basics.ssi:269 en/user_basics.ssi:285
-#: en/user_basics.ssi:293 en/user_basics.ssi:320 en/user_basics.ssi:359
+#: en/other_use-cases.ssi:137 en/user_basics.ssi:38 en/user_basics.ssi:48
+#: en/user_basics.ssi:62 en/user_basics.ssi:72 en/user_basics.ssi:86
+#: en/user_basics.ssi:98 en/user_basics.ssi:110 en/user_basics.ssi:118
+#: en/user_basics.ssi:126 en/user_basics.ssi:136 en/user_basics.ssi:150
+#: en/user_basics.ssi:160 en/user_basics.ssi:168 en/user_basics.ssi:176
+#: en/user_basics.ssi:190 en/user_basics.ssi:198 en/user_basics.ssi:208
+#: en/user_basics.ssi:249 en/user_basics.ssi:261 en/user_basics.ssi:277
+#: en/user_basics.ssi:285 en/user_basics.ssi:312 en/user_basics.ssi:351
#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
#: en/user_customization-contents.ssi:70
#: en/user_customization-internationalization.ssi:14
@@ -127,8 +127,8 @@ msgstr "code{"
#: 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:110
-#: en/user_installation.ssi:125 en/user_installation.ssi:140
+#: en/user_installation.ssi:88 en/user_installation.ssi:108
+#: en/user_installation.ssi:123 en/user_installation.ssi:138
#: en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:84
@@ -137,12 +137,6 @@ msgid "}code"
msgstr "}code"
#. type: Plain text
-#: en/user_basics.ssi:12 en/user_customization-contents.ssi:26
-#: en/user_installation.ssi:102
-msgid "% FIXME: <xref linkend=\"terms\"/>"
-msgstr ""
-
-#. type: Plain text
#: en/user_customization-contents.ssi:2 en/user_customization-overview.ssi:2
msgid "B~ Customizing contents"
msgstr ""
@@ -215,6 +209,11 @@ msgid ""
msgstr ""
#. type: Plain text
+#: en/user_customization-contents.ssi:26
+msgid "% FIXME: <xref linkend=\"terms\"/>"
+msgstr ""
+
+#. type: Plain text
#: en/user_customization-contents.ssi:28
msgid "3~ Live/chroot local includes"
msgstr ""
diff --git a/manual/po/fr/user_installation.ssi.po b/manual/po/fr/user_installation.ssi.po
index 196bbd0..aa940f8 100644
--- a/manual/po/fr/user_installation.ssi.po
+++ b/manual/po/fr/user_installation.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-16 20:36-0200\n"
+"POT-Creation-Date: 2010-10-22 20:34-0200\n"
"PO-Revision-Date: 2010-10-16 20:36-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -17,9 +17,9 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#. type: Plain text
-#: en/about_manual.ssi:83 en/about_manual.ssi:91 en/about_manual.ssi:99
-#: en/about_manual.ssi:111 en/about_manual.ssi:124 en/about_manual.ssi:137
-#: en/about_manual.ssi:145 en/about_manual.ssi:153 en/about_manual.ssi:161
+#: 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/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
@@ -41,15 +41,15 @@ msgstr ""
#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
-#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111 en/user_basics.ssi:36
-#: en/user_basics.ssi:48 en/user_basics.ssi:62 en/user_basics.ssi:74
-#: en/user_basics.ssi:86 en/user_basics.ssi:98 en/user_basics.ssi:114
-#: en/user_basics.ssi:122 en/user_basics.ssi:130 en/user_basics.ssi:140
-#: en/user_basics.ssi:152 en/user_basics.ssi:164 en/user_basics.ssi:172
-#: en/user_basics.ssi:180 en/user_basics.ssi:194 en/user_basics.ssi:202
-#: en/user_basics.ssi:212 en/user_basics.ssi:232 en/user_basics.ssi:265
-#: en/user_basics.ssi:281 en/user_basics.ssi:289 en/user_basics.ssi:309
-#: en/user_basics.ssi:334 en/user_customization-contents.ssi:34
+#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111 en/user_basics.ssi:34
+#: en/user_basics.ssi:44 en/user_basics.ssi:56 en/user_basics.ssi:68
+#: en/user_basics.ssi:80 en/user_basics.ssi:92 en/user_basics.ssi:106
+#: en/user_basics.ssi:114 en/user_basics.ssi:122 en/user_basics.ssi:132
+#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
+#: en/user_basics.ssi:172 en/user_basics.ssi:186 en/user_basics.ssi:194
+#: en/user_basics.ssi:204 en/user_basics.ssi:224 en/user_basics.ssi:257
+#: en/user_basics.ssi:273 en/user_basics.ssi:281 en/user_basics.ssi:301
+#: en/user_basics.ssi:326 en/user_customization-contents.ssi:34
#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
#: en/user_customization-internationalization.ssi:10
#: en/user_customization-internationalization.ssi:18
@@ -67,19 +67,19 @@ msgstr ""
#: 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:106
-#: en/user_installation.ssi:120 en/user_installation.ssi:137
+#: 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:60
-#: en/user_overview.ssi:104 en/user_overview.ssi:112
+#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:46
+#: en/user_overview.ssi:90 en/user_overview.ssi:98
msgid "code{"
msgstr "code{"
#. type: Plain text
-#: en/about_manual.ssi:87 en/about_manual.ssi:95 en/about_manual.ssi:103
-#: en/about_manual.ssi:120 en/about_manual.ssi:133 en/about_manual.ssi:141
-#: en/about_manual.ssi:149 en/about_manual.ssi:157 en/about_manual.ssi:164
+#: 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/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,14 +101,14 @@ msgstr "code{"
#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
#: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
#: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
-#: en/other_use-cases.ssi:137 en/user_basics.ssi:40 en/user_basics.ssi:52
-#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:92
-#: en/user_basics.ssi:104 en/user_basics.ssi:118 en/user_basics.ssi:126
-#: en/user_basics.ssi:134 en/user_basics.ssi:144 en/user_basics.ssi:158
-#: en/user_basics.ssi:168 en/user_basics.ssi:176 en/user_basics.ssi:184
-#: en/user_basics.ssi:198 en/user_basics.ssi:206 en/user_basics.ssi:216
-#: en/user_basics.ssi:257 en/user_basics.ssi:285 en/user_basics.ssi:293
-#: en/user_basics.ssi:320 en/user_basics.ssi:359
+#: en/other_use-cases.ssi:137 en/user_basics.ssi:38 en/user_basics.ssi:48
+#: en/user_basics.ssi:62 en/user_basics.ssi:72 en/user_basics.ssi:86
+#: en/user_basics.ssi:98 en/user_basics.ssi:110 en/user_basics.ssi:118
+#: en/user_basics.ssi:126 en/user_basics.ssi:136 en/user_basics.ssi:150
+#: en/user_basics.ssi:160 en/user_basics.ssi:168 en/user_basics.ssi:176
+#: en/user_basics.ssi:190 en/user_basics.ssi:198 en/user_basics.ssi:208
+#: en/user_basics.ssi:249 en/user_basics.ssi:261 en/user_basics.ssi:277
+#: en/user_basics.ssi:285 en/user_basics.ssi:312 en/user_basics.ssi:351
#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
#: en/user_customization-contents.ssi:70
#: en/user_customization-internationalization.ssi:14
@@ -127,22 +127,16 @@ msgstr "code{"
#: 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:110
-#: en/user_installation.ssi:125 en/user_installation.ssi:140
+#: 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:98
-#: en/user_overview.ssi:108 en/user_overview.ssi:116
+#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:84
+#: en/user_overview.ssi:94 en/user_overview.ssi:102
msgid "}code"
msgstr "}code"
#. type: Plain text
-#: en/user_basics.ssi:12 en/user_customization-contents.ssi:26
-#: en/user_installation.ssi:102
-msgid "% FIXME: <xref linkend=\"terms\"/>"
-msgstr ""
-
-#. type: Plain text
#: en/user_installation.ssi:2
msgid ":B~ Installation"
msgstr ""
@@ -337,26 +331,26 @@ msgstr ""
#: en/user_installation.ssi:100
msgid ""
"To modify the code you can follow the process below. Please ensure you are "
-"familiar with the terms mentioned in terms."
+"familiar with the terms mentioned in {Terms}#terms ."
msgstr ""
#. type: Plain text
-#: en/user_installation.ssi:104
+#: en/user_installation.ssi:102
msgid "_* Checkout the live-boot source"
msgstr ""
#. type: Plain text
-#: en/user_installation.ssi:108
+#: en/user_installation.ssi:106
msgid "$ git clone git://live.debian.net/git/live-boot.git"
msgstr ""
#. type: Plain text
-#: en/user_installation.ssi:112
+#: en/user_installation.ssi:110
msgid "_* Make changes to your local copy"
msgstr ""
#. type: Plain text
-#: en/user_installation.ssi:114
+#: en/user_installation.ssi:112
msgid ""
"And beware that if you want to add your pre-init script in live-bottom, you "
"should name it without dashes '-', e.g: call it \"99new_feature\" and not "
@@ -364,12 +358,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_installation.ssi:116
+#: en/user_installation.ssi:114
msgid "_* Build a live-boot .deb"
msgstr ""
#. type: Plain text
-#: en/user_installation.ssi:118
+#: en/user_installation.ssi:116
msgid ""
"You must build either on your target distribution or in a chroot containing "
"your target platform: this means if your target is Squeeze then you should "
@@ -380,17 +374,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_installation.ssi:123
+#: en/user_installation.ssi:121
msgid "$ cd live-boot $ dpkg-buildpackage -rfakeroot -b -uc -us"
msgstr ""
#. type: Plain text
-#: en/user_installation.ssi:127
+#: en/user_installation.ssi:125
msgid "_* Use the generated live-boot .deb"
msgstr ""
#. type: Plain text
-#: en/user_installation.ssi:129
+#: en/user_installation.ssi:127
msgid ""
"As live-boot is installed by live-build system, installing the package in "
"the host system is not sufficient: you should treat the generated .deb like "
@@ -399,19 +393,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_installation.ssi:131
+#: en/user_installation.ssi:129
msgid ""
"% FIXME: <xref linkend=\"custom-packages\"/> <xref linkend=\"custom-packages-"
"apt\"/>"
msgstr ""
#. type: Plain text
-#: en/user_installation.ssi:133
+#: en/user_installation.ssi:131
msgid "3~ Using live-boot snapshots"
msgstr ""
#. type: Plain text
-#: en/user_installation.ssi:135
+#: en/user_installation.ssi:133
msgid ""
"You can let live-build automatically use the latest snapshot of live-boot by "
"configuring a third-party repository in your live-build configuration "
@@ -420,6 +414,6 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_installation.ssi:139
+#: en/user_installation.ssi:137
msgid "lb config --repository live.debian.net"
msgstr ""
diff --git a/manual/pot/about_manual.ssi.pot b/manual/pot/about_manual.ssi.pot
index 13d772d..ad3df70 100644
--- a/manual/pot/about_manual.ssi.pot
+++ b/manual/pot/about_manual.ssi.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-22 08:45-0200\n"
+"POT-Creation-Date: 2010-10-22 20:34-0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -48,7 +48,7 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:10
-msgid "2~ Terms"
+msgid "2~terms Terms"
msgstr ""
#. type: Plain text
@@ -297,15 +297,15 @@ msgstr ""
#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
-#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111 en/user_basics.ssi:36
-#: en/user_basics.ssi:48 en/user_basics.ssi:62 en/user_basics.ssi:74
-#: en/user_basics.ssi:86 en/user_basics.ssi:98 en/user_basics.ssi:114
-#: en/user_basics.ssi:122 en/user_basics.ssi:130 en/user_basics.ssi:140
-#: en/user_basics.ssi:152 en/user_basics.ssi:164 en/user_basics.ssi:172
-#: en/user_basics.ssi:180 en/user_basics.ssi:194 en/user_basics.ssi:202
-#: en/user_basics.ssi:212 en/user_basics.ssi:232 en/user_basics.ssi:265
-#: en/user_basics.ssi:281 en/user_basics.ssi:289 en/user_basics.ssi:309
-#: en/user_basics.ssi:334 en/user_customization-contents.ssi:34
+#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111 en/user_basics.ssi:34
+#: en/user_basics.ssi:44 en/user_basics.ssi:56 en/user_basics.ssi:68
+#: en/user_basics.ssi:80 en/user_basics.ssi:92 en/user_basics.ssi:106
+#: en/user_basics.ssi:114 en/user_basics.ssi:122 en/user_basics.ssi:132
+#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
+#: en/user_basics.ssi:172 en/user_basics.ssi:186 en/user_basics.ssi:194
+#: en/user_basics.ssi:204 en/user_basics.ssi:224 en/user_basics.ssi:257
+#: en/user_basics.ssi:273 en/user_basics.ssi:281 en/user_basics.ssi:301
+#: en/user_basics.ssi:326 en/user_customization-contents.ssi:34
#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
#: en/user_customization-internationalization.ssi:10
#: en/user_customization-internationalization.ssi:18
@@ -323,8 +323,8 @@ msgstr ""
#: 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:106
-#: en/user_installation.ssi:120 en/user_installation.ssi:137
+#: en/user_installation.ssi:84 en/user_installation.ssi:104
+#: en/user_installation.ssi:118 en/user_installation.ssi:135
#: en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:46
@@ -362,14 +362,14 @@ msgstr ""
#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
#: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
#: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
-#: en/other_use-cases.ssi:137 en/user_basics.ssi:40 en/user_basics.ssi:52
-#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:92
-#: en/user_basics.ssi:104 en/user_basics.ssi:118 en/user_basics.ssi:126
-#: en/user_basics.ssi:134 en/user_basics.ssi:144 en/user_basics.ssi:158
-#: en/user_basics.ssi:168 en/user_basics.ssi:176 en/user_basics.ssi:184
-#: en/user_basics.ssi:198 en/user_basics.ssi:206 en/user_basics.ssi:216
-#: en/user_basics.ssi:257 en/user_basics.ssi:269 en/user_basics.ssi:285
-#: en/user_basics.ssi:293 en/user_basics.ssi:320 en/user_basics.ssi:359
+#: en/other_use-cases.ssi:137 en/user_basics.ssi:38 en/user_basics.ssi:48
+#: en/user_basics.ssi:62 en/user_basics.ssi:72 en/user_basics.ssi:86
+#: en/user_basics.ssi:98 en/user_basics.ssi:110 en/user_basics.ssi:118
+#: en/user_basics.ssi:126 en/user_basics.ssi:136 en/user_basics.ssi:150
+#: en/user_basics.ssi:160 en/user_basics.ssi:168 en/user_basics.ssi:176
+#: en/user_basics.ssi:190 en/user_basics.ssi:198 en/user_basics.ssi:208
+#: en/user_basics.ssi:249 en/user_basics.ssi:261 en/user_basics.ssi:277
+#: en/user_basics.ssi:285 en/user_basics.ssi:312 en/user_basics.ssi:351
#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
#: en/user_customization-contents.ssi:70
#: en/user_customization-internationalization.ssi:14
@@ -388,8 +388,8 @@ msgstr ""
#: 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:110
-#: en/user_installation.ssi:125 en/user_installation.ssi:140
+#: en/user_installation.ssi:88 en/user_installation.ssi:108
+#: en/user_installation.ssi:123 en/user_installation.ssi:138
#: en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:84
diff --git a/manual/pot/user_basics.ssi.pot b/manual/pot/user_basics.ssi.pot
index 0dcd47e..e9cbc5a 100644
--- a/manual/pot/user_basics.ssi.pot
+++ b/manual/pot/user_basics.ssi.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-20 06:53-0200\n"
+"POT-Creation-Date: 2010-10-22 20:34-0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -17,9 +17,9 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#. type: Plain text
-#: en/about_manual.ssi:83 en/about_manual.ssi:91 en/about_manual.ssi:99
-#: en/about_manual.ssi:111 en/about_manual.ssi:124 en/about_manual.ssi:137
-#: en/about_manual.ssi:145 en/about_manual.ssi:153 en/about_manual.ssi:161
+#: 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/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
@@ -41,15 +41,15 @@ msgstr ""
#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
-#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111 en/user_basics.ssi:36
-#: en/user_basics.ssi:48 en/user_basics.ssi:62 en/user_basics.ssi:74
-#: en/user_basics.ssi:86 en/user_basics.ssi:98 en/user_basics.ssi:114
-#: en/user_basics.ssi:122 en/user_basics.ssi:130 en/user_basics.ssi:140
-#: en/user_basics.ssi:152 en/user_basics.ssi:164 en/user_basics.ssi:172
-#: en/user_basics.ssi:180 en/user_basics.ssi:194 en/user_basics.ssi:202
-#: en/user_basics.ssi:212 en/user_basics.ssi:232 en/user_basics.ssi:265
-#: en/user_basics.ssi:281 en/user_basics.ssi:289 en/user_basics.ssi:309
-#: en/user_basics.ssi:334 en/user_customization-contents.ssi:34
+#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111 en/user_basics.ssi:34
+#: en/user_basics.ssi:44 en/user_basics.ssi:56 en/user_basics.ssi:68
+#: en/user_basics.ssi:80 en/user_basics.ssi:92 en/user_basics.ssi:106
+#: en/user_basics.ssi:114 en/user_basics.ssi:122 en/user_basics.ssi:132
+#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
+#: en/user_basics.ssi:172 en/user_basics.ssi:186 en/user_basics.ssi:194
+#: en/user_basics.ssi:204 en/user_basics.ssi:224 en/user_basics.ssi:257
+#: en/user_basics.ssi:273 en/user_basics.ssi:281 en/user_basics.ssi:301
+#: en/user_basics.ssi:326 en/user_customization-contents.ssi:34
#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
#: en/user_customization-internationalization.ssi:10
#: en/user_customization-internationalization.ssi:18
@@ -67,19 +67,19 @@ msgstr ""
#: 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:106
-#: en/user_installation.ssi:120 en/user_installation.ssi:137
+#: 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:60
-#: en/user_overview.ssi:104 en/user_overview.ssi:112
+#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:46
+#: en/user_overview.ssi:90 en/user_overview.ssi:98
msgid "code{"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:87 en/about_manual.ssi:95 en/about_manual.ssi:103
-#: en/about_manual.ssi:120 en/about_manual.ssi:133 en/about_manual.ssi:141
-#: en/about_manual.ssi:149 en/about_manual.ssi:157 en/about_manual.ssi:164
+#: 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/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,14 +101,14 @@ msgstr ""
#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
#: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
#: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
-#: en/other_use-cases.ssi:137 en/user_basics.ssi:40 en/user_basics.ssi:52
-#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:92
-#: en/user_basics.ssi:104 en/user_basics.ssi:118 en/user_basics.ssi:126
-#: en/user_basics.ssi:134 en/user_basics.ssi:144 en/user_basics.ssi:158
-#: en/user_basics.ssi:168 en/user_basics.ssi:176 en/user_basics.ssi:184
-#: en/user_basics.ssi:198 en/user_basics.ssi:206 en/user_basics.ssi:216
-#: en/user_basics.ssi:257 en/user_basics.ssi:269 en/user_basics.ssi:285
-#: en/user_basics.ssi:293 en/user_basics.ssi:320 en/user_basics.ssi:359
+#: en/other_use-cases.ssi:137 en/user_basics.ssi:38 en/user_basics.ssi:48
+#: en/user_basics.ssi:62 en/user_basics.ssi:72 en/user_basics.ssi:86
+#: en/user_basics.ssi:98 en/user_basics.ssi:110 en/user_basics.ssi:118
+#: en/user_basics.ssi:126 en/user_basics.ssi:136 en/user_basics.ssi:150
+#: en/user_basics.ssi:160 en/user_basics.ssi:168 en/user_basics.ssi:176
+#: en/user_basics.ssi:190 en/user_basics.ssi:198 en/user_basics.ssi:208
+#: en/user_basics.ssi:249 en/user_basics.ssi:261 en/user_basics.ssi:277
+#: en/user_basics.ssi:285 en/user_basics.ssi:312 en/user_basics.ssi:351
#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
#: en/user_customization-contents.ssi:70
#: en/user_customization-internationalization.ssi:14
@@ -127,12 +127,12 @@ msgstr ""
#: 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:110
-#: en/user_installation.ssi:125 en/user_installation.ssi:140
+#: 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:98
-#: en/user_overview.ssi:108 en/user_overview.ssi:116
+#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:84
+#: en/user_overview.ssi:94 en/user_overview.ssi:102
msgid "}code"
msgstr ""
@@ -164,17 +164,11 @@ msgid ""
"A live system usually means an operating system booted on a computer from a "
"removable medium (such as CD-ROM, USB stick, or network), ready to use "
"without any installation on the usual drive(s), with an auto-configuration "
-"done at runtime (see terms)."
+"done at runtime (see {Terms}#terms )."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:12 en/user_customization-contents.ssi:26
-#: en/user_installation.ssi:102
-msgid "% FIXME: <xref linkend=\"terms\"/>"
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:14
+#: en/user_basics.ssi:12
msgid ""
"With Debian Live, it's a Debian GNU/Linux operating system, built for one of "
"the supported architectures (currently amd64, i386, powerpc and sparc). It "
@@ -182,17 +176,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:16
+#: en/user_basics.ssi:14
msgid "_* Linux kernel"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:18
+#: en/user_basics.ssi:16
msgid "_* The Linux image, usually named #{vmlinuz*}#"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:20
+#: en/user_basics.ssi:18
msgid ""
"_* *{Initial RAM disk image (initrd)}*: RAM disk setup for the Linux boot, "
"containing modules possibly needed to mount the filesystem's image and some "
@@ -200,7 +194,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:22
+#: en/user_basics.ssi:20
msgid ""
"_* *{System image}*: The operating systems filesystem image. The SquashFS "
"compressed filesystem is used to minimize the Debian Live image size. Note "
@@ -211,12 +205,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:24
+#: en/user_basics.ssi:22
msgid "% FIXME: <xref linkend=\"persistence\"/>"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:26
+#: en/user_basics.ssi:24
msgid ""
"_* *{Bootloader}*: A small piece of code, crafted to boot up from the chosen "
"media, possibly presenting a prompt or menu to allow selection of options/"
@@ -230,7 +224,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:28
+#: en/user_basics.ssi:26
msgid ""
"_* live-build will build the system image from your specifications, setup a "
"Linux kernel and its initrd, a bootloader to run them, all in one media-"
@@ -238,12 +232,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:30
+#: en/user_basics.ssi:28
msgid "2~ First steps: building an ISO image"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:32
+#: en/user_basics.ssi:30
msgid ""
"The following sequence of commands, provided by live-build, will create a "
"basic ISO image containing just the Debian standard system without X.org. It "
@@ -251,104 +245,94 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:34
+#: en/user_basics.ssi:32
msgid ""
"First, we run the #{lb config}# command which will create a \"config/\" "
"hierarchy in the current directory for use by other commands:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:38
+#: en/user_basics.ssi:36
msgid "$ lb config"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:42
+#: en/user_basics.ssi:40
msgid ""
"By passing no parameters to #{lb config}# we indicated that we wish to use "
-"the defaults (see lb-config)."
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:44 en/user_overview.ssi:22 en/user_overview.ssi:42
-msgid "% FIXME: <xref linkend=\"lb-config\"/>"
+"the defaults (see {The lb config command}#lb-config )."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:46
+#: en/user_basics.ssi:42
msgid ""
"Now that we have a \"config/\" hierarchy, we may build the image with the lb "
"build command:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:50 en/user_basics.ssi:132 en/user_basics.ssi:214
+#: en/user_basics.ssi:46 en/user_basics.ssi:124 en/user_basics.ssi:206
msgid "# lb build"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:54
+#: en/user_basics.ssi:50
msgid ""
"This process can take a while, depending on the speed of your network "
-"connection (see lb-build)."
+"connection (see {The lb build command}#lb-build )."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:56 en/user_overview.ssi:46
-msgid "% FIXME: <xref linkend=\"lb-build\"/>"
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:58
+#: en/user_basics.ssi:52
msgid "3~ Testing an ISO image with Qemu"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:60
+#: en/user_basics.ssi:54
msgid "Testing an ISO is simple:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:64 en/user_basics.ssi:154
+#: en/user_basics.ssi:58 en/user_basics.ssi:146
msgid "# apt-get install qemu"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:66
+#: en/user_basics.ssi:60
msgid "$ qemu -cdrom binary.iso"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:70
+#: en/user_basics.ssi:64
msgid "3~ Testing an ISO image with virtualbox-ose"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:72
+#: en/user_basics.ssi:66
msgid "In order to test the ISO with virtualbox-ose:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:76
+#: en/user_basics.ssi:70
msgid "# apt-get install virtualbox-ose"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:80
+#: en/user_basics.ssi:74
msgid ""
"and either install #{virtualbox-ose-source}# or #{virtualbox-ose-dkms}# to "
"build the required kernel modules to run virtualbox-ose."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:82
+#: en/user_basics.ssi:76
msgid ""
"After successful installation, virtualbox can be e.g. found in the GNOME "
"menu under 'Applications/System Tools/VirtualBox OSE'."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:84
+#: en/user_basics.ssi:78
msgid ""
"Please consider including of following packages onto the live image to "
"achieve higher resolution of the display when booting the live image in "
@@ -358,38 +342,38 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:90
+#: en/user_basics.ssi:84
msgid ""
"virtualbox-ose-guest-dkms virtualbox-ose-guest-utils virtualbox-ose-guest-x11"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:94
+#: en/user_basics.ssi:88
msgid "3~ Burning an ISO image to a physical medium"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:96
+#: en/user_basics.ssi:90
msgid "Burning an ISO image is easy:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:100
+#: en/user_basics.ssi:94
msgid "# apt-get install wodim"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:102
+#: en/user_basics.ssi:96
msgid "$ wodim binary.iso"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:106
+#: en/user_basics.ssi:100
msgid "2~ Building an USB/HDD image"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:108
+#: en/user_basics.ssi:102
msgid ""
"The following sequence of commands will create a basic USB/HDD image "
"containing just the Debian standard system without X.org. It is suitable for "
@@ -398,46 +382,42 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:110
+#: en/user_basics.ssi:104
msgid ""
"Note if you created an iso image with the previous example, you will need to "
-"clean up your working directory with the #{lb clean} command (see lb-clean):"
-msgstr ""
-
-#. type: Plain text
-#: en/user_basics.ssi:112
-msgid "% FIXME: <xref linkend=\"lb-clean\"/>"
+"clean up your working directory with the #{lb clean} command (see {The lb "
+"clean command}#lb-clean ):"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:116 en/user_basics.ssi:196
+#: en/user_basics.ssi:108 en/user_basics.ssi:188
msgid "$ lb clean --binary"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:120
+#: en/user_basics.ssi:112
msgid ""
"Run the #{lb config}# command with the parameters to configure the \"config/"
"\" hierarchy to create a USB/HDD image type:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:124
+#: en/user_basics.ssi:116
msgid "$ lb config -b usb-hdd"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:128
+#: en/user_basics.ssi:120
msgid "Now build the image with the #{lb build} command:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:136
+#: en/user_basics.ssi:128
msgid "3~ Copying USB/HDD image to a USB stick"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:138
+#: en/user_basics.ssi:130
msgid ""
"The generated binary image contains a VFAT partition and the syslinux "
"bootloader, ready to be directly written on an USB stick. Plug in an USB "
@@ -445,12 +425,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:142
+#: en/user_basics.ssi:134
msgid "$ dd if=binary.img of=${USBSTICK}"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:146
+#: en/user_basics.ssi:138
msgid ""
"where #{${USBSTICK}}# is the device file of your key, like #{/dev/sdb}# (not "
"a partition like #{/dev/sdb1}#!); you can find the right device name by "
@@ -458,28 +438,28 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:148
+#: en/user_basics.ssi:140
#, no-wrap
msgid "*{This will definitely overwrite any previous contents on your stick!}*\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:150
+#: en/user_basics.ssi:142
msgid "3~ Testing a USB/HDD image with Qemu"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:156
+#: en/user_basics.ssi:148
msgid "$ qemu -hda binary.img"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:160
+#: en/user_basics.ssi:152
msgid "3~ Using the space left on a USB stick"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:162
+#: en/user_basics.ssi:154
msgid ""
"If you want to use the remaining free space after you have installed the "
"binary.img, you can use a partitioning tool such as #{gparted}# or #{parted}"
@@ -488,45 +468,45 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:166
+#: en/user_basics.ssi:158
msgid "# gparted ${USBSTICK}"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:170
+#: en/user_basics.ssi:162
msgid ""
"Ater the creation of the partition you have to create a filsystem on it. One "
"possible choice would be ext4."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:174
+#: en/user_basics.ssi:166
msgid "# mkfs.ext4 ${USBSTICK}"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:178
+#: en/user_basics.ssi:170
msgid "If you want to use this data partition with Windows, use FAT32."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:182
+#: en/user_basics.ssi:174
msgid "# mkfs.vfat -F 32"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:186
+#: en/user_basics.ssi:178
#, no-wrap
msgid "*{Remember: Every time you install a new binary.img on the stick, all your data will be lost because the image includes a complete partition table.}*\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:188
+#: en/user_basics.ssi:180
msgid "2~ Building a netboot image"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:190
+#: en/user_basics.ssi:182
msgid ""
"The following sequence of commands will create a basic netboot image "
"containing the Debian standard system without X.org. It is suitable for "
@@ -534,28 +514,28 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:192
+#: en/user_basics.ssi:184
msgid ""
"Note if you performed any previous examples, you will need to clean up your "
"working directory with the #{lb clean}# command:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:200
+#: en/user_basics.ssi:192
msgid ""
"Run the #{lb config}# command with the parameters to configure the \"config/"
"\" hierarchy to create our netboot image:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:204
+#: en/user_basics.ssi:196
msgid ""
"$ lb config -b net --net-root-path \"/srv/debian-live\" --net-root-server "
"\"192.168.0.1\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:208
+#: en/user_basics.ssi:200
msgid ""
"In contrast with the ISO and USB hdd images, netbooting does not support "
"serving a filesystem image with the client so the files must be served via "
@@ -565,12 +545,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:210
+#: en/user_basics.ssi:202
msgid "Now build the image with the #{lb build}# command:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:218
+#: en/user_basics.ssi:210
msgid ""
"In a network boot the client runs a small piece of software, which usually "
"resides on the EPROM of the Ethernet card. This program sends a DHCP request "
@@ -581,7 +561,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:220
+#: en/user_basics.ssi:212
msgid ""
"For example, if you unpack the generated binary-net.tar.gz archive in the /"
"srv/debian-live directory, you'll find the filesystem image in live/"
@@ -590,17 +570,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:222
+#: en/user_basics.ssi:214
msgid "We must now configure three services on the server to enable netboot."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:224
+#: en/user_basics.ssi:216
msgid "3~ DHCP server"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:226
+#: en/user_basics.ssi:218
msgid ""
"We must configure our network's DHCP server to be sure to give an IP address "
"to the computer netbooting, and to advertise the location of the PXE "
@@ -608,25 +588,25 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:228
+#: en/user_basics.ssi:220
msgid ""
"Here is an example for inspiration, written for the ISC DHCP server #{isc-"
"dhcp-server}# in the /etc/dhcp/dhcpd.conf configuration file;"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:230 en/user_customization-packages.ssi:153
+#: en/user_basics.ssi:222 en/user_customization-packages.ssi:153
msgid "% FIXME"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:234
+#: en/user_basics.ssi:226
#, no-wrap
msgid "subnet 192.168.1.0 netmask 255.255.255.0 { # 192.168.1.0/24\n"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:237
+#: en/user_basics.ssi:229
#, no-wrap
msgid ""
" # IP addresses available for guests\n"
@@ -634,7 +614,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:240
+#: en/user_basics.ssi:232
#, no-wrap
msgid ""
" # allow booting from the net\n"
@@ -642,7 +622,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:245
+#: en/user_basics.ssi:237
#, no-wrap
msgid ""
" # for net booting, server where the first file to be loaded (by TFTP\n"
@@ -652,7 +632,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:249
+#: en/user_basics.ssi:241
#, no-wrap
msgid ""
" # net boot configuration for guests with a PXE client:\n"
@@ -661,7 +641,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:252
+#: en/user_basics.ssi:244
#, no-wrap
msgid ""
" # PXE boot loader (first program to be loaded, by TFTP)\n"
@@ -669,7 +649,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:255
+#: en/user_basics.ssi:247
#, no-wrap
msgid ""
" }\n"
@@ -677,17 +657,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:259
+#: en/user_basics.ssi:251
msgid "3~ TFTP server"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:261
+#: en/user_basics.ssi:253
msgid "This serves the kernel and initial ramdisk to the system at run-time."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:263
+#: en/user_basics.ssi:255
msgid ""
"You should install the tftpd-hpa package. It can serve all files contained "
"inside a root directory, usually /srv/tftp. To let it serve files inside /"
@@ -695,22 +675,22 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:267
+#: en/user_basics.ssi:259
msgid "dpkg-reconfigure -plow tftpd-hpa"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:271
+#: en/user_basics.ssi:263
msgid "and fill in the new tftp server directory when being asked about it."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:273
+#: en/user_basics.ssi:265
msgid "3~ NFS server"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:275
+#: en/user_basics.ssi:267
msgid ""
"Once the guest computer has downloaded and booted a Linux kernel and loaded "
"its initrd, it will try to mount the Live filesystem image through a NFS "
@@ -718,35 +698,35 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:277
+#: en/user_basics.ssi:269
msgid "You need to install the nfs-kernel-server package."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:279
+#: en/user_basics.ssi:271
msgid ""
"Then, make the filesystem image available through NFS by adding a line like "
"the following to /etc/exports:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:283
+#: en/user_basics.ssi:275
msgid "/srv/debian-live *(ro,async,no_root_squash,no_subtree_check)"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:287
+#: en/user_basics.ssi:279
msgid ""
"and tell the NFS server about this new export with the following command:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:291
+#: en/user_basics.ssi:283
msgid "# exportfs -rv"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:295
+#: en/user_basics.ssi:287
msgid ""
"Setting up these three services can be a little tricky. You might need some "
"patience to get all of them working together. The Debian Installer Manual's "
@@ -755,40 +735,40 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:297
+#: en/user_basics.ssi:289
msgid "3~ Netboot testing HowTo"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:299
+#: en/user_basics.ssi:291
msgid ""
"Netboot image creation is made easy with live-build magic, but testing the "
"images on physical machines can be really time consuming."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:301
+#: en/user_basics.ssi:293
msgid ""
"To make our life easier, we can use virtualization. There are two solutions."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:303
+#: en/user_basics.ssi:295
msgid "3~ Qemu"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:305
+#: en/user_basics.ssi:297
msgid "_* Install qemu, bridge-utils, sudo."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:307
+#: en/user_basics.ssi:299
msgid "Edit /etc/qemu-ifup:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:318
+#: en/user_basics.ssi:310
msgid ""
"#!/bin/sh sudo -p \"Password for $0:\" /sbin/ifconfig $1 172.20.0.1 echo "
"\"Executing /etc/qemu-ifup\" echo \"Bringing up $1 for bridged mode...\" "
@@ -797,62 +777,62 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:322
+#: en/user_basics.ssi:314
msgid "Get, or build a grub-floppy-netboot (in the svn)."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:324
+#: en/user_basics.ssi:316
msgid "Launch qemu with \"-net nic,vlan=0 -net tap,vlan=0,ifname=tun0\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:326
+#: en/user_basics.ssi:318
msgid "3~ VMWare Player"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:328
+#: en/user_basics.ssi:320
msgid "_* Install VMWare Player (\"free as in beer\" edition)"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:330
+#: en/user_basics.ssi:322
msgid ""
"_* Create a PXETester directory, and create a text file called pxe.vwx inside"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:332
+#: en/user_basics.ssi:324
msgid "_* Paste this text inside:"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:340
+#: en/user_basics.ssi:332
msgid ""
"#!/usr/bin/vmware config.version = \"8\" virtualHW.version = \"4\" memsize = "
"\"512\" MemAllowAutoScaleDown = \"FALSE\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:346
+#: en/user_basics.ssi:338
msgid ""
"ide0:0.present = \"FALSE\" ide1:0.present = \"FALSE\" floppy0.present = "
"\"FALSE\" sound.present = \"FALSE\" tools.remindInstall = \"FALSE\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:349
+#: en/user_basics.ssi:341
msgid "ethernet0.present = \"TRUE\" ethernet0.addressType = \"generated\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:352
+#: en/user_basics.ssi:344
msgid "displayName = \"Test Boot PXE\" guestOS = \"other\""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:357
+#: en/user_basics.ssi:349
msgid ""
"ethernet0.generatedAddress = \"00:0c:29:8d:71:3b\" uuid.location = \"56 4d "
"83 72 5c c4 de 3f-ae 9e 07 91 1d 8d 71 3b\" uuid.bios = \"56 4d 83 72 5c c4 "
@@ -860,19 +840,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:361
+#: en/user_basics.ssi:353
msgid ""
"_* You can play with this configuration file (i.e. change memory limit to "
"256)"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:363
+#: en/user_basics.ssi:355
msgid ""
"_* Double click on this file (or run VMWare player and selecet this file)."
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:364
+#: en/user_basics.ssi:356
msgid "_* When running just press space if that strange question comes up..."
msgstr ""
diff --git a/manual/pot/user_customization-contents.ssi.pot b/manual/pot/user_customization-contents.ssi.pot
index 5065c15..91bb987 100644
--- a/manual/pot/user_customization-contents.ssi.pot
+++ b/manual/pot/user_customization-contents.ssi.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-22 07:52-0200\n"
+"POT-Creation-Date: 2010-10-22 20:34-0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -41,15 +41,15 @@ msgstr ""
#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
-#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111 en/user_basics.ssi:36
-#: en/user_basics.ssi:48 en/user_basics.ssi:62 en/user_basics.ssi:74
-#: en/user_basics.ssi:86 en/user_basics.ssi:98 en/user_basics.ssi:114
-#: en/user_basics.ssi:122 en/user_basics.ssi:130 en/user_basics.ssi:140
-#: en/user_basics.ssi:152 en/user_basics.ssi:164 en/user_basics.ssi:172
-#: en/user_basics.ssi:180 en/user_basics.ssi:194 en/user_basics.ssi:202
-#: en/user_basics.ssi:212 en/user_basics.ssi:232 en/user_basics.ssi:265
-#: en/user_basics.ssi:281 en/user_basics.ssi:289 en/user_basics.ssi:309
-#: en/user_basics.ssi:334 en/user_customization-contents.ssi:34
+#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111 en/user_basics.ssi:34
+#: en/user_basics.ssi:44 en/user_basics.ssi:56 en/user_basics.ssi:68
+#: en/user_basics.ssi:80 en/user_basics.ssi:92 en/user_basics.ssi:106
+#: en/user_basics.ssi:114 en/user_basics.ssi:122 en/user_basics.ssi:132
+#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
+#: en/user_basics.ssi:172 en/user_basics.ssi:186 en/user_basics.ssi:194
+#: en/user_basics.ssi:204 en/user_basics.ssi:224 en/user_basics.ssi:257
+#: en/user_basics.ssi:273 en/user_basics.ssi:281 en/user_basics.ssi:301
+#: en/user_basics.ssi:326 en/user_customization-contents.ssi:34
#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
#: en/user_customization-internationalization.ssi:10
#: en/user_customization-internationalization.ssi:18
@@ -67,8 +67,8 @@ msgstr ""
#: 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:106
-#: en/user_installation.ssi:120 en/user_installation.ssi:137
+#: en/user_installation.ssi:84 en/user_installation.ssi:104
+#: en/user_installation.ssi:118 en/user_installation.ssi:135
#: en/user_managing_a_configuration.ssi:24
#: en/user_managing_a_configuration.ssi:35
#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:46
@@ -101,14 +101,14 @@ msgstr ""
#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
#: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
#: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
-#: en/other_use-cases.ssi:137 en/user_basics.ssi:40 en/user_basics.ssi:52
-#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:92
-#: en/user_basics.ssi:104 en/user_basics.ssi:118 en/user_basics.ssi:126
-#: en/user_basics.ssi:134 en/user_basics.ssi:144 en/user_basics.ssi:158
-#: en/user_basics.ssi:168 en/user_basics.ssi:176 en/user_basics.ssi:184
-#: en/user_basics.ssi:198 en/user_basics.ssi:206 en/user_basics.ssi:216
-#: en/user_basics.ssi:257 en/user_basics.ssi:269 en/user_basics.ssi:285
-#: en/user_basics.ssi:293 en/user_basics.ssi:320 en/user_basics.ssi:359
+#: en/other_use-cases.ssi:137 en/user_basics.ssi:38 en/user_basics.ssi:48
+#: en/user_basics.ssi:62 en/user_basics.ssi:72 en/user_basics.ssi:86
+#: en/user_basics.ssi:98 en/user_basics.ssi:110 en/user_basics.ssi:118
+#: en/user_basics.ssi:126 en/user_basics.ssi:136 en/user_basics.ssi:150
+#: en/user_basics.ssi:160 en/user_basics.ssi:168 en/user_basics.ssi:176
+#: en/user_basics.ssi:190 en/user_basics.ssi:198 en/user_basics.ssi:208
+#: en/user_basics.ssi:249 en/user_basics.ssi:261 en/user_basics.ssi:277
+#: en/user_basics.ssi:285 en/user_basics.ssi:312 en/user_basics.ssi:351
#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
#: en/user_customization-contents.ssi:70
#: en/user_customization-internationalization.ssi:14
@@ -127,8 +127,8 @@ msgstr ""
#: 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:110
-#: en/user_installation.ssi:125 en/user_installation.ssi:140
+#: en/user_installation.ssi:88 en/user_installation.ssi:108
+#: en/user_installation.ssi:123 en/user_installation.ssi:138
#: en/user_managing_a_configuration.ssi:31
#: en/user_managing_a_configuration.ssi:43
#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:84
@@ -137,12 +137,6 @@ msgid "}code"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:12 en/user_customization-contents.ssi:26
-#: en/user_installation.ssi:102
-msgid "% FIXME: <xref linkend=\"terms\"/>"
-msgstr ""
-
-#. type: Plain text
#: en/user_customization-contents.ssi:2 en/user_customization-overview.ssi:2
msgid "B~ Customizing contents"
msgstr ""
@@ -215,6 +209,11 @@ msgid ""
msgstr ""
#. type: Plain text
+#: en/user_customization-contents.ssi:26
+msgid "% FIXME: <xref linkend=\"terms\"/>"
+msgstr ""
+
+#. type: Plain text
#: en/user_customization-contents.ssi:28
msgid "3~ Live/chroot local includes"
msgstr ""
diff --git a/manual/pot/user_installation.ssi.pot b/manual/pot/user_installation.ssi.pot
index f3ce212..a27d45f 100644
--- a/manual/pot/user_installation.ssi.pot
+++ b/manual/pot/user_installation.ssi.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-10-16 20:36-0200\n"
+"POT-Creation-Date: 2010-10-22 20:34-0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -17,9 +17,9 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#. type: Plain text
-#: en/about_manual.ssi:83 en/about_manual.ssi:91 en/about_manual.ssi:99
-#: en/about_manual.ssi:111 en/about_manual.ssi:124 en/about_manual.ssi:137
-#: en/about_manual.ssi:145 en/about_manual.ssi:153 en/about_manual.ssi:161
+#: 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/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
@@ -41,15 +41,15 @@ msgstr ""
#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
-#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111 en/user_basics.ssi:36
-#: en/user_basics.ssi:48 en/user_basics.ssi:62 en/user_basics.ssi:74
-#: en/user_basics.ssi:86 en/user_basics.ssi:98 en/user_basics.ssi:114
-#: en/user_basics.ssi:122 en/user_basics.ssi:130 en/user_basics.ssi:140
-#: en/user_basics.ssi:152 en/user_basics.ssi:164 en/user_basics.ssi:172
-#: en/user_basics.ssi:180 en/user_basics.ssi:194 en/user_basics.ssi:202
-#: en/user_basics.ssi:212 en/user_basics.ssi:232 en/user_basics.ssi:265
-#: en/user_basics.ssi:281 en/user_basics.ssi:289 en/user_basics.ssi:309
-#: en/user_basics.ssi:334 en/user_customization-contents.ssi:34
+#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111 en/user_basics.ssi:34
+#: en/user_basics.ssi:44 en/user_basics.ssi:56 en/user_basics.ssi:68
+#: en/user_basics.ssi:80 en/user_basics.ssi:92 en/user_basics.ssi:106
+#: en/user_basics.ssi:114 en/user_basics.ssi:122 en/user_basics.ssi:132
+#: en/user_basics.ssi:144 en/user_basics.ssi:156 en/user_basics.ssi:164
+#: en/user_basics.ssi:172 en/user_basics.ssi:186 en/user_basics.ssi:194
+#: en/user_basics.ssi:204 en/user_basics.ssi:224 en/user_basics.ssi:257
+#: en/user_basics.ssi:273 en/user_basics.ssi:281 en/user_basics.ssi:301
+#: en/user_basics.ssi:326 en/user_customization-contents.ssi:34
#: en/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
#: en/user_customization-internationalization.ssi:10
#: en/user_customization-internationalization.ssi:18
@@ -67,19 +67,19 @@ msgstr ""
#: 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:106
-#: en/user_installation.ssi:120 en/user_installation.ssi:137
+#: 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:60
-#: en/user_overview.ssi:104 en/user_overview.ssi:112
+#: en/user_managing_a_configuration.ssi:47 en/user_overview.ssi:46
+#: en/user_overview.ssi:90 en/user_overview.ssi:98
msgid "code{"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:87 en/about_manual.ssi:95 en/about_manual.ssi:103
-#: en/about_manual.ssi:120 en/about_manual.ssi:133 en/about_manual.ssi:141
-#: en/about_manual.ssi:149 en/about_manual.ssi:157 en/about_manual.ssi:164
+#: 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/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,14 +101,14 @@ msgstr ""
#: en/other_procedures.ssi:54 en/other_procedures.ssi:131
#: en/other_use-cases.ssi:33 en/other_use-cases.ssi:69
#: en/other_use-cases.ssi:97 en/other_use-cases.ssi:107
-#: en/other_use-cases.ssi:137 en/user_basics.ssi:40 en/user_basics.ssi:52
-#: en/user_basics.ssi:68 en/user_basics.ssi:78 en/user_basics.ssi:92
-#: en/user_basics.ssi:104 en/user_basics.ssi:118 en/user_basics.ssi:126
-#: en/user_basics.ssi:134 en/user_basics.ssi:144 en/user_basics.ssi:158
-#: en/user_basics.ssi:168 en/user_basics.ssi:176 en/user_basics.ssi:184
-#: en/user_basics.ssi:198 en/user_basics.ssi:206 en/user_basics.ssi:216
-#: en/user_basics.ssi:257 en/user_basics.ssi:285 en/user_basics.ssi:293
-#: en/user_basics.ssi:320 en/user_basics.ssi:359
+#: en/other_use-cases.ssi:137 en/user_basics.ssi:38 en/user_basics.ssi:48
+#: en/user_basics.ssi:62 en/user_basics.ssi:72 en/user_basics.ssi:86
+#: en/user_basics.ssi:98 en/user_basics.ssi:110 en/user_basics.ssi:118
+#: en/user_basics.ssi:126 en/user_basics.ssi:136 en/user_basics.ssi:150
+#: en/user_basics.ssi:160 en/user_basics.ssi:168 en/user_basics.ssi:176
+#: en/user_basics.ssi:190 en/user_basics.ssi:198 en/user_basics.ssi:208
+#: en/user_basics.ssi:249 en/user_basics.ssi:261 en/user_basics.ssi:277
+#: en/user_basics.ssi:285 en/user_basics.ssi:312 en/user_basics.ssi:351
#: en/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
#: en/user_customization-contents.ssi:70
#: en/user_customization-internationalization.ssi:14
@@ -127,22 +127,16 @@ msgstr ""
#: 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:110
-#: en/user_installation.ssi:125 en/user_installation.ssi:140
+#: 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:98
-#: en/user_overview.ssi:108 en/user_overview.ssi:116
+#: en/user_managing_a_configuration.ssi:52 en/user_overview.ssi:84
+#: en/user_overview.ssi:94 en/user_overview.ssi:102
msgid "}code"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:12 en/user_customization-contents.ssi:26
-#: en/user_installation.ssi:102
-msgid "% FIXME: <xref linkend=\"terms\"/>"
-msgstr ""
-
-#. type: Plain text
#: en/user_installation.ssi:2
msgid ":B~ Installation"
msgstr ""
@@ -337,26 +331,26 @@ msgstr ""
#: en/user_installation.ssi:100
msgid ""
"To modify the code you can follow the process below. Please ensure you are "
-"familiar with the terms mentioned in terms."
+"familiar with the terms mentioned in {Terms}#terms ."
msgstr ""
#. type: Plain text
-#: en/user_installation.ssi:104
+#: en/user_installation.ssi:102
msgid "_* Checkout the live-boot source"
msgstr ""
#. type: Plain text
-#: en/user_installation.ssi:108
+#: en/user_installation.ssi:106
msgid "$ git clone git://live.debian.net/git/live-boot.git"
msgstr ""
#. type: Plain text
-#: en/user_installation.ssi:112
+#: en/user_installation.ssi:110
msgid "_* Make changes to your local copy"
msgstr ""
#. type: Plain text
-#: en/user_installation.ssi:114
+#: en/user_installation.ssi:112
msgid ""
"And beware that if you want to add your pre-init script in live-bottom, you "
"should name it without dashes '-', e.g: call it \"99new_feature\" and not "
@@ -364,12 +358,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_installation.ssi:116
+#: en/user_installation.ssi:114
msgid "_* Build a live-boot .deb"
msgstr ""
#. type: Plain text
-#: en/user_installation.ssi:118
+#: en/user_installation.ssi:116
msgid ""
"You must build either on your target distribution or in a chroot containing "
"your target platform: this means if your target is Squeeze then you should "
@@ -380,17 +374,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_installation.ssi:123
+#: en/user_installation.ssi:121
msgid "$ cd live-boot $ dpkg-buildpackage -rfakeroot -b -uc -us"
msgstr ""
#. type: Plain text
-#: en/user_installation.ssi:127
+#: en/user_installation.ssi:125
msgid "_* Use the generated live-boot .deb"
msgstr ""
#. type: Plain text
-#: en/user_installation.ssi:129
+#: en/user_installation.ssi:127
msgid ""
"As live-boot is installed by live-build system, installing the package in "
"the host system is not sufficient: you should treat the generated .deb like "
@@ -399,19 +393,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_installation.ssi:131
+#: en/user_installation.ssi:129
msgid ""
"% FIXME: <xref linkend=\"custom-packages\"/> <xref linkend=\"custom-packages-"
"apt\"/>"
msgstr ""
#. type: Plain text
-#: en/user_installation.ssi:133
+#: en/user_installation.ssi:131
msgid "3~ Using live-boot snapshots"
msgstr ""
#. type: Plain text
-#: en/user_installation.ssi:135
+#: en/user_installation.ssi:133
msgid ""
"You can let live-build automatically use the latest snapshot of live-boot by "
"configuring a third-party repository in your live-build configuration "
@@ -420,6 +414,6 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_installation.ssi:139
+#: en/user_installation.ssi:137
msgid "lb config --repository live.debian.net"
msgstr ""
--
live-manual
More information about the debian-live-changes
mailing list