From 3dbf86f197a0f15c425fbba91dafc8fe69535c91 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Fri, 11 Nov 2016 14:26:25 +0100 Subject: [PATCH] man: use to mark file names This gives the templates a chance to do something extra clever with the formatting. The templates, of course, choose not to :( (cherry picked from commit 7b589e2b722fd19693b9862098a15dfa52de5a91) --- man/NetworkManager.conf.xml | 15 ++++++++------- man/NetworkManager.xml | 28 ++++++++++++++++------------ 2 files changed, 24 insertions(+), 19 deletions(-) diff --git a/man/NetworkManager.conf.xml b/man/NetworkManager.conf.xml index acb75c2e6f..6295b821dc 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. diff --git a/man/NetworkManager.xml b/man/NetworkManager.xml index 3b2a70d02b..60dbe7d7f8 100644 --- a/man/NetworkManager.xml +++ b/man/NetworkManager.xml @@ -69,7 +69,8 @@ Dispatcher scripts NetworkManager will execute scripts in the - /etc/NetworkManager/dispatcher.d directory or subdirectories in + /etc/NetworkManager/dispatcher.d + directory or subdirectories in alphabetical order in response to network events. Each script should be a regular executable file owned by root. Furthermore, it must not be writable by group or other, and not setuid. @@ -88,8 +89,8 @@ pre-up The interface is connected to the network but is not yet fully activated. Scripts acting on this event must be placed or - symlinked into the /etc/NetworkManager/dispatcher.d/pre-up.d directory, - and NetworkManager will wait for script execution to complete before + symlinked into the /etc/NetworkManager/dispatcher.d/pre-up.d + directory, and NetworkManager will wait for script execution to complete before indicating to applications that the interface is fully activated. @@ -101,7 +102,7 @@ pre-down The interface will be deactivated but has not yet been disconnected from the network. Scripts acting on this event must be - placed or symlinked into the /etc/NetworkManager/dispatcher.d/pre-down.d + placed or symlinked into the /etc/NetworkManager/dispatcher.d/pre-down.d directory, and NetworkManager will wait for script execution to complete before disconnecting the interface from its network. Note that this event is not emitted for forced disconnections, like when carrier is @@ -119,8 +120,8 @@ vpn-pre-up The VPN is connected to the network but is not yet fully activated. Scripts acting on this event must be placed or - symlinked into the /etc/NetworkManager/dispatcher.d/pre-up.d directory, - and NetworkManager will wait for script execution to complete before + symlinked into the /etc/NetworkManager/dispatcher.d/pre-up.d + directory, and NetworkManager will wait for script execution to complete before indicating to applications that the VPN is fully activated. @@ -134,7 +135,7 @@ vpn-pre-down The VPN will be deactivated but has not yet been disconnected from the network. Scripts acting on this event must be - placed or symlinked into the /etc/NetworkManager/dispatcher.d/pre-down.d + placed or symlinked into the /etc/NetworkManager/dispatcher.d/pre-down.d directory, and NetworkManager will wait for script execution to complete before disconnecting the VPN from its network. Note that this event is not emitted for forced disconnections, like when the VPN @@ -308,7 +309,8 @@ NetworkManager process, and will be killed if they run for too long. If your script might take arbitrarily long to complete, you should spawn a child process and have the parent return immediately. Scripts that are symbolic links pointing inside the - /etc/NetworkManager/dispatcher.d/no-wait.d/ directory are run immediately, without + /etc/NetworkManager/dispatcher.d/no-wait.d/ + directory are run immediately, without waiting for the termination of previous scripts, and in parallel. Also beware that once a script is queued, it will always be run, even if a later event renders it obsolete. (Eg, if an interface goes up, and then back down again quickly, it is @@ -354,14 +356,16 @@ Specify file for storing state of the NetworkManager persistently. If not specified, the default - value of /var/lib/NetworkManager/NetworkManager.state is used. + value of /var/lib/NetworkManager/NetworkManager.state + is used. Specify configuration file to set up various settings for NetworkManager. If not specified, the default - value of /etc/NetworkManager/NetworkManager.conf is used with + value of /etc/NetworkManager/NetworkManager.conf + is used with a fallback to the older 'nm-system-settings.conf' if located in the same directory. See NetworkManager.conf5 @@ -448,8 +452,8 @@ A SIGHUP also involves further reloading actions, like doing a DNS update and restarting the DNS plugin. The latter can be useful for example when using the dnsmasq plugin and changing - its configuration in /etc/NetworkManager/dnsmasq.d. However, - it also means this will shortly interrupt name resolution. + its configuration in /etc/NetworkManager/dnsmasq.d. + However, it also means this will shortly interrupt name resolution. In the future, there may be further actions added. A SIGHUP means to update NetworkManager configuration and reload everything that is supported. Note that this does not reload