From 9fb81c6e54a2fe05c0ad0b877fd32f30358e3877 Mon Sep 17 00:00:00 2001
From: Julian Andres Klode <jak@debian.org>
Date: Sun, 21 Aug 2016 20:37:14 +0200
Subject: CMake: Discover docbook stylesheet in other locations

Distributions seem to install this stuff all over the place, so
let's add a common list of paths we know about.
---
 doc/docbook-html-style.xsl          | 40 ---------------------
 doc/docbook-html-style.xsl.cmake.in | 40 +++++++++++++++++++++
 doc/docbook-text-style.xsl          | 70 -------------------------------------
 doc/docbook-text-style.xsl.cmake.in | 70 +++++++++++++++++++++++++++++++++++++
 doc/manpage-style.xsl               | 18 ----------
 doc/manpage-style.xsl.cmake.in      | 18 ++++++++++
 6 files changed, 128 insertions(+), 128 deletions(-)
 delete mode 100644 doc/docbook-html-style.xsl
 create mode 100644 doc/docbook-html-style.xsl.cmake.in
 delete mode 100644 doc/docbook-text-style.xsl
 create mode 100644 doc/docbook-text-style.xsl.cmake.in
 delete mode 100644 doc/manpage-style.xsl
 create mode 100644 doc/manpage-style.xsl.cmake.in

(limited to 'doc')

