merged from the debian-sid branch

13 files changed, 559 insertions, 66 deletions

diff --git a/doc/apt-cache.8.xml b/doc/apt-cache.8.xml
index c375f3893..6c8938d8c 100644
--- a/doc/apt-cache.8.xml
+++ b/doc/apt-cache.8.xml
@@ -51,6 +51,7 @@
          <arg>rdepends <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg>
          <arg>pkgnames <arg choice="plain"><replaceable>prefix</replaceable></arg></arg>
          <arg>dotty <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg>
+         <arg>xvcg <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg>
          <arg>policy <arg choice="plain" rep="repeat"><replaceable>pkgs</replaceable></arg></arg>
          <arg>madison <arg choice="plain" rep="repeat"><replaceable>pkgs</replaceable></arg></arg>
       </group>   
@@ -249,6 +250,11 @@ Reverse Provides:
      <para>Caution, dotty cannot graph larger sets of packages.</para></listitem>
      </varlistentry>
      
+     <varlistentry><term>xvcg <replaceable>pkg(s)</replaceable></term>
+	 <listitem><para>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>.
+	 </para></listitem></varlistentry>
+
      <varlistentry><term>policy <replaceable>[ pkg(s) ]</replaceable></term>
      <listitem><para><literal>policy</literal> is meant to help debug issues relating to the 
      preferences file. With no arguments it will print out the 
diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml
index b164022bd..64c3a35e4 100644
--- a/doc/apt-get.8.xml
+++ b/doc/apt-get.8.xml
@@ -15,7 +15,7 @@
    &apt-email;
    &apt-product;
    <!-- The last update date -->
-   <date>29 February 2004</date>
+   <date>08 November 2008</date>
  </refentryinfo>
  
  <refmeta>
@@ -33,22 +33,74 @@
  <refsynopsisdiv>
    <cmdsynopsis>
       <command>apt-get</command>
-      <arg><option>-hvs</option></arg>
-      <arg><option>-o=<replaceable>config string</replaceable></option></arg>
-      <arg><option>-c=<replaceable>file</replaceable></option></arg>
+      <arg><option>-sqdyfmubV</option></arg>
+      <arg>
+	      <option>-o=
+			  <replaceable>config_string</replaceable>
+	      </option>
+      </arg>
+      <arg>
+	      <option>-c=
+		      <replaceable>config_file</replaceable>
+	      </option>
+      </arg>
+      <arg>
+		  <option>-t=</option>
+		  <group choice='req'>
+			  <arg choice='plain'>
+				  <replaceable>target_release_name</replaceable>
+			  </arg>
+			  <arg choice='plain'>
+				  <replaceable>target_release_number_expression</replaceable>
+			  </arg>
+		  </group>
+      </arg>
+
       <group choice="req">
-         <arg>update</arg>
-         <arg>upgrade</arg>
-         <arg>dselect-upgrade</arg>
-         <arg>install <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg>
-         <arg>remove <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg>
-         <arg>purge <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg>
-         <arg>source <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg>
-         <arg>build-dep <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg>
-         <arg>check</arg>
-         <arg>clean</arg>
-         <arg>autoclean</arg>
-         <arg>autoremove</arg>
+         <arg choice='plain'>update</arg>
+         <arg choice='plain'>upgrade</arg>
+         <arg choice='plain'>dselect-upgrade</arg>
+         <arg choice='plain'>dist-upgrade</arg>
+         <arg choice='plain'>install 
+			 <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable>
+				<arg>
+					<group choice='req'>
+						<arg choice='plain'>
+							=<replaceable>pkg_version_number</replaceable>
+						</arg>
+						<arg choice='plain'>
+							/<replaceable>target_release_name</replaceable>
+						</arg>
+					</group>
+				</arg>
+			 </arg>
+	     </arg>
+         <arg choice='plain'>remove <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg>
+         <arg choice='plain'>purge <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg>
+         <arg choice='plain'>source 
+			 <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable>
+				 <arg>
+					 =<replaceable>pkg_version_number</replaceable>
+				 </arg>
+			 </arg>
+	     </arg>
+         <arg choice='plain'>build-dep <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg>
+         <arg choice='plain'>check</arg>
+         <arg choice='plain'>clean</arg>
+         <arg choice='plain'>autoclean</arg>
+         <arg choice='plain'>autoremove</arg>
+		 <arg choice='plain'>
+			 <group choice='req'>
+				<arg choice='plain'>-v</arg>
+				<arg choice='plain'>--version</arg>
+			 </group>
+		 </arg>
+		 <arg choice='plain'>
+			 <group choice='req'>
+				<arg choice='plain'>-h</arg>
+				<arg choice='plain'>--help</arg>
+			 </group>
+		 </arg>
       </group>   
    </cmdsynopsis>
  </refsynopsisdiv>
