Automatic merge of trunk into multilib

Makefile

@@ -48,6 +48,9 @@ ifneq ($(ARCH), default)
   endif
 endif
 
+# https://github.com/docbook/xslt10-stylesheets/issues/239
+SED_XMLNS_XLINK = sed -i 's/xmlns:xlink.*xlink"//'
+
 book: validate profile-html
 	@echo "Generating chunked XHTML files at $(BASEDIR)/ ..."
 	$(Q)xsltproc --nonet                          \
@@ -61,7 +64,7 @@ book: validate profile-html
 	$(Q)mkdir -p $(BASEDIR)/stylesheets
 	$(Q)cp stylesheets/lfs-xsl/*.css $(BASEDIR)/stylesheets
 	$(Q)sed -i 's|../stylesheet|stylesheet|' $(BASEDIR)/index.html
-	$(Q)sed -i 's/xmlns:xlink.*xlink"//' $(BASEDIR)/longindex.html
+	$(Q)$(SED_XMLNS_XLINK) $(BASEDIR)/longindex.html
 
 	$(Q)mkdir -p $(BASEDIR)/images
 	$(Q)cp images/*.png $(BASEDIR)/images
@@ -114,7 +117,7 @@ nochunks: validate profile-html
                 $(RENDERTMP)/lfs-html.xml
 #                $(RENDERTMP)/lfs-html2.xml
 
-	$(Q)sed 's/xmlns:xlink.*xlink"//' -i $(BASEDIR)/$(NOCHUNKS_OUTPUT)
+	$(Q)$(SED_XMLNS_XLINK) $(BASEDIR)/$(NOCHUNKS_OUTPUT)
 	@echo "Running Tidy..."
 	$(Q)tidy -config tidy.conf $(BASEDIR)/$(NOCHUNKS_OUTPUT) || true
 

chapter08/systemd.xml

@@ -157,7 +157,7 @@ meson setup \
       </varlistentry>
 
       <varlistentry>
-        <term><parameter>-Dman=false</parameter></term>
+        <term><parameter>-Dman=disabled</parameter></term>
         <listitem>
           <para>Prevent the generation of man pages to avoid extra
           dependencies.  We will install pre-generated man pages for systemd

chapter08/udev.xml

@@ -130,7 +130,7 @@ meson setup \
     building as a regular user or using a package manager easier):</para>
 
     <screen><userinput remap="make">export udev_helpers=$(grep "'name' :" ../src/udev/meson.build | \
-               awk '{print $3}' | tr -d ",'" | grep -v 'udevadm')</userinput></screen>
+                      awk '{print $3}' | tr -d ",'" | grep -v 'udevadm')</userinput></screen>
 
     <para>Only build the components needed for udev:</para>