Merge branch 'master' of salsa.debian.org:installer-team/installation-guide

2 files changed, 160 insertions, 183 deletions

diff --git a/po/nn/post-install.po b/po/nn/post-install.po
index afb572a47..ea1a383b8 100644
--- a/po/nn/post-install.po
+++ b/po/nn/post-install.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: d-i-manual_post-install\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2018-08-03 23:21+0000\n"
+"POT-Creation-Date: 2018-08-31 23:21+0000\n"
 "PO-Revision-Date: 2016-04-08 20:25+0000\n"
 "Last-Translator: NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Norwegian nynorsk <LL@li.org>\n"
@@ -59,44 +59,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: post-install.xml:61
-#, no-c-format
-msgid "If You Are New to Unix"
-msgstr ""
-
-#. Tag: para
-#: post-install.xml:62
-#, no-c-format
-msgid ""
-"If you are new to Unix, you probably should go out and buy some books and do "
-"some reading. A lot of valuable information can also be found in the <ulink "
-"url=\"&url-debian-reference;\">Debian Reference</ulink>. This <ulink url="
-"\"&url-unix-faq;\">list of Unix FAQs</ulink> contains a number of UseNet "
-"documents which provide a nice historical reference."
-msgstr ""
-
-#. Tag: para
-#: post-install.xml:70
-#, no-c-format
-msgid ""
-"Linux is an implementation of Unix. The <ulink url=\"&url-ldp;\">Linux "
-"Documentation Project (LDP)</ulink> collects a number of HOWTOs and online "
-"books relating to Linux. Most of these documents can be installed locally; "
-"just install the <classname>doc-linux-html</classname> package (HTML "
-"versions) or the <classname>doc-linux-text</classname> package (ASCII "
-"versions), then look in <filename>/usr/share/doc/HOWTO</filename>. "
-"International versions of the LDP HOWTOs are also available as &debian; "
-"packages."
-msgstr ""
-
-#. Tag: title
-#: post-install.xml:91
+#: post-install.xml:60
 #, no-c-format
 msgid "Orienting Yourself to &debian;"
 msgstr ""
 
 #. Tag: para
-#: post-install.xml:92
+#: post-install.xml:61
 #, no-c-format
 msgid ""
 "&debian; is a little different from other distributions. Even if you're "
@@ -108,13 +77,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: post-install.xml:103
+#: post-install.xml:72
 #, no-c-format
 msgid "&debian; Packaging System"
 msgstr ""
 
 #. Tag: para
-#: post-install.xml:104
+#: post-install.xml:73
 #, no-c-format
 msgid ""
 "The most important concept to grasp is the &debian; packaging system. In "
@@ -134,7 +103,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: post-install.xml:145
+#: post-install.xml:114
 #, no-c-format
 msgid ""
 "One of the best installation methods is apt. You can use the command line "
@@ -147,13 +116,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: post-install.xml:159
+#: post-install.xml:128
 #, no-c-format
 msgid "Additional Software Available for &debian;"
 msgstr ""
 
 #. Tag: para
-#: post-install.xml:160
+#: post-install.xml:129
 #, no-c-format
 msgid ""
 "There are official and unofficial software repositories that are not enabled "
@@ -164,13 +133,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: post-install.xml:172
+#: post-install.xml:141
 #, no-c-format
 msgid "Application Version Management"
 msgstr ""
 
 #. Tag: para
-#: post-install.xml:173
+#: post-install.xml:142
 #, no-c-format
 msgid ""
 "Alternative versions of applications are managed by update-alternatives. If "
@@ -179,13 +148,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: post-install.xml:183
+#: post-install.xml:152
 #, no-c-format
 msgid "Cron Job Management"
 msgstr ""
 
 #. Tag: para
-#: post-install.xml:184
+#: post-install.xml:153
 #, no-c-format
 msgid ""
 "Any jobs under the purview of the system administrator should be in "
@@ -197,7 +166,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: post-install.xml:193
+#: post-install.xml:162
 #, no-c-format
 msgid ""
 "On the other hand, if you have a cron job that (a) needs to run as a special "
@@ -208,7 +177,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: post-install.xml:202
+#: post-install.xml:171
 #, no-c-format
 msgid ""
 "In either case, you just edit the files and cron will notice them "