@@ -56,8 +108,8 @@
  <refsect1><title>Description</title>
    <para><command>apt-get</command> is the command-line tool for handling packages, and may be 
    considered the user's "back-end" to other tools using the APT
-   library.  Several "front-end" interfaces exist, such as dselect(8),
-   aptitude, synaptic, gnome-apt and wajig.</para>
+   library.  Several "front-end" interfaces exist, such as &dselect;,
+   &aptitude;, &synaptic;, &gnome-apt; and &wajig;.</para>
 
    <para>Unless the <option>-h</option>, or <option>--help</option> option is given, one of the
    commands below must be present.</para>
@@ -104,6 +156,7 @@
      with new versions of packages; <command>apt-get</command> has a "smart" conflict 
      resolution system, and it will attempt to upgrade the most important 
      packages at the expense of less important ones if necessary. 
+	 So, <literal>dist-upgrade</literal> command may remove some packages.
      The <filename>/etc/apt/sources.list</filename> file contains a list of locations 
      from which to retrieve desired package files.
      See also &apt-preferences; for a mechanism for
@@ -111,17 +164,24 @@
      </varlistentry>
 
      <varlistentry><term>install</term>
-     <listitem><para><literal>install</literal> is followed by one or more packages desired for 
-     installation. Each package is a package name, not a fully qualified 
-     filename (for instance, in a Debian GNU/Linux system, libc6 would be the 
-     argument provided, not <literal>libc6_1.9.6-2.deb</literal>) All packages required 
-     by the package(s) specified for installation will also be retrieved and 
-     installed. The <filename>/etc/apt/sources.list</filename> file is used to locate 
-     the desired packages. If a hyphen is appended to the package name (with 
-     no intervening space), the identified package will be removed if it is 
-     installed. Similarly a plus sign can be used to designate a package to 
-     install. These latter features may be used to override decisions made by 
-     apt-get's conflict resolution system.</para>
+     <listitem>
+	 <para><literal>install</literal> is followed by one or more 
+	 packages desired for installation or upgrading. 
+	 Each package is a package name, not a fully qualified 
+	 filename (for instance, in a Debian GNU/Linux system, 
+	 libc6 would be the argument provided, not 
+	 <literal>libc6_1.9.6-2.deb</literal>). All packages required 
+	 by the package(s) specified for installation will also 
+	 be retrieved and installed. 
+	 The <filename>/etc/apt/sources.list</filename> file is 
+	 used to locate the desired packages. If a hyphen is 
+	 appended to the package name (with no intervening space), 
+	 the identified package will be removed if it is installed. 
+	 Similarly a plus sign can be used to designate a 
+	 package to install. These latter features may be used 
+	 to override decisions made by apt-get's conflict 
+	 resolution system.
+	 </para>
 
      <para>A specific version of a package can be selected for installation by 
      following the package name with an equals and the version of the package 
@@ -133,6 +193,17 @@
      <para>Both of the version selection mechanisms can downgrade packages and must
      be used with care.</para>
 
+	<para>This is also the target to use if you want to upgrade one or 
+		more already-installed packages without upgrading every package 
+		you have on your system. Unlike the "upgrade" target, which 
+		installs the newest version of all currently installed packages, 
+		"install" will install the newest version of only the package(s) 
+		specified. Simply provide the name of the package(s) you wish 
+		to upgrade, and if a newer version is available, it (and its 
+		dependencies, as described above) will be downloaded and 
+		installed.
+	</para>
+
      <para>Finally, the &apt-preferences; mechanism allows you to
      create an alternative installation policy for
      individual packages.</para>
@@ -148,14 +219,15 @@
 
      <varlistentry><term>remove</term>
      <listitem><para><literal>remove</literal> is identical to <literal>install</literal> except that packages are 
