From 45cb5bb3c0e6edb887cf69b417fcaf7053814a9b Mon Sep 17 00:00:00 2001 From: Aron Xu Date: Tue, 20 Dec 2016 20:06:37 +0800 Subject: Imported Upstream version 1.4.4 --- man/NetworkManager.conf.xml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'man/NetworkManager.conf.xml') diff --git a/man/NetworkManager.conf.xml b/man/NetworkManager.conf.xml index acb75c2e..6295b821 100644 --- a/man/NetworkManager.conf.xml +++ b/man/NetworkManager.conf.xml @@ -286,7 +286,7 @@ no-auto-default=* nameserver. unbound: NetworkManager will talk to unbound and dnssec-triggerd, providing a "split DNS" - configuration with DNSSEC support. The /etc/resolv.conf + configuration with DNSSEC support. The /etc/resolv.conf will be managed by dnssec-trigger daemon. none: NetworkManager will not modify resolv.conf. This implies @@ -358,8 +358,8 @@ no-auto-default=* hostname This key is deprecated and has no effect - since the hostname is now stored in /etc/hostname or other - system configuration files according to build options. + since the hostname is now stored in /etc/hostname + or other system configuration files according to build options. @@ -986,7 +986,7 @@ enable=nm-version-min:1.3,nm-version-min:1.2.6,nm-version-min:1.0.16 plugin that supports all the connection types and capabilities that NetworkManager has. It writes files out in an .ini-style format in - /etc/NetworkManager/system-connections. + /etc/NetworkManager/system-connections. The stored connection file may contain passwords and @@ -1051,15 +1051,16 @@ enable=nm-version-min:1.3,nm-version-min:1.2.6,nm-version-min:1.0.16 This plugin allows to read iBFT configuration (iSCSI Boot Firmware Table). - The configuration is read using /sbin/iscsiadm. Users are expected to - configure iBFT connections via the firmware interfaces. + The configuration is read using /sbin/iscsiadm. Users are + expected to configure iBFT connections via the firmware interfaces. If ibft support is available, it is automatically enabled after ifcfg-rh. This can be disabled by no-ibft. You can also explicitly specify ibft to load the plugin without ifcfg-rh or to change the plugin order. - Note that ibft plugin uses /sbin/iscsiadm and thus requires CAP_SYS_ADMIN capability. + Note that ibft plugin uses /sbin/iscsiadm and thus requires + CAP_SYS_ADMIN capability. -- cgit 1.3.0-6-gf8a5