Merge branch 'debian/sid' into ubuntu/master

Conflicts:
	debian/changelog

18 files changed, 40 insertions, 39 deletions

diff --git a/doc/Bugs b/doc/Bugs
index deb7334db..d584dce49 100644
--- a/doc/Bugs
+++ b/doc/Bugs
@@ -31,12 +31,12 @@
 #27601: srange errors from dselect
  Summary: Couldn't locate an archive source
  Status: Require status file
-         Believed to be fixed in 0.1.9, was not reproducable w/ given 
+         Believed to be fixed in 0.1.9, was not reproducible w/ given
 	 status file
 #27841: apt: apt depends on a missing library
  Status: New versions of APT in slink have been compiled with libstdc++2.9
 #23984: apt: support for "no_proxy" would be nice
- Status: Planed to be integrated into the new methods via the configuration
+ Status: Planned to be integrated into the new methods via the configuration
          file
 	 Done - Use Acquire::http::proxy::host.com="DIRECT"
 #25021: apt: Need some control over multiple connections
@@ -83,7 +83,7 @@
  Status: Fix the man pages. This certainly will be done in 0.3.0
 #24799: Some suggestions for the apt method in dselect
  Summary: Wants to be able to specifiy -d from dselect
- Status: Likely a APT_OPTIONS enviornment variable will be created, -d can
+ Status: Likely a APT_OPTIONS environment variable will be created, -d can
          be put there.
 	 There is already an APT_CONFIG in 0.3, APT_OPTIONS may also 
 	 appear..
@@ -112,7 +112,7 @@
          APT now sends a max age header. See the apt.conf(5)
 #28172: HTTP Proxy cache refresh should be forced for corrupted packages
  Summary: Some problem resulted in a corrupted package
- Status: I belive this reflects a deeper problem and the suggested solution
+ Status: I believe this reflects a deeper problem and the suggested solution
          is only a band-aide patch. I intend to close this bug when #24685
 	 is fixed with a configuration directive.
 	 Use -o acquire::http::no-cache=true
diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent
index 966ca2b0f..b9e6a881a 100644
--- a/doc/apt-verbatim.ent
+++ b/doc/apt-verbatim.ent
@@ -219,13 +219,14 @@
 ">
 
 <!-- this will be updated by 'prepare-release' -->
-<!ENTITY apt-product-version "0.9.15.3">
+<!ENTITY apt-product-version "0.9.15.4">
 
 <!-- (Code)names for various things used all over the place -->
 <!ENTITY oldstable-codename "squeeze">
 <!ENTITY stable-codename "wheezy">
 <!ENTITY testing-codename "jessie">
 <!ENTITY stable-version "7">
+<!ENTITY tanglu-codename "bartholomea">
 <!ENTITY ubuntu-codename "trusty">
 
 <!-- good and bad just refers to matching and not matching a pattern…
diff --git a/doc/design.sgml b/doc/design.sgml
index 1ddf49fd8..67406aa01 100644
--- a/doc/design.sgml
+++ b/doc/design.sgml
@@ -48,7 +48,7 @@
 	that additional functionality in the underlying dpkg would
 	also be requested.</p>
 
-      <p> Diety/dselect are the first introduction that people have to
+      <p> Deity/dselect are the first introduction that people have to
 	Debian, and unfortunately this first impression contributes
 	greatly to the public perception of the distribution. It is
 	imperative that this be a showcase for Debian, rather than
diff --git a/doc/dpkg-tech.sgml b/doc/dpkg-tech.sgml
index 1a15f6a4c..ce0c5fa83 100644
--- a/doc/dpkg-tech.sgml
+++ b/doc/dpkg-tech.sgml
@@ -322,7 +322,7 @@ The main principal of the new-format Debian archive (I won't describe the old
 format - for that have a look at deb-old.5), is that the archive really is
 an archive - as used by "ar" and friends. However, dpkg-deb uses this format
 internally, rather than calling "ar". Inside this archive, there are usually