-     removed instead of installed. If a plus sign is appended to the package 
+	 removed instead of installed. Note the removing a package leaves its
+	 configuration files in system. If a plus sign is appended to the package 
      name (with no intervening space), the identified package will be 
      installed instead of removed.</para></listitem>
      </varlistentry>
 
      <varlistentry><term>purge</term>
      <listitem><para><literal>purge</literal> is identical to <literal>remove</literal> except that packages are 
-     removed and purged.</para></listitem>
+     removed and purged (any configuration files are deleted too).</para></listitem>
      </varlistentry>
 
      <varlistentry><term>source</term>
@@ -222,6 +294,11 @@
    &apt-cmdblurb;
 
    <variablelist>
+     <varlistentry><term><option>--no-install-recommends</option></term>
+     <listitem><para>Do not consider recommended packages as a dependency for installing.
+     Configuration Item: <literal>APT::Install-Recommends</literal>.</para></listitem>
+     </varlistentry>
+
      <varlistentry><term><option>-d</option></term><term><option>--download-only</option></term>
      <listitem><para>Download only; package files are only retrieved, not unpacked or installed.
      Configuration Item: <literal>APT::Get::Download-Only</literal>.</para></listitem>
@@ -357,7 +434,8 @@
      <varlistentry><term><option>--purge</option></term>
      <listitem><para>Use purge instead of remove for anything that would be removed.
      An asterisk ("*") will be displayed next to packages which are
-     scheduled to be purged.
+	 scheduled to be purged. <option>remove --purge</option> is equivalent for
+	 <option>purge</option> command.
      Configuration Item: <literal>APT::Get::Purge</literal>.</para></listitem>
      </varlistentry>
 
@@ -458,7 +536,7 @@
      </varlistentry>
      
      <varlistentry><term><filename>/etc/apt/apt.conf.d/</filename></term>
-     <listitem><para>APT configuration file fragments
+     <listitem><para>APT configuration file fragments.
      Configuration Item: <literal>Dir::Etc::Parts</literal>.</para></listitem>
      </varlistentry>
      
@@ -503,7 +581,16 @@
  <refsect1><title>Diagnostics</title>
    <para><command>apt-get</command> returns zero on normal operation, decimal 100 on error.</para>
  </refsect1>
-
+ <refsect1>
+	 <title>ORIGINAL AUTHORS</title>
+	 <para>&apt-author.jgunthorpe;</para>
+ </refsect1>
+ <refsect1>
+	 <title>CURRENT AUTHORS</title>
+	 <para>
+		 &apt-author.team;
+		 &apt-qapage;
+	 </para>
+ </refsect1>
  &manbugs;
- 
 </refentry>
diff --git a/doc/apt-secure.8.xml b/doc/apt-secure.8.xml
index 01b157789..9696e018d 100644
--- a/doc/apt-secure.8.xml
+++ b/doc/apt-secure.8.xml
@@ -179,7 +179,7 @@
 
 <refsect1><title>See Also</title> 
 <para> 
-&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-archive;,
+&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;,
 &debsign; &debsig-verify;, &gpg;
 </para>
 
diff --git a/doc/apt.8 b/doc/apt.8
index 6c14559e3..78e4f0a70 100644
--- a/doc/apt.8
+++ b/doc/apt.8
@@ -37,6 +37,7 @@ None.
 .BR apt-get (8),
 .BR apt.conf (5),
 .BR sources.list (5),
+.BR apt_preferences (5),
 .BR apt-secure (8)
 .SH DIAGNOSTICS
 apt returns zero on normal operation, decimal 100 on error.
diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml
index db8dfa7ce..1835f2282 100644
--- a/doc/apt.conf.5.xml
+++ b/doc/apt.conf.5.xml
@@ -12,10 +12,16 @@
  <refentryinfo>
    &apt-author.jgunthorpe;
    &apt-author.team;
+   <author>
+     <firstname>Daniel</firstname>
+     <surname>Burrows</surname>
+     <contrib>Initial documentation of Debug::*.</contrib>
+     <email>dburrows@debian.org</email>
+   </author>
    &apt-email;
    &apt-product;
    <!-- The last update date -->
-   <date>29 February 2004</date>
+   <date>06 December 2008</date>
  </refentryinfo>
  
  <refmeta>
@@ -101,6 +107,11 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
      compiled for.</para></listitem>
      </varlistentry>
      
