about summary refs log tree commit diff
path: root/man/nm-settings-keyfile.xsl
diff options
context:
space:
mode:
authorSebastien Bacher <seb128@ubuntu.com>2020-05-19 16:38:36 +0200
committerSebastien Bacher <seb128@ubuntu.com>2020-05-19 17:09:07 +0200
commitccf6dc06bbee82c3d49f451545c5317337e0777e (patch)
treea8fddc8c6e2b3b99bebab1d5bb2a64581eff4bfd /man/nm-settings-keyfile.xsl
parentf109e55ef130ce84054d5ba3acf4b71cd8c7564a (diff)
parent7ffed1e6136de75188f10ba8763bcb942f932f8e (diff)
Merge remote-tracking branch 'salsa/debian/master' into ubuntu/master
Diffstat (limited to 'man/nm-settings-keyfile.xsl')
-rw-r--r--man/nm-settings-keyfile.xsl12
1 files changed, 6 insertions, 6 deletions
diff --git a/man/nm-settings-keyfile.xsl b/man/nm-settings-keyfile.xsl
index 486a4c53..c22bd4fc 100644
--- a/man/nm-settings-keyfile.xsl
+++ b/man/nm-settings-keyfile.xsl
@@ -40,12 +40,14 @@
         </para>
         <para>
           The <emphasis>keyfile</emphasis> plugin is the generic plugin that supports all
-          the connection types and capabilities that NetworkManager has. It writes files
-          out in a .ini-style format in <filename>/etc/NetworkManager/system-connections/</filename>.
+          the connection types and capabilities that NetworkManager has. The files are
+          in a .ini-style format and located in <filename>/etc/NetworkManager/system-connections/</filename>,
+          <filename>/usr/lib/NetworkManager/system-connections/</filename> and
+          <filename>/run/NetworkManager/system-connections/</filename>.
           This plugin is always enabled and will automatically be used to store
           any connections that are not supported by any other active plugin.
           For security, it will ignore files that are readable or writable by any user
-          or group other than 'root' since private keys and passphrases may be stored
+          other than 'root' since private keys and passphrases may be stored
           in plaintext inside the file.
         </para>
       </refsect1>
@@ -72,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>