diff options
Diffstat (limited to 'man')
| -rw-r--r-- | man/busctl.xml | 8 | ||||
| -rw-r--r-- | man/systemd-resolve.xml | 4 | ||||
| -rw-r--r-- | man/systemd.journal-fields.xml | 10 | ||||
| -rw-r--r-- | man/systemd.network.xml | 19 |
4 files changed, 36 insertions, 5 deletions
diff --git a/man/busctl.xml b/man/busctl.xml index 052a33097f..f63d0d5bab 100644 --- a/man/busctl.xml +++ b/man/busctl.xml @@ -291,11 +291,11 @@ <listitem><para>Similar to <command>monitor</command> but writes the output in pcap format (for details, see the <ulink - url="http://wiki.wireshark.org/Development/LibpcapFileFormat">Libpcap - File Format</ulink> description. Make sure to redirect the - output to STDOUT to a file. Tools like + url="https://wiki.wireshark.org/Development/LibpcapFileFormat">Libpcap + File Format</ulink> description). Make sure to redirect + standard output to a file. Tools like <citerefentry project='die-net'><refentrytitle>wireshark</refentrytitle><manvolnum>1</manvolnum></citerefentry> - may be used to dissect and view the generated + may be used to dissect and view the resulting files.</para></listitem> </varlistentry> 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 diff --git a/man/systemd.journal-fields.xml b/man/systemd.journal-fields.xml index 494f97aad1..2b0acee407 100644 --- a/man/systemd.journal-fields.xml +++ b/man/systemd.journal-fields.xml @@ -243,6 +243,16 @@ </varlistentry> <varlistentry> + <term><varname>_SYSTEMD_INVOCATION_ID=</varname></term> + <listitem> + <para>The invocation ID for the runtime cycle of the unit + the message was generated in, as available to processes + of the unit in <varname>$INVOCATION_ID</varname> (see + <citerefentry><refentrytitle>systemd.exec</refentrytitle><manvolnum>5</manvolnum></citerefentry>).</para> + </listitem> + </varlistentry> + + <varlistentry> <term><varname>_HOSTNAME=</varname></term> <listitem> <para>The name of the originating host.</para> diff --git a/man/systemd.network.xml b/man/systemd.network.xml index 7818dfff81..b807ebf29b 100644 --- a/man/systemd.network.xml +++ b/man/systemd.network.xml @@ -612,6 +612,25 @@ </para></listitem> </varlistentry> <varlistentry> + <term><varname>IPv6ProxyNDPAddress=</varname></term> + <listitem><para>An IPv6 address, for which Neighbour Advertisement + messages will be proxied. + Proxy NDP (Neighbor Discovery Protocol) is a technique for IPv6 to + allow routing of addresses to a different destination when peers expect them + to be present on a certain physical link. + In this case a router answers Neighbour Advertisement messages intended for + another machine by offering its own MAC address as destination. + Unlike proxy ARP for IPv4, is not enabled globally, but will only send Neighbour + Advertisement messages for addresses in the IPv6 neighbor proxy table, + which can also be shown by <command>ip -6 neighbour show proxy</command> + This option may be specified more than once. systemd-networkd will control the + per-interface `proxy_ndp` switch for each configured interface, depending on whether + there are <option>IPv6ProxyNDPAddress=</option> entries configured and add these to + the kernels IPv6 neighbor proxy table. + Defaults to unset. + </para></listitem> + </varlistentry> + <varlistentry> <term><varname>Bridge=</varname></term> <listitem> <para>The name of the bridge to add the link to. See |