Major updates to the jigdo and mirroring pages

* Update the jigdo homepage link
* jigdo is not necessarily the future of downloads, so don't pretend
* Mention CD/DVD rather than just CD
* Clarify better about jigdo-lite/jigdo-file
* Remove dead text about old unofficial images
* Only mention sha256 and sha512 checksums
* Massive updates to the mirroring section, it was very outdated

Closes: #945248

2 files changed, 79 insertions, 119 deletions

diff --git a/english/CD/jigdo-cd/index.wml b/english/CD/jigdo-cd/index.wml
index 5d2c99a3730..e6df2be300b 100644
--- a/english/CD/jigdo-cd/index.wml
+++ b/english/CD/jigdo-cd/index.wml
@@ -5,47 +5,50 @@
 #include "$(ENGLISHDIR)/releases/images.data"
 #include "$(ENGLISHDIR)/devel/debian-installer/images.data"
 
-<p>Jigsaw Download, or short <a href="http://atterer.org/jigdo/">jigdo</a>,
-is intended to be the main way of distributing Debian CD images in the
-future. Currently, the system works, but is not yet very comfortable to use
-because the download manager application is not finished.</p>
+<p>Jigsaw Download, or short <a
+href="https://www.einval.com/~steve/software/jigdo/">jigdo</a>, is a
+bandwidth-friendly way of distributing Debian CD/DVD images.</p>
 
 <toc-display/>
 
-<toc-add-entry name="why">Why jigdo is better than a direct download</toc-add-entry>
+<toc-add-entry name="why">Why jigdo is better than a direct
+download</toc-add-entry>
 
-<p>Because it
-is faster! For various reasons, there are far fewer mirrors for CD images
-than there are for the "normal" Debian archive. Consequently, if you
-download from a CD image mirror, that mirror will not only be further away
-from you, it will also be overloaded, especially just after a release.</p>
+<p>Because it is faster! For various reasons, there are far fewer
+mirrors for CD/DVD images than there are for the "normal" Debian
+archive. Consequently, if you download from a CD image mirror, that
+mirror will not only be further away from you, it will also be
+overloaded, especially just after a release.</p>
 
 <p>Furthermore, some types of images are not available as full
 <tt>.iso</tt> downloads because there is not enough space on our
 servers to host them.</p>
 
-<p>Of course, a "normal" Debian mirror does not carry any CD images, so how
-can jigdo download them there? jigdo achieves this by downloading
-individually all the files that are on the CD. In the next step, all these
-files are assembled in one big file which
-is an exact copy of the CD image. However, all this happens
-behind the scenes - all that <em>you</em> need to do is tell the download
-tool the location of a "<tt>.jigdo</tt>" file to process.</p>
+<p>Of course, a "normal" Debian mirror does not carry any CD/DVD
+images, so how can jigdo download them there? jigdo achieves this by
+downloading individually all the files that are on the CD/DVD. In the
+next step, all these files are assembled in one big file which is an
+exact copy of the CD/DVD image. However, all this happens behind the
+scenes - all that <em>you</em> need to do is tell the download tool
+the location of a "<tt>.jigdo</tt>" file to process.</p>
 
-<p>More information is available from the
-<a href="http://atterer.org/jigdo/">jigdo homepage</a>. 
-Volunteers willing to help with jigdo development are always welcome!</p>
+<p>More information is available from the <a
+href="https://www.einval.com/~steve/software/jigdo/">jigdo
+homepage</a>.  Volunteers willing to help with jigdo development are
+always welcome!</p>
 
 <toc-add-entry name="how">How to download an image with jigdo</toc-add-entry>
 
 <ul>
 