+     <varlistentry><term>Default-Release</term>
+	 <listitem><para>Default release to install packages from if more than one
+	 version available. Contains release name or release version. Examples: 'stable', 'testing', 'unstable', '4.0', '5.0*'. Release codenames ('etch', 'lenny' etc.) are not allowed now. See also &apt-preferences;.</para></listitem>
+     </varlistentry>
+     
      <varlistentry><term>Ignore-Hold</term>
      <listitem><para>Ignore Held packages; This global option causes the problem resolver to
      ignore held packages in its decision making.</para></listitem>
@@ -161,6 +172,12 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
    and the URI handlers. 
 
    <variablelist>
+     <varlistentry><term>PDiffs</term>
+	 <listitem><para>Try do download deltas called <literal>PDiffs</literal> for
+	 Packages or Sources files instead of downloading whole ones. True
+	 by default.</para></listitem>
+     </varlistentry>
+
      <varlistentry><term>Queue-Mode</term>
      <listitem><para>Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</literal> or 
      <literal>access</literal> which determines how  APT parallelizes outgoing 
@@ -209,6 +226,29 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
      require this are in violation of RFC 2068.</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>
+
+	 <para><literal>CaInfo</literal> suboption specifies place of file that
+	 holds info about trusted certificates.
+	 <literal>&lt;host&gt;::CaInfo</literal> is corresponding per-host option.
+	 <literal>Verify-Peer</literal> boolean suboption determines whether verify
+	 server's host certificate against trusted certificates or not.
+	 <literal>&lt;host&gt;::Verify-Peer</literal> is corresponding per-host option.
+	 <literal>Verify-Host</literal> boolean suboption determines whether verify
+	 server's hostname or not.
+	 <literal>&lt;host&gt;::Verify-Host</literal> is corresponding per-host option.
+	 <literal>SslCert</literal> determines what certificate to use for client
+	 authentication. <literal>&lt;host&gt;::SslCert</literal> is corresponding per-host option.
+	 <literal>SslKey</literal> determines what private key to use for client
+	 authentication. <literal>&lt;host&gt;::SslKey</literal> is corresponding per-host option.
+	 <literal>SslForceVersion</literal> overrides default SSL version to use.
+	 Can contain 'TLSv1' or 'SSLv3' string.
+	 <literal>&lt;host&gt;::SslForceVersion</literal> is corresponding per-host option.
+	 </para></listitem></varlistentry>
+
      <varlistentry><term>ftp</term>
      <listitem><para>FTP URIs; ftp::Proxy is the default proxy server to use. It is in the 
      standard form of <literal>ftp://[[user][:pass]@]host[:port]/</literal> and is 
@@ -389,17 +429,354 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
    </variablelist>
  </refsect1>
 
- <refsect1><title>Debug options</title>
-   <para>Most of the options in the <literal>debug</literal> section are not interesting to 
-   the normal user, however <literal>Debug::pkgProblemResolver</literal> shows 
-   interesting output about the decisions dist-upgrade makes. 
-   <literal>Debug::NoLocking</literal> disables file locking so APT can do some 
-   operations as non-root and <literal>Debug::pkgDPkgPM</literal> will print out the 
-   command line for each dpkg invokation. <literal>Debug::IdentCdrom</literal> will 
-   disable the inclusion of statfs data in CDROM IDs.
-   <literal>Debug::Acquire::gpgv</literal> Debugging of the gpgv method.
+ <refsect1>
+   <title>Periodic and Archives options</title>
+   <para><literal>APT::Periodic</literal> and <literal>APT::Archives</literal>
+   groups of options configure behavior of apt periodic updates, which is
+   done by <literal>/etc/cron.daily/apt</literal> script. See header of
+   this script for the brief documentation of these options.
    </para>
  </refsect1>
