Post by Paul GeversPost by Paul GeversDo 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?
It needs a couple of trivial language fixes, but it also runs into
bug #864017. Oh - okay, while I was writing this you've commented
on that one, so I'll reply separately on that topic.
I would also suggest that we should reserve markup like <systemitem
role="package">apt</systemitem> for cases where we actually mean the
package "apt", as opposed to the package-management infrastructure in
general (aka "APT").
Post by Paul Geversdiff --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
^ly
Slightly confusing use of "installation" in two different senses.
On new installations the default is for APT to be set up to use the
&debian; APT CDN service, which should ensure that packages are
automatically downloaded from a server near you in network terms. As
this is a relatively new service, older installations
Post by Paul Gevers+ 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>,
^^^^^^^
Post by Paul Gevers+ you add this line to your <filename>/etc/apt/sources.list</filename> file
^^^
Post by Paul Gevers+ (assuming you are using <literal>main</literal> and
+ </para>
I would recommend just:
<para>
To make use of the CDN service, add a line like this to your APT source
configuration (assuming you are using <literal>main</literal> and
<literal>contrib</literal>):
</para>
Post by Paul Gevers+ <programlisting>deb http://deb.debian.org/debian &releasename; main contrib</programlisting>
(Yet another interacting change: we want people to start using HTTPS!
But it's much simpler to recommend that as a *post*-upgrade change.)
Post by Paul Gevers+ <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.
If they've already got the right file open, there's no need to repeat
what might be a confusing filename.
After adding your new sources, disable the previously existing
<quote><literal>deb</literal></quote> lines by placing a hash sign
(<literal>#</literal>) in front of them.
Post by Paul Gevers+ </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.
The advantages normally expected from deb.debian.org are something
that should be explained above, not here - what we should be giving
here is some hint at the circumstances that might lead a user to pick
the non-default option.
<para>
However, if you get better results using a specific mirror that is
close to you in network terms, this option is still available.
</para>
Post by Paul Gevers</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
+ To use this mirror with <systemitem role="package">apt</systemitem>, you
+ add this line to your <filename>sources.list</filename> file (again,
To configure APT to use a given mirror, add a line like this (again,
Post by Paul Gevers+ assuming you are using <literal>main</literal> and
</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>
--
JBR with qualifications in linguistics, experience as a Debian
sysadmin, and probably no clue about this particular package