X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd.network.xml;h=024509968a964be49f45959792621835757c7994;hb=a6082d778ee4b97ec3eb6d3266cefc024c5d60f7;hp=dc34154b26168f2cedc60938cf43fdfcf3b1eff6;hpb=bfa695b5cc37aeb78737c57c84e9e69ea08152c0;p=elogind.git
diff --git a/man/systemd.network.xml b/man/systemd.network.xml
index dc34154b2..024509968 100644
--- a/man/systemd.network.xml
+++ b/man/systemd.network.xml
@@ -212,9 +212,6 @@
IPv4LL=
A boolean. When true, enables IPv4 link-local support.
- If DHCP= is also true, acquiring DHCP address
- will deprecate previously acquired IPv4 link-local address or
- stop acquiring process if one has not been acquired before.
@@ -223,10 +220,19 @@
A boolean. When true, sets up the route needed for
non-IPv4LL hosts to communicate with IPv4LL-only hosts. Defaults
- to true.
+ to false.
+
+ LLMNR=
+
+ A boolean or resolve. When true, enables
+ Link-Local Multicast Name Resolution on the link, when set to
+ resolve only resolution is enabled, but not
+ announcement. Defaults to true.
+
+
Address=
@@ -295,7 +301,18 @@
This option may be specified more than once.
-
+
+ Domains=
+
+ The domains used for DNS resolution over this link.
+
+
+
+ NTP=
+
+ An NTP server address. This option may be specified more than once.
+
+
Bridge=
@@ -440,6 +457,13 @@
will be used as the transient hostname.
+
+ UseDomains=
+
+ When true (not the default), the domain name received from the DHCP server
+ will be used for DNS resolution over this link.
+
+
UseRoutes=
@@ -494,7 +518,7 @@ Gateway=192.168.0.1
Name=en*
[Network]
-DHCP=yes
+DHCP=both