Merge tag '1.3_rc3' into ubuntu/master

apt Debian release 1.3~rc3

18 files changed, 174 insertions, 174 deletions

diff --git a/doc/apt-cache.8.xml b/doc/apt-cache.8.xml
index 7ebc1c5c6..571779931 100644
--- a/doc/apt-cache.8.xml
+++ b/doc/apt-cache.8.xml
@@ -14,7 +14,7 @@
    &apt-email;
    &apt-product;
    <!-- The last update date -->
-   <date>2016-08-18T00:00:00Z</date>
+   <date>2016-08-17T00:00:00Z</date>
  </refentryinfo>
  
  <refmeta>
diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml
index f87419229..b4a3002f3 100644
--- a/doc/apt-get.8.xml
+++ b/doc/apt-get.8.xml
@@ -14,7 +14,7 @@
    &apt-email;
    &apt-product;
    <!-- The last update date -->
-   <date>2016-08-18T00:00:00Z</date>
+   <date>2016-08-26T00:00:00Z</date>
  </refentryinfo>
  
  <refmeta>
@@ -522,7 +522,7 @@
      Configuration Item: <literal>APT::Get::Remove</literal>.</para></listitem>
      </varlistentry>
 
-     <varlistentry><term><option>--auto-remove</option></term>
+     <varlistentry><term><option>--auto-remove</option></term><term><option>--autoremove</option></term>
      <listitem><para>If the command is either <literal>install</literal> or <literal>remove</literal>,
      then this option acts like running the <literal>autoremove</literal> command, removing unused
      dependency packages. Configuration Item: <literal>APT::Get::AutomaticRemove</literal>.
diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent
index aaa2c1a6d..1278ff283 100644
--- a/doc/apt-verbatim.ent
+++ b/doc/apt-verbatim.ent
@@ -239,7 +239,7 @@
 ">
 
 <!-- this will be updated by 'prepare-release' -->
-<!ENTITY apt-product-version "1.3~rc2ubuntu3">
+<!ENTITY apt-product-version "1.3~rc3">
 
 <!-- (Code)names for various things used all over the place -->
 <!ENTITY debian-oldstable-codename "wheezy">
diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml
index 0c2b7f763..380371230 100644
--- a/doc/apt.conf.5.xml
+++ b/doc/apt.conf.5.xml
@@ -19,7 +19,7 @@
    &apt-email;
    &apt-product;
    <!-- The last update date -->
-   <date>2016-08-18T00:00:00Z</date>
+   <date>2016-08-17T00:00:00Z</date>
  </refentryinfo>
  
  <refmeta>
diff --git a/doc/docbook-html-style.xsl b/doc/docbook-html-style.xsl.cmake.in
index e4af9f557..9216d8e6e 100644
--- a/doc/docbook-html-style.xsl
+++ b/doc/docbook-html-style.xsl.cmake.in
@@ -2,7 +2,7 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
 
   <!-- Import our base stylesheet -->
-  <xsl:import href="/usr/share/xml/docbook/stylesheet/docbook-xsl/xhtml-1_1/chunk.xsl" />
+  <xsl:import href="@DOCBOOK_XSL@/xhtml-1_1/chunk.xsl" />
 
   <!-- Since we use xsltproc (not saxon), add a workaround to ensure UTF-8 -->
   <xsl:template xmlns="http://www.w3.org/1999/xhtml" name="head.content.generator">
diff --git a/doc/docbook-text-style.xsl b/doc/docbook-text-style.xsl.cmake.in
index 376dded52..36af1bcb2 100644
--- a/doc/docbook-text-style.xsl
+++ b/doc/docbook-text-style.xsl.cmake.in
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
 
-  <xsl:import href="/usr/share/xml/docbook/stylesheet/docbook-xsl/xhtml-1_1/docbook.xsl" />
+  <xsl:import href="@DOCBOOK_XSL@/xhtml-1_1/docbook.xsl" />
 
   <!-- Parameters for optimal text output. -->
   <xsl:param name="callout.graphics" select="0"/>
diff --git a/doc/manpage-style.xsl b/doc/manpage-style.xsl.cmake.in
index a780bad13..53d6780cb 100644
--- a/doc/manpage-style.xsl
+++ b/doc/manpage-style.xsl.cmake.in
@@ -2,7 +2,7 @@
  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
  version="1.0">
 
-<xsl:import href="/usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl" />
+<xsl:import href="@DOCBOOK_XSL@/manpages/docbook.xsl" />
 
 <xsl:param name="man.output.encoding" select="'UTF-8'" />
 
diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot
index d8b2d434e..817adbbef 100644
--- a/doc/po/apt-doc.pot
+++ b/doc/po/apt-doc.pot
@@ -5,9 +5,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: apt-doc 1.3~rc2ubuntu3\n"
+"Project-Id-Version: apt-doc 1.3~rc3\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2016-08-24 10:39+0200\n"
+"POT-Creation-Date: 2016-08-30 22:20+0200\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"
@@ -5788,8 +5788,8 @@ msgstr ""
 #: sources.list.5.xml:1
 #, no-wrap
 msgid ""
-"deb http://httpredir.debian.org/debian &debian-stable-codename; main\n"
-"deb [ arch=amd64,armel ] http://httpredir.debian.org/debian "
+"deb http://deb.debian.org/debian &debian-stable-codename; main\n"
+"deb [ arch=amd64,armel ] http://deb.debian.org/debian "
 "&debian-stable-codename; main"
 msgstr ""
 
