From c53ff08f82bba9ac62b4e46ea702a0ada0e1aa08 Mon Sep 17 00:00:00 2001
From: Xi Ruoyao <xry111@mengyan1223.wang>
Date: Fri, 12 Mar 2021 06:40:05 +0000
Subject: [PATCH] systemd: network configuration: network-manager is now
 compatible with systemd-resolved

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@12161 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter09/networkd.xml | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/chapter09/networkd.xml b/chapter09/networkd.xml
index 229b313b1..49d4031a0 100644
--- a/chapter09/networkd.xml
+++ b/chapter09/networkd.xml
@@ -167,12 +167,13 @@ EOF</userinput></screen>
     <sect3 id="resolv-conf-systemd-resolved">
       <title>systemd-resolved Configuration</title>
 
-      <note><para>If using another means to configure your network
-      interfaces (ex: ppp, network-manager, etc.), or if using any type of
-      local resolver (ex: bind, dnsmasq, unbound, etc.), or any other software 
-      that generates an <filename>/etc/resolv.conf</filename> (ex: resolvconf),
-      the <command>systemd-resolved</command> service should not be
-      used.</para></note>
+      <note><para>If using methods incompatible with systemd-resolved to
+      configure your network interfaces (ex: ppp, etc.), or if using any
+      type of local resolver (ex: bind, dnsmasq, unbound, etc.),
+      or any other software that generates an <filename>/etc/resolv.conf</filename>
+      (ex: a <command>resolvconf</command> program other than the one
+      provided by systemd), the <command>systemd-resolved</command> service
+      should not be used.</para></note>
 
       <para>When using <command>systemd-resolved</command> for DNS
       configuration, it creates the file