@@ -218,13 +187,31 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: post-install.xml:217
+#: post-install.xml:186
 #, no-c-format
 msgid "Further Reading and Information"
 msgstr ""
 
 #. Tag: para
-#: post-install.xml:218
+#: post-install.xml:187
+#, no-c-format
+msgid ""
+"The <ulink url=\"http://www.debian.org/\">Debian web site</ulink> contains a "
+"large quantity of documentation about &debian;. In particular, see the "
+"<ulink url=\"http://www.debian.org/doc/FAQ/\">Debian GNU/Linux FAQ</ulink> "
+"and the <ulink url=\"http://www.debian.org/doc/user-manuals#quick-reference"
+"\">Debian Reference</ulink>. An index of more &debian; documentation is "
+"available from the <ulink url=\"http://www.debian.org/doc/ddp\">Debian "
+"Documentation Project</ulink>. The &debian; community is self-supporting; to "
+"subscribe to one or more of the Debian mailing lists, see the <ulink url="
+"\"http://www.debian.org/MailingLists/subscribe\"> Mail List Subscription</"
+"ulink> page. Last, but not least, the <ulink url=\"http://lists.debian.org/"
+"\">Debian Mailing List Archives</ulink> contain a wealth of information on "
+"&debian;."
+msgstr ""
+
+#. Tag: para
+#: post-install.xml:205
 #, no-c-format
 msgid ""
 "If you need information about a particular program, you should first try "
@@ -233,7 +220,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: post-install.xml:224
+#: post-install.xml:211
 #, no-c-format
 msgid ""
 "There is lots of useful documentation in <filename>/usr/share/doc</filename> "
@@ -245,41 +232,42 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: post-install.xml:235
+#: post-install.xml:222
 #, no-c-format
 msgid ""
-"The <ulink url=\"http://www.debian.org/\">Debian web site</ulink> contains a "
-"large quantity of documentation about &debian;. In particular, see the "
-"<ulink url=\"http://www.debian.org/doc/FAQ/\">Debian GNU/Linux FAQ</ulink> "
-"and the <ulink url=\"http://www.debian.org/doc/user-manuals#quick-reference"
-"\">Debian Reference</ulink>. An index of more &debian; documentation is "
-"available from the <ulink url=\"http://www.debian.org/doc/ddp\">Debian "
-"Documentation Project</ulink>. The &debian; community is self-supporting; to "
-"subscribe to one or more of the Debian mailing lists, see the <ulink url="
-"\"http://www.debian.org/MailingLists/subscribe\"> Mail List Subscription</"
-"ulink> page. Last, but not least, the <ulink url=\"http://lists.debian.org/"
-"\">Debian Mailing List Archives</ulink> contain a wealth of information on "
-"&debian;."
+"A general source of information on GNU/Linux is the <ulink url=\"http://www."
+"tldp.org/\">Linux Documentation Project</ulink>. There you will find the "
+"HOWTOs and pointers to other very valuable information on parts of a GNU/"
+"Linux system."
 msgstr ""
 
 #. Tag: para
-#: post-install.xml:253
+#: post-install.xml:229
 #, no-c-format
 msgid ""
-"A general source of information on GNU/Linux is the <ulink url=\"http://www."
-"tldp.org/\">Linux Documentation Project</ulink>. There you will find the "
-"HOWTOs and pointers to other very valuable information on parts of a GNU/"
-"Linux system."
+"Linux is an implementation of Unix. The <ulink url=\"&url-ldp;\">Linux "
+"Documentation Project (LDP)</ulink> collects a number of HOWTOs and online "
+"books relating to Linux."
+msgstr ""
+
+#. Tag: para
+#: post-install.xml:236
+#, no-c-format
+msgid ""
+"If you are new to Unix, you probably should go out and buy some books and do "
+"some reading. This <ulink url=\"&url-unix-faq;\">list of Unix FAQs</ulink> "
+"contains a number of UseNet documents which provide a nice historical "
+"reference."
 msgstr ""
 
 #. Tag: title
-#: post-install.xml:269
+#: post-install.xml:251
 #, no-c-format
 msgid "Setting Up Your System To Use E-Mail"
 msgstr ""
 
 #. Tag: para
-#: post-install.xml:270
+#: post-install.xml:252
 #, no-c-format
 msgid ""
 "Today, email is an important part of many people's life. As there are many "