@@ -5798,12 +5798,12 @@ msgstr ""
 #, no-wrap
 msgid ""
 "Types: deb\n"
-"URIs: http://httpredir.debian.org/debian\n"
+"URIs: http://deb.debian.org/debian\n"
 "Suites: &debian-stable-codename;\n"
 "Components: main\n"
 "\n"
 "Types: deb\n"
-"URIs: http://httpredir.debian.org/debian\n"
+"URIs: http://deb.debian.org/debian\n"
 "Suites: &debian-stable-codename;\n"
 "Components: main\n"
 "Architectures: amd64 armel\n"
@@ -5919,12 +5919,12 @@ msgstr ""
 #: sources.list.5.xml:1
 #, no-wrap
 msgid ""
-"deb http://httpredir.debian.org/debian stable main contrib\n"
-"deb-src http://httpredir.debian.org/debian stable main contrib\n"
-"deb http://httpredir.debian.org/debian testing main contrib\n"
-"deb-src http://httpredir.debian.org/debian testing main contrib\n"
-"deb http://httpredir.debian.org/debian unstable main contrib\n"
-"deb-src http://httpredir.debian.org/debian unstable main contrib"
+"deb http://deb.debian.org/debian stable main contrib\n"
+"deb-src http://deb.debian.org/debian stable main contrib\n"
+"deb http://deb.debian.org/debian testing main contrib\n"
+"deb-src http://deb.debian.org/debian testing main contrib\n"
+"deb http://deb.debian.org/debian unstable main contrib\n"
+"deb-src http://deb.debian.org/debian unstable main contrib"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
@@ -5932,7 +5932,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 "Types: deb deb-src\n"
-"URIs: http://httpredir.debian.org/debian\n"
+"URIs: http://deb.debian.org/debian\n"
 "Suites: stable testing unstable\n"
 "Components: main contrib\n"
 msgstr ""
diff --git a/doc/po/de.po b/doc/po/de.po
index 8ae13e645..5e4e9db10 100644
--- a/doc/po/de.po
+++ b/doc/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-doc 1.0.8\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2016-08-24 10:39+0200\n"
+"POT-Creation-Date: 2016-08-30 22:20+0200\n"
 "PO-Revision-Date: 2014-09-14 14:46+0200\n"
 "Last-Translator: Chris Leick <c.leick@vollbio.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -8241,8 +8241,8 @@ msgstr ""
 #| "deb http://ftp.debian.org/debian &debian-stable-codename; main\n"
 #| "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &debian-stable-codename; main"
 msgid ""
-"deb http://httpredir.debian.org/debian &debian-stable-codename; main\n"
-"deb [ arch=amd64,armel ] http://httpredir.debian.org/debian &debian-stable-codename; main"
+"deb http://deb.debian.org/debian &debian-stable-codename; main\n"
+"deb [ arch=amd64,armel ] http://deb.debian.org/debian &debian-stable-codename; main"
 msgstr ""
 "deb http://ftp.debian.org/debian &debian-stable-codename; main\n"
 "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &debian-stable-codename; main"
@@ -8255,12 +8255,12 @@ msgstr ""
 #| "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &debian-stable-codename; main"
 msgid ""
 "Types: deb\n"
-"URIs: http://httpredir.debian.org/debian\n"
+"URIs: http://deb.debian.org/debian\n"
 "Suites: &debian-stable-codename;\n"
 "Components: main\n"
 "\n"
 "Types: deb\n"
-"URIs: http://httpredir.debian.org/debian\n"
+"URIs: http://deb.debian.org/debian\n"
 "Suites: &debian-stable-codename;\n"
 "Components: main\n"
 "Architectures: amd64 armel\n"
@@ -8408,12 +8408,12 @@ msgstr ""
 #: sources.list.5.xml
 #, no-wrap
 msgid ""
-"deb http://httpredir.debian.org/debian stable main contrib\n"
-"deb-src http://httpredir.debian.org/debian stable main contrib\n"
-"deb http://httpredir.debian.org/debian testing main contrib\n"
-"deb-src http://httpredir.debian.org/debian testing main contrib\n"
-"deb http://httpredir.debian.org/debian unstable main contrib\n"
-"deb-src http://httpredir.debian.org/debian unstable main contrib"
+"deb http://deb.debian.org/debian stable main contrib\n"
+"deb-src http://deb.debian.org/debian stable main contrib\n"
+"deb http://deb.debian.org/debian testing main contrib\n"
+"deb-src http://deb.debian.org/debian testing main contrib\n"
+"deb http://deb.debian.org/debian unstable main contrib\n"
+"deb-src http://deb.debian.org/debian unstable main contrib"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
@@ -8421,7 +8421,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 "Types: deb deb-src\n"
-"URIs: http://httpredir.debian.org/debian\n"
+"URIs: http://deb.debian.org/debian\n"
 "Suites: stable testing unstable\n"
 "Components: main contrib\n"
 msgstr ""