-the folowing members:-
+the following members:-
 
 <list>
 <item>debian-binary
@@ -349,7 +349,7 @@ supports the following options:-
 <item>--build (-b) &lt;dir&gt; - builds a .deb archive, takes a directory which
 contains all the files as an argument. Note that the directory
 &lt;dir&gt;/DEBIAN will be packed separately into the control archive.
-<item>--contents (-c) &lt;debfile&gt; - Lists the contents of ther "data.tar.gz"
+<item>--contents (-c) &lt;debfile&gt; - Lists the contents of the "data.tar.gz"
 member.
 <item>--control (-e) &lt;debfile&gt; - Extracts the control archive into a
 directory called DEBIAN. Alternatively, with another argument, it will extract
@@ -450,7 +450,7 @@ cleaned up when dpkg exits cleanly.
 
 <p>
 Juding by the use of the updates directory I would call it a Journal. Inorder
-to effeciently ensure the complete integrity of the status file dpkg will
+to efficiently ensure the complete integrity of the status file dpkg will
 "checkpoint" or journal all of it's activities in the updates directory. By
 merging the contents of the updates directory (in order!!) against the 
 original status file it can get the precise current state of the system,
diff --git a/doc/examples/configure-index b/doc/examples/configure-index
index f4d9d17f2..93e96cf16 100644
--- a/doc/examples/configure-index
+++ b/doc/examples/configure-index
@@ -142,7 +142,7 @@ APT
     // APT::Archives::MinAge "2"; (old, deprecated)
     MinAge "2"; // (new)
     // - Set minimum age of a package file. If a file is younger it
-    //   will not be deleted (0=disable). Usefull to prevent races 
+    //   will not be deleted (0=disable). Useful to prevent races
     //   and to keep backups of the packages for emergency.
 
     // APT::Archives::MaxSize "0"; (old, deprecated)
diff --git a/doc/files.sgml b/doc/files.sgml
index a52efc756..56c7f574d 100644
--- a/doc/files.sgml
+++ b/doc/files.sgml
@@ -201,7 +201,7 @@ from partial into archives/. Any files found in archives/ can be assumed
 to be verified.
 
 <p>
-No directory structure is transfered from the receiving site and all .deb
+No directory structure is transferred from the receiving site and all .deb
 file names conform to debian conventions. No short (msdos) filename should
 be placed in archives. If the need arises .debs should be unpacked, scanned
 and renamed to their correct internal names. This is mostly to prevent
diff --git a/doc/libapt-pkg2_to_3.txt b/doc/libapt-pkg2_to_3.txt
index c1f71f9f2..b94dc666e 100644
--- a/doc/libapt-pkg2_to_3.txt
+++ b/doc/libapt-pkg2_to_3.txt
@@ -3,7 +3,7 @@ people need to be aware of.. Many of this changes are done so that most old
 source will continue to function, but perhaps at reduced functionality.
 
 * pkgDepCache is no longer self initilizing, you have to call the Init
-  method seperately after constructing it. Users of pkgCacheFile do not
+  method separately after constructing it. Users of pkgCacheFile do not
   need to worry about this
 * GetCandidateVer/etc is gone from the pkgCache. It exists only in the 
   DepCache and is just an inline around the new Policy class
@@ -55,7 +55,7 @@ source will continue to function, but perhaps at reduced functionality.
   (should be transparent largely)
 * Locking is handled differently, there is no dpkg lock class, the _system
   class provides Lock/UnLock methods
-* pkgDepCache is not a subclass of pkgCache, it agregates it now. Some 
+* pkgDepCache is not a subclass of pkgCache, it aggregates it now. Some
   compatibility functions are provided that make this transition fairly 
   easy.
 * The following functions have had minor argument changes:
diff --git a/doc/method.sgml b/doc/method.sgml
index 27db50173..5aa7b52e8 100644
--- a/doc/method.sgml
+++ b/doc/method.sgml
@@ -246,14 +246,14 @@ pre-transfer status for Internet type methods.
 Fields: Message
 
 <tag>200 URI Start<item>
