summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2009-12-03 17:47:53 +0100
committerMichael Vogt <michael.vogt@ubuntu.com>2009-12-03 17:47:53 +0100
commit864cf8e52aa37de28f2fc9a66236713f1ba34409 (patch)
treeaf16fdbac7edd9a196e4a26bfb18e23555ed3b2e
parent2183a0862311cf2fbb82f61ecdcdf3816ce90040 (diff)
parent2ec8479cef7475fbc82ffdaf6a7bf658f5c3ac52 (diff)
merge from debian-sid apt 0.7.24
Diffstat
-rw-r--r--apt-pkg/deb/dpkgpm.cc19
-rw-r--r--cmdline/apt-get.cc43
-rw-r--r--debian/NEWS16
-rw-r--r--debian/changelog94
-rw-r--r--doc/apt-cache.8.xml7
-rw-r--r--doc/apt.conf.5.xml46
-rw-r--r--doc/pl/makefile11
-rw-r--r--doc/pl/offline.pl.sgml252
-rw-r--r--doc/po/apt-doc.pot514
-rw-r--r--doc/po/fr.po535
-rw-r--r--doc/po/ja.po537
11 files changed, 1332 insertions, 742 deletions
diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc
index 500d4a260..332b3cf0b 100644
--- a/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@ -652,6 +652,7 @@ bool pkgDPkgPM::Go(int OutStatusFd)
// support subpressing of triggers processing for special
// cases like d-i that runs the triggers handling manually
bool const SmartConf = (_config->Find("PackageManager::Configure", "all") != "all");
+ bool const TriggersPending = _config->FindB("DPkg::TriggersPending", false);
if (_config->FindB("DPkg::ConfigurePending", SmartConf) == true)
List.push_back(Item(Item::ConfigurePending, PkgIterator()));
@@ -712,9 +713,23 @@ bool pkgDPkgPM::Go(int OutStatusFd)
// this loop is runs once per operation
for (vector<Item>::const_iterator I = List.begin(); I != List.end();)
{
+ // Do all actions with the same Op in one run
vector<Item>::const_iterator J = I;
- for (; J != List.end() && J->Op == I->Op; J++)
- /* nothing */;
+ if (TriggersPending == true)
+ for (; J != List.end(); J++)
+ {
+ if (J->Op == I->Op)
+ continue;
+ if (J->Op != Item::TriggersPending)
+ break;
+ vector<Item>::const_iterator T = J + 1;
+ if (T != List.end() && T->Op == I->Op)
+ continue;
+ break;
+ }
+ else
+ for (; J != List.end() && J->Op == I->Op; J++)
+ /* nothing */;
// Generate the argument list
const char *Args[MaxArgs + 50];
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 708ac4cc0..8f295ee40 100644
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -1049,17 +1049,42 @@ bool TryToInstall(pkgCache::PkgIterator Pkg,pkgDepCache &Cache,
pkgProblemResolver &Fix,bool Remove,bool BrokenFix,
unsigned int &ExpectedInst,bool AllowFail = true)
{
- /* This is a pure virtual package and there is a single available
- provides */
- if (Cache[Pkg].CandidateVer == 0 && Pkg->ProvidesList != 0 &&
- Pkg.ProvidesList()->NextProvides == 0)
+ /* This is a pure virtual package and there is a single available
+ candidate providing it. */
+ if (Cache[Pkg].CandidateVer == 0 && Pkg->ProvidesList != 0)
{
- pkgCache::PkgIterator Tmp = Pkg.ProvidesList().OwnerPkg();
- ioprintf(c1out,_("Note, selecting %s instead of %s\n"),
- Tmp.Name(),Pkg.Name());
- Pkg = Tmp;
+ pkgCache::PkgIterator Prov;
+ bool found_one = false;
+
+ for (pkgCache::PrvIterator P = Pkg.ProvidesList(); P; P++)
+ {
+ pkgCache::VerIterator const PVer = P.OwnerVer();
+ pkgCache::PkgIterator const PPkg = PVer.ParentPkg();
+
+ /* Ignore versions that are not a candidate. */
+ if (Cache[PPkg].CandidateVer != PVer)
+ continue;
+
+ if (found_one == false)
+ {
+ Prov = PPkg;
+ found_one = true;
+ }
+ else if (PPkg != Prov)
+ {
+ found_one = false; // we found at least two
+ break;
+ }
+ }
+
+ if (found_one == true)
+ {
+ ioprintf(c1out,_("Note, selecting %s instead of %s\n"),
+ Prov.Name(),Pkg.Name());
+ Pkg = Prov;
+ }
}
-
+
// Handle the no-upgrade case
if (_config->FindB("APT::Get::upgrade",true) == false &&
Pkg->CurrentVer != 0)
diff --git a/debian/NEWS b/debian/NEWS
index 88f2c564e..1df94144d 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -1,3 +1,19 @@
+apt (0.7.24) unstable; urgency=low
+
+ * Allready included in the last version but now with better documentation
+ is the possibility to add/prefer different compression types while
+ downloading archive informations, which can decrease the time needed for
+ update on slow machines. See apt.conf (5) manpage for details.
+ * APT manages his manpage translations now with po4a, thanks to Nicolas
+ François and Kurasawa Nozomu, who also provide the ja translation.
+ Thanks to Christian Perrier we have already a fr translation and
+ a few more are hopefully added in the near future.
+ * This version also introduces some _experimental_ configuration options
+ to make more aggressive use of dpkg's triggers. If you want to help
+ testing these _experimental_ options see apt.conf (5) manpage.
+
+ -- David Kalnischkies <kalnischkies@gmail.com> Thu, 24 Sep 2009 15:13:16 +0200
+
apt (0.7.23) unstable; urgency=low
* Code that determines which proxy to use was changed. Now
diff --git a/debian/changelog b/debian/changelog
index 0113fb95a..3c93178f5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,27 +10,9 @@ apt (0.7.24ubuntu1) UNRELEASED; urgency=low
- include df -l output in the apport log as well (thanks to
tjaalton)
- [ Matt Zimmerman ]
- * apt-pkg/deb/dpkgpm.cc:
- - Suppress apport reports on dpkg short reads (these I/O errors are not
- generally indicative of a bug in the packaging)
-
- [ Brian Murray ]
- * cmdline/apt-get.cc:
- - typo fix (LP: #370094)
-
- [ Loïc Minier ]
- * cmdline/apt-key:
- - Emit a warning if removed keys keyring is missing and skip associated
- checks (LP: #218971)
-
- [ Kees Cook ]
- * debian/apt.cron.daily:
- - fix quotes for use with "eval", thanks to Lars Ljung (LP: #449535).
-
- -- Kees Cook <kees@ubuntu.com> Wed, 14 Oct 2009 15:27:56 -0700
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 03 Dec 2009 17:42:36 +0100
-apt (0.7.24) UNRELEASED; urgency=low
+apt (0.7.24) unstable; urgency=low
[ Nicolas François ]
* Cleaned up the first patch draft from KURASAWA Nozomu to finally
@@ -50,7 +32,7 @@ apt (0.7.24) UNRELEASED; urgency=low
(thanks to Simon Richter, closes: #509866)
* apt-inst/contrib/arfile.cc:
- show propper error message for Invalid archive members
-
+
[ David Kalnischkies ]
* doc/Doxyfile.in:
- update file with doxygen 1.6.1 (current unstable)
@@ -62,10 +44,15 @@ apt (0.7.24) UNRELEASED; urgency=low
* apt-pkg/contrib/strutl.cc:
- replace unknown multibytes with ? in UTF8ToCharset (Closes: #545208)
* doc/apt-get.8.xml:
- - fix two little typos in the --simulate description.
+ - fix two little typos in the --simulate description. (Closes: #545059)
* apt-pkg/aptconfiguration.cc, doc/apt.conf.5.xml:
- add an order subgroup to the compression types to simplify reordering
a bit and improve the documentation for this option group.
+ * doc/apt.conf.5.xml:
+ - document the Acquire::http::Dl-Limit option
+ - try to be crystal clear about the usage of :: and {} (Closes: #503481)
+ * doc/apt-cache.8.xml:
+ - clarify the note for the pkgnames command (Closes: #547599)
* doc/apt.ent, all man pages:
- move the description of files to globally usable entities
* doc/apt_preferences.5.xml:
@@ -81,16 +68,71 @@ apt (0.7.24) UNRELEASED; urgency=low
* apt-pkg/deb/dpkgpm.cc, apt-pkg/packagemanager.cc, apt-pkg/orderlist.cc:
- add and document _experimental_ options to make (aggressive)
use of dpkg's trigger and configuration handling (Closes: #473461)
+ * cmdline/apt-get.cc:
+ - ignore versions that are not candidates when selecting a package
+ instead of a virtual one (by Marius Vollmer, Closes: #547788)
[ Christian Perrier ]
* doc/fr/*, doc/po/fr.po:
- remove the old fr man page translation and replace it with
the new po4a-powered translation
- * doc/pl, doc/de: dropped (pl translation is useless as the translated
- document is not provideed anymore and the de translation is too
- incomplete to be used)
+ * doc/de: dropped (translation is too incomplete to be useful in
+ the transition to the po4a-powered translations)
+
+ -- Michael Vogt <mvo@debian.org> Fri, 25 Sep 2009 19:57:25 +0200
+
+apt (0.7.23.1ubuntu2) karmic; urgency=low
+
+ [ Michael Vogt ]
+ * debian/control:
+ - fix Vcr-Bzr header
+
+ [ Kees Cook ]
+ * debian/apt.cron.daily:
+ - fix quotes for use with "eval", thanks to Lars Ljung (LP: #449535).
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 15 Oct 2009 19:05:19 +0200
+
+apt (0.7.23.1ubuntu1) karmic; urgency=low
+
+ [ Matt Zimmerman ]
+ * apt-pkg/deb/dpkgpm.cc:
+ - Suppress apport reports on dpkg short reads (these I/O errors are not
+ generally indicative of a bug in the packaging)
+
+ [ Loïc Minier ]
+ * cmdline/apt-key:
+ - Emit a warning if removed keys keyring is missing and skip associated
+ checks (LP: #218971)
+
+ [ Brian Murray ]
+ * cmdline/apt-get.cc:
+ - typo fix (LP: #370094)
+
+ [ Michael Vogt ]
+ * apt-pkg/deb/dpkgpm.cc:
+ - when tcgetattr() returns non-zero skip all pty magic
+ (thanks to Simon Richter, closes: #509866)
+ * apt-inst/contrib/arfile.cc:
+ - show propper error message for Invalid archive members
+ * apt-pkg/acquire-worker.cc:
+ - show error details of failed methods
+ * apt-pkg/contrib/fileutl.cc:
+ - if a process aborts with signal, show signal number
+ * methods/http.cc:
+ - ignore SIGPIPE, we deal with EPIPE from write in
+ HttpMethod::ServerDie() (LP: #385144)
+ * debian/apt.cron.daily:
+ - if the timestamp is too far in the future, delete it
+ (LP: #135262)
+
+ [ Merge ]
+ * merged from debian, reverted the libdlopen-udev branch
+ because its too late in the release process for this now
+ * not merged the proxy behaviour change from 0.7.23 (that will
+ be part of lucid)
- -- David Kalnischkies <kalnischkies@gmail.com> Fri, 28 Aug 2009 09:40:08 +0200
+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 23 Sep 2009 18:15:10 +0200
apt (0.7.23.1) unstable; urgency=low
diff --git a/doc/apt-cache.8.xml b/doc/apt-cache.8.xml
index 26d55a519..9851135b1 100644
--- a/doc/apt-cache.8.xml
+++ b/doc/apt-cache.8.xml
@@ -226,11 +226,14 @@ Reverse Provides:
</varlistentry>
<varlistentry><term>pkgnames <replaceable>[ prefix ]</replaceable></term>
- <listitem><para>This command prints the name of each package in the system. The optional
+ <listitem><para>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
for use in a shell tab complete function and the output is generated
extremely quickly. This command is best used with the
- <option>--generate</option> option.</para></listitem>
+ <option>--generate</option> option.</para>
+ <para>Note that a package which APT knows of is not nessasarily available to download,
+ installable or installed, e.g. virtual packages are also listed in the generated list.
+ </para></listitem>
</varlistentry>
<varlistentry><term>dotty <replaceable>pkg(s)</replaceable></term>
diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml
index 67aa933cc..e752f9d27 100644
--- a/doc/apt.conf.5.xml
+++ b/doc/apt.conf.5.xml
@@ -86,17 +86,40 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
<para>The names of the configuration items are not case-sensitive. So in the previous example
you could use <literal>dpkg::pre-install-pkgs</literal>.</para>
- <para>Two specials are allowed, <literal>#include</literal> and <literal>#clear</literal>
+ <para>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 above. If you don't specify a name a
+ new entry will simply add a new option to the list. If you specify a name you can override
+ the option as every other option by reassigning a new value to the option.</para>
+
+ <para>Two specials are allowed, <literal>#include</literal> and <literal>#clear</literal>:
<literal>#include</literal> will include the given file, unless the filename
ends in a slash, then the whole directory is included.
<literal>#clear</literal> is used to erase a part of the configuration tree. The
- specified element and all its descendants are erased.</para>
+ specified element and all its descendants are erased.
+ (Note that these lines also need to end with a semicolon.)</para>
+
+ <para>The #clear command is the only way to delete a list or a complete scope.
+ Reopening a scope or the ::-style described below will <emphasis>not</emphasis>
+ override previously written entries. Only options can be overridden by addressing a new
+ value to it - lists and scopes can't be overridden, only cleared.</para>
<para>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.</para>
+ a trailing :: to the list name. (As you might suspect: The scope syntax can't be used
+ on the command line.)</para>
+
+ <para>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 "<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 append to a list will gain the opposite as only the last assignment for this option
+ "<literal>::</literal>" will be used. Upcoming APT versions will raise errors and
+ will stop working if they encounter this misuse, so please correct such statements now
+ as long as APT doesn't complain explicit about them.</para>
</refsect1>
<refsect1><title>The APT Group</title>
@@ -227,7 +250,12 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
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.</para></listitem>
+ require this are in violation of RFC 2068.</para>
+
+ <para>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 as much as possible of the bandwidth (Note that this option implicit
+ deactivates the download from multiple servers at the same time.)</para></listitem>
</varlistentry>
<varlistentry><term>https</term>
@@ -328,7 +356,7 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
<para>Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</replaceable></literal> will
be checked: If this setting exists the method will only be used if this file exists, e.g. for
the bzip2 method (the inbuilt) setting is <literallayout>Dir::Bin::bzip2 "/bin/bzip2";</literallayout>
- Note also that list entries specified on the commandline will be added at the end of the list
+ Note also that list entries specified on the command line will be added at the end of the list
specified in the configuration files, but before the default entries. To prefer a type in this case
over the ones specified in in the configuration files you can set the option direct - not in list style.
This will not override the defined list, it will only prefix the list with this type.</para>
@@ -470,12 +498,12 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
multiply calls of dpkg. Without further options dpkg will use triggers only in between his
own run. Activating these options can therefore decrease the time needed to perform the
install / upgrade. Note that it is intended to activate these options per default in the
- future, but as it changes the way APT calling dpkg drastical it needs a lot more testing.
+ future, but as it changes the way APT calling dpkg drastically it needs a lot more testing.
<emphasis>These options are therefore currently experimental and should not be used in
productive environments.</emphasis> Also it breaks the progress reporting so all frontends will
currently stay around half (or more) of the time in the 100% state while it actually configures
all packages.</para>
- <para>Note that it is not garanteed that APT will support these options or that these options will
+ <para>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 understand the current risks and problems with
these options, but are brave enough to help testing them create a new configuration file and test a
combination of options. Please report any bugs, problems and improvements you encounter and make sure
@@ -522,7 +550,7 @@ DPkg::TriggersPending "true";</literallayout></para>
<varlistentry><term>PackageManager::UnpackAll</term>
<listitem><para>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 Pre-Depends. Default is true
- and therefore the "old" method of ordering in verious steps by everything. While both method
+ and therefore the "old" method of ordering in various steps by everything. While both method
were present in earlier APT versions the <literal>OrderCritical</literal> method was unused, so
this method is very experimental and needs further improvements before becoming really useful.
</para></listitem>
@@ -532,7 +560,7 @@ DPkg::TriggersPending "true";</literallayout></para>
after unpacking. It will be a good idea to do this quite early in the upgrade process as these
these configure calls require currently also <literal>DPkg::TriggersPending</literal> which
will run quite a few triggers (which maybe not needed). Essentials get per default a high score
- but the immediate flag is relativly low (a package which has a Pre-Depends is higher rated).
+ but the immediate flag is relatively low (a package which has a Pre-Depends is higher rated).
These option and the others in the same group can be used to change the scoring. The following
example shows the settings with there default values.
<literallayout>OrderList::Score {
diff --git a/doc/pl/makefile b/doc/pl/makefile
new file mode 100644
index 000000000..94939e156
--- /dev/null
+++ b/doc/pl/makefile
@@ -0,0 +1,11 @@
+# -*- make -*-
+BASE=../..
+SUBDIR=doc/pl
+
+# Bring in the default rules
+include ../../buildlib/defaults.mak
+
+# Debian Doc SGML Documents
+SOURCE = offline.pl.sgml
+DEBIANDOC_HTML_OPTIONS=-l pl
+include $(DEBIANDOC_H)
diff --git a/doc/pl/offline.pl.sgml b/doc/pl/offline.pl.sgml
new file mode 100644
index 000000000..0d301d4fb
--- /dev/null
+++ b/doc/pl/offline.pl.sgml
@@ -0,0 +1,252 @@
+<!doctype debiandoc PUBLIC "-//DebianDoc//DTD DebianDoc//EN">
+<!-- -*- mode: sgml; mode: fold -*- -->
+<book>
+<title>Uywanie APT w trybie offline</title>
+
+<author>Jason Gunthorpe <email>jgg@debian.org</email></author>
+<author>Polskie tumaczenie Krzysztof Fiertek <email>akfedux@megapolis.pl</email></author>
+<version>$Id: offline.sgml,v 1.8 2003/02/12 15:06:41 doogie Exp $</version>
+
+<abstract>
+Dokument ten opisuje uywanie programu APT w rodowiskach pozbawionych dostpu,
+do sieci, a w szczeglnoci metod pozwalajc na robienie aktualizacji systemu.
+</abstract>
+
+<copyright>
+Copyright &copy; Jason Gunthorpe, 1999.
+<p>
+Copyright &copy; polskiego tumaczenia Krzysztof Fiertek, 2004.
+<p>
+"APT" i ten dokument s oprogramowaniem wolnodostpnym; moesz
+rozpowszechnia je i/lub zmienia w zgodzie z postanowieniami
+"Oglnej Licencji Publicznej GNU" (GNU General Public License)
+takiej, jak zostaa opublikowana przez "Fundacje Wolnego
+Oprogramowania (Free Software Foundation); albo w wersji 2 teje
+licencji, albo (twj wybr) w dowolnej pniejszej.
+
+<p>
+Wicej szczegw mona uzyska, przegldajc plik zawierajcy peny tekst
+licencji (w systemach Debian jest to plik /usr/share/common-licenses/GPL).
+</copyright>
+
+<toc sect>
+
+<chapt>Wstp
+<!-- Overview {{{ -->
+<!-- ===================================================================== -->
+<sect>Wprowadzenie
+
+<p>
+Normalnie APT wymaga bezporedniego dostpu do archiww Debiana przez
+sie lokaln albo przez sie internetow. Kolejn niedogodnoci moe by
+fakt, e nasz komputer, ktry pracuje na powolnym czu takim jak modem,
+jest znacznie oddalony od innego komputera z szybkim czem.
+
+<p>
+Rozwizaniem tego problemu jest uycie pojemnych przenonych nonikw
+takich jak dyskietka Zip lub dysk SuperDisk. Noniki te nie s
+wystarczajco pojemne, by zgromadzi kompletne archiwum Debiana, ale mona
+miao dopasowa podzbir duego archiwum wystarczajcy dla wikszoci
+uytkownikw. Pomys polega na tym, by uy programu APT do wygenerowania
+listy pakietw, ktre s wymagane, a nastpnie pobraniu ich na dysk, uywajc
+innego komputera z waciw zwartoci. Jest nawet moliwe, by uy innego
+komputera z Debianem z zainstalowanym programem APT lub zupenie innym
+systemem operacyjnym i programem narzdziowym do pobierania plikw takim
+jak wget.
+
+<p>
+Osigane jest to przez twrcze manipulowanie plikiem konfiguracyjnym
+programu APT. Rzecz niezbdn jest poinformowanie programu APT, aby wskazywa
+na dysk z plikami archiwum. Naley zauway, e dysk powinien by
+sformatowany do obsugi systemu plikw pozwalajcego posugiwa si dugimi
+nazwami plikw (np. ext2, fat32 albo vfat).
+
+
+</sect>
+ <!-- }}} -->
+
+<chapt>Uywanie programu APT na obu komputerach
+<!-- Overview {{{ -->
+<!-- ===================================================================== -->
+<sect>Wprowadzenie
+
+<p>
+APT bdcy do dyspozycji na obu komputerach daje najprostsz kombinacj.
+Zasadniczym pomysem tej metody jest umieszczenie kopii pliku status na dysku
+i uycie odlegego komputera, aby uzyska najnowsze pliki pakietw
+i zdecydowa, ktre pakiety trzeba pobra. Struktura katalogw na dysku
+powinna wyglda nastpujco:
+
+<example>
+ /disc/
+ archives/
+ partial/
+ lists/
+ partial/
+ status
+ sources.list
+ apt.conf
+</example>
+
+</sect>
+ <!-- }}} -->
+<!-- The configuration file {{{ -->
+<!-- ===================================================================== -->
+<sect>Plik konfiguracyjny
+
+<p>
+Plik konfiguracyjny powinien informowa program APT, aby przechowywa swoje
+pliki na dysku, a take uywa plikw konfiguracyjnych z dysku. Plik
+sources.list powinien zawiera prawidowe odnoniki, ktrych naley
+uy na zdalnym komputerze, a plik status powinien by kopi
+<em>/var/lib/dpkg/status</em>. Zauwa, e jeli uywasz lokalnego archiwum
+musisz uy tych samych odnonikw o identycznej skadni.
+
+<p>
+<em>apt.conf</em> musi zawiera niezbdne wpisy, by APT korzysta z dysku:
+
+<example>
+ APT
+ {
+ /* Ten wpis nie jest wymagany, jeli oba komputery maj t sam
+ architektur; mwi on programowi APT na komputerze pobierajcym
+ pakiety, jaka jest architektura naszego komputera */
+ Architecture "i386";
+
+ Get::Download-Only "true";
+ };
+
+ Dir
+ {
+ /* Uyj katalogu disc na informacje stanu i przekieruj plik status
+ z domylnego /var/lib/dpkg */
+ State "/disc/";
+ State::status "status";
+
+ // Katalog lokalnie przechowywanych pakietw binarnych
+ Cache::archives "/disc/archives/";
+
+ Cache "/tmp/";
+
+ // Lokalizacja pliku sources.list.
+ Etc "/disc";
+ };
+</example>
+
+Wicej szczegw mona zobaczy w stronie podrcznika apt.conf i w przykadowym
+pliku konfiguracyjnym <em>/usr/share/doc/apt/examples/apt.conf</em>.
+
+<p>
+Pierwsz rzecz, jak naley zrobi na oddalonym komputerze z Debianem to
+zamontowa dysk i przekopiowa na niego plik <em>/var/lib/dpkg/status</em>.
+Trzeba take utworzy stuktur katalogw przedstawion we "Wprowadzeniu":
+<em>archives/partial/</em> i <em>lists/partial/</em>. Nastpnie niesiemy
+dysk do oddalonego komputera z szybkim czem i konfigurujemy plik
+sources.list. Na oddalonym komputerze wykonujemy kolejno:
+
+<example>
+ # export APT_CONFIG="/disc/apt.conf"
+ # apt-get update
+ [ APT aktualizuje ustawienia ]
+ # apt-get dist-upgrade
+ [ APT pobiera wszystkie pakiety potrzebne do aktualizacji Twojego systemu ]
+
+</example>
+
+Polecenie dist-upgrade mona zastpi kadym innym podstawowym poleceniem
+APT, w szczeglnoci dselect-upgrade. Mona nawet uy APT jako metody
+dostpu dla <em>dselect</em>. Jednak stworzy to problem w przeniesieniu
+Twoich operacji wyborw z powrotem na lokalny komputer.
+
+<p>
+W tej chwili katalog disc zawiera wszystkie pliki indeksowe oraz archiwa
+niezbdne do aktualizacji maszyny z Debianem. Bierzemy dysk z powrotem do
+siebie i wpisujemy:
+
+<example>
+ # export APT_CONFIG="/disc/apt.conf"
+ # apt-get check
+ [ APT tworzy lokaln kopi plikw cache ]
+ # apt-get --no-d -o dir::state::status=/var/lib/dpkg/status dist-upgrade
+ [ Moe te by inne polecenie programu APT ]
+</example>
+
+<p>
+Do prawidowego dziaania koniecznie naley poda plik status z lokalnej
+maszyny. To jest bardzo wane!
+
+<p>
+Jeli uywasz dselect, moesz wykona bardzo ryzykown operacj skopiowania
+disc/status do /var/lib/dpkg/status, tak e wszystkie zmiany, ktrych
+dokonae na odlegym komputerze, bd przeniesione. Mocno zalecam, aby
+dokonywa doboru pakietw tylko na lokalnym komputerze, ale nie zawsze
+jest to moliwe. NIE podmieniaj pliku status, jeli dpkg lub APT byy
+uruchamiane w midzyczasie!!
+
+</sect>
+ <!-- }}} -->
+
+<chapt>Uywanie programw APT i wget
+<!-- Overview {{{ -->
+<!-- ===================================================================== -->
+<sect>Wprowadzenie
+
+<p>
+<em>wget</em> jest popularnym i przenonym programem narzdziowym
+pobierania plikw, ktry dziaa prawie na kadym komputerze.
+W przeciwiestwie do metody opisanej powyej ta wymaga, aby na lokalnym komputerze
+bya aktualna lista dostpnych pakietw.
+
+<p>
+Naley stworzy katalog disc tylko na pakiety do pobrania z innego
+komputera. Uyta zostanie do tego opcja --print-uris programu apt-get,
+a nastpnie przygotujemy skrypt dla programu wget, ktry pobierze waciwe
+pakiety.
+
+</sect>
+ <!-- }}} -->
+<!-- Operation {{{ -->
+<!-- ===================================================================== -->
+<sect>Kolejne kroki
+
+<p>
+W odrnieniu od poprzedniej metody dziaania ta nie wymaga specjalnych
+plikw konfiguracyjnych. Uywamy jedynie podstawowych polece APT, by
+wygenerowa list plikw.
+
+<example>
+ # apt-get dist-upgrade
+ [ Wybierz "no" po znaku zachty, upewnij si, czy to waciwy wybr ]
+ # apt-get -qq --print-uris dist-upgrade > uris
+ # awk '{print "wget -O " $2 " " $1}' < uris > /disc/wget-script
+</example>
+
+Take inne opcje ni dist-upgrade mog tu by uyte, wczajc
+dselect-upgrade.
+
+<p>
+Plik skryptu /disc/wget-script bdzie teraz zawiera list wywoa programu
+wget, niezbdnych do pobrania potrzebnych archiww.
+Skrypt ten naley uruchomi w biecym katalogu o punkcie montowania disc,
+tak aby tu zapisywa dane na dysku.
+
+<p>
+Na oddalonym komputerze naley wykona co takiego
+
+<example>
+ # cd /disc
+ # sh -x ./wget-script
+ [ czekaj.. ]
+</example>
+
+Gdy archiwa zostan pobrane i dysk wrci do komputera z Debianem,
+instalowanie mona prowadzi dalej poleceniem:
+
+<example>
+ # apt-get -o dir::cache::archives="/disc/" dist-upgrade
+</example>
+
+ktre uyje pobranych uprzednio archiww z dysku.
+</sect>
+ <!-- }}} -->
+</book>
diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot
index a624f49c0..ddd9d025e 100644
--- a/doc/po/apt-doc.pot
+++ b/doc/po/apt-doc.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-09-18 17:15+0300\n"
+"POT-Creation-Date: 2009-09-24 15:02+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"
@@ -1126,20 +1126,28 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-cache.8.xml:229
msgid ""
-"This command prints the name of each package in the system. The optional "
+"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 "
"for use in a shell tab complete function and the output is generated "
"extremely quickly. This command is best used with the "
"<option>--generate</option> option."
msgstr ""
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-cache.8.xml:234
+msgid ""
+"Note that a package which APT knows of is not nessasarily 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
+#: apt-cache.8.xml:239
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:240
msgid ""
"<literal>dotty</literal> takes a list of packages on the command line and "
"generates output suitable for use by dotty from the <ulink "
@@ -1152,7 +1160,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:246
+#: apt-cache.8.xml:249
msgid ""
"The resulting nodes will have several shapes; normal packages are boxes, "
"pure provides are triangles, mixed provides are diamonds, missing packages "
@@ -1161,17 +1169,17 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:251
+#: apt-cache.8.xml:254
msgid "Caution, dotty cannot graph larger sets of packages."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:254
+#: apt-cache.8.xml:257
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:258
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 "
@@ -1179,12 +1187,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:259
+#: apt-cache.8.xml:262
msgid "policy <replaceable>[ pkg(s) ]</replaceable>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:260
+#: apt-cache.8.xml:263
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 "
@@ -1193,12 +1201,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:266
+#: apt-cache.8.xml:269
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:270
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 "
@@ -1210,22 +1218,22 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:278 apt-config.8.xml:93 apt-extracttemplates.1.xml:56 apt-ftparchive.1.xml:492 apt-get.8.xml:319 apt-mark.8.xml:89 apt-sortpkgs.1.xml:54 apt.conf.5.xml:408 apt.conf.5.xml:430
+#: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56 apt-ftparchive.1.xml:492 apt-get.8.xml:319 apt-mark.8.xml:89 apt-sortpkgs.1.xml:54 apt.conf.5.xml:436 apt.conf.5.xml:458
msgid "options"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:282
+#: apt-cache.8.xml:285
msgid "<option>-p</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:282
+#: apt-cache.8.xml:285
msgid "<option>--pkg-cache</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:283
+#: apt-cache.8.xml:286
msgid ""
"Select the file to store the package cache. The package cache is the primary "
"cache used by all operations. Configuration Item: "
@@ -1233,17 +1241,17 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:288 apt-ftparchive.1.xml:535 apt-get.8.xml:376 apt-sortpkgs.1.xml:58
+#: apt-cache.8.xml:291 apt-ftparchive.1.xml:535 apt-get.8.xml:376 apt-sortpkgs.1.xml:58
msgid "<option>-s</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:288
+#: apt-cache.8.xml:291
msgid "<option>--src-cache</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:289
+#: apt-cache.8.xml:292
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 "
@@ -1253,17 +1261,17 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:296 apt-ftparchive.1.xml:509 apt-get.8.xml:366
+#: apt-cache.8.xml:299 apt-ftparchive.1.xml:509 apt-get.8.xml:366
msgid "<option>-q</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:296 apt-ftparchive.1.xml:509 apt-get.8.xml:366
+#: apt-cache.8.xml:299 apt-ftparchive.1.xml:509 apt-get.8.xml:366
msgid "<option>--quiet</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:297
+#: apt-cache.8.xml:300
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 "
@@ -1272,17 +1280,17 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:303
+#: apt-cache.8.xml:306
msgid "<option>-i</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:303
+#: apt-cache.8.xml:306
msgid "<option>--important</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:304
+#: apt-cache.8.xml:307
msgid ""
"Print only important dependencies; for use with unmet and depends. Causes "
"only Depends and Pre-Depends relations to be printed. Configuration Item: "
@@ -1290,34 +1298,34 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:309 apt-cdrom.8.xml:121 apt-get.8.xml:333
+#: apt-cache.8.xml:312 apt-cdrom.8.xml:121 apt-get.8.xml:333
msgid "<option>-f</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:309
+#: apt-cache.8.xml:312
msgid "<option>--full</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:310
+#: apt-cache.8.xml:313
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:314 apt-cdrom.8.xml:131
+#: apt-cache.8.xml:317 apt-cdrom.8.xml:131
msgid "<option>-a</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:314
+#: apt-cache.8.xml:317
msgid "<option>--all-versions</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:315
+#: apt-cache.8.xml:318
msgid ""
"Print full records for all available versions. This is the default; to turn "
"it off, use <option>--no-all-versions</option>. If "
@@ -1328,17 +1336,17 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:323
+#: apt-cache.8.xml:326
msgid "<option>-g</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:323
+#: apt-cache.8.xml:326
msgid "<option>--generate</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:324
+#: apt-cache.8.xml:327
msgid ""
"Perform automatic package cache regeneration, rather than use the cache as "
"it is. This is the default; to turn it off, use "
@@ -1347,29 +1355,29 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:329
+#: apt-cache.8.xml:332
msgid "<option>--names-only</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:329 apt-cdrom.8.xml:139
+#: apt-cache.8.xml:332 apt-cdrom.8.xml:139
msgid "<option>-n</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:330
+#: apt-cache.8.xml:333
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:334
+#: apt-cache.8.xml:337
msgid "<option>--all-names</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:335
+#: apt-cache.8.xml:338
msgid ""
"Make <literal>pkgnames</literal> print all names, including virtual packages "
"and missing dependencies. Configuration Item: "
@@ -1377,12 +1385,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:340
+#: apt-cache.8.xml:343
msgid "<option>--recurse</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:341
+#: apt-cache.8.xml:344
msgid ""
"Make <literal>depends</literal> and <literal>rdepends</literal> recursive so "
"that all packages mentioned are printed once. Configuration Item: "
@@ -1390,12 +1398,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:346
+#: apt-cache.8.xml:349
msgid "<option>--installed</option>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:348
+#: apt-cache.8.xml:351
msgid ""
"Limit the output of <literal>depends</literal> and "
"<literal>rdepends</literal> to packages which are currently installed. "
@@ -1403,37 +1411,37 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-cache.8.xml:353 apt-cdrom.8.xml:150 apt-config.8.xml:98 apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:547 apt-get.8.xml:554 apt-sortpkgs.1.xml:64
+#: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:98 apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:547 apt-get.8.xml:554 apt-sortpkgs.1.xml:64
msgid "&apt-commonoptions;"
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:358 apt-get.8.xml:559 apt-key.8.xml:138 apt-mark.8.xml:122 apt.conf.5.xml:940 apt_preferences.5.xml:615
+#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:138 apt-mark.8.xml:122 apt.conf.5.xml:968 apt_preferences.5.xml:615
msgid "Files"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-cache.8.xml:360
+#: apt-cache.8.xml:363
msgid "&file-sourceslist; &file-statelists;"
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:365 apt-cdrom.8.xml:155 apt-config.8.xml:103 apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:563 apt-get.8.xml:569 apt-key.8.xml:162 apt-mark.8.xml:133 apt-secure.8.xml:181 apt-sortpkgs.1.xml:69 apt.conf.5.xml:946 apt_preferences.5.xml:622 sources.list.5.xml:221
+#: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103 apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:563 apt-get.8.xml:569 apt-key.8.xml:162 apt-mark.8.xml:133 apt-secure.8.xml:181 apt-sortpkgs.1.xml:69 apt.conf.5.xml:974 apt_preferences.5.xml:622 sources.list.5.xml:221
msgid "See Also"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:366
+#: apt-cache.8.xml:369
msgid "&apt-conf;, &sources-list;, &apt-get;"
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:370 apt-cdrom.8.xml:160 apt-config.8.xml:108 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:567 apt-get.8.xml:575 apt-mark.8.xml:137 apt-sortpkgs.1.xml:73
+#: apt-cache.8.xml:373 apt-cdrom.8.xml:160 apt-config.8.xml:108 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:567 apt-get.8.xml:575 apt-mark.8.xml:137 apt-sortpkgs.1.xml:73
msgid "Diagnostics"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:371
+#: apt-cache.8.xml:374
msgid ""
"<command>apt-cache</command> returns zero on normal operation, decimal 100 "
"on error."
@@ -2673,7 +2681,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:552 apt.conf.5.xml:934 apt_preferences.5.xml:462 sources.list.5.xml:181
+#: apt-ftparchive.1.xml:552 apt.conf.5.xml:962 apt_preferences.5.xml:462 sources.list.5.xml:181
msgid "Examples"
msgstr ""
@@ -4267,43 +4275,81 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para>
#: apt.conf.5.xml:89
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 "
+"above. If you don't specify a name a new entry will simply add a new option "
+"to the list. If you specify a name you can override the option as every "
+"other option by reassigning a new value to the option."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt.conf.5.xml:94
+msgid ""
"Two specials are allowed, <literal>#include</literal> and "
-"<literal>#clear</literal> <literal>#include</literal> will include the given "
-"file, unless the filename ends in a slash, then the whole directory is "
+"<literal>#clear</literal>: <literal>#include</literal> will include the "
+"given file, unless the filename ends in a slash, then the whole directory is "
"included. <literal>#clear</literal> is used to erase a part of the "
"configuration tree. The specified element and all its descendants are "
-"erased."
+"erased. (Note that these lines also need to end with a semicolon.)"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:95
+#: apt.conf.5.xml:101
+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 "
+"<emphasis>not</emphasis> override previewsly written entries. Only options "
+"can be overridden by adressing a new value to it - lists and scopes can't be "
+"overridden, only cleared."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt.conf.5.xml:106
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."
+"appended too by adding a trailing :: to the list name. (As you might "
+"suspect: The scope syntax can't be used on the commandline.)"
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt.conf.5.xml:113
+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 "
+"\"<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 "
+"append to a list will gain the opposite as only the last assignment for this "
+"option \"<literal>::</literal>\" will be used. Upcoming APT versions will "
+"raise errors and will stop working if they encounter this misuse, so please "
+"correct such statements now as long as APT doesn't complain explicit about "
+"them."
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:102
+#: apt.conf.5.xml:125
msgid "The APT Group"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:103
+#: apt.conf.5.xml:126
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:107
+#: apt.conf.5.xml:130
msgid "Architecture"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:108
+#: apt.conf.5.xml:131
msgid ""
"System Architecture; sets the architecture to use when fetching files and "
"parsing package lists. The internal default is the architecture apt was "
@@ -4311,12 +4357,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:113
+#: apt.conf.5.xml:136
msgid "Default-Release"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:114
+#: apt.conf.5.xml:137
msgid ""
"Default release to install packages from if more than one version "
"available. Contains release name, codename or release version. Examples: "
@@ -4325,24 +4371,24 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:118
+#: apt.conf.5.xml:141
msgid "Ignore-Hold"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:119
+#: apt.conf.5.xml:142
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:123
+#: apt.conf.5.xml:146
msgid "Clean-Installed"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:124
+#: apt.conf.5.xml:147
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 "
@@ -4351,12 +4397,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:130
+#: apt.conf.5.xml:153
msgid "Immediate-Configure"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:131
+#: apt.conf.5.xml:154
msgid ""
"Disable Immediate Configuration; This dangerous option disables some of "
"APT's ordering code to cause it to make fewer dpkg calls. Doing so may be "
@@ -4366,12 +4412,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:138
+#: apt.conf.5.xml:161
msgid "Force-LoopBreak"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:139
+#: apt.conf.5.xml:162
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 "
@@ -4382,87 +4428,87 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:147
+#: apt.conf.5.xml:170
msgid "Cache-Limit"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:148
+#: apt.conf.5.xml:171
msgid ""
"APT uses a fixed size memory mapped cache file to store the 'available' "
"information. This sets the size of that cache (in bytes)."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:152
+#: apt.conf.5.xml:175
msgid "Build-Essential"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:153
+#: apt.conf.5.xml:176
msgid "Defines which package(s) are considered essential build dependencies."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:156
+#: apt.conf.5.xml:179
msgid "Get"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:157
+#: apt.conf.5.xml:180
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:161
+#: apt.conf.5.xml:184
msgid "Cache"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:162
+#: apt.conf.5.xml:185
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:166
+#: apt.conf.5.xml:189
msgid "CDROM"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:167
+#: apt.conf.5.xml:190
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:173
+#: apt.conf.5.xml:196
msgid "The Acquire Group"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:178
+#: apt.conf.5.xml:201
msgid "PDiffs"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:179
+#: apt.conf.5.xml:202
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><term>
-#: apt.conf.5.xml:184
+#: apt.conf.5.xml:207
msgid "Queue-Mode"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:185
+#: apt.conf.5.xml:208
msgid ""
"Queuing mode; <literal>Queue-Mode</literal> can be one of "
"<literal>host</literal> or <literal>access</literal> which determines how "
@@ -4472,36 +4518,36 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:192
+#: apt.conf.5.xml:215
msgid "Retries"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:193
+#: apt.conf.5.xml:216
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:197
+#: apt.conf.5.xml:220
msgid "Source-Symlinks"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:198
+#: apt.conf.5.xml:221
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:202 sources.list.5.xml:139
+#: apt.conf.5.xml:225 sources.list.5.xml:139
msgid "http"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:203
+#: apt.conf.5.xml:226
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 "
@@ -4513,7 +4559,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:211
+#: apt.conf.5.xml:234
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 "
@@ -4527,7 +4573,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:221 apt.conf.5.xml:273
+#: apt.conf.5.xml:244 apt.conf.5.xml:301
msgid ""
"The option <literal>timeout</literal> sets the timeout timer used by the "
"method, this applies to all things including connection timeout and data "
@@ -4535,7 +4581,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:224
+#: apt.conf.5.xml:247
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) "
@@ -4546,13 +4592,23 @@ msgid ""
"are in violation of RFC 2068."
msgstr ""
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:255
+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 "
+"as much as possible of the bandwith (Note that this option implicit "
+"deactivates the download from multiple servers at the same time.)"
+msgstr ""
+
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:233
+#: apt.conf.5.xml:261
msgid "https"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:234
+#: apt.conf.5.xml:262
msgid ""
"HTTPS URIs. Cache-control and proxy options are the same as for "
"<literal>http</literal> method. <literal>Pipeline-Depth</literal> option is "
@@ -4560,7 +4616,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:238
+#: apt.conf.5.xml:266
msgid ""
"<literal>CaInfo</literal> suboption specifies place of file that holds info "
"about trusted certificates. <literal>&lt;host&gt;::CaInfo</literal> is "
@@ -4582,12 +4638,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:256 sources.list.5.xml:150
+#: apt.conf.5.xml:284 sources.list.5.xml:150
msgid "ftp"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:257
+#: apt.conf.5.xml:285
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 "
@@ -4607,7 +4663,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:276
+#: apt.conf.5.xml:304
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 "
@@ -4617,7 +4673,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:283
+#: apt.conf.5.xml:311
msgid ""
"It is possible to proxy FTP over HTTP by setting the "
"<envar>ftp_proxy</envar> environment variable to a http url - see the "
@@ -4627,7 +4683,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:288
+#: apt.conf.5.xml:316
msgid ""
"The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
"<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@ -4637,18 +4693,18 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:295 sources.list.5.xml:132
+#: apt.conf.5.xml:323 sources.list.5.xml:132
msgid "cdrom"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:301
+#: apt.conf.5.xml:329
#, no-wrap
msgid "\"/cdrom/\"::Mount \"foo\";"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:296
+#: apt.conf.5.xml:324
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 "
@@ -4661,12 +4717,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:306
+#: apt.conf.5.xml:334
msgid "gpgv"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:307
+#: apt.conf.5.xml:335
msgid ""
"GPGV URIs; the only option for GPGV URIs is the option to pass additional "
"parameters to gpgv. <literal>gpgv::Options</literal> Additional options "
@@ -4674,12 +4730,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:312
+#: apt.conf.5.xml:340
msgid "CompressionTypes"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:318
+#: apt.conf.5.xml:346
#, no-wrap
msgid ""
"Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> "
@@ -4687,7 +4743,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:313
+#: apt.conf.5.xml:341
msgid ""
"List of compression types which are understood by the acquire methods. "
"Files like <filename>Packages</filename> can be available in various "
@@ -4699,19 +4755,19 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:323
+#: apt.conf.5.xml:351
#, no-wrap
msgid "Acquire::CompressionTypes::Order:: \"gz\";"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:326
+#: apt.conf.5.xml:354
#, no-wrap
msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:319
+#: apt.conf.5.xml:347
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 "
@@ -4728,13 +4784,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:330
+#: apt.conf.5.xml:358
#, no-wrap
msgid "Dir::Bin::bzip2 \"/bin/bzip2\";"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:328
+#: apt.conf.5.xml:356
msgid ""
"Note that at run time the "
"<literal>Dir::Bin::<replaceable>Methodname</replaceable></literal> will be "
@@ -4749,7 +4805,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:335
+#: apt.conf.5.xml:363
msgid ""
"While it is possible to add an empty compression type to the order list, but "
"APT in its current version doesn't understand it correctly and will display "
@@ -4759,7 +4815,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:174
+#: apt.conf.5.xml:197
msgid ""
"The <literal>Acquire</literal> group of options controls the download of "
"packages and the URI handlers. <placeholder type=\"variablelist\" "
@@ -4767,12 +4823,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:344
+#: apt.conf.5.xml:372
msgid "Directories"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:346
+#: apt.conf.5.xml:374
msgid ""
"The <literal>Dir::State</literal> section has directories that pertain to "
"local state information. <literal>lists</literal> is the directory to place "
@@ -4784,7 +4840,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:353
+#: apt.conf.5.xml:381
msgid ""
"<literal>Dir::Cache</literal> contains locations pertaining to local cache "
"information, such as the two package caches <literal>srcpkgcache</literal> "
@@ -4797,7 +4853,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:362
+#: apt.conf.5.xml:390
msgid ""
"<literal>Dir::Etc</literal> contains the location of configuration files, "
"<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -4807,7 +4863,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:368
+#: apt.conf.5.xml:396
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 "
@@ -4815,7 +4871,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:372
+#: apt.conf.5.xml:400
msgid ""
"Binary programs are pointed to by "
"<literal>Dir::Bin</literal>. <literal>Dir::Bin::Methods</literal> specifies "
@@ -4827,7 +4883,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:380
+#: apt.conf.5.xml:408
msgid ""
"The configuration item <literal>RootDir</literal> has a special meaning. If "
"set, all paths in <literal>Dir::</literal> will be relative to "
@@ -4840,12 +4896,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:393
+#: apt.conf.5.xml:421
msgid "APT in DSelect"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:395
+#: apt.conf.5.xml:423
msgid ""
"When APT is used as a &dselect; method several configuration directives "
"control the default behaviour. These are in the <literal>DSelect</literal> "
@@ -4853,12 +4909,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:399
+#: apt.conf.5.xml:427
msgid "Clean"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:400
+#: apt.conf.5.xml:428
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 "
@@ -4869,50 +4925,50 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:409
+#: apt.conf.5.xml:437
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:413
+#: apt.conf.5.xml:441
msgid "Updateoptions"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:414
+#: apt.conf.5.xml:442
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:418
+#: apt.conf.5.xml:446
msgid "PromptAfterUpdate"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:419
+#: apt.conf.5.xml:447
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:425
+#: apt.conf.5.xml:453
msgid "How APT calls dpkg"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:426
+#: apt.conf.5.xml:454
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:431
+#: apt.conf.5.xml:459
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 "
@@ -4920,17 +4976,17 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:436
+#: apt.conf.5.xml:464
msgid "Pre-Invoke"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:436
+#: apt.conf.5.xml:464
msgid "Post-Invoke"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:437
+#: apt.conf.5.xml:465
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 "
@@ -4939,12 +4995,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:443
+#: apt.conf.5.xml:471
msgid "Pre-Install-Pkgs"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:444
+#: apt.conf.5.xml:472
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 "
@@ -4954,7 +5010,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:450
+#: apt.conf.5.xml:478
msgid ""
"Version 2 of this protocol dumps more information, including the protocol "
"version, the APT configuration space and the packages, files and versions "
@@ -4965,36 +5021,36 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:457
+#: apt.conf.5.xml:485
msgid "Run-Directory"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:458
+#: apt.conf.5.xml:486
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:462
+#: apt.conf.5.xml:490
msgid "Build-options"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:463
+#: apt.conf.5.xml:491
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:468
+#: apt.conf.5.xml:496
msgid "dpkg trigger usage (and related options)"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:469
+#: apt.conf.5.xml:497
msgid ""
"APT can call dpkg in a way so it can make aggressive use of triggers over "
"multiply calls of dpkg. Without further options dpkg will use triggers only "
@@ -5009,7 +5065,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:484
+#: apt.conf.5.xml:512
#, no-wrap
msgid ""
"DPkg::NoTriggers \"true\";\n"
@@ -5019,7 +5075,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:478
+#: apt.conf.5.xml:506
msgid ""
"Note that it is not garanteed that APT will support these options or that "
"these options will not cause (big) trouble in the future. If you have "
@@ -5033,12 +5089,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:490
+#: apt.conf.5.xml:518
msgid "DPkg::NoTriggers"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:491
+#: apt.conf.5.xml:519
msgid ""
"Add the no triggers flag to all dpkg calls (expect the ConfigurePending "
"call). See &dpkg; if you are interested in what this actually means. In "
@@ -5050,12 +5106,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:498
+#: apt.conf.5.xml:526
msgid "PackageManager::Configure"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:499
+#: apt.conf.5.xml:527
msgid ""
"Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
"and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default "
@@ -5072,12 +5128,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:509
+#: apt.conf.5.xml:537
msgid "DPkg::ConfigurePending"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:510
+#: apt.conf.5.xml:538
msgid ""
"If this option is set apt will call <command>dpkg --configure "
"--pending</command> to let dpkg handle all required configurations and "
@@ -5089,12 +5145,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:516
+#: apt.conf.5.xml:544
msgid "DPkg::TriggersPending"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:517
+#: apt.conf.5.xml:545
msgid ""
"Useful for <literal>smart</literal> configuration as a package which has "
"pending triggers is not considered as <literal>installed</literal> and dpkg "
@@ -5104,12 +5160,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:522
+#: apt.conf.5.xml:550
msgid "PackageManager::UnpackAll"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:523
+#: apt.conf.5.xml:551
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 "
@@ -5121,12 +5177,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:530
+#: apt.conf.5.xml:558
msgid "OrderList::Score::Immediate"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:538
+#: apt.conf.5.xml:566
#, no-wrap
msgid ""
"OrderList::Score {\n"
@@ -5138,7 +5194,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:531
+#: apt.conf.5.xml:559
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 "
@@ -5152,12 +5208,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:551
+#: apt.conf.5.xml:579
msgid "Periodic and Archives options"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:552
+#: apt.conf.5.xml:580
msgid ""
"<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
"of options configure behavior of apt periodic updates, which is done by "
@@ -5166,12 +5222,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:560
+#: apt.conf.5.xml:588
msgid "Debug options"
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:562
+#: apt.conf.5.xml:590
msgid ""
"Enabling options in the <literal>Debug::</literal> section will cause "
"debugging information to be sent to the standard error stream of the program "
@@ -5182,7 +5238,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:573
+#: apt.conf.5.xml:601
msgid ""
"<literal>Debug::pkgProblemResolver</literal> enables output about the "
"decisions made by <literal>dist-upgrade, upgrade, install, remove, "
@@ -5190,7 +5246,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:581
+#: apt.conf.5.xml:609
msgid ""
"<literal>Debug::NoLocking</literal> disables all file locking. This can be "
"used to run some operations (for instance, <literal>apt-get -s "
@@ -5198,7 +5254,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:590
+#: apt.conf.5.xml:618
msgid ""
"<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
"time that <literal>apt</literal> invokes &dpkg;."
@@ -5208,110 +5264,110 @@ 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:598
+#: apt.conf.5.xml:626
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:608
+#: apt.conf.5.xml:636
msgid "A full list of debugging options to apt follows."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:613
+#: apt.conf.5.xml:641
msgid "<literal>Debug::Acquire::cdrom</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:617
+#: apt.conf.5.xml:645
msgid "Print information related to accessing <literal>cdrom://</literal> sources."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:624
+#: apt.conf.5.xml:652
msgid "<literal>Debug::Acquire::ftp</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:628
+#: apt.conf.5.xml:656
msgid "Print information related to downloading packages using FTP."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:635
+#: apt.conf.5.xml:663
msgid "<literal>Debug::Acquire::http</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:639
+#: apt.conf.5.xml:667
msgid "Print information related to downloading packages using HTTP."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:646
+#: apt.conf.5.xml:674
msgid "<literal>Debug::Acquire::https</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:650
+#: apt.conf.5.xml:678
msgid "Print information related to downloading packages using HTTPS."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:657
+#: apt.conf.5.xml:685
msgid "<literal>Debug::Acquire::gpgv</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:661
+#: apt.conf.5.xml:689
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:668
+#: apt.conf.5.xml:696
msgid "<literal>Debug::aptcdrom</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:672
+#: apt.conf.5.xml:700
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:679
+#: apt.conf.5.xml:707
msgid "<literal>Debug::BuildDeps</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:682
+#: apt.conf.5.xml:710
msgid "Describes the process of resolving build-dependencies in &apt-get;."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:689
+#: apt.conf.5.xml:717
msgid "<literal>Debug::Hashes</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:692
+#: apt.conf.5.xml:720
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:699
+#: apt.conf.5.xml:727
msgid "<literal>Debug::IdentCDROM</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:702
+#: apt.conf.5.xml:730
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 "
@@ -5319,92 +5375,92 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:710
+#: apt.conf.5.xml:738
msgid "<literal>Debug::NoLocking</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:713
+#: apt.conf.5.xml:741
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:721
+#: apt.conf.5.xml:749
msgid "<literal>Debug::pkgAcquire</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:725
+#: apt.conf.5.xml:753
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:732
+#: apt.conf.5.xml:760
msgid "<literal>Debug::pkgAcquire::Auth</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:735
+#: apt.conf.5.xml:763
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:742
+#: apt.conf.5.xml:770
msgid "<literal>Debug::pkgAcquire::Diffs</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:745
+#: apt.conf.5.xml:773
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:753
+#: apt.conf.5.xml:781
msgid "<literal>Debug::pkgAcquire::RRed</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:757
+#: apt.conf.5.xml:785
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:764
+#: apt.conf.5.xml:792
msgid "<literal>Debug::pkgAcquire::Worker</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:768
+#: apt.conf.5.xml:796
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:775
+#: apt.conf.5.xml:803
msgid "<literal>Debug::pkgAutoRemove</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:779
+#: apt.conf.5.xml:807
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:786
+#: apt.conf.5.xml:814
msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:789
+#: apt.conf.5.xml:817
msgid ""
"Generate debug messages describing which packages are being automatically "
"installed to resolve dependencies. This corresponds to the initial "
@@ -5414,12 +5470,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:800
+#: apt.conf.5.xml:828
msgid "<literal>Debug::pkgDepCache::Marker</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:803
+#: apt.conf.5.xml:831
msgid ""
"Generate debug messages describing which package is marked as "
"keep/install/remove while the ProblemResolver does his work. Each addition "
@@ -5437,90 +5493,90 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:822
+#: apt.conf.5.xml:850
msgid "<literal>Debug::pkgInitConfig</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:825
+#: apt.conf.5.xml:853
msgid "Dump the default configuration to standard error on startup."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:832
+#: apt.conf.5.xml:860
msgid "<literal>Debug::pkgDPkgPM</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:835
+#: apt.conf.5.xml:863
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:843
+#: apt.conf.5.xml:871
msgid "<literal>Debug::pkgDPkgProgressReporting</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:846
+#: apt.conf.5.xml:874
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:853
+#: apt.conf.5.xml:881
msgid "<literal>Debug::pkgOrderList</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:857
+#: apt.conf.5.xml:885
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:865
+#: apt.conf.5.xml:893
msgid "<literal>Debug::pkgPackageManager</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:869
+#: apt.conf.5.xml:897
msgid "Output status messages tracing the steps performed when invoking &dpkg;."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:876
+#: apt.conf.5.xml:904
msgid "<literal>Debug::pkgPolicy</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:880
+#: apt.conf.5.xml:908
msgid "Output the priority of each package list on startup."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:886
+#: apt.conf.5.xml:914
msgid "<literal>Debug::pkgProblemResolver</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:890
+#: apt.conf.5.xml:918
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:898
+#: apt.conf.5.xml:926
msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:901
+#: apt.conf.5.xml:929
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 "
@@ -5528,32 +5584,32 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:909
+#: apt.conf.5.xml:937
msgid "<literal>Debug::sourceList</literal>"
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:913
+#: apt.conf.5.xml:941
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:935
+#: apt.conf.5.xml:963
msgid ""
"&configureindex; is a configuration file showing example values for all "
"possible options."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt.conf.5.xml:942
+#: apt.conf.5.xml:970
msgid "&file-aptconf;"
msgstr ""
#. ? reading apt.conf
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:947
+#: apt.conf.5.xml:975
msgid "&apt-cache;, &apt-config;, &apt-preferences;."
msgstr ""
diff --git a/doc/po/fr.po b/doc/po/fr.po
index 6088f9ecf..461638080 100644
--- a/doc/po/fr.po
+++ b/doc/po/fr.po
@@ -9,7 +9,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2009-09-18 17:09+0300\n"
+"POT-Creation-Date: 2009-09-24 15:02+0300\n"
"PO-Revision-Date: 2009-09-14 20:15+0200\n"
"Last-Translator: Christian Perrier <bubulle@debian.org>\n"
"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -1515,8 +1515,15 @@ msgstr "pkgnames <replaceable>[ préfixe ]</replaceable>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-cache.8.xml:229
+#, fuzzy
+#| msgid ""
+#| "This command prints the name of each package in the system. The optional "
+#| "argument is a prefix match to filter the name list. The output is "
+#| "suitable for use in a shell tab complete function and the output is "
+#| "generated extremely quickly. This command is best used with the <option>--"
+#| "generate</option> option."
msgid ""
-"This command prints the name of each package in the system. The optional "
+"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 "
"for use in a shell tab complete function and the output is generated "
"extremely quickly. This command is best used with the <option>--generate</"
@@ -1528,13 +1535,21 @@ msgstr ""
"est produite très rapidement. On utilise au mieux cette commande avec "
"l'option <option>--generate</option>."
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-cache.8.xml:234
+msgid ""
+"Note that a package which APT knows of is not nessasarily 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
+#: apt-cache.8.xml:239
msgid "dotty <replaceable>pkg(s)</replaceable>"
msgstr "dotty <replaceable>paquet(s)</replaceable>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:237
+#: apt-cache.8.xml:240
msgid ""
"<literal>dotty</literal> takes a list of packages on the command line and "
"generates output suitable for use by dotty from the <ulink url=\"http://www."
@@ -1556,7 +1571,7 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:246
+#: apt-cache.8.xml:249
msgid ""
"The resulting nodes will have several shapes; normal packages are boxes, "
"pure provides are triangles, mixed provides are diamonds, missing packages "
@@ -1571,19 +1586,19 @@ msgstr ""
"conflits."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:251
+#: apt-cache.8.xml:254
msgid "Caution, dotty cannot graph larger sets of packages."
msgstr ""
"Attention, dotty ne peut pas représenter des ensembles très grands de "
"paquets."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:254
+#: apt-cache.8.xml:257
msgid "xvcg <replaceable>pkg(s)</replaceable>"
msgstr "xvcg <replaceable>paquet(s)</replaceable>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:255
+#: apt-cache.8.xml:258
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 tool</ulink>."
@@ -1593,12 +1608,12 @@ msgstr ""
"ulink>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:259
+#: apt-cache.8.xml:262
msgid "policy <replaceable>[ pkg(s) ]</replaceable>"
msgstr "policy <replaceable>[ paquet(s) ]</replaceable>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:260
+#: apt-cache.8.xml:263
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 "
@@ -1611,12 +1626,12 @@ msgstr ""
"paquet donné en argument."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:266
+#: apt-cache.8.xml:269
msgid "madison <replaceable>/[ pkg(s) ]</replaceable>"
msgstr "madison <replaceable>[ paquet(s) ]</replaceable>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:267
+#: apt-cache.8.xml:270
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 "
@@ -1636,24 +1651,24 @@ msgstr ""
"literal>)."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:278 apt-config.8.xml:93 apt-extracttemplates.1.xml:56
+#: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56
#: apt-ftparchive.1.xml:492 apt-get.8.xml:319 apt-mark.8.xml:89
-#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:408 apt.conf.5.xml:430
+#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:436 apt.conf.5.xml:458
msgid "options"
msgstr "options"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:282
+#: apt-cache.8.xml:285
msgid "<option>-p</option>"
msgstr "<option>-p</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:282
+#: apt-cache.8.xml:285
msgid "<option>--pkg-cache</option>"
msgstr "<option>--pkg-cache</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:283
+#: apt-cache.8.xml:286
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::"
@@ -1664,18 +1679,18 @@ msgstr ""
"<literal>Dir::Cache::pkgcache</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:288 apt-ftparchive.1.xml:535 apt-get.8.xml:376
+#: apt-cache.8.xml:291 apt-ftparchive.1.xml:535 apt-get.8.xml:376
#: apt-sortpkgs.1.xml:58
msgid "<option>-s</option>"
msgstr "<option>-s</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:288
+#: apt-cache.8.xml:291
msgid "<option>--src-cache</option>"
msgstr "<option>--src-cache</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:289
+#: apt-cache.8.xml:292
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 "
@@ -1691,17 +1706,17 @@ msgstr ""
"<literal>Dir::Cache::srcpkgcache</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:296 apt-ftparchive.1.xml:509 apt-get.8.xml:366
+#: apt-cache.8.xml:299 apt-ftparchive.1.xml:509 apt-get.8.xml:366
msgid "<option>-q</option>"
msgstr "<option>-q</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:296 apt-ftparchive.1.xml:509 apt-get.8.xml:366
+#: apt-cache.8.xml:299 apt-ftparchive.1.xml:509 apt-get.8.xml:366
msgid "<option>--quiet</option>"
msgstr "<option>--quiet</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:297
+#: apt-cache.8.xml:300
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 "
@@ -1716,17 +1731,17 @@ msgstr ""
"<literal>quiet</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:303
+#: apt-cache.8.xml:306
msgid "<option>-i</option>"
msgstr "<option>-i</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:303
+#: apt-cache.8.xml:306
msgid "<option>--important</option>"
msgstr "<option>--important</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:304
+#: apt-cache.8.xml:307
msgid ""
"Print only important dependencies; for use with unmet and depends. Causes "
"only Depends and Pre-Depends relations to be printed. Configuration Item: "
@@ -1737,17 +1752,17 @@ msgstr ""
"Élément de configuration : <literal>APT::Cache::Important</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:309 apt-cdrom.8.xml:121 apt-get.8.xml:333
+#: apt-cache.8.xml:312 apt-cdrom.8.xml:121 apt-get.8.xml:333
msgid "<option>-f</option>"
msgstr "<option>-f</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:309
+#: apt-cache.8.xml:312
msgid "<option>--full</option>"
msgstr "<option>--full</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:310
+#: apt-cache.8.xml:313
msgid ""
"Print full package records when searching. Configuration Item: "
"<literal>APT::Cache::ShowFull</literal>."
@@ -1757,17 +1772,17 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:314 apt-cdrom.8.xml:131
+#: apt-cache.8.xml:317 apt-cdrom.8.xml:131
msgid "<option>-a</option>"
msgstr "<option>-a</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:314
+#: apt-cache.8.xml:317
msgid "<option>--all-versions</option>"
msgstr "<option>--all-versions</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:315
+#: apt-cache.8.xml:318
msgid ""
"Print full records for all available versions. This is the default; to turn "
"it off, use <option>--no-all-versions</option>. If <option>--no-all-"
@@ -1785,17 +1800,17 @@ msgstr ""
"<literal>APT::Cache::AllVersions</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:323
+#: apt-cache.8.xml:326
msgid "<option>-g</option>"
msgstr "<option>-g</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:323
+#: apt-cache.8.xml:326
msgid "<option>--generate</option>"
msgstr "<option>--generate</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:324
+#: apt-cache.8.xml:327
msgid ""
"Perform automatic package cache regeneration, rather than use the cache as "
"it is. This is the default; to turn it off, use <option>--no-generate</"
@@ -1807,17 +1822,17 @@ msgstr ""
"configuration : <literal>APT::Cache::Generate</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:329
+#: apt-cache.8.xml:332
msgid "<option>--names-only</option>"
msgstr "<option>--names-only</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:329 apt-cdrom.8.xml:139
+#: apt-cache.8.xml:332 apt-cdrom.8.xml:139
msgid "<option>-n</option>"
msgstr "<option>-n</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:330
+#: apt-cache.8.xml:333
msgid ""
"Only search on the package names, not the long descriptions. Configuration "
"Item: <literal>APT::Cache::NamesOnly</literal>."
@@ -1827,12 +1842,12 @@ msgstr ""
"NamesOnly</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:334
+#: apt-cache.8.xml:337
msgid "<option>--all-names</option>"
msgstr "<option>--all-names</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:335
+#: apt-cache.8.xml:338
msgid ""
"Make <literal>pkgnames</literal> print all names, including virtual packages "
"and missing dependencies. Configuration Item: <literal>APT::Cache::"
@@ -1843,12 +1858,12 @@ msgstr ""
"configuration : <literal>APT::Cache::AllNames</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:340
+#: apt-cache.8.xml:343
msgid "<option>--recurse</option>"
msgstr "<option>--recurse</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:341
+#: apt-cache.8.xml:344
msgid ""
"Make <literal>depends</literal> and <literal>rdepends</literal> recursive so "
"that all packages mentioned are printed once. Configuration Item: "
@@ -1860,12 +1875,12 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:346
+#: apt-cache.8.xml:349
msgid "<option>--installed</option>"
msgstr "<option>--installed</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:348
+#: apt-cache.8.xml:351
msgid ""
"Limit the output of <literal>depends</literal> and <literal>rdepends</"
"literal> to packages which are currently installed. Configuration Item: "
@@ -1876,46 +1891,46 @@ msgstr ""
"Élément de configuration : <literal>APT::Cache::Installed</literal>."
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-cache.8.xml:353 apt-cdrom.8.xml:150 apt-config.8.xml:98
+#: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:98
#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:547 apt-get.8.xml:554
#: apt-sortpkgs.1.xml:64
msgid "&apt-commonoptions;"
msgstr "&apt-commonoptions;"
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:358 apt-get.8.xml:559 apt-key.8.xml:138 apt-mark.8.xml:122
-#: apt.conf.5.xml:940 apt_preferences.5.xml:615
+#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:138 apt-mark.8.xml:122
+#: apt.conf.5.xml:968 apt_preferences.5.xml:615
msgid "Files"
msgstr "Fichiers"
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-cache.8.xml:360
+#: apt-cache.8.xml:363
msgid "&file-sourceslist; &file-statelists;"
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:365 apt-cdrom.8.xml:155 apt-config.8.xml:103
+#: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103
#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:563 apt-get.8.xml:569
#: apt-key.8.xml:162 apt-mark.8.xml:133 apt-secure.8.xml:181
-#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:946 apt_preferences.5.xml:622
+#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:974 apt_preferences.5.xml:622
#: sources.list.5.xml:221
msgid "See Also"
msgstr "Voir aussi"
#. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:366
+#: apt-cache.8.xml:369
msgid "&apt-conf;, &sources-list;, &apt-get;"
msgstr "&apt-conf;, &sources-list;, &apt-get;."
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:370 apt-cdrom.8.xml:160 apt-config.8.xml:108
+#: apt-cache.8.xml:373 apt-cdrom.8.xml:160 apt-config.8.xml:108
#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:567 apt-get.8.xml:575
#: apt-mark.8.xml:137 apt-sortpkgs.1.xml:73
msgid "Diagnostics"
msgstr "Diagnostique"
#. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:371
+#: apt-cache.8.xml:374
msgid ""
"<command>apt-cache</command> returns zero on normal operation, decimal 100 "
"on error."
@@ -3483,7 +3498,7 @@ msgstr ""
"configuration : <literal>APT::FTPArchive::ReadOnlyDB</literal>."
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:552 apt.conf.5.xml:934 apt_preferences.5.xml:462
+#: apt-ftparchive.1.xml:552 apt.conf.5.xml:962 apt_preferences.5.xml:462
#: sources.list.5.xml:181
msgid "Examples"
msgstr "Exemples"
@@ -5668,6 +5683,16 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para>
#: apt.conf.5.xml:89
+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 above. "
+"If you don't specify a name a new entry will simply add a new option to the "
+"list. If you specify a name you can override the option as every other "
+"option by reassigning a new value to the option."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt.conf.5.xml:94
#, fuzzy
#| msgid ""
#| "Two specials are allowed, <literal>#include</literal> and "
@@ -5678,10 +5703,11 @@ msgstr ""
#| "erased."
msgid ""
"Two specials are allowed, <literal>#include</literal> and <literal>#clear</"
-"literal> <literal>#include</literal> will include the given file, unless the "
-"filename ends in a slash, then the whole directory is included. "
+"literal>: <literal>#include</literal> will include the given file, unless "
+"the filename ends in a slash, then the whole directory is included. "
"<literal>#clear</literal> is used to erase a part of the configuration tree. "
-"The specified element and all its descendants are erased."
+"The specified element and all its descendants are erased. (Note that these "
+"lines also need to end with a semicolon.)"
msgstr ""
"Deux éléments spéciaux sont autorisés : <literal>#include</literal> et "
"<literal>#clear</literal>. <literal>#include</literal> inclut le fichier "
@@ -5691,13 +5717,31 @@ msgstr ""
"ses descendants sont supprimés."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:95
+#: apt.conf.5.xml:101
+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 <emphasis>not</"
+"emphasis> override previewsly written entries. Only options can be "
+"overridden by adressing a new value to it - lists and scopes can't be "
+"overridden, only cleared."
+msgstr ""
+
+#. type: Content of: <refentry><refsect1><para>
+#: apt.conf.5.xml:106
+#, fuzzy
+#| 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."
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."
+"appended too by adding a trailing :: to the list name. (As you might "
+"suspect: The scope syntax can't be used on the commandline.)"
msgstr ""
"Tous les outils d'APT possèdent une option <option>-o</option> qui permet de "
"spécifier une configuration quelconque depuis la ligne de commande. La "
@@ -5706,13 +5750,30 @@ msgstr ""
"de l'option. On peut compléter une liste en ajoutant un « :: » au nom de la "
"liste."
+#. type: Content of: <refentry><refsect1><para>
+#: apt.conf.5.xml:113
+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 "
+"\"<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 append to a "
+"list will gain the opposite as only the last assignment for this option "
+"\"<literal>::</literal>\" will be used. Upcoming APT versions will raise "
+"errors and will stop working if they encounter this misuse, so please "
+"correct such statements now as long as APT doesn't complain explicit about "
+"them."
+msgstr ""
+
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:102
+#: apt.conf.5.xml:125
msgid "The APT Group"
msgstr "Le groupe APT"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:103
+#: apt.conf.5.xml:126
msgid ""
"This group of options controls general APT behavior as well as holding the "
"options for all of the tools."
@@ -5721,12 +5782,12 @@ msgstr ""
"également des options communes à tous les outils."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:107
+#: apt.conf.5.xml:130
msgid "Architecture"
msgstr "Architecture"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:108
+#: apt.conf.5.xml:131
msgid ""
"System Architecture; sets the architecture to use when fetching files and "
"parsing package lists. The internal default is the architecture apt was "
@@ -5737,12 +5798,12 @@ msgstr ""
"valeur interne par défaut est l'architecture pour laquelle APT a été compilé."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:113
+#: apt.conf.5.xml:136
msgid "Default-Release"
msgstr "Default-Release"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:114
+#: apt.conf.5.xml:137
msgid ""
"Default release to install packages from if more than one version available. "
"Contains release name, codename or release version. Examples: 'stable', "
@@ -5755,12 +5816,12 @@ msgstr ""
"« 4.0 », « 5.0* ». Voir aussi &apt-preferences;."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:118
+#: apt.conf.5.xml:141
msgid "Ignore-Hold"
msgstr "Ignore-Hold"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:119
+#: apt.conf.5.xml:142
msgid ""
"Ignore Held packages; This global option causes the problem resolver to "
"ignore held packages in its decision making."
@@ -5770,12 +5831,12 @@ msgstr ""
"décision."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:123
+#: apt.conf.5.xml:146
msgid "Clean-Installed"
msgstr "Clean-Installed"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:124
+#: apt.conf.5.xml:147
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 "
@@ -5789,12 +5850,12 @@ msgstr ""
"les réinstaller."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:130
+#: apt.conf.5.xml:153
msgid "Immediate-Configure"
msgstr "Immediate-Configure"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:131
+#: apt.conf.5.xml:154
msgid ""
"Disable Immediate Configuration; This dangerous option disables some of "
"APT's ordering code to cause it to make fewer dpkg calls. Doing so may be "
@@ -5810,12 +5871,12 @@ msgstr ""
"vos risques et périls."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:138
+#: apt.conf.5.xml:161
msgid "Force-LoopBreak"
msgstr "Force-LoopBreak"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:139
+#: apt.conf.5.xml:162
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 Conflicts/"
@@ -5833,12 +5894,12 @@ msgstr ""
"ces paquets dépendent."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:147
+#: apt.conf.5.xml:170
msgid "Cache-Limit"
msgstr "Cache-Limit"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:148
+#: apt.conf.5.xml:171
msgid ""
"APT uses a fixed size memory mapped cache file to store the 'available' "
"information. This sets the size of that cache (in bytes)."
@@ -5848,24 +5909,24 @@ msgstr ""
"mémoire allouée pour le chargement de ce cache."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:152
+#: apt.conf.5.xml:175
msgid "Build-Essential"
msgstr "Build-Essential"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:153
+#: apt.conf.5.xml:176
msgid "Defines which package(s) are considered essential build dependencies."
msgstr ""
"Cette option définit les paquets qui sont considérés comme faisant partie "
"des dépendances essentielles pour la construction de paquets."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:156
+#: apt.conf.5.xml:179
msgid "Get"
msgstr "Get"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:157
+#: apt.conf.5.xml:180
msgid ""
"The Get subsection controls the &apt-get; tool, please see its documentation "
"for more information about the options here."
@@ -5875,12 +5936,12 @@ msgstr ""
"question."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:161
+#: apt.conf.5.xml:184
msgid "Cache"
msgstr "Cache"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:162
+#: apt.conf.5.xml:185
msgid ""
"The Cache subsection controls the &apt-cache; tool, please see its "
"documentation for more information about the options here."
@@ -5890,12 +5951,12 @@ msgstr ""
"options en question."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:166
+#: apt.conf.5.xml:189
msgid "CDROM"
msgstr "CDROM"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:167
+#: apt.conf.5.xml:190
msgid ""
"The CDROM subsection controls the &apt-cdrom; tool, please see its "
"documentation for more information about the options here."
@@ -5905,17 +5966,17 @@ msgstr ""
"options en question."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:173
+#: apt.conf.5.xml:196
msgid "The Acquire Group"
msgstr "Le groupe Acquire"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:178
+#: apt.conf.5.xml:201
msgid "PDiffs"
msgstr "PDiffs"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:179
+#: apt.conf.5.xml:202
msgid ""
"Try to download deltas called <literal>PDiffs</literal> for Packages or "
"Sources files instead of downloading whole ones. True by default."
@@ -5925,12 +5986,12 @@ msgstr ""
"télécharger entièrement. Par défaut à « true »."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:184
+#: apt.conf.5.xml:207
msgid "Queue-Mode"
msgstr "Queue-Mode"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:185
+#: apt.conf.5.xml:208
msgid ""
"Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</"
"literal> or <literal>access</literal> which determines how APT parallelizes "
@@ -5946,12 +6007,12 @@ msgstr ""
"initiée."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:192
+#: apt.conf.5.xml:215
msgid "Retries"
msgstr "Retries"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:193
+#: apt.conf.5.xml:216
msgid ""
"Number of retries to perform. If this is non-zero APT will retry failed "
"files the given number of times."
@@ -5961,12 +6022,12 @@ msgstr ""
"échoué."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:197
+#: apt.conf.5.xml:220
msgid "Source-Symlinks"
msgstr "Source-Symlinks"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:198
+#: apt.conf.5.xml:221
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."
@@ -5976,12 +6037,12 @@ msgstr ""
"archives de sources au lieu de les copier. Par défaut à « true »."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:202 sources.list.5.xml:139
+#: apt.conf.5.xml:225 sources.list.5.xml:139
msgid "http"
msgstr "http"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:203
+#: apt.conf.5.xml:226
#, fuzzy
#| msgid ""
#| "HTTP URIs; http::Proxy is the default http proxy to use. It is in the "
@@ -6008,7 +6069,7 @@ msgstr ""
"les options de mandataire HTTP."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:211
+#: apt.conf.5.xml:234
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 "
@@ -6033,7 +6094,7 @@ msgstr ""
"en compte aucune de ces options."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:221 apt.conf.5.xml:273
+#: apt.conf.5.xml:244 apt.conf.5.xml:301
msgid ""
"The option <literal>timeout</literal> sets the timeout timer used by the "
"method, this applies to all things including connection timeout and data "
@@ -6043,7 +6104,7 @@ msgstr ""
"(timeout) utilisé par la méthode. Cela vaut pour tout, connexion et données."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:224
+#: apt.conf.5.xml:247
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) "
@@ -6062,13 +6123,23 @@ msgstr ""
"sinon des données seront corrompues. Les machines qui ont besoin de cette "
"option ne respectent pas la RFC 2068."
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:255
+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 as much as possible of the "
+"bandwith (Note that this option implicit deactivates the download from "
+"multiple servers at the same time.)"
+msgstr ""
+
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:233
+#: apt.conf.5.xml:261
msgid "https"
msgstr "https"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:234
+#: apt.conf.5.xml:262
msgid ""
"HTTPS URIs. Cache-control and proxy options are the same as for "
"<literal>http</literal> method. <literal>Pipeline-Depth</literal> option is "
@@ -6079,7 +6150,7 @@ msgstr ""
"<literal>Pipeline-Depth</literal> n'est pas encore supportée."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:238
+#: apt.conf.5.xml:266
msgid ""
"<literal>CaInfo</literal> suboption specifies place of file that holds info "
"about trusted certificates. <literal>&lt;host&gt;::CaInfo</literal> is "
@@ -6111,12 +6182,12 @@ msgstr ""
"ou 'SSLv3'."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:256 sources.list.5.xml:150
+#: apt.conf.5.xml:284 sources.list.5.xml:150
msgid "ftp"
msgstr "ftp"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:257
+#: apt.conf.5.xml:285
#, fuzzy
#| msgid ""
#| "FTP URIs; ftp::Proxy is the default proxy server to use. It is in the "
@@ -6164,7 +6235,7 @@ msgstr ""
"respectif de l'URI."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:276
+#: apt.conf.5.xml:304
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 "
@@ -6181,7 +6252,7 @@ msgstr ""
"modèle de fichier de configuration)."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:283
+#: apt.conf.5.xml:311
msgid ""
"It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</"
"envar> environment variable to a http url - see the discussion of the http "
@@ -6196,7 +6267,7 @@ msgstr ""
"de cette méthode."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:288
+#: apt.conf.5.xml:316
msgid ""
"The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
"<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@ -6212,18 +6283,18 @@ msgstr ""
"des serveurs FTP ne suivent pas la RFC 2428."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:295 sources.list.5.xml:132
+#: apt.conf.5.xml:323 sources.list.5.xml:132
msgid "cdrom"
msgstr "cdrom"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:301
+#: apt.conf.5.xml:329
#, no-wrap
msgid "\"/cdrom/\"::Mount \"foo\";"
msgstr "\"/cdrom/\"::Mount \"foo\";"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:296
+#: apt.conf.5.xml:324
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 "
@@ -6245,12 +6316,12 @@ msgstr ""
"spécifiées en utilisant <literal>UMount</literal>."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:306
+#: apt.conf.5.xml:334
msgid "gpgv"
msgstr "gpgv"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:307
+#: apt.conf.5.xml:335
msgid ""
"GPGV URIs; the only option for GPGV URIs is the option to pass additional "
"parameters to gpgv. <literal>gpgv::Options</literal> Additional options "
@@ -6261,18 +6332,18 @@ msgstr ""
"supplémentaires passées à gpgv."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:312
+#: apt.conf.5.xml:340
msgid "CompressionTypes"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:318
+#: apt.conf.5.xml:346
#, no-wrap
msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:313
+#: apt.conf.5.xml:341
msgid ""
"List of compression types which are understood by the acquire methods. "
"Files like <filename>Packages</filename> can be available in various "
@@ -6284,19 +6355,19 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:323
+#: apt.conf.5.xml:351
#, no-wrap
msgid "Acquire::CompressionTypes::Order:: \"gz\";"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:326
+#: apt.conf.5.xml:354
#, no-wrap
msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:319
+#: apt.conf.5.xml:347
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 "
@@ -6313,13 +6384,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:330
+#: apt.conf.5.xml:358
#, no-wrap
msgid "Dir::Bin::bzip2 \"/bin/bzip2\";"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:328
+#: apt.conf.5.xml:356
msgid ""
"Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</"
"replaceable></literal> will be checked: If this setting exists the method "
@@ -6334,7 +6405,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:335
+#: apt.conf.5.xml:363
msgid ""
"While it is possible to add an empty compression type to the order list, but "
"APT in its current version doesn't understand it correctly and will display "
@@ -6344,7 +6415,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:174
+#: apt.conf.5.xml:197
msgid ""
"The <literal>Acquire</literal> group of options controls the download of "
"packages and the URI handlers. <placeholder type=\"variablelist\" id=\"0\"/>"
@@ -6354,12 +6425,12 @@ msgstr ""
"id=\"0\"/>"
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:344
+#: apt.conf.5.xml:372
msgid "Directories"
msgstr "Les répertoires"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:346
+#: apt.conf.5.xml:374
msgid ""
"The <literal>Dir::State</literal> section has directories that pertain to "
"local state information. <literal>lists</literal> is the directory to place "
@@ -6379,7 +6450,7 @@ msgstr ""
"filename>."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:353
+#: apt.conf.5.xml:381
msgid ""
"<literal>Dir::Cache</literal> contains locations pertaining to local cache "
"information, such as the two package caches <literal>srcpkgcache</literal> "
@@ -6402,7 +6473,7 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:362
+#: apt.conf.5.xml:390
msgid ""
"<literal>Dir::Etc</literal> contains the location of configuration files, "
"<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -6417,7 +6488,7 @@ msgstr ""
"fichier de configuration indiqué par la variable <envar>APT_CONFIG</envar>)."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:368
+#: apt.conf.5.xml:396
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 "
@@ -6428,7 +6499,7 @@ msgstr ""
"configuration est chargé."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:372
+#: apt.conf.5.xml:400
#, fuzzy
#| msgid ""
#| "Binary programs are pointed to by <literal>Dir::Bin</literal>. "
@@ -6453,7 +6524,7 @@ msgstr ""
"l'emplacement des programmes correspondants."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:380
+#: apt.conf.5.xml:408
msgid ""
"The configuration item <literal>RootDir</literal> has a special meaning. If "
"set, all paths in <literal>Dir::</literal> will be relative to "
@@ -6475,12 +6546,12 @@ msgstr ""
"staging/var/lib/dpkg/status</filename>."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:393
+#: apt.conf.5.xml:421
msgid "APT in DSelect"
msgstr "APT et DSelect"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:395
+#: apt.conf.5.xml:423
msgid ""
"When APT is used as a &dselect; method several configuration directives "
"control the default behaviour. These are in the <literal>DSelect</literal> "
@@ -6491,12 +6562,12 @@ msgstr ""
"<literal>DSelect</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:399
+#: apt.conf.5.xml:427
msgid "Clean"
msgstr "Clean"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:400
+#: apt.conf.5.xml:428
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 "
@@ -6514,7 +6585,7 @@ msgstr ""
"supprime avant de récupérer de nouveaux paquets."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:409
+#: apt.conf.5.xml:437
msgid ""
"The contents of this variable is passed to &apt-get; as command line options "
"when it is run for the install phase."
@@ -6523,12 +6594,12 @@ msgstr ""
"&apt-get; lors de la phase d'installation."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:413
+#: apt.conf.5.xml:441
msgid "Updateoptions"
msgstr "UpdateOptions"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:414
+#: apt.conf.5.xml:442
msgid ""
"The contents of this variable is passed to &apt-get; as command line options "
"when it is run for the update phase."
@@ -6537,12 +6608,12 @@ msgstr ""
"&apt-get; lors de la phase de mise à jour."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:418
+#: apt.conf.5.xml:446
msgid "PromptAfterUpdate"
msgstr "PromptAfterUpdate"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:419
+#: apt.conf.5.xml:447
msgid ""
"If true the [U]pdate operation in &dselect; will always prompt to continue. "
"The default is to prompt only on error."
@@ -6552,12 +6623,12 @@ msgstr ""
"d'erreur que l'on propose à l'utilisateur d'intervenir."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:425
+#: apt.conf.5.xml:453
msgid "How APT calls dpkg"
msgstr "Méthode d'appel de &dpkg; par APT"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:426
+#: apt.conf.5.xml:454
msgid ""
"Several configuration directives control how APT invokes &dpkg;. These are "
"in the <literal>DPkg</literal> section."
@@ -6566,7 +6637,7 @@ msgstr ""
"&dpkg; : elles figurent dans la section <literal>DPkg</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:431
+#: apt.conf.5.xml:459
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 "
@@ -6577,17 +6648,17 @@ msgstr ""
"est passé comme un seul paramètre à &dpkg;."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:436
+#: apt.conf.5.xml:464
msgid "Pre-Invoke"
msgstr "Pre-Invoke"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:436
+#: apt.conf.5.xml:464
msgid "Post-Invoke"
msgstr "Post-Invoke"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:437
+#: apt.conf.5.xml:465
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 "
@@ -6600,12 +6671,12 @@ msgstr ""
"<filename>/bin/sh</filename> : APT s'arrête dès que l'une d'elles échoue."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:443
+#: apt.conf.5.xml:471
msgid "Pre-Install-Pkgs"
msgstr "Pre-Install-Pkgs"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:444
+#: apt.conf.5.xml:472
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 "
@@ -6621,7 +6692,7 @@ msgstr ""
"qu'il va installer, à raison d'un par ligne."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:450
+#: apt.conf.5.xml:478
msgid ""
"Version 2 of this protocol dumps more information, including the protocol "
"version, the APT configuration space and the packages, files and versions "
@@ -6637,12 +6708,12 @@ msgstr ""
"literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:457
+#: apt.conf.5.xml:485
msgid "Run-Directory"
msgstr "Run-Directory"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:458
+#: apt.conf.5.xml:486
msgid ""
"APT chdirs to this directory before invoking dpkg, the default is <filename>/"
"</filename>."
@@ -6651,12 +6722,12 @@ msgstr ""
"le répertoire <filename>/</filename>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:462
+#: apt.conf.5.xml:490
msgid "Build-options"
msgstr "Build-options"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:463
+#: apt.conf.5.xml:491
msgid ""
"These options are passed to &dpkg-buildpackage; when compiling packages, the "
"default is to disable signing and produce all binaries."
@@ -6666,12 +6737,12 @@ msgstr ""
"créés."
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt.conf.5.xml:468
+#: apt.conf.5.xml:496
msgid "dpkg trigger usage (and related options)"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:469
+#: apt.conf.5.xml:497
msgid ""
"APT can call dpkg in a way so it can make aggressive use of triggers over "
"multiply calls of dpkg. Without further options dpkg will use triggers only "
@@ -6686,7 +6757,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:484
+#: apt.conf.5.xml:512
#, no-wrap
msgid ""
"DPkg::NoTriggers \"true\";\n"
@@ -6696,7 +6767,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:478
+#: apt.conf.5.xml:506
msgid ""
"Note that it is not garanteed that APT will support these options or that "
"these options will not cause (big) trouble in the future. If you have "
@@ -6710,12 +6781,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:490
+#: apt.conf.5.xml:518
msgid "DPkg::NoTriggers"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:491
+#: apt.conf.5.xml:519
msgid ""
"Add the no triggers flag to all dpkg calls (expect the ConfigurePending "
"call). See &dpkg; if you are interested in what this actually means. In "
@@ -6727,14 +6798,14 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:498
+#: apt.conf.5.xml:526
#, fuzzy
#| msgid "Packages::Compress"
msgid "PackageManager::Configure"
msgstr "Packages::Compress"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:499
+#: apt.conf.5.xml:527
msgid ""
"Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
"and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default "
@@ -6750,12 +6821,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:509
+#: apt.conf.5.xml:537
msgid "DPkg::ConfigurePending"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:510
+#: apt.conf.5.xml:538
msgid ""
"If this option is set apt will call <command>dpkg --configure --pending</"
"command> to let dpkg handle all required configurations and triggers. This "
@@ -6766,12 +6837,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:516
+#: apt.conf.5.xml:544
msgid "DPkg::TriggersPending"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:517
+#: apt.conf.5.xml:545
msgid ""
"Useful for <literal>smart</literal> configuration as a package which has "
"pending triggers is not considered as <literal>installed</literal> and dpkg "
@@ -6781,12 +6852,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:522
+#: apt.conf.5.xml:550
msgid "PackageManager::UnpackAll"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:523
+#: apt.conf.5.xml:551
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 Pre-"
@@ -6798,12 +6869,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:530
+#: apt.conf.5.xml:558
msgid "OrderList::Score::Immediate"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:538
+#: apt.conf.5.xml:566
#, no-wrap
msgid ""
"OrderList::Score {\n"
@@ -6815,7 +6886,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:531
+#: apt.conf.5.xml:559
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 "
@@ -6829,12 +6900,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:551
+#: apt.conf.5.xml:579
msgid "Periodic and Archives options"
msgstr "Options « Periodic » et « Archive »"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:552
+#: apt.conf.5.xml:580
msgid ""
"<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
"of options configure behavior of apt periodic updates, which is done by "
@@ -6846,12 +6917,12 @@ msgstr ""
"script <literal>/etc/cron.daily/apt</literal>, lancé quotidiennement."
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:560
+#: apt.conf.5.xml:588
msgid "Debug options"
msgstr "Les options de débogage"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:562
+#: apt.conf.5.xml:590
msgid ""
"Enabling options in the <literal>Debug::</literal> section will cause "
"debugging information to be sent to the standard error stream of the program "
@@ -6869,7 +6940,7 @@ msgstr ""
"peuvent tout de même être utiles :"
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:573
+#: apt.conf.5.xml:601
msgid ""
"<literal>Debug::pkgProblemResolver</literal> enables output about the "
"decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@ -6880,7 +6951,7 @@ msgstr ""
"upgrade, upgrade, install, remove et purge</literal>."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:581
+#: apt.conf.5.xml:609
msgid ""
"<literal>Debug::NoLocking</literal> disables all file locking. This can be "
"used to run some operations (for instance, <literal>apt-get -s install</"
@@ -6892,7 +6963,7 @@ msgstr ""
"superutilisateur."
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:590
+#: apt.conf.5.xml:618
msgid ""
"<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
"time that <literal>apt</literal> invokes &dpkg;."
@@ -6904,7 +6975,7 @@ 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:598
+#: apt.conf.5.xml:626
msgid ""
"<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
"in CDROM IDs."
@@ -6913,17 +6984,17 @@ msgstr ""
"type statfs dans les identifiants de CD."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:608
+#: apt.conf.5.xml:636
msgid "A full list of debugging options to apt follows."
msgstr "Liste complète des options de débogage de APT :"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:613
+#: apt.conf.5.xml:641
msgid "<literal>Debug::Acquire::cdrom</literal>"
msgstr "<literal>Debug::Acquire::cdrom</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:617
+#: apt.conf.5.xml:645
msgid ""
"Print information related to accessing <literal>cdrom://</literal> sources."
msgstr ""
@@ -6931,44 +7002,44 @@ msgstr ""
"literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:624
+#: apt.conf.5.xml:652
msgid "<literal>Debug::Acquire::ftp</literal>"
msgstr "<literal>Debug::Acquire::ftp</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:628
+#: apt.conf.5.xml:656
msgid "Print information related to downloading packages using FTP."
msgstr ""
"Affiche les informations concernant le téléchargement de paquets par FTP."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:635
+#: apt.conf.5.xml:663
msgid "<literal>Debug::Acquire::http</literal>"
msgstr "<literal>Debug::Acquire::http</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:639
+#: apt.conf.5.xml:667
msgid "Print information related to downloading packages using HTTP."
msgstr ""
"Affiche les informations concernant le téléchargement de paquets par HTTP."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:646
+#: apt.conf.5.xml:674
msgid "<literal>Debug::Acquire::https</literal>"
msgstr "<literal>Debug::Acquire::https</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:650
+#: apt.conf.5.xml:678
msgid "Print information related to downloading packages using HTTPS."
msgstr "Print information related to downloading packages using HTTPS."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:657
+#: apt.conf.5.xml:685
msgid "<literal>Debug::Acquire::gpgv</literal>"
msgstr "<literal>Debug::Acquire::gpgv</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:661
+#: apt.conf.5.xml:689
msgid ""
"Print information related to verifying cryptographic signatures using "
"<literal>gpg</literal>."
@@ -6977,12 +7048,12 @@ msgstr ""
"cryptographiques avec <literal>gpg</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:668
+#: apt.conf.5.xml:696
msgid "<literal>Debug::aptcdrom</literal>"
msgstr "<literal>Debug::aptcdrom</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:672
+#: apt.conf.5.xml:700
msgid ""
"Output information about the process of accessing collections of packages "
"stored on CD-ROMs."
@@ -6991,24 +7062,24 @@ msgstr ""
"stockées sur CD."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:679
+#: apt.conf.5.xml:707
msgid "<literal>Debug::BuildDeps</literal>"
msgstr "<literal>Debug::BuildDeps</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:682
+#: apt.conf.5.xml:710
msgid "Describes the process of resolving build-dependencies in &apt-get;."
msgstr ""
"Décrit le processus de résolution des dépendances pour la construction de "
"paquets source ( « build-dependencies » ) par &apt-get;."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:689
+#: apt.conf.5.xml:717
msgid "<literal>Debug::Hashes</literal>"
msgstr "<literal>Debug::Hashes</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:692
+#: apt.conf.5.xml:720
msgid ""
"Output each cryptographic hash that is generated by the <literal>apt</"
"literal> libraries."
@@ -7017,12 +7088,12 @@ msgstr ""
"librairies d'<literal>apt</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:699
+#: apt.conf.5.xml:727
msgid "<literal>Debug::IdentCDROM</literal>"
msgstr "<literal>Debug::IdentCDROM</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:702
+#: apt.conf.5.xml:730
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 "
@@ -7033,12 +7104,12 @@ msgstr ""
"utilisés sur le système de fichier du CD."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:710
+#: apt.conf.5.xml:738
msgid "<literal>Debug::NoLocking</literal>"
msgstr "<literal>Debug::NoLocking</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:713
+#: apt.conf.5.xml:741
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."
@@ -7048,24 +7119,24 @@ msgstr ""
"temps."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:721
+#: apt.conf.5.xml:749
msgid "<literal>Debug::pkgAcquire</literal>"
msgstr "<literal>Debug::pkgAcquire</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:725
+#: apt.conf.5.xml:753
msgid "Log when items are added to or removed from the global download queue."
msgstr ""
"Trace les ajouts et suppressions d'éléments de la queue globale de "
"téléchargement."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:732
+#: apt.conf.5.xml:760
msgid "<literal>Debug::pkgAcquire::Auth</literal>"
msgstr "<literal>Debug::pkgAcquire::Auth</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:735
+#: apt.conf.5.xml:763
msgid ""
"Output status messages and errors related to verifying checksums and "
"cryptographic signatures of downloaded files."
@@ -7075,12 +7146,12 @@ msgstr ""
"éventuelles."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:742
+#: apt.conf.5.xml:770
msgid "<literal>Debug::pkgAcquire::Diffs</literal>"
msgstr "<literal>Debug::pkgAcquire::Diffs</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:745
+#: apt.conf.5.xml:773
msgid ""
"Output information about downloading and applying package index list diffs, "
"and errors relating to package index list diffs."
@@ -7090,12 +7161,12 @@ msgstr ""
"éventuelles."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:753
+#: apt.conf.5.xml:781
msgid "<literal>Debug::pkgAcquire::RRed</literal>"
msgstr "<literal>Debug::pkgAcquire::RRed</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:757
+#: apt.conf.5.xml:785
msgid ""
"Output information related to patching apt package lists when downloading "
"index diffs instead of full indices."
@@ -7105,12 +7176,12 @@ msgstr ""
"place des fichiers complets."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:764
+#: apt.conf.5.xml:792
msgid "<literal>Debug::pkgAcquire::Worker</literal>"
msgstr "<literal>Debug::pkgAcquire::Worker</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:768
+#: apt.conf.5.xml:796
msgid ""
"Log all interactions with the sub-processes that actually perform downloads."
msgstr ""
@@ -7118,12 +7189,12 @@ msgstr ""
"effectivement des téléchargements."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:775
+#: apt.conf.5.xml:803
msgid "<literal>Debug::pkgAutoRemove</literal>"
msgstr "<literal>Debug::pkgAutoRemove</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:779
+#: apt.conf.5.xml:807
msgid ""
"Log events related to the automatically-installed status of packages and to "
"the removal of unused packages."
@@ -7132,12 +7203,12 @@ msgstr ""
"automatiquement, et la suppression des paquets inutiles."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:786
+#: apt.conf.5.xml:814
msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>"
msgstr "<literal>Debug::pkgDepCache::AutoInstall</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:789
+#: apt.conf.5.xml:817
msgid ""
"Generate debug messages describing which packages are being automatically "
"installed to resolve dependencies. This corresponds to the initial auto-"
@@ -7152,12 +7223,12 @@ msgstr ""
"de APT ; voir <literal>Debug::pkgProblemResolver</literal> pour ce dernier."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:800
+#: apt.conf.5.xml:828
msgid "<literal>Debug::pkgDepCache::Marker</literal>"
msgstr "<literal>Debug::pkgDepCache::Marker</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:803
+#: apt.conf.5.xml:831
msgid ""
"Generate debug messages describing which package is marked as keep/install/"
"remove while the ProblemResolver does his work. Each addition or deletion "
@@ -7192,24 +7263,24 @@ msgstr ""
"de APT ; voir <literal>Debug::pkgProblemResolver</literal> pour ce dernier."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:822
+#: apt.conf.5.xml:850
msgid "<literal>Debug::pkgInitConfig</literal>"
msgstr "<literal>Debug::pkgInitConfig</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:825
+#: apt.conf.5.xml:853
msgid "Dump the default configuration to standard error on startup."
msgstr ""
"Affiche, au lancement, l'ensemble de la configuration sur la sortie d'erreur "
"standard."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:832
+#: apt.conf.5.xml:860
msgid "<literal>Debug::pkgDPkgPM</literal>"
msgstr "<literal>Debug::pkgDPkgPM</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:835
+#: apt.conf.5.xml:863
msgid ""
"When invoking &dpkg;, output the precise command line with which it is being "
"invoked, with arguments separated by a single space character."
@@ -7218,12 +7289,12 @@ msgstr ""
"paramètres sont séparés par des espaces."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:843
+#: apt.conf.5.xml:871
msgid "<literal>Debug::pkgDPkgProgressReporting</literal>"
msgstr "<literal>Debug::pkgDPkgProgressReporting</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:846
+#: apt.conf.5.xml:874
msgid ""
"Output all the data received from &dpkg; on the status file descriptor and "
"any errors encountered while parsing it."
@@ -7233,12 +7304,12 @@ msgstr ""
"fichier."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:853
+#: apt.conf.5.xml:881
msgid "<literal>Debug::pkgOrderList</literal>"
msgstr "<literal>Debug::pkgOrderList</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:857
+#: apt.conf.5.xml:885
msgid ""
"Generate a trace of the algorithm that decides the order in which "
"<literal>apt</literal> should pass packages to &dpkg;."
@@ -7247,33 +7318,33 @@ msgstr ""
"<literal>apt</literal> passe les paquets à &dpkg;."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:865
+#: apt.conf.5.xml:893
msgid "<literal>Debug::pkgPackageManager</literal>"
msgstr "<literal>Debug::pkgPackageManager</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:869
+#: apt.conf.5.xml:897
msgid ""
"Output status messages tracing the steps performed when invoking &dpkg;."
msgstr "Affiche le détail des opérations liées à l'invocation de &dpkg;."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:876
+#: apt.conf.5.xml:904
msgid "<literal>Debug::pkgPolicy</literal>"
msgstr "<literal>Debug::pkgPolicy</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:880
+#: apt.conf.5.xml:908
msgid "Output the priority of each package list on startup."
msgstr "Affiche, au lancement, la priorité de chaque liste de paquets."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:886
+#: apt.conf.5.xml:914
msgid "<literal>Debug::pkgProblemResolver</literal>"
msgstr "<literal>Debug::pkgProblemResolver</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:890
+#: apt.conf.5.xml:918
msgid ""
"Trace the execution of the dependency resolver (this applies only to what "
"happens when a complex dependency problem is encountered)."
@@ -7282,12 +7353,12 @@ msgstr ""
"concerne que les cas où un problème de dépendances complexe se présente)."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:898
+#: apt.conf.5.xml:926
msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>"
msgstr "<literal>Debug::pkgProblemResolver::ShowScores</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:901
+#: apt.conf.5.xml:929
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 "
@@ -7298,12 +7369,12 @@ msgstr ""
"est décrite dans <literal>Debug::pkgDepCache::Marker</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:909
+#: apt.conf.5.xml:937
msgid "<literal>Debug::sourceList</literal>"
msgstr "<literal>Debug::sourceList</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:913
+#: apt.conf.5.xml:941
msgid ""
"Print information about the vendors read from <filename>/etc/apt/vendors."
"list</filename>."
@@ -7312,7 +7383,7 @@ msgstr ""
"list</filename>."
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:935
+#: apt.conf.5.xml:963
msgid ""
"&configureindex; is a configuration file showing example values for all "
"possible options."
@@ -7321,7 +7392,7 @@ msgstr ""
"exemples pour toutes les options existantes."
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt.conf.5.xml:942
+#: apt.conf.5.xml:970
#, fuzzy
#| msgid "&apt-conf;"
msgid "&file-aptconf;"
@@ -7329,7 +7400,7 @@ msgstr "&apt-conf;"
#. ? reading apt.conf
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:947
+#: apt.conf.5.xml:975
msgid "&apt-cache;, &apt-config;, &apt-preferences;."
msgstr "&apt-cache;, &apt-config;, &apt-preferences;."
diff --git a/doc/po/ja.po b/doc/po/ja.po
index e7d67ddaa..fc1fec09e 100644
--- a/doc/po/ja.po
+++ b/doc/po/ja.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2009-09-18 17:09+0300\n"
+"POT-Creation-Date: 2009-09-24 15:02+0300\n"
"PO-Revision-Date: 2009-07-30 22:55+0900\n"
"Last-Translator: KURASAWA Nozomu <nabetaro@caldron.jp>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1557,8 +1557,15 @@ msgstr "pkgnames <replaceable>[ prefix ]</replaceable>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-cache.8.xml:229
+#, fuzzy
+#| msgid ""
+#| "This command prints the name of each package in the system. The optional "
+#| "argument is a prefix match to filter the name list. The output is "
+#| "suitable for use in a shell tab complete function and the output is "
+#| "generated extremely quickly. This command is best used with the <option>--"
+#| "generate</option> option."
msgid ""
-"This command prints the name of each package in the system. The optional "
+"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 "
"for use in a shell tab complete function and the output is generated "
"extremely quickly. This command is best used with the <option>--generate</"
@@ -1569,15 +1576,23 @@ msgstr ""
"タブによる補完機能に使いやすく、また非常に速く生成されます。このコマンドは "
"<option>--generate</option> オプションと共に使用すると非常に便利です。"
+#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
+#: apt-cache.8.xml:234
+msgid ""
+"Note that a package which APT knows of is not nessasarily available to "
+"download, installable or installed, e.g. virtual packages are also listed in "
+"the generated list."
+msgstr ""
+
# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:236
+#: apt-cache.8.xml:239
msgid "dotty <replaceable>pkg(s)</replaceable>"
msgstr "dotty <replaceable>pkg(s)</replaceable>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:237
+#: apt-cache.8.xml:240
msgid ""
"<literal>dotty</literal> takes a list of packages on the command line and "
"generates output suitable for use by dotty from the <ulink url=\"http://www."
@@ -1597,7 +1612,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:246
+#: apt-cache.8.xml:249
msgid ""
"The resulting nodes will have several shapes; normal packages are boxes, "
"pure provides are triangles, mixed provides are diamonds, missing packages "
@@ -1611,18 +1626,18 @@ msgstr ""
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:251
+#: apt-cache.8.xml:254
msgid "Caution, dotty cannot graph larger sets of packages."
msgstr "注意) dotty は、パッケージのより大きなセットのグラフは描けません。"
# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:254
+#: apt-cache.8.xml:257
msgid "xvcg <replaceable>pkg(s)</replaceable>"
msgstr "xvcg <replaceable>pkg(s)</replaceable>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:255
+#: apt-cache.8.xml:258
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 tool</ulink>."
@@ -1632,13 +1647,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:259
+#: apt-cache.8.xml:262
msgid "policy <replaceable>[ pkg(s) ]</replaceable>"
msgstr "policy <replaceable>[ pkg(s) ]</replaceable>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:260
+#: apt-cache.8.xml:263
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 "
@@ -1651,13 +1666,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:266
+#: apt-cache.8.xml:269
msgid "madison <replaceable>/[ pkg(s) ]</replaceable>"
msgstr "madison <replaceable>/[ pkg(s) ]</replaceable>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:267
+#: apt-cache.8.xml:270
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 "
@@ -1676,25 +1691,25 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:278 apt-config.8.xml:93 apt-extracttemplates.1.xml:56
+#: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56
#: apt-ftparchive.1.xml:492 apt-get.8.xml:319 apt-mark.8.xml:89
-#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:408 apt.conf.5.xml:430
+#: apt-sortpkgs.1.xml:54 apt.conf.5.xml:436 apt.conf.5.xml:458
msgid "options"
msgstr "オプション"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:282
+#: apt-cache.8.xml:285
msgid "<option>-p</option>"
msgstr "<option>-p</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:282
+#: apt-cache.8.xml:285
msgid "<option>--pkg-cache</option>"
msgstr "<option>--pkg-cache</option>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:283
+#: apt-cache.8.xml:286
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::"
@@ -1705,19 +1720,19 @@ msgstr ""
"pkgcache</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:288 apt-ftparchive.1.xml:535 apt-get.8.xml:376
+#: apt-cache.8.xml:291 apt-ftparchive.1.xml:535 apt-get.8.xml:376
#: apt-sortpkgs.1.xml:58
msgid "<option>-s</option>"
msgstr "<option>-s</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:288
+#: apt-cache.8.xml:291
msgid "<option>--src-cache</option>"
msgstr "<option>--src-cache</option>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:289
+#: apt-cache.8.xml:292
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 "
@@ -1732,18 +1747,18 @@ msgstr ""
"<literal>Dir::Cache::srcpkgcache</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:296 apt-ftparchive.1.xml:509 apt-get.8.xml:366
+#: apt-cache.8.xml:299 apt-ftparchive.1.xml:509 apt-get.8.xml:366
msgid "<option>-q</option>"
msgstr "<option>-q</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:296 apt-ftparchive.1.xml:509 apt-get.8.xml:366
+#: apt-cache.8.xml:299 apt-ftparchive.1.xml:509 apt-get.8.xml:366
msgid "<option>--quiet</option>"
msgstr "<option>--quiet</option>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:297
+#: apt-cache.8.xml:300
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 "
@@ -1756,18 +1771,18 @@ msgstr ""
"<literal>quiet</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:303
+#: apt-cache.8.xml:306
msgid "<option>-i</option>"
msgstr "<option>-i</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:303
+#: apt-cache.8.xml:306
msgid "<option>--important</option>"
msgstr "<option>--important</option>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:304
+#: apt-cache.8.xml:307
msgid ""
"Print only important dependencies; for use with unmet and depends. Causes "
"only Depends and Pre-Depends relations to be printed. Configuration Item: "
@@ -1778,18 +1793,18 @@ msgstr ""
"Cache::Important</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:309 apt-cdrom.8.xml:121 apt-get.8.xml:333
+#: apt-cache.8.xml:312 apt-cdrom.8.xml:121 apt-get.8.xml:333
msgid "<option>-f</option>"
msgstr "<option>-f</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:309
+#: apt-cache.8.xml:312
msgid "<option>--full</option>"
msgstr "<option>--full</option>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:310
+#: apt-cache.8.xml:313
msgid ""
"Print full package records when searching. Configuration Item: "
"<literal>APT::Cache::ShowFull</literal>."
@@ -1798,18 +1813,18 @@ msgstr ""
"ShowFull</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:314 apt-cdrom.8.xml:131
+#: apt-cache.8.xml:317 apt-cdrom.8.xml:131
msgid "<option>-a</option>"
msgstr "<option>-a</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:314
+#: apt-cache.8.xml:317
msgid "<option>--all-versions</option>"
msgstr "<option>--all-versions</option>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:315
+#: apt-cache.8.xml:318
msgid ""
"Print full records for all available versions. This is the default; to turn "
"it off, use <option>--no-all-versions</option>. If <option>--no-all-"
@@ -1825,18 +1840,18 @@ msgstr ""
"用できます。設定項目 - <literal>APT::Cache::AllVersions</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:323
+#: apt-cache.8.xml:326
msgid "<option>-g</option>"
msgstr "<option>-g</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:323
+#: apt-cache.8.xml:326
msgid "<option>--generate</option>"
msgstr "<option>--generate</option>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:324
+#: apt-cache.8.xml:327
msgid ""
"Perform automatic package cache regeneration, rather than use the cache as "
"it is. This is the default; to turn it off, use <option>--no-generate</"
@@ -1848,18 +1863,18 @@ msgstr ""
"literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:329
+#: apt-cache.8.xml:332
msgid "<option>--names-only</option>"
msgstr "<option>--names-only</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:329 apt-cdrom.8.xml:139
+#: apt-cache.8.xml:332 apt-cdrom.8.xml:139
msgid "<option>-n</option>"
msgstr "<option>-n</option>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:330
+#: apt-cache.8.xml:333
msgid ""
"Only search on the package names, not the long descriptions. Configuration "
"Item: <literal>APT::Cache::NamesOnly</literal>."
@@ -1868,13 +1883,13 @@ msgstr ""
"Cache::NamesOnly</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:334
+#: apt-cache.8.xml:337
msgid "<option>--all-names</option>"
msgstr "<option>--all-names</option>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:335
+#: apt-cache.8.xml:338
msgid ""
"Make <literal>pkgnames</literal> print all names, including virtual packages "
"and missing dependencies. Configuration Item: <literal>APT::Cache::"
@@ -1884,13 +1899,13 @@ msgstr ""
"表示します。設定項目 - <literal>APT::Cache::AllNames</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:340
+#: apt-cache.8.xml:343
msgid "<option>--recurse</option>"
msgstr "<option>--recurse</option>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:341
+#: apt-cache.8.xml:344
msgid ""
"Make <literal>depends</literal> and <literal>rdepends</literal> recursive so "
"that all packages mentioned are printed once. Configuration Item: "
@@ -1901,13 +1916,13 @@ msgstr ""
"RecurseDepends</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt-cache.8.xml:346
+#: apt-cache.8.xml:349
msgid "<option>--installed</option>"
msgstr "<option>--installed</option>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt-cache.8.xml:348
+#: apt-cache.8.xml:351
msgid ""
"Limit the output of <literal>depends</literal> and <literal>rdepends</"
"literal> to packages which are currently installed. Configuration Item: "
@@ -1919,7 +1934,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-cache.8.xml:353 apt-cdrom.8.xml:150 apt-config.8.xml:98
+#: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:98
#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:547 apt-get.8.xml:554
#: apt-sortpkgs.1.xml:64
msgid "&apt-commonoptions;"
@@ -1927,35 +1942,35 @@ msgstr "&apt-commonoptions;"
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:358 apt-get.8.xml:559 apt-key.8.xml:138 apt-mark.8.xml:122
-#: apt.conf.5.xml:940 apt_preferences.5.xml:615
+#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:138 apt-mark.8.xml:122
+#: apt.conf.5.xml:968 apt_preferences.5.xml:615
msgid "Files"
msgstr "ファイル"
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt-cache.8.xml:360
+#: apt-cache.8.xml:363
msgid "&file-sourceslist; &file-statelists;"
msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:365 apt-cdrom.8.xml:155 apt-config.8.xml:103
+#: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103
#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:563 apt-get.8.xml:569
#: apt-key.8.xml:162 apt-mark.8.xml:133 apt-secure.8.xml:181
-#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:946 apt_preferences.5.xml:622
+#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:974 apt_preferences.5.xml:622
#: sources.list.5.xml:221
msgid "See Also"
msgstr "関連項目"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:366
+#: apt-cache.8.xml:369
msgid "&apt-conf;, &sources-list;, &apt-get;"
msgstr "&apt-conf;, &sources-list;, &apt-get;"
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><title>
-#: apt-cache.8.xml:370 apt-cdrom.8.xml:160 apt-config.8.xml:108
+#: apt-cache.8.xml:373 apt-cdrom.8.xml:160 apt-config.8.xml:108
#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:567 apt-get.8.xml:575
#: apt-mark.8.xml:137 apt-sortpkgs.1.xml:73
msgid "Diagnostics"
@@ -1963,7 +1978,7 @@ msgstr "診断メッセージ"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt-cache.8.xml:371
+#: apt-cache.8.xml:374
msgid ""
"<command>apt-cache</command> returns zero on normal operation, decimal 100 "
"on error."
@@ -3630,7 +3645,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><title>
-#: apt-ftparchive.1.xml:552 apt.conf.5.xml:934 apt_preferences.5.xml:462
+#: apt-ftparchive.1.xml:552 apt.conf.5.xml:962 apt_preferences.5.xml:462
#: sources.list.5.xml:181
msgid "Examples"
msgstr "サンプル"
@@ -5849,9 +5864,19 @@ msgstr ""
"設定項目の名前は、文字の大小を区別しません。そのため、前述の例を "
"<literal>dpkg::pre-install-pkgs</literal> とできます。"
-# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
#: apt.conf.5.xml:89
+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 above. "
+"If you don't specify a name a new entry will simply add a new option to the "
+"list. If you specify a name you can override the option as every other "
+"option by reassigning a new value to the option."
+msgstr ""
+
+# type: Content of: <refentry><refsect1><para>
+#. type: Content of: <refentry><refsect1><para>
+#: apt.conf.5.xml:94
#, fuzzy
#| msgid ""
#| "Two specials are allowed, <literal>#include</literal> and "
@@ -5862,10 +5887,11 @@ msgstr ""
#| "erased."
msgid ""
"Two specials are allowed, <literal>#include</literal> and <literal>#clear</"
-"literal> <literal>#include</literal> will include the given file, unless the "
-"filename ends in a slash, then the whole directory is included. "
+"literal>: <literal>#include</literal> will include the given file, unless "
+"the filename ends in a slash, then the whole directory is included. "
"<literal>#clear</literal> is used to erase a part of the configuration tree. "
-"The specified element and all its descendants are erased."
+"The specified element and all its descendants are erased. (Note that these "
+"lines also need to end with a semicolon.)"
msgstr ""
"<literal>#include</literal> と <literal>#clear</literal> の 2 つの特別な記法"
"があります。<literal>#include</literal> は指定したファイルを取り込みます。"
@@ -5873,30 +5899,65 @@ msgstr ""
"す。<literal>#clear</literal> は、設定ツリーの一部を削除するにに使用します。"
"指定した要素と、それ以下の要素を削除します。"
+#. type: Content of: <refentry><refsect1><para>
+#: apt.conf.5.xml:101
+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 <emphasis>not</"
+"emphasis> override previewsly written entries. Only options can be "
+"overridden by adressing a new value to it - lists and scopes can't be "
+"overridden, only cleared."
+msgstr ""
+
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:95
+#: apt.conf.5.xml:106
+#, fuzzy
+#| 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."
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."
+"appended too by adding a trailing :: to the list name. (As you might "
+"suspect: The scope syntax can't be used on the commandline.)"
msgstr ""
"すべての APT ツールで、コマンドラインで任意の設定を行う -o オプションが使用で"
"きます。文法は、完全なオプション名 (例: <literal>APT::Get::Assume-Yes</"
"literal>)、等号、続いてオプションの新しい値となります。リスト名に続き::を加え"
"ることで、リストを追加することができます。"
+#. type: Content of: <refentry><refsect1><para>
+#: apt.conf.5.xml:113
+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 "
+"\"<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 append to a "
+"list will gain the opposite as only the last assignment for this option "
+"\"<literal>::</literal>\" will be used. Upcoming APT versions will raise "
+"errors and will stop working if they encounter this misuse, so please "
+"correct such statements now as long as APT doesn't complain explicit about "
+"them."
+msgstr ""
+
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:102
+#: apt.conf.5.xml:125
msgid "The APT Group"
msgstr "APT グループ"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:103
+#: apt.conf.5.xml:126
msgid ""
"This group of options controls general APT behavior as well as holding the "
"options for all of the tools."
@@ -5906,13 +5967,13 @@ msgstr ""
# type: <tag></tag>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:107
+#: apt.conf.5.xml:130
msgid "Architecture"
msgstr "Architecture"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:108
+#: apt.conf.5.xml:131
msgid ""
"System Architecture; sets the architecture to use when fetching files and "
"parsing package lists. The internal default is the architecture apt was "
@@ -5924,12 +5985,12 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:113
+#: apt.conf.5.xml:136
msgid "Default-Release"
msgstr "Default-Release"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:114
+#: apt.conf.5.xml:137
msgid ""
"Default release to install packages from if more than one version available. "
"Contains release name, codename or release version. Examples: 'stable', "
@@ -5942,13 +6003,13 @@ msgstr ""
"す。 &apt-preferences; も参照してください。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:118
+#: apt.conf.5.xml:141
msgid "Ignore-Hold"
msgstr "Ignore-Hold"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:119
+#: apt.conf.5.xml:142
msgid ""
"Ignore Held packages; This global option causes the problem resolver to "
"ignore held packages in its decision making."
@@ -5958,13 +6019,13 @@ msgstr ""
# type: <tag></tag>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:123
+#: apt.conf.5.xml:146
msgid "Clean-Installed"
msgstr "Clean-Installed"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:124
+#: apt.conf.5.xml:147
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 "
@@ -5979,13 +6040,13 @@ msgstr ""
# type: Content of: <refentry><refnamediv><refname>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:130
+#: apt.conf.5.xml:153
msgid "Immediate-Configure"
msgstr "Immediate-Configure"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:131
+#: apt.conf.5.xml:154
msgid ""
"Disable Immediate Configuration; This dangerous option disables some of "
"APT's ordering code to cause it to make fewer dpkg calls. Doing so may be "
@@ -6000,13 +6061,13 @@ msgstr ""
"ください。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:138
+#: apt.conf.5.xml:161
msgid "Force-LoopBreak"
msgstr "Force-LoopBreak"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:139
+#: apt.conf.5.xml:162
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 Conflicts/"
@@ -6024,13 +6085,13 @@ msgstr ""
"不可欠パッケージで動作します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:147
+#: apt.conf.5.xml:170
msgid "Cache-Limit"
msgstr "Cache-Limit"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:148
+#: apt.conf.5.xml:171
msgid ""
"APT uses a fixed size memory mapped cache file to store the 'available' "
"information. This sets the size of that cache (in bytes)."
@@ -6039,24 +6100,24 @@ msgstr ""
"ファイルを使用します。このオプションは、そのキャッシュサイズを指定します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:152
+#: apt.conf.5.xml:175
msgid "Build-Essential"
msgstr "Build-Essential"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:153
+#: apt.conf.5.xml:176
msgid "Defines which package(s) are considered essential build dependencies."
msgstr "構築依存関係で不可欠なパッケージを定義します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:156
+#: apt.conf.5.xml:179
msgid "Get"
msgstr "Get"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:157
+#: apt.conf.5.xml:180
msgid ""
"The Get subsection controls the &apt-get; tool, please see its documentation "
"for more information about the options here."
@@ -6065,13 +6126,13 @@ msgstr ""
"&apt-get; の文書を参照してください。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:161
+#: apt.conf.5.xml:184
msgid "Cache"
msgstr "Cache"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:162
+#: apt.conf.5.xml:185
msgid ""
"The Cache subsection controls the &apt-cache; tool, please see its "
"documentation for more information about the options here."
@@ -6080,13 +6141,13 @@ msgstr ""
"は &apt-cache; の文書を参照してください。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:166
+#: apt.conf.5.xml:189
msgid "CDROM"
msgstr "CDROM"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:167
+#: apt.conf.5.xml:190
msgid ""
"The CDROM subsection controls the &apt-cdrom; tool, please see its "
"documentation for more information about the options here."
@@ -6096,17 +6157,17 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:173
+#: apt.conf.5.xml:196
msgid "The Acquire Group"
msgstr "Acquire グループ"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:178
+#: apt.conf.5.xml:201
msgid "PDiffs"
msgstr "PDiffs"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:179
+#: apt.conf.5.xml:202
msgid ""
"Try to download deltas called <literal>PDiffs</literal> for Packages or "
"Sources files instead of downloading whole ones. True by default."
@@ -6116,13 +6177,13 @@ msgstr ""
"ルトでは True です。"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:184
+#: apt.conf.5.xml:207
msgid "Queue-Mode"
msgstr "Queue-Mode"
# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:185
+#: apt.conf.5.xml:208
msgid ""
"Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</"
"literal> or <literal>access</literal> which determines how APT parallelizes "
@@ -6137,13 +6198,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><title>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:192
+#: apt.conf.5.xml:215
msgid "Retries"
msgstr "Retries"
# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:193
+#: apt.conf.5.xml:216
msgid ""
"Number of retries to perform. If this is non-zero APT will retry failed "
"files the given number of times."
@@ -6152,13 +6213,13 @@ msgstr ""
"えられた回数だけリトライを行います。"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:197
+#: apt.conf.5.xml:220
msgid "Source-Symlinks"
msgstr "Source-Symlinks"
# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:198
+#: apt.conf.5.xml:221
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."
@@ -6169,13 +6230,13 @@ msgstr ""
# type: <tag></tag>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:202 sources.list.5.xml:139
+#: apt.conf.5.xml:225 sources.list.5.xml:139
msgid "http"
msgstr "http"
# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:203
+#: apt.conf.5.xml:226
#, fuzzy
#| msgid ""
#| "HTTP URIs; http::Proxy is the default http proxy to use. It is in the "
@@ -6201,7 +6262,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:211
+#: apt.conf.5.xml:234
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 "
@@ -6226,7 +6287,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:221 apt.conf.5.xml:273
+#: apt.conf.5.xml:244 apt.conf.5.xml:301
msgid ""
"The option <literal>timeout</literal> sets the timeout timer used by the "
"method, this applies to all things including connection timeout and data "
@@ -6238,7 +6299,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:224
+#: apt.conf.5.xml:247
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) "
@@ -6256,14 +6317,24 @@ msgstr ""
"ければデータが破損してしまいます。これが必要なホストは RFC 2068 に違反してい"
"ます。"
+#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
+#: apt.conf.5.xml:255
+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 as much as possible of the "
+"bandwith (Note that this option implicit deactivates the download from "
+"multiple servers at the same time.)"
+msgstr ""
+
# type: <tag></tag>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:233
+#: apt.conf.5.xml:261
msgid "https"
msgstr "https"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:234
+#: apt.conf.5.xml:262
msgid ""
"HTTPS URIs. Cache-control and proxy options are the same as for "
"<literal>http</literal> method. <literal>Pipeline-Depth</literal> option is "
@@ -6274,7 +6345,7 @@ msgstr ""
"していません。"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:238
+#: apt.conf.5.xml:266
msgid ""
"<literal>CaInfo</literal> suboption specifies place of file that holds info "
"about trusted certificates. <literal>&lt;host&gt;::CaInfo</literal> is "
@@ -6296,13 +6367,13 @@ msgstr ""
# type: <tag></tag>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:256 sources.list.5.xml:150
+#: apt.conf.5.xml:284 sources.list.5.xml:150
msgid "ftp"
msgstr "ftp"
# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:257
+#: apt.conf.5.xml:285
#, fuzzy
#| msgid ""
#| "FTP URIs; ftp::Proxy is the default proxy server to use. It is in the "
@@ -6345,7 +6416,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:276
+#: apt.conf.5.xml:304
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 "
@@ -6361,7 +6432,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:283
+#: apt.conf.5.xml:311
msgid ""
"It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</"
"envar> environment variable to a http url - see the discussion of the http "
@@ -6375,7 +6446,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:288
+#: apt.conf.5.xml:316
msgid ""
"The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
"<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
@@ -6392,19 +6463,19 @@ msgstr ""
# type: Content of: <refentry><refnamediv><refname>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:295 sources.list.5.xml:132
+#: apt.conf.5.xml:323 sources.list.5.xml:132
msgid "cdrom"
msgstr "cdrom"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:301
+#: apt.conf.5.xml:329
#, no-wrap
msgid "\"/cdrom/\"::Mount \"foo\";"
msgstr "\"/cdrom/\"::Mount \"foo\";"
# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:296
+#: apt.conf.5.xml:324
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 "
@@ -6425,13 +6496,13 @@ msgstr ""
"す。"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:306
+#: apt.conf.5.xml:334
msgid "gpgv"
msgstr "gpgv"
# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:307
+#: apt.conf.5.xml:335
msgid ""
"GPGV URIs; the only option for GPGV URIs is the option to pass additional "
"parameters to gpgv. <literal>gpgv::Options</literal> Additional options "
@@ -6442,18 +6513,18 @@ msgstr ""
"す。"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
-#: apt.conf.5.xml:312
+#: apt.conf.5.xml:340
msgid "CompressionTypes"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:318
+#: apt.conf.5.xml:346
#, no-wrap
msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:313
+#: apt.conf.5.xml:341
msgid ""
"List of compression types which are understood by the acquire methods. "
"Files like <filename>Packages</filename> can be available in various "
@@ -6465,19 +6536,19 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:323
+#: apt.conf.5.xml:351
#, no-wrap
msgid "Acquire::CompressionTypes::Order:: \"gz\";"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
-#: apt.conf.5.xml:326
+#: apt.conf.5.xml:354
#, no-wrap
msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:319
+#: apt.conf.5.xml:347
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 "
@@ -6494,13 +6565,13 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:330
+#: apt.conf.5.xml:358
#, no-wrap
msgid "Dir::Bin::bzip2 \"/bin/bzip2\";"
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:328
+#: apt.conf.5.xml:356
msgid ""
"Note that at run time the <literal>Dir::Bin::<replaceable>Methodname</"
"replaceable></literal> will be checked: If this setting exists the method "
@@ -6515,7 +6586,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:335
+#: apt.conf.5.xml:363
msgid ""
"While it is possible to add an empty compression type to the order list, but "
"APT in its current version doesn't understand it correctly and will display "
@@ -6526,7 +6597,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:174
+#: apt.conf.5.xml:197
msgid ""
"The <literal>Acquire</literal> group of options controls the download of "
"packages and the URI handlers. <placeholder type=\"variablelist\" id=\"0\"/>"
@@ -6537,13 +6608,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><title>
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:344
+#: apt.conf.5.xml:372
msgid "Directories"
msgstr "ディレクトリ"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:346
+#: apt.conf.5.xml:374
msgid ""
"The <literal>Dir::State</literal> section has directories that pertain to "
"local state information. <literal>lists</literal> is the directory to place "
@@ -6563,7 +6634,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:353
+#: apt.conf.5.xml:381
msgid ""
"<literal>Dir::Cache</literal> contains locations pertaining to local cache "
"information, such as the two package caches <literal>srcpkgcache</literal> "
@@ -6585,7 +6656,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:362
+#: apt.conf.5.xml:390
msgid ""
"<literal>Dir::Etc</literal> contains the location of configuration files, "
"<literal>sourcelist</literal> gives the location of the sourcelist and "
@@ -6600,7 +6671,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:368
+#: apt.conf.5.xml:396
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 "
@@ -6612,7 +6683,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:372
+#: apt.conf.5.xml:400
#, fuzzy
#| msgid ""
#| "Binary programs are pointed to by <literal>Dir::Bin</literal>. "
@@ -6637,7 +6708,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:380
+#: apt.conf.5.xml:408
msgid ""
"The configuration item <literal>RootDir</literal> has a special meaning. If "
"set, all paths in <literal>Dir::</literal> will be relative to "
@@ -6658,13 +6729,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:393
+#: apt.conf.5.xml:421
msgid "APT in DSelect"
msgstr "DSelect での APT"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:395
+#: apt.conf.5.xml:423
msgid ""
"When APT is used as a &dselect; method several configuration directives "
"control the default behaviour. These are in the <literal>DSelect</literal> "
@@ -6674,13 +6745,13 @@ msgstr ""
"設定項目で、デフォルトの動作を制御します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:399
+#: apt.conf.5.xml:427
msgid "Clean"
msgstr "Clean"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:400
+#: apt.conf.5.xml:428
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 "
@@ -6697,7 +6768,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:409
+#: apt.conf.5.xml:437
msgid ""
"The contents of this variable is passed to &apt-get; as command line options "
"when it is run for the install phase."
@@ -6707,13 +6778,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:413
+#: apt.conf.5.xml:441
msgid "Updateoptions"
msgstr "Updateoptions"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:414
+#: apt.conf.5.xml:442
msgid ""
"The contents of this variable is passed to &apt-get; as command line options "
"when it is run for the update phase."
@@ -6722,13 +6793,13 @@ msgstr ""
"されます。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:418
+#: apt.conf.5.xml:446
msgid "PromptAfterUpdate"
msgstr "PromptAfterUpdate"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:419
+#: apt.conf.5.xml:447
msgid ""
"If true the [U]pdate operation in &dselect; will always prompt to continue. "
"The default is to prompt only on error."
@@ -6738,13 +6809,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:425
+#: apt.conf.5.xml:453
msgid "How APT calls dpkg"
msgstr "APT が dpkg を呼ぶ方法"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:426
+#: apt.conf.5.xml:454
msgid ""
"Several configuration directives control how APT invokes &dpkg;. These are "
"in the <literal>DPkg</literal> section."
@@ -6754,7 +6825,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:431
+#: apt.conf.5.xml:459
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 "
@@ -6764,18 +6835,18 @@ msgstr ""
"ければなりません。また、各リストは単一の引数として &dpkg; に渡されます。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:436
+#: apt.conf.5.xml:464
msgid "Pre-Invoke"
msgstr "Pre-Invoke"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:436
+#: apt.conf.5.xml:464
msgid "Post-Invoke"
msgstr "Post-Invoke"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:437
+#: apt.conf.5.xml:465
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 "
@@ -6789,13 +6860,13 @@ msgstr ""
# type: <tag></tag>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:443
+#: apt.conf.5.xml:471
msgid "Pre-Install-Pkgs"
msgstr "Pre-Install-Pkgs"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:444
+#: apt.conf.5.xml:472
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 "
@@ -6811,7 +6882,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:450
+#: apt.conf.5.xml:478
msgid ""
"Version 2 of this protocol dumps more information, including the protocol "
"version, the APT configuration space and the packages, files and versions "
@@ -6827,13 +6898,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><title>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:457
+#: apt.conf.5.xml:485
msgid "Run-Directory"
msgstr "Run-Directory"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:458
+#: apt.conf.5.xml:486
msgid ""
"APT chdirs to this directory before invoking dpkg, the default is <filename>/"
"</filename>."
@@ -6843,13 +6914,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:462
+#: apt.conf.5.xml:490
msgid "Build-options"
msgstr "Build-options"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:463
+#: apt.conf.5.xml:491
msgid ""
"These options are passed to &dpkg-buildpackage; when compiling packages, the "
"default is to disable signing and produce all binaries."
@@ -6858,12 +6929,12 @@ msgstr ""
"ます。デフォルトでは署名を無効にし、全バイナリを生成します。"
#. type: Content of: <refentry><refsect1><refsect2><title>
-#: apt.conf.5.xml:468
+#: apt.conf.5.xml:496
msgid "dpkg trigger usage (and related options)"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:469
+#: apt.conf.5.xml:497
msgid ""
"APT can call dpkg in a way so it can make aggressive use of triggers over "
"multiply calls of dpkg. Without further options dpkg will use triggers only "
@@ -6878,7 +6949,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><literallayout>
-#: apt.conf.5.xml:484
+#: apt.conf.5.xml:512
#, no-wrap
msgid ""
"DPkg::NoTriggers \"true\";\n"
@@ -6888,7 +6959,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
-#: apt.conf.5.xml:478
+#: apt.conf.5.xml:506
msgid ""
"Note that it is not garanteed that APT will support these options or that "
"these options will not cause (big) trouble in the future. If you have "
@@ -6902,12 +6973,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:490
+#: apt.conf.5.xml:518
msgid "DPkg::NoTriggers"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:491
+#: apt.conf.5.xml:519
msgid ""
"Add the no triggers flag to all dpkg calls (expect the ConfigurePending "
"call). See &dpkg; if you are interested in what this actually means. In "
@@ -6920,14 +6991,14 @@ msgstr ""
# type: <tag></tag>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:498
+#: apt.conf.5.xml:526
#, fuzzy
#| msgid "Packages::Compress"
msgid "PackageManager::Configure"
msgstr "Packages::Compress"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:499
+#: apt.conf.5.xml:527
msgid ""
"Valid values are \"<literal>all</literal>\", \"<literal>smart</literal>\" "
"and \"<literal>no</literal>\". \"<literal>all</literal>\" is the default "
@@ -6944,13 +7015,13 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:509
+#: apt.conf.5.xml:537
#, fuzzy
msgid "DPkg::ConfigurePending"
msgstr "ユーザの設定"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:510
+#: apt.conf.5.xml:538
msgid ""
"If this option is set apt will call <command>dpkg --configure --pending</"
"command> to let dpkg handle all required configurations and triggers. This "
@@ -6961,12 +7032,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:516
+#: apt.conf.5.xml:544
msgid "DPkg::TriggersPending"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:517
+#: apt.conf.5.xml:545
msgid ""
"Useful for <literal>smart</literal> configuration as a package which has "
"pending triggers is not considered as <literal>installed</literal> and dpkg "
@@ -6976,12 +7047,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:522
+#: apt.conf.5.xml:550
msgid "PackageManager::UnpackAll"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:523
+#: apt.conf.5.xml:551
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 Pre-"
@@ -6993,12 +7064,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
-#: apt.conf.5.xml:530
+#: apt.conf.5.xml:558
msgid "OrderList::Score::Immediate"
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
-#: apt.conf.5.xml:538
+#: apt.conf.5.xml:566
#, no-wrap
msgid ""
"OrderList::Score {\n"
@@ -7010,7 +7081,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:531
+#: apt.conf.5.xml:559
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 "
@@ -7024,12 +7095,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:551
+#: apt.conf.5.xml:579
msgid "Periodic and Archives options"
msgstr "Periodic オプションと Archives オプション"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:552
+#: apt.conf.5.xml:580
msgid ""
"<literal>APT::Periodic</literal> and <literal>APT::Archives</literal> groups "
"of options configure behavior of apt periodic updates, which is done by "
@@ -7043,12 +7114,12 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><title>
-#: apt.conf.5.xml:560
+#: apt.conf.5.xml:588
msgid "Debug options"
msgstr "デバッグオプション"
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:562
+#: apt.conf.5.xml:590
msgid ""
"Enabling options in the <literal>Debug::</literal> section will cause "
"debugging information to be sent to the standard error stream of the program "
@@ -7059,7 +7130,7 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:573
+#: apt.conf.5.xml:601
msgid ""
"<literal>Debug::pkgProblemResolver</literal> enables output about the "
"decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</"
@@ -7070,7 +7141,7 @@ msgstr ""
"にします。"
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:581
+#: apt.conf.5.xml:609
msgid ""
"<literal>Debug::NoLocking</literal> disables all file locking. This can be "
"used to run some operations (for instance, <literal>apt-get -s install</"
@@ -7081,7 +7152,7 @@ msgstr ""
"literal>) を行う場合に使用します。"
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
-#: apt.conf.5.xml:590
+#: apt.conf.5.xml:618
msgid ""
"<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
"time that <literal>apt</literal> invokes &dpkg;."
@@ -7091,66 +7162,66 @@ 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:598
+#: apt.conf.5.xml:626
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:608
+#: apt.conf.5.xml:636
msgid "A full list of debugging options to apt follows."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:613
+#: apt.conf.5.xml:641
msgid "<literal>Debug::Acquire::cdrom</literal>"
msgstr "<literal>Debug::Acquire::cdrom</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:617
+#: apt.conf.5.xml:645
msgid ""
"Print information related to accessing <literal>cdrom://</literal> sources."
msgstr ""
"<literal>cdrom://</literal> ソースへのアクセスに関する情報を出力します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:624
+#: apt.conf.5.xml:652
msgid "<literal>Debug::Acquire::ftp</literal>"
msgstr "<literal>Debug::Acquire::ftp</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:628
+#: apt.conf.5.xml:656
msgid "Print information related to downloading packages using FTP."
msgstr "FTP を用いたパッケージのダウンロードに関する情報を出力します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:635
+#: apt.conf.5.xml:663
msgid "<literal>Debug::Acquire::http</literal>"
msgstr "<literal>Debug::Acquire::http</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:639
+#: apt.conf.5.xml:667
msgid "Print information related to downloading packages using HTTP."
msgstr "HTTP を用いたパッケージのダウンロードに関する情報を出力します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:646
+#: apt.conf.5.xml:674
msgid "<literal>Debug::Acquire::https</literal>"
msgstr "<literal>Debug::Acquire::https</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:650
+#: apt.conf.5.xml:678
msgid "Print information related to downloading packages using HTTPS."
msgstr "HTTPS を用いたパッケージのダウンロードに関する情報を出力します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:657
+#: apt.conf.5.xml:685
msgid "<literal>Debug::Acquire::gpgv</literal>"
msgstr "<literal>Debug::Acquire::gpgv</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:661
+#: apt.conf.5.xml:689
msgid ""
"Print information related to verifying cryptographic signatures using "
"<literal>gpg</literal>."
@@ -7158,46 +7229,46 @@ msgstr ""
"<literal>gpg</literal> を用いた暗号署名の検証に関する情報を出力します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:668
+#: apt.conf.5.xml:696
msgid "<literal>Debug::aptcdrom</literal>"
msgstr "<literal>Debug::aptcdrom</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:672
+#: apt.conf.5.xml:700
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:679
+#: apt.conf.5.xml:707
msgid "<literal>Debug::BuildDeps</literal>"
msgstr "<literal>Debug::BuildDeps</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:682
+#: apt.conf.5.xml:710
msgid "Describes the process of resolving build-dependencies in &apt-get;."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:689
+#: apt.conf.5.xml:717
msgid "<literal>Debug::Hashes</literal>"
msgstr "<literal>Debug::Hashes</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:692
+#: apt.conf.5.xml:720
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:699
+#: apt.conf.5.xml:727
msgid "<literal>Debug::IdentCDROM</literal>"
msgstr "<literal>Debug::IdentCDROM</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:702
+#: apt.conf.5.xml:730
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 "
@@ -7205,93 +7276,93 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:710
+#: apt.conf.5.xml:738
msgid "<literal>Debug::NoLocking</literal>"
msgstr "<literal>Debug::NoLocking</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:713
+#: apt.conf.5.xml:741
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:721
+#: apt.conf.5.xml:749
msgid "<literal>Debug::pkgAcquire</literal>"
msgstr "<literal>Debug::pkgAcquire</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:725
+#: apt.conf.5.xml:753
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:732
+#: apt.conf.5.xml:760
msgid "<literal>Debug::pkgAcquire::Auth</literal>"
msgstr "<literal>Debug::pkgAcquire::Auth</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:735
+#: apt.conf.5.xml:763
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:742
+#: apt.conf.5.xml:770
msgid "<literal>Debug::pkgAcquire::Diffs</literal>"
msgstr "<literal>Debug::pkgAcquire::Diffs</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:745
+#: apt.conf.5.xml:773
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:753
+#: apt.conf.5.xml:781
msgid "<literal>Debug::pkgAcquire::RRed</literal>"
msgstr "<literal>Debug::pkgAcquire::RRed</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:757
+#: apt.conf.5.xml:785
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:764
+#: apt.conf.5.xml:792
msgid "<literal>Debug::pkgAcquire::Worker</literal>"
msgstr "<literal>Debug::pkgAcquire::Worker</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:768
+#: apt.conf.5.xml:796
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:775
+#: apt.conf.5.xml:803
msgid "<literal>Debug::pkgAutoRemove</literal>"
msgstr "<literal>Debug::pkgAutoRemove</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:779
+#: apt.conf.5.xml:807
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:786
+#: apt.conf.5.xml:814
msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>"
msgstr "<literal>Debug::pkgDepCache::AutoInstall</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:789
+#: apt.conf.5.xml:817
msgid ""
"Generate debug messages describing which packages are being automatically "
"installed to resolve dependencies. This corresponds to the initial auto-"
@@ -7301,12 +7372,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:800
+#: apt.conf.5.xml:828
msgid "<literal>Debug::pkgDepCache::Marker</literal>"
msgstr "<literal>Debug::pkgDepCache::Marker</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:803
+#: apt.conf.5.xml:831
msgid ""
"Generate debug messages describing which package is marked as keep/install/"
"remove while the ProblemResolver does his work. Each addition or deletion "
@@ -7323,91 +7394,91 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:822
+#: apt.conf.5.xml:850
msgid "<literal>Debug::pkgInitConfig</literal>"
msgstr "<literal>Debug::pkgInitConfig</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:825
+#: apt.conf.5.xml:853
msgid "Dump the default configuration to standard error on startup."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:832
+#: apt.conf.5.xml:860
msgid "<literal>Debug::pkgDPkgPM</literal>"
msgstr "<literal>Debug::pkgDPkgPM</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:835
+#: apt.conf.5.xml:863
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:843
+#: apt.conf.5.xml:871
msgid "<literal>Debug::pkgDPkgProgressReporting</literal>"
msgstr "<literal>Debug::pkgDPkgProgressReporting</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:846
+#: apt.conf.5.xml:874
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:853
+#: apt.conf.5.xml:881
msgid "<literal>Debug::pkgOrderList</literal>"
msgstr "<literal>Debug::pkgOrderList</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:857
+#: apt.conf.5.xml:885
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:865
+#: apt.conf.5.xml:893
msgid "<literal>Debug::pkgPackageManager</literal>"
msgstr "<literal>Debug::pkgPackageManager</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:869
+#: apt.conf.5.xml:897
msgid ""
"Output status messages tracing the steps performed when invoking &dpkg;."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:876
+#: apt.conf.5.xml:904
msgid "<literal>Debug::pkgPolicy</literal>"
msgstr "<literal>Debug::pkgPolicy</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:880
+#: apt.conf.5.xml:908
msgid "Output the priority of each package list on startup."
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:886
+#: apt.conf.5.xml:914
msgid "<literal>Debug::pkgProblemResolver</literal>"
msgstr "<literal>Debug::pkgProblemResolver</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:890
+#: apt.conf.5.xml:918
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:898
+#: apt.conf.5.xml:926
msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>"
msgstr "<literal>Debug::pkgProblemResolver::ShowScores</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:901
+#: apt.conf.5.xml:929
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 "
@@ -7415,12 +7486,12 @@ msgid ""
msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
-#: apt.conf.5.xml:909
+#: apt.conf.5.xml:937
msgid "<literal>Debug::sourceList</literal>"
msgstr "<literal>Debug::sourceList</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml:913
+#: apt.conf.5.xml:941
msgid ""
"Print information about the vendors read from <filename>/etc/apt/vendors."
"list</filename>."
@@ -7428,7 +7499,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:935
+#: apt.conf.5.xml:963
msgid ""
"&configureindex; is a configuration file showing example values for all "
"possible options."
@@ -7438,7 +7509,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><variablelist>
-#: apt.conf.5.xml:942
+#: apt.conf.5.xml:970
#, fuzzy
#| msgid "&apt-conf;"
msgid "&file-aptconf;"
@@ -7447,7 +7518,7 @@ msgstr "&apt-conf;"
# type: Content of: <refentry><refsect1><para>
#. ? reading apt.conf
#. type: Content of: <refentry><refsect1><para>
-#: apt.conf.5.xml:947
+#: apt.conf.5.xml:975
msgid "&apt-cache;, &apt-config;, &apt-preferences;."
msgstr "&apt-cache;, &apt-config;, &apt-preferences;."
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-21 18:04:29 +0000