diff --git a/doc/po/es.po b/doc/po/es.po
index 48961c258..1145c74cc 100644
--- a/doc/po/es.po
+++ b/doc/po/es.po
@@ -38,7 +38,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-doc 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2016-08-24 10:39+0200\n"
+"POT-Creation-Date: 2016-08-30 22:20+0200\n"
 "PO-Revision-Date: 2014-07-04 01:31+0200\n"
 "Last-Translator: Omar Campagne <ocampagne@gmail.com>\n"
 "Language-Team: Debian l10n Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -8243,8 +8243,8 @@ msgstr ""
 #| "deb http://ftp.debian.org/debian &debian-stable-codename; main\n"
 #| "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &debian-stable-codename; main"
 msgid ""
-"deb http://httpredir.debian.org/debian &debian-stable-codename; main\n"
-"deb [ arch=amd64,armel ] http://httpredir.debian.org/debian &debian-stable-codename; main"
+"deb http://deb.debian.org/debian &debian-stable-codename; main\n"
+"deb [ arch=amd64,armel ] http://deb.debian.org/debian &debian-stable-codename; main"
 msgstr ""
 "deb http://ftp.debian.org/debian &debian-stable-codename; main\n"
 "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &debian-stable-codename; main"
@@ -8257,12 +8257,12 @@ msgstr ""
 #| "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &debian-stable-codename; main"
 msgid ""
 "Types: deb\n"
-"URIs: http://httpredir.debian.org/debian\n"
+"URIs: http://deb.debian.org/debian\n"
 "Suites: &debian-stable-codename;\n"
 "Components: main\n"
 "\n"
 "Types: deb\n"
-"URIs: http://httpredir.debian.org/debian\n"
+"URIs: http://deb.debian.org/debian\n"
 "Suites: &debian-stable-codename;\n"
 "Components: main\n"
 "Architectures: amd64 armel\n"
@@ -8408,12 +8408,12 @@ msgstr ""
 #: sources.list.5.xml
 #, no-wrap
 msgid ""
-"deb http://httpredir.debian.org/debian stable main contrib\n"
-"deb-src http://httpredir.debian.org/debian stable main contrib\n"
-"deb http://httpredir.debian.org/debian testing main contrib\n"
-"deb-src http://httpredir.debian.org/debian testing main contrib\n"
-"deb http://httpredir.debian.org/debian unstable main contrib\n"
-"deb-src http://httpredir.debian.org/debian unstable main contrib"
+"deb http://deb.debian.org/debian stable main contrib\n"
+"deb-src http://deb.debian.org/debian stable main contrib\n"
+"deb http://deb.debian.org/debian testing main contrib\n"
+"deb-src http://deb.debian.org/debian testing main contrib\n"
+"deb http://deb.debian.org/debian unstable main contrib\n"
+"deb-src http://deb.debian.org/debian unstable main contrib"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
@@ -8421,7 +8421,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 "Types: deb deb-src\n"
-"URIs: http://httpredir.debian.org/debian\n"
+"URIs: http://deb.debian.org/debian\n"
 "Suites: stable testing unstable\n"
 "Components: main contrib\n"
 msgstr ""
diff --git a/doc/po/fr.po b/doc/po/fr.po
index 003ec244e..ef12e4783 100644
--- a/doc/po/fr.po
+++ b/doc/po/fr.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-doc 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2016-08-24 10:39+0200\n"
+"POT-Creation-Date: 2016-08-30 22:20+0200\n"
 "PO-Revision-Date: 2014-11-15 17:26+0100\n"
 "Last-Translator: Jean-Pierre Giraud <jean-pierregiraud@neuf.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -8206,8 +8206,8 @@ msgstr ""
 #| "deb http://ftp.debian.org/debian &debian-stable-codename; main\n"
 #| "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &debian-stable-codename; main"
 msgid ""
-"deb http://httpredir.debian.org/debian &debian-stable-codename; main\n"
-"deb [ arch=amd64,armel ] http://httpredir.debian.org/debian &debian-stable-codename; main"
+"deb http://deb.debian.org/debian &debian-stable-codename; main\n"
+"deb [ arch=amd64,armel ] http://deb.debian.org/debian &debian-stable-codename; main"
 msgstr ""
 "deb http://ftp.debian.org/debian &debian-stable-codename; main\n"
 "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &debian-stable-codename; main"
@@ -8220,12 +8220,12 @@ msgstr ""
 #| "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &debian-stable-codename; main"
 msgid ""
 "Types: deb\n"
-"URIs: http://httpredir.debian.org/debian\n"
+"URIs: http://deb.debian.org/debian\n"
 "Suites: &debian-stable-codename;\n"
 "Components: main\n"
 "\n"
 "Types: deb\n"
-"URIs: http://httpredir.debian.org/debian\n"
+"URIs: http://deb.debian.org/debian\n"
 "Suites: &debian-stable-codename;\n"
 "Components: main\n"
 "Architectures: amd64 armel\n"
@@ -8372,12 +8372,12 @@ msgstr ""
 #: sources.list.5.xml
 #, no-wrap
 msgid ""
-"deb http://httpredir.debian.org/debian stable main contrib\n"
-"deb-src http://httpredir.debian.org/debian stable main contrib\n"
-"deb http://httpredir.debian.org/debian testing main contrib\n"
-"deb-src http://httpredir.debian.org/debian testing main contrib\n"
-"deb http://httpredir.debian.org/debian unstable main contrib\n"
-"deb-src http://httpredir.debian.org/debian unstable main contrib"
+"deb http://deb.debian.org/debian stable main contrib\n"
+"deb-src http://deb.debian.org/debian stable main contrib\n"
+"deb http://deb.debian.org/debian testing main contrib\n"
+"deb-src http://deb.debian.org/debian testing main contrib\n"
+"deb http://deb.debian.org/debian unstable main contrib\n"
+"deb-src http://deb.debian.org/debian unstable main contrib"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
@@ -8385,7 +8385,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 "Types: deb deb-src\n"
-"URIs: http://httpredir.debian.org/debian\n"
+"URIs: http://deb.debian.org/debian\n"
 "Suites: stable testing unstable\n"
 "Components: main contrib\n"
 msgstr ""
