summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2020-04-10 14:49:44 +0200
committerThomas Haller <thaller@redhat.com>2020-04-10 15:02:20 +0200
commit2f20878dbf940af873fe495e1eac07526c35207e (patch)
tree1731414ec38a936e53f1512ad14b03547aff1677
parent6cbbdb63fba381639b3762df4cf26f3d5d417bfc (diff)
downloadNetworkManager-2f20878dbf940af873fe495e1eac07526c35207e.tar.gz
man: fix obsolete references to monitor-connection-files in manual pages
monitor-connection-files was deprecated and disabled by default for a long time. In the meantime, it has no effect at all. Remove references from the manual pages.
-rw-r--r--introspection/org.freedesktop.NetworkManager.Settings.xml10
-rw-r--r--man/NetworkManager.conf.xml4
-rw-r--r--man/nm-settings-ifcfg-rh.xsl4
-rw-r--r--man/nm-settings-keyfile.xsl4
-rw-r--r--man/nmcli.xml9
5 files changed, 11 insertions, 20 deletions
diff --git a/introspection/org.freedesktop.NetworkManager.Settings.xml b/introspection/org.freedesktop.NetworkManager.Settings.xml
index 0587db5f45..42e6f1ef85 100644
--- a/introspection/org.freedesktop.NetworkManager.Settings.xml
+++ b/introspection/org.freedesktop.NetworkManager.Settings.xml
@@ -107,9 +107,8 @@
Loads or reloads the indicated connections from disk. You should call this
after making changes directly to an on-disk connection file to make sure
- that NetworkManager sees the changes. (If "monitor-connection-files" in
- NetworkManager.conf is "true", then this will have no real effect, but is
- harmless.) As with AddConnection(), this operation does not necessarily
+ that NetworkManager sees the changes.
+ As with AddConnection(), this operation does not necessarily
start the network connection.
-->
<method name="LoadConnections">
@@ -123,10 +122,7 @@
@status: This always returns %TRUE.
Tells NetworkManager to reload all connection files from disk, including
- noticing any added or deleted connection files. By default, connections
- are re-read automatically any time they change, so you only need to use
- this command if you have set "monitor-connection-files=false" in
- NetworkManager.conf.
+ noticing any added or deleted connection files.
-->
<method name="ReloadConnections">
<arg name="status" type="b" direction="out"/>
diff --git a/man/NetworkManager.conf.xml b/man/NetworkManager.conf.xml
index 782f1ab52b..6aa0398e64 100644
--- a/man/NetworkManager.conf.xml
+++ b/man/NetworkManager.conf.xml
@@ -153,7 +153,9 @@ plugins-=remove-me
</varlistentry>
<varlistentry>
<term><varname>monitor-connection-files</varname></term>
- <listitem><para>This setting is deprecated and has no effect.</para></listitem>
+ <listitem><para>This setting is deprecated and has no effect. Profiles
+ from disk are never automatically reloaded. Use for example <literal>nmcli connection (re)load</literal>
+ for that.</para></listitem>
</varlistentry>
<varlistentry>
<term><varname>auth-polkit</varname></term>
diff --git a/man/nm-settings-ifcfg-rh.xsl b/man/nm-settings-ifcfg-rh.xsl
index aef30fd104..eac6b0a15d 100644
--- a/man/nm-settings-ifcfg-rh.xsl
+++ b/man/nm-settings-ifcfg-rh.xsl
@@ -72,9 +72,7 @@
Users can create or modify the <emphasis>ifcfg-rh</emphasis> connection files
manually, even if that is not the recommended way of managing the profiles.
However, if they choose to do that, they must inform NetworkManager about
- their changes (see <emphasis>monitor-connection-file</emphasis> in
- <citerefentry><refentrytitle>nm-settings</refentrytitle><manvolnum>5</manvolnum>
- </citerefentry>, and <emphasis>nmcli con (re)load</emphasis>).
+ their changes (for example via <emphasis>nmcli con (re)load</emphasis>).
</para>
<formalpara>
<title>Some <emphasis>ifcfg-rh</emphasis> configuration examples:</title>
diff --git a/man/nm-settings-keyfile.xsl b/man/nm-settings-keyfile.xsl
index ce4328cc2c..c22bd4fc04 100644
--- a/man/nm-settings-keyfile.xsl
+++ b/man/nm-settings-keyfile.xsl
@@ -74,9 +74,7 @@
Users can create or modify the <emphasis>keyfile</emphasis> connection files
manually, even if that is not the recommended way of managing the profiles.
However, if they choose to do that, they must inform NetworkManager about
- their changes (see <emphasis>monitor-connection-file</emphasis> in
- <citerefentry><refentrytitle>nm-settings</refentrytitle><manvolnum>5</manvolnum>
- </citerefentry> and <emphasis>nmcli con (re)load</emphasis>).
+ their changes (for example via <emphasis>nmcli con (re)load</emphasis>).
</para>
<formalpara>
<title>Examples of <emphasis>keyfile</emphasis> configuration</title>
diff --git a/man/nmcli.xml b/man/nmcli.xml
index fc36f4e0e3..cded9ab6cb 100644
--- a/man/nmcli.xml
+++ b/man/nmcli.xml
@@ -1147,13 +1147,10 @@
<listitem>
<para>Reload all connection files from disk.
- NetworkManager does not monitor changes to connection
- files by default. So you need to use this command in order to tell
+ NetworkManager does not monitor changes to connection.
+ So you need to use this command in order to tell
NetworkManager to re-read the connection profiles from
- disk when a change was made to them. However, the auto-loading feature can be
- enabled and then NetworkManager will reload connection
- files any time they change (monitor-connection-files=true in
- <link linkend='NetworkManager.conf'><link linkend='NetworkManager.conf'><citerefentry><refentrytitle>NetworkManager.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry></link></link>).
+ disk when a change was made to them.
</para>
</listitem>
</varlistentry>