-  <li>Download a package containing <tt>jigdo-lite</tt>, which is
-  available for GNU/Linux, Windows and Solaris from the
-  <a href="http://atterer.org/jigdo/">jigdo homepage</a>. For FreeBSD,
-  install from /usr/ports/net-p2p/jigdo or grab the package with <tt>pkg_add
-  -r jigdo</tt>.
-  </li>
+  <li>Download a package containing <tt>jigdo-lite</tt>. This is
+  available directly for installation in the Debian and Ubuntu
+  distributions in the <tt>jigdo-file</tt> package. For FreeBSD,
+  install from /usr/ports/net-p2p/jigdo or grab the package
+  with <tt>pkg_add -r jigdo</tt>. For other installation options
+  (binaries for Windows, source), check the
+  the <a href="https://www.einval.com/~steve/software/jigdo/">jigdo
+  homepage</a>. </li>
 
   <li>Run the <tt>jigdo-lite</tt> script. It will ask for the URL
   of a "<tt>.jigdo</tt>" file to process. (You can also supply
@@ -74,14 +77,14 @@ Volunteers willing to help with jigdo development are always welcome!</p>
 </ul>
 
 <p>For a detailed, step-by-step description of this process, have a
-look at the <a href="http://www.tldp.org/HOWTO/Debian-Jigdo/">Debian jigdo
-mini-HOWTO</a>. The HOWTO also explains jigdo's advanced features,
-such as upgrading an older version of a CD image to the current
-version (by downloading only what has changed, not the entire new
-image).</p>
-
-<p>Once you have downloaded the images and written them to CD, be sure
-to have a look at the <a
+look at the <a href="http://www.tldp.org/HOWTO/Debian-Jigdo/">Debian
+jigdo mini-HOWTO</a>. The HOWTO also explains jigdo's advanced
+features, such as upgrading an older version of a CD/DVD image to the
+current version (by downloading only what has changed, not the entire
+new image).</p>
+
+<p>Once you have downloaded the images and written them to CD/DCD, be
+sure to have a look at the <a
 href="$(HOME)/releases/stable/installmanual">detailed information
 about the installation process</a>.</p>
 
@@ -133,45 +136,6 @@ walkthrough of the installation process. Other useful documentation includes:
 </div>
 </div>
 
-<comment>
-<toc-add-entry name="unofficial">Unofficial images</toc-add-entry>
-
-<p>These images are not built and offered by Debian, but by <a
-href="http://www.fsn.hu/">fsn://HU</a>:</p>
-
-<ul>
-
-  <li>fsn://HU jigdo files for the <a
-  href="ftp://ftp.fsn.hu/pub/CDROM-Images/debian-unofficial/etch/jigdo/">\
-  "testing" distribution</a> on CD (<em>amd64 and i386, regenerated
-  weekly</em>), <a
-  href="ftp://ftp.fsn.hu/pub/CDROM-Images/debian-unofficial/MIRRORS">\
-  mirrors</a></li>
-
-  <li>fsn://HU jigdo files for the <a
-  href="ftp://ftp.fsn.hu/pub/CDROM-Images/debian-unofficial/etch-dvd/jigdo/">\
-  "testing" distribution</a> on DVD (<em>amd64 and i386, regenerated
-  weekly</em>), <a
-  href="ftp://ftp.fsn.hu/pub/CDROM-Images/debian-unofficial/MIRRORS">\
-  mirrors</a></li>
-
-  <li>fsn://HU jigdo files for the <a
-  href="ftp://ftp.fsn.hu/pub/CDROM-Images/debian-unofficial/sid/jigdo/">\
-  "unstable" distribution</a> on CD (<em>amd64 and i386, regenerated
-  weekly</em>), <a
-  href="ftp://ftp.fsn.hu/pub/CDROM-Images/debian-unofficial/MIRRORS">\
-  mirrors</a></li>
-
-  <li>fsn://HU jigdo files for the <a
-  href="ftp://ftp.fsn.hu/pub/CDROM-Images/debian-unofficial/sid-dvd/jigdo/">\
-  "unstable" distribution</a> on DVD (<em>amd64 and i386, regenerated
-  weekly</em>), <a
-  href="ftp://ftp.fsn.hu/pub/CDROM-Images/debian-unofficial/MIRRORS">\
-  mirrors</a></li>
-
-</ul>
-</comment>
-
 <hr />
 
 <toc-add-entry name="search">Search Contents of CD images</toc-add-entry>
diff --git a/english/CD/mirroring/index.wml b/english/CD/mirroring/index.wml
index 5e96bb66af3..1d71f2dc8f6 100644
--- a/english/CD/mirroring/index.wml
+++ b/english/CD/mirroring/index.wml
@@ -5,11 +5,11 @@
 Unix-like machine with a permanent, reliable connection to the
 Internet. Debian CD mirrors hold <tt>.iso</tt> images for CDs and DVDs
 of various sizes, files for <a
-href="http://atterer.org/jigdo/">jigdo</a> (<tt>.jigdo</tt> and
+href="https://www.einval.com/~steve/software/jigdo/">jigdo</a> (<tt>.jigdo</tt> and
 <tt>.template</tt>), <a
 href="https://en.wikipedia.org/wiki/BitTorrent">BitTorrent</a> files
 (<tt>.torrent</tt>) and verification files for the images
-(<tt>SHA256SUMS*</tt>, <tt>SHA512SUMS*</tt> and other).</p>
+(<tt>SHA512SUMS*</tt> and <tt>SHA256SUMS*</tt>).</p>
 
 <toc-display/>
 
@@ -68,20 +68,6 @@ files.</p>
 
   </li>
 
-<!--
-  <li>Beta/unstable/testing images:<br>
-
-    <a href="https://cdimage.debian.org/pub/cdimage-testing/"
-    ><tt>https://cdimage.debian.org/pub/cdimage-testing/</tt></a><br>
-
-    <a href="ftp://cdimage.debian.org/pub/cdimage-testing/"
-    ><tt>ftp://cdimage.debian.org/pub/cdimage-testing/</tt></a><br>
-
-    <tt>rsync://cdimage.debian.org/cdimage-testing/</tt>
-
-  </li>
--->
-
 </ul>
 #______________________________________________________________________
 
@@ -124,7 +110,7 @@ really obligatory.</p>
 discouraged</toc-add-entry>
 
 <p>Recent versions of the <a
-href="http://atterer.org/jigdo/"><kbd>jigdo-lite</kbd></a> program
+href="https://www.einval.com/~steve/software/jigdo/"><kbd>jigdo-lite</kbd></a> program
 support batch downloading of multiple images. However, we do not
 recommend to use <kbd>jigdo-lite</kbd> to create Debian CD mirrors -
 use <kbd>jigdo-mirror</kbd> instead.</p>
@@ -134,25 +120,26 @@ use <kbd>jigdo-mirror</kbd> instead.</p>
 recommended</toc-add-entry>
 
 <p>Actually, this means: Mirror the <tt>.iso</tt> files using <a
-href="http://atterer.org/jigdo/"><kbd>jigdo-mirror</kbd></a>, then (if
+href="https://www.einval.com/~steve/software/jigdo/"><kbd>jigdo-mirror</kbd></a>, then (if
 you also want to mirror other types of files, e.g. <tt>.jigdo</tt> and
 <tt>.template</tt> files) run rsync over the directory to fetch the
 rest. The scripts on <a
 href="http://www.acc.umu.se/~maswan/debian-push/cdimage/">this
 page</a> might help when setting this up.</p>
 
-<p>A lot of people maintain "regular" Debian mirrors (<kbd>debian/</kbd>),
-or just have such a mirror nearby. This means that they already have the
-<tt>.deb</tt>s that are included in the CD images. The obvious
-question is -- why can't we use those same files in the CD images?</p>
+<p>A lot of people maintain "regular" Debian mirrors
+(<kbd>debian/</kbd>), or just have such a mirror nearby. This means
+that they already have the <tt>.deb</tt>s that are included in the
+CD/DVD images. The obvious question is -- why can't we use those same
+files in the CD/DVD images?</p>
 
 <p><kbd>jigdo-mirror</kbd> is a program that enables one to generate a
-Debian CD images using the files from a "normal" mirror, plus a few extra
-jigdo template files.</p>
+set of Debian CD/DVD images using the files from a "normal" mirror,
+plus a few extra jigdo template files.</p>
  
-<p>First off, you need the jigdo template files. See
-<a href="../jigdo-cd">the jigdo information page</a> for links.
-Fetch the files for each architecture you wish to build images for.</p>
+<p>Firstly, you need the jigdo template files. See <a
+href="../jigdo-cd">the jigdo information page</a> for links. Fetch the
+files for each architecture you wish to build images for.</p>
 
 <p>Create <kbd>~/.jigdo-mirror</kbd> file to configure the program.
 This is an example:</p>
@@ -236,9 +223,9 @@ included.</p>
   The full set of i386 images may still take too much space for you if
   it includes DVD and dual-layer DVD images. This excludes all
   <tt>.iso</tt> images except for the net-install images and the first
-  three i386 CDs.</li>
+  three i386 DVDs.</li>
 
-  <li><strong>Exclude all architectures except i386:</strong>
+  <li><strong>Exclude multiple architectures except i386:</strong>
   <kbd>--exclude=alpha/ --exclude=arm/ --exclude=hppa/ --exclude=hurd/
   --exclude=ia64/ --exclude=m68k/ --exclude=mips/ --exclude=mipsel/
   --exclude=powerpc/ --exclude=s390/ --exclude=sh/
@@ -246,7 +233,10 @@ included.</p>
 
   Only include the full set of files for i386, do not include any
   <tt>.jigdo</tt>, <tt>.iso</tt> etc files whatsoever for the other
-  architectures.</li>
+  architectures.<br>
+
+  <strong>Check the architecture list before mirroring - the list
+  changes and these examples may be out of date!</strong></li>
 
 </ul>
 #______________________________________________________________________
@@ -261,24 +251,30 @@ mirror:</p>
 <ul>
 
   <li><strong><tt>*-netinst.iso</tt></strong>: One image for each
-  architecture, up to 300&nbsp;MB</li>
+  architecture, up to 500&nbsp;MB</li>
 
   <li><strong><tt>*-dvd.iso</tt></strong> (single-layer DVDs):
-  Multiple images for i386 only, each up to 4482&nbsp;MB large. For
-  sarge, the accumulated size of the i386 images is about
-  9000&nbsp;MB.</li>
-
-  <li><strong><tt>*-dldvd.iso</tt></strong> (dual-layer DVDs): As
-  above, except that individual images are up to 8106&nbsp;MB
-  large. For sarge, no <tt>.iso</tt> images are available, only jigdo
-  files.</li>
-
-  <li><strong><tt>*.iso</tt></strong>: All remaining <tt>.iso</tt>
-  files which do not match one of the above patterns are CD
-  images. There are multiple images for each architecture, each up to
-  650&nbsp;MB large. The accumulated size of all images and
-  architectures equals the <a href="/mirror/size">size of a full
-  Debian mirror</a> (100&nbsp;GB as of this writing).</li>
+  Multiple images, each up to 4482&nbsp;MB large. For buster, there
+  are up to <strong>16</strong> DVD images per architecture. Debian
+  servers provide only a small subset of DVD images in .iso form for
+  direct download: 3 for amd64, 3 for i386 and 1 each for other
+  architectures. The remaining images are only provided in jigdo
+  form.</li>
+
+  <li><strong><tt>*-bd.iso</tt></strong> (single-layer Blu-Rays): As
+  above, except that individual images are up to 23&nbsp;GB in
+  size. These images are only available as jigdo files for a limited
+  set of architectures (amd64 and i386) and source.</li>
+
+  <li><strong><tt>*-dlbd.iso</tt></strong> (dual-layer Blu-Rays): As
+  above, except that individual images are up to 48&nbsp;GB in
+  size. These images are only available as jigdo files for a limited
+  set of architectures (amd64 and i386) and source.</li>
+
+  <li><strong><tt>*-STICK16GB*.iso</tt></strong> (16GB USB images): As
+  above, except that individual images are up to 16&nbsp;GB in
+  size. These images are only available as jigdo files for a limited
+  set of architectures (amd64 and i386).</li>
 
 </ul>
 #______________________________________________________________________