From 7514efc2f38c9ace4557d4e69d68e7d380389030 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 26 Aug 2016 02:18:32 +0200 Subject: Imported Upstream version 1.4.0 --- man/nm-settings-keyfile.xml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'man/nm-settings-keyfile.xml') diff --git a/man/nm-settings-keyfile.xml b/man/nm-settings-keyfile.xml index 849b3da9..1bf66c7e 100644 --- a/man/nm-settings-keyfile.xml +++ b/man/nm-settings-keyfile.xml @@ -1,6 +1,6 @@ -nm-settings-keyfileNetworkManager developersnm-settings-keyfile5NetworkManagerConfiguration1.2.4nm-settings-keyfileDescription of keyfile settings pluginDescription +nm-settings-keyfileNetworkManager developersnm-settings-keyfile5NetworkManagerConfiguration1.4.0nm-settings-keyfileDescription of keyfile settings pluginDescription NetworkManager is based on the concept of connection profiles that contain network configuration (see nm-settings5 for details). The profiles can be stored in various formats. NetworkManager uses plugins for reading and writing @@ -128,7 +128,7 @@ id=4 There are several exceptions to this rule, mainly for making keyfile syntax easier for humans. The exceptions handled specially by keyfile plugin are listed below. Refer to - nm-settings5 + nm-settings5 for all available settings and properties and their description. Name aliases Some of the NetworkManager setting names are somewhat hard to type or remember. Therefore @@ -234,9 +234,9 @@ Example: mac-address-blacklist= 00:22:68:12:79:A6;00:22:68:12:79:782 - (not-saved) - this secret should not be saved but should be requested from the user each time it is required.4 - (not-required) - in some situations it cannot be automatically determined that a secret is required or not. This flag hints that the secret is not required - and should not be requested from the user.Files/etc/NetworkManager/system-connections/*See Alsonm-settings5, - nm-settings-ifcfg-rh5, - NetworkManager8, - NetworkManager.conf5, - nmcli1, - nmcli-examples7 + and should not be requested from the user.Files/etc/NetworkManager/system-connections/*See Alsonm-settings5, + nm-settings-ifcfg-rh5, + NetworkManager8, + NetworkManager.conf5, + nmcli1, + nmcli-examples7 -- cgit 1.3.0-6-gf8a5