diff --git a/doc/po/it.po b/doc/po/it.po
index 8a2b68956..4f770b078 100644
--- a/doc/po/it.po
+++ b/doc/po/it.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-doc 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2016-08-24 10:39+0200\n"
+"POT-Creation-Date: 2016-08-30 22:20+0200\n"
 "PO-Revision-Date: 2015-12-27 21:26+0200\n"
 "Last-Translator: Beatrice Torracca <beatricet@libero.it>\n"
 "Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n"
@@ -8358,34 +8358,34 @@ msgstr ""
 #: sources.list.5.xml
 #, no-wrap
 msgid ""
-"deb http://httpredir.debian.org/debian &debian-stable-codename; main\n"
-"deb [ arch=amd64,armel ] http://httpredir.debian.org/debian &debian-stable-codename; main"
+"deb http://deb.debian.org/debian &debian-stable-codename; main\n"
+"deb [ arch=amd64,armel ] http://deb.debian.org/debian &debian-stable-codename; main"
 msgstr ""
-"deb http://httpredir.debian.org/debian &debian-stable-codename; main\n"
-"deb [ arch=amd64,armel ] http://httpredir.debian.org/debian &debian-stable-codename; main"
+"deb http://deb.debian.org/debian &debian-stable-codename; main\n"
+"deb [ arch=amd64,armel ] http://deb.debian.org/debian &debian-stable-codename; main"
 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml
 #, no-wrap
 msgid ""
 "Types: deb\n"
-"URIs: http://httpredir.debian.org/debian\n"
+"URIs: http://deb.debian.org/debian\n"
 "Suites: &debian-stable-codename;\n"
 "Components: main\n"
 "\n"
 "Types: deb\n"
-"URIs: http://httpredir.debian.org/debian\n"
+"URIs: http://deb.debian.org/debian\n"
 "Suites: &debian-stable-codename;\n"
 "Components: main\n"
 "Architectures: amd64 armel\n"
 msgstr ""
 "Types: deb\n"
-"URIs: http://httpredir.debian.org/debian\n"
+"URIs: http://deb.debian.org/debian\n"
 "Suites: &debian-stable-codename;\n"
 "Components: main\n"
 "\n"
 "Types: deb\n"
-"URIs: http://httpredir.debian.org/debian\n"
+"URIs: http://deb.debian.org/debian\n"
 "Suites: &debian-stable-codename;\n"
 "Components: main\n"
 "Architectures: amd64 armel\n"
@@ -8528,31 +8528,31 @@ msgstr ""
 #: sources.list.5.xml
 #, no-wrap
 msgid ""
-"deb http://httpredir.debian.org/debian stable main contrib\n"
-"deb-src http://httpredir.debian.org/debian stable main contrib\n"
-"deb http://httpredir.debian.org/debian testing main contrib\n"
-"deb-src http://httpredir.debian.org/debian testing main contrib\n"
-"deb http://httpredir.debian.org/debian unstable main contrib\n"
-"deb-src http://httpredir.debian.org/debian unstable main contrib"
+"deb http://deb.debian.org/debian stable main contrib\n"
+"deb-src http://deb.debian.org/debian stable main contrib\n"
+"deb http://deb.debian.org/debian testing main contrib\n"
+"deb-src http://deb.debian.org/debian testing main contrib\n"
+"deb http://deb.debian.org/debian unstable main contrib\n"
+"deb-src http://deb.debian.org/debian unstable main contrib"
 msgstr ""
-"deb http://httpredir.debian.org/debian stable main contrib\n"
-"deb-src http://httpredir.debian.org/debian stable main contrib\n"
-"deb http://httpredir.debian.org/debian testing main contrib\n"
-"deb-src http://httpredir.debian.org/debian testing main contrib\n"
-"deb http://httpredir.debian.org/debian unstable main contrib\n"
-"deb-src http://httpredir.debian.org/debian unstable main contrib"
+"deb http://deb.debian.org/debian stable main contrib\n"
+"deb-src http://deb.debian.org/debian stable main contrib\n"
+"deb http://deb.debian.org/debian testing main contrib\n"
+"deb-src http://deb.debian.org/debian testing main contrib\n"
+"deb http://deb.debian.org/debian unstable main contrib\n"
+"deb-src http://deb.debian.org/debian unstable main contrib"
 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml
 #, no-wrap
 msgid ""
 "Types: deb deb-src\n"
-"URIs: http://httpredir.debian.org/debian\n"
+"URIs: http://deb.debian.org/debian\n"
 "Suites: stable testing unstable\n"
 "Components: main contrib\n"
 msgstr ""
 "Types: deb deb-src\n"
-"URIs: http://httpredir.debian.org/debian\n"
+"URIs: http://deb.debian.org/debian\n"
 "Suites: stable testing unstable\n"
 "Components: main contrib\n"
 