-Indicates the URI is starting to be transfered. The URI is specified
+Indicates the URI is starting to be transferred. The URI is specified
 along with stats about the file itself.
 Fields: URI, Size, Last-Modified, Resume-Point
 
 <tag>201 URI Done<item>
-Indicates that a URI has completed being transfered. It is possible
+Indicates that a URI has completed being transferred. It is possible
 to specify a <em>201 URI Done</> without a <em>URI Start</> which would
-mean no data was transfered but the file is now available. A Filename
+mean no data was transferred but the file is now available. A Filename
 field is specified when the URI is directly available in the local 
 pathname space. APT will either directly use that file or copy it into 
 another location. It is possible to return Alt-* fields to indicate that
diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot
index 8e63cdfc0..348980dd7 100644
--- a/doc/po/apt-doc.pot
+++ b/doc/po/apt-doc.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: apt-doc 0.9.15.2\n"
+"Project-Id-Version: apt-doc 0.9.15.3\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-02-20 14:42+0100\n"
+"POT-Creation-Date: 2014-02-23 00:29+0100\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"
@@ -6183,7 +6183,7 @@ msgstr ""
 #: guide.sgml:163
 msgid ""
 "<prgn>apt-get</prgn> has several command line options that are detailed in "
-"its man page, <manref name=\"apt-get\" section=\"8\">. The most useful "
+"its man page, <manref section=\"8\" name=\"apt-get\">. The most useful "
 "option is <tt>-d</tt> which does not install the fetched files. If the "
 "system has to download a large number of package it would be undesired to "
 "start installing them in case something goes wrong. When <tt>-d</tt> is used "
diff --git a/doc/po/de.po b/doc/po/de.po
index 5afea89ca..b7d84acc1 100644
--- a/doc/po/de.po
+++ b/doc/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-doc 0.9.14.2\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-02-20 14:42+0100\n"
+"POT-Creation-Date: 2014-02-23 00:29+0100\n"
 "PO-Revision-Date: 2014-01-26 15:26+0100\n"
 "Last-Translator: Chris Leick <c.leick@vollbio.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -8780,7 +8780,7 @@ msgstr ""
 #| "command that caused them to be downloaded again without <tt>-d</tt>."
 msgid ""
 "<prgn>apt-get</prgn> has several command line options that are detailed in "
-"its man page, <manref name=\"apt-get\" section=\"8\">. The most useful "
+"its man page, <manref section=\"8\" name=\"apt-get\">. The most useful "
 "option is <tt>-d</tt> which does not install the fetched files. If the "
 "system has to download a large number of package it would be undesired to "
 "start installing them in case something goes wrong. When <tt>-d</tt> is used "
diff --git a/doc/po/es.po b/doc/po/es.po
index 5c49f7485..bcf0ccf51 100644
--- a/doc/po/es.po
+++ b/doc/po/es.po
@@ -38,7 +38,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.9.7.1\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-02-20 14:42+0100\n"
+"POT-Creation-Date: 2014-02-23 00:29+0100\n"
 "PO-Revision-Date: 2012-07-14 12:21+0200\n"
 "Last-Translator: Omar Campagne <ocampagne@gmail.com>\n"
 "Language-Team: Debian l10n Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -8792,7 +8792,7 @@ msgstr ""
 #| "command that caused them to be downloaded again without <tt>-d</tt>."
 msgid ""
 "<prgn>apt-get</prgn> has several command line options that are detailed in "
-"its man page, <manref name=\"apt-get\" section=\"8\">. The most useful "
+"its man page, <manref section=\"8\" name=\"apt-get\">. The most useful "
 "option is <tt>-d</tt> which does not install the fetched files. If the "
 "system has to download a large number of package it would be undesired to "
 "start installing them in case something goes wrong. When <tt>-d</tt> is used "