@@ -289,7 +277,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: post-install.xml:277
+#: post-install.xml:259
 #, no-c-format
 msgid ""
 "There are three main functions that make up an e-mail system. First there is "
@@ -302,7 +290,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: post-install.xml:287
+#: post-install.xml:269
 #, no-c-format
 msgid ""
 "These three functions can be performed by separate programs, but they can "
@@ -311,7 +299,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: post-install.xml:293
+#: post-install.xml:275
 #, no-c-format
 msgid ""
 "On Linux and Unix systems <command>mutt</command> is historically a very "
@@ -321,7 +309,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: post-install.xml:300
+#: post-install.xml:282
 #, no-c-format
 msgid ""
 "With the increasing popularity of graphical desktop systems, the use of "
@@ -333,13 +321,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: post-install.xml:312
+#: post-install.xml:294
 #, no-c-format
 msgid "Default E-Mail Configuration"
 msgstr ""
 
 #. Tag: para
-#: post-install.xml:313
+#: post-install.xml:295
 #, no-c-format
 msgid ""
 "Even if you are planning to use a graphical mail program, it is important "
@@ -352,7 +340,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: post-install.xml:328
+#: post-install.xml:310
 #, no-c-format
 msgid ""
 "For this reason the packages <classname>exim4</classname> and "
@@ -369,7 +357,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: post-install.xml:347
+#: post-install.xml:329
 #, no-c-format
 msgid ""
 "When system e-mails are delivered they are added to a file in <filename>/var/"
@@ -378,13 +366,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: post-install.xml:357
+#: post-install.xml:339
 #, no-c-format
 msgid "Sending E-Mails Outside The System"
 msgstr ""
 
 #. Tag: para
-#: post-install.xml:358
+#: post-install.xml:340
 #, no-c-format
 msgid ""
 "As mentioned earlier, the installed &debian; system is only set up to handle "
@@ -393,7 +381,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: post-install.xml:364
+#: post-install.xml:346
 #, no-c-format
 msgid ""
 "If you would like <classname>exim4</classname> to handle external e-mail, "
@@ -402,7 +390,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: post-install.xml:370
+#: post-install.xml:352
 #, no-c-format
 msgid ""
 "If you intend to use a graphical mail program and use a mail server of your "
@@ -413,7 +401,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: post-install.xml:379
+#: post-install.xml:361
 #, no-c-format
 msgid ""
 "However, in that case you may need to configure individual utilities to "
@@ -424,7 +412,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: post-install.xml:387
+#: post-install.xml:369
 #, no-c-format
 msgid ""
 "To correctly set up <command>reportbug</command> to use an external mail "
@@ -434,13 +422,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: post-install.xml:398
+#: post-install.xml:380
 #, no-c-format
 msgid "Configuring the Exim4 Mail Transport Agent"
 msgstr ""
 
 #. Tag: para
-#: post-install.xml:399
+#: post-install.xml:381
 #, no-c-format
 msgid ""
 "If you would like your system to also handle external e-mail, you will need "
@@ -450,13 +438,13 @@ msgid ""
 msgstr ""
 
 #. Tag: screen
-#: post-install.xml:411
+#: post-install.xml:393
 #, no-c-format
 msgid "# dpkg-reconfigure exim4-config"
 msgstr ""
 
 #. Tag: para
-#: post-install.xml:413
+#: post-install.xml:395
 #, no-c-format
 msgid ""
 "After entering that command (as root), you will be asked if you want split "
@@ -465,7 +453,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: post-install.xml:419
+#: post-install.xml:401
 #, no-c-format
 msgid ""
 "Next you will be presented with several common mail scenarios. Choose the "
@@ -473,13 +461,13 @@ msgid ""
 msgstr ""
 
 #. Tag: term
-#: post-install.xml:428
+#: post-install.xml:410
 #, no-c-format
 msgid "internet site"
 msgstr ""
 
 #. Tag: para
-#: post-install.xml:429
+#: post-install.xml:411
 #, no-c-format
 msgid ""
 "Your system is connected to a network and your mail is sent and received "
@@ -489,13 +477,13 @@ msgid ""
 msgstr ""
 
 #. Tag: term
-#: post-install.xml:440
+#: post-install.xml:422
 #, no-c-format
 msgid "mail sent by smarthost"
 msgstr ""
 
 #. Tag: para