diff --git a/doc/po/ja.po b/doc/po/ja.po
index 6ddbcc99d..b992b66fc 100644
--- a/doc/po/ja.po
+++ b/doc/po/ja.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-doc 1.0.6\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2016-08-24 10:39+0200\n"
+"POT-Creation-Date: 2016-08-30 22:20+0200\n"
 "PO-Revision-Date: 2016-03-23 09:39+0900\n"
 "Last-Translator: Takuma Yamada <tyamada@takumayamada.com>\n"
 "Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
@@ -7995,34 +7995,34 @@ msgstr ""
 #: sources.list.5.xml
 #, no-wrap
 msgid ""
-"deb http://httpredir.debian.org/debian &debian-stable-codename; main\n"
-"deb [ arch=amd64,armel ] http://httpredir.debian.org/debian &debian-stable-codename; main"
+"deb http://deb.debian.org/debian &debian-stable-codename; main\n"
+"deb [ arch=amd64,armel ] http://deb.debian.org/debian &debian-stable-codename; main"
 msgstr ""
-"deb http://httpredir.debian.org/debian &debian-stable-codename; main\n"
-"deb [ arch=amd64,armel ] http://httpredir.debian.org/debian &debian-stable-codename; main"
+"deb http://deb.debian.org/debian &debian-stable-codename; main\n"
+"deb [ arch=amd64,armel ] http://deb.debian.org/debian &debian-stable-codename; main"
 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml
 #, no-wrap
 msgid ""
 "Types: deb\n"
-"URIs: http://httpredir.debian.org/debian\n"
+"URIs: http://deb.debian.org/debian\n"
 "Suites: &debian-stable-codename;\n"
 "Components: main\n"
 "\n"
 "Types: deb\n"
-"URIs: http://httpredir.debian.org/debian\n"
+"URIs: http://deb.debian.org/debian\n"
 "Suites: &debian-stable-codename;\n"
 "Components: main\n"
 "Architectures: amd64 armel\n"
 msgstr ""
 "Types: deb\n"
-"URIs: http://httpredir.debian.org/debian\n"
+"URIs: http://deb.debian.org/debian\n"
 "Suites: &debian-stable-codename;\n"
 "Components: main\n"
 "\n"
 "Types: deb\n"
-"URIs: http://httpredir.debian.org/debian\n"
+"URIs: http://deb.debian.org/debian\n"
 "Suites: &debian-stable-codename;\n"
 "Components: main\n"
 "Architectures: amd64 armel\n"
@@ -8169,31 +8169,31 @@ msgstr ""
 #: sources.list.5.xml
 #, no-wrap
 msgid ""
-"deb http://httpredir.debian.org/debian stable main contrib\n"
-"deb-src http://httpredir.debian.org/debian stable main contrib\n"
-"deb http://httpredir.debian.org/debian testing main contrib\n"
-"deb-src http://httpredir.debian.org/debian testing main contrib\n"
-"deb http://httpredir.debian.org/debian unstable main contrib\n"
-"deb-src http://httpredir.debian.org/debian unstable main contrib"
+"deb http://deb.debian.org/debian stable main contrib\n"
+"deb-src http://deb.debian.org/debian stable main contrib\n"
+"deb http://deb.debian.org/debian testing main contrib\n"
+"deb-src http://deb.debian.org/debian testing main contrib\n"
+"deb http://deb.debian.org/debian unstable main contrib\n"
+"deb-src http://deb.debian.org/debian unstable main contrib"
 msgstr ""
-"deb http://httpredir.debian.org/debian stable main contrib\n"
-"deb-src http://httpredir.debian.org/debian stable main contrib\n"
-"deb http://httpredir.debian.org/debian testing main contrib\n"
-"deb-src http://httpredir.debian.org/debian testing main contrib\n"
-"deb http://httpredir.debian.org/debian unstable main contrib\n"
-"deb-src http://httpredir.debian.org/debian unstable main contrib"
+"deb http://deb.debian.org/debian stable main contrib\n"
+"deb-src http://deb.debian.org/debian stable main contrib\n"
+"deb http://deb.debian.org/debian testing main contrib\n"
+"deb-src http://deb.debian.org/debian testing main contrib\n"
+"deb http://deb.debian.org/debian unstable main contrib\n"
+"deb-src http://deb.debian.org/debian unstable main contrib"
 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml
 #, no-wrap
 msgid ""
 "Types: deb deb-src\n"
-"URIs: http://httpredir.debian.org/debian\n"
+"URIs: http://deb.debian.org/debian\n"
 "Suites: stable testing unstable\n"
 "Components: main contrib\n"
 msgstr ""
 "Types: deb deb-src\n"
-"URIs: http://httpredir.debian.org/debian\n"
+"URIs: http://deb.debian.org/debian\n"
 "Suites: stable testing unstable\n"
 "Components: main contrib\n"
 
diff --git a/doc/po/nl.po b/doc/po/nl.po
index 6097373ea..c7cf7e267 100644
--- a/doc/po/nl.po
+++ b/doc/po/nl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-doc 1.1.10-nl\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2016-08-24 10:39+0200\n"
+"POT-Creation-Date: 2016-08-30 22:20+0200\n"
 "PO-Revision-Date: 2016-02-01 16:17+0100\n"
 "Last-Translator: Frans Spiesschaert <Frans.Spiesschaert@yucom.be>\n"
 "Language-Team: Debian Dutch l10n Team <debian-l10n-dutch@lists.debian.org>\n"