diff --git a/doc/docbook-html-style.xsl b/doc/docbook-html-style.xsl
deleted file mode 100644
index e4af9f557..000000000
--- a/doc/docbook-html-style.xsl
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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" />
-
-  <!-- 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">
-    <xsl:param name="node" select="."/>
-    <meta name="generator" content="DocBook {$DistroTitle} V{$VERSION}"/>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-  </xsl:template>
-
-  <xsl:template name="generate.html.title"/>
-
-  <xsl:template match="releaseinfo" mode="titlepage.mode">
-    <xsl:apply-imports/>
-    <hr/>
-  </xsl:template>
-
-  <xsl:param name="root.filename">index</xsl:param>
-
-  <!-- We do not want a title in HTML. -->
-  <xsl:param name="generate.meta.abstract" select="0"/>
-
-  <!-- We do not want the first subsection on the same page as content. -->
-  <xsl:param name="chunk.first.sections" select="0"/>
-  <xsl:param name="chunk.section.depth" select="0"/>
-  <xsl:param name="chunker.output.indent" select="'yes'"/>
-
-  <xsl:param name="use.id.as.filename" select="1"/>
-
-  <xsl:param name="toc.section.depth" select="1"/>
-  <xsl:param name="generate.section.toc.level" select="0"/>
-  <xsl:param name="section.label.includes.component.label" select="1"/>
-  <xsl:param name="section.autolabel" select="1"/>
-
-  <xsl:param name="generate.css.header" select="1"/>
-
-</xsl:stylesheet>
diff --git a/doc/docbook-html-style.xsl.cmake.in b/doc/docbook-html-style.xsl.cmake.in
new file mode 100644
index 000000000..9216d8e6e
--- /dev/null
+++ b/doc/docbook-html-style.xsl.cmake.in
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+
+  <!-- Import our base stylesheet -->
+  <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">
+    <xsl:param name="node" select="."/>
+    <meta name="generator" content="DocBook {$DistroTitle} V{$VERSION}"/>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+  </xsl:template>
+
+  <xsl:template name="generate.html.title"/>
+
+  <xsl:template match="releaseinfo" mode="titlepage.mode">
+    <xsl:apply-imports/>
+    <hr/>
+  </xsl:template>
+
+  <xsl:param name="root.filename">index</xsl:param>
+
+  <!-- We do not want a title in HTML. -->
+  <xsl:param name="generate.meta.abstract" select="0"/>
+
+  <!-- We do not want the first subsection on the same page as content. -->
+  <xsl:param name="chunk.first.sections" select="0"/>
+  <xsl:param name="chunk.section.depth" select="0"/>
+  <xsl:param name="chunker.output.indent" select="'yes'"/>
+
+  <xsl:param name="use.id.as.filename" select="1"/>
+
+  <xsl:param name="toc.section.depth" select="1"/>
+  <xsl:param name="generate.section.toc.level" select="0"/>
+  <xsl:param name="section.label.includes.component.label" select="1"/>
+  <xsl:param name="section.autolabel" select="1"/>
+
+  <xsl:param name="generate.css.header" select="1"/>
+
+</xsl:stylesheet>
diff --git a/doc/docbook-text-style.xsl b/doc/docbook-text-style.xsl
deleted file mode 100644
index 376dded52..000000000
--- a/doc/docbook-text-style.xsl
+++ /dev/null
@@ -1,70 +0,0 @@
-<?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" />
-
-  <!-- Parameters for optimal text output. -->
-  <xsl:param name="callout.graphics" select="0"/>
-  <xsl:param name="callout.unicode" select="0"/>
-  <xsl:param name="section.autolabel" select="1"/>
-  <xsl:param name="section.label.includes.component.label" select="1"/>
-
-  <!-- Centering and aligning title elements. -->
-  <xsl:template match="/*/title[position()=1]" mode="titlepage.mode">
-    <br/>
-    <center>
-      <xsl:apply-imports/>
-    </center>
-    <br/>
-    <hr/> <!-- No underline, but at least something. -->
-  </xsl:template>
-  <xsl:template match="author|editor" mode="titlepage.mode">
-    <center>
-      <xsl:apply-imports/>
-    </center>
-  </xsl:template>
-
-  <xsl:template match="releaseinfo" mode="titlepage.mode">
-    <center>
-      <xsl:apply-imports/>
-    </center>
-    <hr/>
-  </xsl:template>
-
-  <!-- Dirty hack to get a left margin for paragraphs etc. -->
-  <xsl:template match="legalnotice/*
-        |chapter/*[not(name(.)='section') and not(name(.)='title')]
-        |section/*[not(name(.)='section') and not(name(.)='title')]
-        |appendix/*[not(name(.)='section') and not(name(.)='title')]
-        |footnote/*">
-    <xsl:copy><table><tr><td>&#xa0;&#xa0;&#xa0;</td><td>
-    <xsl:apply-imports/>
-    </td></tr></table></xsl:copy>
-  </xsl:template>
-
-  <!-- Skip URLs if it has something to print. -->
-  <xsl:template match="ulink[.!='']">
-    <xsl:copy-of select="."/>
-  </xsl:template>
-  <!-- Print URLs if nothing to print. -->
-  <xsl:template match="ulink[.='']">
-    <xsl:value-of select="@url"/>
-  </xsl:template>
-
-  <!-- Make clear where notes etc. begin and end. -->
-  <xsl:template match="caution|important|note|tip|warning">
-    <table width="80%" border="1">
-      <colgroup>
-        <col align="justify"/>
-      </colgroup>
-      <tbody>
-        <tr>
-          <td align="justify">
-            <xsl:apply-imports/>
-          </td>
-        </tr>
-      </tbody>
-    </table>
-  </xsl:template>
-
-</xsl:stylesheet>
diff --git a/doc/docbook-text-style.xsl.cmake.in b/doc/docbook-text-style.xsl.cmake.in
new file mode 100644
index 000000000..36af1bcb2
--- /dev/null
+++ b/doc/docbook-text-style.xsl.cmake.in
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+
+  <xsl:import href="@DOCBOOK_XSL@/xhtml-1_1/docbook.xsl" />
+
+  <!-- Parameters for optimal text output. -->
+  <xsl:param name="callout.graphics" select="0"/>
+  <xsl:param name="callout.unicode" select="0"/>
+  <xsl:param name="section.autolabel" select="1"/>
+  <xsl:param name="section.label.includes.component.label" select="1"/>
+
+  <!-- Centering and aligning title elements. -->
+  <xsl:template match="/*/title[position()=1]" mode="titlepage.mode">
+    <br/>
+    <center>
+      <xsl:apply-imports/>
+    </center>
+    <br/>
+    <hr/> <!-- No underline, but at least something. -->
+  </xsl:template>
+  <xsl:template match="author|editor" mode="titlepage.mode">
+    <center>
+      <xsl:apply-imports/>
+    </center>
+  </xsl:template>
+
+  <xsl:template match="releaseinfo" mode="titlepage.mode">
+    <center>
+      <xsl:apply-imports/>
+    </center>
+    <hr/>
+  </xsl:template>
+
+  <!-- Dirty hack to get a left margin for paragraphs etc. -->
+  <xsl:template match="legalnotice/*
+        |chapter/*[not(name(.)='section') and not(name(.)='title')]
+        |section/*[not(name(.)='section') and not(name(.)='title')]
+        |appendix/*[not(name(.)='section') and not(name(.)='title')]
+        |footnote/*">
+    <xsl:copy><table><tr><td>&#xa0;&#xa0;&#xa0;</td><td>
+    <xsl:apply-imports/>
+    </td></tr></table></xsl:copy>
+  </xsl:template>
+
+  <!-- Skip URLs if it has something to print. -->
+  <xsl:template match="ulink[.!='']">
+    <xsl:copy-of select="."/>
+  </xsl:template>
+  <!-- Print URLs if nothing to print. -->
+  <xsl:template match="ulink[.='']">
+    <xsl:value-of select="@url"/>
+  </xsl:template>
+
+  <!-- Make clear where notes etc. begin and end. -->
+  <xsl:template match="caution|important|note|tip|warning">
+    <table width="80%" border="1">
+      <colgroup>
+        <col align="justify"/>
+      </colgroup>
+      <tbody>
+        <tr>
+          <td align="justify">
+            <xsl:apply-imports/>
+          </td>
+        </tr>
+      </tbody>
+    </table>
+  </xsl:template>
+
+</xsl:stylesheet>
diff --git a/doc/manpage-style.xsl b/doc/manpage-style.xsl
deleted file mode 100644
index a780bad13..000000000
--- a/doc/manpage-style.xsl
+++ /dev/null
@@ -1,18 +0,0 @@
-<xsl:stylesheet
- 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:param name="man.output.encoding" select="'UTF-8'" />
-
-<xsl:template match="email">&lt;<xsl:apply-templates/>&gt;</xsl:template>
-
-<xsl:template match="date">
-	<xsl:call-template name="datetime.format">
-		<xsl:with-param name="date" select="."/>
-		<xsl:with-param name="format" select="'d B Y'"/>
-	</xsl:call-template>
-</xsl:template>
-
-</xsl:stylesheet>
diff --git a/doc/manpage-style.xsl.cmake.in b/doc/manpage-style.xsl.cmake.in
new file mode 100644
index 000000000..53d6780cb
--- /dev/null
+++ b/doc/manpage-style.xsl.cmake.in
@@ -0,0 +1,18 @@
+<xsl:stylesheet
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version="1.0">
+
+<xsl:import href="@DOCBOOK_XSL@/manpages/docbook.xsl" />
+
+<xsl:param name="man.output.encoding" select="'UTF-8'" />
+
+<xsl:template match="email">&lt;<xsl:apply-templates/>&gt;</xsl:template>
+
+<xsl:template match="date">
+	<xsl:call-template name="datetime.format">
+		<xsl:with-param name="date" select="."/>
+		<xsl:with-param name="format" select="'d B Y'"/>
+	</xsl:call-template>
+</xsl:template>
+
+</xsl:stylesheet>
-- 
cgit v1.2.3


From 75d238ba66576c04f257e9d7c0a6995721f1441d Mon Sep 17 00:00:00 2001
From: Julian Andres Klode <jak@debian.org>
Date: Fri, 26 Aug 2016 16:14:13 +0200
Subject: Accept --autoremove as alias for --auto-remove

I probably missed that when I did the usability work. But better
late than never.
---
 doc/apt-get.8.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'doc')

diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml
index 4c34b298b..56ce08165 100644
--- a/doc/apt-get.8.xml
+++ b/doc/apt-get.8.xml
@@ -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>.
-- 
cgit v1.2.3


From 30749ef1edb33a91401bd7e4da7a4474e7bc2f6a Mon Sep 17 00:00:00 2001
From: Julian Andres Klode <jak@debian.org>
Date: Mon, 29 Aug 2016 15:09:05 +0200
Subject: Switch documentation from httpredir.d.o to deb.d.o

The CDN service deb.d.o is more reliable than the http
redirector, so switch to it for our examples.
---
 doc/po/apt-doc.pot     | 22 +++++++++++-----------
 doc/po/de.po           | 22 +++++++++++-----------
 doc/po/es.po           | 22 +++++++++++-----------
 doc/po/fr.po           | 22 +++++++++++-----------
 doc/po/it.po           | 44 ++++++++++++++++++++++----------------------
 doc/po/ja.po           | 44 ++++++++++++++++++++++----------------------
 doc/po/nl.po           | 44 ++++++++++++++++++++++----------------------
 doc/po/pl.po           | 22 +++++++++++-----------
 doc/po/pt.po           | 22 +++++++++++-----------
 doc/po/pt_BR.po        | 22 +++++++++++-----------
 doc/sources.list.5.xml | 22 +++++++++++-----------
 11 files changed, 154 insertions(+), 154 deletions(-)

(limited to 'doc')

diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot
index fa084c504..02a1c3895 100644
--- a/doc/po/apt-doc.pot
+++ b/doc/po/apt-doc.pot
@@ -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 3284f8199..94f795cad 100644
--- a/doc/po/de.po
+++ b/doc/po/de.po
@@ -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 0c1b02e27..3f934437a 100644
--- a/doc/po/es.po
+++ b/doc/po/es.po
@@ -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 f53d1a73a..e4092bec3 100644
--- a/doc/po/fr.po
+++ b/doc/po/fr.po
@@ -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 7cdca80a4..3f8d6467f 100644
--- a/doc/po/it.po
+++ b/doc/po/it.po
@@ -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 0a8e54720..e1c1faf36 100644
--- a/doc/po/ja.po
+++ b/doc/po/ja.po
@@ -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 23ee68f2b..5fa0bc924 100644
--- a/doc/po/nl.po
+++ b/doc/po/nl.po
@@ -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 a5f1c3f3b..1bc70dfc1 100644
--- a/doc/po/pl.po
+++ b/doc/po/pl.po
@@ -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 35a004286..05e9ae7d2 100644
--- a/doc/po/pt.po
+++ b/doc/po/pt.po
@@ -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 9d3ea426b..7d74de4b8 100644
--- a/doc/po/pt_BR.po
+++ b/doc/po/pt_BR.po
@@ -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..9b52a8b9e 100644
--- a/doc/sources.list.5.xml
+++ b/doc/sources.list.5.xml
@@ -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>
-- 
cgit v1.2.3


From 317bb39f3cd6626c74f25d7bdf2907f1b235f553 Mon Sep 17 00:00:00 2001
From: Julian Andres Klode <jak@debian.org>
Date: Tue, 30 Aug 2016 22:20:55 +0200
Subject: Release 1.3~rc3

---
 doc/apt-cache.8.xml    | 2 +-
 doc/apt-get.8.xml      | 2 +-
 doc/apt-verbatim.ent   | 2 +-
 doc/apt.conf.5.xml     | 2 +-
 doc/po/apt-doc.pot     | 4 ++--
 doc/po/de.po           | 2 +-
 doc/po/es.po           | 2 +-
 doc/po/fr.po           | 2 +-
 doc/po/it.po           | 2 +-
 doc/po/ja.po           | 2 +-
 doc/po/nl.po           | 2 +-
 doc/po/pl.po           | 2 +-
 doc/po/pt.po           | 2 +-
 doc/po/pt_BR.po        | 2 +-
 doc/sources.list.5.xml | 2 +-
 15 files changed, 16 insertions(+), 16 deletions(-)

(limited to 'doc')

diff --git a/doc/apt-cache.8.xml b/doc/apt-cache.8.xml
index b8c6aa989..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-16T00: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 56ce08165..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-16T00:00:00Z</date>
+   <date>2016-08-26T00:00:00Z</date>
  </refentryinfo>
  
  <refmeta>
diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent
index 2ffb4f54d..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~rc2">
+<!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 13e248c0f..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-11T00:00:00Z</date>
+   <date>2016-08-17T00:00:00Z</date>
  </refentryinfo>
  
  <refmeta>
diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot
index 02a1c3895..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~rc2\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-17 23:47+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"
diff --git a/doc/po/de.po b/doc/po/de.po
index 94f795cad..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-17 23:47+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"
diff --git a/doc/po/es.po b/doc/po/es.po
index 3f934437a..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-17 23:47+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"
diff --git a/doc/po/fr.po b/doc/po/fr.po
index e4092bec3..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-17 23:47+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"
diff --git a/doc/po/it.po b/doc/po/it.po
index 3f8d6467f..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-17 23:47+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"
diff --git a/doc/po/ja.po b/doc/po/ja.po
index e1c1faf36..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-17 23:47+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"
diff --git a/doc/po/nl.po b/doc/po/nl.po
index 5fa0bc924..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-17 23:47+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"
diff --git a/doc/po/pl.po b/doc/po/pl.po
index 1bc70dfc1..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-17 23:47+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"
diff --git a/doc/po/pt.po b/doc/po/pt.po
index 05e9ae7d2..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-17 23:47+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"
diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po
index 7d74de4b8..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-17 23:47+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"
diff --git a/doc/sources.list.5.xml b/doc/sources.list.5.xml
index 9b52a8b9e..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>
-- 
cgit v1.2.3