* Merged from the mvo branch

* merged from the lp:~mvo/apt/history branch
* Fix apt-ftparchive(1) wrt description of the "-o" option.
  Thanks to Dann Frazier for the patch. Closes: #273100
* po/LINGUAS. Re-disable Hebrew. Closes: #534992
* po/LINGUAS. Enable Asturian and Lithuanian
* Fix typo in apt-cache.8.xml: nessasarily
* Fix "with with" in apt-get.8.xml
* Fix some of the typos mentioned by the german team
  Closes: #479997
* Polish translation update by Wiktor Wandachowicz
  Closes: #548571
* German translation update by Holger Wansing
  Closes: #551534
* Italian translation update by Milo Casagrande
  Closes: #555797
* Simplified Chinese translation update by Aron Xu 
  Closes: #558737
* Slovak translation update by Ivan Masár
  Closes: #559277

* apt-pkg/packagemanager.cc:
  - add output about pre-depends configuring when debug::pkgPackageManager
    is used
* methods/https.cc:
  - fix incorrect use of CURLOPT_TIMEOUT, closes: #497983, LP: #354972
    thanks to Brian Thomason for the patch
* merge lp:~mvo/apt/netrc branch, this adds support for a
  /etc/apt/auth.conf that can be used to store username/passwords
  in a "netrc" style file (with the extension that it supports "/"
  in a machine definition). Based on the maemo git branch (Closes: #518473)
  (thanks also to Jussi Hakala and Julian Andres Klode)
* apt-pkg/deb/dpkgpm.cc:
  - add "purge" to list of known actions
* apt-pkg/init.h:
  - add compatibility with old ABI name until the next ABI break
* merge segfault fix from Mario Sanchez Prada, many thanks
  (closes: #561109)
* apt-pkg/depcache.cc, apt-pkg/indexcopy.cc:
  - typo fix (LP: #462328)

* cmdline/apt-key:
  - Emit a warning if removed keys keyring is missing and skip associated
    checks (LP: #218971)
* apt-pkg/packagemanager.cc:
  - better debug output for ImmediateAdd with depth and why
  - improve the message shown for failing immediate configuration
* doc/guide.it.sgml: moved to doc/it/guide.it.sgml
* doc/po4a.conf: activate translation of guide.sgml and offline.sgml
* doc/apt.conf.5.xml:
  - provide a few more details about APT::Immediate-Configure
  - briefly document the behaviour of the new https options
* doc/sources.list.5.xml:
  - add note about additional apt-transport-methods
* doc/apt-mark.8.xml:
  - correct showauto synopsis, thanks Andrew Schulman (Closes: #551440)
* cmdline/apt-get.cc:
  - source should display his final pkg pick (Closes: #249383, #550952)
  - source doesn't need the complete version for match (Closes: #245250)
  - source ignores versions/releases if not available (Closes: #377424)
  - only warn if (free) space overflows (Closes: #522238)
  - add --debian-only as alias for --diff-only
* methods/connect.cc:
  - display also strerror of "wicked" getaddrinfo errors
  - add AI_ADDRCONFIG to ai_flags as suggested by Aurelien Jarno
    in response to Bernhard R. Link, thanks! (Closes: #505020)
* buildlib/configure.mak, buildlib/config.{sub,guess}:
  - remove (outdated) config.{sub,guess} and use the ones provided
    by the new added build-dependency autotools-dev instead
* configure.in, buildlib/{xml,yodl,sgml}_manpage.mak:
  - remove the now obsolete manpage buildsystems
* doc/{pl,pt_BR,es,it}/*.{sgml,xml}:
  - convert all remaining translation to the po4a system
* debian/control:
  - drop build-dependency on docbook-utils and xmlto
  - add build-dependency on autotools-dev
  - bump policy to 3.8.3 as we have no outdated manpages anymore
* debian/NEWS:
  - fix a typo in 0.7.24: Allready -> Already (Closes: #557674)
* ftparchive/writer.{cc,h}:
  - add APT::FTPArchive::LongDescription to be able to disable them
* apt-pkg/deb/debsrcrecords.cc:
  - use "diff" filetype for .debian.tar.* files (Closes: #554898)
* methods/rred.cc:
  - rewrite to be able to handle even big patch files
  - adopt optional mmap+iovec patch from Morten Hustveit
    (Closes: #463354) which should speed up a bit. Thanks!
* methods/http{,s}.cc
  - add config setting for User-Agent to the Acquire group,
    thanks Timothy J. Miller! (Closes: #355782)
  - add https options which default to http ones (Closes: #557085)
* debian/apt.cron.daily:
  - check cache size even if we do nothing else otherwise, thanks
    Francesco Poli for patch(s) and patience! (Closes: #459344)
* ftparchive/*:
  - fix a few typos in strings, comments and manpage,
    thanks Karl Goetz! (Closes: #558757)
* cmdline/apt-mark:
  - print an error if a new state file can't be created
    (Closes: #521289) and
  - exit nicely if python-apt is not installed (Closes: #521284)
* doc/de: German translation of manpages (Closes: #552606)
* doc/ various manpages:
  - correct various errors, typos and oddities (Closes: #552535)
* doc/apt-secure.8.xml:
  - replace literal with emphasis tags in Archive configuration
* doc/apt-ftparchive.1.xml:
  - remove informalexample tag which hides the programlisting
* doc/apt-get.8.xml:
  - change equivalent "for" to "to the" (purge command)
  - clarify --fix-broken sentence about specifying packages
* apt-pkg/contib/strutl.h
  - Avoid extra inner copy in APT_MKSTRCMP and APT_MKSTRCMP2.
* build infrastructure:
  - Bumped libapt version, excluded eglibc from SONAME. (Closes: #448249)
* doc/apt.conf.5.xml:
  - Deprecate unquoted values, string concatenation and explain what should
    not be written inside a value (quotes,backslash).
  - Restrict option names to alphanumerical characters and "/-:._+".
  - Deprecate #include, we have apt.conf.d nowadays which should be
    sufficient.
* ftparchive/apt-ftparchive.cc:
  - Call setlocale() so translations are actually used.
* debian/apt.conf.autoremove:
  - Add kfreebsd-image-* to the list (Closes: #558803)

1 files changed, 49 insertions, 22 deletions

diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml
index e752f9d27..d7ad51cfb 100644
--- a/doc/apt.conf.5.xml
+++ b/doc/apt.conf.5.xml
@@ -48,9 +48,9 @@
    loading even more config files.</para>
 
    <para>The configuration file is organized in a tree with options organized into
-   functional groups. option specification is given with a double colon
+   functional groups. Option specification is given with a double colon
    notation, for instance <literal>APT::Get::Assume-Yes</literal> is an option within 
-   the APT tool group, for the Get tool. options do not inherit from their 
+   the APT tool group, for the Get tool. Options do not inherit from their 
    parent groups.</para> 
 
    <para>Syntactically the configuration language is modeled after what the ISC tools
@@ -58,9 +58,13 @@
    <literal>//</literal> are treated as comments (ignored), as well as all text
    between <literal>/*</literal> and <literal>*/</literal>, just like C/C++ comments.
    Each line is of the form
-   <literal>APT::Get::Assume-Yes "true";</literal> The trailing 
-   semicolon is required and the quotes are optional. A new scope can be
-   opened with curly braces, like:</para>
+   <literal>APT::Get::Assume-Yes "true";</literal>. The trailing 
+   semicolon and the quotes are required. The value must be on one line, and
+   there is no kind of string concatenation. It must not include inside quotes.
+   The behavior of the backslash "\" and escaped characters inside a value is
+   undefined and it should not be used. An option name may include
+   alphanumerical characters and the "/-:._+" characters. A new scope can
+   be opened with curly braces, like:</para>
 
 <informalexample><programlisting>   
 APT {
@@ -91,7 +95,8 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
    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>:
+   <para>Two specials are allowed, <literal>#include</literal> (which is deprecated
+   and not supported by alternative implementations) 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
@@ -151,11 +156,26 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
      </varlistentry>
 
      <varlistentry><term>Immediate-Configure</term>
-     <listitem><para>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 necessary on some extremely slow single user systems but 
-     is very dangerous and may cause package install scripts to fail or worse.
-     Use at your own risk.</para></listitem>
+     <listitem><para>Defaults to on which will cause APT to install essential and important packages
+     as fast as possible in the install/upgrade operation. This is done to limit the effect of a failing
+     &dpkg; call: If this option is disabled APT does treat an important package in the same way as
+     an extra package: Between the unpacking of the important package A and his configuration can then
+     be many other unpack or configuration calls, e.g. for package B which has no relation to A, but
+     causes the dpkg call to fail (e.g. because maintainer script of package B generates an error) which results
+     in a system state in which package A is unpacked but unconfigured - each package depending on A is now no
+     longer guaranteed to work as their dependency on A is not longer satisfied. The immediate configuration marker
+     is also applied to all dependencies which can generate a problem if the dependencies e.g. form a circle
+     as a dependency with the immediate flag is comparable with a Pre-Dependency. So in theory it is possible
+     that APT encounters a situation in which it is unable to perform immediate configuration, error out and
+     refers to this option so the user can deactivate the immediate configuration temporary to be able to perform
+     an install/upgrade again. Note the use of the word "theory" here as this problem was only encountered by now
+     in real world a few times in non-stable distribution versions and caused by wrong dependencies of the package
+     in question or by a system in an already broken state, so you should not blindly disable this option as
+     the mentioned scenario above is not the only problem immediate configuration can help to prevent in the first place.
+     Before a big operation like <literal>dist-upgrade</literal> is run with this option disabled it should be tried to
+     explicitly <literal>install</literal> the package APT is unable to configure immediately, but please make sure to
+     report your problem also to your distribution and to the APT team with the buglink below so they can work on
+     improving or correcting the upgrade process.</para></listitem>
      </varlistentry>
 
      <varlistentry><term>Force-LoopBreak</term>
@@ -245,7 +265,7 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
      this applies to all things including connection timeout and data timeout.</para>
 
      <para>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)
+     remote server is not RFC conforming or buggy (such as Squid 2.0.2).
      <literal>Acquire::http::Pipeline-Depth</literal> can be a value from 0 to 5 
      indicating how many outstanding requests APT should send. A value of
      zero MUST be specified if the remote host does not properly linger
@@ -255,13 +275,20 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
      <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>
+     deactivates the download from multiple servers at the same time.)</para>
+
+     <para><literal>Acquire::http::User-Agent</literal> can be used to set a different
+     User-Agent for the http download method as some proxies allow access for clients
+     only if the client uses a known identifier.</para>
+     </listitem>
      </varlistentry>
 
      <varlistentry><term>https</term>
-	 <listitem><para>HTTPS URIs. Cache-control and proxy options are the same as for
-	 <literal>http</literal> method.
-	 <literal>Pipeline-Depth</literal> option is not supported yet.</para>
+	 <listitem><para>HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and
+	 proxy options are the same as for <literal>http</literal> method and will also
+	 default to the options from the <literal>http</literal> method if they are not
+	 explicitly set for https. <literal>Pipeline-Depth</literal> option is not
+	 supported yet.</para>
 
 	 <para><literal>CaInfo</literal> suboption specifies place of file that
 	 holds info about trusted certificates.
@@ -326,7 +353,7 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
      as specified in <filename>/etc/fstab</filename>. It is possible to provide 
      alternate mount and unmount commands if your mount point cannot be listed 
      in the fstab (such as an SMB mount and old mount packages). The syntax 
-     is to put <literallayout>"/cdrom/"::Mount "foo";</literallayout> within 
+     is to put <literallayout>/cdrom/::Mount "foo";</literallayout> within 
      the cdrom block. It is important to have the trailing slash. Unmount 
      commands can be specified using UMount.</para></listitem>
      </varlistentry>
@@ -516,9 +543,9 @@ DPkg::TriggersPending "true";</literallayout></para>
 
      <variablelist>
        <varlistentry><term>DPkg::NoTriggers</term>
-       <listitem><para>Add the no triggers flag to all dpkg calls (expect the ConfigurePending call).
+       <listitem><para>Add the no triggers flag to all dpkg calls (except the ConfigurePending call).
        See &dpkg; if you are interested in what this actually means. In short: dpkg will not run the
-       triggers then this flag is present unless it is explicit called to do so in an extra call.
+       triggers when this flag is present unless it is explicitly called to do so in an extra call.
        Note that this option exists (undocumented) also in older apt versions with a slightly different
        meaning: Previously these option only append --no-triggers to the configure calls to dpkg -
        now apt will add these flag also to the unpack and remove calls.</para></listitem>
@@ -529,8 +556,8 @@ DPkg::TriggersPending "true";</literallayout></para>
        The "<literal>smart</literal>" way is it to configure only packages which need to be configured before
        another package can be unpacked (Pre-Depends) and let the rest configure by dpkg with a call generated
        by the next option. "<literal>no</literal>" on the other hand will not configure anything and totally
-       relay on dpkg for configuration (which will at the moment fail if a Pre-Depends is encountered).
-       Setting this option to another than the all value will implicit activate also the next option per
+       rely on dpkg for configuration (which will at the moment fail if a Pre-Depends is encountered).
+       Setting this option to another than the all value will implicitly activate also the next option per
        default as otherwise the system could end in an unconfigured status which could be unbootable!
        </para></listitem>
        </varlistentry>
@@ -538,7 +565,7 @@ DPkg::TriggersPending "true";</literallayout></para>
        <listitem><para>If this option is set apt will call <command>dpkg --configure --pending</command>
        to let dpkg handle all required configurations and triggers. This option is activated automatic
        per default if the previous option is not set to <literal>all</literal>, but deactivating could be useful
-       if you want to run APT multiple times in a row - e.g. in an installer. In this sceneries you could
+       if you want to run APT multiple times in a row - e.g. in an installer. In these sceneries you could
        deactivate this option in all but the last run.</para></listitem>
        </varlistentry>
        <varlistentry><term>DPkg::TriggersPending</term>