-#: post-install.xml:441
+#: post-install.xml:423
 #, no-c-format
 msgid ""
 "In this scenario your outgoing mail is forwarded to another machine, called "
@@ -507,7 +495,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: post-install.xml:451
+#: post-install.xml:433
 #, no-c-format
 msgid ""
 "In a lot of cases the smarthost will be your ISP's mail server, which makes "
@@ -516,13 +504,13 @@ msgid ""
 msgstr ""
 
 #. Tag: term
-#: post-install.xml:461
+#: post-install.xml:443
 #, no-c-format
 msgid "mail sent by smarthost; no local mail"
 msgstr ""
 
 #. Tag: para
-#: post-install.xml:462
+#: post-install.xml:444
 #, no-c-format
 msgid ""
 "This option is basically the same as the previous one except that the system "
@@ -531,25 +519,25 @@ msgid ""
 msgstr ""
 
 #. Tag: term
-#: post-install.xml:473
+#: post-install.xml:455
 #, no-c-format
 msgid "local delivery only"
 msgstr ""
 
 #. Tag: para
-#: post-install.xml:474
+#: post-install.xml:456
 #, no-c-format
 msgid "This is the option your system is configured for by default."
 msgstr ""
 
 #. Tag: term
-#: post-install.xml:482
+#: post-install.xml:464
 #, no-c-format
 msgid "no configuration at this time"
 msgstr ""
 
 #. Tag: para
-#: post-install.xml:483
+#: post-install.xml:465
 #, no-c-format
 msgid ""
 "Choose this if you are absolutely convinced you know what you are doing. "
@@ -559,7 +547,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: post-install.xml:494
+#: post-install.xml:476
 #, no-c-format
 msgid ""
 "If none of these scenarios suits your needs, or if you need a finer grained "
@@ -572,7 +560,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: post-install.xml:505
+#: post-install.xml:487
 #, no-c-format
 msgid ""
 "Note that sending mail directly to the Internet when you don't have an "
@@ -585,13 +573,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: post-install.xml:523
+#: post-install.xml:505
 #, no-c-format
 msgid "Compiling a New Kernel"
 msgstr ""
 
 #. Tag: para
-#: post-install.xml:524
+#: post-install.xml:506
 #, no-c-format
 msgid ""
 "Why would someone want to compile a new kernel? It is most probably not "
@@ -600,7 +588,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: post-install.xml:530
+#: post-install.xml:512
 #, no-c-format
 msgid ""
 "If you want to compile your own kernel nevertheless, this is of course "
@@ -610,13 +598,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: post-install.xml:545
+#: post-install.xml:527
 #, no-c-format
 msgid "Recovering a Broken System"
 msgstr ""
 
 #. Tag: para
-#: post-install.xml:546
+#: post-install.xml:528
 #, no-c-format
 msgid ""
 "Sometimes, things go wrong, and the system you've carefully installed is no "
@@ -628,7 +616,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: post-install.xml:556
+#: post-install.xml:538
 #, no-c-format
 msgid ""
 "To access rescue mode, select <userinput>rescue</userinput> from the boot "
@@ -643,7 +631,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: post-install.xml:573
+#: post-install.xml:555
 #, no-c-format
 msgid ""
 "Instead of the partitioning tool, you should now be presented with a list of "
@@ -654,7 +642,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: post-install.xml:581
+#: post-install.xml:563
 #, no-c-format
 msgid ""
 "If possible, the installer will now present you with a shell prompt in the "
@@ -666,7 +654,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: post-install.xml:593
+#: post-install.xml:575
 #, no-c-format
 msgid ""
 "If the installer cannot run a usable shell in the root file system you "
@@ -678,13 +666,13 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: post-install.xml:602
+#: post-install.xml:584
 #, no-c-format
 msgid "In either case, after you exit the shell, the system will reboot."
 msgstr ""
 
 #. Tag: para
-#: post-install.xml:606
+#: post-install.xml:588
 #, no-c-format
 msgid ""
 "Finally, note that repairing broken systems can be difficult, and this "
