Index: general/prog/git.xml
===================================================================
--- general/prog/git.xml	(revision d396c65272c1d795eb9af21d47b72ebe2f8186ac)
+++ general/prog/git.xml	(revision 4f8ca948c8c0ed51217f41c288339712ec6ea9b2)
@@ -108,8 +108,6 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-      <xref linkend="curl"/> (needed to use <application>Git</application> over http,
-      https, ftp or ftps), and
-      <!-- <xref linkend="perl-error"/>, and -->
-      <xref linkend="python2"/>
+      <xref linkend="curl"/> (needed to use <application>Git</application> over
+      http, https, ftp or ftps)
     </para>
 
@@ -119,5 +117,7 @@
       linkend="pcre"/>), in either case configured with
       <literal>--enable-jit</literal>,
-      <xref linkend="subversion"/> with Perl bindings (for <command>git svn</command>),
+      <xref linkend="python2"/>,
+      <xref linkend="subversion"/> with Perl bindings (for <command>git
+         svn</command>),
       <xref role="runtime" linkend="tk"/>
       (gitk, a simple <application>Git</application>
@@ -264,6 +264,8 @@
 
     <para>
-      <option>--without-python</option>: Use this switch if
-      <application>Python</application> is not installed.
+      <option>--with-python=python3</option>: Use this switch to allow using
+      <application>Python 3</application>. <application>Python</application> is
+      only used for the <command>git p4</command> interface to Perforce
+      repositories.
     </para>
 
Index: general/prog/rust.xml
===================================================================
--- general/prog/rust.xml	(revision d396c65272c1d795eb9af21d47b72ebe2f8186ac)
+++ general/prog/rust.xml	(revision 4f8ca948c8c0ed51217f41c288339712ec6ea9b2)
@@ -110,5 +110,8 @@
       <para>
         Rustc defaults to building for ALL supported architectures, using a
-        shipped copy of LLVM. In BLFS the build is only for the X86 architecture.
+        shipped copy of LLVM. In BLFS the build is only for the X86
+        architecture. Rustc still claims to require Python 2, but that is only
+        really necessary when building some other architectures with the
+        shipped LLVM.
         If you intend to develop rust crates, this build may not be good
         enough for your purposes.
@@ -168,7 +171,6 @@
     <para role="required">
       <xref linkend="curl"/>,
-      <xref linkend="cmake"/>,
-      <xref linkend="libssh2"/>, and
-      <xref linkend="python2"/>
+      <xref linkend="cmake"/>, and
+      <xref linkend="libssh2"/>
     </para>
 
@@ -182,5 +184,8 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="gdb"/> (used by the testsuite if it is present)
+      <xref linkend="gdb"/> (used by the testsuite if it is present) and
+      <xref linkend="python2"/> (if gdb is present, it must have been built
+      with Python 2 support to prevent some tests failing. Furthermore, another
+      test fails if Python 2 is not present)
     </para>
 
@@ -269,5 +274,5 @@
 
 <screen><userinput>export RUSTFLAGS="$RUSTFLAGS -C link-args=-lffi" &amp;&amp;
-./x.py build --exclude src/tools/miri</userinput></screen>
+python3 ./x.py build --exclude src/tools/miri</userinput></screen>
 
     <note>
@@ -285,7 +290,7 @@
 
     <para>
-      To run the tests issue
-      <command>./x.py test --verbose --no-fail-fast | tee rustc-testlog</command>:
-      as with the build, that will use all available CPUs.
+      To run the tests issue <command>python3 ./x.py test --verbose
+      --no-fail-fast | tee rustc-testlog</command>: as with the build, that
+      will use all available CPUs.
     </para>
 
@@ -294,9 +299,11 @@
       <emphasis>will</emphasis> fail and the tests will be reported to end in
       error, with a backtrace of the last failing test. On a good run, 3 tests
-      which need Thumb (ARM) compilers will fail, all  in <filename
+      which need Thumb (ARM) compilers will fail, all in <filename
       class="directory">ui/issues</filename> for issues 37131, 49851 and 50993.
-      Occasionally a fourth test, 'run-make-fulldeps/sysroot-crates-are-unstable'
+      Occasionally a fourth test,
+      <filename>run-make-fulldeps/sysroot-crates-are-unstable</filename>
       fails. If gdb has been installed, in some circumstances three tests in
-      debuginfo-both also fail. As with all large testsuites, other tests might
+      <filename class="directory">debuginfo</filename> also fail. As with all
+      large testsuites, other tests might
       fail on some machines - if the number of failures is in the single digits,
       check the log for 'FAILED' and review lines above that. Any mention of
@@ -329,5 +336,5 @@
 
 <screen><userinput>export LIBSSH2_SYS_USE_PKG_CONFIG=1 &amp;&amp;
-DESTDIR=${PWD}/install ./x.py install &amp;&amp;
+DESTDIR=${PWD}/install python3 ./x.py install &amp;&amp;
 unset LIBSSH2_SYS_USE_PKG_CONFIG</userinput></screen>
 
@@ -420,6 +427,6 @@
 
     <para>
-      <command>DESTDIR=${PWD}/install ./x.py install</command>: This effects a
-      DESTDIR-style install in the source tree,creating an <filename
+      <command>DESTDIR=${PWD}/install python3 ./x.py install</command>: This
+      effects a DESTDIR-style install in the source tree,creating an <filename
       class="directory">install</filename> directory. Note that DESTDIR installs
       need an absolute path, passing 'install' will not work.
