Automatic merge of trunk into multilib

chapter01/changelog.xml

@@ -45,6 +45,16 @@
     appropriate for the entry or if needed the entire day's listitem.
     -->
 
+    <listitem>
+      <para>2021-04-22</para>
+      <itemizedlist>
+        <listitem>
+          <para>[xry111] - Revert 2772bb9c, as the proposed fix in it is
+          rejected by Python maintainers explicitly.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2021-04-06</para>
       <itemizedlist>

chapter08/python.xml

@@ -42,10 +42,6 @@
   <sect2 role="installation">
     <title>Installation of Python 3</title>
 
-    <para>First, a header file needs to be fixed:</para>
-
-<screen><userinput remap="pre">sed 's|cpython/||' -i Include/cpython/pystate.h</userinput></screen>
-
     <para>Prepare Python for compilation:</para>
 
 <screen><userinput remap="configure">./configure --prefix=/usr       \