Mentioning `route nameserver' relevance made it obvious that the
`preference' block duplicates lots of information and I despise adding
to that.

So rearrange the list of types such that conceptually related ones are
subsequent and can reference each user to not repeat things.

This looks like this:

     preference {type ...}
             A list of DNS name server types to specify the order in which
             name servers are picked when measured round-trip time medians are
             equal.  Additionally, the first mentioned type gets a time bonus.
             Validating name servers are always picked over non-validating
             name servers.  DNS name server types are:

             autoconf        Name servers learned via DHCP, SLAAC or route
                             nameserver.
             oDoT-autoconf   autoconf with opportunistic DNS over TLS.
             stub            autoconf via libc functions.  See asr_run(3).
                             Will never validate.  Useful when running behind
                             broken middle boxes that do not like edns0.  DNS
                             answers from stub name servers are not cached.
             forwarder       Name servers configured in unwind.conf.
             DoT             forwarder with DNS over TLS.
             oDoT-forwarder  Opportunistic DoT.
             recursor        Recursively resolve names.

Emphasize "edns0" while here and simplify "unwind does X" to just "X".

Fist I tried listing types in the default order such that the sentence
afterwards is obsoleted by the self-documenting manner, but that
conflicts with the logical order I picked above.

Feedback? Objections? OK?

Index: unwind.conf.5
===================================================================
RCS file: /cvs/src/sbin/unwind/unwind.conf.5,v
retrieving revision 1.31
diff -u -p -r1.31 unwind.conf.5
--- unwind.conf.5       24 Oct 2021 15:57:17 -0000      1.31
+++ unwind.conf.5       26 Oct 2021 13:17:56 -0000
@@ -93,33 +93,32 @@ Validating name servers are always picke
 DNS name server types are:
 .Pp
 .Bl -tag -width "oDoT-forwarder" -compact
+.It Ic autoconf
+Name servers learned via DHCP, SLAAC or
+.Cm route nameserver .
+.It Ic oDoT-autoconf
+.Ic autoconf
+with opportunistic DNS over TLS.
 .It Ic stub
-Name servers learned via DHCP or SLAAC, queried using the libc functions.
+.Ic autoconf
+via libc functions.
 See
 .Xr asr_run 3 .
 Will never validate.
-Useful when running behind broken middle boxes that do not like edns0.
+Useful when running behind broken middle boxes that do not like
+.Cm edns0 .
 DNS answers from stub name servers are not cached.
-.It Ic autoconf
-Name servers learned via DHCP or SLAAC.
-.It Ic oDoT-autoconf
-Name servers learned via DHCP or SLAAC.
-.Nm unwind
-tries to opportunistically use DNS over TLS.
-.It Ic DoT
-DNS over TLS name servers configured in
-.Nm .
 .It Ic forwarder
 Name servers configured in
 .Nm .
+.It Ic DoT
+.Ic forwarder
+with DNS over TLS.
 .It Ic oDoT-forwarder
-Name servers configured in
-.Nm .
-.Nm unwind
-tries to opportunistically use DNS over TLS.
+Opportunistic
+.Ic DoT .
 .It Ic recursor
-.Nm unwind
-itself recursively resolves names.
+Recursively resolve names.
 .El
 .Pp
 The default preference is

Reply via email to