summaryrefslogtreecommitdiff
path: root/doc/po/apt-doc.pot
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2012-05-22 16:07:49 +0200
committerMichael Vogt <michael.vogt@ubuntu.com>2012-05-22 16:07:49 +0200
commit800694cbf33e206935dc9e6e8fa6e9a036b8efad (patch)
tree1557d96ee0f463a020b11604146be66fb9809a31 /doc/po/apt-doc.pot
parent6c0c0387e616f8d04f00916fbd1fe899acd265cd (diff)
parent1351329e376a8dbe7780693693d0f3db0ec749fa (diff)
merged (and resolved a bunch of conflicts) of the debian-sid branch
Diffstat (limited to 'doc/po/apt-doc.pot')
-rw-r--r--doc/po/apt-doc.pot2983
1 files changed, 831 insertions, 2152 deletions
diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot
index fff943e35..68da38ba0 100644
--- a/doc/po/apt-doc.pot
+++ b/doc/po/apt-doc.pot
@@ -1,13 +1,14 @@
# SOME DESCRIPTIVE TITLE
# Copyright (C) YEAR Free Software Foundation, Inc.
-# This file is distributed under the same license as the PACKAGE package.
+# This file is distributed under the same license as the apt package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-11-10 16:42+0100\n"
+"Project-Id-Version: apt 0.9.5ubuntu1~20120522\n"
+"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
+"POT-Creation-Date: 2012-05-22 15:59+0300\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"
@@ -126,32 +127,7 @@ msgid "apt was written by the APT team E<lt>apt@packages.debian.orgE<gt>."
msgstr ""
#. type: Plain text
-#: apt.ent:2
-msgid "<!-- -*- mode: sgml; mode: fold -*- -->"
-msgstr ""
-
-#. type: Plain text
-#: apt.ent:16
-#, no-wrap
-msgid ""
-"<!-- Boiler plate docinfo section -->\n"
-"<!ENTITY apt-docinfo \"\n"
-" <refentryinfo>\n"
-" <address><email>apt@packages.debian.org</email></address>\n"
-" <author>\n"
-" <firstname>Jason</firstname> <surname>Gunthorpe</surname>\n"
-" <contrib></contrib>\n"
-" </author>\n"
-" <copyright><year>1998-2001</year> <holder>Jason "
-"Gunthorpe</holder></copyright>\n"
-" <date>28 October 2008</date>\n"
-" <productname>Linux</productname>\n"
-" </refentryinfo>\n"
-"\">\n"
-msgstr ""
-
-#. type: Plain text
-#: apt.ent:23
+#: apt.ent:7
#, no-wrap
msgid ""
"<!ENTITY apt-author.team \"\n"
@@ -163,7 +139,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: apt.ent:29
+#: apt.ent:13
#, no-wrap
msgid ""
"<!ENTITY apt-qapage \"\n"
@@ -174,7 +150,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: apt.ent:40
+#: apt.ent:24
#, no-wrap
msgid ""
"<!-- Boiler plate Bug reporting section -->\n"
@@ -190,7 +166,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: apt.ent:48
+#: apt.ent:32
#, no-wrap
msgid ""
"<!-- Boiler plate Author section -->\n"
@@ -204,7 +180,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: apt.ent:58
+#: apt.ent:42
#, no-wrap
msgid ""
"<!-- Should be used within the option section of the text to\n"
@@ -219,7 +195,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: apt.ent:66
+#: apt.ent:50
#, no-wrap
msgid ""
" <varlistentry>\n"
@@ -232,7 +208,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: apt.ent:78
+#: apt.ent:62
#, no-wrap
msgid ""
" <varlistentry>\n"
@@ -252,7 +228,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: apt.ent:90
+#: apt.ent:74
#, no-wrap
msgid ""
" <varlistentry>\n"
@@ -272,7 +248,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: apt.ent:101
+#: apt.ent:85
#, no-wrap
msgid ""
"<!-- Should be used within the option section of the text to\n"
@@ -289,7 +265,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: apt.ent:107
+#: apt.ent:91
#, no-wrap
msgid ""
"<!ENTITY file-aptconf \"\n"
@@ -301,7 +277,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: apt.ent:113
+#: apt.ent:97
#, no-wrap
msgid ""
" <varlistentry><term><filename>/etc/apt/apt.conf.d/</filename></term>\n"
@@ -313,7 +289,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: apt.ent:119
+#: apt.ent:103
#, no-wrap
msgid ""
"<!ENTITY file-cachearchives \"\n"
@@ -325,20 +301,21 @@ msgid ""
msgstr ""
#. type: Plain text
-#: apt.ent:125
+#: apt.ent:109
#, no-wrap
msgid ""
" "
"<varlistentry><term><filename>&cachedir;/archives/partial/</filename></term>\n"
" <listitem><para>Storage area for package files in transit.\n"
-" Configuration Item: <literal>Dir::Cache::Archives</literal> (implicit "
-"partial). </para></listitem>\n"
+" Configuration Item: <literal>Dir::Cache::Archives</literal> "
+"(<filename>partial</filename> will be implicitly "
+"appended). </para></listitem>\n"
" </varlistentry>\n"
"\">\n"
msgstr ""
#. type: Plain text
-#: apt.ent:135
+#: apt.ent:119
#, no-wrap
msgid ""
"<!ENTITY file-preferences \"\n"
@@ -354,7 +331,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: apt.ent:141
+#: apt.ent:125
#, no-wrap
msgid ""
" "
@@ -367,7 +344,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: apt.ent:147
+#: apt.ent:131
#, no-wrap
msgid ""
"<!ENTITY file-sourceslist \"\n"
@@ -379,7 +356,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: apt.ent:153
+#: apt.ent:137
#, no-wrap
msgid ""
" "
@@ -392,7 +369,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: apt.ent:160
+#: apt.ent:144
#, no-wrap
msgid ""
"<!ENTITY file-statelists \"\n"
@@ -406,20 +383,21 @@ msgid ""
msgstr ""
#. type: Plain text
-#: apt.ent:166
+#: apt.ent:150
#, no-wrap
msgid ""
" "
"<varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n"
" <listitem><para>Storage area for state information in transit.\n"
-" Configuration Item: <literal>Dir::State::Lists</literal> (implicit "
-"partial).</para></listitem>\n"
+" Configuration Item: <literal>Dir::State::Lists</literal> "
+"(<filename>partial</filename> will be implicitly "
+"appended).</para></listitem>\n"
" </varlistentry>\n"
"\">\n"
msgstr ""
#. type: Plain text
-#: apt.ent:172
+#: apt.ent:156
#, no-wrap
msgid ""
"<!ENTITY file-trustedgpg \"\n"
@@ -432,7 +410,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: apt.ent:179
+#: apt.ent:163
#, no-wrap
msgid ""
" "
@@ -447,7 +425,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: apt.ent:187
+#: apt.ent:171
#, no-wrap
msgid ""
"<!ENTITY file-extended_states \"\n"
@@ -461,7 +439,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: apt.ent:191
+#: apt.ent:175
#, no-wrap
msgid ""
"<!-- TRANSLATOR: This is the section header for the following paragraphs - "
@@ -472,7 +450,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: apt.ent:200
+#: apt.ent:184
#, no-wrap
msgid ""
"<!-- TRANSLATOR: This is a placeholder. You should write here who has "
@@ -491,7 +469,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: apt.ent:210
+#: apt.ent:195
#, no-wrap
msgid ""
"<!-- TRANSLATOR: As a translation is allowed to have 20% of "
@@ -510,26 +488,130 @@ msgid ""
"\">\n"
msgstr ""
-#. The last update date
-#. type: Content of: <refentry><refentryinfo>
-#: apt-cache.8.xml:16
+#. type: Plain text
+#: apt.ent:198
msgid ""
-"&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>04 "
-"February 2011</date>"
+"<!-- TRANSLATOR: used as in -o=config_string "
+"e.g. -o=Debug::pkgProblemResolver=1 --> <!ENTITY synopsis-config-string "
+"\"config_string\">"
msgstr ""
-#. type: Content of: <refentry><refnamediv><refname>
-#: apt-cache.8.xml:25 apt-cache.8.xml:32
-msgid "apt-cache"
+#. type: Plain text
+#: apt.ent:201
+msgid ""
+"<!-- TRANSLATOR: used as in -c=config_file e.g. -c=./apt.conf --> <!ENTITY "
+"synopsis-config-file \"config_file\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:204
+msgid ""
+"<!-- TRANSLATOR: used as in -t=target_release or pkg/target_release "
+"e.g. -t=squeeze apt/experimental --> <!ENTITY synopsis-target-release "
+"\"target_release\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:207
+msgid ""
+"<!-- TRANSLATOR: used as in -a=architecture e.g. -a=armel --> <!ENTITY "
+"synopsis-architecture \"architecture\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:210
+msgid ""
+"<!-- TRANSLATOR: used as in apt-get install pkg e.g. apt-get install awesome "
+"--> <!ENTITY synopsis-pkg \"pkg\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:213
+msgid ""
+"<!-- TRANSLATOR: used as in pkg=pkg_version_number e.g. apt=0.8.15 --> "
+"<!ENTITY synopsis-pkg-ver-number \"pkg_version_number\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:216
+msgid ""
+"<!-- TRANSLATOR: used as in apt-cache pkgnames prefix e.g. apt-cache "
+"pkgnames apt --> <!ENTITY synopsis-prefix \"prefix\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:219
+msgid ""
+"<!-- TRANSLATOR: used as in apt-cache search regex e.g. apt-cache search "
+"awesome --> <!ENTITY synopsis-regex \"regex\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:222
+msgid ""
+"<!-- TRANSLATOR: used as in apt-cdrom -d=cdrom_mount_point e.g. apt-cdrom "
+"-d=/media/cdrom --> <!ENTITY synopsis-cdrom-mount \"cdrom_mount_point\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:225
+msgid ""
+"<!-- TRANSLATOR: used as in apt-extracttemplates -t=temporary_directory "
+"e.g. apt-extracttemplates -t=/tmp --> <!ENTITY synopsis-tmp-directory "
+"\"temporary_directory\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:228
+msgid ""
+"<!-- TRANSLATOR: used as in apt-extracttemplates filename --> <!ENTITY "
+"synopsis-filename \"filename\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:231
+msgid ""
+"<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
+"packages path override-file pathprefix --> <!ENTITY synopsis-path \"path\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:234
+msgid ""
+"<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
+"packages path override-file pathprefix --> <!ENTITY synopsis-override "
+"\"override-file\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:237
+msgid ""
+"<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
+"packages path override-file pathprefix --> <!ENTITY synopsis-pathprefix "
+"\"pathprefix\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:240
+msgid ""
+"<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
+"generate section --> <!ENTITY synopsis-section \"section\">"
+msgstr ""
+
+#. type: Plain text
+#: apt.ent:243
+msgid ""
+"<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export "
+"473041FA --> <!ENTITY synopsis-keyid \"keyid\">"
msgstr ""
#. type: Content of: <refentry><refmeta><manvolnum>
-#: apt-cache.8.xml:26 apt-cdrom.8.xml:25 apt-config.8.xml:26 apt-get.8.xml:26 apt-key.8.xml:18 apt-mark.8.xml:26 apt-secure.8.xml:18
+#: apt-cache.8.xml:26 apt-cdrom.8.xml:25 apt-config.8.xml:26 apt-get.8.xml:26 apt-key.8.xml:25 apt-mark.8.xml:26 apt-secure.8.xml:25
msgid "8"
msgstr ""
#. type: Content of: <refentry><refmeta><refmiscinfo>
-#: apt-cache.8.xml:27 apt-cdrom.8.xml:26 apt-config.8.xml:27 apt-extracttemplates.1.xml:27 apt-ftparchive.1.xml:27 apt-get.8.xml:27 apt-key.8.xml:19 apt-mark.8.xml:27 apt-secure.8.xml:19 apt-sortpkgs.1.xml:27 apt.conf.5.xml:33 apt_preferences.5.xml:26 sources.list.5.xml:27
+#: apt-cache.8.xml:27 apt-cdrom.8.xml:26 apt-config.8.xml:27 apt-extracttemplates.1.xml:27 apt-ftparchive.1.xml:27 apt-get.8.xml:27 apt-key.8.xml:26 apt-mark.8.xml:27 apt-secure.8.xml:26 apt-sortpkgs.1.xml:27 apt.conf.5.xml:32 apt_preferences.5.xml:26 sources.list.5.xml:27
msgid "APT"
msgstr ""
@@ -538,40 +620,13 @@ msgstr ""
msgid "query the APT cache"
msgstr ""
-#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-cache.8.xml:39
-msgid ""
-"<command>apt-cache</command> <arg><option>-hvsn</option></arg> "
-"<arg><option>-o=<replaceable>config string</replaceable></option></arg> "
-"<arg><option>-c=<replaceable>file</replaceable></option></arg> <group "
-"choice=\"req\"> <arg>gencaches</arg> <arg>showpkg <arg choice=\"plain\" "
-"rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg>showsrc <arg "
-"choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> "
-"<arg>stats</arg> <arg>dump</arg> <arg>dumpavail</arg> <arg>unmet</arg> "
-"<arg>search <arg "
-"choice=\"plain\"><replaceable>regex</replaceable></arg></arg> <arg>show <arg "
-"choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> "
-"<arg>depends <arg choice=\"plain\" "
-"rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg>rdepends <arg "
-"choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> "
-"<arg>pkgnames <arg "
-"choice=\"plain\"><replaceable>prefix</replaceable></arg></arg> <arg>dotty "
-"<arg choice=\"plain\" "
-"rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg>xvcg <arg "
-"choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> "
-"<arg>policy <arg choice=\"plain\" "
-"rep=\"repeat\"><replaceable>pkgs</replaceable></arg></arg> <arg>madison <arg "
-"choice=\"plain\" rep=\"repeat\"><replaceable>pkgs</replaceable></arg></arg> "
-"</group>"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:64 apt-cdrom.8.xml:50 apt-config.8.xml:50 apt-extracttemplates.1.xml:46 apt-ftparchive.1.xml:59 apt-get.8.xml:121 apt-key.8.xml:38 apt-mark.8.xml:56 apt-secure.8.xml:43 apt-sortpkgs.1.xml:47 apt.conf.5.xml:42 apt_preferences.5.xml:36 sources.list.5.xml:36
+#: apt-cache.8.xml:38 apt-cdrom.8.xml:37 apt-config.8.xml:38 apt-extracttemplates.1.xml:38 apt-ftparchive.1.xml:38 apt-get.8.xml:38 apt-key.8.xml:37 apt-mark.8.xml:38 apt-secure.8.xml:50 apt-sortpkgs.1.xml:38 apt.conf.5.xml:41 apt_preferences.5.xml:36 sources.list.5.xml:36
msgid "Description"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:65
+#: apt-cache.8.xml:39
msgid ""
"<command>apt-cache</command> performs a variety of operations on APT's "
"package cache. <command>apt-cache</command> does not manipulate the state of "
@@ -580,32 +635,26 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:70 apt-get.8.xml:127
+#: apt-cache.8.xml:44 apt-get.8.xml:44
msgid ""
"Unless the <option>-h</option>, or <option>--help</option> option is given, "
"one of the commands below must be present."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:74
-msgid "gencaches"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:75
+#: apt-cache.8.xml:49
msgid ""
-"<literal>gencaches</literal> performs the same operation as <command>apt-get "
-"check</command>. It builds the source and package caches from the sources in "
-"&sources-list; and from <filename>/var/lib/dpkg/status</filename>."
+"<literal>gencaches</literal> creates APT's package cache. This is done "
+"implicitly by all commands needing this cache if it is missing or outdated."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:81
-msgid "showpkg <replaceable>pkg(s)</replaceable>"
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
+#: apt-cache.8.xml:53 apt-cache.8.xml:142 apt-cache.8.xml:163 apt-cache.8.xml:187 apt-cache.8.xml:192 apt-cache.8.xml:208 apt-cache.8.xml:226 apt-cache.8.xml:238
+msgid "&synopsis-pkg;"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:82
+#: apt-cache.8.xml:54
msgid ""
"<literal>showpkg</literal> displays information about the packages listed on "
"the command line. Remaining arguments are package names. The available "
@@ -619,7 +668,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>
-#: apt-cache.8.xml:94
+#: apt-cache.8.xml:66
#, no-wrap
msgid ""
"Package: libreadline2\n"
@@ -635,7 +684,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:106
+#: apt-cache.8.xml:78
msgid ""
"Thus it may be seen that libreadline2, version 2.1-12, depends on libc5 and "
"ncurses3.0 which must be installed for libreadline2 to work. In turn, "
@@ -646,27 +695,22 @@ msgid ""
"best to consult the apt source code."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:115
-msgid "stats"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:115
+#: apt-cache.8.xml:87
msgid ""
"<literal>stats</literal> displays some statistics about the cache. No "
"further arguments are expected. Statistics reported are:"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:118
+#: apt-cache.8.xml:90
msgid ""
"<literal>Total package names</literal> is the number of package names found "
"in the cache."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:122
+#: apt-cache.8.xml:94
msgid ""
"<literal>Normal packages</literal> is the number of regular, ordinary "
"package names; these are packages that bear a one-to-one correspondence "
@@ -675,7 +719,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:128
+#: apt-cache.8.xml:100
msgid ""
"<literal>Pure virtual packages</literal> is the number of packages that "
"exist only as a virtual package name; that is, packages only \"provide\" the "
@@ -686,7 +730,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:136
+#: apt-cache.8.xml:108
msgid ""
"<literal>Single virtual packages</literal> is the number of packages with "
"only one package providing a particular virtual package. For example, in the "
@@ -695,7 +739,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:142
+#: apt-cache.8.xml:114
msgid ""
"<literal>Mixed virtual packages</literal> is the number of packages that "
"either provide a particular virtual package or have the virtual package name "
@@ -705,7 +749,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:149
+#: apt-cache.8.xml:121
msgid ""
"<literal>Missing</literal> is the number of package names that were "
"referenced in a dependency but were not provided by any package. Missing "
@@ -715,7 +759,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:156
+#: apt-cache.8.xml:128
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 "
@@ -725,81 +769,56 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
-#: apt-cache.8.xml:163
+#: apt-cache.8.xml:135
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><term>
-#: apt-cache.8.xml:170
-msgid "showsrc <replaceable>pkg(s)</replaceable>"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:171
+#: apt-cache.8.xml:143
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."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:176 apt-config.8.xml:87
-msgid "dump"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:177
+#: apt-cache.8.xml:149
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><term>
-#: apt-cache.8.xml:181
-msgid "dumpavail"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:182
+#: apt-cache.8.xml:154
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><term>
-#: apt-cache.8.xml:186
-msgid "unmet"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:187
+#: apt-cache.8.xml:159
msgid ""
"<literal>unmet</literal> displays a summary of all unmet dependencies in the "
"package cache."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:191
-msgid "show <replaceable>pkg(s)</replaceable>"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:192
+#: apt-cache.8.xml:164
msgid ""
"<literal>show</literal> performs a function similar to <command>dpkg "
"--print-avail</command>; it displays the package records for the named "
"packages."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:197
-msgid "search <replaceable>regex [ regex ... ]</replaceable>"
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
+#: apt-cache.8.xml:169
+msgid "&synopsis-regex;"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:198
+#: apt-cache.8.xml:170
msgid ""
"<literal>search</literal> performs a full text search on all available "
"package lists for the POSIX regex pattern given, see "
@@ -814,43 +833,33 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:211
+#: apt-cache.8.xml:183
msgid ""
"Separate arguments can be used to specify multiple search patterns that are "
"and'ed together."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:215
-msgid "depends <replaceable>pkg(s)</replaceable>"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:216
+#: apt-cache.8.xml:188
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><term>
-#: apt-cache.8.xml:220
-msgid "rdepends <replaceable>pkg(s)</replaceable>"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:221
+#: apt-cache.8.xml:193
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:225
-msgid "pkgnames <replaceable>[ prefix ]</replaceable>"
+#: apt-cache.8.xml:197
+msgid "<optional><replaceable>&synopsis-prefix;</replaceable></optional>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:226
+#: apt-cache.8.xml:198
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 "
@@ -860,20 +869,15 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:231
+#: apt-cache.8.xml:203
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 "
"the generated list."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:236
-msgid "dotty <replaceable>pkg(s)</replaceable>"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:237
+#: apt-cache.8.xml:209
msgid ""
"<literal>dotty</literal> takes a list of packages on the command line and "
"generates output suitable for use by dotty from the <ulink "
@@ -886,7 +890,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:246
+#: apt-cache.8.xml:218
msgid ""
"The resulting nodes will have several shapes; normal packages are boxes, "
"pure provides are triangles, mixed provides are diamonds, missing packages "
@@ -895,17 +899,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:251
+#: apt-cache.8.xml:223
msgid "Caution, dotty cannot graph larger sets of packages."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:254
-msgid "xvcg <replaceable>pkg(s)</replaceable>"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:255
+#: apt-cache.8.xml:227
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 "
@@ -913,12 +912,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:259
-msgid "policy <replaceable>[ pkg(s) ]</replaceable>"
+#: apt-cache.8.xml:231
+msgid "<optional><replaceable>&synopsis-pkg;</replaceable>…</optional>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:260
+#: apt-cache.8.xml:232
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 "
@@ -926,13 +925,8 @@ msgid ""
"selection of the named package."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:266
-msgid "madison <replaceable>[ pkg(s) ]</replaceable>"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:267
+#: apt-cache.8.xml:239
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 "
@@ -943,41 +937,21 @@ msgid ""
"(<literal>APT::Architecture</literal>)."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:278 apt-config.8.xml:96 apt-extracttemplates.1.xml:59 apt-ftparchive.1.xml:525 apt-get.8.xml:342 apt-mark.8.xml:126 apt-sortpkgs.1.xml:57 apt.conf.5.xml:577 apt.conf.5.xml:599
+#. type: Content of: <refentry><refsect1><title>
+#: apt-cache.8.xml:250 apt-config.8.xml:84 apt-extracttemplates.1.xml:52 apt-ftparchive.1.xml:504 apt-get.8.xml:259 apt-mark.8.xml:108 apt-sortpkgs.1.xml:48
msgid "options"
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:282
-msgid "<option>-p</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:282
-msgid "<option>--pkg-cache</option>"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:283
+#: apt-cache.8.xml:255
msgid ""
"Select the file to store the package cache. The package cache is the primary "
"cache used by all operations. Configuration Item: "
"<literal>Dir::Cache::pkgcache</literal>."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:288 apt-ftparchive.1.xml:572 apt-get.8.xml:404 apt-sortpkgs.1.xml:61
-msgid "<option>-s</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:288
-msgid "<option>--src-cache</option>"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:289
+#: apt-cache.8.xml:261
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 "
@@ -986,18 +960,8 @@ msgid ""
"Item: <literal>Dir::Cache::srcpkgcache</literal>."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:394
-msgid "<option>-q</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:296 apt-ftparchive.1.xml:546 apt-get.8.xml:394
-msgid "<option>--quiet</option>"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:297
+#: apt-cache.8.xml:269
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 "
@@ -1005,66 +969,16 @@ msgid ""
"configuration file. Configuration Item: <literal>quiet</literal>."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:303
-msgid "<option>-i</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:303
-msgid "<option>--important</option>"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:304
+#: apt-cache.8.xml:276
msgid ""
"Print only important dependencies; for use with unmet and depends. Causes "
"only Depends and Pre-Depends relations to be printed. Configuration Item: "
"<literal>APT::Cache::Important</literal>."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:309
-msgid "<option>--no-pre-depends</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:310
-msgid "<option>--no-depends</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:311
-msgid "<option>--no-recommends</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:312
-msgid "<option>--no-suggests</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:313
-msgid "<option>--no-conflicts</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:314
-msgid "<option>--no-breaks</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:315
-msgid "<option>--no-replaces</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:316
-msgid "<option>--no-enhances</option>"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:317
+#: apt-cache.8.xml:289
msgid ""
"Per default the <literal>depends</literal> and <literal>rdepends</literal> "
"print all dependencies. This can be tweaked with these flags which will omit "
@@ -1073,35 +987,15 @@ msgid ""
"e.g. <literal>APT::Cache::ShowRecommends</literal>."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:323 apt-cdrom.8.xml:124 apt-get.8.xml:361
-msgid "<option>-f</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:323
-msgid "<option>--full</option>"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:324
+#: apt-cache.8.xml:296
msgid ""
"Print full package records when searching. Configuration Item: "
"<literal>APT::Cache::ShowFull</literal>."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:328 apt-cdrom.8.xml:134 apt-ftparchive.1.xml:584 apt-get.8.xml:452
-msgid "<option>-a</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:328
-msgid "<option>--all-versions</option>"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:329
+#: apt-cache.8.xml:301
msgid ""
"Print full records for all available versions. This is the default; to turn "
"it off, use <option>--no-all-versions</option>. If "
@@ -1111,18 +1005,8 @@ msgid ""
"Configuration Item: <literal>APT::Cache::AllVersions</literal>."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:337
-msgid "<option>-g</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:337
-msgid "<option>--generate</option>"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:338
+#: apt-cache.8.xml:310
msgid ""
"Perform automatic package cache regeneration, rather than use the cache as "
"it is. This is the default; to turn it off, use "
@@ -1130,56 +1014,31 @@ msgid ""
"<literal>APT::Cache::Generate</literal>."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:343
-msgid "<option>--names-only</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:343 apt-cdrom.8.xml:142
-msgid "<option>-n</option>"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:344
+#: apt-cache.8.xml:316
msgid ""
"Only search on the package names, not the long descriptions. Configuration "
"Item: <literal>APT::Cache::NamesOnly</literal>."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:348
-msgid "<option>--all-names</option>"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:349
+#: apt-cache.8.xml:321
msgid ""
"Make <literal>pkgnames</literal> print all names, including virtual packages "
"and missing dependencies. Configuration Item: "
"<literal>APT::Cache::AllNames</literal>."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:354
-msgid "<option>--recurse</option>"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:355
+#: apt-cache.8.xml:327
msgid ""
"Make <literal>depends</literal> and <literal>rdepends</literal> recursive so "
"that all packages mentioned are printed once. Configuration Item: "
"<literal>APT::Cache::RecurseDepends</literal>."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:360
-msgid "<option>--installed</option>"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:362
+#: apt-cache.8.xml:334
msgid ""
"Limit the output of <literal>depends</literal> and "
"<literal>rdepends</literal> to packages which are currently installed. "
@@ -1187,71 +1046,49 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-cache.8.xml:367 apt-cdrom.8.xml:153 apt-config.8.xml:101 apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:612 apt-get.8.xml:596 apt-mark.8.xml:140 apt-sortpkgs.1.xml:67
+#: apt-cache.8.xml:339 apt-cdrom.8.xml:140 apt-config.8.xml:104 apt-extracttemplates.1.xml:63 apt-ftparchive.1.xml:591 apt-get.8.xml:514 apt-mark.8.xml:122 apt-sortpkgs.1.xml:58
msgid "&apt-commonoptions;"
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:372 apt-get.8.xml:601 apt-key.8.xml:175 apt-mark.8.xml:144 apt.conf.5.xml:1110 apt_preferences.5.xml:697
+#: apt-cache.8.xml:344 apt-get.8.xml:519 apt-key.8.xml:174 apt-mark.8.xml:126 apt.conf.5.xml:1118 apt_preferences.5.xml:698
msgid "Files"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-cache.8.xml:374
+#: apt-cache.8.xml:346
msgid "&file-sourceslist; &file-statelists;"
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:379 apt-cdrom.8.xml:158 apt-config.8.xml:106 apt-extracttemplates.1.xml:77 apt-ftparchive.1.xml:628 apt-get.8.xml:611 apt-key.8.xml:196 apt-mark.8.xml:150 apt-secure.8.xml:185 apt-sortpkgs.1.xml:72 apt.conf.5.xml:1116 apt_preferences.5.xml:704 sources.list.5.xml:255
+#: apt-cache.8.xml:351 apt-cdrom.8.xml:145 apt-config.8.xml:109 apt-extracttemplates.1.xml:70 apt-ftparchive.1.xml:607 apt-get.8.xml:529 apt-key.8.xml:195 apt-mark.8.xml:132 apt-secure.8.xml:192 apt-sortpkgs.1.xml:63 apt.conf.5.xml:1124 apt_preferences.5.xml:705 sources.list.5.xml:255
msgid "See Also"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:380
+#: apt-cache.8.xml:352
msgid "&apt-conf;, &sources-list;, &apt-get;"
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:384 apt-cdrom.8.xml:163 apt-config.8.xml:111 apt-extracttemplates.1.xml:81 apt-ftparchive.1.xml:632 apt-get.8.xml:617 apt-mark.8.xml:154 apt-sortpkgs.1.xml:76
+#: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:114 apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:611 apt-get.8.xml:535 apt-mark.8.xml:136 apt-sortpkgs.1.xml:67
msgid "Diagnostics"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:385
+#: apt-cache.8.xml:357
msgid ""
"<command>apt-cache</command> returns zero on normal operation, decimal 100 "
"on error."
msgstr ""
-#. type: Content of: <refentry><refentryinfo>
-#: apt-cdrom.8.xml:16
-msgid ""
-"&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>14 "
-"February 2004</date>"
-msgstr ""
-
-#. type: Content of: <refentry><refnamediv><refname>
-#: apt-cdrom.8.xml:24 apt-cdrom.8.xml:31
-msgid "apt-cdrom"
-msgstr ""
-
#. type: Content of: <refentry><refnamediv><refpurpose>
#: apt-cdrom.8.xml:32
msgid "APT CDROM management utility"
msgstr ""
-#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-cdrom.8.xml:38
-msgid ""
-"<command>apt-cdrom</command> <arg><option>-hvrmfan</option></arg> "
-"<arg><option>-d=<replaceable>cdrom mount point</replaceable></option></arg> "
-"<arg><option>-o=<replaceable>config string</replaceable></option></arg> "
-"<arg><option>-c=<replaceable>file</replaceable></option></arg> <group> "
-"<arg>add</arg> <arg>ident</arg> </group>"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:51
+#: apt-cdrom.8.xml:38
msgid ""
"<command>apt-cdrom</command> is used to add a new CDROM to APTs list of "
"available sources. <command>apt-cdrom</command> takes care of determining "
@@ -1260,20 +1097,15 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:58
+#: apt-cdrom.8.xml:45
msgid ""
"It is necessary to use <command>apt-cdrom</command> to add CDs to the APT "
"system, it cannot be done by hand. Furthermore each disk in a multi-cd set "
"must be inserted and scanned separately to account for possible mis-burns."
msgstr ""
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:68
-msgid "add"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:69
+#: apt-cdrom.8.xml:56
msgid ""
"<literal>add</literal> is used to add a new disc to the source list. It will "
"unmount the CDROM device, prompt for a disk to be inserted and then proceed "
@@ -1283,27 +1115,22 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:77
+#: apt-cdrom.8.xml:64
msgid ""
"APT uses a CDROM ID to track which disc is currently in the drive and "
"maintains a database of these IDs in "
"<filename>&statedir;/cdroms.list</filename>"
msgstr ""
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:84
-msgid "ident"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:85
+#: apt-cdrom.8.xml:72
msgid ""
"A debugging tool to report the identity of the current disc as well as the "
"stored file name"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:64
+#: apt-cdrom.8.xml:51
msgid ""
"Unless the <option>-h</option>, or <option>--help</option> option is given "
"one of the commands below must be present. <placeholder "
@@ -1311,71 +1138,36 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-cdrom.8.xml:94 apt-key.8.xml:161
+#: apt-cdrom.8.xml:81 apt-key.8.xml:160
msgid "Options"
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:98 apt-ftparchive.1.xml:540 apt-get.8.xml:356
-msgid "<option>-d</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:98
-msgid "<option>--cdrom</option>"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:99
+#: apt-cdrom.8.xml:86
msgid ""
"Mount point; specify the location to mount the cdrom. This mount point must "
"be listed in <filename>/etc/fstab</filename> and properly configured. "
"Configuration Item: <literal>Acquire::cdrom::mount</literal>."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:107
-msgid "<option>-r</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:107
-msgid "<option>--rename</option>"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:108
+#: apt-cdrom.8.xml:95
msgid ""
"Rename a disc; change the label of a disk or override the disks given "
"label. This option will cause <command>apt-cdrom</command> to prompt for a "
"new label. Configuration Item: <literal>APT::CDROM::Rename</literal>."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:116 apt-get.8.xml:375
-msgid "<option>-m</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:116
-msgid "<option>--no-mount</option>"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:117
+#: apt-cdrom.8.xml:104
msgid ""
"No mounting; prevent <command>apt-cdrom</command> from mounting and "
"unmounting the mount point. Configuration Item: "
"<literal>APT::CDROM::NoMount</literal>."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:124
-msgid "<option>--fast</option>"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:125
+#: apt-cdrom.8.xml:112
msgid ""
"Fast Copy; Assume the package files are valid and do not check every "
"package. This option should be used only if <command>apt-cdrom</command> has "
@@ -1383,36 +1175,16 @@ msgid ""
"Item: <literal>APT::CDROM::Fast</literal>."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:134
-msgid "<option>--thorough</option>"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:135
+#: apt-cdrom.8.xml:122
msgid ""
"Thorough Package Scan; This option may be needed with some old Debian "
"1.1/1.2 discs that have Package files in strange places. It takes much "
"longer to scan the CD but will pick them all up."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:143 apt-get.8.xml:406
-msgid "<option>--just-print</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:144 apt-get.8.xml:408
-msgid "<option>--recon</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cdrom.8.xml:145 apt-get.8.xml:409
-msgid "<option>--no-act</option>"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cdrom.8.xml:146
+#: apt-cdrom.8.xml:133
msgid ""
"No Changes; Do not change the &sources-list; file and do not write index "
"files. Everything is still checked however. Configuration Item: "
@@ -1420,46 +1192,24 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:159
+#: apt-cdrom.8.xml:146
msgid "&apt-conf;, &apt-get;, &sources-list;"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-cdrom.8.xml:164
+#: apt-cdrom.8.xml:151
msgid ""
"<command>apt-cdrom</command> returns zero on normal operation, decimal 100 "
"on error."
msgstr ""
-#. The last update date
-#. type: Content of: <refentry><refentryinfo>
-#: apt-config.8.xml:16 apt-extracttemplates.1.xml:16 apt-sortpkgs.1.xml:16 sources.list.5.xml:16
-msgid ""
-"&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>29 "
-"February 2004</date>"
-msgstr ""
-
-#. type: Content of: <refentry><refnamediv><refname>
-#: apt-config.8.xml:25 apt-config.8.xml:32
-msgid "apt-config"
-msgstr ""
-
#. type: Content of: <refentry><refnamediv><refpurpose>
#: apt-config.8.xml:33
msgid "APT Configuration Query program"
msgstr ""
-#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-config.8.xml:39
-msgid ""
-"<command>apt-config</command> <arg><option>-hv</option></arg> "
-"<arg><option>-o=<replaceable>config string</replaceable></option></arg> "
-"<arg><option>-c=<replaceable>file</replaceable></option></arg> <group "
-"choice=\"req\"> <arg>shell</arg> <arg>dump</arg> </group>"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:51
+#: apt-config.8.xml:39
msgid ""
"<command>apt-config</command> is an internal program used by various "
"portions of the APT suite to provide consistent configurability. It accesses "
@@ -1468,19 +1218,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:56 apt-ftparchive.1.xml:75
+#: apt-config.8.xml:44 apt-ftparchive.1.xml:54
msgid ""
"Unless the <option>-h</option>, or <option>--help</option> option is given "
"one of the commands below must be present."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-config.8.xml:61
-msgid "shell"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:63
+#: apt-config.8.xml:51
msgid ""
"shell is used to access the configuration information from a shell "
"script. It is given pairs of arguments, the first being a shell variable and "
@@ -1490,7 +1235,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting>
-#: apt-config.8.xml:71
+#: apt-config.8.xml:59
#, no-wrap
msgid ""
"OPTS=\"-f\"\n"
@@ -1499,14 +1244,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:76
+#: apt-config.8.xml:64
msgid ""
"This will set the shell environment variable $OPTS to the value of "
"MyApp::options with a default of <option>-f</option>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:80
+#: apt-config.8.xml:68
msgid ""
"The configuration item may be postfixed with a /[fdbi]. f returns file "
"names, d returns directories, b returns true or false and i returns an "
@@ -1514,27 +1259,46 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-config.8.xml:89
+#: apt-config.8.xml:77
msgid "Just show the contents of the configuration space."
msgstr ""
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-config.8.xml:90
+msgid ""
+"Include options which have an empty value. This is the default, so use "
+"--no-empty to remove them from the output."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><replaceable>
+#: apt-config.8.xml:95
+msgid "&percnt;f &#x0022;&percnt;v&#x0022;;&percnt;n"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-config.8.xml:96
+msgid ""
+"Defines the output of each config option. &percnt;t will be replaced with "
+"the name of the option, &percnt;f with the complete optionname and &percnt;v "
+"with the value of the option. Use uppercase letters and special characters "
+"in the value will be encoded to ensure that it can e.g. be savely used in a "
+"quoted-string as defined by RFC822. Additionally &percnt;n will be replaced "
+"by a newline, &percnt;N by a tab. A &percnt; can be printed by using "
+"&percnt;&percnt;."
+msgstr ""
+
#. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:107 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:629 apt-sortpkgs.1.xml:73
+#: apt-config.8.xml:110 apt-extracttemplates.1.xml:71 apt-ftparchive.1.xml:608 apt-sortpkgs.1.xml:64
msgid "&apt-conf;"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-config.8.xml:112
+#: apt-config.8.xml:115
msgid ""
"<command>apt-config</command> returns zero on normal operation, decimal 100 "
"on error."
msgstr ""
-#. type: Content of: <refentry><refnamediv><refname>
-#: apt-extracttemplates.1.xml:25 apt-extracttemplates.1.xml:32
-msgid "apt-extracttemplates"
-msgstr ""
-
#. type: Content of: <refentry><refmeta><manvolnum>
#: apt-extracttemplates.1.xml:26 apt-ftparchive.1.xml:26 apt-sortpkgs.1.xml:26
msgid "1"
@@ -1545,17 +1309,8 @@ msgstr ""
msgid "Utility to extract DebConf config and templates from Debian packages"
msgstr ""
-#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-extracttemplates.1.xml:39
-msgid ""
-"<command>apt-extracttemplates</command> <arg><option>-hv</option></arg> "
-"<arg><option>-t=<replaceable>temporary "
-"directory</replaceable></option></arg> <arg choice=\"plain\" "
-"rep=\"repeat\"><replaceable>file</replaceable></arg>"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:47
+#: apt-extracttemplates.1.xml:39
msgid ""
"<command>apt-extracttemplates</command> will take one or more Debian package "
"files as input and write out (to a temporary directory) all associated "
@@ -1565,32 +1320,22 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:52
+#: apt-extracttemplates.1.xml:44
msgid "package version template-file config-script"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:53
+#: apt-extracttemplates.1.xml:45
msgid ""
"template-file and config-script are written to the temporary directory "
-"specified by the -t or --tempdir "
-"(<literal>APT::ExtractTemplates::TempDir</literal>) directory, with "
+"specified by the <option>-t</option> or <option>--tempdir</option> "
+"(<literal>APT::ExtractTemplates::TempDir</literal>) directory, with "
"filenames of the form <filename>package.template.XXXX</filename> and "
"<filename>package.config.XXXX</filename>"
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-extracttemplates.1.xml:63 apt-get.8.xml:530
-msgid "<option>-t</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-extracttemplates.1.xml:63
-msgid "<option>--tempdir</option>"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-extracttemplates.1.xml:65
+#: apt-extracttemplates.1.xml:58
msgid ""
"Temporary directory in which to write extracted debconf template files and "
"config scripts. Configuration Item: "
@@ -1598,57 +1343,19 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-extracttemplates.1.xml:82
+#: apt-extracttemplates.1.xml:75
msgid ""
"<command>apt-extracttemplates</command> returns zero on normal operation, "
"decimal 100 on error."
msgstr ""
-#. The last update date
-#. type: Content of: <refentry><refentryinfo>
-#: apt-ftparchive.1.xml:16
-msgid ""
-"&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>17 "
-"August 2009</date>"
-msgstr ""
-
-#. type: Content of: <refentry><refnamediv><refname>
-#: apt-ftparchive.1.xml:25 apt-ftparchive.1.xml:32
-msgid "apt-ftparchive"
-msgstr ""
-
#. type: Content of: <refentry><refnamediv><refpurpose>
#: apt-ftparchive.1.xml:33
msgid "Utility to generate index files"
msgstr ""
-#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-ftparchive.1.xml:39
-msgid ""
-"<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> "
-"<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> "
-"<arg><option>--readonly</option></arg> "
-"<arg><option>--contents</option></arg> <arg><option>--arch "
-"<replaceable>architecture</replaceable></option></arg> <arg><option>-o "
-"<replaceable>config</replaceable>=<replaceable>string</replaceable></option></arg> "
-"<arg><option>-c=<replaceable>file</replaceable></option></arg> <group "
-"choice=\"req\"> <arg>packages<arg choice=\"plain\" "
-"rep=\"repeat\"><replaceable>path</replaceable></arg><arg><replaceable>override</replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> "
-"<arg>sources<arg choice=\"plain\" "
-"rep=\"repeat\"><replaceable>path</replaceable></arg><arg><replaceable>override</replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> "
-"<arg>contents <arg "
-"choice=\"plain\"><replaceable>path</replaceable></arg></arg> <arg>release "
-"<arg choice=\"plain\"><replaceable>path</replaceable></arg></arg> "
-"<arg>generate <arg "
-"choice=\"plain\"><replaceable>config-file</replaceable></arg> <arg "
-"choice=\"plain\" "
-"rep=\"repeat\"><replaceable>section</replaceable></arg></arg> <arg>clean "
-"<arg choice=\"plain\"><replaceable>config-file</replaceable></arg></arg> "
-"</group>"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:60
+#: apt-ftparchive.1.xml:39
msgid ""
"<command>apt-ftparchive</command> is the command line tool that generates "
"the index files that APT uses to access a distribution source. The index "
@@ -1657,7 +1364,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:64
+#: apt-ftparchive.1.xml:43
msgid ""
"<command>apt-ftparchive</command> is a superset of the &dpkg-scanpackages; "
"program, incorporating its entire functionality via the "
@@ -1667,7 +1374,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:70
+#: apt-ftparchive.1.xml:49
msgid ""
"Internally <command>apt-ftparchive</command> can make use of binary "
"databases to cache the contents of a .deb file and it does not rely on any "
@@ -1676,13 +1383,8 @@ msgid ""
"output files."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:79
-msgid "packages"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:81
+#: apt-ftparchive.1.xml:60
msgid ""
"The packages command generates a package file from a directory tree. It "
"takes the given directory and recursively searches it for .deb files, "
@@ -1691,17 +1393,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:86 apt-ftparchive.1.xml:110
+#: apt-ftparchive.1.xml:65 apt-ftparchive.1.xml:89
msgid "The option <option>--db</option> can be used to specify a binary caching DB."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:89
-msgid "sources"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:91
+#: apt-ftparchive.1.xml:70
msgid ""
"The <literal>sources</literal> command generates a source index file from a "
"directory tree. It takes the given directory and recursively searches it "
@@ -1710,20 +1407,15 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:96
+#: apt-ftparchive.1.xml:75
msgid ""
"If an override file is specified then a source override file will be looked "
"for with an extension of .src. The --source-override option can be used to "
"change the source override file that will be used."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:101
-msgid "contents"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:103
+#: apt-ftparchive.1.xml:82
msgid ""
"The <literal>contents</literal> command generates a contents file from a "
"directory tree. It takes the given directory and recursively searches it for "
@@ -1733,13 +1425,8 @@ msgid ""
"separated by a comma in the output."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:113
-msgid "release"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:115
+#: apt-ftparchive.1.xml:94
msgid ""
"The <literal>release</literal> command generates a Release file from a "
"directory tree. It recursively searches the given directory for uncompressed "
@@ -1755,7 +1442,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:125
+#: apt-ftparchive.1.xml:104
msgid ""
"Values for the additional metadata fields in the Release file are taken from "
"the corresponding variables under "
@@ -1768,13 +1455,8 @@ msgid ""
"<literal>Components</literal>, <literal>Description</literal>."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:136
-msgid "generate"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:138
+#: apt-ftparchive.1.xml:117
msgid ""
"The <literal>generate</literal> command is designed to be runnable from a "
"cron script and builds indexes according to the given config file. The "
@@ -1783,25 +1465,20 @@ msgid ""
"maintaining the required settings."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:145 apt-get.8.xml:298
-msgid "clean"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:147
+#: apt-ftparchive.1.xml:126
msgid ""
"The <literal>clean</literal> command tidies the databases used by the given "
"configuration file by removing any records that are no longer necessary."
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:153
+#: apt-ftparchive.1.xml:132
msgid "The Generate Configuration"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:155
+#: apt-ftparchive.1.xml:134
msgid ""
"The <literal>generate</literal> command uses a configuration file to "
"describe the archives that are going to be generated. It follows the typical "
@@ -1812,17 +1489,17 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:163
+#: apt-ftparchive.1.xml:142
msgid "The generate configuration has 4 separate sections, each described below."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:165
+#: apt-ftparchive.1.xml:144
msgid "Dir Section"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:167
+#: apt-ftparchive.1.xml:146
msgid ""
"The <literal>Dir</literal> section defines the standard directories needed "
"to locate the files required during the generation process. These "
@@ -1830,71 +1507,46 @@ msgid ""
"to produce a complete an absolute path."
msgstr ""
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:172
-msgid "ArchiveDir"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:174
+#: apt-ftparchive.1.xml:153
msgid ""
"Specifies the root of the FTP archive, in a standard Debian configuration "
"this is the directory that contains the <filename>ls-LR</filename> and dist "
"nodes."
msgstr ""
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:179
-msgid "OverrideDir"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:181
+#: apt-ftparchive.1.xml:160
msgid "Specifies the location of the override files."
msgstr ""
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:184
-msgid "CacheDir"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:186
+#: apt-ftparchive.1.xml:165
msgid "Specifies the location of the cache files"
msgstr ""
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:189
-msgid "FileListDir"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:191
+#: apt-ftparchive.1.xml:170
msgid ""
"Specifies the location of the file list files, if the "
"<literal>FileList</literal> setting is used below."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:197
+#: apt-ftparchive.1.xml:176
msgid "Default Section"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:199
+#: apt-ftparchive.1.xml:178
msgid ""
"The <literal>Default</literal> section specifies default values, and "
"settings that control the operation of the generator. Other sections may "
"override these defaults with a per-section setting."
msgstr ""
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:203
-msgid "Packages::Compress"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:205
+#: apt-ftparchive.1.xml:184
msgid ""
"Sets the default compression schemes to use for the Package index files. It "
"is a string that contains a space separated list of at least one of: '.' (no "
@@ -1902,136 +1554,86 @@ msgid ""
"'. gzip'."
msgstr ""
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:211
-msgid "Packages::Extensions"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:213
+#: apt-ftparchive.1.xml:192
msgid ""
"Sets the default list of file extensions that are package files. This "
"defaults to '.deb'."
msgstr ""
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:217
-msgid "Sources::Compress"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:219
+#: apt-ftparchive.1.xml:198
msgid ""
"This is similar to <literal>Packages::Compress</literal> except that it "
"controls the compression for the Sources files."
msgstr ""
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:223
-msgid "Sources::Extensions"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:225
+#: apt-ftparchive.1.xml:204
msgid ""
"Sets the default list of file extensions that are source files. This "
"defaults to '.dsc'."
msgstr ""
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:229
-msgid "Contents::Compress"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:231
+#: apt-ftparchive.1.xml:210
msgid ""
"This is similar to <literal>Packages::Compress</literal> except that it "
"controls the compression for the Contents files."
msgstr ""
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:235
-msgid "Translation::Compress"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:237
+#: apt-ftparchive.1.xml:216
msgid ""
"This is similar to <literal>Packages::Compress</literal> except that it "
"controls the compression for the Translation-en master file."
msgstr ""
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:241
-msgid "DeLinkLimit"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:243
+#: apt-ftparchive.1.xml:222
msgid ""
"Specifies the number of kilobytes to delink (and replace with hard links) "
"per run. This is used in conjunction with the per-section "
"<literal>External-Links</literal> setting."
msgstr ""
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:248
-msgid "FileMode"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:250
+#: apt-ftparchive.1.xml:229
msgid ""
"Specifies the mode of all created index files. It defaults to 0644. All "
"index files are set to this mode with no regard to the umask."
msgstr ""
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:255 apt-ftparchive.1.xml:401
-msgid "LongDescription"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:257 apt-ftparchive.1.xml:403
+#: apt-ftparchive.1.xml:236 apt-ftparchive.1.xml:382
msgid ""
"Sets if long descriptions should be included in the Packages file or split "
"out into a master Translation-en file."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:263
+#: apt-ftparchive.1.xml:242
msgid "TreeDefault Section"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:265
+#: apt-ftparchive.1.xml:244
msgid ""
"Sets defaults specific to <literal>Tree</literal> sections. All of these "
"variables are substitution variables and have the strings $(DIST), "
"$(SECTION) and $(ARCH) replaced with their respective values."
msgstr ""
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:270
-msgid "MaxContentsChange"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:272
+#: apt-ftparchive.1.xml:251
msgid ""
"Sets the number of kilobytes of contents files that are generated each "
"day. The contents files are round-robined so that over several days they "
"will all be rebuilt."
msgstr ""
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:277
-msgid "ContentsAge"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:279
+#: apt-ftparchive.1.xml:258
msgid ""
"Controls the number of days a contents file is allowed to be checked without "
"changing. If this limit is passed the mtime of the contents file is "
@@ -2041,87 +1643,52 @@ msgid ""
"new file anyhow. The default is 10, the units are in days."
msgstr ""
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:288
-msgid "Directory"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:290
+#: apt-ftparchive.1.xml:269
msgid ""
"Sets the top of the .deb directory tree. Defaults to "
"<filename>$(DIST)/$(SECTION)/binary-$(ARCH)/</filename>"
msgstr ""
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:294
-msgid "SrcDirectory"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:296
+#: apt-ftparchive.1.xml:275
msgid ""
"Sets the top of the source package directory tree. Defaults to "
"<filename>$(DIST)/$(SECTION)/source/</filename>"
msgstr ""
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:300 apt-ftparchive.1.xml:439
-msgid "Packages"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:302
+#: apt-ftparchive.1.xml:281
msgid ""
"Sets the output Packages file. Defaults to "
"<filename>$(DIST)/$(SECTION)/binary-$(ARCH)/Packages</filename>"
msgstr ""
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:306 apt-ftparchive.1.xml:444
-msgid "Sources"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:308
+#: apt-ftparchive.1.xml:287
msgid ""
"Sets the output Sources file. Defaults to "
"<filename>$(DIST)/$(SECTION)/source/Sources</filename>"
msgstr ""
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:312
-msgid "Translation"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:314
+#: apt-ftparchive.1.xml:293
msgid ""
"Set the output Translation-en master file with the long descriptions if they "
"should be not included in the Packages file. Defaults to "
"<filename>$(DIST)/$(SECTION)/i18n/Translation-en</filename>"
msgstr ""
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:319
-msgid "InternalPrefix"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:321
+#: apt-ftparchive.1.xml:300
msgid ""
"Sets the path prefix that causes a symlink to be considered an internal link "
"instead of an external link. Defaults to "
"<filename>$(DIST)/$(SECTION)/</filename>"
msgstr ""
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:326 apt-ftparchive.1.xml:450
-msgid "Contents"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:328
+#: apt-ftparchive.1.xml:307
msgid ""
"Sets the output Contents file. Defaults to "
"<filename>$(DIST)/Contents-$(ARCH)</filename>. If this setting causes "
@@ -2130,48 +1697,28 @@ msgid ""
"package files together automatically."
msgstr ""
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:335
-msgid "Contents::Header"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:337
+#: apt-ftparchive.1.xml:316
msgid "Sets header file to prepend to the contents output."
msgstr ""
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:340 apt-ftparchive.1.xml:475
-msgid "BinCacheDB"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:342
+#: apt-ftparchive.1.xml:321
msgid ""
"Sets the binary cache database to use for this section. Multiple sections "
"can share the same database."
msgstr ""
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:346
-msgid "FileList"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:348
+#: apt-ftparchive.1.xml:327
msgid ""
"Specifies that instead of walking the directory tree, "
"<command>apt-ftparchive</command> should read the list of files from the "
"given file. Relative files names are prefixed with the archive directory."
msgstr ""
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:353
-msgid "SourceFileList"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:355
+#: apt-ftparchive.1.xml:334
msgid ""
"Specifies that instead of walking the directory tree, "
"<command>apt-ftparchive</command> should read the list of files from the "
@@ -2180,12 +1727,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:363
+#: apt-ftparchive.1.xml:342
msgid "Tree Section"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:365
+#: apt-ftparchive.1.xml:344
msgid ""
"The <literal>Tree</literal> section defines a standard Debian file tree "
"which consists of a base directory, then multiple sections in that base "
@@ -2195,7 +1742,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:370
+#: apt-ftparchive.1.xml:349
msgid ""
"The <literal>Tree</literal> section takes a scope tag which sets the "
"<literal>$(DIST)</literal> variable and defines the root of the tree (the "
@@ -2204,7 +1751,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:375
+#: apt-ftparchive.1.xml:354
msgid ""
"All of the settings defined in the <literal>TreeDefault</literal> section "
"can be use in a <literal>Tree</literal> section as well as three new "
@@ -2212,7 +1759,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt-ftparchive.1.xml:381
+#: apt-ftparchive.1.xml:360
#, no-wrap
msgid ""
"for i in Sections do \n"
@@ -2222,90 +1769,60 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:378
+#: apt-ftparchive.1.xml:357
msgid ""
"When processing a <literal>Tree</literal> section "
"<command>apt-ftparchive</command> performs an operation similar to: "
"<placeholder type=\"programlisting\" id=\"0\"/>"
msgstr ""
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:387
-msgid "Sections"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:389
+#: apt-ftparchive.1.xml:368
msgid ""
"This is a space separated list of sections which appear under the "
"distribution, typically this is something like <literal>main contrib "
"non-free</literal>"
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:394 apt.conf.5.xml:157
-msgid "Architectures"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:396
+#: apt-ftparchive.1.xml:375
msgid ""
"This is a space separated list of all the architectures that appear under "
"search section. The special architecture 'source' is used to indicate that "
"this tree has a source archive."
msgstr ""
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:407 apt-ftparchive.1.xml:455
-msgid "BinOverride"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:409
+#: apt-ftparchive.1.xml:388
msgid ""
"Sets the binary override file. The override file contains section, priority "
"and maintainer address information."
msgstr ""
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:413 apt-ftparchive.1.xml:460
-msgid "SrcOverride"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:415
+#: apt-ftparchive.1.xml:394
msgid ""
"Sets the source override file. The override file contains section "
"information."
msgstr ""
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:419 apt-ftparchive.1.xml:465
-msgid "ExtraOverride"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:421 apt-ftparchive.1.xml:467
+#: apt-ftparchive.1.xml:400 apt-ftparchive.1.xml:446
msgid "Sets the binary extra override file."
msgstr ""
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:424 apt-ftparchive.1.xml:470
-msgid "SrcExtraOverride"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:426 apt-ftparchive.1.xml:472
+#: apt-ftparchive.1.xml:405 apt-ftparchive.1.xml:451
msgid "Sets the source extra override file."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt-ftparchive.1.xml:431
+#: apt-ftparchive.1.xml:410
msgid "BinDirectory Section"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt-ftparchive.1.xml:433
+#: apt-ftparchive.1.xml:412
msgid ""
"The <literal>bindirectory</literal> section defines a binary directory tree "
"with no special structure. The scope tag specifies the location of the "
@@ -2315,64 +1832,54 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:441
+#: apt-ftparchive.1.xml:420
msgid "Sets the Packages file output."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:446
+#: apt-ftparchive.1.xml:425
msgid ""
"Sets the Sources file output. At least one of <literal>Packages</literal> or "
"<literal>Sources</literal> is required."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:452
+#: apt-ftparchive.1.xml:431
msgid "Sets the Contents file output. (optional)"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:457
+#: apt-ftparchive.1.xml:436
msgid "Sets the binary override file."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:462
+#: apt-ftparchive.1.xml:441
msgid "Sets the source override file."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:477
+#: apt-ftparchive.1.xml:456
msgid "Sets the cache DB."
msgstr ""
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:480
-msgid "PathPrefix"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:482
+#: apt-ftparchive.1.xml:461
msgid "Appends a path to all the output paths."
msgstr ""
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:485
-msgid "FileList, SourceFileList"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:487
+#: apt-ftparchive.1.xml:466
msgid "Specifies the file list file."
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:494
+#: apt-ftparchive.1.xml:473
msgid "The Binary Override File"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:495
+#: apt-ftparchive.1.xml:474
msgid ""
"The binary override file is fully compatible with &dpkg-scanpackages;. It "
"contains 4 fields separated by spaces. The first field is the package name, "
@@ -2382,19 +1889,19 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><literallayout>
-#: apt-ftparchive.1.xml:501
+#: apt-ftparchive.1.xml:480
#, no-wrap
msgid "old [// oldn]* => new"
msgstr ""
#. type: Content of: <refentry><refsect1><para><literallayout>
-#: apt-ftparchive.1.xml:503
+#: apt-ftparchive.1.xml:482
#, no-wrap
msgid "new"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:500
+#: apt-ftparchive.1.xml:479
msgid ""
"The general form of the maintainer field is: <placeholder "
"type=\"literallayout\" id=\"0\"/> or simply, <placeholder "
@@ -2405,12 +1912,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:511
+#: apt-ftparchive.1.xml:490
msgid "The Source Override File"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:513
+#: apt-ftparchive.1.xml:492
msgid ""
"The source override file is fully compatible with &dpkg-scansources;. It "
"contains 2 fields separated by spaces. The first fields is the source "
@@ -2418,25 +1925,20 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:518
+#: apt-ftparchive.1.xml:497
msgid "The Extra Override File"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:520
+#: apt-ftparchive.1.xml:499
msgid ""
"The extra override file allows any arbitrary tag to be added or replaced in "
"the output. It has 3 columns, the first is the package, the second is the "
"tag and the remainder of the line is the new value."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:529
-msgid "<option>--md5</option>, <option>--sha1</option>, <option>--sha256</option>"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:531
+#: apt-ftparchive.1.xml:510
msgid ""
"Generate the given checksum. These options default to on, when turned off "
"the generated index files will not have the checksum fields where possible. "
@@ -2451,20 +1953,15 @@ msgid ""
"<literal>SHA256</literal>."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:540
-msgid "<option>--db</option>"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:542
+#: apt-ftparchive.1.xml:521
msgid ""
"Use a binary caching DB. This has no effect on the generate command. "
"Configuration Item: <literal>APT::FTPArchive::DB</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:548
+#: apt-ftparchive.1.xml:527
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 "
@@ -2472,13 +1969,8 @@ msgid ""
"file. Configuration Item: <literal>quiet</literal>."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:554
-msgid "<option>--delink</option>"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:556
+#: apt-ftparchive.1.xml:535
msgid ""
"Perform Delinking. If the <literal>External-Links</literal> setting is used "
"then this option actually enables delinking of the files. It defaults to on "
@@ -2486,13 +1978,8 @@ msgid ""
"Item: <literal>APT::FTPArchive::DeLinkAct</literal>."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:562
-msgid "<option>--contents</option>"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:564
+#: apt-ftparchive.1.xml:543
msgid ""
"Perform contents generation. When this option is set and package indexes are "
"being generated with a cache DB then the file listing will also be extracted "
@@ -2501,38 +1988,23 @@ msgid ""
"Configuration Item: <literal>APT::FTPArchive::Contents</literal>."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:572
-msgid "<option>--source-override</option>"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:574
+#: apt-ftparchive.1.xml:553
msgid ""
"Select the source override file to use with the <literal>sources</literal> "
"command. Configuration Item: "
"<literal>APT::FTPArchive::SourceOverride</literal>."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:578
-msgid "<option>--readonly</option>"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:580
+#: apt-ftparchive.1.xml:559
msgid ""
"Make the caching databases read only. Configuration Item: "
"<literal>APT::FTPArchive::ReadOnlyDB</literal>."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:584
-msgid "<option>--arch</option>"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:585
+#: apt-ftparchive.1.xml:564
msgid ""
"Accept in the <literal>packages</literal> and <literal>contents</literal> "
"commands only package files matching <literal>*_arch.deb</literal> or "
@@ -2540,13 +2012,8 @@ msgid ""
"path. Configuration Item: <literal>APT::FTPArchive::Architecture</literal>."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:591
-msgid "<option>APT::FTPArchive::AlwaysStat</option>"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:593
+#: apt-ftparchive.1.xml:572
msgid ""
"&apt-ftparchive; caches as much as possible of metadata in a cachedb. If "
"packages are recompiled and/or republished with the same version again, this "
@@ -2559,13 +2026,8 @@ msgid ""
"are useless."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-ftparchive.1.xml:603
-msgid "<option>APT::FTPArchive::LongDescription</option>"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-ftparchive.1.xml:605
+#: apt-ftparchive.1.xml:584
msgid ""
"This configuration option defaults to \"<literal>true</literal>\" and should "
"only be set to <literal>\"false\"</literal> if the Archive generated with "
@@ -2575,12 +2037,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:617 apt.conf.5.xml:1104 apt_preferences.5.xml:544 sources.list.5.xml:214
+#: apt-ftparchive.1.xml:596 apt.conf.5.xml:1112 apt_preferences.5.xml:545 sources.list.5.xml:214
msgid "Examples"
msgstr ""
#. type: Content of: <refentry><refsect1><para><programlisting>
-#: apt-ftparchive.1.xml:623
+#: apt-ftparchive.1.xml:602
#, no-wrap
msgid ""
"<command>apt-ftparchive</command> packages "
@@ -2589,74 +2051,26 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:619
+#: apt-ftparchive.1.xml:598
msgid ""
"To create a compressed Packages file for a directory containing binary "
"packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-ftparchive.1.xml:633
+#: apt-ftparchive.1.xml:612
msgid ""
"<command>apt-ftparchive</command> returns zero on normal operation, decimal "
"100 on error."
msgstr ""
-#. The last update date
-#. type: Content of: <refentry><refentryinfo>
-#: apt-get.8.xml:16
-msgid ""
-"&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>08 "
-"November 2008</date>"
-msgstr ""
-
-#. type: <heading></heading>
-#: apt-get.8.xml:25 apt-get.8.xml:32 guide.sgml:96
-msgid "apt-get"
-msgstr ""
-
#. type: Content of: <refentry><refnamediv><refpurpose>
#: apt-get.8.xml:33
msgid "APT package handling utility -- command-line interface"
msgstr ""
-#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-get.8.xml:39
-msgid ""
-"<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> "
-"<option>-o= <replaceable>config_string</replaceable> </option> </arg> <arg> "
-"<option>-c= <replaceable>config_file</replaceable> </option> </arg> <arg> "
-"<option>-t=</option> <arg choice='plain'> "
-"<replaceable>target_release</replaceable> </arg> </arg> <arg> "
-"<option>-a=</option> <arg choice='plain'> "
-"<replaceable>default_architecture</replaceable> </arg> </arg> <group "
-"choice=\"req\"> <arg choice='plain'>update</arg> <arg "
-"choice='plain'>upgrade</arg> <arg choice='plain'>dselect-upgrade</arg> <arg "
-"choice='plain'>dist-upgrade</arg> <arg choice='plain'>install <arg "
-"choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable> <arg> <group "
-"choice='req'> <arg choice='plain'> "
-"=<replaceable>pkg_version_number</replaceable> </arg> <arg choice='plain'> "
-"/<replaceable>target_release</replaceable> </arg> </group> </arg> </arg> "
-"</arg> <arg choice='plain'>remove <arg choice=\"plain\" "
-"rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
-"choice='plain'>purge <arg choice=\"plain\" "
-"rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
-"choice='plain'>source <arg choice=\"plain\" "
-"rep=\"repeat\"><replaceable>pkg</replaceable> <arg> <group choice='req'> "
-"<arg choice='plain'> =<replaceable>pkg_version_number</replaceable> </arg> "
-"<arg choice='plain'> /<replaceable>target_release</replaceable> </arg> "
-"</group> </arg> </arg> </arg> <arg choice='plain'>build-dep <arg "
-"choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> "
-"<arg choice='plain'>check</arg> <arg choice='plain'>clean</arg> <arg "
-"choice='plain'>autoclean</arg> <arg choice='plain'>autoremove</arg> <arg "
-"choice='plain'> <group choice='req'> <arg choice='plain'>-v</arg> <arg "
-"choice='plain'>--version</arg> </group> </arg> <arg choice='plain'> <group "
-"choice='req'> <arg choice='plain'>-h</arg> <arg choice='plain'>--help</arg> "
-"</group> </arg> </group>"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:122
+#: apt-get.8.xml:39
msgid ""
"<command>apt-get</command> is the command-line tool for handling packages, "
"and may be considered the user's \"back-end\" to other tools using the APT "
@@ -2664,13 +2078,8 @@ msgid ""
"&aptitude;, &synaptic; and &wajig;."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:131 apt-key.8.xml:127
-msgid "update"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:132
+#: apt-get.8.xml:49
msgid ""
"<literal>update</literal> is used to resynchronize the package index files "
"from their sources. The indexes of available packages are fetched from the "
@@ -2684,13 +2093,8 @@ msgid ""
"advance."
msgstr ""
-#. type: <tag></tag>
-#: apt-get.8.xml:143 guide.sgml:121
-msgid "upgrade"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:144
+#: apt-get.8.xml:61
msgid ""
"<literal>upgrade</literal> is used to install the newest versions of all "
"packages currently installed on the system from the sources enumerated in "
@@ -2705,13 +2109,8 @@ msgid ""
"available."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:156
-msgid "dselect-upgrade"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:157
+#: apt-get.8.xml:74
msgid ""
"<literal>dselect-upgrade</literal> is used in conjunction with the "
"traditional Debian packaging front-end, "
@@ -2721,13 +2120,8 @@ msgid ""
"removal of old and the installation of new packages)."
msgstr ""
-#. type: <tag></tag>
-#: apt-get.8.xml:166 guide.sgml:140
-msgid "dist-upgrade"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:167
+#: apt-get.8.xml:84
msgid ""
"<literal>dist-upgrade</literal> in addition to performing the function of "
"<literal>upgrade</literal>, also intelligently handles changing dependencies "
@@ -2740,13 +2134,8 @@ msgid ""
"for a mechanism for overriding the general settings for individual packages."
msgstr ""
-#. type: <tag></tag>
-#: apt-get.8.xml:179 guide.sgml:131
-msgid "install"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:181
+#: apt-get.8.xml:98
msgid ""
"<literal>install</literal> is followed by one or more packages desired for "
"installation or upgrading. Each package is a package name, not a fully "
@@ -2762,7 +2151,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:199
+#: apt-get.8.xml:116
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 "
@@ -2773,14 +2162,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:206
+#: apt-get.8.xml:123
msgid ""
"Both of the version selection mechanisms can downgrade packages and must be "
"used with care."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:209
+#: apt-get.8.xml:126
msgid ""
"This is also the target to use if you want to upgrade one or more "
"already-installed packages without upgrading every package you have on your "
@@ -2792,14 +2181,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:220
+#: apt-get.8.xml:137
msgid ""
"Finally, the &apt-preferences; mechanism allows you to create an alternative "
"installation policy for individual packages."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:224
+#: apt-get.8.xml:141
msgid ""
"If no package matches the given expression and the expression contains one "
"of '.', '?' or '*' then it is assumed to be a POSIX regular expression, and "
@@ -2810,13 +2199,8 @@ msgid ""
"expression."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:233
-msgid "remove"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:234
+#: apt-get.8.xml:151
msgid ""
"<literal>remove</literal> is identical to <literal>install</literal> except "
"that packages are removed instead of installed. Note the removing a package "
@@ -2825,38 +2209,28 @@ msgid ""
"installed instead of removed."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:241
-msgid "purge"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:242
+#: apt-get.8.xml:159
msgid ""
"<literal>purge</literal> is identical to <literal>remove</literal> except "
"that packages are removed and purged (any configuration files are deleted "
"too)."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:246
-msgid "source"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:247
+#: apt-get.8.xml:164
msgid ""
"<literal>source</literal> causes <command>apt-get</command> to fetch source "
"packages. APT will examine the available packages to decide which source "
"package to fetch. It will then find and download into the current directory "
-"the newest available version of that source package while respect the "
+"the newest available version of that source package while respecting the "
"default release, set with the option "
"<literal>APT::Default-Release</literal>, the <option>-t</option> option or "
"per package with the <literal>pkg/release</literal> syntax, if possible."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:255
+#: apt-get.8.xml:172
msgid ""
"Source packages are tracked separately from binary packages via "
"<literal>deb-src</literal> type lines in the &sources-list; file. This means "
@@ -2867,7 +2241,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:262
+#: apt-get.8.xml:179
msgid ""
"If the <option>--compile</option> option is specified then the package will "
"be compiled to a binary .deb using <command>dpkg-buildpackage</command> for "
@@ -2877,7 +2251,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:269
+#: apt-get.8.xml:186
msgid ""
"A specific source version can be retrieved by postfixing the source name "
"with an equals and then the version to fetch, similar to the mechanism used "
@@ -2887,54 +2261,39 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:275
+#: apt-get.8.xml:192
msgid ""
"Note that source packages are not tracked like binary packages, they exist "
"only in the current directory and are similar to downloading source tar "
"balls."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:280
-msgid "build-dep"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:281
+#: apt-get.8.xml:198
msgid ""
"<literal>build-dep</literal> causes apt-get to install/remove packages in an "
"attempt to satisfy the build dependencies for a source package. By default "
-"the dependencies are satisfied to build the package nativly. If desired a "
+"the dependencies are satisfied to build the package natively. If desired a "
"host-architecture can be specified with the "
"<option>--host-architecture</option> option instead."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:287
-msgid "check"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:288
+#: apt-get.8.xml:205
msgid ""
"<literal>check</literal> is a diagnostic tool; it updates the package cache "
"and checks for broken dependencies."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:292
-msgid "download"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:293
+#: apt-get.8.xml:210
msgid ""
"<literal>download</literal> will download the given binary package into the "
"current directory."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:299
+#: apt-get.8.xml:216
msgid ""
"<literal>clean</literal> clears out the local repository of retrieved "
"package files. It removes everything but the lock file from "
@@ -2945,13 +2304,8 @@ msgid ""
"from time to time to free up disk space."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:308
-msgid "autoclean"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:309
+#: apt-get.8.xml:226
msgid ""
"Like <literal>clean</literal>, <literal>autoclean</literal> clears out the "
"local repository of retrieved package files. The difference is that it only "
@@ -2962,80 +2316,52 @@ msgid ""
"being erased if it is set to off."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:318
-msgid "autoremove"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:319
+#: apt-get.8.xml:236
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><term>
-#: apt-get.8.xml:323
-msgid "changelog"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:324
+#: apt-get.8.xml:241
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>http://packages.debian.org/changelogs</ulink> for "
-"Debian or <ulink>http://changelogs.ubuntu.com/changelogs</ulink> for "
-"Ubuntu). By default it displays the changelog for the version that is "
+"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."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:346
-msgid "<option>--no-install-recommends</option>"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:347
+#: apt-get.8.xml:264
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><term>
-#: apt-get.8.xml:351
-msgid "<option>--install-suggests</option>"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:352
+#: apt-get.8.xml:269
msgid ""
"Consider suggested packages as a dependency for installing. Configuration "
"Item: <literal>APT::Install-Suggests</literal>."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:356
-msgid "<option>--download-only</option>"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:357
+#: apt-get.8.xml:274
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><term>
-#: apt-get.8.xml:361
-msgid "<option>--fix-broken</option>"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:362
+#: apt-get.8.xml:279
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 "
@@ -3050,18 +2376,8 @@ msgid ""
"Item: <literal>APT::Get::Fix-Broken</literal>."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:375
-msgid "<option>--ignore-missing</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:376
-msgid "<option>--fix-missing</option>"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:377
+#: apt-get.8.xml:294
msgid ""
"Ignore missing packages; If packages cannot be retrieved or fail the "
"integrity check after retrieval (corrupted package files), hold back those "
@@ -3072,13 +2388,8 @@ msgid ""
"Configuration Item: <literal>APT::Get::Fix-Missing</literal>."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:387
-msgid "<option>--no-download</option>"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:388
+#: apt-get.8.xml:305
msgid ""
"Disables downloading of packages. This is best used with "
"<option>--ignore-missing</option> to force APT to use only the .debs it has "
@@ -3087,7 +2398,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:395
+#: apt-get.8.xml:312
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 "
@@ -3098,18 +2409,8 @@ msgid ""
"<literal>quiet</literal>."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:405
-msgid "<option>--simulate</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:407
-msgid "<option>--dry-run</option>"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:410
+#: apt-get.8.xml:327
msgid ""
"No action; perform a simulation of events that would occur but do not "
"actually change the system. Configuration Item: "
@@ -3117,7 +2418,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:414
+#: apt-get.8.xml:331
msgid ""
"Simulation run as user will deactivate locking "
"(<literal>Debug::NoLocking</literal>) automatic. Also a notice will be "
@@ -3129,7 +2430,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:420
+#: apt-get.8.xml:337
msgid ""
"Simulate prints out a series of lines each one representing a dpkg "
"operation, Configure (Conf), Remove (Remv), Unpack (Inst). Square brackets "
@@ -3137,23 +2438,8 @@ msgid ""
"that are of no consequence (rare)."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:427
-msgid "<option>-y</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:427
-msgid "<option>--yes</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:428
-msgid "<option>--assume-yes</option>"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:429
+#: apt-get.8.xml:346
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 "
@@ -3162,97 +2448,47 @@ msgid ""
"Configuration Item: <literal>APT::Get::Assume-Yes</literal>."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:436
-msgid "<option>--assume-no</option>"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:437
+#: apt-get.8.xml:354
msgid ""
"Automatic \"no\" to all prompts. Configuration Item: "
"<literal>APT::Get::Assume-No</literal>."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:441
-msgid "<option>-u</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:441
-msgid "<option>--show-upgraded</option>"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:442
+#: apt-get.8.xml:359
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><term>
-#: apt-get.8.xml:447
-msgid "<option>-V</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:447
-msgid "<option>--verbose-versions</option>"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:448
+#: apt-get.8.xml:365
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><term>
-#: apt-get.8.xml:453
-msgid "<option>--host-architecture</option>"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:454
+#: apt-get.8.xml:371
msgid ""
"This option controls the architecture packages are built for by "
"<command>apt-get source --compile</command> and how cross-builddependencies "
-"are satisfied. By default is not set which means that the host architecture "
-"is the same as the build architecture (which is defined by "
-"<literal>APT::Architecture</literal>) Configuration Item: "
+"are satisfied. By default is it not set which means that the host "
+"architecture is the same as the build architecture (which is defined by "
+"<literal>APT::Architecture</literal>). Configuration Item: "
"<literal>APT::Get::Host-Architecture</literal>"
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:462
-msgid "<option>-b</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:462
-msgid "<option>--compile</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:463
-msgid "<option>--build</option>"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:464
+#: apt-get.8.xml:381
msgid ""
"Compile source packages after downloading them. Configuration Item: "
"<literal>APT::Get::Compile</literal>."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:468
-msgid "<option>--ignore-hold</option>"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:469
+#: apt-get.8.xml:386
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 "
@@ -3260,13 +2496,8 @@ msgid ""
"holds. Configuration Item: <literal>APT::Ignore-Hold</literal>."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:475
-msgid "<option>--no-upgrade</option>"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:476
+#: apt-get.8.xml:393
msgid ""
"Do not upgrade packages; When used in conjunction with "
"<literal>install</literal>, <literal>no-upgrade</literal> will prevent "
@@ -3274,27 +2505,18 @@ msgid ""
"installed. Configuration Item: <literal>APT::Get::Upgrade</literal>."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:482
-msgid "<option>--only-upgrade</option>"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:483
+#: apt-get.8.xml:400
msgid ""
"Do not install new packages; When used in conjunction with "
-"<literal>install</literal>, <literal>only-upgrade</literal> will prevent "
-"packages on the command line from being upgraded if they are not already "
-"installed. Configuration Item: <literal>APT::Get::Only-Upgrade</literal>."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:489
-msgid "<option>--force-yes</option>"
+"<literal>install</literal>, <literal>only-upgrade</literal> will install "
+"upgrades for already installed packages only and ignore requests to install "
+"new packages. Configuration Item: "
+"<literal>APT::Get::Only-Upgrade</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:490
+#: apt-get.8.xml:408
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 "
@@ -3303,13 +2525,8 @@ msgid ""
"Configuration Item: <literal>APT::Get::force-yes</literal>."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:497
-msgid "<option>--print-uris</option>"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:498
+#: apt-get.8.xml:416
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 "
@@ -3321,13 +2538,8 @@ msgid ""
"<literal>APT::Get::Print-URIs</literal>."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:508
-msgid "<option>--purge</option>"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:509
+#: apt-get.8.xml:427
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 "
@@ -3336,25 +2548,15 @@ msgid ""
"<literal>APT::Get::Purge</literal>."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:516
-msgid "<option>--reinstall</option>"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:517
+#: apt-get.8.xml:435
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><term>
-#: apt-get.8.xml:521
-msgid "<option>--list-cleanup</option>"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:522
+#: apt-get.8.xml:440
msgid ""
"This option defaults to on, use <literal>--no-list-cleanup</literal> to turn "
"it off. When on <command>apt-get</command> will automatically manage the "
@@ -3364,18 +2566,8 @@ msgid ""
"<literal>APT::Get::List-Cleanup</literal>."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:531
-msgid "<option>--target-release</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:532
-msgid "<option>--default-release</option>"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:533
+#: apt-get.8.xml:451
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 "
@@ -3389,13 +2581,8 @@ msgid ""
"manual page."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:546
-msgid "<option>--trivial-only</option>"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:548
+#: apt-get.8.xml:466
msgid ""
"Only perform operations that are 'trivial'. Logically this can be considered "
"related to <option>--assume-yes</option>, where "
@@ -3404,25 +2591,15 @@ msgid ""
"<literal>APT::Get::Trivial-Only</literal>."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:554
-msgid "<option>--no-remove</option>"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:555
+#: apt-get.8.xml:473
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><term>
-#: apt-get.8.xml:560
-msgid "<option>--auto-remove</option>"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:561
+#: apt-get.8.xml:479
msgid ""
"If the command is either <literal>install</literal> or "
"<literal>remove</literal>, then this option acts like running "
@@ -3430,13 +2607,8 @@ msgid ""
"packages. Configuration Item: <literal>APT::Get::AutomaticRemove</literal>."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:567
-msgid "<option>--only-source</option>"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:568
+#: apt-get.8.xml:486
msgid ""
"Only has meaning for the <literal>source</literal> and "
"<literal>build-dep</literal> commands. Indicates that the given source "
@@ -3447,23 +2619,8 @@ msgid ""
"<literal>APT::Get::Only-Source</literal>."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:578
-msgid "<option>--diff-only</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:578
-msgid "<option>--dsc-only</option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:578
-msgid "<option>--tar-only</option>"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:579
+#: apt-get.8.xml:497
msgid ""
"Download only the diff, dsc, or tar file of a source archive. Configuration "
"Item: <literal>APT::Get::Diff-Only</literal>, "
@@ -3471,25 +2628,15 @@ msgid ""
"<literal>APT::Get::Tar-Only</literal>."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:584
-msgid "<option>--arch-only</option>"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:585
+#: apt-get.8.xml:503
msgid ""
"Only process architecture-dependent build-dependencies. Configuration Item: "
"<literal>APT::Get::Arch-Only</literal>."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-get.8.xml:589
-msgid "<option>--allow-unauthenticated</option>"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-get.8.xml:590
+#: apt-get.8.xml:508
msgid ""
"Ignore if packages can't be authenticated and don't prompt about it. This "
"is useful for tools like pbuilder. Configuration Item: "
@@ -3497,14 +2644,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-get.8.xml:603
+#: apt-get.8.xml:521
msgid ""
"&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; "
"&file-statelists;"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:612
+#: apt-get.8.xml:530
msgid ""
"&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
"&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, "
@@ -3512,53 +2659,19 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:618
+#: apt-get.8.xml:536
msgid ""
"<command>apt-get</command> returns zero on normal operation, decimal 100 on "
"error."
msgstr ""
-#. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:621
-msgid "ORIGINAL AUTHORS"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:622
-msgid "&apt-author.jgunthorpe;"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><title>
-#: apt-get.8.xml:625
-msgid "CURRENT AUTHORS"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><para>
-#: apt-get.8.xml:627
-msgid "&apt-author.team;"
-msgstr ""
-
-#. type: Content of: <refentry><refnamediv><refname>
-#: apt-key.8.xml:17 apt-key.8.xml:24
-msgid "apt-key"
-msgstr ""
-
#. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-key.8.xml:25
+#: apt-key.8.xml:32
msgid "APT key management utility"
msgstr ""
-#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-key.8.xml:31
-msgid ""
-"<command>apt-key</command> <arg><option>--keyring "
-"<replaceable>filename</replaceable></option></arg> "
-"<arg><replaceable>command</replaceable></arg> <arg "
-"rep=\"repeat\"><option><replaceable>arguments</replaceable></option></arg>"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:40
+#: apt-key.8.xml:39
msgid ""
"<command>apt-key</command> is used to manage the list of keys used by apt to "
"authenticate packages. Packages which have been authenticated using these "
@@ -3566,87 +2679,52 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-key.8.xml:46
+#: apt-key.8.xml:45
msgid "Commands"
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:48
-msgid "add <replaceable>filename</replaceable>"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:52
+#: apt-key.8.xml:50
msgid ""
-"Add a new key to the list of trusted keys. The key is read from "
-"<replaceable>filename</replaceable>, or standard input if "
-"<replaceable>filename</replaceable> is <literal>-</literal>."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:60
-msgid "del <replaceable>keyid</replaceable>"
+"Add a new key to the list of trusted keys. The key is read from the "
+"filename given with the parameter &synopsis-param-filename; or if the "
+"filename is <literal>-</literal> from standard input."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:64
+#: apt-key.8.xml:63
msgid "Remove a key from the list of trusted keys."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:71
-msgid "export <replaceable>keyid</replaceable>"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:75
-msgid "Output the key <replaceable>keyid</replaceable> to standard output."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:82
-msgid "exportall"
+#: apt-key.8.xml:74
+msgid "Output the key &synopsis-param-keyid; to standard output."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:86
+#: apt-key.8.xml:85
msgid "Output all trusted keys to standard output."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:93
-msgid "list"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:97
+#: apt-key.8.xml:96
msgid "List trusted keys."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:104
-msgid "finger"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:108
+#: apt-key.8.xml:107
msgid "List fingerprints of trusted keys."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:115
-msgid "adv"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:119
+#: apt-key.8.xml:118
msgid ""
"Pass advanced options to gpg. With adv --recv-key you can download the "
"public key."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:131
+#: apt-key.8.xml:130
msgid ""
"Update the local keyring with the archive keyring and remove from the local "
"keyring the archive keys which are no longer valid. The archive keyring is "
@@ -3655,13 +2733,8 @@ msgid ""
"Ubuntu."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:141
-msgid "net-update"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:145
+#: apt-key.8.xml:144
msgid ""
"Work similar to the <command>update</command> command above, but get the "
"archive keyring from an URI instead and validate it against a master key. "
@@ -3672,107 +2745,77 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:162
+#: apt-key.8.xml:161
msgid ""
"Note that options need to be defined before the commands described in the "
"previous section."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:164
-msgid "--keyring <replaceable>filename</replaceable>"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:165
+#: apt-key.8.xml:164
msgid ""
"With this option it is possible to specify a specific keyring file the "
"command should operate on. The default is that a command is executed on the "
"<filename>trusted.gpg</filename> file as well as on all parts in the "
-"<filename>trusted.gpg.d</filename> directory, through "
+"<filename>trusted.gpg.d</filename> directory, though "
"<filename>trusted.gpg</filename> is the primary keyring which means that "
"e.g. new keys are added to this one."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-key.8.xml:178
+#: apt-key.8.xml:177
msgid "&file-trustedgpg;"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:180
+#: apt-key.8.xml:179
msgid "<filename>/etc/apt/trustdb.gpg</filename>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:181
+#: apt-key.8.xml:180
msgid "Local trust database of archive keys."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:184
+#: apt-key.8.xml:183
msgid "<filename>/usr/share/keyrings/ubuntu-archive-keyring.gpg</filename>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:185
+#: apt-key.8.xml:184
msgid "Keyring of Ubuntu archive trusted keys."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-key.8.xml:188
+#: apt-key.8.xml:187
msgid "<filename>/usr/share/keyrings/ubuntu-archive-removed-keys.gpg</filename>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-key.8.xml:189
+#: apt-key.8.xml:188
msgid "Keyring of Ubuntu archive removed trusted keys."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-key.8.xml:198
+#: apt-key.8.xml:197
msgid "&apt-get;, &apt-secure;"
msgstr ""
-#. The last update date
-#. type: Content of: <refentry><refentryinfo>
-#: apt-mark.8.xml:16
-msgid ""
-"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>21 "
-"April 2011</date>"
-msgstr ""
-
-#. type: Content of: <refentry><refnamediv><refname>
-#: apt-mark.8.xml:25 apt-mark.8.xml:32
-msgid "apt-mark"
-msgstr ""
-
#. type: Content of: <refentry><refnamediv><refpurpose>
#: apt-mark.8.xml:33
msgid "mark/unmark a package as being automatically-installed"
msgstr ""
-#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-mark.8.xml:39
-msgid ""
-" <command>apt-mark</command> <arg><option>-hv</option></arg> "
-"<arg><option>-f=<replaceable>FILENAME</replaceable></option></arg> <group "
-"choice=\"plain\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg "
-"choice=\"plain\">auto</arg> <arg choice=\"plain\">manual</arg> <arg "
-"choice=\"plain\">showauto</arg> <arg choice=\"plain\">showmanual</arg> "
-"</group> <arg choice=\"plain\" "
-"rep=\"repeat\"><replaceable>package</replaceable></arg> </arg> </group>"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:57
+#: apt-mark.8.xml:39
msgid ""
"<command>apt-mark</command> will change whether a package has been marked as "
"being automatically installed."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:61
+#: apt-mark.8.xml:43
msgid ""
"When you request that a package is installed, and as a result other packages "
"are installed to satisfy its dependencies, the dependencies are marked as "
@@ -3781,39 +2824,24 @@ msgid ""
"removed by e.g. <command>apt-get</command> or <command>aptitude</command>."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:69
-msgid "auto"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:70
+#: apt-mark.8.xml:52
msgid ""
"<literal>auto</literal> is used to mark a package as being automatically "
"installed, which will cause the package to be removed when no more manually "
"installed packages depend on this package."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:77
-msgid "manual"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:78
+#: apt-mark.8.xml:60
msgid ""
"<literal>manual</literal> is used to mark a package as being manually "
"installed, which will prevent the package from being automatically removed "
"if no other packages depend on it."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:85
-msgid "hold"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:86
+#: apt-mark.8.xml:68
msgid ""
"<literal>hold</literal> is used to mark a package as hold back, which will "
"prevent the package from being automatically installed, upgraded or "
@@ -3822,25 +2850,15 @@ msgid ""
"and not effected by the <option>--filename</option> option."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:95
-msgid "unhold"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:96
+#: apt-mark.8.xml:78
msgid ""
"<literal>unhold</literal> is used to cancel a previously set hold on a "
"package to allow all actions again."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:101
-msgid "showauto"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:102
+#: apt-mark.8.xml:84
msgid ""
"<literal>showauto</literal> is used to print a list of automatically "
"installed packages with each package on a new line. All automatically "
@@ -3848,79 +2866,60 @@ msgid ""
"given only those which are automatically installed will be shown."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:109
-msgid "showmanual"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:110
+#: apt-mark.8.xml:92
msgid ""
"<literal>showmanual</literal> can be used in the same way as "
"<literal>showauto</literal> except that it will print a list of manually "
"installed packages instead."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:116
-msgid "showhold"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:117
+#: apt-mark.8.xml:99
msgid ""
"<literal>showhold</literal> is used to print a list of packages on hold in "
"the same way as for the other show commands."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:130
-msgid "<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-mark.8.xml:131
-msgid "<option>--file=<filename><replaceable>FILENAME</replaceable></filename></option>"
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term><option><filename>
+#: apt-mark.8.xml:112 apt-mark.8.xml:113
+msgid "<replaceable>&synopsis-filename;</replaceable>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-mark.8.xml:134
+#: apt-mark.8.xml:115
msgid ""
-"Read/Write package stats from "
-"<filename><replaceable>FILENAME</replaceable></filename> instead of the "
-"default location, which is <filename>extended_status</filename> in the "
-"directory defined by the Configuration Item: <literal>Dir::State</literal>."
+"Read/Write package stats from the filename given with the parameter "
+"<filename><replaceable>&synopsis-filename;</replaceable></filename> instead "
+"of from the default location, which is <filename>extended_status</filename> "
+"in the directory defined by the Configuration Item: "
+"<literal>Dir::State</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-mark.8.xml:146
+#: apt-mark.8.xml:128
msgid " &file-extended_states;"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:151
+#: apt-mark.8.xml:133
msgid "&apt-get;,&aptitude;,&apt-conf;"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-mark.8.xml:155
+#: apt-mark.8.xml:137
msgid ""
"<command>apt-mark</command> returns zero on normal operation, non-zero on "
"error."
msgstr ""
-#. type: Content of: <refentry><refnamediv><refname>
-#: apt-secure.8.xml:17 apt-secure.8.xml:39
-msgid "apt-secure"
-msgstr ""
-
#. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt-secure.8.xml:40
+#: apt-secure.8.xml:47
msgid "Archive authentication support for APT"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:45
+#: apt-secure.8.xml:52
msgid ""
"Starting with version 0.6, <command>apt</command> contains code that does "
"signature checking of the Release file for all archives. This ensures that "
@@ -3929,7 +2928,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:53
+#: apt-secure.8.xml:60
msgid ""
"If a package comes from a archive without a signature or with a signature "
"that apt does not have a key for that package is considered untrusted and "
@@ -3939,19 +2938,19 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:62
+#: apt-secure.8.xml:69
msgid ""
"The package frontends &apt-get;, &aptitude; and &synaptic; support this new "
"authentication feature."
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:67
+#: apt-secure.8.xml:74
msgid "Trusted archives"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:70
+#: apt-secure.8.xml:77
msgid ""
"The chain of trust from an apt archive to the end user is made up of "
"different steps. <command>apt-secure</command> is the last step in this "
@@ -3962,7 +2961,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:78
+#: apt-secure.8.xml:85
msgid ""
"apt-secure does not review signatures at a package level. If you require "
"tools to do this you should look at <command>debsig-verify</command> and "
@@ -3971,7 +2970,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:85
+#: apt-secure.8.xml:92
msgid ""
"The chain of trust in Debian starts when a maintainer uploads a new package "
"or a new version of a package to the Debian archive. This upload in order to "
@@ -3982,7 +2981,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:95
+#: apt-secure.8.xml:102
msgid ""
"Once the uploaded package is verified and included in the archive, the "
"maintainer signature is stripped off, an MD5 sum of the package is computed "
@@ -3993,7 +2992,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:105
+#: apt-secure.8.xml:112
msgid ""
"Any end user can check the signature of the Release file, extract the MD5 "
"sum of a package from it and compare it with the MD5 sum of the package he "
@@ -4003,14 +3002,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:112
+#: apt-secure.8.xml:119
msgid ""
"Notice that this is distinct from checking signatures on a per package "
"basis. It is designed to prevent two possible attacks:"
msgstr ""
#. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:117
+#: apt-secure.8.xml:124
msgid ""
"<literal>Network \"man in the middle\" attacks</literal>. Without signature "
"checking, a malicious agent can introduce himself in the package download "
@@ -4020,7 +3019,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:125
+#: apt-secure.8.xml:132
msgid ""
"<literal>Mirror network compromise</literal>. Without signature checking, a "
"malicious agent can compromise a mirror host and modify the files in it to "
@@ -4029,7 +3028,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:132
+#: apt-secure.8.xml:139
msgid ""
"However, it does not defend against a compromise of the Debian master server "
"itself (which signs the packages) or against a compromise of the key used to "
@@ -4038,12 +3037,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:138
+#: apt-secure.8.xml:145
msgid "User configuration"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:140
+#: apt-secure.8.xml:147
msgid ""
"<command>apt-key</command> is the program that manages the list of keys used "
"by apt. It can be used to add or remove keys although an installation of "
@@ -4052,7 +3051,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:147
+#: apt-secure.8.xml:154
msgid ""
"In order to add a new key you need to first download it (you should make "
"sure you are using a trusted communication channel when retrieving it), add "
@@ -4063,19 +3062,19 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:156
+#: apt-secure.8.xml:163
msgid "Archive configuration"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:158
+#: apt-secure.8.xml:165
msgid ""
"If you want to provide archive signatures in an archive under your "
"maintenance you have to:"
msgstr ""
#. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:163
+#: apt-secure.8.xml:170
msgid ""
"<emphasis>Create a toplevel Release file</emphasis>, if it does not exist "
"already. You can do this by running <command>apt-ftparchive "
@@ -4083,7 +3082,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:168
+#: apt-secure.8.xml:175
msgid ""
"<emphasis>Sign it</emphasis>. You can do this by running <command>gpg "
"--clearsign -o InRelease Release</command> and <command>gpg -abs -o "
@@ -4091,7 +3090,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
-#: apt-secure.8.xml:172
+#: apt-secure.8.xml:179
msgid ""
"<emphasis>Publish the key fingerprint</emphasis>, that way your users will "
"know what key they need to import in order to authenticate the files in the "
@@ -4099,7 +3098,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:179
+#: apt-secure.8.xml:186
msgid ""
"Whenever the contents of the archive changes (new packages are added or "
"removed) the archive maintainer has to follow the first two steps previously "
@@ -4107,17 +3106,17 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:187
+#: apt-secure.8.xml:194
msgid ""
"&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, "
"&debsign; &debsig-verify;, &gpg;"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:191
+#: apt-secure.8.xml:198
msgid ""
"For more background information you might want to review the <ulink "
-"url=\"http://www.debian.org/doc/manuals/securing-debian-howto/ch7.en.html\">Debian "
+"url=\"http://www.debian.org/doc/manuals/securing-debian-howto/ch7\">Debian "
"Security Infrastructure</ulink> chapter of the Securing Debian Manual "
"(available also in the harden-doc package) and the <ulink "
"url=\"http://www.cryptnet.net/fdp/crypto/strong_distro.html\" >Strong "
@@ -4125,38 +3124,24 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-secure.8.xml:204
+#: apt-secure.8.xml:211
msgid "Manpage Authors"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-secure.8.xml:206
+#: apt-secure.8.xml:213
msgid ""
"This man-page is based on the work of Javier Fernández-Sanguino Peña, Isaac "
"Jones, Colin Walters, Florian Weimer and Michael Vogt."
msgstr ""
-#. type: Content of: <refentry><refnamediv><refname>
-#: apt-sortpkgs.1.xml:25 apt-sortpkgs.1.xml:32
-msgid "apt-sortpkgs"
-msgstr ""
-
#. type: Content of: <refentry><refnamediv><refpurpose>
#: apt-sortpkgs.1.xml:33
msgid "Utility to sort package index files"
msgstr ""
-#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
-#: apt-sortpkgs.1.xml:39
-msgid ""
-"<command>apt-sortpkgs</command> <arg><option>-hvs</option></arg> "
-"<arg><option>-o=<replaceable>config string</replaceable></option></arg> "
-"<arg><option>-c=<replaceable>file</replaceable></option></arg> <arg "
-"choice=\"plain\" rep=\"repeat\"><replaceable>file</replaceable></arg>"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><para>
-#: apt-sortpkgs.1.xml:48
+#: apt-sortpkgs.1.xml:39
msgid ""
"<command>apt-sortpkgs</command> will take an index file (Source index or "
"Package index) and sort the records so that they are ordered by the package "
@@ -4165,56 +3150,46 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-sortpkgs.1.xml:54
+#: apt-sortpkgs.1.xml:45
msgid "All output is sent to stdout, the input must be a seekable file."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-sortpkgs.1.xml:61
-msgid "<option>--source</option>"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-sortpkgs.1.xml:63
+#: apt-sortpkgs.1.xml:54
msgid ""
"Use Source index field ordering. Configuration Item: "
"<literal>APT::SortPkgs::Source</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-sortpkgs.1.xml:77
+#: apt-sortpkgs.1.xml:68
msgid ""
"<command>apt-sortpkgs</command> returns zero on normal operation, decimal "
"100 on error."
msgstr ""
-#. The last update date
-#. type: Content of: <refentry><refentryinfo>
-#: apt.conf.5.xml:16
-msgid ""
-"&apt-author.jgunthorpe; &apt-author.team; <author> "
-"<firstname>Daniel</firstname> <surname>Burrows</surname> <contrib>Initial "
-"documentation of Debug::*.</contrib> <email>dburrows@debian.org</email> "
-"</author> &apt-email; &apt-product; <date>16 January 2010</date>"
+#. type: Content of: <refentry><refentryinfo><author><contrib>
+#: apt.conf.5.xml:20
+msgid "Initial documentation of Debug::*."
msgstr ""
-#. type: Content of: <refentry><refnamediv><refname>
-#: apt.conf.5.xml:31 apt.conf.5.xml:38
-msgid "apt.conf"
+#. type: Content of: <refentry><refentryinfo><author><email>
+#: apt.conf.5.xml:21
+msgid "dburrows@debian.org"
msgstr ""
#. type: Content of: <refentry><refmeta><manvolnum>
-#: apt.conf.5.xml:32 apt_preferences.5.xml:25 sources.list.5.xml:26
+#: apt.conf.5.xml:31 apt_preferences.5.xml:25 sources.list.5.xml:26
msgid "5"
msgstr ""
#. type: Content of: <refentry><refnamediv><refpurpose>
-#: apt.conf.5.xml:39
+#: apt.conf.5.xml:38
msgid "Configuration file for APT"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:43
+#: apt.conf.5.xml:42
msgid ""
"<filename>apt.conf</filename> is the main configuration file for the APT "
"suite of tools, but by far not the only place changes to options can be "
@@ -4223,21 +3198,21 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><orderedlist><para>
-#: apt.conf.5.xml:48
+#: apt.conf.5.xml:47
msgid ""
"When an APT tool starts up it will read the configuration files in the "
"following order:"
msgstr ""
#. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
-#: apt.conf.5.xml:50
+#: apt.conf.5.xml:49
msgid ""
"the file specified by the <envar>APT_CONFIG</envar> environment variable (if "
"any)"
msgstr ""
#. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
-#: apt.conf.5.xml:52
+#: apt.conf.5.xml:51
msgid ""
"all files in <literal>Dir::Etc::Parts</literal> in alphanumeric ascending "
"order which have either no or \"<literal>conf</literal>\" as filename "
@@ -4249,24 +3224,24 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
-#: apt.conf.5.xml:59
+#: apt.conf.5.xml:58
msgid "the main configuration file specified by <literal>Dir::Etc::main</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
-#: apt.conf.5.xml:61
+#: apt.conf.5.xml:60
msgid ""
"the command line options are applied to override the configuration "
"directives or to load even more configuration files."
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:65
+#: apt.conf.5.xml:64
msgid "Syntax"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:66
+#: apt.conf.5.xml:65
msgid ""
"The configuration file is organized in a tree with options organized into "
"functional groups. Option specification is given with a double colon "
@@ -4276,7 +3251,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:72
+#: apt.conf.5.xml:71
msgid ""
"Syntactically the configuration language is modeled after what the ISC tools "
"such as bind and dhcp use. Lines starting with <literal>//</literal> are "
@@ -4292,7 +3267,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><informalexample><programlisting>
-#: apt.conf.5.xml:86
+#: apt.conf.5.xml:85
#, no-wrap
msgid ""
"APT {\n"
@@ -4304,7 +3279,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:94
+#: apt.conf.5.xml:93
msgid ""
"with newlines placed to make it more readable. Lists can be created by "
"opening a scope and including a single string enclosed in quotes followed by "
@@ -4313,13 +3288,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><informalexample><programlisting>
-#: apt.conf.5.xml:99
+#: apt.conf.5.xml:98
#, no-wrap
msgid "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:102
+#: apt.conf.5.xml:101
msgid ""
"In general the sample configuration file in "
"<filename>&docdir;examples/apt.conf</filename> &configureindex; is a good "
@@ -4327,14 +3302,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:106
+#: apt.conf.5.xml:105
msgid ""
"The names of the configuration items are not case-sensitive. So in the "
"previous example you could use <literal>dpkg::pre-install-pkgs</literal>."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:109
+#: apt.conf.5.xml:108
msgid ""
"Names for the configuration items are optional if a list is defined as it "
"can be see in the <literal>DPkg::Pre-Install-Pkgs</literal> example "
@@ -4344,7 +3319,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:114
+#: apt.conf.5.xml:113
msgid ""
"Two specials are allowed, <literal>#include</literal> (which is deprecated "
"and not supported by alternative implementations) and "
@@ -4356,7 +3331,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:122
+#: apt.conf.5.xml:121
msgid ""
"The #clear command is the only way to delete a list or a complete scope. "
"Reopening a scope or the ::-style described below will "
@@ -4366,23 +3341,23 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:127
+#: apt.conf.5.xml:126
msgid ""
"All of the APT tools take a -o option which allows an arbitrary "
"configuration directive to be specified on the command line. The syntax is a "
"full option name (<literal>APT::Get::Assume-Yes</literal> for instance) "
-"followed by an equals sign then the new value of the option. Lists can be "
-"appended too by adding a trailing :: to the list name. (As you might "
+"followed by an equals sign then the new value of the option. To append a new "
+"element to a list, add a trailing :: to the name of the list. (As you might "
"suspect: The scope syntax can't be used on the command line.)"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:134
+#: apt.conf.5.xml:133
msgid ""
"Note that you can use :: only for appending one item per line to a list and "
"that you should not use it in combination with the scope syntax. (The scope "
"syntax implicit insert ::) Using both syntaxes together will trigger a bug "
-"which some users unfortunately relay on: An option with the unusual name "
+"which some users unfortunately depend on: An option with the unusual name "
"\"<literal>::</literal>\" which acts like every other option with a "
"name. These introduces many problems including that a user who writes "
"multiple lines in this <emphasis>wrong</emphasis> syntax in the hope to "
@@ -4394,24 +3369,19 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:146
+#: apt.conf.5.xml:145
msgid "The APT Group"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:147
+#: apt.conf.5.xml:146
msgid ""
"This group of options controls general APT behavior as well as holding the "
"options for all of the tools."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:151
-msgid "Architecture"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:152
+#: apt.conf.5.xml:151
msgid ""
"System Architecture; sets the architecture to use when fetching files and "
"parsing package lists. The internal default is the architecture apt was "
@@ -4419,23 +3389,20 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:158
+#: apt.conf.5.xml:157
msgid ""
"All Architectures the system supports. Processors implementing the "
-"<literal>amd64</literal> are e.g. also able to execute binaries compiled for "
-"<literal>i386</literal>; This list is use when fetching files and parsing "
-"package lists. The internal default is always the native architecture "
-"(<literal>APT::Architecture</literal>) and all foreign architectures it can "
-"retrieve by calling <command>dpkg --print-foreign-architectures</command>."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:165
-msgid "Default-Release"
+"<literal>amd64</literal> (also called <literal>x86-64</literal>) instruction "
+"set are e.g. also able to execute binaries compiled for the "
+"<literal>i386</literal> (<literal>x86</literal>) instruction set; This list "
+"is use when fetching files and parsing package lists. The internal default "
+"is always the native architecture (<literal>APT::Architecture</literal>) "
+"and all foreign architectures it can retrieve by calling <command>dpkg "
+"--print-foreign-architectures</command>."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:166
+#: apt.conf.5.xml:167
msgid ""
"Default release to install packages from if more than one version "
"available. Contains release name, codename or release version. Examples: "
@@ -4443,25 +3410,15 @@ msgid ""
"'4.0', '5.0*'. See also &apt-preferences;."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:171
-msgid "Ignore-Hold"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:172
+#: apt.conf.5.xml:173
msgid ""
"Ignore Held packages; This global option causes the problem resolver to "
"ignore held packages in its decision making."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:176
-msgid "Clean-Installed"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:177
+#: apt.conf.5.xml:178
msgid ""
"Defaults to on. When turned on the autoclean feature will remove any "
"packages which can no longer be downloaded from the cache. If turned off "
@@ -4469,13 +3426,8 @@ msgid ""
"but note that APT provides no direct means to reinstall them."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:183
-msgid "Immediate-Configure"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:184
+#: apt.conf.5.xml:185
msgid ""
"Defaults to on which will cause APT to install essential and important "
"packages as fast as possible in the install/upgrade operation. This is done "
@@ -4507,13 +3459,8 @@ msgid ""
"work on improving or correcting the upgrade process."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:206
-msgid "Force-LoopBreak"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:207
+#: apt.conf.5.xml:208
msgid ""
"Never Enable this option unless you -really- know what you are doing. It "
"permits APT to temporarily remove an essential package to break a "
@@ -4523,90 +3470,60 @@ msgid ""
"anything that those packages depend on."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:215
-msgid "Cache-Start, Cache-Grow and Cache-Limit"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:216
+#: apt.conf.5.xml:217
msgid ""
"APT uses since version 0.7.26 a resizable memory mapped cache file to store "
"the 'available' information. <literal>Cache-Start</literal> acts as a hint "
"to which size the Cache will grow and is therefore the amount of memory APT "
"will request at startup. The default value is 20971520 bytes (~20 MB). Note "
-"that these amount of space need to be available for APT otherwise it will "
-"likely fail ungracefully, so for memory restricted devices these value "
-"should be lowered while on systems with a lot of configured sources this "
-"might be increased. <literal>Cache-Grow</literal> defines in byte with the "
-"default of 1048576 (~1 MB) how much the Cache size will be increased in the "
-"event the space defined by <literal>Cache-Start</literal> is not "
-"enough. These value will be applied again and again until either the cache "
-"is big enough to store all information or the size of the cache reaches the "
+"that this amount of space needs to be available for APT otherwise it will "
+"likely fail ungracefully, so for memory restricted devices this value should "
+"be lowered while on systems with a lot of configured sources it should be "
+"increased. <literal>Cache-Grow</literal> defines in bytes with the default "
+"of 1048576 (~1 MB) how much the Cache size will be increased in the event "
+"the space defined by <literal>Cache-Start</literal> is not enough. These "
+"value will be applied again and again until either the cache is big enough "
+"to store all information or the size of the cache reaches the "
"<literal>Cache-Limit</literal>. The default of "
"<literal>Cache-Limit</literal> is 0 which stands for no limit. If "
"<literal>Cache-Grow</literal> is set to 0 the automatic grow of the cache is "
"disabled."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:231
-msgid "Build-Essential"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:232
+#: apt.conf.5.xml:233
msgid "Defines which package(s) are considered essential build dependencies."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:235
-msgid "Get"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:236
+#: apt.conf.5.xml:237
msgid ""
"The Get subsection controls the &apt-get; tool, please see its documentation "
"for more information about the options here."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:240
-msgid "Cache"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:241
+#: apt.conf.5.xml:242
msgid ""
"The Cache subsection controls the &apt-cache; tool, please see its "
"documentation for more information about the options here."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:245
-msgid "CDROM"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:246
+#: apt.conf.5.xml:247
msgid ""
"The CDROM subsection controls the &apt-cdrom; tool, please see its "
"documentation for more information about the options here."
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:252
+#: apt.conf.5.xml:253
msgid "The Acquire Group"
msgstr ""
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:257
-msgid "Check-Valid-Until"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:258
+#: apt.conf.5.xml:259
msgid ""
"Security related option defaulting to true as an expiring validation for a "
"Release file prevents longtime replay attacks and can e.g. also help users "
@@ -4617,69 +3534,49 @@ msgid ""
"<literal>Max-ValidTime</literal> option can be used."
msgstr ""
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:268
-msgid "Max-ValidTime"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:269
+#: apt.conf.5.xml:270
msgid ""
"Seconds the Release file should be considered valid after it was created "
"(indicated by the <literal>Date</literal> header). If the Release file "
"itself includes a <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 \"for ever\". Archive specific "
+"<literal>0</literal> which stands for \"for ever valid\". Archive specific "
"settings can be made by appending the label of the archive to the option "
"name."
msgstr ""
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:279
-msgid "Min-ValidTime"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:280
+#: apt.conf.5.xml:281
msgid ""
"Minimum of seconds the Release file should be considered valid after it was "
"created (indicated by the <literal>Date</literal> header). Use this if you "
"need to use a seldomly updated (local) mirror of a more regular updated "
-"archive with a <literal>Valid-Until</literal> header instead of competely "
+"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."
msgstr ""
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:290
-msgid "PDiffs"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:291
+#: apt.conf.5.xml:292
msgid ""
"Try to download deltas called <literal>PDiffs</literal> for Packages or "
"Sources files instead of downloading whole ones. True by default."
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:294
+#: apt.conf.5.xml:295
msgid ""
"Two sub-options to limit the use of PDiffs are also available: With "
"<literal>FileLimit</literal> can be specified how many PDiff files are "
-"downloaded at most to patch a file. <literal>SizeLimit</literal> on the "
+"downloaded at most to update a file. <literal>SizeLimit</literal> on the "
"other hand is the maximum percentage of the size of all patches compared to "
"the size of the targeted file. If one of these limits is exceeded the "
"complete file is downloaded instead of the patches."
msgstr ""
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:303
-msgid "Queue-Mode"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:304
+#: apt.conf.5.xml:305
msgid ""
"Queuing mode; <literal>Queue-Mode</literal> can be one of "
"<literal>host</literal> or <literal>access</literal> which determines how "
@@ -4688,37 +3585,22 @@ msgid ""
"means that one connection per URI type will be opened."
msgstr ""
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:311
-msgid "Retries"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:312
+#: apt.conf.5.xml:313
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><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:316
-msgid "Source-Symlinks"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:317
+#: apt.conf.5.xml:318
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><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:321 sources.list.5.xml:160
-msgid "http"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:322
+#: apt.conf.5.xml:323
msgid ""
"HTTP URIs; http::Proxy is the default http proxy to use. It is in the "
"standard form of <literal>http://[[user][:pass]@]host[:port]/</literal>. Per "
@@ -4730,7 +3612,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:330
+#: apt.conf.5.xml:331
msgid ""
"Three settings are provided for cache control with HTTP/1.1 compliant proxy "
"caches. <literal>No-Cache</literal> tells the proxy to not use its cached "
@@ -4744,7 +3626,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:340 apt.conf.5.xml:404
+#: apt.conf.5.xml:341 apt.conf.5.xml:407
msgid ""
"The option <literal>timeout</literal> sets the timeout timer used by the "
"method, this applies to all things including connection timeout and data "
@@ -4752,20 +3634,27 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:343
+#: apt.conf.5.xml:344
msgid ""
-"One setting is provided to control the pipeline depth in cases where the "
-"remote server is not RFC conforming or buggy (such as Squid 2.0.2). "
-"<literal>Acquire::http::Pipeline-Depth</literal> can be a value from 0 to 5 "
-"indicating how many outstanding requests APT should send. A value of zero "
-"MUST be specified if the remote host does not properly linger on TCP "
-"connections - otherwise data corruption will occur. Hosts which require this "
-"are in violation of RFC 2068."
+"The setting <literal>Acquire::http::Pipeline-Depth</literal> can be used to "
+"enabled HTTP pipeling (RFC 2616 section 8.1.2.2) which can be beneficial "
+"e.g. on high-latency connections. It specifies how many requests are send in "
+"a pipeline. Previous APT versions had a default of 10 for this setting, but "
+"the default value is now 0 (= disabled) to avoid problems with the "
+"ever-growing amount of webservers and proxies which choose to not conform to "
+"the HTTP/1.1 specification."
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml:351
msgid ""
+"<literal>Acquire::http::AllowRedirect</literal> controls if APT will follow "
+"redirects, which is enabled by default."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:354
+msgid ""
"The used bandwidth can be limited with "
"<literal>Acquire::http::Dl-Limit</literal> which accepts integer values in "
"kilobyte. The default value is 0 which deactivates the limit and tries uses "
@@ -4774,20 +3663,15 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:356
+#: apt.conf.5.xml:359
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 "
"clients only if the client uses a known identifier."
msgstr ""
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:362
-msgid "https"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:363
+#: apt.conf.5.xml:366
msgid ""
"HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy "
"options are the same as for <literal>http</literal> method and will also "
@@ -4797,7 +3681,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:369
+#: apt.conf.5.xml:372
msgid ""
"<literal>CaInfo</literal> suboption specifies place of file that holds info "
"about trusted certificates. <literal>&lt;host&gt;::CaInfo</literal> is "
@@ -4818,13 +3702,8 @@ msgid ""
"option."
msgstr ""
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:387 sources.list.5.xml:171
-msgid "ftp"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:388
+#: apt.conf.5.xml:391
msgid ""
"FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the standard "
"form of <literal>ftp://[[user][:pass]@]host[:port]/</literal>. Per host "
@@ -4844,7 +3723,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:407
+#: apt.conf.5.xml:410
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 "
@@ -4854,7 +3733,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:414
+#: apt.conf.5.xml:417
msgid ""
"It is possible to proxy FTP over HTTP by setting the "
"<envar>ftp_proxy</envar> environment variable to a http url - see the "
@@ -4864,7 +3743,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:419
+#: apt.conf.5.xml:422
msgid ""
"The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
"<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@ -4873,19 +3752,14 @@ msgid ""
"that most FTP servers do not support RFC2428."
msgstr ""
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:426 sources.list.5.xml:153
-msgid "cdrom"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:432
+#: apt.conf.5.xml:435
#, no-wrap
msgid "/cdrom/::Mount \"foo\";"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:427
+#: apt.conf.5.xml:430
msgid ""
"CDROM URIs; the only setting for CDROM URIs is the mount point, "
"<literal>cdrom::Mount</literal> which must be the mount point for the CDROM "
@@ -4897,26 +3771,16 @@ msgid ""
"can be specified using UMount."
msgstr ""
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:437
-msgid "gpgv"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:438
+#: apt.conf.5.xml:441
msgid ""
"GPGV URIs; the only option for GPGV URIs is the option to pass additional "
"parameters to gpgv. <literal>gpgv::Options</literal> Additional options "
"passed to gpgv."
msgstr ""
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:443
-msgid "CompressionTypes"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:449
+#: apt.conf.5.xml:452
#, no-wrap
msgid ""
"Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> "
@@ -4924,7 +3788,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:444
+#: apt.conf.5.xml:447
msgid ""
"List of compression types which are understood by the acquire methods. "
"Files like <filename>Packages</filename> can be available in various "
@@ -4936,19 +3800,19 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:454
+#: apt.conf.5.xml:457
#, no-wrap
msgid "Acquire::CompressionTypes::Order:: \"gz\";"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:457
+#: apt.conf.5.xml:460
#, no-wrap
msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:450
+#: apt.conf.5.xml:453
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 "
@@ -4965,13 +3829,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:461
+#: apt.conf.5.xml:464
#, no-wrap
msgid "Dir::Bin::bzip2 \"/bin/bzip2\";"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:459
+#: apt.conf.5.xml:462
msgid ""
"Note that at run time the "
"<literal>Dir::Bin::<replaceable>Methodname</replaceable></literal> will be "
@@ -4986,20 +3850,15 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:466
+#: apt.conf.5.xml:469
msgid ""
"The special type <literal>uncompressed</literal> can be used to give "
"uncompressed files a preference, but note that most archives don't provide "
"uncompressed files so this is mostly only useable for local mirrors."
msgstr ""
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:471
-msgid "GzipIndexes"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:473
+#: apt.conf.5.xml:476
msgid ""
"When downloading <literal>gzip</literal> compressed indexes (Packages, "
"Sources, or Translations), keep them gzip compressed locally instead of "
@@ -5007,13 +3866,8 @@ msgid ""
"CPU requirements when building the local package caches. False by default."
msgstr ""
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:480
-msgid "Languages"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:481
+#: apt.conf.5.xml:484
msgid ""
"The Languages subsection controls which <filename>Translation</filename> "
"files are downloaded and in which order APT tries to display the "
@@ -5026,13 +3880,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><programlisting>
-#: apt.conf.5.xml:497
+#: apt.conf.5.xml:500
#, no-wrap
msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:487
+#: apt.conf.5.xml:490
msgid ""
"The default list includes \"environment\" and "
"\"en\". \"<literal>environment</literal>\" has a special meaning here: It "
@@ -5054,8 +3908,18 @@ msgid ""
"<placeholder type=\"programlisting\" id=\"0\"/>"
msgstr ""
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:501
+msgid ""
+"Note: To prevent problems resulting from APT being executed in different "
+"environments (e.g. by different users or by other programs) all Translation "
+"files which are found in <filename>/var/lib/apt/lists/</filename> will be "
+"added to the end of the list (after an implicit "
+"\"<literal>none</literal>\")."
+msgstr ""
+
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:253
+#: apt.conf.5.xml:254
msgid ""
"The <literal>Acquire</literal> group of options controls the download of "
"packages and the URI handlers. <placeholder type=\"variablelist\" "
@@ -5063,24 +3927,24 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:504
+#: apt.conf.5.xml:512
msgid "Directories"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:506
+#: apt.conf.5.xml:514
msgid ""
"The <literal>Dir::State</literal> section has directories that pertain to "
"local state information. <literal>lists</literal> is the directory to place "
"downloaded package lists in and <literal>status</literal> is the name of the "
"dpkg status file. <literal>preferences</literal> is the name of the APT "
-"preferences file. <literal>Dir::State</literal> contains the default "
-"directory to prefix on all sub items if they do not start with "
-"<filename>/</filename> or <filename>./</filename>."
+"<filename>preferences</filename> file. <literal>Dir::State</literal> "
+"contains the default directory to prefix on all sub items if they do not "
+"start with <filename>/</filename> or <filename>./</filename>."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:513
+#: apt.conf.5.xml:521
msgid ""
"<literal>Dir::Cache</literal> contains locations pertaining to local cache "
"information, such as the two package caches <literal>srcpkgcache</literal> "
@@ -5093,7 +3957,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:522
+#: apt.conf.5.xml:530
msgid ""
"<literal>Dir::Etc</literal> contains the location of configuration files, "
"<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -5103,7 +3967,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:528
+#: apt.conf.5.xml:536
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 "
@@ -5111,7 +3975,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:532
+#: apt.conf.5.xml:540
msgid ""
"Binary programs are pointed to by "
"<literal>Dir::Bin</literal>. <literal>Dir::Bin::Methods</literal> specifies "
@@ -5123,7 +3987,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:540
+#: apt.conf.5.xml:548
msgid ""
"The configuration item <literal>RootDir</literal> has a special meaning. If "
"set, all paths in <literal>Dir::</literal> will be relative to "
@@ -5136,7 +4000,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:553
+#: apt.conf.5.xml:561
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 "
@@ -5147,25 +4011,20 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:562
+#: apt.conf.5.xml:570
msgid "APT in DSelect"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:564
+#: apt.conf.5.xml:572
msgid ""
"When APT is used as a &dselect; method several configuration directives "
"control the default behaviour. These are in the <literal>DSelect</literal> "
"section."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:568
-msgid "Clean"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:569
+#: apt.conf.5.xml:577
msgid ""
"Cache Clean mode; this value may be one of always, prompt, auto, pre-auto "
"and never. always and prompt will remove all packages from the cache after "
@@ -5176,68 +4035,48 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:578
+#: apt.conf.5.xml:586
msgid ""
"The contents of this variable is passed to &apt-get; as command line options "
"when it is run for the install phase."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:582
-msgid "Updateoptions"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:583
+#: apt.conf.5.xml:591
msgid ""
"The contents of this variable is passed to &apt-get; as command line options "
"when it is run for the update phase."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:587
-msgid "PromptAfterUpdate"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:588
+#: apt.conf.5.xml:596
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:594
+#: apt.conf.5.xml:602
msgid "How APT calls dpkg"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:595
+#: apt.conf.5.xml:603
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:600
+#: apt.conf.5.xml:608
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 "
"&dpkg;."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:605
-msgid "Pre-Invoke"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:605
-msgid "Post-Invoke"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:606
+#: apt.conf.5.xml:614
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 "
@@ -5245,13 +4084,8 @@ msgid ""
"fail APT will abort."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:612
-msgid "Pre-Install-Pkgs"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:613
+#: apt.conf.5.xml:621
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 "
@@ -5261,7 +4095,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:619
+#: apt.conf.5.xml:627
msgid ""
"Version 2 of this protocol dumps more information, including the protocol "
"version, the APT configuration space and the packages, files and versions "
@@ -5271,37 +4105,27 @@ msgid ""
"<literal>Pre-Install-Pkgs</literal>."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:626
-msgid "Run-Directory"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:627
+#: apt.conf.5.xml:635
msgid ""
"APT chdirs to this directory before invoking dpkg, the default is "
"<filename>/</filename>."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:631
-msgid "Build-options"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:632
+#: apt.conf.5.xml:640
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:637
+#: apt.conf.5.xml:645
msgid "dpkg trigger usage (and related options)"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:638
+#: apt.conf.5.xml:646
msgid ""
"APT can call dpkg in a way so it can make aggressive use of triggers over "
"multiple calls of dpkg. Without further options dpkg will use triggers only "
@@ -5316,7 +4140,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:653
+#: apt.conf.5.xml:661
#, no-wrap
msgid ""
"DPkg::NoTriggers \"true\";\n"
@@ -5326,7 +4150,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:647
+#: apt.conf.5.xml:655
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 "
@@ -5339,13 +4163,8 @@ msgid ""
"would be <placeholder type=\"literallayout\" id=\"0\"/>"
msgstr ""
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:659
-msgid "DPkg::NoTriggers"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:660
+#: apt.conf.5.xml:668
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 "
@@ -5356,13 +4175,8 @@ msgid ""
"dpkg - now apt will add these flag also to the unpack and remove calls."
msgstr ""
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:667
-msgid "PackageManager::Configure"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:668
+#: apt.conf.5.xml:676
msgid ""
"Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
"and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default "
@@ -5378,13 +4192,8 @@ msgid ""
"could be unbootable!"
msgstr ""
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:678
-msgid "DPkg::ConfigurePending"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:679
+#: apt.conf.5.xml:687
msgid ""
"If this option is set apt will call <command>dpkg --configure "
"--pending</command> to let dpkg handle all required configurations and "
@@ -5395,13 +4204,8 @@ msgid ""
"the last run."
msgstr ""
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:685
-msgid "DPkg::TriggersPending"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:686
+#: apt.conf.5.xml:694
msgid ""
"Useful for <literal>smart</literal> configuration as a package which has "
"pending triggers is not considered as <literal>installed</literal> and dpkg "
@@ -5410,13 +4214,8 @@ msgid ""
"triggers, not only the triggers needed to configure this package."
msgstr ""
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:691
-msgid "PackageManager::UnpackAll"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:692
+#: apt.conf.5.xml:700
msgid ""
"As the configuration can be deferred to be done at the end by dpkg it can be "
"tried to order the unpack series only by critical needs, e.g. by "
@@ -5427,13 +4226,8 @@ msgid ""
"really useful."
msgstr ""
-#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:699
-msgid "OrderList::Score::Immediate"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:707
+#: apt.conf.5.xml:715
#, no-wrap
msgid ""
"OrderList::Score {\n"
@@ -5445,7 +4239,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:700
+#: apt.conf.5.xml:708
msgid ""
"Essential packages (and there dependencies) should be configured immediately "
"after unpacking. It will be a good idea to do this quite early in the "
@@ -5459,12 +4253,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:720
+#: apt.conf.5.xml:728
msgid "Periodic and Archives options"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:721
+#: apt.conf.5.xml:729
msgid ""
"<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
"of options configure behavior of apt periodic updates, which is done by "
@@ -5473,12 +4267,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:729
+#: apt.conf.5.xml:737
msgid "Debug options"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:731
+#: apt.conf.5.xml:739
msgid ""
"Enabling options in the <literal>Debug::</literal> section will cause "
"debugging information to be sent to the standard error stream of the program "
@@ -5489,7 +4283,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:742
+#: apt.conf.5.xml:750
msgid ""
"<literal>Debug::pkgProblemResolver</literal> enables output about the "
"decisions made by <literal>dist-upgrade, upgrade, install, remove, "
@@ -5497,7 +4291,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:750
+#: apt.conf.5.xml:758
msgid ""
"<literal>Debug::NoLocking</literal> disables all file locking. This can be "
"used to run some operations (for instance, <literal>apt-get -s "
@@ -5505,7 +4299,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:759
+#: apt.conf.5.xml:767
msgid ""
"<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
"time that <literal>apt</literal> invokes &dpkg;."
@@ -5515,203 +4309,118 @@ 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:767
+#: apt.conf.5.xml:775
msgid ""
"<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
"in CDROM IDs."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:777
+#: apt.conf.5.xml:785
msgid "A full list of debugging options to apt follows."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:782
-msgid "<literal>Debug::Acquire::cdrom</literal>"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:786
+#: apt.conf.5.xml:794
msgid "Print information related to accessing <literal>cdrom://</literal> sources."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:793
-msgid "<literal>Debug::Acquire::ftp</literal>"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:797
+#: apt.conf.5.xml:805
msgid "Print information related to downloading packages using FTP."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:804
-msgid "<literal>Debug::Acquire::http</literal>"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:808
+#: apt.conf.5.xml:816
msgid "Print information related to downloading packages using HTTP."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:815
-msgid "<literal>Debug::Acquire::https</literal>"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:819
+#: apt.conf.5.xml:827
msgid "Print information related to downloading packages using HTTPS."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:826
-msgid "<literal>Debug::Acquire::gpgv</literal>"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:830
+#: apt.conf.5.xml:838
msgid ""
"Print information related to verifying cryptographic signatures using "
"<literal>gpg</literal>."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:837
-msgid "<literal>Debug::aptcdrom</literal>"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:841
+#: apt.conf.5.xml:849
msgid ""
"Output information about the process of accessing collections of packages "
"stored on CD-ROMs."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:848
-msgid "<literal>Debug::BuildDeps</literal>"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:851
+#: apt.conf.5.xml:859
msgid "Describes the process of resolving build-dependencies in &apt-get;."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:858
-msgid "<literal>Debug::Hashes</literal>"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:861
+#: apt.conf.5.xml:869
msgid ""
"Output each cryptographic hash that is generated by the "
"<literal>apt</literal> libraries."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:868
-msgid "<literal>Debug::IdentCDROM</literal>"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:871
+#: apt.conf.5.xml:879
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 "
"a CD-ROM."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:879
-msgid "<literal>Debug::NoLocking</literal>"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:882
+#: apt.conf.5.xml:890
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><term>
-#: apt.conf.5.xml:890
-msgid "<literal>Debug::pkgAcquire</literal>"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:894
+#: apt.conf.5.xml:902
msgid "Log when items are added to or removed from the global download queue."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:901
-msgid "<literal>Debug::pkgAcquire::Auth</literal>"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:904
+#: apt.conf.5.xml:912
msgid ""
"Output status messages and errors related to verifying checksums and "
"cryptographic signatures of downloaded files."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:911
-msgid "<literal>Debug::pkgAcquire::Diffs</literal>"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:914
+#: apt.conf.5.xml:922
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><term>
-#: apt.conf.5.xml:922
-msgid "<literal>Debug::pkgAcquire::RRed</literal>"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:926
+#: apt.conf.5.xml:934
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><term>
-#: apt.conf.5.xml:933
-msgid "<literal>Debug::pkgAcquire::Worker</literal>"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:937
+#: apt.conf.5.xml:945
msgid "Log all interactions with the sub-processes that actually perform downloads."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:944
-msgid "<literal>Debug::pkgAutoRemove</literal>"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:948
+#: apt.conf.5.xml:956
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><term>
-#: apt.conf.5.xml:955
-msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:958
+#: apt.conf.5.xml:966
msgid ""
"Generate debug messages describing which packages are being automatically "
"installed to resolve dependencies. This corresponds to the initial "
@@ -5720,13 +4429,8 @@ msgid ""
"<literal>Debug::pkgProblemResolver</literal> for that."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:969
-msgid "<literal>Debug::pkgDepCache::Marker</literal>"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:972
+#: apt.conf.5.xml:980
msgid ""
"Generate debug messages describing which package is marked as "
"keep/install/remove while the ProblemResolver does his work. Each addition "
@@ -5743,138 +4447,82 @@ msgid ""
"section the package appears in."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:991
-msgid "<literal>Debug::pkgInitConfig</literal>"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:994
+#: apt.conf.5.xml:1002
msgid "Dump the default configuration to standard error on startup."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1001
-msgid "<literal>Debug::pkgDPkgPM</literal>"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1004
+#: apt.conf.5.xml:1012
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><term>
-#: apt.conf.5.xml:1012
-msgid "<literal>Debug::pkgDPkgProgressReporting</literal>"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1015
+#: apt.conf.5.xml:1023
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><term>
-#: apt.conf.5.xml:1022
-msgid "<literal>Debug::pkgOrderList</literal>"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1026
+#: apt.conf.5.xml:1034
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><term>
-#: apt.conf.5.xml:1034
-msgid "<literal>Debug::pkgPackageManager</literal>"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1038
+#: apt.conf.5.xml:1046
msgid "Output status messages tracing the steps performed when invoking &dpkg;."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1045
-msgid "<literal>Debug::pkgPolicy</literal>"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1049
+#: apt.conf.5.xml:1057
msgid "Output the priority of each package list on startup."
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1055
-msgid "<literal>Debug::pkgProblemResolver</literal>"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1059
+#: apt.conf.5.xml:1067
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><term>
-#: apt.conf.5.xml:1067
-msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1070
+#: apt.conf.5.xml:1078
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 "
"described in <literal>Debug::pkgDepCache::Marker</literal>"
msgstr ""
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:1078
-msgid "<literal>Debug::sourceList</literal>"
-msgstr ""
-
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:1082
+#: apt.conf.5.xml:1090
msgid ""
"Print information about the vendors read from "
"<filename>/etc/apt/vendors.list</filename>."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1105
+#: apt.conf.5.xml:1113
msgid ""
"&configureindex; is a configuration file showing example values for all "
"possible options."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt.conf.5.xml:1112
+#: apt.conf.5.xml:1120
msgid "&file-aptconf;"
msgstr ""
#. ? reading apt.conf
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:1117
+#: apt.conf.5.xml:1125
msgid "&apt-cache;, &apt-config;, &apt-preferences;."
msgstr ""
-#. The last update date
-#. type: Content of: <refentry><refentryinfo>
-#: apt_preferences.5.xml:16
-msgid "&apt-author.team; &apt-email; &apt-product; <date>16 February 2010</date>"
-msgstr ""
-
-#. type: Content of: <refentry><refnamediv><refname>
-#: apt_preferences.5.xml:24 apt_preferences.5.xml:31
-msgid "apt_preferences"
-msgstr ""
-
#. type: Content of: <refentry><refnamediv><refpurpose>
#: apt_preferences.5.xml:32
msgid "Preference control file for APT"
@@ -6294,93 +4942,94 @@ msgid ""
"Pin-Priority: 990\n"
msgstr ""
-#. type: Content of: <refentry><refsect1><refsect2><literal>
-#: apt_preferences.5.xml:290
-msgid "Package"
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><refsect2><literal>
-#: apt_preferences.5.xml:296
-msgid "*"
+#. type: Content of: <refentry><refsect1><refsect2><para>
+#: apt_preferences.5.xml:291
+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 "
+"of all package names it matches. It is undecided whether this will change in "
+"the future, thus you should always list wild-card pins first, so later "
+"specific pins override it. The pattern \"<literal>*</literal>\" in a "
+"Package field is not considered a glob() expression in itself."
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:306
+#: apt_preferences.5.xml:307
msgid "How APT Interprets Priorities"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:314
+#: apt_preferences.5.xml:315
msgid "P &gt; 1000"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:315
+#: apt_preferences.5.xml:316
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:319
+#: apt_preferences.5.xml:320
msgid "990 &lt; P &lt;=1000"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:320
+#: apt_preferences.5.xml:321
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:325
+#: apt_preferences.5.xml:326
msgid "500 &lt; P &lt;=990"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:326
+#: apt_preferences.5.xml:327
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:331
+#: apt_preferences.5.xml:332
msgid "100 &lt; P &lt;=500"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:332
+#: apt_preferences.5.xml:333
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:337
+#: apt_preferences.5.xml:338
msgid "0 &lt; P &lt;=100"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:338
+#: apt_preferences.5.xml:339
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:342
+#: apt_preferences.5.xml:343
msgid "P &lt; 0"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:343
+#: apt_preferences.5.xml:344
msgid "prevents the version from being installed"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:309
+#: apt_preferences.5.xml:310
msgid ""
"Priorities (P) assigned in the APT preferences file must be positive or "
"negative integers. They are interpreted as follows (roughly speaking): "
@@ -6388,7 +5037,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:348
+#: apt_preferences.5.xml:349
msgid ""
"If any specific-form records match an available package version then the "
"first such record determines the priority of the package version. Failing "
@@ -6397,14 +5046,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:354
+#: apt_preferences.5.xml:355
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:358
+#: apt_preferences.5.xml:359
#, no-wrap
msgid ""
"Package: perl\n"
@@ -6421,12 +5070,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:371
+#: apt_preferences.5.xml:372
msgid "Then:"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:373
+#: apt_preferences.5.xml:374
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 "
@@ -6436,7 +5085,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:378
+#: apt_preferences.5.xml:379
msgid ""
"A version of any package other than <literal>perl</literal> that is "
"available from the local system has priority over other versions, even "
@@ -6444,7 +5093,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
-#: apt_preferences.5.xml:382
+#: apt_preferences.5.xml:383
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 "
@@ -6453,12 +5102,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:392
+#: apt_preferences.5.xml:393
msgid "Determination of Package Version and Distribution Properties"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:394
+#: apt_preferences.5.xml:395
msgid ""
"The locations listed in the &sources-list; file should provide "
"<filename>Packages</filename> and <filename>Release</filename> files to "
@@ -6466,27 +5115,27 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:406
+#: apt_preferences.5.xml:407
msgid "the <literal>Package:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:407
+#: apt_preferences.5.xml:408
msgid "gives the package name"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:410 apt_preferences.5.xml:460
+#: apt_preferences.5.xml:411 apt_preferences.5.xml:461
msgid "the <literal>Version:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:411
+#: apt_preferences.5.xml:412
msgid "gives the version number for the named package"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:398
+#: apt_preferences.5.xml:399
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>: "
@@ -6498,12 +5147,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:427
+#: apt_preferences.5.xml:428
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:428
+#: apt_preferences.5.xml:429
msgid ""
"names the archive to which all the packages in the directory tree belong. "
"For example, the line \"Archive: stable\" or \"Suite: stable\" specifies "
@@ -6514,18 +5163,18 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:438
+#: apt_preferences.5.xml:439
#, no-wrap
msgid "Pin: release a=stable\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:444
+#: apt_preferences.5.xml:445
msgid "the <literal>Codename:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:445
+#: apt_preferences.5.xml:446
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 "
@@ -6536,13 +5185,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:454
+#: apt_preferences.5.xml:455
#, 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:461
+#: apt_preferences.5.xml:462
msgid ""
"names the release version. For example, the packages in the tree might "
"belong to Debian GNU/Linux release version 3.0. Note that there is normally "
@@ -6553,7 +5202,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:470
+#: apt_preferences.5.xml:471
#, no-wrap
msgid ""
"Pin: release v=3.0\n"
@@ -6562,12 +5211,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:479
+#: apt_preferences.5.xml:480
msgid "the <literal>Component:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:480
+#: apt_preferences.5.xml:481
msgid ""
"names the licensing component associated with the packages in the directory "
"tree of the <filename>Release</filename> file. For example, the line "
@@ -6579,18 +5228,18 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:489
+#: apt_preferences.5.xml:490
#, no-wrap
msgid "Pin: release c=main\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:495
+#: apt_preferences.5.xml:496
msgid "the <literal>Origin:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:496
+#: apt_preferences.5.xml:497
msgid ""
"names the originator of the packages in the directory tree of the "
"<filename>Release</filename> file. Most commonly, this is "
@@ -6599,18 +5248,18 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:502
+#: apt_preferences.5.xml:503
#, no-wrap
msgid "Pin: release o=Debian\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
-#: apt_preferences.5.xml:508
+#: apt_preferences.5.xml:509
msgid "the <literal>Label:</literal> line"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#: apt_preferences.5.xml:509
+#: apt_preferences.5.xml:510
msgid ""
"names the label of the packages in the directory tree of the "
"<filename>Release</filename> file. Most commonly, this is "
@@ -6619,13 +5268,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#: apt_preferences.5.xml:515
+#: apt_preferences.5.xml:516
#, no-wrap
msgid "Pin: release l=Debian\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:416
+#: apt_preferences.5.xml:417
msgid ""
"The <filename>Release</filename> file is normally found in the directory "
"<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
@@ -6639,7 +5288,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:522
+#: apt_preferences.5.xml:523
msgid ""
"All of the <filename>Packages</filename> and <filename>Release</filename> "
"files retrieved from locations listed in the &sources-list; file are stored "
@@ -6654,12 +5303,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:535
+#: apt_preferences.5.xml:536
msgid "Optional Lines in an APT Preferences Record"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:537
+#: apt_preferences.5.xml:538
msgid ""
"Each record in the APT preferences file can optionally begin with one or "
"more lines beginning with the word <literal>Explanation:</literal>. This "
@@ -6667,12 +5316,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:546
+#: apt_preferences.5.xml:547
msgid "Tracking Stable"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:554
+#: apt_preferences.5.xml:555
#, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated\n"
@@ -6687,7 +5336,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:548
+#: apt_preferences.5.xml:549
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 "
@@ -6697,7 +5346,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:571 apt_preferences.5.xml:617 apt_preferences.5.xml:675
+#: apt_preferences.5.xml:572 apt_preferences.5.xml:618 apt_preferences.5.xml:676
#, no-wrap
msgid ""
"apt-get install <replaceable>package-name</replaceable>\n"
@@ -6706,7 +5355,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:566
+#: apt_preferences.5.xml:567
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 "
@@ -6715,13 +5364,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:583
+#: apt_preferences.5.xml:584
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/testing\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:577
+#: apt_preferences.5.xml:578
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>testing</literal> distribution; the package "
@@ -6730,12 +5379,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:589
+#: apt_preferences.5.xml:590
msgid "Tracking Testing or Unstable"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:598
+#: apt_preferences.5.xml:599
#, no-wrap
msgid ""
"Package: *\n"
@@ -6752,7 +5401,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:591
+#: apt_preferences.5.xml:592
msgid ""
"The following APT preferences file will cause APT to assign a high priority "
"to package versions from the <literal>testing</literal> distribution, a "
@@ -6763,7 +5412,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:612
+#: apt_preferences.5.xml:613
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 "
@@ -6772,13 +5421,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:632
+#: apt_preferences.5.xml:633
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/unstable\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:623
+#: apt_preferences.5.xml:624
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>unstable</literal> distribution. "
@@ -6790,12 +5439,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt_preferences.5.xml:639
+#: apt_preferences.5.xml:640
msgid "Tracking the evolution of a codename release"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:653
+#: apt_preferences.5.xml:654
#, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated package "
@@ -6817,7 +5466,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:641
+#: apt_preferences.5.xml:642
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 "
@@ -6832,7 +5481,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:670
+#: apt_preferences.5.xml:671
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 "
@@ -6841,13 +5490,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
-#: apt_preferences.5.xml:690
+#: apt_preferences.5.xml:691
#, no-wrap
msgid "apt-get install <replaceable>package</replaceable>/sid\n"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt_preferences.5.xml:681
+#: apt_preferences.5.xml:682
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>sid</literal> distribution. Thereafter, "
@@ -6859,20 +5508,15 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt_preferences.5.xml:699
+#: apt_preferences.5.xml:700
msgid "&file-preferences;"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt_preferences.5.xml:705
+#: apt_preferences.5.xml:706
msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;"
msgstr ""
-#. type: Content of: <refentry><refnamediv><refname>
-#: sources.list.5.xml:25 sources.list.5.xml:32
-msgid "sources.list"
-msgstr ""
-
#. type: Content of: <refentry><refnamediv><refpurpose>
#: sources.list.5.xml:33
msgid "Package resource list for APT"
@@ -6999,7 +5643,7 @@ msgid ""
"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 through that unsupported settings will be ignored "
+"supported by APT, note though that unsupported settings will be ignored "
"silently:"
msgstr ""
@@ -7016,12 +5660,12 @@ msgstr ""
#: sources.list.5.xml:121
msgid ""
"<literal>trusted=yes</literal> can be set to indicate that packages from "
-"this source are always authenificated even if the "
+"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 authenificated sources as not "
-"authenificated."
+"opposite which handles even correctly authenticated sources as not "
+"authenticated."
msgstr ""
#. type: Content of: <refentry><refsect1><para>
@@ -7066,6 +5710,11 @@ msgid ""
"archives."
msgstr ""
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
+#: sources.list.5.xml:153
+msgid "cdrom"
+msgstr ""
+
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#: sources.list.5.xml:155
msgid ""
@@ -7074,6 +5723,11 @@ msgid ""
"list."
msgstr ""
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
+#: sources.list.5.xml:160
+msgid "http"
+msgstr ""
+
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#: sources.list.5.xml:162
msgid ""
@@ -7085,6 +5739,11 @@ msgid ""
"method of authentication."
msgstr ""
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
+#: sources.list.5.xml:171
+msgid "ftp"
+msgstr ""
+
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#: sources.list.5.xml:173
msgid ""
@@ -7404,6 +6063,11 @@ msgid ""
"packages for installation."
msgstr ""
+#. type: <heading></heading>
+#: guide.sgml:96
+msgid "apt-get"
+msgstr ""
+
#. type: <p></p>
#: guide.sgml:102
msgid ""
@@ -7440,6 +6104,11 @@ msgstr ""
msgid "Once updated there are several commands that can be used:"
msgstr ""
+#. type: <tag></tag>
+#: guide.sgml:121
+msgid "upgrade"
+msgstr ""
+
#. type: <p></p>
#: guide.sgml:131
msgid ""
@@ -7452,6 +6121,11 @@ msgid ""
"<tt>apt-get install</tt> can be used to force these packages to install."
msgstr ""
+#. type: <tag></tag>
+#: guide.sgml:131
+msgid "install"
+msgstr ""
+
#. type: <p></p>
#: guide.sgml:140
msgid ""
@@ -7464,6 +6138,11 @@ msgid ""
"anything other than its arguments are changed."
msgstr ""
+#. type: <tag></tag>
+#: guide.sgml:140
+msgid "dist-upgrade"
+msgstr ""
+
#. type: <p></p>
#: guide.sgml:149
msgid ""