diff --git a/po/nn/welcome.po b/po/nn/welcome.po
index f946a4821..b5b254fe2 100644
--- a/po/nn/welcome.po
+++ b/po/nn/welcome.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: d-i-manual_welcome\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2018-07-07 09:56+0000\n"
+"POT-Creation-Date: 2018-08-31 23:21+0000\n"
 "PO-Revision-Date: 2014-01-29 10:50+0000\n"
 "Last-Translator: NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Norwegian nynorsk <LL@li.org>\n"
@@ -116,17 +116,6 @@ msgstr ""
 #: welcome.xml:89
 #, no-c-format
 msgid ""
-"The <ulink url=\"&url-lsb-org;\">Linux Standard Base</ulink> (LSB) is a "
-"project aimed at standardizing the basic GNU/Linux system, which will enable "
-"third-party software and hardware developers to easily design programs and "
-"device drivers for Linux-in-general, rather than for a specific GNU/Linux "
-"distribution."
-msgstr ""
-
-#. Tag: para
-#: welcome.xml:99
-#, no-c-format
-msgid ""
 "The <ulink url=\"&url-fhs-home;\">Filesystem Hierarchy Standard</ulink> "
 "(FHS) is an effort to standardize the layout of the Linux file system. The "
 "FHS will allow software developers to concentrate their efforts on designing "
@@ -135,7 +124,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: welcome.xml:109
+#: welcome.xml:99
 #, no-c-format
 msgid ""
 "<ulink url=\"&url-debian-jr;\">Debian Jr.</ulink> is an internal project, "
@@ -143,7 +132,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: welcome.xml:118
+#: welcome.xml:108
 #, no-c-format
 msgid ""
 "For more general information about Debian, see the <ulink url=\"&url-debian-"
@@ -151,13 +140,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: welcome.xml:133
+#: welcome.xml:123
 #, no-c-format
 msgid "What is GNU/Linux?"
 msgstr ""
 
 #. Tag: para
-#: welcome.xml:134
+#: welcome.xml:124
 #, no-c-format
 msgid ""
 "Linux is an operating system: a series of programs that let you interact "
@@ -165,7 +154,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: welcome.xml:139
+#: welcome.xml:129
 #, no-c-format
 msgid ""
 "An operating system consists of various fundamental programs which are "
@@ -181,7 +170,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: welcome.xml:153
+#: welcome.xml:143
 #, no-c-format
 msgid ""
 "Linux is modelled on the Unix operating system. From the start, Linux was "
@@ -193,7 +182,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: welcome.xml:162
+#: welcome.xml:152
 #, no-c-format
 msgid ""
 "Development of what later became GNU/Linux began in 1984, when the <ulink "
@@ -202,7 +191,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: welcome.xml:168
+#: welcome.xml:158
 #, no-c-format
 msgid ""
 "The <ulink url=\"&url-gnu;\">GNU Project</ulink> has developed a "
@@ -214,7 +203,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: welcome.xml:178
+#: welcome.xml:168
 #, no-c-format
 msgid ""
 "While many groups and individuals have contributed to Linux, the largest "
@@ -224,7 +213,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: welcome.xml:185
+#: welcome.xml:175
 #, no-c-format
 msgid ""
 "The <ulink url=\"&url-kernel-org;\">Linux kernel</ulink> first appeared in "
@@ -235,7 +224,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: welcome.xml:194
+#: welcome.xml:184
 #, no-c-format
 msgid ""
 "Linus Torvalds continues to coordinate the work of several hundred "
@@ -247,7 +236,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: welcome.xml:204
+#: welcome.xml:194
 #, no-c-format
 msgid ""
 "Linux users have immense freedom of choice in their software. For example, "
@@ -258,7 +247,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: welcome.xml:213
+#: welcome.xml:203
 #, no-c-format
 msgid ""
 "Linux is also less likely to crash, better able to run more than one program "
@@ -269,13 +258,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: welcome.xml:231
+#: welcome.xml:221
 #, no-c-format
 msgid "What is &debian; GNU/Linux?"
 msgstr ""
 
 #. Tag: para
-#: welcome.xml:232
+#: welcome.xml:222
 #, no-c-format
 msgid ""
 "The combination of &debian;'s philosophy and methodology and the GNU tools, "
@@ -291,7 +280,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: welcome.xml:246
+#: welcome.xml:236
 #, no-c-format
 msgid ""
 "&debian;'s attention to detail allows us to produce a high-quality, stable, "
