summaryrefslogtreecommitdiff
path: root/man
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2017-02-12 15:38:51 -0500
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2017-02-12 15:38:51 -0500
commit01c901e257521a7a3ff6fc5945a3e5a4a7409a94 (patch)
tree5cddf7c13988f6e96ef18fa7638e35dce0e26c8e /man
parent9606bc4b4b09a4d1bff3f047d5ca5ac4cf3fe073 (diff)
parentfa8b44999406ace5f44376c1be1c75edfdde5a03 (diff)
Merge pull request #4832 from rojkov/mdns
Diffstat (limited to 'man')
-rw-r--r--man/systemd-resolve.xml4
1 files changed, 3 insertions, 1 deletions
diff --git a/man/systemd-resolve.xml b/man/systemd-resolve.xml
index b52f946fa5..50da971b07 100644
--- a/man/systemd-resolve.xml
+++ b/man/systemd-resolve.xml
@@ -182,7 +182,9 @@
(i.e. classic unicast DNS), <literal>llmnr</literal> (<ulink
url="https://tools.ietf.org/html/rfc4795">Link-Local Multicast Name Resolution</ulink>),
<literal>llmnr-ipv4</literal>, <literal>llmnr-ipv6</literal> (LLMNR via the indicated underlying IP
- protocols). By default the lookup is done via all protocols suitable for the lookup. If used, limits the set of
+ protocols), <literal>mdns</literal> (<ulink url="https://www.ietf.org/rfc/rfc6762.txt">Multicast DNS</ulink>),
+ <literal>mdns-ipv4</literal>, <literal>mdns-ipv6</literal> (MDNS via the indicated underlying IP protocols).
+ By default the lookup is done via all protocols suitable for the lookup. If used, limits the set of
protocols that may be used. Use this option multiple times to enable resolving via multiple protocols at the
same time. The setting <literal>llmnr</literal> is identical to specifying this switch once with
<literal>llmnr-ipv4</literal> and once via <literal>llmnr-ipv6</literal>. Note that this option does not force