Index: general/prog/mercurial.xml
===================================================================
--- general/prog/mercurial.xml	(revision c86d663425d0376bd0ff95fb4cb67a68dc85b76d)
+++ general/prog/mercurial.xml	(revision 3f2db3a638d9b8a14bcb7f076eccf68e4a92faa0)
@@ -7,8 +7,8 @@
   <!ENTITY mercurial-download-http "https://www.mercurial-scm.org/release/mercurial-&mercurial-version;.tar.gz">
   <!ENTITY mercurial-download-ftp  " ">
-  <!ENTITY mercurial-md5sum        "5d9b9515ba10c60de2a5ec10bee45807">
-  <!ENTITY mercurial-size          "7.8 MB">
-  <!ENTITY mercurial-buildsize     "77 MB (with docs, add 1.6 GB for tests)">
-  <!ENTITY mercurial-time          "0.3 SBU (with docs, add 18 SBU for tests using -j4)">
+  <!ENTITY mercurial-md5sum        "3d16503218c720fb017a19c9bad4f97d">
+  <!ENTITY mercurial-size          "7.7 MB">
+  <!ENTITY mercurial-buildsize     "79 MB (with docs, add 1.9 GB for tests)">
+  <!ENTITY mercurial-time          "0.3 SBU (with docs, add 23 SBU for tests using -j4)">
 ]>
 
@@ -16,7 +16,4 @@
   <?dbhtml filename="mercurial.html"?>
 
-  <sect1info>
-    <date>$Date$</date>
-  </sect1info>
 
   <title>Mercurial-&mercurial-version;</title>
@@ -37,5 +34,5 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs112_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -74,11 +71,4 @@
 
     <bridgehead renderas="sect3">Mercurial Dependencies</bridgehead>
-
-    <!--
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="python2"/>
-    </para>
-    -->
 
     <bridgehead renderas="sect4">Optional</bridgehead>
@@ -91,8 +81,8 @@
       (runtime, to access ssh://... repositories),
     <xref linkend="pygments"/>,
-    <xref linkend="rust"/>,
+    <xref linkend="rust"/> (see <filename>rust/README.rst</filename> and <filename>rust/rhg/README.md</filename>),
     <xref linkend="subversion"/> (with Python bindings),
     <ulink url="https://launchpad.net/bzr">Bazaar</ulink>,
-    <ulink url="http://www.nongnu.org/cvs/">CVS</ulink>,
+    <ulink url="https://www.nongnu.org/cvs/">CVS</ulink>,
     <ulink url="https://pypi.python.org/pypi/pyflakes">pyflakes</ulink>,
     <ulink url="https://www.pyopenssl.org/en/stable/">pyOpenSSL</ulink>, and
@@ -111,10 +101,4 @@
 
     <para>
-      First, force the build system to use Python 3:
-    </para>
-
-<screen><userinput remap="pre">export PYTHON=python3</userinput></screen>
-
-    <para>
       Build <application>Mercurial</application> by issuing the following
       command:
@@ -130,5 +114,5 @@
 
     <para>
-      To run the test suite, issue (15 tests are known to fail):
+      To run the test suite, issue:
     </para>
 <screen remap="test"><userinput>TESTFLAGS="-j<replaceable>&lt;N&gt;</replaceable> --tmpdir tmp --blacklist blacklists/fsmonitor --blacklist blacklists/linux-vfat" make check</userinput></screen>
@@ -138,5 +122,13 @@
     <para>
       where <replaceable>&lt;N&gt;</replaceable> is an integer between one
-      and the number of ( processor X threads ), inclusive.  In order to
+      and the number of ( processor X threads ), inclusive. Several tests
+      (about 20) fail because some error messages have changed in Python, or
+      some deprecation warnings are printed, that were not present when the
+      test was designed.
+      <!--
+      # Ran 908 tests, 65 skipped, 4 failed.  real  10m37.422s -bdubbs 6 Sep 22.
+      # Ran 881 tests, 102 skipped, 23 failed. -plabs 17 Nov 22.
+      -->
+      In order to
       investigate any apparently failing tests, you may use the
       <command>run-tests.py</command> script. To see the almost forty switches,
@@ -152,17 +144,16 @@
 
     <para>
-      Normally, the previous failures will be confirmed. However, if
+      Normally, the previous failures will be reproducible. However, if
       you add the switch <option>--debug</option> before
-      <option>--tmpdir</option>, and run again, some failures are gone, which
-      seems to be a problem with the test suite. If this happens, normally,
-      from now on, there will be no more such failures whether you use the
-      debug switch or not.
-      There are 13 of 876 tests that are known to fail.
-    </para>
-
-    <para>
-      An interesting switch is <option>--time</option>, which will generate at
-      the end of the test suite execution, a table with all executed tests and
-      respective start, end, user, system and real times. Note that the
+      <option>--tmpdir</option>, and run the tests again, some failures may
+      disappear, which is a problem with the test suite. If this happens,
+      there will be no more of these failures even if you do not pass the
+      --debug switch again.
+    </para>
+
+    <para>
+      An interesting switch is <option>--time</option>, which will generate a
+      table of all the executed tests and their respective start, end, user,
+      system and real times once the tests are complete. Note that these
       switches may be used with <command>make check</command> by including
       them in the <envar>TESTFLAGS</envar> environment variable.
@@ -183,10 +174,4 @@
 <screen role="root"
         remap="doc"><userinput>make PREFIX=/usr install-doc</userinput></screen>
-
-    <para>
-      Next, clean up the environment variable set earlier:
-    </para>
-
-<screen><userinput>unset PYTHON</userinput></screen>
 
     <para>
@@ -246,7 +231,7 @@
         The great majority of extensions are disabled by default. Run
         <command>hg help extensions</command> if you need to enable any, e.g.
-        when investigating test failures. You will obtain the lists of enabled
-        and disabled extensions, and more information, such as how to enable
-        or disable them using configuration files.
+        when investigating test failures. This will output a list of enabled
+        and disabled extensions, as well as more information such as how to
+        enable or disable extensions using configuration files.
       </para>
 
@@ -284,6 +269,10 @@
         </seg>
         <seg>
-          /etc/mercurial and
-          /usr/lib/python&python3-majorver;/site-packages/{hgdemandimport,hgext,hgext3rd,mercurial}
+          /etc/mercurial,
+          /usr/lib/python&python3-majorver;/site-packages/hgdemandimport,
+          /usr/lib/python&python3-majorver;/site-packages/hgext,
+          /usr/lib/python&python3-majorver;/site-packages/hgext3rd,
+          /usr/lib/python&python3-majorver;/site-packages/mercurial, and
+          /usr/lib/python&python3-majorver;/site-packages/mercurial-&mercurial-version;-py&python3-majorver;.egg-info
         </seg>
       </seglistitem>
