diff --git a/man/custom-html.xsl b/man/custom-html.xsl index fccaf51ff5e..7eebfdb5a14 100644 --- a/man/custom-html.xsl +++ b/man/custom-html.xsl @@ -1,9 +1,5 @@ - - + @@ -96,6 +92,21 @@ + + + + https://manpages.debian.org/unstable/ + + / + + . + + .en.html + + + + + diff --git a/man/resolvectl.xml b/man/resolvectl.xml index 594e22c03f3..a7de5a309f4 100644 --- a/man/resolvectl.xml +++ b/man/resolvectl.xml @@ -288,17 +288,27 @@ - Compatibility with <citerefentry><refentrytitle>resolvconf</refentrytitle><manvolnum>8</manvolnum></citerefentry> + Compatibility with + <citerefentry project="debian"><refentrytitle>resolvconf</refentrytitle><manvolnum>8</manvolnum></citerefentry> resolvectl is a multi-call binary. When invoked as resolvconf (generally achieved by means of a symbolic link of this name to the resolvectl binary) it - is run in a limited resolvconf8 + is run in a limited + resolvconf8 compatibility mode. It accepts mostly the same arguments and pushes all data into systemd-resolved.service8, similar to how and commands operate. Note that systemd-resolved.service is the only supported backend, which is different from other - implementations of this command. Note that not all operations supported by other implementations are supported - natively. Specifically: + implementations of this command. + + /etc/resolv.conf will only be updated with servers added with this command + when /etc/resolv.conf is a symlink to + /run/systemd/resolve/resolv.conf, and not a static file. See the discussion of + /etc/resolv.conf handling in + systemd-resolved.service8. + + + Not all operations supported by other implementations are supported natively. Specifically: @@ -359,7 +369,9 @@ - See resolvconf8 for details on this command line options. + See + resolvconf8 + for details on those command line options. diff --git a/src/resolve/resolved-dns-scope.c b/src/resolve/resolved-dns-scope.c index d7e7b5a853c..d06e428011b 100644 --- a/src/resolve/resolved-dns-scope.c +++ b/src/resolve/resolved-dns-scope.c @@ -496,9 +496,8 @@ DnsScopeMatch dns_scope_good_domain( assert(s); assert(domain); - /* Checks if the specified domain is something to look up on - * this scope. Note that this accepts non-qualified hostnames, - * i.e. those without any search path prefixed yet. */ + /* Checks if the specified domain is something to look up on this scope. Note that this accepts + * non-qualified hostnames, i.e. those without any search path suffixed. */ if (ifindex != 0 && (!s->link || s->link->ifindex != ifindex)) return DNS_SCOPE_NO;