+
+ <refsect1>
+   <title>Debug options</title>
+   <para>
+     Enabling options in the <literal>Debug::</literal> section will
+     cause debugging information to be sent to the standard error
+     stream of the program utilizing the <literal>apt</literal>
+     libraries, or enable special program modes that are primarily
+     useful for debugging the behavior of <literal>apt</literal>.
+     Most of these options are not interesting to a normal user, but a
+     few may be:
+
+     <itemizedlist>
+       <listitem>
+	 <para>
+	   <literal>Debug::pkgProblemResolver</literal> enables output
+	   about the decisions made by
+	   <literal>dist-upgrade, upgrade, install, remove, purge</literal>.
+	 </para>
+       </listitem>
+
+       <listitem>
+	 <para>
+	   <literal>Debug::NoLocking</literal> disables all file
+	   locking.  This can be used to run some operations (for
+	   instance, <literal>apt-get -s install</literal>) as a
+	   non-root user.
+	 </para>
+       </listitem>
+
+       <listitem>
+	 <para>
+	   <literal>Debug::pkgDPkgPM</literal> prints out the actual
+	   command line each time that <literal>apt</literal> invokes
+	   &dpkg;.
+	 </para>
+       </listitem>
+
+       <listitem>
+	 <para>
+	   <literal>Debug::IdentCdrom</literal> disables the inclusion
+	   of statfs data in CDROM IDs.  <!-- TODO: provide a
+	   motivating example, except I haven't a clue why you'd want
+	   to do this. -->
+	 </para>
+       </listitem>
+     </itemizedlist>
+   </para>
+
+   <para>
+     A full list of debugging options to apt follows.
+   </para>
+
+   <variablelist>
+     <varlistentry>
+       <term><literal>Debug::Acquire::cdrom</literal></term>
+
+       <listitem>
+	 <para>
+	   Print information related to accessing
+	   <literal>cdrom://</literal> sources.
+	 </para>
+       </listitem>
+     </varlistentry>
+
+     <varlistentry>
+       <term><literal>Debug::Acquire::ftp</literal></term>
+
+       <listitem>
+	 <para>
+	   Print information related to downloading packages using
+	   FTP.
+	 </para>
+       </listitem>
+     </varlistentry>
+
+     <varlistentry>
+       <term><literal>Debug::Acquire::http</literal></term>
+
+       <listitem>
+	 <para>
+	   Print information related to downloading packages using
+	   HTTP.
+	 </para>
+       </listitem>
+     </varlistentry>
+
+     <varlistentry>
+       <term><literal>Debug::Acquire::https</literal></term>
+
+       <listitem>
+	 <para>
+	   Print information related to downloading packages using
+	   HTTPS.
+	 </para>
+       </listitem>
+     </varlistentry>
+
+     <varlistentry>
+       <term><literal>Debug::Acquire::gpgv</literal></term>
+
+       <listitem>
+	 <para>
+	   Print information related to verifying cryptographic
+	   signatures using <literal>gpg</literal>.
+	 </para>
+       </listitem>
+     </varlistentry>
+
+     <varlistentry>
+       <term><literal>Debug::aptcdrom</literal></term>
+
+       <listitem>
+	 <para>
+	   Output information about the process of accessing
+	   collections of packages stored on CD-ROMs.
+	 </para>
+       </listitem>
+     </varlistentry>
+
+     <varlistentry>
+       <term><literal>Debug::BuildDeps</literal></term>
+       <listitem>
+	 <para>
+	   Describes the process of resolving build-dependencies in
+	   &apt-get;.
+	 </para>
+       </listitem>
+     </varlistentry>
+
+     <varlistentry>
+       <term><literal>Debug::Hashes</literal></term>
+       <listitem>
+	 <para>
+	   Output each cryptographic hash that is generated by the
+	   <literal>apt</literal> libraries.
+	 </para>
+       </listitem>
+     </varlistentry>
+
+     <varlistentry>
+       <term><literal>Debug::IdentCDROM</literal></term>
+       <listitem>
+	 <para>
+	   Do not include information from <literal>statfs</literal>,
+	   namely the number of used and free blocks on the CD-ROM
+	   filesystem, when generating an ID for a CD-ROM.
+	 </para>
+       </listitem>
+     </varlistentry>
+
+     <varlistentry>
+       <term><literal>Debug::NoLocking</literal></term>
+       <listitem>
+	 <para>
+	   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.
+	 </para>
+       </listitem>
+     </varlistentry>
+
+     <varlistentry>
+       <term><literal>Debug::pkgAcquire</literal></term>
+
+       <listitem>
+	 <para>
+	   Log when items are added to or removed from the global
+	   download queue.
+	 </para>
+       </listitem>
+     </varlistentry>
+
+     <varlistentry>
+       <term><literal>Debug::pkgAcquire::Auth</literal></term>
+       <listitem>
+	 <para>
+	   Output status messages and errors related to verifying
+	   checksums and cryptographic signatures of downloaded files.
+	 </para>
+       </listitem>
+     </varlistentry>
+
+     <varlistentry>
+       <term><literal>Debug::pkgAcquire::Diffs</literal></term>
+       <listitem>
+	 <para>
+	   Output information about downloading and applying package
+	   index list diffs, and errors relating to package index list
+	   diffs.
+	 </para>
+       </listitem>
+     </varlistentry>
+
+     <varlistentry>
+       <term><literal>Debug::pkgAcquire::RRed</literal></term>
+
+       <listitem>
+	 <para>
+	   Output information related to patching apt package lists
+	   when downloading index diffs instead of full indices.
+	 </para>
+       </listitem>
+     </varlistentry>
+
+     <varlistentry>
+       <term><literal>Debug::pkgAcquire::Worker</literal></term>
+
+       <listitem>
+	 <para>
+	   Log all interactions with the sub-processes that actually
+	   perform downloads.
+	 </para>
+       </listitem>
+     </varlistentry>
+
+     <varlistentry>
+       <term><literal>Debug::pkgAutoRemove</literal></term>
+
+       <listitem>
+	 <para>
+	   Log events related to the automatically-installed status of
+	   packages and to the removal of unused packages.
+	 </para>
+       </listitem>
+     </varlistentry>
+
+     <varlistentry>
+       <term><literal>Debug::pkgDepCache::AutoInstall</literal></term>
+       <listitem>
+	 <para>
+	   Generate debug messages describing which packages are being
+	   automatically installed to resolve dependencies.  This
+	   corresponds to the initial auto-install pass performed in,
+	   e.g., <literal>apt-get install</literal>, and not to the
+	   full <literal>apt</literal> dependency resolver; see
+	   <literal>Debug::pkgProblemResolver</literal> for that.
+	 </para>
+       </listitem>
+     </varlistentry>
+
+     <!-- Question: why doesn't this do anything?  The code says it should. -->
+     <varlistentry>
+       <term><literal>Debug::pkgInitConfig</literal></term>
+       <listitem>
+	 <para>
+	   Dump the default configuration to standard output on
+	   startup.
+	 </para>
+       </listitem>
+     </varlistentry>
+
+     <varlistentry>
+       <term><literal>Debug::pkgDPkgPM</literal></term>
+       <listitem>
+	 <para>
+	   When invoking &dpkg;, output the precise command line with
+	   which it is being invoked, with arguments separated by a
+	   single space character.
+	 </para>
+       </listitem>
+     </varlistentry>
+
+     <varlistentry>
+       <term><literal>Debug::pkgDPkgProgressReporting</literal></term>
+       <listitem>
+	 <para>
+	   Output all the data received from &dpkg; on the status file
+	   descriptor and any errors encountered while parsing it.
+	 </para>
+       </listitem>
+     </varlistentry>
+
+     <varlistentry>
+       <term><literal>Debug::pkgOrderList</literal></term>
+
+       <listitem>
+	 <para>
+	   Generate a trace of the algorithm that decides the order in
+	   which <literal>apt</literal> should pass packages to
+	   &dpkg;.
+	 </para>
+       </listitem>
+     </varlistentry>
+
+     <varlistentry>
+       <term><literal>Debug::pkgPackageManager</literal></term>
+
+       <listitem>
+	 <para>
+	   Output status messages tracing the steps performed when
+	   invoking &dpkg;.
+	 </para>
+       </listitem>
+     </varlistentry>
+
+     <varlistentry>
+       <term><literal>Debug::pkgPolicy</literal></term>
+
+       <listitem>
+	 <para>
+	   Output the priority of each package list on startup.
+	 </para>
+       </listitem>
+     </varlistentry>
+
+     <varlistentry>
+       <term><literal>Debug::pkgProblemResolver</literal></term>
+
+       <listitem>
+	 <para>
+	   Trace the execution of the dependency resolver (this
+	   applies only to what happens when a complex dependency
+	   problem is encountered).
+	 </para>
+       </listitem>
+     </varlistentry>
+
+     <varlistentry>
+       <term><literal>Debug::sourceList</literal></term>
+
+       <listitem>
+	 <para>
+	   Print information about the vendors read from
+	   <filename>/etc/apt/vendors.list</filename>.
+	 </para>
+       </listitem>
+     </varlistentry>
+
+     <varlistentry>
+       <term><literal>Debug::Vendor</literal></term>
+
+       <listitem>
+	 <para>
+	   Print information about each vendor.
+	 </para>
+       </listitem>
+     </varlistentry>
+   </variablelist>
+ </refsect1>
  
  <refsect1><title>Examples</title>
    <para>&configureindex; is a 