@@ -301,7 +290,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: welcome.xml:253
+#: welcome.xml:243
 #, no-c-format
 msgid ""
 "&debian; is especially popular among advanced users because of its technical "
@@ -311,7 +300,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: welcome.xml:260
+#: welcome.xml:250
 #, no-c-format
 msgid ""
 "For example, &debian; was the first Linux distribution to include a package "
@@ -321,7 +310,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: welcome.xml:267
+#: welcome.xml:257
 #, no-c-format
 msgid ""
 "&debian; continues to be a leader in Linux development. Its development "
@@ -331,7 +320,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: welcome.xml:274
+#: welcome.xml:264
 #, no-c-format
 msgid ""
 "The feature that most distinguishes &debian; from other Linux distributions "
@@ -344,7 +333,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: welcome.xml:285
+#: welcome.xml:275
 #, no-c-format
 msgid ""
 "To protect your system against <quote>Trojan horses</quote> and other "
@@ -357,7 +346,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: welcome.xml:295
+#: welcome.xml:285
 #, no-c-format
 msgid ""
 "The primary, and best, method of getting support for your &debian; GNU/Linux "
@@ -370,20 +359,20 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: welcome.xml:318
+#: welcome.xml:308
 #, no-c-format
 msgid "What is &debian; GNU/kFreeBSD?"
 msgstr ""
 
 #. Tag: para
-#: welcome.xml:320
+#: welcome.xml:310
 #, no-c-format
 msgid ""
 "&debian; GNU/kFreeBSD is a &debian; GNU system with the kFreeBSD kernel."
 msgstr ""
 
 #. Tag: para
-#: welcome.xml:324
+#: welcome.xml:314
 #, no-c-format
 msgid ""
 "This port of &debian; is currently only being developed for the i386 and "
@@ -391,7 +380,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: welcome.xml:329
+#: welcome.xml:319
 #, no-c-format
 msgid ""
 "Please note that &debian; GNU/kFreeBSD is not a Linux system, and thus some "
@@ -399,7 +388,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: welcome.xml:334
+#: welcome.xml:324
 #, no-c-format
 msgid ""
 "For more information, see the <ulink url=\"http://www.debian.org/ports/"
@@ -408,13 +397,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: welcome.xml:353
+#: welcome.xml:343
 #, no-c-format
 msgid "What is &debian; GNU/Hurd?"
 msgstr ""
 
 #. Tag: para
-#: welcome.xml:355
+#: welcome.xml:345
 #, no-c-format
 msgid ""
 "&debian; GNU/Hurd is a &debian; GNU system with the GNU Hurd &mdash; a set "
@@ -422,7 +411,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: welcome.xml:360
+#: welcome.xml:350
 #, no-c-format
 msgid ""
 "The Hurd is still unfinished, and is unsuitable for day-to-day use, but work "
@@ -432,7 +421,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: welcome.xml:368
+#: welcome.xml:358
 #, no-c-format
 msgid ""
 "Please note that &debian; GNU/Hurd is not a Linux system, and thus some "
@@ -440,7 +429,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: welcome.xml:373
+#: welcome.xml:363
 #, no-c-format
 msgid ""
 "For more information, see the <ulink url=\"http://www.debian.org/ports/hurd/"
@@ -449,13 +438,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: welcome.xml:390
+#: welcome.xml:380
 #, no-c-format
 msgid "Getting &debian;"
 msgstr ""
 
 #. Tag: para
-#: welcome.xml:392
+#: welcome.xml:382
 #, no-c-format
 msgid ""
 "For information on how to download &debian-gnu; from the Internet or from "
@@ -466,7 +455,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: welcome.xml:401
+#: welcome.xml:391
 #, no-c-format
 msgid ""
 "&debian; can be upgraded after installation very easily. The installation "
@@ -475,13 +464,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: welcome.xml:416
+#: welcome.xml:406
 #, no-c-format
 msgid "Getting the Newest Version of This Document"
 msgstr ""
 
 #. Tag: para
-#: welcome.xml:418
+#: welcome.xml:408
 #, no-c-format
 msgid ""
 "This document is constantly being revised. Be sure to check the <ulink url="
@@ -492,13 +481,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: welcome.xml:436
+#: welcome.xml:426
 #, no-c-format
 msgid "Organization of This Document"
 msgstr ""
 
 #. Tag: para
