Automatic merge of trunk into multilib

appendices/dependencies.xml

@@ -1047,7 +1047,15 @@
       <segmentedlist id="gettext-optdeps">
         <segtitle>&external;</segtitle>
         <seglistitem>
-          <seg><ulink url='&blfs-book;general/libxml2.html'>libxml2</ulink></seg>
+          <seg>
+            <ulink url='&blfs-book;general/libunistring.html'>
+              libunistring
+            </ulink>
+            and
+            <ulink url='&blfs-book;general/libxml2.html'>
+              libxml2
+            </ulink>
+          </seg>
         </seglistitem>
       </segmentedlist>
 

chapter08/glibc.xml

@@ -247,7 +247,7 @@ esac</userinput></screen>
             <emphasis role='bold'>you MUST follow the note in Libxcrypt
             section to install
             <filename class='libraryfile'>libcrypt.so.1*</filename>
-            (overwritting
+            (replacing
             <filename class='libraryfile'>libcrypt.so.1</filename> from the
             prior Glibc installation)</emphasis>.
           </para>
@@ -265,7 +265,7 @@ esac</userinput></screen>
 
           <screen role='nodump'><userinput>rm -f /usr/sbin/nscd</userinput></screen>
 
-          <para>
+          <para revision='systemd'>
             If this system (prior to LFS 12.1, exclusive) is based on
             Systemd, it's also needed to disable and stop the
             <command>nscd</command> service now:

chapter08/libxcrypt.xml

@@ -110,7 +110,7 @@
             --disable-static             \
             --disable-failure-tokens
 make
-cp -av .libs/libcrypt.so.1* /usr/lib</userinput></screen>
+cp -av --remove-destination .libs/libcrypt.so.1* /usr/lib</userinput></screen>
     </note>
 
   </sect2>