Automatic merge of trunk into multilib

chapter07/texinfo.xml

@@ -43,11 +43,6 @@
   <sect2 role="installation">
     <title>Installation of Texinfo</title>
 
-    <para>First, fix an issue building the package with Glibc-2.34 or later:</para>
-
-<screen><userinput remap="pre">sed -e 's/__attribute_nonnull__/__nonnull/' \
-    -i gnulib/lib/malloc/dynarray-skeleton.c</userinput></screen>
-
     <para>Prepare Texinfo for compilation:</para>
 
 <screen><userinput remap="configure">./configure --prefix=/usr</userinput></screen>

chapter08/python.xml

@@ -126,8 +126,9 @@
         command to upgrade a module (for example, from meson-0.61.3 to
         meson-0.62.0), insert the option <parameter>--upgrade</parameter> into
         the command line.  If it's really necessary to downgrade a module or
-        reinstall the same version for some reason, insert 
+        reinstall the same version for some reason, insert
-        <parameter>--force-reinstall</parameter> into the command line.
+        <parameter>--force-reinstall --no-deps</parameter> into the command
+        line.
       </para>
     </important>
 

chapter08/texinfo.xml

@@ -62,11 +62,6 @@
     </variablelist>
 -->
 
-    <para>Again, fix an issue building the package with Glibc-2.34 or later:</para>
-
-<screen><userinput remap="pre">sed -e 's/__attribute_nonnull__/__nonnull/' \
-    -i gnulib/lib/malloc/dynarray-skeleton.c</userinput></screen>
-
     <para>Compile the package:</para>
 
 <screen><userinput remap="make">make</userinput></screen>