@@ -8505,34 +8505,34 @@ msgstr ""
 #: sources.list.5.xml
 #, no-wrap
 msgid ""
-"deb http://httpredir.debian.org/debian &debian-stable-codename; main\n"
-"deb [ arch=amd64,armel ] http://httpredir.debian.org/debian &debian-stable-codename; main"
+"deb http://deb.debian.org/debian &debian-stable-codename; main\n"
+"deb [ arch=amd64,armel ] http://deb.debian.org/debian &debian-stable-codename; main"
 msgstr ""
-"deb http://httpredir.debian.org/debian &debian-stable-codename; main\n"
-"deb [ arch=amd64,armel ] http://httpredir.debian.org/debian &debian-stable-codename; main"
+"deb http://deb.debian.org/debian &debian-stable-codename; main\n"
+"deb [ arch=amd64,armel ] http://deb.debian.org/debian &debian-stable-codename; main"
 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml
 #, no-wrap
 msgid ""
 "Types: deb\n"
-"URIs: http://httpredir.debian.org/debian\n"
+"URIs: http://deb.debian.org/debian\n"
 "Suites: &debian-stable-codename;\n"
 "Components: main\n"
 "\n"
 "Types: deb\n"
-"URIs: http://httpredir.debian.org/debian\n"
+"URIs: http://deb.debian.org/debian\n"
 "Suites: &debian-stable-codename;\n"
 "Components: main\n"
 "Architectures: amd64 armel\n"
 msgstr ""
 "Types: deb\n"
-"URIs: http://httpredir.debian.org/debian\n"
+"URIs: http://deb.debian.org/debian\n"
 "Suites: &debian-stable-codename;\n"
 "Components: main\n"
 "\n"
 "Types: deb\n"
-"URIs: http://httpredir.debian.org/debian\n"
+"URIs: http://deb.debian.org/debian\n"
 "Suites: &debian-stable-codename;\n"
 "Components: main\n"
 "Architectures: amd64 armel\n"
@@ -8681,31 +8681,31 @@ msgstr ""
 #: sources.list.5.xml
 #, no-wrap
 msgid ""
-"deb http://httpredir.debian.org/debian stable main contrib\n"
-"deb-src http://httpredir.debian.org/debian stable main contrib\n"
-"deb http://httpredir.debian.org/debian testing main contrib\n"
-"deb-src http://httpredir.debian.org/debian testing main contrib\n"
-"deb http://httpredir.debian.org/debian unstable main contrib\n"
-"deb-src http://httpredir.debian.org/debian unstable main contrib"
+"deb http://deb.debian.org/debian stable main contrib\n"
+"deb-src http://deb.debian.org/debian stable main contrib\n"
+"deb http://deb.debian.org/debian testing main contrib\n"
+"deb-src http://deb.debian.org/debian testing main contrib\n"
+"deb http://deb.debian.org/debian unstable main contrib\n"
+"deb-src http://deb.debian.org/debian unstable main contrib"
 msgstr ""
-"deb http://httpredir.debian.org/debian stable main contrib\n"
-"deb-src http://httpredir.debian.org/debian stable main contrib\n"
-"deb http://httpredir.debian.org/debian testing main contrib\n"
-"deb-src http://httpredir.debian.org/debian testing main contrib\n"
-"deb http://httpredir.debian.org/debian unstable main contrib\n"
-"deb-src http://httpredir.debian.org/debian unstable main contrib"
+"deb http://deb.debian.org/debian stable main contrib\n"
+"deb-src http://deb.debian.org/debian stable main contrib\n"
+"deb http://deb.debian.org/debian testing main contrib\n"
+"deb-src http://deb.debian.org/debian testing main contrib\n"
+"deb http://deb.debian.org/debian unstable main contrib\n"
+"deb-src http://deb.debian.org/debian unstable main contrib"
 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml
 #, no-wrap
 msgid ""
 "Types: deb deb-src\n"
-"URIs: http://httpredir.debian.org/debian\n"
+"URIs: http://deb.debian.org/debian\n"
 "Suites: stable testing unstable\n"
 "Components: main contrib\n"
 msgstr ""
 "Types: deb deb-src\n"
-"URIs: http://httpredir.debian.org/debian\n"
+"URIs: http://deb.debian.org/debian\n"
 "Suites: stable testing unstable\n"
 "Components: main contrib\n"
 
diff --git a/doc/po/pl.po b/doc/po/pl.po
index 246a35a73..9737f8182 100644
--- a/doc/po/pl.po
+++ b/doc/po/pl.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-doc 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2016-08-24 10:39+0200\n"
+"POT-Creation-Date: 2016-08-30 22:20+0200\n"
 "PO-Revision-Date: 2014-07-04 02:13+0200\n"
 "Last-Translator: Robert Luberda <robert@debian.org>\n"
 "Language-Team: Polish <manpages-pl-list@lists.sourceforge.net>\n"
@@ -7607,8 +7607,8 @@ msgstr ""
 #| "deb http://ftp.debian.org/debian &debian-stable-codename; main\n"
 #| "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &debian-stable-codename; main"
 msgid ""
