diff options
Diffstat (limited to 'man/NetworkManager.conf.xml')
| -rw-r--r-- | man/NetworkManager.conf.xml | 46 |
1 files changed, 12 insertions, 34 deletions
diff --git a/man/NetworkManager.conf.xml b/man/NetworkManager.conf.xml index 3308f68e..446540aa 100644 --- a/man/NetworkManager.conf.xml +++ b/man/NetworkManager.conf.xml @@ -312,7 +312,6 @@ no-auto-default=* <listitem><para>Set the DNS (<filename>resolv.conf</filename>) processing mode. If the key is unspecified, <literal>default</literal> is used, unless <filename>/etc/resolv.conf</filename> is a symlink to - <filename>/run/systemd/resolve/stub-resolv.conf</filename>, <filename>/run/systemd/resolve/resolv.conf</filename>, <filename>/lib/systemd/resolv.conf</filename> or <filename>/usr/lib/systemd/resolv.conf</filename>. @@ -656,9 +655,6 @@ ipv6.ip6-privacy=0 <term><varname>connection.lldp</varname></term> </varlistentry> <varlistentry> - <term><varname>connection.mdns</varname></term> - </varlistentry> - <varlistentry> <term><varname>connection.stable-id</varname></term> </varlistentry> <varlistentry> @@ -687,9 +683,6 @@ ipv6.ip6-privacy=0 <term><varname>ipv4.dad-timeout</varname></term> </varlistentry> <varlistentry> - <term><varname>ipv4.dhcp-client-id</varname></term> - </varlistentry> - <varlistentry> <term><varname>ipv4.dhcp-timeout</varname></term> <listitem><para>If left unspecified, the default value for the interface type is used.</para></listitem> @@ -756,11 +749,6 @@ ipv6.ip6-privacy=0 <listitem><para>If left unspecified, the default value "<literal>optional</literal>" will be used.</para></listitem> </varlistentry> - <varlistentry> - <term><varname>wifi-sec.fils</varname></term> - <listitem><para>If left unspecified, the default value - "<literal>optional</literal>" will be used.</para></listitem> - </varlistentry> </variablelist> </para> </refsect2> @@ -939,15 +927,6 @@ managed=1 </para> </listitem> </varlistentry> - <varlistentry id="wifi.backend"> - <term><varname>wifi.backend</varname></term> - <listitem> - <para> - Specify the Wi-Fi backend used for the device. Currently supported - are <literal>wpa_supplicant</literal> and <literal>iwd</literal> (experimental). - </para> - </listitem> - </varlistentry> <varlistentry> <term><varname>wifi.scan-generate-mac-address-mask</varname></term> <listitem> @@ -1000,7 +979,7 @@ managed=1 <listitem><para>The URI of a web page to periodically request when connectivity is being checked. This page should return the header "X-NetworkManager-Status" with a - value of "online". Alternatively, its body content should + value of "online". Alternatively, it's body content should be set to "NetworkManager is online". The body content check can be controlled by the <literal>response</literal> option. If this option is blank or missing, connectivity @@ -1201,7 +1180,6 @@ enable=nm-version-min:1.3,nm-version-min:1.2.6,nm-version-min:1.0.16 </para> </listitem> </varlistentry> - <varlistentry> <term><varname>ifcfg-rh</varname></term> <listitem> @@ -1220,6 +1198,17 @@ enable=nm-version-min:1.3,nm-version-min:1.2.6,nm-version-min:1.0.16 </varlistentry> <varlistentry> + <term><varname>ifcfg-suse</varname></term> + <listitem> + <para> + This plugin is deprecated and its selection has no effect. + The <literal>keyfile</literal> plugin should be used + instead. + </para> + </listitem> + </varlistentry> + + <varlistentry> <term><varname>ifupdown</varname></term> <listitem> <para> @@ -1255,17 +1244,6 @@ enable=nm-version-min:1.3,nm-version-min:1.2.6,nm-version-min:1.0.16 </listitem> </varlistentry> - <varlistentry> - <term><varname>ifcfg-suse</varname>, <varname>ifnet</varname></term> - <listitem> - <para> - These plugins are deprecated and their selection has no effect. - The <literal>keyfile</literal> plugin should be used - instead. - </para> - </listitem> - </varlistentry> - </variablelist> </refsect1> |