diff --git a/doc/apt.ent b/doc/apt.ent
index b7d03b585..6594ba1b3 100644
--- a/doc/apt.ent
+++ b/doc/apt.ent
@@ -57,8 +57,8 @@
   </citerefentry>"
 >
 
-<!ENTITY apt-archive "<citerefentry>
-    <refentrytitle><filename>apt-archive</filename></refentrytitle>
+<!ENTITY apt-ftparchive "<citerefentry>
+    <refentrytitle><filename>apt-ftparchive</filename></refentrytitle>
     <manvolnum>1</manvolnum>
   </citerefentry>"
 >
@@ -141,14 +141,26 @@
     <manvolnum>1</manvolnum>
   </citerefentry>"
 >
-    
+
+<!ENTITY gnome-apt "<citerefentry>
+    <refentrytitle><command>gnome-apt</command></refentrytitle>
+    <manvolnum>1</manvolnum>
+  </citerefentry>"
+>
+
+<!ENTITY wajig "<citerefentry>
+    <refentrytitle><command>wajig</command></refentrytitle>
+    <manvolnum>1</manvolnum>
+  </citerefentry>"
+>
+ 
 <!-- Boiler plate docinfo section -->
 <!ENTITY apt-docinfo "
  <refentryinfo>
    <address><email>apt@packages.debian.org</email></address>
    <author><firstname>Jason</firstname> <surname>Gunthorpe</surname></author>
    <copyright><year>1998-2001</year> <holder>Jason Gunthorpe</holder></copyright>