-"deb http://httpredir.debian.org/debian &debian-stable-codename; main\n"
-"deb [ arch=amd64,armel ] http://httpredir.debian.org/debian &debian-stable-codename; main"
+"deb http://deb.debian.org/debian &debian-stable-codename; main\n"
+"deb [ arch=amd64,armel ] http://deb.debian.org/debian &debian-stable-codename; main"
 msgstr ""
 "deb http://ftp.debian.org/debian &debian-stable-codename; main\n"
 "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &debian-stable-codename; main"
@@ -7621,12 +7621,12 @@ msgstr ""
 #| "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &debian-stable-codename; main"
 msgid ""
 "Types: deb\n"
-"URIs: http://httpredir.debian.org/debian\n"
+"URIs: http://deb.debian.org/debian\n"
 "Suites: &debian-stable-codename;\n"
 "Components: main\n"
 "\n"
 "Types: deb\n"
-"URIs: http://httpredir.debian.org/debian\n"
+"URIs: http://deb.debian.org/debian\n"
 "Suites: &debian-stable-codename;\n"
 "Components: main\n"
 "Architectures: amd64 armel\n"
@@ -7771,12 +7771,12 @@ msgstr ""
 #: sources.list.5.xml
 #, no-wrap
 msgid ""
-"deb http://httpredir.debian.org/debian stable main contrib\n"
-"deb-src http://httpredir.debian.org/debian stable main contrib\n"
-"deb http://httpredir.debian.org/debian testing main contrib\n"
-"deb-src http://httpredir.debian.org/debian testing main contrib\n"
-"deb http://httpredir.debian.org/debian unstable main contrib\n"
-"deb-src http://httpredir.debian.org/debian unstable main contrib"
+"deb http://deb.debian.org/debian stable main contrib\n"
+"deb-src http://deb.debian.org/debian stable main contrib\n"
+"deb http://deb.debian.org/debian testing main contrib\n"
+"deb-src http://deb.debian.org/debian testing main contrib\n"
+"deb http://deb.debian.org/debian unstable main contrib\n"
+"deb-src http://deb.debian.org/debian unstable main contrib"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
@@ -7784,7 +7784,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 "Types: deb deb-src\n"
-"URIs: http://httpredir.debian.org/debian\n"
+"URIs: http://deb.debian.org/debian\n"
 "Suites: stable testing unstable\n"
 "Components: main contrib\n"
 msgstr ""
diff --git a/doc/po/pt.po b/doc/po/pt.po
index 9d5487d59..9d3355c4c 100644
--- a/doc/po/pt.po
+++ b/doc/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-doc 1.0.7\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2016-08-24 10:39+0200\n"
+"POT-Creation-Date: 2016-08-30 22:20+0200\n"
 "PO-Revision-Date: 2014-08-29 00:34+0100\n"
 "Last-Translator: Américo Monteiro <a_monteiro@gmx.com>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -8175,8 +8175,8 @@ msgstr ""
 #| "deb http://ftp.debian.org/debian &debian-stable-codename; main\n"
 #| "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &debian-stable-codename; main"
 msgid ""
-"deb http://httpredir.debian.org/debian &debian-stable-codename; main\n"
-"deb [ arch=amd64,armel ] http://httpredir.debian.org/debian &debian-stable-codename; main"
+"deb http://deb.debian.org/debian &debian-stable-codename; main\n"
+"deb [ arch=amd64,armel ] http://deb.debian.org/debian &debian-stable-codename; main"
 msgstr ""
 "deb http://ftp.debian.org/debian &debian-stable-codename; main\n"
 "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &debian-stable-codename; main"
@@ -8189,12 +8189,12 @@ msgstr ""
 #| "deb [ arch=amd64,armel ] http://ftp.debian.org/debian &debian-stable-codename; main"
 msgid ""
 "Types: deb\n"
-"URIs: http://httpredir.debian.org/debian\n"
+"URIs: http://deb.debian.org/debian\n"
 "Suites: &debian-stable-codename;\n"
 "Components: main\n"
 "\n"
 "Types: deb\n"
-"URIs: http://httpredir.debian.org/debian\n"
+"URIs: http://deb.debian.org/debian\n"
 "Suites: &debian-stable-codename;\n"
 "Components: main\n"
 "Architectures: amd64 armel\n"
@@ -8339,12 +8339,12 @@ msgstr ""
 #: sources.list.5.xml
 #, no-wrap
 msgid ""
-"deb http://httpredir.debian.org/debian stable main contrib\n"
-"deb-src http://httpredir.debian.org/debian stable main contrib\n"
-"deb http://httpredir.debian.org/debian testing main contrib\n"
-"deb-src http://httpredir.debian.org/debian testing main contrib\n"
-"deb http://httpredir.debian.org/debian unstable main contrib\n"
-"deb-src http://httpredir.debian.org/debian unstable main contrib"
+"deb http://deb.debian.org/debian stable main contrib\n"
+"deb-src http://deb.debian.org/debian stable main contrib\n"
+"deb http://deb.debian.org/debian testing main contrib\n"
+"deb-src http://deb.debian.org/debian testing main contrib\n"
+"deb http://deb.debian.org/debian unstable main contrib\n"
+"deb-src http://deb.debian.org/debian unstable main contrib"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
@@ -8352,7 +8352,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 "Types: deb deb-src\n"
-"URIs: http://httpredir.debian.org/debian\n"
+"URIs: http://deb.debian.org/debian\n"
 "Suites: stable testing unstable\n"
 "Components: main contrib\n"
 msgstr ""
diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po
index 6a994944d..330a1a51f 100644
--- a/doc/po/pt_BR.po
+++ b/doc/po/pt_BR.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-doc 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2016-08-24 10:39+0200\n"
+"POT-Creation-Date: 2016-08-30 22:20+0200\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"
@@ -6144,8 +6144,8 @@ msgstr ""
 #: sources.list.5.xml
 #, no-wrap
 msgid ""
-"deb http://httpredir.debian.org/debian &debian-stable-codename; main\n"
-"deb [ arch=amd64,armel ] http://httpredir.debian.org/debian &debian-stable-codename; main"
+"deb http://deb.debian.org/debian &debian-stable-codename; main\n"
+"deb [ arch=amd64,armel ] http://deb.debian.org/debian &debian-stable-codename; main"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
@@ -6153,12 +6153,12 @@ msgstr ""
 #, no-wrap
 msgid ""
 "Types: deb\n"
-"URIs: http://httpredir.debian.org/debian\n"
+"URIs: http://deb.debian.org/debian\n"
 "Suites: &debian-stable-codename;\n"
 "Components: main\n"
 "\n"
 "Types: deb\n"
-"URIs: http://httpredir.debian.org/debian\n"
+"URIs: http://deb.debian.org/debian\n"
 "Suites: &debian-stable-codename;\n"
 "Components: main\n"
 "Architectures: amd64 armel\n"
@@ -6273,12 +6273,12 @@ msgstr ""
 #: sources.list.5.xml
 #, no-wrap
 msgid ""
-"deb http://httpredir.debian.org/debian stable main contrib\n"
-"deb-src http://httpredir.debian.org/debian stable main contrib\n"
-"deb http://httpredir.debian.org/debian testing main contrib\n"
-"deb-src http://httpredir.debian.org/debian testing main contrib\n"
-"deb http://httpredir.debian.org/debian unstable main contrib\n"
-"deb-src http://httpredir.debian.org/debian unstable main contrib"
+"deb http://deb.debian.org/debian stable main contrib\n"
+"deb-src http://deb.debian.org/debian stable main contrib\n"
+"deb http://deb.debian.org/debian testing main contrib\n"
+"deb-src http://deb.debian.org/debian testing main contrib\n"
+"deb http://deb.debian.org/debian unstable main contrib\n"
+"deb-src http://deb.debian.org/debian unstable main contrib"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
@@ -6286,7 +6286,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 "Types: deb deb-src\n"
-"URIs: http://httpredir.debian.org/debian\n"
+"URIs: http://deb.debian.org/debian\n"
 "Suites: stable testing unstable\n"
 "Components: main contrib\n"
 msgstr ""
diff --git a/doc/sources.list.5.xml b/doc/sources.list.5.xml
index 8fdc8eedb..c0960958f 100644
--- a/doc/sources.list.5.xml
+++ b/doc/sources.list.5.xml
@@ -14,7 +14,7 @@
    &apt-email;
    &apt-product;
    <!-- The last update date -->
-   <date>2016-08-06T00:00:00Z</date>
+   <date>2016-08-29T00:00:00Z</date>
  </refentryinfo>
  
  <refmeta>
@@ -441,15 +441,15 @@ Components: main contrib non-free</literallayout>
 
    <para>The first line gets package information for the architectures in <literal>APT::Architectures</literal>
    while the second always retrieves <literal>amd64</literal> and <literal>armel</literal>.</para>
-   <literallayout>deb http://httpredir.debian.org/debian &debian-stable-codename; main
-deb [ arch=amd64,armel ] http://httpredir.debian.org/debian &debian-stable-codename; main</literallayout>
+   <literallayout>deb http://deb.debian.org/debian &debian-stable-codename; main
+deb [ arch=amd64,armel ] http://deb.debian.org/debian &debian-stable-codename; main</literallayout>
    <literallayout>Types: deb
-URIs: http://httpredir.debian.org/debian
+URIs: http://deb.debian.org/debian
 Suites: &debian-stable-codename;
 Components: main
 
 Types: deb
-URIs: http://httpredir.debian.org/debian
+URIs: http://deb.debian.org/debian
 Suites: &debian-stable-codename;
 Components: main
 Architectures: amd64 armel
@@ -496,14 +496,14 @@ Suites: unstable/binary-$(ARCH)/</literallayout>
 
    <para>Uses HTTP to get binary packages as well as sources from the stable, testing and unstable
       suites and the components main and contrib.</para>
-   <literallayout>deb http://httpredir.debian.org/debian stable main contrib
-deb-src http://httpredir.debian.org/debian stable main contrib
-deb http://httpredir.debian.org/debian testing main contrib
-deb-src http://httpredir.debian.org/debian testing main contrib
-deb http://httpredir.debian.org/debian unstable main contrib
-deb-src http://httpredir.debian.org/debian unstable main contrib</literallayout>
+   <literallayout>deb http://deb.debian.org/debian stable main contrib
+deb-src http://deb.debian.org/debian stable main contrib
+deb http://deb.debian.org/debian testing main contrib
+deb-src http://deb.debian.org/debian testing main contrib
+deb http://deb.debian.org/debian unstable main contrib
+deb-src http://deb.debian.org/debian unstable main contrib</literallayout>
    <literallayout>Types: deb deb-src
-URIs: http://httpredir.debian.org/debian
+URIs: http://deb.debian.org/debian
 Suites: stable testing unstable
 Components: main contrib
 </literallayout>