summaryrefslogtreecommitdiff
path: root/doc/po/apt-doc.pot
diff options
context:
space:
mode:
authorMichael Vogt <mvo@debian.org>2015-08-21 11:42:50 +0200
committerMichael Vogt <mvo@debian.org>2015-08-24 06:41:03 -0400
commit864fe99c3628585ba2081650e441ab15e4ee7bae (patch)
treee470b68e9ec52fbeb79794d9096f7ad84d12de44 /doc/po/apt-doc.pot
parentc8ec5ab764e90565b58ba5f55f4d9d6939b44c69 (diff)
releasing package apt version 1.1~exp101.1.exp10
Diffstat (limited to 'doc/po/apt-doc.pot')
-rw-r--r--doc/po/apt-doc.pot1443
1 files changed, 933 insertions, 510 deletions
diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot
index 35db9571d..ff7cbdfcf 100644
--- a/doc/po/apt-doc.pot
+++ b/doc/po/apt-doc.pot
@@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: apt-doc 1.0.9.7\n"
+"Project-Id-Version: apt-doc 1.1~exp10\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2015-03-10 09:48+0100\n"
+"POT-Creation-Date: 2015-08-24 04:18-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -536,28 +536,28 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:54
+#: apt.8.xml:55
msgid ""
"<literal>search</literal> searches for the given term(s) and display "
"matching packages."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:60
+#: apt.8.xml:61
msgid ""
"<literal>show</literal> shows the package information for the given "
"package(s)."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:67
+#: apt.8.xml:68
msgid ""
"<literal>install</literal> is followed by one or more package names desired "
"for installation or upgrading."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:71 apt-get.8.xml:112
+#: apt.8.xml:72 apt-get.8.xml:112
msgid ""
"A specific version of a package can be selected for installation by "
"following the package name with an equals and the version of the package to "
@@ -568,7 +568,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:81 apt-get.8.xml:147
+#: apt.8.xml:82 apt-get.8.xml:147
msgid ""
"<literal>remove</literal> is identical to <literal>install</literal> except "
"that packages are removed instead of installed. Note that removing a package "
@@ -577,22 +577,40 @@ msgid ""
"installed instead of removed."
msgstr ""
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt.8.xml:89 apt-get.8.xml:217 apt-get.8.xml:227
+msgid "(and the"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt.8.xml:89 apt-get.8.xml:217 apt-get.8.xml:227
+msgid "alias since 1.1)"
+msgstr ""
+
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:89
+#: apt.8.xml:90 apt-get.8.xml:228
+msgid ""
+"<literal>autoremove</literal> is used to remove packages that were "
+"automatically installed to satisfy dependencies for other packages and are "
+"now no longer needed."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.8.xml:95
msgid ""
"<literal>edit-sources</literal> lets you edit your sources.list file and "
"provides basic sanity checks."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:95
+#: apt.8.xml:101
msgid ""
"<literal>update</literal> is used to resynchronize the package index files "
"from their sources."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:101
+#: apt.8.xml:107
msgid ""
"<literal>upgrade</literal> is used to install the newest versions of all "
"packages currently installed on the system from the sources enumerated in "
@@ -601,7 +619,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.8.xml:110
+#: apt.8.xml:116
msgid ""
"<literal>full-upgrade</literal> performs the function of upgrade but may "
"also remove installed packages if that is required in order to resolve a "
@@ -609,17 +627,17 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:120 apt-get.8.xml:251 apt-cache.8.xml:244 apt-mark.8.xml:104 apt-config.8.xml:80 apt-extracttemplates.1.xml:48 apt-sortpkgs.1.xml:44 apt-ftparchive.1.xml:500
+#: apt.8.xml:126 apt-get.8.xml:262 apt-cache.8.xml:246 apt-mark.8.xml:104 apt-config.8.xml:80 apt-extracttemplates.1.xml:48 apt-sortpkgs.1.xml:44 apt-ftparchive.1.xml:500
msgid "options"
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:130
+#: apt.8.xml:136
msgid "Script usage"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:132
+#: apt.8.xml:138
msgid ""
"The &apt; commandline is designed as a end-user tool and it may change the "
"output between versions. While it tries to not break backward compatibility "
@@ -629,12 +647,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:140
+#: apt.8.xml:146
msgid "Differences to &apt-get;"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:141
+#: apt.8.xml:147
msgid ""
"The <command>apt</command> command is meant to be pleasant for end users and "
"does not need to be backward compatible like &apt-get;. Therefore some "
@@ -642,48 +660,48 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml:147
+#: apt.8.xml:153
msgid "The option <literal>DPkg::Progress-Fancy</literal> is enabled."
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml:151
+#: apt.8.xml:157
msgid "The option <literal>APT::Color</literal> is enabled."
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml:155
+#: apt.8.xml:161
msgid ""
"A new <literal>list</literal> command is available similar to <literal>dpkg "
"--list</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.8.xml:160
+#: apt.8.xml:166
msgid ""
"The option <literal>upgrade</literal> has <literal>--with-new-pkgs</literal> "
"enabled by default."
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:170 apt-get.8.xml:560 apt-cache.8.xml:346 apt-key.8.xml:191 apt-mark.8.xml:127 apt-secure.8.xml:187 apt-cdrom.8.xml:148 apt-config.8.xml:105 apt.conf.5.xml:1254 apt_preferences.5.xml:701 sources.list.5.xml:274 apt-extracttemplates.1.xml:66 apt-sortpkgs.1.xml:59 apt-ftparchive.1.xml:603
+#: apt.8.xml:176 apt-get.8.xml:597 apt-cache.8.xml:359 apt-key.8.xml:191 apt-mark.8.xml:127 apt-secure.8.xml:187 apt-cdrom.8.xml:148 apt-config.8.xml:105 apt.conf.5.xml:1319 apt_preferences.5.xml:716 sources.list.5.xml:453 apt-extracttemplates.1.xml:66 apt-sortpkgs.1.xml:59 apt-ftparchive.1.xml:603
msgid "See Also"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:171
+#: apt.8.xml:177
msgid ""
"&apt-get;, &apt-cache;, &sources-list;, &apt-conf;, &apt-config;, The APT "
"User's guide in &guidesdir;, &apt-preferences;, the APT Howto."
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.8.xml:176 apt-get.8.xml:566 apt-cache.8.xml:351 apt-mark.8.xml:131 apt-cdrom.8.xml:153 apt-config.8.xml:110 apt-extracttemplates.1.xml:70 apt-sortpkgs.1.xml:63 apt-ftparchive.1.xml:607
+#: apt.8.xml:182 apt-get.8.xml:603 apt-cache.8.xml:364 apt-mark.8.xml:131 apt-cdrom.8.xml:153 apt-config.8.xml:110 apt-extracttemplates.1.xml:70 apt-sortpkgs.1.xml:63 apt-ftparchive.1.xml:607
msgid "Diagnostics"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.8.xml:177
+#: apt.8.xml:183
msgid ""
"<command>apt</command> returns zero on normal operation, decimal 100 on "
"error."
@@ -926,51 +944,52 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:228
+#: apt-get.8.xml:233
msgid ""
-"<literal>autoremove</literal> is used to remove packages that were "
-"automatically installed to satisfy dependencies for other packages and are "
-"now no longer needed."
+"<literal>changelog</literal> tries to download the changelog of a package "
+"and displays it through <command>sensible-pager</command>. By default it "
+"displays the changelog for the version that is installed. However, you can "
+"specify the same options as for the <option>install</option> command."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:233
+#: apt-get.8.xml:243
msgid ""
-"<literal>changelog</literal> downloads a package changelog and displays it "
-"through <command>sensible-pager</command>. The server name and base "
-"directory is defined in the <literal>APT::Changelogs::Server</literal> "
-"variable (e.g. <ulink "
-"url=\"http://packages.debian.org/changelogs\">packages.debian.org/changelogs</ulink> "
-"for Debian or <ulink "
-"url=\"http://changelogs.ubuntu.com/changelogs\">changelogs.ubuntu.com/changelogs</ulink> "
-"for Ubuntu). By default it displays the changelog for the version that is "
-"installed. However, you can specify the same options as for the "
-"<option>install</option> command."
+"Displays by default a deb822 formatted listing of information about all data "
+"files (aka index targets) <command>apt-get update</command> would "
+"download. Supports a <option>--format</option> option to modify the output "
+"format as well as accepts lines of the default output to filter the records "
+"by. The command is mainly used as an interface for external tools working "
+"with APT to get information as well as filenames for downloaded files so "
+"they can use them as well instead of downloading them again on their "
+"own. Detailed documentation is omitted here and can instead be found in the "
+"source tree in "
+"<literal><filename>doc/acquire-additional-files.txt</filename></literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:256
+#: apt-get.8.xml:267
msgid ""
"Do not consider recommended packages as a dependency for installing. "
"Configuration Item: <literal>APT::Install-Recommends</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:261
+#: apt-get.8.xml:272
msgid ""
"Consider suggested packages as a dependency for installing. Configuration "
"Item: <literal>APT::Install-Suggests</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:266
+#: apt-get.8.xml:277
msgid ""
"Download only; package files are only retrieved, not unpacked or installed. "
"Configuration Item: <literal>APT::Get::Download-Only</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:271
+#: apt-get.8.xml:282
msgid ""
"Fix; attempt to correct a system with broken dependencies in place. This "
"option, when used with install/remove, can omit any packages to permit APT "
@@ -986,7 +1005,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:286
+#: apt-get.8.xml:297
msgid ""
"Ignore missing packages; if packages cannot be retrieved or fail the "
"integrity check after retrieval (corrupted package files), hold back those "
@@ -998,7 +1017,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:297
+#: apt-get.8.xml:308
msgid ""
"Disables downloading of packages. This is best used with "
"<option>--ignore-missing</option> to force APT to use only the .debs it has "
@@ -1007,7 +1026,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:304
+#: apt-get.8.xml:315
msgid ""
"Quiet; produces output suitable for logging, omitting progress indicators. "
"More q's will produce more quiet up to a maximum of 2. You can also use "
@@ -1019,27 +1038,21 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:319
+#: apt-get.8.xml:330
msgid ""
-"No action; perform a simulation of events that would occur but do not "
-"actually change the system. Configuration Item: "
+"No action; perform a simulation of events that would occur based on the "
+"current system state but do not actually change the system. Locking will be "
+"disabled (<option>Debug::NoLocking</option>) so the system state could "
+"change while <command>apt-get</command> is running. Simulations can also be "
+"executed by non-root users which might not have read access to all apt "
+"configuration distorting the simulation. A notice expressing this warning "
+"is also shown by default for non-root users "
+"(<option>APT::Get::Show-User-Simulation-Note</option>). Configuration Item: "
"<literal>APT::Get::Simulate</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:323
-msgid ""
-"Simulated runs performed as a user will automatically deactivate locking "
-"(<literal>Debug::NoLocking</literal>), and if the option "
-"<literal>APT::Get::Show-User-Simulation-Note</literal> is set (as it is by "
-"default) a notice will also be displayed indicating that this is only a "
-"simulation. Runs performed as root do not trigger either NoLocking or the "
-"notice - superusers should know what they are doing without further warnings "
-"from <literal>apt-get</literal>."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:331
+#: apt-get.8.xml:340
msgid ""
"Simulated runs print out a series of lines, each representing a "
"<command>dpkg</command> operation: configure (<literal>Conf</literal>), "
@@ -1049,7 +1062,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:339
+#: apt-get.8.xml:348
msgid ""
"Automatic yes to prompts; assume \"yes\" as answer to all prompts and run "
"non-interactively. If an undesirable situation, such as changing a held "
@@ -1059,28 +1072,28 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:347
+#: apt-get.8.xml:356
msgid ""
"Automatic \"no\" to all prompts. Configuration Item: "
"<literal>APT::Get::Assume-No</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:352
+#: apt-get.8.xml:361
msgid ""
"Show upgraded packages; print out a list of all packages that are to be "
"upgraded. Configuration Item: <literal>APT::Get::Show-Upgraded</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:358
+#: apt-get.8.xml:367
msgid ""
"Show full versions for upgraded and installed packages. Configuration Item: "
"<literal>APT::Get::Show-Versions</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:364
+#: apt-get.8.xml:373
msgid ""
"This option controls the architecture packages are built for by "
"<command>apt-get source --compile</command> and how cross-builddependencies "
@@ -1091,7 +1104,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:374
+#: apt-get.8.xml:383
msgid ""
"This option controls the activated build profiles for which a source package "
"is built by <command>apt-get source --compile</command> and how build "
@@ -1101,14 +1114,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:385
+#: apt-get.8.xml:394
msgid ""
"Compile source packages after downloading them. Configuration Item: "
"<literal>APT::Get::Compile</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:390
+#: apt-get.8.xml:399
msgid ""
"Ignore package holds; this causes <command>apt-get</command> to ignore a "
"hold placed on a package. This may be useful in conjunction with "
@@ -1117,7 +1130,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:397
+#: apt-get.8.xml:406
msgid ""
"Allow installing new packages when used in conjunction with "
"<literal>upgrade</literal>. This is useful if the update of a installed "
@@ -1129,7 +1142,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:409
+#: apt-get.8.xml:418
msgid ""
"Do not upgrade packages; when used in conjunction with "
"<literal>install</literal>, <literal>no-upgrade</literal> will prevent "
@@ -1138,7 +1151,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:416
+#: apt-get.8.xml:425
msgid ""
"Do not install new packages; when used in conjunction with "
"<literal>install</literal>, <literal>only-upgrade</literal> will install "
@@ -1148,17 +1161,50 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:424
+#: apt-get.8.xml:433
+msgid ""
+"This is a dangerous option that will cause apt to continue without prompting "
+"if it is doing downgrades. It should not be used except in very special "
+"situations. Using it can potentially destroy your system! Configuration "
+"Item: <literal>APT::Get::allow-downgrades</literal>. Introduced in APT 1.1."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:441
+msgid ""
+"Force yes; this is a dangerous option that will cause apt to continue "
+"without prompting if it is removing essentials. It should not be used except "
+"in very special situations. Using it can potentially destroy your system! "
+"Configuration Item: "
+"<literal>APT::Get::allow-remove-essential</literal>. Introduced in APT 1.1."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:449
+msgid ""
+"Force yes; this is a dangerous option that will cause apt to continue "
+"without prompting if it is changing held packages. It should not be used "
+"except in very special situations. Using it can potentially destroy your "
+"system! Configuration Item: "
+"<literal>APT::Get::allow-change-held-packages</literal>. Introduced in APT "
+"1.1."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-get.8.xml:457
msgid ""
"Force yes; this is a dangerous option that will cause apt to continue "
"without prompting if it is doing something potentially harmful. It should "
"not be used except in very special situations. Using "
"<literal>force-yes</literal> can potentially destroy your system! "
-"Configuration Item: <literal>APT::Get::force-yes</literal>."
+"Configuration Item: <literal>APT::Get::force-yes</literal>. This is "
+"deprecated and replaced by <option>--allow-downgrades</option>, "
+"<option>--allow-remove-essential</option>, "
+"<option>--allow-change-held-packages</option> in 1.1."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:432
+#: apt-get.8.xml:465
msgid ""
"Instead of fetching the files to install their URIs are printed. Each URI "
"will have the path, the destination file name, the size and the expected MD5 "
@@ -1171,7 +1217,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:443
+#: apt-get.8.xml:476
msgid ""
"Use purge instead of remove for anything that would be removed. An asterisk "
"(\"*\") will be displayed next to packages which are scheduled to be "
@@ -1181,14 +1227,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:451
+#: apt-get.8.xml:484
msgid ""
"Re-install packages that are already installed and at the newest version. "
"Configuration Item: <literal>APT::Get::ReInstall</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:456
+#: apt-get.8.xml:489
msgid ""
"This option is on by default; use <literal>--no-list-cleanup</literal> to "
"turn it off. When it is on, <command>apt-get</command> will automatically "
@@ -1199,7 +1245,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:466
+#: apt-get.8.xml:499
msgid ""
"This option controls the default input to the policy engine; it creates a "
"default pin at priority 990 using the specified release string. This "
@@ -1214,7 +1260,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:481
+#: apt-get.8.xml:514
msgid ""
"Only perform operations that are 'trivial'. Logically this can be considered "
"related to <option>--assume-yes</option>; where "
@@ -1224,14 +1270,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:488
+#: apt-get.8.xml:521
msgid ""
"If any packages are to be removed apt-get immediately aborts without "
"prompting. Configuration Item: <literal>APT::Get::Remove</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:494
+#: apt-get.8.xml:527
msgid ""
"If the command is either <literal>install</literal> or "
"<literal>remove</literal>, then this option acts like running the "
@@ -1240,7 +1286,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:501
+#: apt-get.8.xml:534
msgid ""
"Only has meaning for the <literal>source</literal> and "
"<literal>build-dep</literal> commands. Indicates that the given source "
@@ -1252,7 +1298,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:512
+#: apt-get.8.xml:545
msgid ""
"Download only the diff, dsc, or tar file of a source archive. Configuration "
"Item: <literal>APT::Get::Diff-Only</literal>, "
@@ -1261,22 +1307,25 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:518
+#: apt-get.8.xml:551
msgid ""
"Only process architecture-dependent build-dependencies. Configuration Item: "
"<literal>APT::Get::Arch-Only</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:523
+#: apt-get.8.xml:556
msgid ""
"Ignore if packages can't be authenticated and don't prompt about it. This "
-"is useful for tools like pbuilder. Configuration Item: "
+"can be useful while working with local repositories, but is a huge security "
+"risk if data authenticity isn't ensured in another way by the user itself. "
+"The usage of the <option>Trusted</option> option for &sources-list; entries "
+"should usually be preferred over this global override. Configuration Item: "
"<literal>APT::Get::AllowUnauthenticated</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:529
+#: apt-get.8.xml:566
msgid ""
"Forbid the update command to acquire unverifiable data from configured "
"sources. Apt will fail at the update command for repositories without valid "
@@ -1285,7 +1334,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:537
+#: apt-get.8.xml:574
msgid ""
"Show user friendly progress information in the terminal window when packages "
"are installed, upgraded or removed. For a machine parsable version of this "
@@ -1295,12 +1344,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:550 apt-cache.8.xml:339 apt-key.8.xml:170 apt-mark.8.xml:121 apt.conf.5.xml:1248 apt_preferences.5.xml:694
+#: apt-get.8.xml:587 apt-cache.8.xml:352 apt-key.8.xml:170 apt-mark.8.xml:121 apt.conf.5.xml:1313 apt_preferences.5.xml:709
msgid "Files"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:561
+#: apt-get.8.xml:598
msgid ""
"&apt-cache;, &apt-cdrom;, &dpkg;, &sources-list;, &apt-conf;, &apt-config;, "
"&apt-secure;, The APT User's guide in &guidesdir;, &apt-preferences;, the "
@@ -1308,7 +1357,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:567
+#: apt-get.8.xml:604
msgid ""
"<command>apt-get</command> returns zero on normal operation, decimal 100 on "
"error."
@@ -1336,7 +1385,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
-#: apt-cache.8.xml:49 apt-cache.8.xml:138 apt-cache.8.xml:159 apt-cache.8.xml:181 apt-cache.8.xml:186 apt-cache.8.xml:202 apt-cache.8.xml:220 apt-cache.8.xml:232
+#: apt-cache.8.xml:49 apt-cache.8.xml:137 apt-cache.8.xml:161 apt-cache.8.xml:183 apt-cache.8.xml:188 apt-cache.8.xml:204 apt-cache.8.xml:222 apt-cache.8.xml:234
msgid "&synopsis-pkg;"
msgstr ""
@@ -1448,50 +1497,50 @@ msgstr ""
#: apt-cache.8.xml:124
msgid ""
"<literal>Total distinct</literal> versions is the number of package versions "
-"found in the cache; this value is therefore at least equal to the number of "
-"total package names. If more than one distribution is being accessed (for "
+"found in the cache. If more than one distribution is being accessed (for "
"instance, \"stable\" and \"unstable\"), this value can be considerably "
"larger than the number of total package names."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:131
+#: apt-cache.8.xml:130
msgid ""
"<literal>Total dependencies</literal> is the number of dependency "
"relationships claimed by all of the packages in the cache."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:139
+#: apt-cache.8.xml:138
msgid ""
"<literal>showsrc</literal> displays all the source package records that "
"match the given package names. All versions are shown, as well as all "
-"records that declare the name to be a binary package."
+"records that declare the name to be a binary package. Use "
+"<option>--only-source</option> to display only source package names."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:145
+#: apt-cache.8.xml:147
msgid ""
"<literal>dump</literal> shows a short listing of every package in the "
"cache. It is primarily for debugging."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:150
+#: apt-cache.8.xml:152
msgid ""
"<literal>dumpavail</literal> prints out an available list to stdout. This is "
"suitable for use with &dpkg; and is used by the &dselect; method."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:155
+#: apt-cache.8.xml:157
msgid ""
"<literal>unmet</literal> displays a summary of all unmet dependencies in the "
"package cache."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:160
+#: apt-cache.8.xml:162
msgid ""
"<literal>show</literal> performs a function similar to <command>dpkg "
"--print-avail</command>; it displays the package records for the named "
@@ -1499,12 +1548,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
-#: apt-cache.8.xml:165
+#: apt-cache.8.xml:167
msgid "&synopsis-regex;"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:166
+#: apt-cache.8.xml:168
msgid ""
"<literal>search</literal> performs a full text search on all available "
"package lists for the POSIX regex pattern given, see &regex;. It searches "
@@ -1513,37 +1562,38 @@ msgid ""
"including virtual package names. If <option>--full</option> is given then "
"output identical to <literal>show</literal> is produced for each matched "
"package, and if <option>--names-only</option> is given then the long "
-"description is not searched, only the package name is."
+"description is not searched, only the package name and provided packages "
+"are."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:177
+#: apt-cache.8.xml:179
msgid ""
"Separate arguments can be used to specify multiple search patterns that are "
"and'ed together."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:182
+#: apt-cache.8.xml:184
msgid ""
"<literal>depends</literal> shows a listing of each dependency a package has "
"and all the possible other packages that can fulfill that dependency."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:187
+#: apt-cache.8.xml:189
msgid ""
"<literal>rdepends</literal> shows a listing of each reverse dependency a "
"package has."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:191
+#: apt-cache.8.xml:193
msgid "<optional><replaceable>&synopsis-prefix;</replaceable></optional>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:192
+#: apt-cache.8.xml:194
msgid ""
"This command prints the name of each package APT knows. The optional "
"argument is a prefix match to filter the name list. The output is suitable "
@@ -1553,7 +1603,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:197
+#: apt-cache.8.xml:199
msgid ""
"Note that a package which APT knows of is not necessarily available to "
"download, installable or installed, e.g. virtual packages are also listed in "
@@ -1561,7 +1611,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:203
+#: apt-cache.8.xml:205
msgid ""
"<literal>dotty</literal> takes a list of packages on the command line and "
"generates output suitable for use by dotty from the <ulink "
@@ -1574,7 +1624,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:212
+#: apt-cache.8.xml:214
msgid ""
"The resulting nodes will have several shapes; normal packages are boxes, "
"pure virtual packages are triangles, mixed virtual packages are diamonds, "
@@ -1583,12 +1633,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:217
+#: apt-cache.8.xml:219
msgid "Caution, dotty cannot graph larger sets of packages."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:221
+#: apt-cache.8.xml:223
msgid ""
"The same as <literal>dotty</literal>, only for xvcg from the <ulink "
"url=\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">VCG "
@@ -1596,12 +1646,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:225
+#: apt-cache.8.xml:227
msgid "<optional><replaceable>&synopsis-pkg;</replaceable>…</optional>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:226
+#: apt-cache.8.xml:228
msgid ""
"<literal>policy</literal> is meant to help debug issues relating to the "
"preferences file. With no arguments it will print out the priorities of each "
@@ -1610,7 +1660,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:233
+#: apt-cache.8.xml:235
msgid ""
"<literal>apt-cache</literal>'s <literal>madison</literal> command attempts "
"to mimic the output format and a subset of the functionality of the Debian "
@@ -1622,7 +1672,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:249
+#: apt-cache.8.xml:251
msgid ""
"Select the file to store the package cache. The package cache is the primary "
"cache used by all operations. Configuration Item: "
@@ -1630,7 +1680,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:255
+#: apt-cache.8.xml:257
msgid ""
"Select the file to store the source cache. The source is used only by "
"<literal>gencaches</literal> and it stores a parsed version of the package "
@@ -1640,7 +1690,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:263
+#: apt-cache.8.xml:265
msgid ""
"Quiet; produces output suitable for logging, omitting progress indicators. "
"More q's will produce more quietness up to a maximum of 2. You can also use "
@@ -1649,7 +1699,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:270
+#: apt-cache.8.xml:272
msgid ""
"Print only important dependencies; for use with <literal>unmet</literal> and "
"<literal>depends</literal>. Causes only Depends and Pre-Depends relations to "
@@ -1657,9 +1707,9 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:284
+#: apt-cache.8.xml:286
msgid ""
-"Per default the <literal>depends</literal> and <literal>rdepends</literal> "
+"Per default the <command>depends</command> and <command>rdepends</command> "
"print all dependencies. This can be tweaked with these flags which will omit "
"the specified dependency type. Configuration Item: "
"<literal>APT::Cache::Show<replaceable>DependencyType</replaceable></literal> "
@@ -1667,14 +1717,26 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:291
+#: apt-cache.8.xml:294
+msgid ""
+"Per default <command>depends</command> and <command>rdepends</command> print "
+"only dependencies explicitly expressed in the metadata. With this flag it "
+"will also show dependencies implicitely added based on the encountered "
+"data. A <literal>Conflicts: foo</literal> e.g. expresses implicitely that "
+"this package also conflicts with the package foo from any other "
+"architecture. Configuration Item: "
+"<literal>APT::Cache::ShowImplicit</literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-cache.8.xml:304
msgid ""
"Print full package records when searching. Configuration Item: "
"<literal>APT::Cache::ShowFull</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:296
+#: apt-cache.8.xml:309
msgid ""
"Print full records for all available versions. This is the default; to turn "
"it off, use <option>--no-all-versions</option>. If "
@@ -1685,7 +1747,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:305
+#: apt-cache.8.xml:318
msgid ""
"Perform automatic package cache regeneration, rather than use the cache as "
"it is. This is the default; to turn it off, use "
@@ -1694,14 +1756,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:311
+#: apt-cache.8.xml:324
msgid ""
-"Only search on the package names, not the long descriptions. Configuration "
-"Item: <literal>APT::Cache::NamesOnly</literal>."
+"Only search on the package and provided package names, not the long "
+"descriptions. Configuration Item: <literal>APT::Cache::NamesOnly</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:316
+#: apt-cache.8.xml:329
msgid ""
"Make <literal>pkgnames</literal> print all names, including virtual packages "
"and missing dependencies. Configuration Item: "
@@ -1709,7 +1771,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:322
+#: apt-cache.8.xml:335
msgid ""
"Make <literal>depends</literal> and <literal>rdepends</literal> recursive so "
"that all packages mentioned are printed once. Configuration Item: "
@@ -1717,7 +1779,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:329
+#: apt-cache.8.xml:342
msgid ""
"Limit the output of <literal>depends</literal> and "
"<literal>rdepends</literal> to packages which are currently installed. "
@@ -1725,12 +1787,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:347
+#: apt-cache.8.xml:360
msgid "&apt-conf;, &sources-list;, &apt-get;"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:352
+#: apt-cache.8.xml:365
msgid ""
"<command>apt-cache</command> returns zero on normal operation, decimal 100 "
"on error."
@@ -2785,11 +2847,13 @@ msgid ""
"user system. Archive maintainers are encouraged to create Release files with "
"the <literal>Valid-Until</literal> header, but if they don't or a stricter "
"value is desired the <literal>Max-ValidTime</literal> option below can be "
-"used."
+"used. The <option>Check-Valid-Until</option> option of &sources-list; "
+"entries should be preferred to disable the check selectively instead of "
+"using this global override."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:308
+#: apt.conf.5.xml:310
msgid ""
"Maximum time (in seconds) after its creation (as indicated by the "
"<literal>Date</literal> header) that the <filename>Release</filename> file "
@@ -2797,11 +2861,13 @@ msgid ""
"<literal>Valid-Until</literal> header the earlier date of the two is used as "
"the expiration date. The default value is <literal>0</literal> which stands "
"for \"valid forever\". Archive specific settings can be made by appending "
-"the label of the archive to the option name."
+"the label of the archive to the option name. Preferably, the same can be "
+"achieved for specific &sources-list; entries by using the "
+"<option>Valid-Until-Max</option> option there."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:320
+#: apt.conf.5.xml:323
msgid ""
"Minimum time (in seconds) after its creation (as indicated by the "
"<literal>Date</literal> header) that the <filename>Release</filename> file "
@@ -2809,11 +2875,13 @@ msgid ""
"(local) mirror of a more frequently updated archive with a "
"<literal>Valid-Until</literal> header instead of completely disabling the "
"expiration date checking. Archive specific settings can and should be used "
-"by appending the label of the archive to the option name."
+"by appending the label of the archive to the option name. Preferably, the "
+"same can be achieved for specific &sources-list; entries by using the "
+"<option>Valid-Until-Min</option> option there."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:332
+#: apt.conf.5.xml:336
msgid ""
"Try to download deltas called <literal>PDiffs</literal> for indexes (like "
"<filename>Packages</filename> files) instead of downloading whole ones. True "
@@ -2821,7 +2889,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:335
+#: apt.conf.5.xml:339
msgid ""
"Two sub-options to limit the use of PDiffs are also available: "
"<literal>FileLimit</literal> can be used to specify a maximum number of "
@@ -2833,7 +2901,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:345
+#: apt.conf.5.xml:349
msgid ""
"Queuing mode; <literal>Queue-Mode</literal> can be one of "
"<literal>host</literal> or <literal>access</literal> which determines how "
@@ -2843,21 +2911,21 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:353
+#: apt.conf.5.xml:357
msgid ""
"Number of retries to perform. If this is non-zero APT will retry failed "
"files the given number of times."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:358
+#: apt.conf.5.xml:362
msgid ""
"Use symlinks for source archives. If set to true then source archives will "
"be symlinked when possible instead of copying. True is the default."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:363
+#: apt.conf.5.xml:367
msgid ""
"<literal>http::Proxy</literal> sets the default proxy to use for HTTP "
"URIs. It is in the standard form of "
@@ -2870,7 +2938,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:371
+#: apt.conf.5.xml:375
msgid ""
"Three settings are provided for cache control with HTTP/1.1 compliant proxy "
"caches. <literal>No-Cache</literal> tells the proxy not to use its cached "
@@ -2882,14 +2950,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:381 apt.conf.5.xml:469
+#: apt.conf.5.xml:385 apt.conf.5.xml:473
msgid ""
"The option <literal>timeout</literal> sets the timeout timer used by the "
"method; this value applies to the connection as well as the data timeout."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:384
+#: apt.conf.5.xml:388
msgid ""
"The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to "
"enable HTTP pipelining (RFC 2616 section 8.1.2.2) which can be beneficial "
@@ -2901,14 +2969,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:391
+#: apt.conf.5.xml:395
msgid ""
"<literal>Acquire::http::AllowRedirect</literal> controls whether APT will "
"follow redirects, which is enabled by default."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:394
+#: apt.conf.5.xml:398
msgid ""
"The used bandwidth can be limited with "
"<literal>Acquire::http::Dl-Limit</literal> which accepts integer values in "
@@ -2918,7 +2986,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:401
+#: apt.conf.5.xml:405
msgid ""
"<literal>Acquire::http::User-Agent</literal> can be used to set a different "
"User-Agent for the http download method as some proxies allow access for "
@@ -2926,7 +2994,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:405
+#: apt.conf.5.xml:409
msgid ""
"<literal>Acquire::http::Proxy-Auto-Detect</literal> can be used to specify "
"an external command to discover the http proxy to use. Apt expects the "
@@ -2940,7 +3008,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:423
+#: apt.conf.5.xml:427
msgid ""
"The <literal>Cache-control</literal>, <literal>Timeout</literal>, "
"<literal>AllowRedirect</literal>, <literal>Dl-Limit</literal> and "
@@ -2951,7 +3019,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:431
+#: apt.conf.5.xml:435
msgid ""
"<literal>CaInfo</literal> suboption specifies place of file that holds info "
"about trusted certificates. <literal>&lt;host&gt;::CaInfo</literal> is the "
@@ -2975,7 +3043,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:452
+#: apt.conf.5.xml:456
msgid ""
"<literal>ftp::Proxy</literal> sets the default proxy to use for FTP URIs. "
"It is in the standard form of "
@@ -2996,7 +3064,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:472
+#: apt.conf.5.xml:476
msgid ""
"Several settings are provided to control passive mode. Generally it is safe "
"to leave passive mode on; it works in nearly every environment. However, "
@@ -3006,7 +3074,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:479
+#: apt.conf.5.xml:483
msgid ""
"It is possible to proxy FTP over HTTP by setting the "
"<envar>ftp_proxy</envar> environment variable to an HTTP URL - see the "
@@ -3016,7 +3084,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:484
+#: apt.conf.5.xml:488
msgid ""
"The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
"<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@ -3026,13 +3094,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:498
+#: apt.conf.5.xml:502
#, no-wrap
msgid "/cdrom/::Mount \"foo\";"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:493
+#: apt.conf.5.xml:497
msgid ""
"For URIs using the <literal>cdrom</literal> method, the only configurable "
"option is the mount point, <literal>cdrom::Mount</literal>, which must be "
@@ -3045,7 +3113,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:506
+#: apt.conf.5.xml:510
msgid ""
"For GPGV URIs the only configurable option is "
"<literal>gpgv::Options</literal>, which passes additional parameters to "
@@ -3053,7 +3121,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:517
+#: apt.conf.5.xml:521
#, no-wrap
msgid ""
"Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> "
@@ -3061,7 +3129,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:512
+#: apt.conf.5.xml:516
msgid ""
"List of compression types which are understood by the acquire methods. "
"Files like <filename>Packages</filename> can be available in various "
@@ -3073,19 +3141,19 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:522
+#: apt.conf.5.xml:526
#, no-wrap
msgid "Acquire::CompressionTypes::Order:: \"gz\";"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:525
+#: apt.conf.5.xml:529
#, no-wrap
msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:518
+#: apt.conf.5.xml:522
msgid ""
"Also, the <literal>Order</literal> subgroup can be used to define in which "
"order the acquire system will try to download the compressed files. The "
@@ -3103,13 +3171,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:532
+#: apt.conf.5.xml:536
#, no-wrap
msgid "Dir::Bin::bzip2 \"/bin/bzip2\";"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:527
+#: apt.conf.5.xml:531
msgid ""
"Note that the "
"<literal>Dir::Bin::<replaceable>Methodname</replaceable></literal> will be "
@@ -3125,7 +3193,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:537
+#: apt.conf.5.xml:541
msgid ""
"The special type <literal>uncompressed</literal> can be used to give "
"uncompressed files a preference, but note that most archives don't provide "
@@ -3133,7 +3201,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:544
+#: apt.conf.5.xml:548
msgid ""
"When downloading <literal>gzip</literal> compressed indexes (Packages, "
"Sources, or Translations), keep them gzip compressed locally instead of "
@@ -3142,7 +3210,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:552
+#: apt.conf.5.xml:556
msgid ""
"The Languages subsection controls which <filename>Translation</filename> "
"files are downloaded and in which order APT tries to display the "
@@ -3154,13 +3222,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><programlisting>
-#: apt.conf.5.xml:569
+#: apt.conf.5.xml:573
#, no-wrap
msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:557
+#: apt.conf.5.xml:561
msgid ""
"The default list includes \"environment\" and "
"\"en\". \"<literal>environment</literal>\" has a special meaning here: it "
@@ -3182,7 +3250,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:570
+#: apt.conf.5.xml:574
msgid ""
"Note: To prevent problems resulting from APT being executed in different "
"environments (e.g. by different users or by other programs) all Translation "
@@ -3192,24 +3260,32 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:579
+#: apt.conf.5.xml:583
msgid "When downloading, force to use only the IPv4 protocol."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:585
+#: apt.conf.5.xml:589
msgid "When downloading, force to use only the IPv6 protocol."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:591
+#: apt.conf.5.xml:595
msgid ""
"The maximum file size of Release/Release.gpg/InRelease files. The default "
"is 10MB."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:598
+#: apt.conf.5.xml:602
+msgid ""
+"This option controls if apt will use the DNS SRV server record as specified "
+"in RFC 2782 to select an alternative server to connect to. The default is "
+"\"true\"."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:611
msgid ""
"Allow the update operation to load data files from a repository without a "
"trusted signature. If enabled this option no data files will be loaded and "
@@ -3218,7 +3294,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:609
+#: apt.conf.5.xml:622
msgid ""
"Allow that a repository that was previously gpg signed to become unsigned "
"durign a update operation. When there is no valid signature of a perviously "
@@ -3228,13 +3304,49 @@ msgid ""
"this source untrusted and warn about them if you try to install them."
msgstr ""
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
+#: apt.conf.5.xml:634
+msgid "scope"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:636
+msgid ""
+"Acquiring changelogs can only be done if an URI is known from where to get "
+"them. Preferable the Release file indicates this in a 'Changelogs' "
+"field. If this isn't available the Label/Origin field of the Release file is "
+"used to check if a "
+"<literal>Acquire::Changelogs::URI::Label::<replaceable>LABEL</replaceable></literal> "
+"or "
+"<literal>Acquire::Changelogs::URI::Origin::<replaceable>ORIGIN</replaceable></literal> "
+"option exists and if so this value is taken. The value in the Release file "
+"can be overridden with "
+"<literal>Acquire::Changelogs::URI::Override::Label::<replaceable>LABEL</replaceable></literal> "
+"or "
+"<literal>Acquire::Changelogs::URI::Override::Origin::<replaceable>ORIGIN</replaceable></literal>. "
+"The value should be a normal URI to a text file, expect that package "
+"specific data is replaced with the placeholder "
+"<literal>CHANGEPATH</literal>. The value for it is: 1. if the package is "
+"from a component (e.g. <literal>main</literal>) this is the first part "
+"otherwise it is omitted, 2. the first letter of source package name, expect "
+"if the source package name starts with '<literal>lib</literal>' in which "
+"case it will be the first four letters. 3. The complete source package "
+"name. 4. the complete name again and 5. the source version. The first (if "
+"present), second, third and fourth part are separated by a slash "
+"('<literal>/</literal>') and between the fourth and fifth part is an "
+"underscore ('<literal>_</literal>'). The special value "
+"'<literal>no</literal>' is available for this option indicating that this "
+"source can't be used to acquire changelog files from. Another source will be "
+"tried if available in this case."
+msgstr ""
+
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:624
+#: apt.conf.5.xml:664
msgid "Directories"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:626
+#: apt.conf.5.xml:666
msgid ""
"The <literal>Dir::State</literal> section has directories that pertain to "
"local state information. <literal>lists</literal> is the directory to place "
@@ -3246,7 +3358,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:633
+#: apt.conf.5.xml:673
msgid ""
"<literal>Dir::Cache</literal> contains locations pertaining to local cache "
"information, such as the two package caches <literal>srcpkgcache</literal> "
@@ -3260,7 +3372,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:643
+#: apt.conf.5.xml:683
msgid ""
"<literal>Dir::Etc</literal> contains the location of configuration files, "
"<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -3270,7 +3382,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:649
+#: apt.conf.5.xml:689
msgid ""
"The <literal>Dir::Parts</literal> setting reads in all the config fragments "
"in lexical order from the directory specified. After this is done then the "
@@ -3278,7 +3390,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:653
+#: apt.conf.5.xml:693
msgid ""
"Binary programs are pointed to by "
"<literal>Dir::Bin</literal>. <literal>Dir::Bin::Methods</literal> specifies "
@@ -3290,20 +3402,21 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:661
+#: apt.conf.5.xml:701
msgid ""
"The configuration item <literal>RootDir</literal> has a special meaning. If "
-"set, all paths in <literal>Dir::</literal> will be relative to "
-"<literal>RootDir</literal>, <emphasis>even paths that are specified "
-"absolutely</emphasis>. So, for instance, if <literal>RootDir</literal> is "
-"set to <filename>/tmp/staging</filename> and "
-"<literal>Dir::State::status</literal> is set to "
-"<filename>/var/lib/dpkg/status</filename>, then the status file will be "
-"looked up in <filename>/tmp/staging/var/lib/dpkg/status</filename>."
+"set, all paths will be relative to <literal>RootDir</literal>, "
+"<emphasis>even paths that are specified absolutely</emphasis>. So, for "
+"instance, if <literal>RootDir</literal> is set to "
+"<filename>/tmp/staging</filename> and <literal>Dir::State::status</literal> "
+"is set to <filename>/var/lib/dpkg/status</filename>, then the status file "
+"will be looked up in <filename>/tmp/staging/var/lib/dpkg/status</filename>. "
+"If you want to prefix only relative paths, set <literal>Dir</literal> "
+"instead."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:674
+#: apt.conf.5.xml:715
msgid ""
"The <literal>Ignore-Files-Silently</literal> list can be used to specify "
"which files APT should silently ignore while parsing the files in the "
@@ -3314,12 +3427,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:683
+#: apt.conf.5.xml:724
msgid "APT in DSelect"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:685
+#: apt.conf.5.xml:726
msgid ""
"When APT is used as a &dselect; method several configuration directives "
"control the default behavior. These are in the <literal>DSelect</literal> "
@@ -3327,7 +3440,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:690
+#: apt.conf.5.xml:731
msgid ""
"Cache Clean mode; this value may be one of <literal>always</literal>, "
"<literal>prompt</literal>, <literal>auto</literal>, "
@@ -3341,40 +3454,40 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:704
+#: apt.conf.5.xml:745
msgid ""
"The contents of this variable are passed to &apt-get; as command line "
"options when it is run for the install phase."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:709
+#: apt.conf.5.xml:750
msgid ""
"The contents of this variable are passed to &apt-get; as command line "
"options when it is run for the update phase."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:714
+#: apt.conf.5.xml:755
msgid ""
"If true the [U]pdate operation in &dselect; will always prompt to continue. "
"The default is to prompt only on error."
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:720
+#: apt.conf.5.xml:761
msgid "How APT calls &dpkg;"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:721
+#: apt.conf.5.xml:762
msgid ""
"Several configuration directives control how APT invokes &dpkg;. These are "
"in the <literal>DPkg</literal> section."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:726
+#: apt.conf.5.xml:767
msgid ""
"This is a list of options to pass to &dpkg;. The options must be specified "
"using the list notation and each list item is passed as a single argument to "
@@ -3382,7 +3495,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:732
+#: apt.conf.5.xml:773
msgid ""
"This is a list of shell commands to run before/after invoking &dpkg;. Like "
"<literal>options</literal> this must be specified in list notation. The "
@@ -3391,7 +3504,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:739
+#: apt.conf.5.xml:780
msgid ""
"This is a list of shell commands to run before invoking &dpkg;. Like "
"<literal>options</literal> this must be specified in list notation. The "
@@ -3402,16 +3515,51 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:746
+#: apt.conf.5.xml:787
msgid ""
-"Version 2 of this protocol dumps more information, including the protocol "
-"version, the APT configuration space and the packages, files and versions "
-"being changed. Version 3 adds the architecture and "
-"<literal>MultiArch</literal> flag to each version being dumped."
+"Version 2 of this protocol sends more information through the requested file "
+"descriptor: a line with the text <literal>VERSION 2</literal>, the APT "
+"configuration space, and a list of package actions with filename and version "
+"information."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:751
+#: apt.conf.5.xml:792
+msgid ""
+"Each configuration directive line has the form "
+"<literal>key=value</literal>. Special characters (equal signs, newlines, "
+"nonprintable characters, quotation marks, and percent signs in "
+"<literal>key</literal> and newlines, nonprintable characters, and percent "
+"signs in <literal>value</literal>) are %-encoded. Lists are represented by "
+"multiple <literal>key::=value</literal> lines with the same key. The "
+"configuration section ends with a blank line."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:800
+msgid ""
+"Package action lines consist of five fields in Version 2: old version, "
+"direction of version change (&lt; for upgrades, &gt; for downgrades, = for "
+"no change), new version, action. The version fields are \"-\" for no version "
+"at all (for example when installing a package for the first time; no version "
+"is treated as earlier than any real version, so that is an upgrade, "
+"indicated as <literal>- &lt; 1.23.4</literal>). The action field is "
+"\"**CONFIGURE**\" if the package is being configured, \"**REMOVE**\" if it "
+"is being removed, or the filename of a .deb file if it is being unpacked."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:810
+msgid ""
+"In Version 3 after each version field follows the architecture of this "
+"version, which is \"-\" if there is no version, and a field showing the "
+"MultiArch type \"same\", foreign\", \"allowed\" or \"none\". Note that "
+"\"none\" is an incorrect typename which is just kept to remain compatible, "
+"it should be read as \"no\" and users are encouraged to support both."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:816
msgid ""
"The version of the protocol to be used for the command "
"<literal><replaceable>cmd</replaceable></literal> can be chosen by setting "
@@ -3422,7 +3570,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:758
+#: apt.conf.5.xml:823
msgid ""
"The file descriptor to be used to send the information can be requested with "
"<literal>DPkg::Tools::options::<replaceable>cmd</replaceable>::InfoFD</literal> "
@@ -3433,26 +3581,26 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:768
+#: apt.conf.5.xml:833
msgid ""
"APT chdirs to this directory before invoking &dpkg;, the default is "
"<filename>/</filename>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:773
+#: apt.conf.5.xml:838
msgid ""
"These options are passed to &dpkg-buildpackage; when compiling packages; the "
"default is to disable signing and produce all binaries."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt.conf.5.xml:778
+#: apt.conf.5.xml:843
msgid "dpkg trigger usage (and related options)"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:779
+#: apt.conf.5.xml:844
msgid ""
"APT can call &dpkg; in such a way as to let it make aggressive use of "
"triggers over multiple calls of &dpkg;. Without further options &dpkg; will "
@@ -3467,7 +3615,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:794
+#: apt.conf.5.xml:859
#, no-wrap
msgid ""
"DPkg::NoTriggers \"true\";\n"
@@ -3477,7 +3625,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:788
+#: apt.conf.5.xml:853
msgid ""
"Note that it is not guaranteed that APT will support these options or that "
"these options will not cause (big) trouble in the future. If you have "
@@ -3491,7 +3639,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:801
+#: apt.conf.5.xml:866
msgid ""
"Add the no triggers flag to all &dpkg; calls (except the ConfigurePending "
"call). See &dpkg; if you are interested in what this actually means. In "
@@ -3504,7 +3652,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:809
+#: apt.conf.5.xml:874
msgid ""
"Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
"and \"<literal>no</literal>\". The default value is "
@@ -3522,7 +3670,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:824
+#: apt.conf.5.xml:889
msgid ""
"If this option is set APT will call <command>dpkg --configure "
"--pending</command> to let &dpkg; handle all required configurations and "
@@ -3534,7 +3682,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:831
+#: apt.conf.5.xml:896
msgid ""
"Useful for the <literal>smart</literal> configuration as a package which has "
"pending triggers is not considered as <literal>installed</literal>, and "
@@ -3545,7 +3693,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:844
+#: apt.conf.5.xml:909
#, no-wrap
msgid ""
"OrderList::Score {\n"
@@ -3557,7 +3705,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:837
+#: apt.conf.5.xml:902
msgid ""
"Essential packages (and their dependencies) should be configured immediately "
"after unpacking. It is a good idea to do this quite early in the upgrade "
@@ -3571,12 +3719,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:857
+#: apt.conf.5.xml:922
msgid "Periodic and Archives options"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:858
+#: apt.conf.5.xml:923
msgid ""
"<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
"of options configure behavior of apt periodic updates, which is done by the "
@@ -3585,12 +3733,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:866
+#: apt.conf.5.xml:931
msgid "Debug options"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:868
+#: apt.conf.5.xml:933
msgid ""
"Enabling options in the <literal>Debug::</literal> section will cause "
"debugging information to be sent to the standard error stream of the program "
@@ -3601,7 +3749,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:879
+#: apt.conf.5.xml:944
msgid ""
"<literal>Debug::pkgProblemResolver</literal> enables output about the "
"decisions made by <literal>dist-upgrade, upgrade, install, remove, "
@@ -3609,7 +3757,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:887
+#: apt.conf.5.xml:952
msgid ""
"<literal>Debug::NoLocking</literal> disables all file locking. This can be "
"used to run some operations (for instance, <literal>apt-get -s "
@@ -3617,7 +3765,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:896
+#: apt.conf.5.xml:961
msgid ""
"<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
"time that <literal>apt</literal> invokes &dpkg;."
@@ -3627,65 +3775,65 @@ msgstr ""
#. motivating example, except I haven't a clue why you'd want
#. to do this.
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:904
+#: apt.conf.5.xml:969
msgid ""
"<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
"in CD-ROM IDs."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:914
+#: apt.conf.5.xml:979
msgid "A full list of debugging options to apt follows."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:923
+#: apt.conf.5.xml:988
msgid "Print information related to accessing <literal>cdrom://</literal> sources."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:934
+#: apt.conf.5.xml:999
msgid "Print information related to downloading packages using FTP."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:945
+#: apt.conf.5.xml:1010
msgid "Print information related to downloading packages using HTTP."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:956
+#: apt.conf.5.xml:1021
msgid "Print information related to downloading packages using HTTPS."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:967
+#: apt.conf.5.xml:1032
msgid ""
"Print information related to verifying cryptographic signatures using "
"<literal>gpg</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:978
+#: apt.conf.5.xml:1043
msgid ""
"Output information about the process of accessing collections of packages "
"stored on CD-ROMs."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:988
+#: apt.conf.5.xml:1053
msgid "Describes the process of resolving build-dependencies in &apt-get;."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:998
+#: apt.conf.5.xml:1063
msgid ""
"Output each cryptographic hash that is generated by the "
"<literal>apt</literal> libraries."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1008
+#: apt.conf.5.xml:1073
msgid ""
"Do not include information from <literal>statfs</literal>, namely the number "
"of used and free blocks on the CD-ROM filesystem, when generating an ID for "
@@ -3693,52 +3841,52 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1019
+#: apt.conf.5.xml:1084
msgid ""
"Disable all file locking. For instance, this will allow two instances of "
"<quote><literal>apt-get update</literal></quote> to run at the same time."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1031
+#: apt.conf.5.xml:1096
msgid "Log when items are added to or removed from the global download queue."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1041
+#: apt.conf.5.xml:1106
msgid ""
"Output status messages and errors related to verifying checksums and "
"cryptographic signatures of downloaded files."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1051
+#: apt.conf.5.xml:1116
msgid ""
"Output information about downloading and applying package index list diffs, "
"and errors relating to package index list diffs."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1063
+#: apt.conf.5.xml:1128
msgid ""
"Output information related to patching apt package lists when downloading "
"index diffs instead of full indices."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1074
+#: apt.conf.5.xml:1139
msgid "Log all interactions with the sub-processes that actually perform downloads."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1085
+#: apt.conf.5.xml:1150
msgid ""
"Log events related to the automatically-installed status of packages and to "
"the removal of unused packages."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1095
+#: apt.conf.5.xml:1160
msgid ""
"Generate debug messages describing which packages are being automatically "
"installed to resolve dependencies. This corresponds to the initial "
@@ -3748,7 +3896,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1109
+#: apt.conf.5.xml:1174
msgid ""
"Generate debug messages describing which packages are marked as "
"keep/install/remove while the ProblemResolver does his work. Each addition "
@@ -3766,45 +3914,45 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1130
+#: apt.conf.5.xml:1195
msgid ""
"When invoking &dpkg;, output the precise command line with which it is being "
"invoked, with arguments separated by a single space character."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1141
+#: apt.conf.5.xml:1206
msgid ""
"Output all the data received from &dpkg; on the status file descriptor and "
"any errors encountered while parsing it."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1152
+#: apt.conf.5.xml:1217
msgid ""
"Generate a trace of the algorithm that decides the order in which "
"<literal>apt</literal> should pass packages to &dpkg;."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1164
+#: apt.conf.5.xml:1229
msgid "Output status messages tracing the steps performed when invoking &dpkg;."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1175
+#: apt.conf.5.xml:1240
msgid "Output the priority of each package list on startup."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1185
+#: apt.conf.5.xml:1250
msgid ""
"Trace the execution of the dependency resolver (this applies only to what "
"happens when a complex dependency problem is encountered)."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1196
+#: apt.conf.5.xml:1261
msgid ""
"Display a list of all installed packages with their calculated score used by "
"the pkgProblemResolver. The description of the package is the same as "
@@ -3812,14 +3960,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1208
+#: apt.conf.5.xml:1273
msgid ""
"Print information about the vendors read from "
"<filename>/etc/apt/vendors.list</filename>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1218
+#: apt.conf.5.xml:1283
msgid ""
"Display the external commands that are called by apt hooks. This includes "
"e.g. the config options <literal>DPkg::{Pre,Post}-Invoke</literal> or "
@@ -3827,12 +3975,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:1242 apt_preferences.5.xml:541 sources.list.5.xml:233 apt-ftparchive.1.xml:592
+#: apt.conf.5.xml:1307 apt_preferences.5.xml:556 sources.list.5.xml:358 apt-ftparchive.1.xml:592
msgid "Examples"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1243
+#: apt.conf.5.xml:1308
msgid ""
"&configureindex; is a configuration file showing example values for all "
"possible options."
@@ -3840,7 +3988,7 @@ msgstr ""
#. ? reading apt.conf
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1255
+#: apt.conf.5.xml:1320
msgid "&apt-cache;, &apt-config;, &apt-preferences;."
msgstr ""
@@ -3986,9 +4134,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
#: apt_preferences.5.xml:118
-msgid ""
-"to the versions that are not installed and do not belong to the target "
-"release."
+msgid "to the versions that do not belong to the target release."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
@@ -3998,11 +4144,18 @@ msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
#: apt_preferences.5.xml:123
-msgid "to the versions that are not installed and belong to the target release."
+msgid "to the versions that belong to the target release."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt_preferences.5.xml:127
+msgid ""
+"The highest of those priorities whose description matches the version is "
+"assigned to the version."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:128
+#: apt_preferences.5.xml:131
msgid ""
"If the target release has not been specified then APT simply assigns "
"priority 100 to all installed package versions and priority 500 to all "
@@ -4013,14 +4166,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:135
+#: apt_preferences.5.xml:138
msgid ""
"APT then applies the following rules, listed in order of precedence, to "
"determine which version of a package to install."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:138
+#: apt_preferences.5.xml:141
msgid ""
"Never downgrade unless the priority of an available version exceeds 1000. "
"(\"Downgrading\" is installing a less recent version of a package in place "
@@ -4030,19 +4183,19 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:144
+#: apt_preferences.5.xml:147
msgid "Install the highest priority version."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:145
+#: apt_preferences.5.xml:148
msgid ""
"If two or more versions have the same priority, install the most recent one "
"(that is, the one with the higher version number)."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:148
+#: apt_preferences.5.xml:151
msgid ""
"If two or more versions have the same priority and version number but either "
"the packages differ in some of their metadata or the "
@@ -4050,7 +4203,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:154
+#: apt_preferences.5.xml:157
msgid ""
"In a typical situation, the installed version of a package (priority 100) "
"is not as recent as one of the versions available from the sources listed in "
@@ -4061,7 +4214,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:161
+#: apt_preferences.5.xml:164
msgid ""
"More rarely, the installed version of a package is <emphasis>more</emphasis> "
"recent than any of the other available versions. The package will not be "
@@ -4071,7 +4224,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:166
+#: apt_preferences.5.xml:169
msgid ""
"Sometimes the installed version of a package is more recent than the version "
"belonging to the target release, but not as recent as a version belonging to "
@@ -4083,12 +4236,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:175
+#: apt_preferences.5.xml:178
msgid "The Effect of APT Preferences"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:177
+#: apt_preferences.5.xml:180
msgid ""
"The APT preferences file allows the system administrator to control the "
"assignment of priorities. The file consists of one or more multi-line "
@@ -4097,7 +4250,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:183
+#: apt_preferences.5.xml:186
msgid ""
"The specific form assigns a priority (a \"Pin-Priority\") to one or more "
"specified packages with a specified version or version range. For example, "
@@ -4108,7 +4261,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:190
+#: apt_preferences.5.xml:193
#, no-wrap
msgid ""
"Package: perl\n"
@@ -4117,7 +4270,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:196
+#: apt_preferences.5.xml:199
msgid ""
"The general form assigns a priority to all of the package versions in a "
"given distribution (that is, to all the versions of packages that are listed "
@@ -4127,7 +4280,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:202
+#: apt_preferences.5.xml:205
msgid ""
"This general-form entry in the APT preferences file applies only to groups "
"of packages. For example, the following record assigns a high priority to "
@@ -4135,7 +4288,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:207
+#: apt_preferences.5.xml:210
#, no-wrap
msgid ""
"Package: *\n"
@@ -4144,7 +4297,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:212
+#: apt_preferences.5.xml:215
msgid ""
"A note of caution: the keyword used here is \"<literal>origin</literal>\" "
"which can be used to match a hostname. The following record will assign a "
@@ -4153,7 +4306,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:216
+#: apt_preferences.5.xml:219
#, no-wrap
msgid ""
"Package: *\n"
@@ -4162,7 +4315,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:220
+#: apt_preferences.5.xml:223
msgid ""
"This should <emphasis>not</emphasis> be confused with the Origin of a "
"distribution as specified in a <filename>Release</filename> file. What "
@@ -4172,7 +4325,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:225
+#: apt_preferences.5.xml:228
msgid ""
"The following record assigns a low priority to all package versions "
"belonging to any distribution whose Archive name is "
@@ -4180,7 +4333,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:229
+#: apt_preferences.5.xml:232
#, no-wrap
msgid ""
"Package: *\n"
@@ -4189,7 +4342,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:234
+#: apt_preferences.5.xml:237
msgid ""
"The following record assigns a high priority to all package versions "
"belonging to any distribution whose Codename is "
@@ -4197,7 +4350,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:238
+#: apt_preferences.5.xml:241
#, no-wrap
msgid ""
"Package: *\n"
@@ -4206,7 +4359,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:243
+#: apt_preferences.5.xml:246
msgid ""
"The following record assigns a high priority to all package versions "
"belonging to any release whose Archive name is \"<literal>stable</literal>\" "
@@ -4214,7 +4367,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
-#: apt_preferences.5.xml:248
+#: apt_preferences.5.xml:251
#, no-wrap
msgid ""
"Package: *\n"
@@ -4222,13 +4375,22 @@ msgid ""
"Pin-Priority: 500\n"
msgstr ""
-#. type: Content of: <refentry><refsect1><refsect2><title>
+#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt_preferences.5.xml:258
+msgid ""
+"The effect of the comma operator is similar to an \"and\" in logic: All "
+"conditions must be satisfied for the pin to match. There is one exception: "
+"For any type of condition (such as two \"a\" conditions), only the last such "
+"condition is checked."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><title>
+#: apt_preferences.5.xml:266
msgid "Regular expressions and &glob; syntax"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:260
+#: apt_preferences.5.xml:268
msgid ""
"APT also supports pinning by &glob; expressions, and regular expressions "
"surrounded by slashes. For example, the following example assigns the "
@@ -4238,7 +4400,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:269
+#: apt_preferences.5.xml:277
#, no-wrap
msgid ""
"Package: gnome* /kde/\n"
@@ -4247,7 +4409,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:275
+#: apt_preferences.5.xml:283
msgid ""
"The rule for those expressions is that they can occur anywhere where a "
"string can occur. Thus, the following pin assigns the priority 990 to all "
@@ -4255,7 +4417,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:281
+#: apt_preferences.5.xml:289
#, no-wrap
msgid ""
"Package: *\n"
@@ -4264,7 +4426,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:287
+#: apt_preferences.5.xml:295
msgid ""
"If a regular expression occurs in a <literal>Package</literal> field, the "
"behavior is the same as if this regular expression were replaced with a list "
@@ -4275,105 +4437,116 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:303
+#: apt_preferences.5.xml:311
msgid "How APT Interprets Priorities"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:306
+#: apt_preferences.5.xml:314
msgid ""
"Priorities (P) assigned in the APT preferences file must be positive or "
"negative integers. They are interpreted as follows (roughly speaking):"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:311
+#: apt_preferences.5.xml:319
msgid "P &gt;= 1000"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:312
+#: apt_preferences.5.xml:320
msgid ""
"causes a version to be installed even if this constitutes a downgrade of the "
"package"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:316
+#: apt_preferences.5.xml:324
msgid "990 &lt;= P &lt; 1000"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:317
+#: apt_preferences.5.xml:325
msgid ""
"causes a version to be installed even if it does not come from the target "
"release, unless the installed version is more recent"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:322
+#: apt_preferences.5.xml:330
msgid "500 &lt;= P &lt; 990"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:323
+#: apt_preferences.5.xml:331
msgid ""
"causes a version to be installed unless there is a version available "
"belonging to the target release or the installed version is more recent"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:328
+#: apt_preferences.5.xml:336
msgid "100 &lt;= P &lt; 500"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:329
+#: apt_preferences.5.xml:337
msgid ""
"causes a version to be installed unless there is a version available "
"belonging to some other distribution or the installed version is more recent"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:334
+#: apt_preferences.5.xml:342
msgid "0 &lt; P &lt; 100"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:335
+#: apt_preferences.5.xml:343
msgid ""
"causes a version to be installed only if there is no installed version of "
"the package"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:339
+#: apt_preferences.5.xml:347
msgid "P &lt; 0"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:340
+#: apt_preferences.5.xml:348
msgid "prevents the version from being installed"
msgstr ""
+#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
+#: apt_preferences.5.xml:351
+msgid "P = 0"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
+#: apt_preferences.5.xml:352
+msgid "has undefined behaviour, do not use it."
+msgstr ""
+
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:345
+#: apt_preferences.5.xml:358
msgid ""
-"If any specific-form records match an available package version then the "
-"first such record determines the priority of the package version. Failing "
-"that, if any general-form records match an available package version then "
-"the first such record determines the priority of the package version."
+"The first specific-form record matching an available package version "
+"determines the priority of the package version. Failing that, the priority "
+"of the package is defined as the maximum of all priorities defined by "
+"generic-form records matching the version. Records defined using patterns "
+"in the Pin field other than \"*\" are treated like specific-form records."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:351
+#: apt_preferences.5.xml:366
msgid ""
"For example, suppose the APT preferences file contains the three records "
"presented earlier:"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><programlisting>
-#: apt_preferences.5.xml:355
+#: apt_preferences.5.xml:370
#, no-wrap
msgid ""
"Package: perl\n"
@@ -4390,12 +4563,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:368
+#: apt_preferences.5.xml:383
msgid "Then:"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:370
+#: apt_preferences.5.xml:385
msgid ""
"The most recent available version of the <literal>perl</literal> package "
"will be installed, so long as that version's version number begins with "
@@ -4406,7 +4579,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:375
+#: apt_preferences.5.xml:390
msgid ""
"A version of any package other than <literal>perl</literal> that is "
"available from the local system has priority over other versions, even "
@@ -4414,7 +4587,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:379
+#: apt_preferences.5.xml:394
msgid ""
"A version of a package whose origin is not the local system but some other "
"site listed in &sources-list; and which belongs to an "
@@ -4423,12 +4596,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:389
+#: apt_preferences.5.xml:404
msgid "Determination of Package Version and Distribution Properties"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:391
+#: apt_preferences.5.xml:406
msgid ""
"The locations listed in the &sources-list; file should provide "
"<filename>Packages</filename> and <filename>Release</filename> files to "
@@ -4436,7 +4609,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:395
+#: apt_preferences.5.xml:410
msgid ""
"The <filename>Packages</filename> file is normally found in the directory "
"<filename>.../dists/<replaceable>dist-name</replaceable>/<replaceable>component</replaceable>/<replaceable>arch</replaceable></filename>: "
@@ -4448,27 +4621,27 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:403
+#: apt_preferences.5.xml:418
msgid "the <literal>Package:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:404
+#: apt_preferences.5.xml:419
msgid "gives the package name"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:407 apt_preferences.5.xml:457
+#: apt_preferences.5.xml:422 apt_preferences.5.xml:472
msgid "the <literal>Version:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:408
+#: apt_preferences.5.xml:423
msgid "gives the version number for the named package"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:413
+#: apt_preferences.5.xml:428
msgid ""
"The <filename>Release</filename> file is normally found in the directory "
"<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
@@ -4481,12 +4654,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:424
+#: apt_preferences.5.xml:439
msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:425
+#: apt_preferences.5.xml:440
msgid ""
"names the archive to which all the packages in the directory tree belong. "
"For example, the line \"Archive: stable\" or \"Suite: stable\" specifies "
@@ -4497,18 +4670,18 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:435
+#: apt_preferences.5.xml:450
#, no-wrap
msgid "Pin: release a=stable\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:441
+#: apt_preferences.5.xml:456
msgid "the <literal>Codename:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:442
+#: apt_preferences.5.xml:457
msgid ""
"names the codename to which all the packages in the directory tree belong. "
"For example, the line \"Codename: &testing-codename;\" specifies that all of "
@@ -4519,13 +4692,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:451
+#: apt_preferences.5.xml:466
#, no-wrap
msgid "Pin: release n=&testing-codename;\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:458
+#: apt_preferences.5.xml:473
msgid ""
"names the release version. For example, the packages in the tree might "
"belong to Debian release version &stable-version;. Note that there is "
@@ -4536,7 +4709,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:467
+#: apt_preferences.5.xml:482
#, no-wrap
msgid ""
"Pin: release v=&stable-version;\n"
@@ -4545,12 +4718,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:476
+#: apt_preferences.5.xml:491
msgid "the <literal>Component:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:477
+#: apt_preferences.5.xml:492
msgid ""
"names the licensing component associated with the packages in the directory "
"tree of the <filename>Release</filename> file. For example, the line "
@@ -4562,18 +4735,18 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:486
+#: apt_preferences.5.xml:501
#, no-wrap
msgid "Pin: release c=main\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:492
+#: apt_preferences.5.xml:507
msgid "the <literal>Origin:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:493
+#: apt_preferences.5.xml:508
msgid ""
"names the originator of the packages in the directory tree of the "
"<filename>Release</filename> file. Most commonly, this is "
@@ -4582,18 +4755,18 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:499
+#: apt_preferences.5.xml:514
#, no-wrap
msgid "Pin: release o=Debian\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:505
+#: apt_preferences.5.xml:520
msgid "the <literal>Label:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:506
+#: apt_preferences.5.xml:521
msgid ""
"names the label of the packages in the directory tree of the "
"<filename>Release</filename> file. Most commonly, this is "
@@ -4602,13 +4775,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:512
+#: apt_preferences.5.xml:527
#, no-wrap
msgid "Pin: release l=Debian\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:519
+#: apt_preferences.5.xml:534
msgid ""
"All of the <filename>Packages</filename> and <filename>Release</filename> "
"files retrieved from locations listed in the &sources-list; file are stored "
@@ -4623,12 +4796,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:532
+#: apt_preferences.5.xml:547
msgid "Optional Lines in an APT Preferences Record"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:534
+#: apt_preferences.5.xml:549
msgid ""
"Each record in the APT preferences file can optionally begin with one or "
"more lines beginning with the word <literal>Explanation:</literal>. This "
@@ -4636,12 +4809,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:543
+#: apt_preferences.5.xml:558
msgid "Tracking Stable"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:551
+#: apt_preferences.5.xml:566
#, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated\n"
@@ -4656,7 +4829,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:545
+#: apt_preferences.5.xml:560
msgid ""
"The following APT preferences file will cause APT to assign a priority "
"higher than the default (500) to all package versions belonging to a "
@@ -4666,7 +4839,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:568 apt_preferences.5.xml:614 apt_preferences.5.xml:672
+#: apt_preferences.5.xml:583 apt_preferences.5.xml:629 apt_preferences.5.xml:687
#, no-wrap
msgid ""
"apt-get install <replaceable>package-name</replaceable>\n"
@@ -4675,7 +4848,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:563
+#: apt_preferences.5.xml:578
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
"the following commands will cause APT to upgrade to the latest "
@@ -4684,13 +4857,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:580
+#: apt_preferences.5.xml:595
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/testing\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:574
+#: apt_preferences.5.xml:589
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>testing</literal> distribution; the package "
@@ -4699,12 +4872,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:586
+#: apt_preferences.5.xml:601
msgid "Tracking Testing or Unstable"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:595
+#: apt_preferences.5.xml:610
#, no-wrap
msgid ""
"Package: *\n"
@@ -4721,7 +4894,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:588
+#: apt_preferences.5.xml:603
msgid ""
"The following APT preferences file will cause APT to assign a high priority "
"to package versions from the <literal>testing</literal> distribution, a "
@@ -4732,7 +4905,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:609
+#: apt_preferences.5.xml:624
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
"the following commands will cause APT to upgrade to the latest "
@@ -4741,13 +4914,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:629
+#: apt_preferences.5.xml:644
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/unstable\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:620
+#: apt_preferences.5.xml:635
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>unstable</literal> distribution. "
@@ -4759,12 +4932,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:636
+#: apt_preferences.5.xml:651
msgid "Tracking the evolution of a codename release"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:650
+#: apt_preferences.5.xml:665
#, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated package "
@@ -4786,7 +4959,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:638
+#: apt_preferences.5.xml:653
msgid ""
"The following APT preferences file will cause APT to assign a priority "
"higher than the default (500) to all package versions belonging to a "
@@ -4801,7 +4974,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:667
+#: apt_preferences.5.xml:682
msgid ""
"With a suitable &sources-list; file and the above preferences file, any of "
"the following commands will cause APT to upgrade to the latest version(s) in "
@@ -4810,13 +4983,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:687
+#: apt_preferences.5.xml:702
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/sid\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:678
+#: apt_preferences.5.xml:693
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>sid</literal> distribution. Thereafter, "
@@ -4828,7 +5001,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:702
+#: apt_preferences.5.xml:717
msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
msgstr ""
@@ -4840,53 +5013,126 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:34
msgid ""
-"The source list <filename>/etc/apt/sources.list</filename> is designed to "
-"support any number of active sources and a variety of source media. The file "
-"lists one source per line, with the most preferred source listed first. The "
-"information available from the configured sources is acquired by "
-"<command>apt-get update</command> (or by an equivalent command from another "
-"APT front-end)."
+"The source list <filename>/etc/apt/sources.list</filename> and the the files "
+"contained in <filename>/etc/apt/sources.list.d/</filename> are designed to "
+"support any number of active sources and a variety of source media. The "
+"files list one source per line (one line style) or contain multiline stanzas "
+"defining one or more sources per stanza (deb822 style), with the most "
+"preferred source listed first (in case a single version is available from "
+"more than one source). The information available from the configured sources "
+"is acquired by <command>apt-get update</command> (or by an equivalent "
+"command from another APT front-end)."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: sources.list.5.xml:45
+msgid "sources.list.d"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml:46
+msgid ""
+"The <filename>/etc/apt/sources.list.d</filename> directory provides a way to "
+"add sources.list entries in separate files. Two different file formats are "
+"allowed as described in the next two sections. Filenames need to have "
+"either the extension <filename>.list</filename> or "
+"<filename>.sources</filename> depending on the contained format. The "
+"filenames may only contain letters (a-z and A-Z), digits (0-9), underscore "
+"(_), hyphen (-) and period (.) characters. Otherwise APT will print a "
+"notice that it has ignored a file, unless that file matches a pattern in the "
+"<literal>Dir::Ignore-Files-Silently</literal> configuration list - in which "
+"case it will be silently ignored."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: sources.list.5.xml:58
+msgid "one line style format"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:41
+#: sources.list.5.xml:60
msgid ""
-"Each line specifying a source starts with type "
+"Files in this format have the extension <filename>.list</filename>. Each "
+"line specifying a source starts with a type "
"(e.g. <literal>deb-src</literal>) followed by options and arguments for "
"this type. Individual entries cannot be continued onto a following "
"line. Empty lines are ignored, and a <literal>#</literal> character anywhere "
-"on a line marks the remainder of that line as a comment."
+"on a line marks the remainder of that line as a comment. Consequently an "
+"entry can be disabled by commenting out the entire line. If options should "
+"be provided they are separated by spaces and all of them together are "
+"enclosed by square brackets (<literal>[]</literal>) included in the line "
+"after the type separated from it with a space. If an option allows multiple "
+"values these are separated from each other with a comma "
+"(<literal>,</literal>). An option name is separated from its value(s) by a "
+"equal sign (<literal>=</literal>). Multivalue options have also "
+"<literal>-=</literal> and <literal>+=</literal> as separator which instead "
+"of replacing the default with the given value(s) modify the default value(s) "
+"to remove or include the given values."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml:79
+msgid ""
+"This is the traditional format and supported by all apt versions. Note that "
+"not all options as described below are supported by all apt versions. Note "
+"also that some older applications parsing this format on its own might not "
+"expect to encounter options as they were uncommon before the introduction of "
+"multi-architecture support."
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:49
-msgid "sources.list.d"
+#: sources.list.5.xml:87
+msgid "deb822 style format"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml:89
+msgid ""
+"Files in this format have the extension <filename>.sources</filename>. The "
+"format is similar in syntax to other files used by Debian and its "
+"derivatives, like the metadata itself apt will download from the configured "
+"sources or the <filename>debian/control</filename> file in a Debian source "
+"package. Individual entries are separated by an empty line, additional "
+"empty lines are ignored, and a <literal>#</literal> character at the start "
+"of the line marks the entire line as a comment. An entry can hence be "
+"disabled by commenting out each line belonging to the stanza, but it is "
+"usually easier to add the field \"Enabled: no\" to the stanza to disable the "
+"entry. Removing the field or setting it to yes reenables it. Options have "
+"the same syntax as every other field: A fieldname separated by a colon "
+"(<literal>:</literal>) and optionally spaces from its value(s). Note "
+"especially that multiple values are separated by spaces, not by commas as in "
+"the one line format. Multivalue fields like <literal>Architectures</literal> "
+"also have <literal>Architectures-Add</literal> and "
+"<literal>Architectures-Remove</literal> to modify the default value rather "
+"than replacing it."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:50
+#: sources.list.5.xml:108
msgid ""
-"The <filename>/etc/apt/sources.list.d</filename> directory provides a way to "
-"add sources.list entries in separate files. The format is the same as for "
-"the regular <filename>sources.list</filename> file. File names need to end "
-"with <filename>.list</filename> and may only contain letters (a-z and A-Z), "
-"digits (0-9), underscore (_), hyphen (-) and period (.) characters. "
-"Otherwise APT will print a notice that it has ignored a file, unless that "
-"file matches a pattern in the <literal>Dir::Ignore-Files-Silently</literal> "
-"configuration list - in which case it will be silently ignored."
+"This is a new format supported by apt itself since version 1.1. Previous "
+"versions ignore such files with a notice message as described earlier. It "
+"is intended to make this format gradually the default format and deprecating "
+"the previously described one line style format as it is easier to create, "
+"extend and modify by humans and machines alike especially if a lot of "
+"sources and/or options are involved. Developers who are working with and/or "
+"parsing apt sources are highly encouraged to add support for this format and "
+"to contact the APT team to coordinate and share this work. Users can freely "
+"adopt this format already, but could encounter problems with software not "
+"supporting the format yet."
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:61
-msgid "The deb and deb-src types"
+#: sources.list.5.xml:123
+msgid "The deb and deb-src types: General Format"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:62
+#: sources.list.5.xml:124
msgid ""
"The <literal>deb</literal> type references a typical two-level Debian "
"archive, <filename>distribution/component</filename>. The "
-"<literal>distribution</literal> is generally an archive name like "
+"<literal>distribution</literal> is generally a suite name like "
"<literal>stable</literal> or <literal>testing</literal> or a codename like "
"<literal>&stable-codename;</literal> or "
"<literal>&testing-codename;</literal> while component is one of "
@@ -4898,63 +5144,57 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:73
+#: sources.list.5.xml:135
msgid ""
-"The format for a <filename>sources.list</filename> entry using the "
-"<literal>deb</literal> and <literal>deb-src</literal> types is:"
+"The format for two one line style entries using the <literal>deb</literal> "
+"and <literal>deb-src</literal> types is:"
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:76
+#: sources.list.5.xml:138
#, no-wrap
-msgid "deb [ options ] uri suite [component1] [component2] [...]"
+msgid ""
+"deb [ option1=value1 option2=value2 ] uri suite [component1] [component2] "
+"[...]\n"
+"deb-src [ option1=value1 option2=value2 ] uri suite [component1] "
+"[component2] [...]"
msgstr ""
#. type: Content of: <refentry><refsect1><para><literallayout>
-#: sources.list.5.xml:80
+#: sources.list.5.xml:143
#, no-wrap
msgid ""
" Types: deb deb-src\n"
-" URIs: http://example.com\n"
-" Suites: stable testing\n"
-" Sections: component1 component2\n"
-" Description: short\n"
-" long long long\n"
-" [option1]: [option1-value]\n"
-"\n"
-" Types: deb\n"
-" URIs: http://another.example.com\n"
-" Suites: experimental\n"
-" Sections: component1 component2\n"
-" Enabled: no\n"
-" Description: short\n"
-" long long long\n"
-" [option1]: [option1-value]\n"
+" URIs: uri\n"
+" Suites: suite\n"
+" Components: [component1] [component2] [...]\n"
+" option1: value1\n"
+" option2: value2\n"
" "
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:78
+#: sources.list.5.xml:141
msgid ""
-"Alternatively a rfc822 style format is also supported: <placeholder "
-"type=\"literallayout\" id=\"0\"/>"
+"Alternatively the equivalent entry in deb822 style looks like this: "
+"<placeholder type=\"literallayout\" id=\"0\"/>"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:99
+#: sources.list.5.xml:152
msgid ""
"The URI for the <literal>deb</literal> type must specify the base of the "
"Debian distribution, from which APT will find the information it needs. "
"<literal>suite</literal> can specify an exact path, in which case the "
"components must be omitted and <literal>suite</literal> must end with a "
"slash (<literal>/</literal>). This is useful for the case when only a "
-"particular sub-section of the archive denoted by the URI is of interest. If "
-"<literal>suite</literal> does not specify an exact path, at least one "
+"particular sub-directory of the archive denoted by the URI is of interest. "
+"If <literal>suite</literal> does not specify an exact path, at least one "
"<literal>component</literal> must be present."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:108
+#: sources.list.5.xml:161
msgid ""
"<literal>suite</literal> may also contain a variable, "
"<literal>$(ARCH)</literal> which expands to the Debian architecture (such as "
@@ -4966,99 +5206,166 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:116
+#: sources.list.5.xml:169
msgid ""
-"In the traditional style sources.list format since only one distribution can "
-"be specified per line it may be necessary to have multiple lines for the "
-"same URI, if a subset of all available distributions or components at that "
+"Especially in the one line style format since only one distribution can be "
+"specified per line it may be necessary to have multiple lines for the same "
+"URI, if a subset of all available distributions or components at that "
"location is desired. APT will sort the URI list after it has generated a "
"complete set internally, and will collapse multiple references to the same "
"Internet host, for instance, into a single connection, so that it does not "
-"inefficiently establish an FTP connection, close it, do something else, and "
-"then re-establish a connection to that same host. This feature is useful for "
-"accessing busy FTP sites with limits on the number of simultaneous anonymous "
-"users. APT also parallelizes connections to different hosts to more "
-"effectively deal with sites with low bandwidth."
+"inefficiently establish a connection, close it, do something else, and then "
+"re-establish a connection to that same host. APT also parallelizes "
+"connections to different hosts to more effectively deal with sites with low "
+"bandwidth."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml:181
+msgid ""
+"It is important to list sources in order of preference, with the most "
+"preferred source listed first. Typically this will result in sorting by "
+"speed from fastest to slowest (CD-ROM followed by hosts on a local network, "
+"followed by distant Internet hosts, for example)."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><literallayout>
+#: sources.list.5.xml:188
+#, no-wrap
+msgid "&sourceslist-list-format;"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><literallayout>
+#: sources.list.5.xml:190
+#, no-wrap
+msgid "&sourceslist-sources-format;"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:130
+#: sources.list.5.xml:186
msgid ""
-"<literal>options</literal> is always optional and needs to be surrounded by "
-"square brackets. It can consist of multiple settings in the form "
-"<literal><replaceable>setting</replaceable>=<replaceable>value</replaceable></literal>. "
-"Multiple settings are separated by spaces. The following settings are "
-"supported by APT (note however that unsupported settings will be ignored "
-"silently):"
+"As an example, the sources for your distribution could look like this in one "
+"line style format: <placeholder type=\"literallayout\" id=\"0\"/> or like "
+"this in deb822 style format: <placeholder type=\"literallayout\" id=\"1\"/>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><title>
+#: sources.list.5.xml:193
+msgid "The deb and deb-src types: Options"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml:194
+msgid ""
+"Each source entry can have options specified modifying which and how the "
+"source is accessed and data acquired from it. Format, syntax and names of "
+"the options varies between the two formats one line and deb822 style as "
+"described, but they have both the same options available. For simplicity we "
+"list the deb822 fieldname and provide the one line name in brackets. "
+"Remember that beside setting multivalue options explicitly, there is also "
+"the option to modify them based on the default, but we aren't listing those "
+"names explicitly here. Unsupported options are silently ignored by all APT "
+"versions."
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:136
+#: sources.list.5.xml:205
msgid ""
-"<literal>arch=<replaceable>arch1</replaceable>,<replaceable>arch2</replaceable>,…</literal> "
-"can be used to specify for which architectures information should be "
-"downloaded. If this option is not set all architectures defined by the "
-"<literal>APT::Architectures</literal> option will be downloaded."
+"<option>Architectures</option> (<option>arch</option>) is a multivalue "
+"option defining for which architectures information should be downloaded. If "
+"this option isn't set the default is all architectures as defined by the "
+"<option>APT::Architectures</option> config option."
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:140
+#: sources.list.5.xml:212
msgid ""
-"<literal>arch+=<replaceable>arch1</replaceable>,<replaceable>arch2</replaceable>,…</literal> "
-"and "
-"<literal>arch-=<replaceable>arch1</replaceable>,<replaceable>arch2</replaceable>,…</literal> "
-"which can be used to add/remove architectures from the set which will be "
-"downloaded."
+"<option>Languages</option> (<option>lang</option>) is a multivalue option "
+"defining for which languages information like translated package "
+"descriptions should be downloaded. If this option isn't set the default is "
+"all languages as defined by the <option>Acquire::Languages</option> config "
+"option."
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: sources.list.5.xml:143
+#: sources.list.5.xml:220
msgid ""
-"<literal>trusted=yes</literal> can be set to indicate that packages from "
-"this source are always authenticated even if the "
-"<filename>Release</filename> file is not signed or the signature can't be "
-"checked. This disables parts of &apt-secure; and should therefore only be "
-"used in a local and trusted context. <literal>trusted=no</literal> is the "
-"opposite which handles even correctly authenticated sources as not "
-"authenticated."
+"<option>Targets</option> (<option>target</option>) is a multivalue option "
+"defining which download targets apt will try to acquire from this source. If "
+"not specified, the default set is defined by the "
+"<option>Acquire::IndexTargets</option> configuration scope."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:150
+#: sources.list.5.xml:228
msgid ""
-"It is important to list sources in order of preference, with the most "
-"preferred source listed first. Typically this will result in sorting by "
-"speed from fastest to slowest (CD-ROM followed by hosts on a local network, "
-"followed by distant Internet hosts, for example)."
+"Further more, there are options which if set effect <emphasis>all</emphasis> "
+"sources with the same URI and Suite, so they have to be set on all such "
+"entries and can not be varied between different components. APT will try to "
+"detect and error out on such anomalies."
msgstr ""
-#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:155
-msgid "Some examples:"
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml:235
+msgid ""
+"<option>Signed-By</option> (<option>signed-by</option>) is either an "
+"absolute path to a keyring file (has to be accessible and readable for the "
+"<literal>_apt</literal> user, so ensure everyone has read-permissions on the "
+"file) or a fingerprint of a key in either the "
+"<filename>trusted.gpg</filename> keyring or in one of the keyrings in the "
+"<filename>trusted.gpg.d/</filename> directory (see <command>apt-key "
+"fingerprint</command>). If the option is set only the key(s) in this keyring "
+"or only the key with this fingerprint is used for the &apt-secure; "
+"verification of this repository. Otherwise all keys in the trusted keyrings "
+"are considered valid signers for this repository."
msgstr ""
-#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:157
-#, no-wrap
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml:249
msgid ""
-"deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
-"deb http://security.debian.org/ &stable-codename;/updates main contrib "
-"non-free\n"
-" "
+"<option>Check-Valid-Until</option> (<option>check-valid-until</option>) is "
+"a yes/no value which controls if APT should try to detect replay attacks. A "
+"repository creator can declare until then the data provided in the "
+"repository should be considered valid and if this time is reached, but no "
+"new data is provided the data is considered expired and an error is raised. "
+"Beside increasing security as a malicious attacker can't sent old data "
+"forever denying a user to be able to upgrade to a new version, this also "
+"helps users identify mirrors which are no longer updated. Some repositories "
+"like historic archives aren't updated anymore by design through, so this "
+"check can be disabled by setting this option to <literal>no</literal>. "
+"Defaults to the value of configuration option "
+"<option>Acquire::Check-Valid-Until</option> which itself defaults to "
+"<literal>yes</literal>."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
+#: sources.list.5.xml:266
+msgid ""
+"<option>Valid-Until-Min</option> (<option>check-valid-min</option>) and "
+"<option>Valid-Until-Max</option> (<option>valid-until-max</option>) can be "
+"used to raise or lower the time period in seconds in which the data from "
+"this repository is considered valid. -Max can be especially useful if the "
+"repository provides no Valid-Until field on its Release file to set your own "
+"value, while -Min can be used to increase the valid time on seldomly updated "
+"(local) mirrors of a more frequently updated but less accessible archive "
+"(which is in the sources.list as well) instead of disabling the check "
+"entirely. Default to the value of the configuration options "
+"<option>Acquire::Min-ValidTime</option> and "
+"<option>Acquire::Max-ValidTime</option> which are both unset by default."
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: sources.list.5.xml:163
+#: sources.list.5.xml:288
msgid "URI specification"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:165
+#: sources.list.5.xml:290
msgid "The currently recognized URI types are:"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:169
+#: sources.list.5.xml:294
msgid ""
"The file scheme allows an arbitrary directory in the file system to be "
"considered an archive. This is useful for NFS mounts and local mirrors or "
@@ -5066,7 +5373,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:176
+#: sources.list.5.xml:301
msgid ""
"The cdrom scheme allows APT to use a local CD-ROM drive with media "
"swapping. Use the &apt-cdrom; program to create cdrom entries in the source "
@@ -5074,7 +5381,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:183
+#: sources.list.5.xml:308
msgid ""
"The http scheme specifies an HTTP server for the archive. If an environment "
"variable <envar>http_proxy</envar> is set with the format "
@@ -5085,7 +5392,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:194
+#: sources.list.5.xml:319
msgid ""
"The ftp scheme specifies an FTP server for the archive. APT's FTP behavior "
"is highly configurable; for more information see the &apt-conf; manual "
@@ -5098,7 +5405,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:206
+#: sources.list.5.xml:331
msgid ""
"The copy scheme is identical to the file scheme except that packages are "
"copied into the cache directory instead of used directly at their location. "
@@ -5107,7 +5414,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:213
+#: sources.list.5.xml:338
msgid ""
"The rsh/ssh method invokes RSH/SSH to connect to a remote host and access "
"the files as a given user. Prior configuration of rhosts or RSA keys is "
@@ -5116,12 +5423,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: sources.list.5.xml:220
+#: sources.list.5.xml:345
msgid "adding more recognizable URI types"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml:222
+#: sources.list.5.xml:347
msgid ""
"APT can be extended with more methods shipped in other optional packages, "
"which should follow the naming scheme "
@@ -5133,42 +5440,72 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:234
+#: sources.list.5.xml:359
msgid ""
-"Uses the archive stored locally (or NFS mounted) at /home/jason/debian for "
+"Uses the archive stored locally (or NFS mounted) at /home/apt/debian for "
"stable/main, stable/contrib, and stable/non-free."
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:236
+#: sources.list.5.xml:361
+#, no-wrap
+msgid "deb file:/home/apt/debian stable main contrib non-free"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><literallayout>
+#: sources.list.5.xml:362
#, no-wrap
-msgid "deb file:/home/jason/debian stable main contrib non-free"
+msgid ""
+"Types: deb\n"
+"URIs: file:/home/apt/debian\n"
+"Suites: stable\n"
+"Components: main contrib non-free"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:238
+#: sources.list.5.xml:367
msgid "As above, except this uses the unstable (development) distribution."
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:239
+#: sources.list.5.xml:368
#, no-wrap
-msgid "deb file:/home/jason/debian unstable main contrib non-free"
+msgid "deb file:/home/apt/debian unstable main contrib non-free"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><literallayout>
+#: sources.list.5.xml:369
+#, no-wrap
+msgid ""
+"Types: deb\n"
+"URIs: file:/home/apt/debian\n"
+"Suites: unstable\n"
+"Components: main contrib non-free"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:241
+#: sources.list.5.xml:374
msgid "Source line for the above"
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:242
+#: sources.list.5.xml:375
+#, no-wrap
+msgid "deb-src file:/home/apt/debian unstable main contrib non-free"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><literallayout>
+#: sources.list.5.xml:376
#, no-wrap
-msgid "deb-src file:/home/jason/debian unstable main contrib non-free"
+msgid ""
+"Types: deb-src\n"
+"URIs: file:/home/apt/debian\n"
+"Suites: unstable\n"
+"Components: main contrib non-free"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:244
+#: sources.list.5.xml:382
msgid ""
"The first line gets package information for the architectures in "
"<literal>APT::Architectures</literal> while the second always retrieves "
@@ -5176,41 +5513,78 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:246
+#: sources.list.5.xml:384
#, no-wrap
msgid ""
-"deb http://ftp.debian.org/debian &stable-codename; main\n"
-"deb [ arch=amd64,armel ] http://ftp.debian.org/debian &stable-codename; main"
+"deb http://httpredir.debian.org/debian &stable-codename; main\n"
+"deb [ arch=amd64,armel ] http://httpredir.debian.org/debian "
+"&stable-codename; main"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><literallayout>
+#: sources.list.5.xml:386
+#, no-wrap
+msgid ""
+"Types: deb\n"
+"URIs: http://httpredir.debian.org/debian\n"
+"Suites: &stable-codename;\n"
+"Components: main\n"
+"\n"
+"Types: deb\n"
+"URIs: http://httpredir.debian.org/debian\n"
+"Suites: &stable-codename;\n"
+"Components: main\n"
+"Architectures: amd64 armel\n"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:249
+#: sources.list.5.xml:398
msgid ""
"Uses HTTP to access the archive at archive.debian.org, and uses only the "
"hamm/main area."
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:251
+#: sources.list.5.xml:400
#, no-wrap
msgid "deb http://archive.debian.org/debian-archive hamm main"
msgstr ""
+#. type: Content of: <refentry><refsect1><literallayout>
+#: sources.list.5.xml:401
+#, no-wrap
+msgid ""
+"Types: deb\n"
+"URIs: http://archive.debian.org/debian-archive\n"
+"Suites: hamm\n"
+"Components: main"
+msgstr ""
+
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:253
+#: sources.list.5.xml:406
msgid ""
"Uses FTP to access the archive at ftp.debian.org, under the debian "
"directory, and uses only the &stable-codename;/contrib area."
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:255
+#: sources.list.5.xml:408
#, no-wrap
msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
msgstr ""
+#. type: Content of: <refentry><refsect1><literallayout>
+#: sources.list.5.xml:409
+#, no-wrap
+msgid ""
+"Types: deb\n"
+"URIs: ftp://ftp.debian.org/debian\n"
+"Suites: &stable-codename;\n"
+"Components: contrib"
+msgstr ""
+
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:257
+#: sources.list.5.xml:414
msgid ""
"Uses FTP to access the archive at ftp.debian.org, under the debian "
"directory, and uses only the unstable/contrib area. If this line appears as "
@@ -5219,19 +5593,38 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><literallayout>
-#: sources.list.5.xml:261
+#: sources.list.5.xml:418
#, no-wrap
msgid "deb ftp://ftp.debian.org/debian unstable contrib"
msgstr ""
+#. type: Content of: <refentry><refsect1><literallayout>
+#: sources.list.5.xml:419
+#, no-wrap
+msgid ""
+"Types: deb\n"
+"URIs: ftp://ftp.debian.org/debian\n"
+"Suites: unstable\n"
+"Components: contrib"
+msgstr ""
+
#. type: Content of: <refentry><refsect1><para><literallayout>
-#: sources.list.5.xml:270
+#: sources.list.5.xml:431
#, no-wrap
msgid "deb http://ftp.tlh.debian.org/universe unstable/binary-$(ARCH)/"
msgstr ""
+#. type: Content of: <refentry><refsect1><para><literallayout>
+#: sources.list.5.xml:432
+#, no-wrap
+msgid ""
+"Types: deb\n"
+"URIs: http://ftp.tlh.debian.org/universe\n"
+"Suites: unstable/binary-$(ARCH)/"
+msgstr ""
+
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:263
+#: sources.list.5.xml:424
msgid ""
"Uses HTTP to access the archive at ftp.tlh.debian.org, under the universe "
"directory, and uses only files found under "
@@ -5239,12 +5632,42 @@ msgid ""
"<filename>unstable/binary-amd64</filename> on amd64, and so forth for other "
"supported architectures. [Note this example only illustrates how to use the "
"substitution variable; official debian archives are not structured like "
-"this] <placeholder type=\"literallayout\" id=\"0\"/>"
+"this] <placeholder type=\"literallayout\" id=\"0\"/> <placeholder "
+"type=\"literallayout\" id=\"1\"/>"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: sources.list.5.xml:437
+msgid ""
+"Uses HTTP to get binary packages as well as sources from the stable, testing "
+"and unstable suites and the components main and contrib."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><literallayout>
+#: sources.list.5.xml:439
+#, no-wrap
+msgid ""
+"deb http://httpredir.debian.org/debian stable main contrib\n"
+"deb-src http://httpredir.debian.org/debian stable main contrib\n"
+"deb http://httpredir.debian.org/debian testing main contrib\n"
+"deb-src http://httpredir.debian.org/debian testing main contrib\n"
+"deb http://httpredir.debian.org/debian unstable main contrib\n"
+"deb-src http://httpredir.debian.org/debian unstable main contrib"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><literallayout>
+#: sources.list.5.xml:445
+#, no-wrap
+msgid ""
+"Types: deb deb-src\n"
+"URIs: http://httpredir.debian.org/debian\n"
+"Suites: stable testing unstable\n"
+"Components: main contrib\n"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: sources.list.5.xml:275
-msgid "&apt-cache; &apt-conf;"
+#: sources.list.5.xml:454
+msgid "&apt-get;, &apt-conf;"
msgstr ""
#. type: Content of: <refentry><refmeta><manvolnum>