-#: welcome.xml:438
+#: welcome.xml:428
 #, no-c-format
 msgid ""
 "This document is meant to serve as a manual for first-time &debian; users. "
@@ -508,7 +497,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: welcome.xml:445
+#: welcome.xml:435
 #, no-c-format
 msgid ""
 "Expert users may also find interesting reference information in this "
@@ -518,7 +507,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: welcome.xml:452
+#: welcome.xml:442
 #, no-c-format
 msgid ""
 "In general, this manual is arranged in a linear fashion, walking you through "
@@ -528,7 +517,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: welcome.xml:460
+#: welcome.xml:450
 #, no-c-format
 msgid ""
 "Determine whether your hardware meets the requirements for using the "
@@ -536,7 +525,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: welcome.xml:466
+#: welcome.xml:456
 #, no-c-format
 msgid ""
 "Backup your system, perform any necessary planning and hardware "
@@ -546,7 +535,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: welcome.xml:474
+#: welcome.xml:464
 #, no-c-format
 msgid ""
 "In <xref linkend=\"install-methods\"/>, you will obtain the necessary "
@@ -554,7 +543,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: welcome.xml:480
+#: welcome.xml:470
 #, no-c-format
 msgid ""
 "The next <xref linkend=\"boot-installer\"/> describes booting into the "
@@ -563,7 +552,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: welcome.xml:487
+#: welcome.xml:477
 #, no-c-format
 msgid ""
 "Perform the actual installation according to <xref linkend=\"d-i-intro\"/>. "
@@ -577,7 +566,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: welcome.xml:500
+#: welcome.xml:490
 #, no-c-format
 msgid ""
 "Boot into your newly installed base system, from <xref linkend=\"boot-new\"/"
@@ -585,7 +574,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: welcome.xml:508
+#: welcome.xml:498
 #, no-c-format
 msgid ""
 "Once you've got your system installed, you can read <xref linkend=\"post-"
@@ -594,7 +583,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: welcome.xml:518
+#: welcome.xml:508
 #, no-c-format
 msgid ""
 "Finally, information about this document and how to contribute to it may be "
@@ -602,13 +591,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: welcome.xml:528
+#: welcome.xml:518
 #, no-c-format
 msgid "Your Documentation Help is Welcome"
 msgstr ""
 
 #. Tag: para
-#: welcome.xml:530
+#: welcome.xml:520
 #, no-c-format
 msgid ""
 "Any help, suggestions, and especially, patches, are greatly appreciated. "
@@ -618,7 +607,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: welcome.xml:537
+#: welcome.xml:527
 #, no-c-format
 msgid ""
 "Source is also available publicly; look in <xref linkend=\"administrivia\"/> "
@@ -629,13 +618,13 @@ msgid ""
 msgstr ""
 
 #. Tag: title
-#: welcome.xml:553
+#: welcome.xml:543
 #, no-c-format
 msgid "About Copyrights and Software Licenses"
 msgstr ""
 
 #. Tag: para
-#: welcome.xml:556
+#: welcome.xml:546
 #, no-c-format
 msgid ""
 "We're sure that you've read some of the licenses that come with most "
@@ -650,7 +639,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: welcome.xml:569
+#: welcome.xml:559
 #, no-c-format
 msgid ""
 "Calling software <emphasis>free</emphasis> doesn't mean that the software "
@@ -663,7 +652,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: welcome.xml:580
+#: welcome.xml:570
 #, no-c-format
 msgid ""
 "The &debian; project, as a pragmatic concession to its users, does make some "
@@ -677,7 +666,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: welcome.xml:594
+#: welcome.xml:584
 #, no-c-format
 msgid ""
 "Many of the programs in the system are licensed under the <emphasis>GNU</"
@@ -694,7 +683,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: welcome.xml:613
+#: welcome.xml:603
 #, no-c-format
 msgid ""
 "There are several other forms of copyright statements and software licenses "
@@ -705,7 +694,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: welcome.xml:623
+#: welcome.xml:613
 #, no-c-format
 msgid ""
 "For more information about licenses and how &debian; determines whether "
@@ -714,7 +703,7 @@ msgid ""
 msgstr ""
 
 #. Tag: para
-#: welcome.xml:629
+#: welcome.xml:619
 #, no-c-format
 msgid ""
 "The most important legal notice is that this software comes with "