-   <date>14 December 2003</date>
+   <date>28 October 2008</date>
    <productname>Linux</productname>
 
  </refentryinfo>
@@ -207,6 +219,12 @@
    <productname>Linux</productname>
 ">
 
+<!ENTITY apt-qapage "
+	<para>
+		<ulink url='http://packages.qa.debian.org/a/apt.html'>QA Page</ulink>
+	</para>
+">
+
 <!-- Boiler plate Bug reporting section -->
 <!ENTITY manbugs "
  <refsect1><title>Bugs</title>
diff --git a/doc/examples/configure-index b/doc/examples/configure-index
index 0bab8e0f8..84b1d8829 100644
--- a/doc/examples/configure-index
+++ b/doc/examples/configure-index
@@ -1,4 +1,3 @@
-// $Id: configure-index,v 1.10 2004/07/17 19:37:16 mdz Exp $
 /* This file is an index of all APT configuration directives. It should
    NOT actually be used as a real config file, though it is (except for the
    last line) a completely valid file. Most of the options have sane default
@@ -25,13 +24,14 @@ APT
   Architecture "i386";
   Build-Essential "build-essential";
 
-  NeverAutoRemove  { "linux-kernel.*";  };  // packages that should never
+  NeverAutoRemove  { "linux-image.*";  };  // packages that should never
                                             // considered for autoRemove
 
   // Options for apt-get
   Get 
   {
      Arch-Only "false";
+     AllowUnauthenticated "false";
      AutomaticRemove "false";       
      HideAutoRemove "false";
      Download-Only "false";
@@ -104,7 +104,7 @@ APT
 
   // consider Recommends, Suggests as important dependencies that should
   // be installed by default
-  Install-Recommends "false";
+  Install-Recommends "true";
   Install-Suggests "false";
 
   // consider dependencies of packages in this section manual
diff --git a/doc/examples/sources.list b/doc/examples/sources.list
index 9af1c3c4c..ef729e203 100644
--- a/doc/examples/sources.list
+++ b/doc/examples/sources.list
@@ -6,4 +6,4 @@ deb http://security.debian.org stable/updates main contrib non-free
 
 # Uncomment if you want the apt-get source function to work
 #deb-src http://http.us.debian.org/debian stable main contrib non-free
-#deb-src http://non-us.debian.org/debian-non-US stable/non-US main contrib non-free
+#deb-src http://security.debian.org stable/updates main contrib non-free
diff --git a/doc/fr/apt-secure.fr.8.xml b/doc/fr/apt-secure.fr.8.xml
index 5cec9a49d..25b5ffd09 100644
--- a/doc/fr/apt-secure.fr.8.xml
+++ b/doc/fr/apt-secure.fr.8.xml
@@ -188,7 +188,7 @@ les deux premières étapes.
 
 <refsect1><title>Voir aussi</title> 
 <para> 
-&apt-conf;, &apt-get;,&sources-list;, &apt-key;, &apt-archive;, &debsign;, 
+&apt-conf;, &apt-get;,&sources-list;, &apt-key;, &apt-ftparchive;, &debsign;, 
 &debsig-verify;, &gpg;
 
 </para>
diff --git a/doc/fr/apt.ent.fr b/doc/fr/apt.ent.fr
index d705b9e3e..651100497 100644
--- a/doc/fr/apt.ent.fr
+++ b/doc/fr/apt.ent.fr
@@ -56,8 +56,8 @@
   </citerefentry>"
 >
 
-<!ENTITY apt-archive "<citerefentry>
-    <refentrytitle><filename>apt-archive</filename></refentrytitle>
+<!ENTITY apt-ftparchive "<citerefentry>
+    <refentrytitle><filename>apt-ftparchive</filename></refentrytitle>
     <manvolnum>1</manvolnum>
   </citerefentry>"
 >
diff --git a/doc/ja/apt-secure.ja.8.xml b/doc/ja/apt-secure.ja.8.xml
index e20b86561..20c57fb16 100644
--- a/doc/ja/apt-secure.ja.8.xml
+++ b/doc/ja/apt-secure.ja.8.xml
@@ -325,7 +325,7 @@
 -->
 <refsect1><title>関連項目</title> 
 <para> 
-&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-archive;,
+&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;,
 &debsign; &debsig-verify;, &gpg;
 </para>
 
diff --git a/doc/ja/apt.ent.ja b/doc/ja/apt.ent.ja
index d63342461..1d1c36b1e 100644
--- a/doc/ja/apt.ent.ja
+++ b/doc/ja/apt.ent.ja
@@ -56,8 +56,8 @@
   </citerefentry>"
 >
 
-<!ENTITY apt-archive "<citerefentry>
-    <refentrytitle><filename>apt-archive</filename></refentrytitle>
+<!ENTITY apt-ftparchive "<citerefentry>
+    <refentrytitle><filename>apt-ftparchive</filename></refentrytitle>
     <manvolnum>1</manvolnum>
   </citerefentry>"
 >
diff --git a/doc/sources.list.5.xml b/doc/sources.list.5.xml
index e47418b27..b875086ef 100644
--- a/doc/sources.list.5.xml
+++ b/doc/sources.list.5.xml
@@ -48,9 +48,12 @@
  
  <refsect1><title>sources.list.d</title>
    <para>The <filename>/etc/apt/sources.list.d</filename> directory provides
-   a way to add sources.list entries in seperate files that end with 
-   <literal>.list</literal>. The format is the same as for the regular
-   <filename>sources.list</filename> file. </para>
+   a way to add sources.list entries in separate files.
+   The format is the same as for the regular <filename>sources.list</filename> file.
+   File names need to end with
+   <filename>.list</filename> and may only contain letters (a-z and A-Z),
+   digits (0-9), underscore (_), hyphen (-) and period (.) characters.
+   Otherwise they will be silently ignored.</para>
  </refsect1>
 
  <refsect1><title>The deb and deb-src types</title>
@@ -115,7 +118,8 @@ deb http://http.us.debian.org/debian dists/stable-updates/
 
  <refsect1><title>URI specification</title>
 
-   <para>The currently recognized URI types are cdrom, file, http, and ftp.
+   <para>The currently recognized URI types are cdrom, file, http, ftp, copy,
+   ssh, rsh.
    <variablelist>
     <varlistentry><term>file</term>
     <listitem><para>
@@ -163,8 +167,8 @@ deb http://http.us.debian.org/debian dists/stable-updates/
     <varlistentry><term>rsh</term><term>ssh</term>
     <listitem><para>
     The rsh/ssh method invokes rsh/ssh to connect to a remote host
-    as a given user and access the files. No password authentication is 
-    possible, prior arrangements with RSA keys or rhosts must have been made.
+	as a given user and access the files. It is a good idea to do prior
+	arrangements with RSA keys or rhosts.
     Access to files on the remote uses standard <command>find</command> and
     <command>dd</command> 
     commands to perform the file transfers from the remote.</para></listitem>