diff --git a/doc/po/fr.po b/doc/po/fr.po
index 09b70a66f..2ae614b56 100644
--- a/doc/po/fr.po
+++ b/doc/po/fr.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-02-20 14:42+0100\n"
+"POT-Creation-Date: 2014-02-23 00:29+0100\n"
 "PO-Revision-Date: 2013-04-09 07:56+0200\n"
 "Last-Translator: Christian Perrier <bubulle@debian.org>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -8753,7 +8753,7 @@ msgstr ""
 #| "command that caused them to be downloaded again without <tt>-d</tt>."
 msgid ""
 "<prgn>apt-get</prgn> has several command line options that are detailed in "
-"its man page, <manref name=\"apt-get\" section=\"8\">. The most useful "
+"its man page, <manref section=\"8\" name=\"apt-get\">. The most useful "
 "option is <tt>-d</tt> which does not install the fetched files. If the "
 "system has to download a large number of package it would be undesired to "
 "start installing them in case something goes wrong. When <tt>-d</tt> is used "
diff --git a/doc/po/it.po b/doc/po/it.po
index 30bbf8b11..1050cee57 100644
--- a/doc/po/it.po
+++ b/doc/po/it.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-02-20 14:42+0100\n"
+"POT-Creation-Date: 2014-02-23 00:29+0100\n"
 "PO-Revision-Date: 2012-12-23 18:04+0200\n"
 "Last-Translator: Beatrice Torracca <beatricet@libero.it>\n"
 "Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n"
@@ -8766,7 +8766,7 @@ msgstr ""
 #| "command that caused them to be downloaded again without <tt>-d</tt>."
 msgid ""
 "<prgn>apt-get</prgn> has several command line options that are detailed in "
-"its man page, <manref name=\"apt-get\" section=\"8\">. The most useful "
+"its man page, <manref section=\"8\" name=\"apt-get\">. The most useful "
 "option is <tt>-d</tt> which does not install the fetched files. If the "
 "system has to download a large number of package it would be undesired to "
 "start installing them in case something goes wrong. When <tt>-d</tt> is used "
diff --git a/doc/po/ja.po b/doc/po/ja.po
index 7fd447ef9..99c2ea2c3 100644
--- a/doc/po/ja.po
+++ b/doc/po/ja.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.7.25.3\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-02-20 14:42+0100\n"
+"POT-Creation-Date: 2014-02-23 00:29+0100\n"
 "PO-Revision-Date: 2012-08-08 07:58+0900\n"
 "Last-Translator: KURASAWA Nozomu <nabetaro@debian.or.jp>\n"
 "Language-Team: Debian Japanese List <debian-japanese@lists.debian.org>\n"
@@ -8336,7 +8336,7 @@ msgstr ""
 #: guide.sgml:163
 msgid ""
 "<prgn>apt-get</prgn> has several command line options that are detailed in "
-"its man page, <manref name=\"apt-get\" section=\"8\">. The most useful "
+"its man page, <manref section=\"8\" name=\"apt-get\">. The most useful "
 "option is <tt>-d</tt> which does not install the fetched files. If the "
 "system has to download a large number of package it would be undesired to "
 "start installing them in case something goes wrong. When <tt>-d</tt> is used "
diff --git a/doc/po/pl.po b/doc/po/pl.po
index 5b6463102..dda23a5d3 100644
--- a/doc/po/pl.po
+++ b/doc/po/pl.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.9.7.3\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-02-20 14:42+0100\n"
+"POT-Creation-Date: 2014-02-23 00:29+0100\n"
 "PO-Revision-Date: 2012-07-28 21:59+0200\n"
 "Last-Translator: Robert Luberda <robert@debian.org>\n"
 "Language-Team: Polish <manpages-pl-list@lists.sourceforge.net>\n"
@@ -7996,7 +7996,7 @@ msgstr ""
 #| "command that caused them to be downloaded again without <tt>-d</tt>."
 msgid ""
 "<prgn>apt-get</prgn> has several command line options that are detailed in "
