Automatic merge of trunk into multilib

chapter03/packages.xml

@@ -270,6 +270,20 @@
         <para>Home page: <ulink url="&glibc-home;"/></para>
         <para>Download: <ulink url="&glibc-url;"/></para>
         <para>MD5 sum: <literal>&glibc-md5;</literal></para>
+
+        <note>
+          <para>
+            The Glibc developers maintain a
+            <ulink url='https://sourceware.org/git/?p=glibc.git;a=shortlog;h=refs/heads/release/&glibc-version;/master'>Git
+            branch</ulink> containing patches considered worthy for
+            Glibc-&glibc-version; but unfortunately developed after
+            Glibc-&glibc-version; release.  The LFS editors will issue a
+            security advisory if any security fix is added into the branch,
+            but no actions will be taken for other newly added patches.  You
+            may review the patches yourself and incorporate some patches if
+            you consider them important.
+          </para>
+        </note>
       </listitem>
     </varlistentry>
 

chapter09/networkd.xml

@@ -164,7 +164,7 @@ Name=<network-device-name>
 [Network]
 DHCP=ipv4
 
-[DHCP]
+[DHCPv4]
 UseDomains=true</literal>
 EOF</userinput></screen>