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 --- docs/api/html/NetworkManager.conf.html | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'docs/api/html/NetworkManager.conf.html') diff --git a/docs/api/html/NetworkManager.conf.html b/docs/api/html/NetworkManager.conf.html index 5c404c47..ffaa8612 100644 --- a/docs/api/html/NetworkManager.conf.html +++ b/docs/api/html/NetworkManager.conf.html @@ -3,7 +3,7 @@ NetworkManager.conf: NetworkManager Reference Manual - + @@ -277,7 +277,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 @@ -354,14 +354,14 @@ 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.

path

The location where keyfiles are read and stored. - This defaults to "${prefix}/etc/NetworkManager/conf.d". + This defaults to "/etc/NetworkManager/conf.d".

@@ -1008,7 +1008,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 @@ -1066,15 +1066,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