From dee13c2f4e453e5a6df0dcb50a8851e93769b70f Mon Sep 17 00:00:00 2001
From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Mon, 6 Dec 2021 16:28:10 +0900
Subject: [PATCH 1/2] man: network: rebreak lines

---
 man/systemd.network.xml | 33 +++++++++++++--------------------
 1 file changed, 13 insertions(+), 20 deletions(-)

diff --git a/man/systemd.network.xml b/man/systemd.network.xml
index e8e01f9094..54254cae17 100644
--- a/man/systemd.network.xml
+++ b/man/systemd.network.xml
@@ -518,18 +518,13 @@ Table=1234</programlisting></para>
         <varlistentry>
           <term><varname>DNSOverTLS=</varname></term>
           <listitem>
-            <para>Takes a boolean or <literal>opportunistic</literal>.
-            When true, enables
-            <ulink
-            url="https://tools.ietf.org/html/rfc7858">DNS-over-TLS</ulink>
-            support on the link.
-            When set to <literal>opportunistic</literal>, compatibility with
-            non-DNS-over-TLS servers is increased, by automatically
-            turning off DNS-over-TLS servers in this case.
-            This option defines a per-interface setting for
+            <para>Takes a boolean or <literal>opportunistic</literal>. When true, enables
+            <ulink url="https://tools.ietf.org/html/rfc7858">DNS-over-TLS</ulink> support on the link.
+            When set to <literal>opportunistic</literal>, compatibility with non-DNS-over-TLS servers
+            is increased, by automatically turning off DNS-over-TLS servers in this case. This option
+            defines a per-interface setting for
             <citerefentry><refentrytitle>resolved.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>'s
-            global <varname>DNSOverTLS=</varname> option. Defaults to
-            false. This setting is read by
+            global <varname>DNSOverTLS=</varname> option. Defaults to false. This setting is read by
             <citerefentry><refentrytitle>systemd-resolved.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>.</para>
           </listitem>
         </varlistentry>
@@ -537,16 +532,14 @@ Table=1234</programlisting></para>
           <term><varname>DNSSEC=</varname></term>
           <listitem>
             <para>Takes a boolean or <literal>allow-downgrade</literal>. When true, enables
-            <ulink url="https://tools.ietf.org/html/rfc4033">DNSSEC</ulink>
-            DNS validation support on the link. When set to
-            <literal>allow-downgrade</literal>, compatibility with
-            non-DNSSEC capable networks is increased, by automatically
-            turning off DNSSEC in this case. This option defines a
-            per-interface setting for
+            <ulink url="https://tools.ietf.org/html/rfc4033">DNSSEC</ulink> DNS validation support on
+            the link. When set to <literal>allow-downgrade</literal>, compatibility with non-DNSSEC
+            capable networks is increased, by automatically turning off DNSSEC in this case. This
+            option defines a per-interface setting for
             <citerefentry><refentrytitle>resolved.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>'s
-            global <varname>DNSSEC=</varname> option. Defaults to
-            false. This setting is read by
-            <citerefentry><refentrytitle>systemd-resolved.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>.</para>
+            global <varname>DNSSEC=</varname> option. Defaults to false. This setting is read by
+            <citerefentry><refentrytitle>systemd-resolved.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>.
+            </para>
           </listitem>
         </varlistentry>
         <varlistentry>

From 472e1349edfd13774eacf182f2c0540714d22319 Mon Sep 17 00:00:00 2001
From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Mon, 6 Dec 2021 16:29:46 +0900
Subject: [PATCH 2/2] man: network: fix default values for DNSSEC= and
 DNSOverTLS=

---
 man/systemd.network.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/man/systemd.network.xml b/man/systemd.network.xml
index 54254cae17..82d50c9569 100644
--- a/man/systemd.network.xml
+++ b/man/systemd.network.xml
@@ -524,7 +524,8 @@ Table=1234</programlisting></para>
             is increased, by automatically turning off DNS-over-TLS servers in this case. This option
             defines a per-interface setting for
             <citerefentry><refentrytitle>resolved.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>'s
-            global <varname>DNSOverTLS=</varname> option. Defaults to false. This setting is read by
+            global <varname>DNSOverTLS=</varname> option. Defaults to unset, and the global setting
+            will be used. This setting is read by
             <citerefentry><refentrytitle>systemd-resolved.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>.</para>
           </listitem>
         </varlistentry>
@@ -537,7 +538,8 @@ Table=1234</programlisting></para>
             capable networks is increased, by automatically turning off DNSSEC in this case. This
             option defines a per-interface setting for
             <citerefentry><refentrytitle>resolved.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>'s
-            global <varname>DNSSEC=</varname> option. Defaults to false. This setting is read by
+            global <varname>DNSSEC=</varname> option. Defaults to unset, and the global setting will be
+            used. This setting is read by
             <citerefentry><refentrytitle>systemd-resolved.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>.
             </para>
           </listitem>