-"its man page, <manref name=\"apt-get\" section=\"8\">. The most useful "
+"its man page, <manref section=\"8\" name=\"apt-get\">. The most useful "
 "option is <tt>-d</tt> which does not install the fetched files. If the "
 "system has to download a large number of package it would be undesired to "
 "start installing them in case something goes wrong. When <tt>-d</tt> is used "
diff --git a/doc/po/pt.po b/doc/po/pt.po
index c4668f2ee..99adcbaff 100644
--- a/doc/po/pt.po
+++ b/doc/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.9.7.1\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-02-20 14:42+0100\n"
+"POT-Creation-Date: 2014-02-23 00:29+0100\n"
 "PO-Revision-Date: 2012-09-03 01:53+0100\n"
 "Last-Translator: Américo Monteiro <a_monteiro@netcabo.pt>\n"
 "Language-Team: Portuguese <l10n@debianpt.org>\n"
@@ -8700,7 +8700,7 @@ msgstr ""
 #| "command that caused them to be downloaded again without <tt>-d</tt>."
 msgid ""
 "<prgn>apt-get</prgn> has several command line options that are detailed in "
-"its man page, <manref name=\"apt-get\" section=\"8\">. The most useful "
+"its man page, <manref section=\"8\" name=\"apt-get\">. The most useful "
 "option is <tt>-d</tt> which does not install the fetched files. If the "
 "system has to download a large number of package it would be undesired to "
 "start installing them in case something goes wrong. When <tt>-d</tt> is used "
diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po
index 1e75023f1..c1014fbb0 100644
--- a/doc/po/pt_BR.po
+++ b/doc/po/pt_BR.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-02-20 14:42+0100\n"
+"POT-Creation-Date: 2014-02-23 00:29+0100\n"
 "PO-Revision-Date: 2004-09-20 17:02+0000\n"
 "Last-Translator: André Luís Lopes <andrelop@debian.org>\n"
 "Language-Team: <debian-l10n-portuguese@lists.debian.org>\n"
@@ -6598,7 +6598,7 @@ msgstr ""
 #: guide.sgml:163
 msgid ""
 "<prgn>apt-get</prgn> has several command line options that are detailed in "
-"its man page, <manref name=\"apt-get\" section=\"8\">. The most useful "
+"its man page, <manref section=\"8\" name=\"apt-get\">. The most useful "
 "option is <tt>-d</tt> which does not install the fetched files. If the "
 "system has to download a large number of package it would be undesired to "
 "start installing them in case something goes wrong. When <tt>-d</tt> is used "
diff --git a/doc/style.txt b/doc/style.txt
index 2072251d0..7658b0314 100644
--- a/doc/style.txt
+++ b/doc/style.txt
@@ -9,7 +9,7 @@ Ver - A version
 Indenting, Comments, Etc
 ~~~~~~~~~~~~~~~~~~~~~~~~
 Would make Linus cry :P However it is what I prefer. 3 space indent,
-8 space tab all braces on seperate lines, function return on the same line 
+8 space tab all braces on separate lines, function return on the same line
 as the function, cases aligned with their code. The 'indent' options for 
 this style are:
    indent -bl -bli0 -di1 -i3 -nsc -ts8 -npcs -npsl
@@ -60,13 +60,13 @@ almost always designates a change in ownership rules).
   * Pass by non-const reference may be used to indicate a OUT type variable
   * Pass by pointer (except in the case where the pointer is really an array)
     should be used when the object will be retained or ownership will be
-    transfered. Ownership transference should be rare and noted by a comment.
+    transferred. Ownership transference should be rare and noted by a comment.
   * Standard C things (FILE * etc) should be left as is.
   
   * Return by references should indicate a borrowed object
   * Return by pointer (except arrays) should indicate ownership is 
-    transfered. Return by pointer should not be used unless ownership is 
-    transfered.
+    transferred. Return by pointer should not be used unless ownership is
+    transferred.
   * Return by pointer to variable indicates ownership transfer unless the
     pointer is an 'input' parameter (designated generally by an =0, 
     indicating a default of 'none')