Control: tags -1 patch Hi Adrian, all, On 23-03-2019 22:29, Paul Gevers wrote: > On Sat, 03 Jun 2017 17:14:18 +0300 Adrian Bunk <bunk@debian.org> wrote: >> "4.3.1. Adding APT Internet sources" is using mirrors >> instead of deb.debian.org which should be used by default >> (see section 2.2.5.). > > Do we recommend using deb.debian.org as the default in > /etc/apt/sources.list (I think so)? If so, is that documented somewhere? > > I think people that upgrade may have older entries and I think we should > suggest them to migrate, no? Where to find an authoritative answer? What do you think of the attached patch? Paul
From 92aa94112368b4fcc69218fcba3507b25d42af21 Mon Sep 17 00:00:00 2001
From: Paul Gevers <elbrus@debian.org>
Date: Sun, 24 Mar 2019 17:19:40 +0100
Subject: [PATCH] Recommend use of deb.debian.org instead of the mirrors
Closes: #864035
---
en/upgrading.dbk | 44 ++++++++++++++++++++++++++++++++------------
release-notes.ent | 1 -
2 files changed, 32 insertions(+), 13 deletions(-)
diff --git a/en/upgrading.dbk b/en/upgrading.dbk
index b779789f..f64458ca 100644
--- a/en/upgrading.dbk
+++ b/en/upgrading.dbk
@@ -476,14 +476,33 @@ $ apt-forktracer | sort
<section id="network">
<title>Adding APT Internet sources</title>
- <programlisting condition="fixme">
- TODO: [elbrus, 2019]: we now have deb.debian.org. This section could do with
- some minor updates regarding using that.
- </programlisting>
<para>
- The default configuration is set up for installation from the main Debian Internet
- servers, but you may wish to modify <filename>/etc/apt/sources.list</filename>
- to use other mirrors, preferably a mirror that is closest to you in network terms.
+ The default configuration is set up for installation from the &debian;
+ apt CDN service, so on new installations you should always be getting
+ packages from a server near you. As this is a relative new service, you
+ may have configuration that still points to one of the main &debian;
+ Internet servers or one of the mirrors. If you haven't done so yet, it is
+ recommended to switch over to the use of the CDN service in your apt
+ configuration.
+ </para>
+ <para>
+ To use the CDN service with <systemitem role="package">apt</systemitem>,
+ you add this line to your <filename>/etc/apt/sources.list</filename> file
+ (assuming you are using <literal>main</literal> and
+ <literal>contrib</literal>):
+ </para>
+ <programlisting>deb http://deb.debian.org/debian &releasename; main contrib</programlisting>
+ <para>
+ After adding your new sources, disable the previously existing
+ <quote><literal>deb</literal></quote> lines in
+ <filename>sources.list</filename> by placing a hash sign
+ (<literal>#</literal>) in front of them.
+ </para>
+ <para>
+ Normally using the CDN service provides you with the best performance,
+ however you may wish to modify <filename>sources.list</filename> to use
+ one of the mirrors, preferably a mirror that is closest to you in network
+ terms.
</para>
<para>
Debian mirror addresses can be found at <ulink
@@ -502,8 +521,10 @@ $ apt-forktracer | sort
&url-debian-mirror-eg;/debian/dists/&releasename;/contrib/binary-&architecture;/...
</programlisting>
<para>
- To use this mirror with <systemitem role="package">apt</systemitem>, you add this line to your
- <filename>sources.list</filename> file:
+ To use this mirror with <systemitem role="package">apt</systemitem>, you
+ add this line to your <filename>sources.list</filename> file (again,
+ assuming you are using <literal>main</literal> and
+ <literal>contrib</literal>):
</para>
<programlisting>deb &url-debian-mirror-eg;/debian &releasename; main contrib</programlisting>
<para>
@@ -511,9 +532,8 @@ $ apt-forktracer | sort
after the release name are used to expand the path into multiple directories.
</para>
<para>
- After adding your new sources, disable the previously existing
- <quote><literal>deb</literal></quote> lines in <filename>sources.list</filename> by placing a
- hash sign (<literal>#</literal>) in front of them.
+ Again, after adding your new sources, disable the previously existing
+ <quote><literal>deb</literal></quote> lines.
</para>
</section>
diff --git a/release-notes.ent b/release-notes.ent
index 6d350512..7cbb2bee 100644
--- a/release-notes.ent
+++ b/release-notes.ent
@@ -46,7 +46,6 @@ Remember, this is XML; the *first* definition of an ENTITY wins.
<!ENTITY url-debian-list-archives "https://lists.debian.org/";>
<!ENTITY url-debian-mirrors "https://www.debian.org/distrib/ftplist";>
<!-- an example mirror w/o trailing slash -->
-<!-- TODO: [elbrus, 2019] shouldn't we set this to deb.debian.org nowadays -->
<!ENTITY url-debian-mirror-eg "http://mirrors.kernel.org";>
<!ENTITY url-irc-host "http://www.oftc.net/";>
<!ENTITY debian-irc-server "irc.debian.org">
--
2.20.1
Attachment:
signature.asc
Description: OpenPGP digital signature