[SCM] live-manual branch, debian, updated. debian/2.0_a10-1-13-g6ee6584
Ben Armstrong
synrg at debian.org
Sun Nov 28 11:17:36 UTC 2010
The following commit has been merged in the debian branch:
commit 6ee6584a7351591bc6c4bbab1fe598a4ed5a02b7
Author: Ben Armstrong <synrg at debian.org>
Date: Sun Nov 28 07:17:11 2010 -0400
Fixing Basics intro to more accurately reflect contents of chapter.
diff --git a/manual/de/live-manual.ssm b/manual/de/live-manual.ssm
index 45ca328..be6cb8e 100644
--- a/manual/de/live-manual.ssm
+++ b/manual/de/live-manual.ssm
@@ -9,7 +9,7 @@
:license: This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.<br><br>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.<br><br>You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/. <br><br>On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-3 file.
@date:
- :published: 2010-11-27
+ :published: 2010-11-28
@publisher: Debian Live Project <debian-live at lists.debian.org>
diff --git a/manual/de/user_basics.ssi b/manual/de/user_basics.ssi
index eda6c9e..b4e6373 100644
--- a/manual/de/user_basics.ssi
+++ b/manual/de/user_basics.ssi
@@ -3,14 +3,16 @@
1~the-basics The basics
This chapter contains a brief overview of the build process and instructions
-for using the default image type, #{iso-hybrid}# with a virtual machine,
-optical media or USB portable storage device. The chapter finishes with
-instructions for building and using a #{net}# type image, which is a bit
-more involved due to the setup required on the server. This is a slightly
-advanced topic for anyone who is not familiar already with netbooting, but
-is included here because once the setup is done, it is a very convenient way
-to test and deploy images for booting on the local network without the
-hassle of dealing with image media.
+for using the three most commonly used image types. The most versatile image
+type, #{iso-hybrid}#, may be used on a virtual machine, optical media or USB
+portable storage device. In certain special cases, #{usb-hdd}# may be more
+suitable for USB devices. The chapter finishes with instructions for
+building and using a #{net}# type image, which is a bit more involved due to
+the setup required on the server. This is a slightly advanced topic for
+anyone who is not familiar already with netbooting, but is included here
+because once the setup is done, it is a very convenient way to test and
+deploy images for booting on the local network without the hassle of dealing
+with image media.
2~ What is a live system?
diff --git a/manual/en/live-manual.ssm b/manual/en/live-manual.ssm
index 97effe0..7fa28be 100644
--- a/manual/en/live-manual.ssm
+++ b/manual/en/live-manual.ssm
@@ -9,7 +9,7 @@
:license: This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.<br><br>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.<br><br>You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/. <br><br>On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-3 file.
@date:
- :published: 2010-11-27
+ :published: 2010-11-28
@publisher: Debian Live Project <debian-live at lists.debian.org>
diff --git a/manual/en/user_basics.ssi b/manual/en/user_basics.ssi
index 8fdecf7..abdc69e 100644
--- a/manual/en/user_basics.ssi
+++ b/manual/en/user_basics.ssi
@@ -2,7 +2,7 @@
1~the-basics The basics
-This chapter contains a brief overview of the build process and instructions for using the default image type, #{iso-hybrid}# with a virtual machine, optical media or USB portable storage device. The chapter finishes with instructions for building and using a #{net}# type image, which is a bit more involved due to the setup required on the server. This is a slightly advanced topic for anyone who is not familiar already with netbooting, but is included here because once the setup is done, it is a very convenient way to test and deploy images for booting on the local network without the hassle of dealing with image media.
+This chapter contains a brief overview of the build process and instructions for using the three most commonly used image types. The most versatile image type, #{iso-hybrid}#, may be used on a virtual machine, optical media or USB portable storage device. In certain special cases, #{usb-hdd}# may be more suitable for USB devices. The chapter finishes with instructions for building and using a #{net}# type image, which is a bit more involved due to the setup required on the server. This is a slightly advanced topic for anyone who is not familiar already with netbooting, but is included here because once the setup is done, it is a very convenient way to test and deploy images for booting on the local network without the hassle of dealing with image media.
2~ What is a live system?
diff --git a/manual/fr/live-manual.ssm b/manual/fr/live-manual.ssm
index 69fbc1b..bb58c0d 100644
--- a/manual/fr/live-manual.ssm
+++ b/manual/fr/live-manual.ssm
@@ -9,7 +9,7 @@
:license: This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.<br><br>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.<br><br>You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/. <br><br>On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-3 file.
@date:
- :published: 2010-11-27
+ :published: 2010-11-28
@publisher: Debian Live Project <debian-live at lists.debian.org>
diff --git a/manual/fr/user_basics.ssi b/manual/fr/user_basics.ssi
index eda6c9e..b4e6373 100644
--- a/manual/fr/user_basics.ssi
+++ b/manual/fr/user_basics.ssi
@@ -3,14 +3,16 @@
1~the-basics The basics
This chapter contains a brief overview of the build process and instructions
-for using the default image type, #{iso-hybrid}# with a virtual machine,
-optical media or USB portable storage device. The chapter finishes with
-instructions for building and using a #{net}# type image, which is a bit
-more involved due to the setup required on the server. This is a slightly
-advanced topic for anyone who is not familiar already with netbooting, but
-is included here because once the setup is done, it is a very convenient way
-to test and deploy images for booting on the local network without the
-hassle of dealing with image media.
+for using the three most commonly used image types. The most versatile image
+type, #{iso-hybrid}#, may be used on a virtual machine, optical media or USB
+portable storage device. In certain special cases, #{usb-hdd}# may be more
+suitable for USB devices. The chapter finishes with instructions for
+building and using a #{net}# type image, which is a bit more involved due to
+the setup required on the server. This is a slightly advanced topic for
+anyone who is not familiar already with netbooting, but is included here
+because once the setup is done, it is a very convenient way to test and
+deploy images for booting on the local network without the hassle of dealing
+with image media.
2~ What is a live system?
diff --git a/manual/po/de/live-manual.ssm.po b/manual/po/de/live-manual.ssm.po
index 6143d31..5fe3801 100644
--- a/manual/po/de/live-manual.ssm.po
+++ b/manual/po/de/live-manual.ssm.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-11-27 10:30-0400\n"
+"POT-Creation-Date: 2010-11-28 07:16-0400\n"
"PO-Revision-Date: 2010-10-03 20:30+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -45,7 +45,7 @@ msgstr ""
#, no-wrap
msgid ""
"@date:\n"
-" :published: 2010-11-27\n"
+" :published: 2010-11-28\n"
msgstr ""
#. type: Plain text
diff --git a/manual/po/de/user_basics.ssi.po b/manual/po/de/user_basics.ssi.po
index 99e86e9..0845284 100644
--- a/manual/po/de/user_basics.ssi.po
+++ b/manual/po/de/user_basics.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-11-27 09:40-0400\n"
+"POT-Creation-Date: 2010-11-28 07:16-0400\n"
"PO-Revision-Date: 2010-10-03 20:30+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -66,7 +66,11 @@ msgstr ""
#: en/user_customization-packages.ssi:261
#: en/user_customization-packages.ssi:273
#: en/user_customization-packages.ssi:283 en/user_examples.ssi:12
-#: en/user_examples.ssi:27 en/user_examples.ssi:37 en/user_examples.ssi:75
+#: en/user_examples.ssi:27 en/user_examples.ssi:37 en/user_examples.ssi:51
+#: en/user_examples.ssi:61 en/user_examples.ssi:77 en/user_examples.ssi:87
+#: en/user_examples.ssi:104 en/user_examples.ssi:114 en/user_examples.ssi:128
+#: en/user_examples.ssi:136 en/user_examples.ssi:151 en/user_examples.ssi:159
+#: en/user_examples.ssi:185 en/user_examples.ssi:206 en/user_examples.ssi:214
#: en/user_installation.ssi:38 en/user_installation.ssi:46
#: en/user_installation.ssi:56 en/user_installation.ssi:64
#: en/user_installation.ssi:76 en/user_installation.ssi:84
@@ -128,7 +132,11 @@ msgstr ""
#: en/user_customization-packages.ssi:265
#: en/user_customization-packages.ssi:277
#: en/user_customization-packages.ssi:287 en/user_examples.ssi:17
-#: en/user_examples.ssi:31 en/user_examples.ssi:41 en/user_examples.ssi:84
+#: en/user_examples.ssi:31 en/user_examples.ssi:41 en/user_examples.ssi:55
+#: en/user_examples.ssi:65 en/user_examples.ssi:83 en/user_examples.ssi:98
+#: en/user_examples.ssi:108 en/user_examples.ssi:120 en/user_examples.ssi:132
+#: en/user_examples.ssi:147 en/user_examples.ssi:155 en/user_examples.ssi:163
+#: en/user_examples.ssi:194 en/user_examples.ssi:210 en/user_examples.ssi:218
#: en/user_installation.ssi:42 en/user_installation.ssi:50
#: en/user_installation.ssi:60 en/user_installation.ssi:72
#: en/user_installation.ssi:80 en/user_installation.ssi:88
@@ -154,14 +162,16 @@ msgstr ""
#: en/user_basics.ssi:6
msgid ""
"This chapter contains a brief overview of the build process and instructions "
-"for using the default image type, #{iso-hybrid}# with a virtual machine, "
-"optical media or USB portable storage device. The chapter finishes with "
-"instructions for building and using a #{net}# type image, which is a bit "
-"more involved due to the setup required on the server. This is a slightly "
-"advanced topic for anyone who is not familiar already with netbooting, but "
-"is included here because once the setup is done, it is a very convenient way "
-"to test and deploy images for booting on the local network without the "
-"hassle of dealing with image media."
+"for using the three most commonly used image types. The most versatile image "
+"type, #{iso-hybrid}#, may be used on a virtual machine, optical media or USB "
+"portable storage device. In certain special cases, #{usb-hdd}# may be more "
+"suitable for USB devices. The chapter finishes with instructions for "
+"building and using a #{net}# type image, which is a bit more involved due to "
+"the setup required on the server. This is a slightly advanced topic for "
+"anyone who is not familiar already with netbooting, but is included here "
+"because once the setup is done, it is a very convenient way to test and "
+"deploy images for booting on the local network without the hassle of dealing "
+"with image media."
msgstr ""
#. type: Plain text
@@ -280,6 +290,7 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:44 en/user_basics.ssi:120 en/user_basics.ssi:204
+#: en/user_examples.ssi:106 en/user_examples.ssi:153
msgid "# lb build"
msgstr ""
diff --git a/manual/po/fr/live-manual.ssm.po b/manual/po/fr/live-manual.ssm.po
index f07fd52..bb31a3b 100644
--- a/manual/po/fr/live-manual.ssm.po
+++ b/manual/po/fr/live-manual.ssm.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-11-27 10:30-0400\n"
+"POT-Creation-Date: 2010-11-28 07:16-0400\n"
"PO-Revision-Date: 2010-10-21 07:06-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -45,7 +45,7 @@ msgstr ""
#, no-wrap
msgid ""
"@date:\n"
-" :published: 2010-11-27\n"
+" :published: 2010-11-28\n"
msgstr ""
#. type: Plain text
diff --git a/manual/po/fr/user_basics.ssi.po b/manual/po/fr/user_basics.ssi.po
index b4b18cf..b066784 100644
--- a/manual/po/fr/user_basics.ssi.po
+++ b/manual/po/fr/user_basics.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-11-27 09:40-0400\n"
+"POT-Creation-Date: 2010-11-28 07:16-0400\n"
"PO-Revision-Date: 2010-10-20 06:53-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -66,7 +66,11 @@ msgstr ""
#: en/user_customization-packages.ssi:261
#: en/user_customization-packages.ssi:273
#: en/user_customization-packages.ssi:283 en/user_examples.ssi:12
-#: en/user_examples.ssi:27 en/user_examples.ssi:37 en/user_examples.ssi:75
+#: en/user_examples.ssi:27 en/user_examples.ssi:37 en/user_examples.ssi:51
+#: en/user_examples.ssi:61 en/user_examples.ssi:77 en/user_examples.ssi:87
+#: en/user_examples.ssi:104 en/user_examples.ssi:114 en/user_examples.ssi:128
+#: en/user_examples.ssi:136 en/user_examples.ssi:151 en/user_examples.ssi:159
+#: en/user_examples.ssi:185 en/user_examples.ssi:206 en/user_examples.ssi:214
#: en/user_installation.ssi:38 en/user_installation.ssi:46
#: en/user_installation.ssi:56 en/user_installation.ssi:64
#: en/user_installation.ssi:76 en/user_installation.ssi:84
@@ -128,7 +132,11 @@ msgstr "code{"
#: en/user_customization-packages.ssi:265
#: en/user_customization-packages.ssi:277
#: en/user_customization-packages.ssi:287 en/user_examples.ssi:17
-#: en/user_examples.ssi:31 en/user_examples.ssi:41 en/user_examples.ssi:84
+#: en/user_examples.ssi:31 en/user_examples.ssi:41 en/user_examples.ssi:55
+#: en/user_examples.ssi:65 en/user_examples.ssi:83 en/user_examples.ssi:98
+#: en/user_examples.ssi:108 en/user_examples.ssi:120 en/user_examples.ssi:132
+#: en/user_examples.ssi:147 en/user_examples.ssi:155 en/user_examples.ssi:163
+#: en/user_examples.ssi:194 en/user_examples.ssi:210 en/user_examples.ssi:218
#: en/user_installation.ssi:42 en/user_installation.ssi:50
#: en/user_installation.ssi:60 en/user_installation.ssi:72
#: en/user_installation.ssi:80 en/user_installation.ssi:88
@@ -154,14 +162,16 @@ msgstr ""
#: en/user_basics.ssi:6
msgid ""
"This chapter contains a brief overview of the build process and instructions "
-"for using the default image type, #{iso-hybrid}# with a virtual machine, "
-"optical media or USB portable storage device. The chapter finishes with "
-"instructions for building and using a #{net}# type image, which is a bit "
-"more involved due to the setup required on the server. This is a slightly "
-"advanced topic for anyone who is not familiar already with netbooting, but "
-"is included here because once the setup is done, it is a very convenient way "
-"to test and deploy images for booting on the local network without the "
-"hassle of dealing with image media."
+"for using the three most commonly used image types. The most versatile image "
+"type, #{iso-hybrid}#, may be used on a virtual machine, optical media or USB "
+"portable storage device. In certain special cases, #{usb-hdd}# may be more "
+"suitable for USB devices. The chapter finishes with instructions for "
+"building and using a #{net}# type image, which is a bit more involved due to "
+"the setup required on the server. This is a slightly advanced topic for "
+"anyone who is not familiar already with netbooting, but is included here "
+"because once the setup is done, it is a very convenient way to test and "
+"deploy images for booting on the local network without the hassle of dealing "
+"with image media."
msgstr ""
#. type: Plain text
@@ -280,6 +290,7 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:44 en/user_basics.ssi:120 en/user_basics.ssi:204
+#: en/user_examples.ssi:106 en/user_examples.ssi:153
msgid "# lb build"
msgstr ""
diff --git a/manual/po/pt_BR/live-manual.ssm.po b/manual/po/pt_BR/live-manual.ssm.po
index f89abc6..ed08329 100644
--- a/manual/po/pt_BR/live-manual.ssm.po
+++ b/manual/po/pt_BR/live-manual.ssm.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-11-27 10:30-0400\n"
+"POT-Creation-Date: 2010-11-28 07:16-0400\n"
"PO-Revision-Date: 2010-10-22 07:52-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -45,7 +45,7 @@ msgstr ""
#, no-wrap
msgid ""
"@date:\n"
-" :published: 2010-11-27\n"
+" :published: 2010-11-28\n"
msgstr ""
#. type: Plain text
diff --git a/manual/po/pt_BR/user_basics.ssi.po b/manual/po/pt_BR/user_basics.ssi.po
index 665d824..e0dac47 100644
--- a/manual/po/pt_BR/user_basics.ssi.po
+++ b/manual/po/pt_BR/user_basics.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-11-27 09:40-0400\n"
+"POT-Creation-Date: 2010-11-28 07:16-0400\n"
"PO-Revision-Date: 2010-10-20 06:53-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -66,7 +66,11 @@ msgstr ""
#: en/user_customization-packages.ssi:261
#: en/user_customization-packages.ssi:273
#: en/user_customization-packages.ssi:283 en/user_examples.ssi:12
-#: en/user_examples.ssi:27 en/user_examples.ssi:37 en/user_examples.ssi:75
+#: en/user_examples.ssi:27 en/user_examples.ssi:37 en/user_examples.ssi:51
+#: en/user_examples.ssi:61 en/user_examples.ssi:77 en/user_examples.ssi:87
+#: en/user_examples.ssi:104 en/user_examples.ssi:114 en/user_examples.ssi:128
+#: en/user_examples.ssi:136 en/user_examples.ssi:151 en/user_examples.ssi:159
+#: en/user_examples.ssi:185 en/user_examples.ssi:206 en/user_examples.ssi:214
#: en/user_installation.ssi:38 en/user_installation.ssi:46
#: en/user_installation.ssi:56 en/user_installation.ssi:64
#: en/user_installation.ssi:76 en/user_installation.ssi:84
@@ -128,7 +132,11 @@ msgstr "code{"
#: en/user_customization-packages.ssi:265
#: en/user_customization-packages.ssi:277
#: en/user_customization-packages.ssi:287 en/user_examples.ssi:17
-#: en/user_examples.ssi:31 en/user_examples.ssi:41 en/user_examples.ssi:84
+#: en/user_examples.ssi:31 en/user_examples.ssi:41 en/user_examples.ssi:55
+#: en/user_examples.ssi:65 en/user_examples.ssi:83 en/user_examples.ssi:98
+#: en/user_examples.ssi:108 en/user_examples.ssi:120 en/user_examples.ssi:132
+#: en/user_examples.ssi:147 en/user_examples.ssi:155 en/user_examples.ssi:163
+#: en/user_examples.ssi:194 en/user_examples.ssi:210 en/user_examples.ssi:218
#: en/user_installation.ssi:42 en/user_installation.ssi:50
#: en/user_installation.ssi:60 en/user_installation.ssi:72
#: en/user_installation.ssi:80 en/user_installation.ssi:88
@@ -154,14 +162,16 @@ msgstr ""
#: en/user_basics.ssi:6
msgid ""
"This chapter contains a brief overview of the build process and instructions "
-"for using the default image type, #{iso-hybrid}# with a virtual machine, "
-"optical media or USB portable storage device. The chapter finishes with "
-"instructions for building and using a #{net}# type image, which is a bit "
-"more involved due to the setup required on the server. This is a slightly "
-"advanced topic for anyone who is not familiar already with netbooting, but "
-"is included here because once the setup is done, it is a very convenient way "
-"to test and deploy images for booting on the local network without the "
-"hassle of dealing with image media."
+"for using the three most commonly used image types. The most versatile image "
+"type, #{iso-hybrid}#, may be used on a virtual machine, optical media or USB "
+"portable storage device. In certain special cases, #{usb-hdd}# may be more "
+"suitable for USB devices. The chapter finishes with instructions for "
+"building and using a #{net}# type image, which is a bit more involved due to "
+"the setup required on the server. This is a slightly advanced topic for "
+"anyone who is not familiar already with netbooting, but is included here "
+"because once the setup is done, it is a very convenient way to test and "
+"deploy images for booting on the local network without the hassle of dealing "
+"with image media."
msgstr ""
#. type: Plain text
@@ -280,6 +290,7 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:44 en/user_basics.ssi:120 en/user_basics.ssi:204
+#: en/user_examples.ssi:106 en/user_examples.ssi:153
msgid "# lb build"
msgstr ""
diff --git a/manual/po/ro/live-manual.ssm.po b/manual/po/ro/live-manual.ssm.po
index dd921f2..b11e056 100644
--- a/manual/po/ro/live-manual.ssm.po
+++ b/manual/po/ro/live-manual.ssm.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-11-27 10:30-0400\n"
+"POT-Creation-Date: 2010-11-28 07:16-0400\n"
"PO-Revision-Date: 2010-10-23 00:04+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -46,7 +46,7 @@ msgstr ""
#, no-wrap
msgid ""
"@date:\n"
-" :published: 2010-11-27\n"
+" :published: 2010-11-28\n"
msgstr ""
#. type: Plain text
diff --git a/manual/po/ro/user_basics.ssi.po b/manual/po/ro/user_basics.ssi.po
index 8936776..6a7d9fb 100644
--- a/manual/po/ro/user_basics.ssi.po
+++ b/manual/po/ro/user_basics.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-11-27 09:40-0400\n"
+"POT-Creation-Date: 2010-11-28 07:16-0400\n"
"PO-Revision-Date: 2010-10-23 16:43+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -67,7 +67,11 @@ msgstr ""
#: en/user_customization-packages.ssi:261
#: en/user_customization-packages.ssi:273
#: en/user_customization-packages.ssi:283 en/user_examples.ssi:12
-#: en/user_examples.ssi:27 en/user_examples.ssi:37 en/user_examples.ssi:75
+#: en/user_examples.ssi:27 en/user_examples.ssi:37 en/user_examples.ssi:51
+#: en/user_examples.ssi:61 en/user_examples.ssi:77 en/user_examples.ssi:87
+#: en/user_examples.ssi:104 en/user_examples.ssi:114 en/user_examples.ssi:128
+#: en/user_examples.ssi:136 en/user_examples.ssi:151 en/user_examples.ssi:159
+#: en/user_examples.ssi:185 en/user_examples.ssi:206 en/user_examples.ssi:214
#: en/user_installation.ssi:38 en/user_installation.ssi:46
#: en/user_installation.ssi:56 en/user_installation.ssi:64
#: en/user_installation.ssi:76 en/user_installation.ssi:84
@@ -129,7 +133,11 @@ msgstr "code{"
#: en/user_customization-packages.ssi:265
#: en/user_customization-packages.ssi:277
#: en/user_customization-packages.ssi:287 en/user_examples.ssi:17
-#: en/user_examples.ssi:31 en/user_examples.ssi:41 en/user_examples.ssi:84
+#: en/user_examples.ssi:31 en/user_examples.ssi:41 en/user_examples.ssi:55
+#: en/user_examples.ssi:65 en/user_examples.ssi:83 en/user_examples.ssi:98
+#: en/user_examples.ssi:108 en/user_examples.ssi:120 en/user_examples.ssi:132
+#: en/user_examples.ssi:147 en/user_examples.ssi:155 en/user_examples.ssi:163
+#: en/user_examples.ssi:194 en/user_examples.ssi:210 en/user_examples.ssi:218
#: en/user_installation.ssi:42 en/user_installation.ssi:50
#: en/user_installation.ssi:60 en/user_installation.ssi:72
#: en/user_installation.ssi:80 en/user_installation.ssi:88
@@ -155,14 +163,16 @@ msgstr ""
#: en/user_basics.ssi:6
msgid ""
"This chapter contains a brief overview of the build process and instructions "
-"for using the default image type, #{iso-hybrid}# with a virtual machine, "
-"optical media or USB portable storage device. The chapter finishes with "
-"instructions for building and using a #{net}# type image, which is a bit "
-"more involved due to the setup required on the server. This is a slightly "
-"advanced topic for anyone who is not familiar already with netbooting, but "
-"is included here because once the setup is done, it is a very convenient way "
-"to test and deploy images for booting on the local network without the "
-"hassle of dealing with image media."
+"for using the three most commonly used image types. The most versatile image "
+"type, #{iso-hybrid}#, may be used on a virtual machine, optical media or USB "
+"portable storage device. In certain special cases, #{usb-hdd}# may be more "
+"suitable for USB devices. The chapter finishes with instructions for "
+"building and using a #{net}# type image, which is a bit more involved due to "
+"the setup required on the server. This is a slightly advanced topic for "
+"anyone who is not familiar already with netbooting, but is included here "
+"because once the setup is done, it is a very convenient way to test and "
+"deploy images for booting on the local network without the hassle of dealing "
+"with image media."
msgstr ""
#. type: Plain text
@@ -281,6 +291,7 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:44 en/user_basics.ssi:120 en/user_basics.ssi:204
+#: en/user_examples.ssi:106 en/user_examples.ssi:153
msgid "# lb build"
msgstr ""
diff --git a/manual/pot/live-manual.ssm.pot b/manual/pot/live-manual.ssm.pot
index 83424bd..c4df031 100644
--- a/manual/pot/live-manual.ssm.pot
+++ b/manual/pot/live-manual.ssm.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-11-27 10:30-0400\n"
+"POT-Creation-Date: 2010-11-28 07:16-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -45,7 +45,7 @@ msgstr ""
#, no-wrap
msgid ""
"@date:\n"
-" :published: 2010-11-27\n"
+" :published: 2010-11-28\n"
msgstr ""
#. type: Plain text
diff --git a/manual/pot/user_basics.ssi.pot b/manual/pot/user_basics.ssi.pot
index be44e64..3ac6529 100644
--- a/manual/pot/user_basics.ssi.pot
+++ b/manual/pot/user_basics.ssi.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-11-27 09:40-0400\n"
+"POT-Creation-Date: 2010-11-28 07:16-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -66,7 +66,11 @@ msgstr ""
#: en/user_customization-packages.ssi:261
#: en/user_customization-packages.ssi:273
#: en/user_customization-packages.ssi:283 en/user_examples.ssi:12
-#: en/user_examples.ssi:27 en/user_examples.ssi:37 en/user_examples.ssi:75
+#: en/user_examples.ssi:27 en/user_examples.ssi:37 en/user_examples.ssi:51
+#: en/user_examples.ssi:61 en/user_examples.ssi:77 en/user_examples.ssi:87
+#: en/user_examples.ssi:104 en/user_examples.ssi:114 en/user_examples.ssi:128
+#: en/user_examples.ssi:136 en/user_examples.ssi:151 en/user_examples.ssi:159
+#: en/user_examples.ssi:185 en/user_examples.ssi:206 en/user_examples.ssi:214
#: en/user_installation.ssi:38 en/user_installation.ssi:46
#: en/user_installation.ssi:56 en/user_installation.ssi:64
#: en/user_installation.ssi:76 en/user_installation.ssi:84
@@ -128,7 +132,11 @@ msgstr ""
#: en/user_customization-packages.ssi:265
#: en/user_customization-packages.ssi:277
#: en/user_customization-packages.ssi:287 en/user_examples.ssi:17
-#: en/user_examples.ssi:31 en/user_examples.ssi:41 en/user_examples.ssi:84
+#: en/user_examples.ssi:31 en/user_examples.ssi:41 en/user_examples.ssi:55
+#: en/user_examples.ssi:65 en/user_examples.ssi:83 en/user_examples.ssi:98
+#: en/user_examples.ssi:108 en/user_examples.ssi:120 en/user_examples.ssi:132
+#: en/user_examples.ssi:147 en/user_examples.ssi:155 en/user_examples.ssi:163
+#: en/user_examples.ssi:194 en/user_examples.ssi:210 en/user_examples.ssi:218
#: en/user_installation.ssi:42 en/user_installation.ssi:50
#: en/user_installation.ssi:60 en/user_installation.ssi:72
#: en/user_installation.ssi:80 en/user_installation.ssi:88
@@ -154,14 +162,16 @@ msgstr ""
#: en/user_basics.ssi:6
msgid ""
"This chapter contains a brief overview of the build process and instructions "
-"for using the default image type, #{iso-hybrid}# with a virtual machine, "
-"optical media or USB portable storage device. The chapter finishes with "
-"instructions for building and using a #{net}# type image, which is a bit "
-"more involved due to the setup required on the server. This is a slightly "
-"advanced topic for anyone who is not familiar already with netbooting, but "
-"is included here because once the setup is done, it is a very convenient way "
-"to test and deploy images for booting on the local network without the "
-"hassle of dealing with image media."
+"for using the three most commonly used image types. The most versatile image "
+"type, #{iso-hybrid}#, may be used on a virtual machine, optical media or USB "
+"portable storage device. In certain special cases, #{usb-hdd}# may be more "
+"suitable for USB devices. The chapter finishes with instructions for "
+"building and using a #{net}# type image, which is a bit more involved due to "
+"the setup required on the server. This is a slightly advanced topic for "
+"anyone who is not familiar already with netbooting, but is included here "
+"because once the setup is done, it is a very convenient way to test and "
+"deploy images for booting on the local network without the hassle of dealing "
+"with image media."
msgstr ""
#. type: Plain text
@@ -280,6 +290,7 @@ msgstr ""
#. type: Plain text
#: en/user_basics.ssi:44 en/user_basics.ssi:120 en/user_basics.ssi:204
+#: en/user_examples.ssi:106 en/user_examples.ssi:153
msgid "# lb build"
msgstr ""
diff --git a/manual/pt_BR/live-manual.ssm b/manual/pt_BR/live-manual.ssm
index 69fbc1b..bb58c0d 100644
--- a/manual/pt_BR/live-manual.ssm
+++ b/manual/pt_BR/live-manual.ssm
@@ -9,7 +9,7 @@
:license: This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.<br><br>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.<br><br>You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/. <br><br>On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-3 file.
@date:
- :published: 2010-11-27
+ :published: 2010-11-28
@publisher: Debian Live Project <debian-live at lists.debian.org>
diff --git a/manual/pt_BR/user_basics.ssi b/manual/pt_BR/user_basics.ssi
index eda6c9e..b4e6373 100644
--- a/manual/pt_BR/user_basics.ssi
+++ b/manual/pt_BR/user_basics.ssi
@@ -3,14 +3,16 @@
1~the-basics The basics
This chapter contains a brief overview of the build process and instructions
-for using the default image type, #{iso-hybrid}# with a virtual machine,
-optical media or USB portable storage device. The chapter finishes with
-instructions for building and using a #{net}# type image, which is a bit
-more involved due to the setup required on the server. This is a slightly
-advanced topic for anyone who is not familiar already with netbooting, but
-is included here because once the setup is done, it is a very convenient way
-to test and deploy images for booting on the local network without the
-hassle of dealing with image media.
+for using the three most commonly used image types. The most versatile image
+type, #{iso-hybrid}#, may be used on a virtual machine, optical media or USB
+portable storage device. In certain special cases, #{usb-hdd}# may be more
+suitable for USB devices. The chapter finishes with instructions for
+building and using a #{net}# type image, which is a bit more involved due to
+the setup required on the server. This is a slightly advanced topic for
+anyone who is not familiar already with netbooting, but is included here
+because once the setup is done, it is a very convenient way to test and
+deploy images for booting on the local network without the hassle of dealing
+with image media.
2~ What is a live system?
diff --git a/manual/ro/live-manual.ssm b/manual/ro/live-manual.ssm
index 69fbc1b..bb58c0d 100644
--- a/manual/ro/live-manual.ssm
+++ b/manual/ro/live-manual.ssm
@@ -9,7 +9,7 @@
:license: This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.<br><br>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.<br><br>You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/. <br><br>On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-3 file.
@date:
- :published: 2010-11-27
+ :published: 2010-11-28
@publisher: Debian Live Project <debian-live at lists.debian.org>
diff --git a/manual/ro/user_basics.ssi b/manual/ro/user_basics.ssi
index eda6c9e..b4e6373 100644
--- a/manual/ro/user_basics.ssi
+++ b/manual/ro/user_basics.ssi
@@ -3,14 +3,16 @@
1~the-basics The basics
This chapter contains a brief overview of the build process and instructions
-for using the default image type, #{iso-hybrid}# with a virtual machine,
-optical media or USB portable storage device. The chapter finishes with
-instructions for building and using a #{net}# type image, which is a bit
-more involved due to the setup required on the server. This is a slightly
-advanced topic for anyone who is not familiar already with netbooting, but
-is included here because once the setup is done, it is a very convenient way
-to test and deploy images for booting on the local network without the
-hassle of dealing with image media.
+for using the three most commonly used image types. The most versatile image
+type, #{iso-hybrid}#, may be used on a virtual machine, optical media or USB
+portable storage device. In certain special cases, #{usb-hdd}# may be more
+suitable for USB devices. The chapter finishes with instructions for
+building and using a #{net}# type image, which is a bit more involved due to
+the setup required on the server. This is a slightly advanced topic for
+anyone who is not familiar already with netbooting, but is included here
+because once the setup is done, it is a very convenient way to test and
+deploy images for booting on the local network without the hassle of dealing
+with image media.
2~ What is a live system?
--
live-manual
More information about the debian-live-changes
mailing list