[SCM] live-manual branch, debian, updated. debian/2.0_a8-1-8-g1ec433c
Ben Armstrong
synrg at debian.org
Wed Oct 13 17:58:56 UTC 2010
The following commit has been merged in the debian branch:
commit 1ec433c6430b30bb9bf93e26325aaa23b4faf336
Author: Ben Armstrong <synrg at debian.org>
Date: Wed Oct 13 15:00:15 2010 -0300
Fixing misc. punctuation, spelling and consistency.
diff --git a/manual/de/about_manual.ssi b/manual/de/about_manual.ssi
index 8506689..3842e9c 100644
--- a/manual/de/about_manual.ssi
+++ b/manual/de/about_manual.ssi
@@ -19,15 +19,15 @@ command.
_* *{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.
+so. Live systems are typically booted from media such as CDs, DVDs or USB
+sticks. Some may also boot over the network.
_* *{Debian Live}*: The Debian sub-project which maintains the live-boot,
live-build, live-config, and live-manual packages.
_* *{Debian Live system}*: A live system that uses software from the Debian
operating system that may be booted from CDs, DVDs, USB sticks, over the
-network (via netboot images), and over the internet (via boot parameter
+network (via netboot images), and over the Internet (via boot parameter
#{fetch=URL}#).
_* *{Host system}*: The environment used to create the live system.
@@ -38,16 +38,16 @@ _* *{live-boot}*: A collection of scripts used to boot live
systems. live-boot was formerly a part of live-initramfs.
_* *{live-build}*: A collection of scripts used to build customised Debian
-Live systems. live-build was formerly know as live-helper, and even earlier
-know as live-package.
+Live systems. live-build was formerly known as live-helper, and even earlier
+known as live-package.
-_* *{live-config}*: A collection of scripts used to configure a live systems
+_* *{live-config}*: A collection of scripts used to configure a live system
during the boot process. live-config was formerly a part of live-initramfs.
_* *{live-manual}*: This document is maintained in a package called
live-manual.
-_* *{Debian Installer/(d-i)}*: The official installation system for the
+_* *{Debian Installer (d-i)}*: The official installation system for the
Debian distribution.
_* *{Boot parameters}*: Parameters that can be entered at the bootloader
@@ -57,13 +57,13 @@ _* *{chroot}*: The chroot program, chroot(8), enables us to run different
instances of the GNU/Linux environment on a single system simultaneously
without rebooting.
-_* *{Binary image}*: On a live system, binary image refers to the binary
-filesystem and the respective extension, such as binary.iso or binary.img.
+_* *{Binary image}*: A file containing the live system, such as binary.iso
+or binary.img.
_* *{Target distribution}*: The distribution upon which your live system
-will be based. This can differ from the distribution of your Build System.
+will be based. This can differ from the distribution of your host system.
-_* *{squeeze/wheezy/sid stable/testing/unstable}*: The stable distribution
+_* *{Squeeze/Wheezy/Sid (stable/testing/unstable)}*: The stable distribution
contains the latest officially released distribution of Debian. The testing
distribution is the staging area for the next stable release. A major
advantage of using this distribution is that it has more recent versions of
@@ -71,8 +71,8 @@ software relative to the stable release. The unstable distribution is where
active development of Debian occurs. Generally, this distribution is run by
developers and those who like to live on the edge.
-At the time of writing, squeeze is the current stable release and wheezy is
-the current testing release. sid will always be a synonym for the unstable
+At the time of writing, Squeeze is the current stable release and Wheezy is
+the current testing release. Sid will always be a synonym for the unstable
release.
2~ Authors
@@ -105,17 +105,17 @@ _* Trent W. Buck
2~ Contributing to this document
-This manual is intended as a community project and all proposals for
-improvements and contributions are extremely welcome. The preferred way to
-submit a contribution is to send it to the mailing list. Please see contact
-for more information.
+% FIXME: link to about_project.ssi 'Contact' This manual is intended as a
+community project and all proposals for improvements and contributions are
+extremely welcome. The preferred way to submit a contribution is to send it
+to the mailing list. Please see contact for more information.
% FIXME: <xref linkend="contact"/>
-When submitting a contribution please clearly identify its copyright holder
-and include the licensing statement. Note that to be accepted the
+When submitting a contribution, please clearly identify its copyright holder
+and include the licensing statement. Note that to be accepted, the
contribution must be licensed under the same license as the rest of the
-document, namely GPL version 3 or later.
+document, namely, GPL version 3 or later.
The sources for this manual are maintained using the Git version control
system. You can checkout the latest copy by executing:
@@ -148,19 +148,19 @@ $ make build
3~ Applying patches
Directly commiting to the repository is possible by anyone. However, we ask
-you to send bigger changes to the mailinglist to discuss them first. In
+you to send bigger changes to the mailing list to discuss them first. In
order to push to the repository, the following steps are required.
_* Fetch the public commit key:
code{
-$ mkdir -p ~/.ssh/identity.d $ wget
-http://live.debian.net/other/openssh/repository-public-commit-key-current/live-manual@debian-live
--O ~/.ssh/identity.d/live-manual at debian-live $ wget
-http://live.debian.net/other/openssh/repository-public-commit-key-current/live-manual@debian-live.pub
--O ~/.ssh/identity.d/live-manual at debian-live.pub $ chmod 0600
-~/.ssh/identity.d/live-manual at debian-live*
+$ mkdir -p ~/.ssh/identity.d
+$ wget http://live.debian.net/other/openssh/repository-public-commit-key-current/live-manual@debian-live \
+ -O ~/.ssh/identity.d/live-manual at debian-live
+$ wget http://live.debian.net/other/openssh/repository-public-commit-key-current/live-manual@debian-live.pub \
+ -O ~/.ssh/identity.d/live-manual at debian-live.pub
+$ chmod 0600 ~/.ssh/identity.d/live-manual at debian-live*
}code
@@ -186,7 +186,7 @@ $ git clone gitosis at live.debian.net:/live-manual.git
}code
_* After editing the files in manual/en/, please call the 'commit' target in
-the toplevel directory to sanitize the files and update the translation
+the top level directory to sanitize the files and update the translation
files:
code{
diff --git a/manual/en/about_manual.ssi b/manual/en/about_manual.ssi
index ae26112..a4015bf 100644
--- a/manual/en/about_manual.ssi
+++ b/manual/en/about_manual.ssi
@@ -8,11 +8,11 @@ Some of the commands mentioned in the text must be executed with superuser privi
2~ 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.
+_* *{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.
_* *{Debian Live}*: The Debian sub-project which maintains the live-boot, live-build, live-config, and live-manual packages.
-_* *{Debian Live system}*: A live system that uses software from the Debian operating system that may be booted from CDs, DVDs, USB sticks, over the network (via netboot images), and over the internet (via boot parameter #{fetch=URL}#).
+_* *{Debian Live system}*: A live system that uses software from the Debian operating system that may be booted from CDs, DVDs, USB sticks, over the network (via netboot images), and over the Internet (via boot parameter #{fetch=URL}#).
_* *{Host system}*: The environment used to create the live system.
@@ -20,25 +20,25 @@ _* *{Target system}*: The environment used to run the live system.
_* *{live-boot}*: A collection of scripts used to boot live systems. live-boot was formerly a part of live-initramfs.
-_* *{live-build}*: A collection of scripts used to build customised Debian Live systems. live-build was formerly know as live-helper, and even earlier know as live-package.
+_* *{live-build}*: A collection of scripts used to build customised Debian Live systems. live-build was formerly known as live-helper, and even earlier known as live-package.
-_* *{live-config}*: A collection of scripts used to configure a live systems during the boot process. live-config was formerly a part of live-initramfs.
+_* *{live-config}*: A collection of scripts used to configure a live system during the boot process. live-config was formerly a part of live-initramfs.
_* *{live-manual}*: This document is maintained in a package called live-manual.
-_* *{Debian Installer/(d-i)}*: The official installation system for the Debian distribution.
+_* *{Debian Installer (d-i)}*: The official installation system for the Debian distribution.
_* *{Boot parameters}*: Parameters that can be entered at the bootloader prompt to influence the kernel or live-config.
_* *{chroot}*: The chroot program, chroot(8), enables us to run different instances of the GNU/Linux environment on a single system simultaneously without rebooting.
-_* *{Binary image}*: On a live system, binary image refers to the binary filesystem and the respective extension, such as binary.iso or binary.img.
+_* *{Binary image}*: A file containing the live system, such as binary.iso or binary.img.
-_* *{Target distribution}*: The distribution upon which your live system will be based. This can differ from the distribution of your Build System.
+_* *{Target distribution}*: The distribution upon which your live system will be based. This can differ from the distribution of your host system.
-_* *{squeeze/wheezy/sid stable/testing/unstable}*: The stable distribution contains the latest officially released distribution of Debian. The testing distribution is the staging area for the next stable release. A major advantage of using this distribution is that it has more recent versions of software relative to the stable release. The unstable distribution is where active development of Debian occurs. Generally, this distribution is run by developers and those who like to live on the edge.
+_* *{Squeeze/Wheezy/Sid (stable/testing/unstable)}*: The stable distribution contains the latest officially released distribution of Debian. The testing distribution is the staging area for the next stable release. A major advantage of using this distribution is that it has more recent versions of software relative to the stable release. The unstable distribution is where active development of Debian occurs. Generally, this distribution is run by developers and those who like to live on the edge.
-At the time of writing, squeeze is the current stable release and wheezy is the current testing release. sid will always be a synonym for the unstable release.
+At the time of writing, Squeeze is the current stable release and Wheezy is the current testing release. Sid will always be a synonym for the unstable release.
2~ Authors
@@ -70,11 +70,12 @@ _* Trent W. Buck
2~ Contributing to this document
+% FIXME: link to about_project.ssi 'Contact'
This manual is intended as a community project and all proposals for improvements and contributions are extremely welcome. The preferred way to submit a contribution is to send it to the mailing list. Please see contact for more information.
% FIXME: <xref linkend="contact"/>
-When submitting a contribution please clearly identify its copyright holder and include the licensing statement. Note that to be accepted the contribution must be licensed under the same license as the rest of the document, namely GPL version 3 or later.
+When submitting a contribution, please clearly identify its copyright holder and include the licensing statement. Note that to be accepted, the contribution must be licensed under the same license as the rest of the document, namely, GPL version 3 or later.
The sources for this manual are maintained using the Git version control system. You can checkout the latest copy by executing:
@@ -102,15 +103,17 @@ $ make build
3~ Applying patches
-Directly commiting to the repository is possible by anyone. However, we ask you to send bigger changes to the mailinglist to discuss them first. In order to push to the repository, the following steps are required.
+Directly commiting to the repository is possible by anyone. However, we ask you to send bigger changes to the mailing list to discuss them first. In order to push to the repository, the following steps are required.
_* Fetch the public commit key:
code{
$ mkdir -p ~/.ssh/identity.d
-$ wget http://live.debian.net/other/openssh/repository-public-commit-key-current/live-manual@debian-live -O ~/.ssh/identity.d/live-manual at debian-live
-$ wget http://live.debian.net/other/openssh/repository-public-commit-key-current/live-manual@debian-live.pub -O ~/.ssh/identity.d/live-manual at debian-live.pub
+$ wget http://live.debian.net/other/openssh/repository-public-commit-key-current/live-manual@debian-live \
+ -O ~/.ssh/identity.d/live-manual at debian-live
+$ wget http://live.debian.net/other/openssh/repository-public-commit-key-current/live-manual@debian-live.pub \
+ -O ~/.ssh/identity.d/live-manual at debian-live.pub
$ chmod 0600 ~/.ssh/identity.d/live-manual at debian-live*
}code
@@ -136,7 +139,7 @@ $ git clone gitosis at live.debian.net:/live-manual.git
}code
-_* After editing the files in manual/en/, please call the 'commit' target in the toplevel directory to sanitize the files and update the translation files:
+_* After editing the files in manual/en/, please call the 'commit' target in the top level directory to sanitize the files and update the translation files:
code{
diff --git a/manual/po/de/about_manual.ssi.po b/manual/po/de/about_manual.ssi.po
index ad28636..1b556ad 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-03 20:30+0300\n"
+"POT-Creation-Date: 2010-10-13 14:59-0200\n"
"PO-Revision-Date: 2010-10-03 20:30+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -57,8 +57,8 @@ msgid ""
"_* *{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."
+"Live systems are typically booted from media such as CDs, DVDs or USB "
+"sticks. Some may also boot over the network."
msgstr ""
#. type: Plain text
@@ -73,7 +73,7 @@ msgstr ""
msgid ""
"_* *{Debian Live system}*: A live system that uses software from the Debian "
"operating system that may be booted from CDs, DVDs, USB sticks, over the "
-"network (via netboot images), and over the internet (via boot parameter #"
+"network (via netboot images), and over the Internet (via boot parameter #"
"{fetch=URL}#)."
msgstr ""
@@ -98,14 +98,14 @@ msgstr ""
#: en/about_manual.ssi:24
msgid ""
"_* *{live-build}*: A collection of scripts used to build customised Debian "
-"Live systems. live-build was formerly know as live-helper, and even earlier "
-"know as live-package."
+"Live systems. live-build was formerly known as live-helper, and even earlier "
+"known as live-package."
msgstr ""
#. type: Plain text
#: en/about_manual.ssi:26
msgid ""
-"_* *{live-config}*: A collection of scripts used to configure a live systems "
+"_* *{live-config}*: A collection of scripts used to configure a live system "
"during the boot process. live-config was formerly a part of live-initramfs."
msgstr ""
@@ -119,7 +119,7 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:30
msgid ""
-"_* *{Debian Installer/(d-i)}*: The official installation system for the "
+"_* *{Debian Installer (d-i)}*: The official installation system for the "
"Debian distribution."
msgstr ""
@@ -141,21 +141,21 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:36
msgid ""
-"_* *{Binary image}*: On a live system, binary image refers to the binary "
-"filesystem and the respective extension, such as binary.iso or binary.img."
+"_* *{Binary image}*: A file containing the live system, such as binary.iso "
+"or binary.img."
msgstr ""
#. type: Plain text
#: en/about_manual.ssi:38
msgid ""
"_* *{Target distribution}*: The distribution upon which your live system "
-"will be based. This can differ from the distribution of your Build System."
+"will be based. This can differ from the distribution of your host system."
msgstr ""
#. type: Plain text
#: en/about_manual.ssi:40
msgid ""
-"_* *{squeeze/wheezy/sid stable/testing/unstable}*: The stable distribution "
+"_* *{Squeeze/Wheezy/Sid (stable/testing/unstable)}*: The stable distribution "
"contains the latest officially released distribution of Debian. The testing "
"distribution is the staging area for the next stable release. A major "
"advantage of using this distribution is that it has more recent versions of "
@@ -167,8 +167,8 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:42
msgid ""
-"At the time of writing, squeeze is the current stable release and wheezy is "
-"the current testing release. sid will always be a synonym for the unstable "
+"At the time of writing, Squeeze is the current stable release and Wheezy is "
+"the current testing release. Sid will always be a synonym for the unstable "
"release."
msgstr ""
@@ -248,119 +248,116 @@ msgid "2~ Contributing to this document"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:74
+#: en/about_manual.ssi:75
msgid ""
-"This manual is intended as a community project and all proposals for "
-"improvements and contributions are extremely welcome. The preferred way to "
-"submit a contribution is to send it to the mailing list. Please see contact "
-"for more information."
+"% FIXME: link to about_project.ssi 'Contact' This manual is intended as a "
+"community project and all proposals for improvements and contributions are "
+"extremely welcome. The preferred way to submit a contribution is to send it "
+"to the mailing list. Please see contact for more information."
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:76
+#: en/about_manual.ssi:77
msgid "% FIXME: <xref linkend=\"contact\"/>"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:78
+#: en/about_manual.ssi:79
msgid ""
-"When submitting a contribution please clearly identify its copyright holder "
-"and include the licensing statement. Note that to be accepted the "
+"When submitting a contribution, please clearly identify its copyright holder "
+"and include the licensing statement. Note that to be accepted, the "
"contribution must be licensed under the same license as the rest of the "
-"document, namely GPL version 3 or later."
+"document, namely, GPL version 3 or later."
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:80
+#: en/about_manual.ssi:81
msgid ""
"The sources for this manual are maintained using the Git version control "
"system. You can checkout the latest copy by executing:"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:82 en/about_manual.ssi:90 en/about_manual.ssi:98
-#: en/about_manual.ssi:110 en/about_manual.ssi:121 en/about_manual.ssi:134
-#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
+#: en/about_manual.ssi: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/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
#: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
#: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
#: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: en/other_customization-internationalization.ssi:10
-#: en/other_customization-internationalization.ssi:18
-#: en/other_customization-internationalization.ssi:26
-#: en/other_customization-internationalization.ssi:34
-#: en/other_customization-internationalization.ssi:46 en/other_faq.ssi:41
-#: en/other_faq.ssi:83 en/other_faq.ssi:103 en/other_faq.ssi:117
-#: en/other_faq.ssi:137 en/other_faq.ssi:151 en/other_faq.ssi:198
-#: en/other_faq.ssi:245 en/other_faq.ssi:261 en/other_faq.ssi:287
-#: en/other_faq.ssi:299 en/other_faq.ssi:314 en/other_faq.ssi:333
-#: en/other_faq.ssi:345 en/other_faq.ssi:353 en/other_faq.ssi:364
-#: en/other_faq.ssi:374 en/other_howtos.ssi:16 en/other_howtos.ssi:43
-#: en/other_live-environment.ssi:14 en/other_live-environment.ssi:30
-#: en/other_live-environment.ssi:51 en/other_live-environment.ssi:61
-#: en/other_live-environment.ssi:69 en/other_live-environment.ssi:77
-#: en/other_live-environment.ssi:85 en/other_live-environment.ssi:93
-#: en/other_live-environment.ssi:116 en/other_live-environment.ssi:124
-#: en/other_live-environment.ssi:133 en/other_procedures.ssi:12
-#: en/other_procedures.ssi:46 en/other_procedures.ssi:58
-#: en/other_use-cases.ssi:24 en/other_use-cases.ssi:49
-#: en/other_use-cases.ssi:75 en/other_use-cases.ssi:103
-#: en/other_use-cases.ssi:111 en/user_basics.ssi:36 en/user_basics.ssi:48
-#: en/user_basics.ssi:62 en/user_basics.ssi:74 en/user_basics.ssi:88
-#: en/user_basics.ssi:104 en/user_basics.ssi:112 en/user_basics.ssi:120
-#: en/user_basics.ssi:130 en/user_basics.ssi:142 en/user_basics.ssi:154
-#: en/user_basics.ssi:162 en/user_basics.ssi:170 en/user_basics.ssi:184
-#: en/user_basics.ssi:192 en/user_basics.ssi:202 en/user_basics.ssi:222
-#: en/user_basics.ssi:255 en/user_basics.ssi:271 en/user_basics.ssi:279
-#: en/user_basics.ssi:299 en/user_basics.ssi:324
-#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
-#: en/user_customization-contents.ssi:66 en/user_customization-packages.ssi:16
-#: en/user_customization-packages.ssi:24 en/user_customization-packages.ssi:36
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:59
-#: en/user_customization-packages.ssi:73
+#: en/other_faq.ssi:41 en/other_faq.ssi:83 en/other_faq.ssi:103
+#: en/other_faq.ssi:117 en/other_faq.ssi:137 en/other_faq.ssi:151
+#: en/other_faq.ssi:198 en/other_faq.ssi:245 en/other_faq.ssi:261
+#: en/other_faq.ssi:287 en/other_faq.ssi:299 en/other_faq.ssi:314
+#: en/other_faq.ssi:333 en/other_faq.ssi:345 en/other_faq.ssi:353
+#: en/other_faq.ssi:364 en/other_faq.ssi:374 en/other_howtos.ssi:16
+#: en/other_howtos.ssi:43 en/other_live-environment.ssi:14
+#: en/other_live-environment.ssi:30 en/other_live-environment.ssi:51
+#: en/other_live-environment.ssi:61 en/other_live-environment.ssi:69
+#: en/other_live-environment.ssi:77 en/other_live-environment.ssi:85
+#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
+#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
+#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
+#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
+#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
+#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111 en/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/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
+#: en/user_customization-internationalization.ssi:10
+#: en/user_customization-internationalization.ssi:18
+#: en/user_customization-internationalization.ssi:26
+#: en/user_customization-internationalization.ssi:38
+#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
+#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
+#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
#: en/user_customization-packages.ssi:103
#: en/user_customization-packages.ssi:111
#: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:160
-#: en/user_customization-packages.ssi:170
-#: en/user_customization-packages.ssi:180
-#: en/user_customization-packages.ssi:190 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:186
+#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
#: en/user_installation.ssi:46 en/user_installation.ssi:56
#: en/user_installation.ssi:64 en/user_installation.ssi:76
#: en/user_installation.ssi:84 en/user_installation.ssi:105
#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_overview.ssi:60 en/user_overview.ssi:104 en/user_overview.ssi:112
+#: 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
msgid "code{"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:84
+#: en/about_manual.ssi:85
msgid "$ git clone git://live.debian.net/git/live-manual.git"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:86 en/about_manual.ssi:94 en/about_manual.ssi:102
-#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
+#: en/about_manual.ssi: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/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
#: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
#: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
#: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: en/other_customization-internationalization.ssi:14
-#: en/other_customization-internationalization.ssi:22
-#: en/other_customization-internationalization.ssi:30
-#: en/other_customization-internationalization.ssi:38
-#: en/other_customization-internationalization.ssi:50 en/other_faq.ssi:37
-#: en/other_faq.ssi:46 en/other_faq.ssi:92 en/other_faq.ssi:108
-#: en/other_faq.ssi:141 en/other_faq.ssi:155 en/other_faq.ssi:207
-#: en/other_faq.ssi:256 en/other_faq.ssi:292 en/other_faq.ssi:307
-#: en/other_faq.ssi:319 en/other_faq.ssi:337 en/other_faq.ssi:349
-#: en/other_faq.ssi:358 en/other_faq.ssi:370 en/other_faq.ssi:381
-#: en/other_howtos.ssi:20 en/other_howtos.ssi:47
+#: en/other_faq.ssi:37 en/other_faq.ssi:46 en/other_faq.ssi:92
+#: en/other_faq.ssi:108 en/other_faq.ssi:141 en/other_faq.ssi:155
+#: en/other_faq.ssi:207 en/other_faq.ssi:256 en/other_faq.ssi:292
+#: en/other_faq.ssi:307 en/other_faq.ssi:319 en/other_faq.ssi:337
+#: en/other_faq.ssi:349 en/other_faq.ssi:358 en/other_faq.ssi:370
+#: en/other_faq.ssi:381 en/other_howtos.ssi:20 en/other_howtos.ssi:47
#: en/other_live-environment.ssi:18 en/other_live-environment.ssi:34
#: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
#: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
@@ -371,34 +368,41 @@ msgstr ""
#: 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:94
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:124
-#: en/user_basics.ssi:134 en/user_basics.ssi:148 en/user_basics.ssi:158
-#: en/user_basics.ssi:166 en/user_basics.ssi:174 en/user_basics.ssi:188
-#: en/user_basics.ssi:196 en/user_basics.ssi:206 en/user_basics.ssi:247
-#: en/user_basics.ssi:275 en/user_basics.ssi:283 en/user_basics.ssi:310
-#: en/user_basics.ssi:349 en/user_customization-contents.ssi:39
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
+#: en/user_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/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:70
+#: en/user_customization-internationalization.ssi:14
+#: en/user_customization-internationalization.ssi:22
+#: en/user_customization-internationalization.ssi:30
+#: en/user_customization-internationalization.ssi:42
#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
#: en/user_customization-packages.ssi:107
#: en/user_customization-packages.ssi:115
#: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:172
+#: en/user_customization-packages.ssi:182
+#: en/user_customization-packages.ssi:192
+#: en/user_customization-packages.ssi:202 en/user_installation.ssi:42
#: en/user_installation.ssi:50 en/user_installation.ssi:60
#: en/user_installation.ssi:72 en/user_installation.ssi:80
#: en/user_installation.ssi:109 en/user_installation.ssi:124
-#: en/user_installation.ssi:139 en/user_overview.ssi:98
+#: en/user_installation.ssi:139 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
msgid "}code"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:88
+#: en/about_manual.ssi:89
msgid ""
"Prior to submission of your contribution, please preview your work. To "
"preview the live-manual, ensure the packages needed for building are "
@@ -406,58 +410,59 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:92
+#: en/about_manual.ssi:93
msgid "# apt-get install sisu-complete"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:96
+#: en/about_manual.ssi:97
msgid ""
"You may build the live-manual from the top level directory of your git "
"checkout by executing:"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:100
+#: en/about_manual.ssi:101
msgid "$ make build"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:104
+#: en/about_manual.ssi:105
msgid "3~ Applying patches"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:106
+#: en/about_manual.ssi:107
msgid ""
"Directly commiting to the repository is possible by anyone. However, we ask "
-"you to send bigger changes to the mailinglist to discuss them first. In "
+"you to send bigger changes to the mailing list to discuss them first. In "
"order to push to the repository, the following steps are required."
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:108
+#: en/about_manual.ssi:109
msgid "_* Fetch the public commit key:"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:115
+#: en/about_manual.ssi:118
+#, no-wrap
msgid ""
-"$ mkdir -p ~/.ssh/identity.d $ wget http://live.debian.net/other/openssh/"
-"repository-public-commit-key-current/live-manual at debian-live -O ~/.ssh/"
-"identity.d/live-manual at debian-live $ wget http://live.debian.net/other/"
-"openssh/repository-public-commit-key-current/live-manual at debian-live.pub -O "
-"~/.ssh/identity.d/live-manual at debian-live.pub $ chmod 0600 ~/.ssh/identity.d/"
-"live-manual at debian-live*"
+"$ mkdir -p ~/.ssh/identity.d\n"
+"$ wget http://live.debian.net/other/openssh/repository-public-commit-key-current/live-manual@debian-live \\\n"
+"\t-O ~/.ssh/identity.d/live-manual at debian-live\n"
+"$ wget http://live.debian.net/other/openssh/repository-public-commit-key-current/live-manual@debian-live.pub \\\n"
+"\t-O ~/.ssh/identity.d/live-manual at debian-live.pub\n"
+"$ chmod 0600 ~/.ssh/identity.d/live-manual at debian-live*\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:119
+#: en/about_manual.ssi:122
msgid "_* Add the following section to your openssh-client config:"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:128
+#: en/about_manual.ssi:131
#, no-wrap
msgid ""
"$ cat >> ~/.ssh/config << EOF\n"
@@ -469,30 +474,30 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:132
+#: en/about_manual.ssi:135
msgid "_* Checkout a clone of the manual through ssh:"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:136
+#: en/about_manual.ssi:139
msgid "$ git clone gitosis at live.debian.net:/live-manual.git"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:140
+#: en/about_manual.ssi:143
msgid ""
"_* After editing the files in manual/en/, please call the 'commit' target in "
-"the toplevel directory to sanitize the files and update the translation "
+"the top level directory to sanitize the files and update the translation "
"files:"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:144
+#: en/about_manual.ssi:147
msgid "$ make commit"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:148
+#: en/about_manual.ssi:151
msgid ""
"_* After sanitizing commit the changes. Write commit messages, that consist "
"of full useful sentences, starting with a capital letter and ending with a "
@@ -501,16 +506,16 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:152
+#: en/about_manual.ssi:155
msgid "$ git commit -a"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:156
+#: en/about_manual.ssi:159
msgid "_* Push the commit to the server:"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:160
+#: en/about_manual.ssi:163
msgid "$ git push"
msgstr ""
diff --git a/manual/pot/about_manual.ssi.pot b/manual/pot/about_manual.ssi.pot
index eeaafc6..9aa8122 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-03 20:30+0300\n"
+"POT-Creation-Date: 2010-10-13 14:59-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"
@@ -57,8 +57,8 @@ msgid ""
"_* *{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."
+"Live systems are typically booted from media such as CDs, DVDs or USB "
+"sticks. Some may also boot over the network."
msgstr ""
#. type: Plain text
@@ -73,7 +73,7 @@ msgstr ""
msgid ""
"_* *{Debian Live system}*: A live system that uses software from the Debian "
"operating system that may be booted from CDs, DVDs, USB sticks, over the "
-"network (via netboot images), and over the internet (via boot parameter #"
+"network (via netboot images), and over the Internet (via boot parameter #"
"{fetch=URL}#)."
msgstr ""
@@ -98,14 +98,14 @@ msgstr ""
#: en/about_manual.ssi:24
msgid ""
"_* *{live-build}*: A collection of scripts used to build customised Debian "
-"Live systems. live-build was formerly know as live-helper, and even earlier "
-"know as live-package."
+"Live systems. live-build was formerly known as live-helper, and even earlier "
+"known as live-package."
msgstr ""
#. type: Plain text
#: en/about_manual.ssi:26
msgid ""
-"_* *{live-config}*: A collection of scripts used to configure a live systems "
+"_* *{live-config}*: A collection of scripts used to configure a live system "
"during the boot process. live-config was formerly a part of live-initramfs."
msgstr ""
@@ -119,7 +119,7 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:30
msgid ""
-"_* *{Debian Installer/(d-i)}*: The official installation system for the "
+"_* *{Debian Installer (d-i)}*: The official installation system for the "
"Debian distribution."
msgstr ""
@@ -141,21 +141,21 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:36
msgid ""
-"_* *{Binary image}*: On a live system, binary image refers to the binary "
-"filesystem and the respective extension, such as binary.iso or binary.img."
+"_* *{Binary image}*: A file containing the live system, such as binary.iso "
+"or binary.img."
msgstr ""
#. type: Plain text
#: en/about_manual.ssi:38
msgid ""
"_* *{Target distribution}*: The distribution upon which your live system "
-"will be based. This can differ from the distribution of your Build System."
+"will be based. This can differ from the distribution of your host system."
msgstr ""
#. type: Plain text
#: en/about_manual.ssi:40
msgid ""
-"_* *{squeeze/wheezy/sid stable/testing/unstable}*: The stable distribution "
+"_* *{Squeeze/Wheezy/Sid (stable/testing/unstable)}*: The stable distribution "
"contains the latest officially released distribution of Debian. The testing "
"distribution is the staging area for the next stable release. A major "
"advantage of using this distribution is that it has more recent versions of "
@@ -167,8 +167,8 @@ msgstr ""
#. type: Plain text
#: en/about_manual.ssi:42
msgid ""
-"At the time of writing, squeeze is the current stable release and wheezy is "
-"the current testing release. sid will always be a synonym for the unstable "
+"At the time of writing, Squeeze is the current stable release and Wheezy is "
+"the current testing release. Sid will always be a synonym for the unstable "
"release."
msgstr ""
@@ -248,119 +248,116 @@ msgid "2~ Contributing to this document"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:74
+#: en/about_manual.ssi:75
msgid ""
-"This manual is intended as a community project and all proposals for "
-"improvements and contributions are extremely welcome. The preferred way to "
-"submit a contribution is to send it to the mailing list. Please see contact "
-"for more information."
+"% FIXME: link to about_project.ssi 'Contact' This manual is intended as a "
+"community project and all proposals for improvements and contributions are "
+"extremely welcome. The preferred way to submit a contribution is to send it "
+"to the mailing list. Please see contact for more information."
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:76
+#: en/about_manual.ssi:77
msgid "% FIXME: <xref linkend=\"contact\"/>"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:78
+#: en/about_manual.ssi:79
msgid ""
-"When submitting a contribution please clearly identify its copyright holder "
-"and include the licensing statement. Note that to be accepted the "
+"When submitting a contribution, please clearly identify its copyright holder "
+"and include the licensing statement. Note that to be accepted, the "
"contribution must be licensed under the same license as the rest of the "
-"document, namely GPL version 3 or later."
+"document, namely, GPL version 3 or later."
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:80
+#: en/about_manual.ssi:81
msgid ""
"The sources for this manual are maintained using the Git version control "
"system. You can checkout the latest copy by executing:"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:82 en/about_manual.ssi:90 en/about_manual.ssi:98
-#: en/about_manual.ssi:110 en/about_manual.ssi:121 en/about_manual.ssi:134
-#: en/about_manual.ssi:142 en/about_manual.ssi:150 en/about_manual.ssi:158
+#: en/about_manual.ssi: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/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
#: en/other_coding-style.ssi:106 en/other_coding-style.ssi:117
#: en/other_common-tasks.ssi:32 en/other_customization-backports.ssi:8
#: en/other_customization-bootup.ssi:30 en/other_customization-bootup.ssi:39
-#: en/other_customization-internationalization.ssi:10
-#: en/other_customization-internationalization.ssi:18
-#: en/other_customization-internationalization.ssi:26
-#: en/other_customization-internationalization.ssi:34
-#: en/other_customization-internationalization.ssi:46 en/other_faq.ssi:41
-#: en/other_faq.ssi:83 en/other_faq.ssi:103 en/other_faq.ssi:117
-#: en/other_faq.ssi:137 en/other_faq.ssi:151 en/other_faq.ssi:198
-#: en/other_faq.ssi:245 en/other_faq.ssi:261 en/other_faq.ssi:287
-#: en/other_faq.ssi:299 en/other_faq.ssi:314 en/other_faq.ssi:333
-#: en/other_faq.ssi:345 en/other_faq.ssi:353 en/other_faq.ssi:364
-#: en/other_faq.ssi:374 en/other_howtos.ssi:16 en/other_howtos.ssi:43
-#: en/other_live-environment.ssi:14 en/other_live-environment.ssi:30
-#: en/other_live-environment.ssi:51 en/other_live-environment.ssi:61
-#: en/other_live-environment.ssi:69 en/other_live-environment.ssi:77
-#: en/other_live-environment.ssi:85 en/other_live-environment.ssi:93
-#: en/other_live-environment.ssi:116 en/other_live-environment.ssi:124
-#: en/other_live-environment.ssi:133 en/other_procedures.ssi:12
-#: en/other_procedures.ssi:46 en/other_procedures.ssi:58
-#: en/other_use-cases.ssi:24 en/other_use-cases.ssi:49
-#: en/other_use-cases.ssi:75 en/other_use-cases.ssi:103
-#: en/other_use-cases.ssi:111 en/user_basics.ssi:36 en/user_basics.ssi:48
-#: en/user_basics.ssi:62 en/user_basics.ssi:74 en/user_basics.ssi:88
-#: en/user_basics.ssi:104 en/user_basics.ssi:112 en/user_basics.ssi:120
-#: en/user_basics.ssi:130 en/user_basics.ssi:142 en/user_basics.ssi:154
-#: en/user_basics.ssi:162 en/user_basics.ssi:170 en/user_basics.ssi:184
-#: en/user_basics.ssi:192 en/user_basics.ssi:202 en/user_basics.ssi:222
-#: en/user_basics.ssi:255 en/user_basics.ssi:271 en/user_basics.ssi:279
-#: en/user_basics.ssi:299 en/user_basics.ssi:324
-#: en/user_customization-contents.ssi:34 en/user_customization-contents.ssi:43
-#: en/user_customization-contents.ssi:66 en/user_customization-packages.ssi:16
-#: en/user_customization-packages.ssi:24 en/user_customization-packages.ssi:36
-#: en/user_customization-packages.ssi:45 en/user_customization-packages.ssi:59
-#: en/user_customization-packages.ssi:73
+#: en/other_faq.ssi:41 en/other_faq.ssi:83 en/other_faq.ssi:103
+#: en/other_faq.ssi:117 en/other_faq.ssi:137 en/other_faq.ssi:151
+#: en/other_faq.ssi:198 en/other_faq.ssi:245 en/other_faq.ssi:261
+#: en/other_faq.ssi:287 en/other_faq.ssi:299 en/other_faq.ssi:314
+#: en/other_faq.ssi:333 en/other_faq.ssi:345 en/other_faq.ssi:353
+#: en/other_faq.ssi:364 en/other_faq.ssi:374 en/other_howtos.ssi:16
+#: en/other_howtos.ssi:43 en/other_live-environment.ssi:14
+#: en/other_live-environment.ssi:30 en/other_live-environment.ssi:51
+#: en/other_live-environment.ssi:61 en/other_live-environment.ssi:69
+#: en/other_live-environment.ssi:77 en/other_live-environment.ssi:85
+#: en/other_live-environment.ssi:93 en/other_live-environment.ssi:116
+#: en/other_live-environment.ssi:124 en/other_live-environment.ssi:133
+#: en/other_procedures.ssi:12 en/other_procedures.ssi:46
+#: en/other_procedures.ssi:58 en/other_use-cases.ssi:24
+#: en/other_use-cases.ssi:49 en/other_use-cases.ssi:75
+#: en/other_use-cases.ssi:103 en/other_use-cases.ssi:111 en/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/user_customization-contents.ssi:43 en/user_customization-contents.ssi:66
+#: en/user_customization-internationalization.ssi:10
+#: en/user_customization-internationalization.ssi:18
+#: en/user_customization-internationalization.ssi:26
+#: en/user_customization-internationalization.ssi:38
+#: en/user_customization-packages.ssi:16 en/user_customization-packages.ssi:24
+#: en/user_customization-packages.ssi:36 en/user_customization-packages.ssi:45
+#: en/user_customization-packages.ssi:59 en/user_customization-packages.ssi:73
#: en/user_customization-packages.ssi:103
#: en/user_customization-packages.ssi:111
#: en/user_customization-packages.ssi:131
-#: en/user_customization-packages.ssi:160
-#: en/user_customization-packages.ssi:170
-#: en/user_customization-packages.ssi:180
-#: en/user_customization-packages.ssi:190 en/user_installation.ssi:38
+#: en/user_customization-packages.ssi:166
+#: en/user_customization-packages.ssi:176
+#: en/user_customization-packages.ssi:186
+#: en/user_customization-packages.ssi:196 en/user_installation.ssi:38
#: en/user_installation.ssi:46 en/user_installation.ssi:56
#: en/user_installation.ssi:64 en/user_installation.ssi:76
#: en/user_installation.ssi:84 en/user_installation.ssi:105
#: en/user_installation.ssi:119 en/user_installation.ssi:136
-#: en/user_overview.ssi:60 en/user_overview.ssi:104 en/user_overview.ssi:112
+#: 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
msgid "code{"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:84
+#: en/about_manual.ssi:85
msgid "$ git clone git://live.debian.net/git/live-manual.git"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:86 en/about_manual.ssi:94 en/about_manual.ssi:102
-#: en/about_manual.ssi:117 en/about_manual.ssi:130 en/about_manual.ssi:138
-#: en/about_manual.ssi:146 en/about_manual.ssi:154 en/about_manual.ssi:161
+#: en/about_manual.ssi: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/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
#: en/other_coding-style.ssi:113 en/other_coding-style.ssi:124
#: en/other_common-tasks.ssi:36 en/other_customization-backports.ssi:16
#: en/other_customization-bootup.ssi:35 en/other_customization-bootup.ssi:48
-#: en/other_customization-internationalization.ssi:14
-#: en/other_customization-internationalization.ssi:22
-#: en/other_customization-internationalization.ssi:30
-#: en/other_customization-internationalization.ssi:38
-#: en/other_customization-internationalization.ssi:50 en/other_faq.ssi:37
-#: en/other_faq.ssi:46 en/other_faq.ssi:92 en/other_faq.ssi:108
-#: en/other_faq.ssi:141 en/other_faq.ssi:155 en/other_faq.ssi:207
-#: en/other_faq.ssi:256 en/other_faq.ssi:292 en/other_faq.ssi:307
-#: en/other_faq.ssi:319 en/other_faq.ssi:337 en/other_faq.ssi:349
-#: en/other_faq.ssi:358 en/other_faq.ssi:370 en/other_faq.ssi:381
-#: en/other_howtos.ssi:20 en/other_howtos.ssi:47
+#: en/other_faq.ssi:37 en/other_faq.ssi:46 en/other_faq.ssi:92
+#: en/other_faq.ssi:108 en/other_faq.ssi:141 en/other_faq.ssi:155
+#: en/other_faq.ssi:207 en/other_faq.ssi:256 en/other_faq.ssi:292
+#: en/other_faq.ssi:307 en/other_faq.ssi:319 en/other_faq.ssi:337
+#: en/other_faq.ssi:349 en/other_faq.ssi:358 en/other_faq.ssi:370
+#: en/other_faq.ssi:381 en/other_howtos.ssi:20 en/other_howtos.ssi:47
#: en/other_live-environment.ssi:18 en/other_live-environment.ssi:34
#: en/other_live-environment.ssi:55 en/other_live-environment.ssi:65
#: en/other_live-environment.ssi:73 en/other_live-environment.ssi:81
@@ -371,34 +368,41 @@ msgstr ""
#: 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:94
-#: en/user_basics.ssi:108 en/user_basics.ssi:116 en/user_basics.ssi:124
-#: en/user_basics.ssi:134 en/user_basics.ssi:148 en/user_basics.ssi:158
-#: en/user_basics.ssi:166 en/user_basics.ssi:174 en/user_basics.ssi:188
-#: en/user_basics.ssi:196 en/user_basics.ssi:206 en/user_basics.ssi:247
-#: en/user_basics.ssi:275 en/user_basics.ssi:283 en/user_basics.ssi:310
-#: en/user_basics.ssi:349 en/user_customization-contents.ssi:39
-#: en/user_customization-contents.ssi:54 en/user_customization-contents.ssi:70
+#: en/user_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/user_customization-contents.ssi:39 en/user_customization-contents.ssi:54
+#: en/user_customization-contents.ssi:70
+#: en/user_customization-internationalization.ssi:14
+#: en/user_customization-internationalization.ssi:22
+#: en/user_customization-internationalization.ssi:30
+#: en/user_customization-internationalization.ssi:42
#: en/user_customization-packages.ssi:20 en/user_customization-packages.ssi:28
#: en/user_customization-packages.ssi:41 en/user_customization-packages.ssi:49
#: en/user_customization-packages.ssi:63 en/user_customization-packages.ssi:77
#: en/user_customization-packages.ssi:107
#: en/user_customization-packages.ssi:115
#: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:166
-#: en/user_customization-packages.ssi:176
-#: en/user_customization-packages.ssi:186
-#: en/user_customization-packages.ssi:196 en/user_installation.ssi:42
+#: en/user_customization-packages.ssi:172
+#: en/user_customization-packages.ssi:182
+#: en/user_customization-packages.ssi:192
+#: en/user_customization-packages.ssi:202 en/user_installation.ssi:42
#: en/user_installation.ssi:50 en/user_installation.ssi:60
#: en/user_installation.ssi:72 en/user_installation.ssi:80
#: en/user_installation.ssi:109 en/user_installation.ssi:124
-#: en/user_installation.ssi:139 en/user_overview.ssi:98
+#: en/user_installation.ssi:139 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
msgid "}code"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:88
+#: en/about_manual.ssi:89
msgid ""
"Prior to submission of your contribution, please preview your work. To "
"preview the live-manual, ensure the packages needed for building are "
@@ -406,58 +410,59 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:92
+#: en/about_manual.ssi:93
msgid "# apt-get install sisu-complete"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:96
+#: en/about_manual.ssi:97
msgid ""
"You may build the live-manual from the top level directory of your git "
"checkout by executing:"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:100
+#: en/about_manual.ssi:101
msgid "$ make build"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:104
+#: en/about_manual.ssi:105
msgid "3~ Applying patches"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:106
+#: en/about_manual.ssi:107
msgid ""
"Directly commiting to the repository is possible by anyone. However, we ask "
-"you to send bigger changes to the mailinglist to discuss them first. In "
+"you to send bigger changes to the mailing list to discuss them first. In "
"order to push to the repository, the following steps are required."
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:108
+#: en/about_manual.ssi:109
msgid "_* Fetch the public commit key:"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:115
+#: en/about_manual.ssi:118
+#, no-wrap
msgid ""
-"$ mkdir -p ~/.ssh/identity.d $ wget http://live.debian.net/other/openssh/"
-"repository-public-commit-key-current/live-manual at debian-live -O ~/.ssh/"
-"identity.d/live-manual at debian-live $ wget http://live.debian.net/other/"
-"openssh/repository-public-commit-key-current/live-manual at debian-live.pub -O "
-"~/.ssh/identity.d/live-manual at debian-live.pub $ chmod 0600 ~/.ssh/identity.d/"
-"live-manual at debian-live*"
+"$ mkdir -p ~/.ssh/identity.d\n"
+"$ wget http://live.debian.net/other/openssh/repository-public-commit-key-current/live-manual@debian-live \\\n"
+"\t-O ~/.ssh/identity.d/live-manual at debian-live\n"
+"$ wget http://live.debian.net/other/openssh/repository-public-commit-key-current/live-manual@debian-live.pub \\\n"
+"\t-O ~/.ssh/identity.d/live-manual at debian-live.pub\n"
+"$ chmod 0600 ~/.ssh/identity.d/live-manual at debian-live*\n"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:119
+#: en/about_manual.ssi:122
msgid "_* Add the following section to your openssh-client config:"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:128
+#: en/about_manual.ssi:131
#, no-wrap
msgid ""
"$ cat >> ~/.ssh/config << EOF\n"
@@ -469,30 +474,30 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:132
+#: en/about_manual.ssi:135
msgid "_* Checkout a clone of the manual through ssh:"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:136
+#: en/about_manual.ssi:139
msgid "$ git clone gitosis at live.debian.net:/live-manual.git"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:140
+#: en/about_manual.ssi:143
msgid ""
"_* After editing the files in manual/en/, please call the 'commit' target in "
-"the toplevel directory to sanitize the files and update the translation "
+"the top level directory to sanitize the files and update the translation "
"files:"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:144
+#: en/about_manual.ssi:147
msgid "$ make commit"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:148
+#: en/about_manual.ssi:151
msgid ""
"_* After sanitizing commit the changes. Write commit messages, that consist "
"of full useful sentences, starting with a capital letter and ending with a "
@@ -501,16 +506,16 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:152
+#: en/about_manual.ssi:155
msgid "$ git commit -a"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:156
+#: en/about_manual.ssi:159
msgid "_* Push the commit to the server:"
msgstr ""
#. type: Plain text
-#: en/about_manual.ssi:160
+#: en/about_manual.ssi:163
msgid "$ git push"
msgstr ""
--
live-manual
More information about the debian-live-changes
mailing list