From: Miss Skeleton (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Thu, 22 Oct 2020 23:42:01 +0000 (-0700)
Subject: [3.8] bpo-38486: Fix dead qmail links in the mailbox docs (GH-22239) (GH-22902)
X-Git-Tag: v3.8.7rc1~75
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cd894b1094ac472ceb98fe15a28ebeb8301fc079;p=thirdparty%2FPython%2Fcpython.git

[3.8] bpo-38486: Fix dead qmail links in the mailbox docs (GH-22239) (GH-22902)



(cherry picked from commit ec388cfb4ede56dace2bb78851ff6f38fa2a6abe)


Co-authored-by: Zackery Spytz <zspytz@gmail.com>

Automerge-Triggered-By: GH:warsaw
---

diff --git a/Doc/library/mailbox.rst b/Doc/library/mailbox.rst
index f82a3b200deb..94d95d10290b 100644
--- a/Doc/library/mailbox.rst
+++ b/Doc/library/mailbox.rst
@@ -426,17 +426,14 @@ Supported mailbox formats are Maildir, mbox, MH, Babyl, and MMDF.
 
 .. seealso::
 
-   `maildir man page from qmail <http://www.qmail.org/man/man5/maildir.html>`_
-      The original specification of the format.
+   `maildir man page from Courier <http://www.courier-mta.org/maildir.html>`_
+      A specification of the format. Describes a common extension for
+      supporting folders.
 
    `Using maildir format <https://cr.yp.to/proto/maildir.html>`_
       Notes on Maildir by its inventor. Includes an updated name-creation scheme and
       details on "info" semantics.
 
-   `maildir man page from Courier <http://www.courier-mta.org/maildir.html>`_
-      Another specification of the format. Describes a common extension for supporting
-      folders.
-
 
 .. _mailbox-mbox:
 
@@ -485,11 +482,8 @@ Supported mailbox formats are Maildir, mbox, MH, Babyl, and MMDF.
 
 .. seealso::
 
-   `mbox man page from qmail <http://www.qmail.org/man/man5/mbox.html>`_
-      A specification of the format and its variations.
-
    `mbox man page from tin <http://www.tin.org/bin/man.cgi?section=5&topic=mbox>`_
-      Another specification of the format, with details on locking.
+      A specification of the format, with details on locking.
 
    `Configuring Netscape Mail on Unix: Why The Content-Length Format is Bad <https://www.jwz.org/doc/content-length.html>`_
       An argument for using the original mbox format rather than a variation.