diff --git a/man/NetworkManager.conf.xml.in b/man/NetworkManager.conf.xml.in
index a819bdb62..7f5021022 100644
--- a/man/NetworkManager.conf.xml.in
+++ b/man/NetworkManager.conf.xml.in
@@ -84,16 +84,16 @@ Copyright 2010 - 2014 Red Hat, Inc.
Minimal system settings configuration file looks like this:
- [main]
- plugins=keyfile
+ [main]
+ plugins=keyfile
As an extension to the normal keyfile format, you can also
append a value to a previously-set list-valued key by doing:
- plugins+=another-plugin
- plugins-=remove-me
+ plugins+=another-plugin
+ plugins-=remove-me
@@ -102,201 +102,201 @@ Copyright 2010 - 2014 Red Hat, Inc.
<literal>main</literal> section
- plugins
-
-
- Lists system settings plugin names separated by ','. These
- plugins are used to read and write system-wide
- connections. When multiple plugins are specified, the
- connections are read from all listed plugins. When writing
- connections, the plugins will be asked to save the
- connection in the order listed here; if the first plugin
- cannot write out that connection type (or can't write out
- any connections) the next plugin is tried, etc. If none of
- the plugins can save the connection, an error is returned
- to the user.
-
-
- If NetworkManager defines a distro-specific
- network-configuration plugin for your system, then that
- will normally be listed here. (See below for the available
- plugins.) Note that the keyfile plugin
- is always appended to the end of this list (if it doesn't
- already appear earlier in the list), so if there is no
- distro-specific plugin for your system then you can leave
- this key unset and NetworkManager will fall back to using
- keyfile.
-
-
+ plugins
+
+
+ Lists system settings plugin names separated by ','. These
+ plugins are used to read and write system-wide
+ connections. When multiple plugins are specified, the
+ connections are read from all listed plugins. When writing
+ connections, the plugins will be asked to save the
+ connection in the order listed here; if the first plugin
+ cannot write out that connection type (or can't write out
+ any connections) the next plugin is tried, etc. If none of
+ the plugins can save the connection, an error is returned
+ to the user.
+
+
+ If NetworkManager defines a distro-specific
+ network-configuration plugin for your system, then that
+ will normally be listed here. (See below for the available
+ plugins.) Note that the keyfile plugin
+ is always appended to the end of this list (if it doesn't
+ already appear earlier in the list), so if there is no
+ distro-specific plugin for your system then you can leave
+ this key unset and NetworkManager will fall back to using
+ keyfile.
+
+
- monitor-connection-files
- Whether the configured settings plugin(s)
- should set up file monitors and immediately pick up changes
- made to connection files while NetworkManager is running. This
- is disabled by default; NetworkManager will only read
- the connection files at startup, and when explicitly requested
- via the ReloadConnections D-Bus call. If this key is set to
- 'true', then NetworkManager will reload
- connection files any time they changed.
+ monitor-connection-files
+ Whether the configured settings plugin(s)
+ should set up file monitors and immediately pick up changes
+ made to connection files while NetworkManager is running. This
+ is disabled by default; NetworkManager will only read
+ the connection files at startup, and when explicitly requested
+ via the ReloadConnections D-Bus call. If this key is set to
+ 'true', then NetworkManager will reload
+ connection files any time they changed.
- auth-polkit
- Whether the system uses PolicyKit for authorization.
- If false, all requests will be allowed. If
- true, non-root requests are authorized using PolicyKit.
- The default value is @NM_CONFIG_DEFAULT_AUTH_POLKIT_TEXT@.
-
+ auth-polkit
+ Whether the system uses PolicyKit for authorization.
+ If false, all requests will be allowed. If
+ true, non-root requests are authorized using PolicyKit.
+ The default value is @NM_CONFIG_DEFAULT_AUTH_POLKIT_TEXT@.
+
- dhcp
- This key sets up what DHCP client
- NetworkManager will use. Allowed values are
- dhclient, dhcpcd, and
- internal. The dhclient
- and dhcpcd options require the indicated
- clients to be installed. The internal
- option uses a built-in DHCP client which is not currently as
- featureful as the external clients (and in particular, does
- not yet support DHCPv6).
- If this key is missing, available DHCP clients are
- looked for in this order: dhclient,
- dhcpcd,
- internal.
+ dhcp
+ This key sets up what DHCP client
+ NetworkManager will use. Allowed values are
+ dhclient, dhcpcd, and
+ internal. The dhclient
+ and dhcpcd options require the indicated
+ clients to be installed. The internal
+ option uses a built-in DHCP client which is not currently as
+ featureful as the external clients (and in particular, does
+ not yet support DHCPv6).
+ If this key is missing, available DHCP clients are
+ looked for in this order: dhclient,
+ dhcpcd,
+ internal.
- no-auto-default
- Specify devices for which
- NetworkManager shouldn't create default wired connection
- (Auto eth0). By default, NetworkManager creates a temporary
- wired connection for any Ethernet device that is managed and
- doesn't have a connection configured. List a device in this
- option to inhibit creating the default connection for the
- device. May have the special value * to
- apply to all devices.
- When the default wired connection is deleted or saved
- to a new persistent connection by a plugin, the device is
- added to a list in the file
- /var/run/NetworkManager/no-auto-default.state
- to prevent creating the default connection for that device
- again.
- See for the syntax how to
- specify a device.
-
-
- Example:
-
+ no-auto-default
+ Specify devices for which
+ NetworkManager shouldn't create default wired connection
+ (Auto eth0). By default, NetworkManager creates a temporary
+ wired connection for any Ethernet device that is managed and
+ doesn't have a connection configured. List a device in this
+ option to inhibit creating the default connection for the
+ device. May have the special value * to
+ apply to all devices.
+ When the default wired connection is deleted or saved
+ to a new persistent connection by a plugin, the device is
+ added to a list in the file
+ /var/run/NetworkManager/no-auto-default.state
+ to prevent creating the default connection for that device
+ again.
+ See for the syntax how to
+ specify a device.
+
+
+ Example:
+
no-auto-default=00:22:68:5c:5d:c4,00:1e:65:ff:aa:ee
no-auto-default=eth0,eth1
no-auto-default=*
-
-
-
+
+
+
- ignore-carrier
-
-
- Specify devices for which NetworkManager will (partially)
- ignore the carrier state. Normally, for
- device types that support carrier-detect, such as Ethernet
- and InfiniBand, NetworkManager will only allow a
- connection to be activated on the device if carrier is
- present (ie, a cable is plugged in), and it will
- deactivate the device if carrier drops for more than a few
- seconds.
-
-
- Listing a device here will allow activating connections on
- that device even when it does not have carrier, provided
- that the connection uses only statically-configured IP
- addresses. Additionally, it will allow any active
- connection (whether static or dynamic) to remain active on
- the device when carrier is lost.
-
-
- Note that the "carrier" property of NMDevices and device D-Bus
- interfaces will still reflect the actual device state; it's just
- that NetworkManager will not make use of that information.
-
- See for the syntax how to
- specify a device.
-
-
+ ignore-carrier
+
+
+ Specify devices for which NetworkManager will (partially)
+ ignore the carrier state. Normally, for
+ device types that support carrier-detect, such as Ethernet
+ and InfiniBand, NetworkManager will only allow a
+ connection to be activated on the device if carrier is
+ present (ie, a cable is plugged in), and it will
+ deactivate the device if carrier drops for more than a few
+ seconds.
+
+
+ Listing a device here will allow activating connections on
+ that device even when it does not have carrier, provided
+ that the connection uses only statically-configured IP
+ addresses. Additionally, it will allow any active
+ connection (whether static or dynamic) to remain active on
+ the device when carrier is lost.
+
+
+ Note that the "carrier" property of NMDevices and device D-Bus
+ interfaces will still reflect the actual device state; it's just
+ that NetworkManager will not make use of that information.
+
+ See for the syntax how to
+ specify a device.
+
+
- assume-ipv6ll-only
-
-
- Specify devices for which NetworkManager will try to
- generate a connection based on initial configuration when
- the device only has an IPv6 link-local address.
-
- See for the syntax how to
- specify a device.
-
-
+ assume-ipv6ll-only
+
+
+ Specify devices for which NetworkManager will try to
+ generate a connection based on initial configuration when
+ the device only has an IPv6 link-local address.
+
+ See for the syntax how to
+ specify a device.
+
+
- configure-and-quit
-
-
- When set to 'true', NetworkManager quits after
- performing initial network configuration but spawns small helpers
- to preserve DHCP leases and IPv6 addresses. This is useful in
- environments where network setup is more or less static or it is
- desirable to save process time but still handle some dynamic
- configurations. When this option is true,
- network configuration for WiFi, WWAN, Bluetooth, ADSL, and PPPoE
- interfaces cannot be preserved due to their use of external
- services, and these devices will be deconfigured when NetworkManager
- quits even though other interface's configuration may be preserved.
- Also, to preserve DHCP addresses the 'dhcp' option
- must be set to 'internal'. The default value of
- the 'configure-and-quit' option is
- 'false', meaning that NetworkManager will continue
- running after initial network configuration and continue responding
- to system and hardware events, D-Bus requests, and user commands.
-
-
+ configure-and-quit
+
+
+ When set to 'true', NetworkManager quits after
+ performing initial network configuration but spawns small helpers
+ to preserve DHCP leases and IPv6 addresses. This is useful in
+ environments where network setup is more or less static or it is
+ desirable to save process time but still handle some dynamic
+ configurations. When this option is true,
+ network configuration for WiFi, WWAN, Bluetooth, ADSL, and PPPoE
+ interfaces cannot be preserved due to their use of external
+ services, and these devices will be deconfigured when NetworkManager
+ quits even though other interface's configuration may be preserved.
+ Also, to preserve DHCP addresses the 'dhcp' option
+ must be set to 'internal'. The default value of
+ the 'configure-and-quit' option is
+ 'false', meaning that NetworkManager will continue
+ running after initial network configuration and continue responding
+ to system and hardware events, D-Bus requests, and user commands.
+
+
- dns
- Set the DNS (resolv.conf) processing mode.
- default: The default if the key is
- not specified. NetworkManager will update
- resolv.conf to reflect the nameservers
- provided by currently active connections.
- dnsmasq: NetworkManager will run
- dnsmasq as a local caching nameserver, using a "split DNS"
- configuration if you are connected to a VPN, and then update
- resolv.conf to point to the local
- nameserver.
- unbound: NetworkManager will talk
- to unbound and dnssec-triggerd, providing a "split DNS"
- configuration with DNSSEC support. The /etc/resolv.conf
- will be managed by dnssec-trigger daemon.
- none: NetworkManager will not
- modify resolv.conf.
-
+ dns
+ Set the DNS (resolv.conf) processing mode.
+ default: The default if the key is
+ not specified. NetworkManager will update
+ resolv.conf to reflect the nameservers
+ provided by currently active connections.
+ dnsmasq: NetworkManager will run
+ dnsmasq as a local caching nameserver, using a "split DNS"
+ configuration if you are connected to a VPN, and then update
+ resolv.conf to point to the local
+ nameserver.
+ unbound: NetworkManager will talk
+ to unbound and dnssec-triggerd, providing a "split DNS"
+ configuration with DNSSEC support. The /etc/resolv.conf
+ will be managed by dnssec-trigger daemon.
+ none: NetworkManager will not
+ modify resolv.conf.
+
- rc-manager
- Set the resolv.conf
- management mode. The default value depends on how NetworkManager
- was built.
- none: NetworkManager will directly
- write changes to resolv.conf.
- resolvconf: NetworkManager will run
- resolvconf to update the DNS configuration.
- netconfig: NetworkManager will run
- netconfig to update the DNS configuration.
-
+ rc-manager
+ Set the resolv.conf
+ management mode. The default value depends on how NetworkManager
+ was built.
+ none: NetworkManager will directly
+ write changes to resolv.conf.
+ resolvconf: NetworkManager will run
+ resolvconf to update the DNS configuration.
+ netconfig: NetworkManager will run
+ netconfig to update the DNS configuration.
+
@@ -329,13 +329,13 @@ 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.
-
-
+
+ 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.
+
+ path
@@ -344,23 +344,23 @@ no-auto-default=*
-
- unmanaged-devices
- Set devices that should be ignored by
- NetworkManager.
-
- See for the syntax how to
- specify a device.
-
-
- Example:
-
+
+ unmanaged-devices
+ Set devices that should be ignored by
+ NetworkManager.
+
+ See for the syntax how to
+ specify a device.
+
+
+ Example:
+
unmanaged-devices=interface-name:em4
unmanaged-devices=mac:00:22:68:1c:59:b1;mac:00:1E:65:30:D1:C4;interface-name:eth2
-
-
-
-
+
+
+
+
@@ -372,23 +372,23 @@ unmanaged-devices=mac:00:22:68:1c:59:b1;mac:00:1E:65:30:D1:C4;interface-name:eth
-
- managed
- If set to true, then
- interfaces listed in
- /etc/network/interfaces are managed by
- NetworkManager. If set to false, then
- any interface listed in
- /etc/network/interfaces will be ignored
- by NetworkManager. Remember that NetworkManager controls the
- default route, so because the interface is ignored,
- NetworkManager may assign the default route to some other
- interface.
-
- The default value is false.
-
-
-
+
+ managed
+ If set to true, then
+ interfaces listed in
+ /etc/network/interfaces are managed by
+ NetworkManager. If set to false, then
+ any interface listed in
+ /etc/network/interfaces will be ignored
+ by NetworkManager. Remember that NetworkManager controls the
+ default route, so because the interface is ignored,
+ NetworkManager may assign the default route to some other
+ interface.
+
+ The default value is false.
+
+
+
@@ -401,35 +401,35 @@ unmanaged-devices=mac:00:22:68:1c:59:b1;mac:00:1E:65:30:D1:C4;interface-name:eth
-
- level
- The default logging verbosity level.
- One of OFF, ERR,
- WARN, INFO,
- DEBUG, TRACE. The ERR
- level logs only critical errors. WARN logs warnings that may
- reflect operation. INFO logs various informational messages that
- are useful for tracking state and operations. DEBUG enables
- verbose logging for debugging purposes. TRACE enables even more
- verbose logging then DEBUG level. Subsequent levels also log
- all messages from earlier levels; thus setting the log level
- to INFO also logs error and warning messages.
-
-
- domains
- The following log domains are available:
- PLATFORM, RFKILL, ETHER, WIFI, BT, MB, DHCP4, DHCP6, PPP,
- WIFI_SCAN, IP4, IP6, AUTOIP4, DNS, VPN, SHARING, SUPPLICANT,
- AGENTS, SETTINGS, SUSPEND, CORE, DEVICE, OLPC, WIMAX,
- INFINIBAND, FIREWALL, ADSL, BOND, VLAN, BRIDGE, DBUS_PROPS,
- TEAM, CONCHECK, DCB, DISPATCH, AUDIT.
- In addition, these special domains can be used: NONE,
- ALL, DEFAULT, DHCP, IP.
- You can specify per-domain log level overrides by
- adding a colon and a log level to any domain. E.g.,
- "WIFI:DEBUG,WIFI_SCAN:OFF".
-
-
+
+ level
+ The default logging verbosity level.
+ One of OFF, ERR,
+ WARN, INFO,
+ DEBUG, TRACE. The ERR
+ level logs only critical errors. WARN logs warnings that may
+ reflect operation. INFO logs various informational messages that
+ are useful for tracking state and operations. DEBUG enables
+ verbose logging for debugging purposes. TRACE enables even more
+ verbose logging then DEBUG level. Subsequent levels also log
+ all messages from earlier levels; thus setting the log level
+ to INFO also logs error and warning messages.
+
+
+ domains
+ The following log domains are available:
+ PLATFORM, RFKILL, ETHER, WIFI, BT, MB, DHCP4, DHCP6, PPP,
+ WIFI_SCAN, IP4, IP6, AUTOIP4, DNS, VPN, SHARING, SUPPLICANT,
+ AGENTS, SETTINGS, SUSPEND, CORE, DEVICE, OLPC, WIMAX,
+ INFINIBAND, FIREWALL, ADSL, BOND, VLAN, BRIDGE, DBUS_PROPS,
+ TEAM, CONCHECK, DCB, DISPATCH, AUDIT.
+ In addition, these special domains can be used: NONE,
+ ALL, DEFAULT, DHCP, IP.
+ You can specify per-domain log level overrides by
+ adding a colon and a log level to any domain. E.g.,
+ "WIFI:DEBUG,WIFI_SCAN:OFF".
+
+ Domain descriptions:
PLATFORM : OS (platform) operations
@@ -479,29 +479,29 @@ unmanaged-devices=mac:00:22:68:1c:59:b1;mac:00:1E:65:30:D1:C4;interface-name:eth
-
- backend
- The logging backend. Supported values
- are "debug", "syslog",
- "journal" and "journal-syslog-style.
- "debug" uses syslog and logs to standard error.
- "journal-syslog-style" prints the same message to journal
- as it would print for "syslog", containing redundant
- fields in the text.
- If NetworkManager is started in debug mode (--debug)
- this option is ignored and "debug" is always used.
- Otherwise, the default is "@NM_CONFIG_LOGGING_BACKEND_DEFAULT_TEXT@".
-
-
-
- audit
- Whether the audit records are delivered to
- auditd, the audit daemon. If false, audit
- records will be sent only to the NetworkManager logging
- system. If set to true, they will be also
- sent to auditd. The default value is @NM_CONFIG_DEFAULT_LOGGING_AUDIT_TEXT@.
-
-
+
+ backend
+ The logging backend. Supported values
+ are "debug", "syslog",
+ "journal" and "journal-syslog-style.
+ "debug" uses syslog and logs to standard error.
+ "journal-syslog-style" prints the same message to journal
+ as it would print for "syslog", containing redundant
+ fields in the text.
+ If NetworkManager is started in debug mode (--debug)
+ this option is ignored and "debug" is always used.
+ Otherwise, the default is "@NM_CONFIG_LOGGING_BACKEND_DEFAULT_TEXT@".
+
+
+
+ audit
+ Whether the audit records are delivered to
+ auditd, the audit daemon. If false, audit
+ records will be sent only to the NetworkManager logging
+ system. If set to true, they will be also
+ sent to auditd. The default value is @NM_CONFIG_DEFAULT_LOGGING_AUDIT_TEXT@.
+
+
@@ -629,32 +629,32 @@ ipv6.ip6-privacy=1
-
- uri
- The URI of a web page to periodically
- request when connectivity is being checked. This page
- should return the header "X-NetworkManager-Status" with a
- value of "online". Alternatively, it's body content should
- be set to "NetworkManager is online". The body content
- check can be controlled by the response
- option. If this option is blank or missing, connectivity
- checking is disabled.
-
-
-
- interval
- Specified in seconds; controls how often
- connectivity is checked when a network connection exists. If
- set to 0 connectivity checking is disabled. If missing, the
- default is 300 seconds.
-
-
- response
- If set controls what body content
- NetworkManager checks for when requesting the URI for
- connectivity checking. If missing, defaults to
- "NetworkManager is online"
-
+
+ uri
+ The URI of a web page to periodically
+ request when connectivity is being checked. This page
+ should return the header "X-NetworkManager-Status" with a
+ value of "online". Alternatively, it's body content should
+ be set to "NetworkManager is online". The body content
+ check can be controlled by the response
+ option. If this option is blank or missing, connectivity
+ checking is disabled.
+
+
+
+ interval
+ Specified in seconds; controls how often
+ connectivity is checked when a network connection exists. If
+ set to 0 connectivity checking is disabled. If missing, the
+ default is 300 seconds.
+
+
+ response
+ If set controls what body content
+ NetworkManager checks for when requesting the URI for
+ connectivity checking. If missing, defaults to
+ "NetworkManager is online"
+
@@ -665,22 +665,22 @@ ipv6.ip6-privacy=1
connection-specific configuration.
-
- searches
-
-
- A list of search domains to be used during hostname lookup.
-
-
-
-
- options
-
-
- A list of of options to be passed to the hostname resolver.
-
-
-
+
+ searches
+
+
+ A list of search domains to be used during hostname lookup.
+
+
+
+
+ options
+
+
+ A list of of options to be passed to the hostname resolver.
+
+
+
@@ -697,22 +697,22 @@ ipv6.ip6-privacy=1
-
- servers
-
-
- A list of addresses of DNS servers to be used for the given domain.
-
-
-
-
- options
-
-
- A list of domain-specific DNS options. Not used at the moment.
-
-
-
+
+ servers
+
+
+ A list of addresses of DNS servers to be used for the given domain.
+
+
+
+
+ options
+
+
+ A list of domain-specific DNS options. Not used at the moment.
+
+
+
@@ -811,86 +811,86 @@ enable=nm-version-min:1.3,nm-version-min:1.2.6,nm-version-min:1.0.16
- keyfile
-
-
- The keyfile plugin is the generic
- 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.
-
-
- The stored connection file may contain passwords and
- private keys, so it will be made readable only to root,
- and the plugin will ignore files that are readable or
- writable by any user or group other than root.
-
-
- This plugin is always active, and will automatically be
- used to store any connections that aren't supported by any
- other active plugin.
-
-
+ keyfile
+
+
+ The keyfile plugin is the generic
+ 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.
+
+
+ The stored connection file may contain passwords and
+ private keys, so it will be made readable only to root,
+ and the plugin will ignore files that are readable or
+ writable by any user or group other than root.
+
+
+ This plugin is always active, and will automatically be
+ used to store any connections that aren't supported by any
+ other active plugin.
+
+
- ifcfg-rh
-
-
- This plugin is used on the Fedora and Red Hat Enterprise
- Linux distributions to read and write configuration from
- the standard
- /etc/sysconfig/network-scripts/ifcfg-*
- files. It currently supports reading Ethernet, Wi-Fi,
- InfiniBand, VLAN, Bond, Bridge, and Team connections.
- Enabling ifcfg-rh implicitly enables
- ibft plugin, if it is available.
- This can be disabled by adding no-ibft.
-
-
+ ifcfg-rh
+
+
+ This plugin is used on the Fedora and Red Hat Enterprise
+ Linux distributions to read and write configuration from
+ the standard
+ /etc/sysconfig/network-scripts/ifcfg-*
+ files. It currently supports reading Ethernet, Wi-Fi,
+ InfiniBand, VLAN, Bond, Bridge, and Team connections.
+ Enabling ifcfg-rh implicitly enables
+ ibft plugin, if it is available.
+ This can be disabled by adding no-ibft.
+
+
- ifcfg-suse
-
-
- This plugin is deprecated and its selection has no effect.
- The keyfile plugin should be used
- instead.
-
-
+ ifcfg-suse
+
+
+ This plugin is deprecated and its selection has no effect.
+ The keyfile plugin should be used
+ instead.
+
+
- ifupdown
-
-
- This plugin is used on the Debian and Ubuntu
- distributions, and reads Ethernet and Wi-Fi connections
- from /etc/network/interfaces.
-
-
- This plugin is read-only; any connections (of any type)
- added from within NetworkManager when you are using this
- plugin will be saved using the keyfile
- plugin instead.
-
-
+ ifupdown
+
+
+ This plugin is used on the Debian and Ubuntu
+ distributions, and reads Ethernet and Wi-Fi connections
+ from /etc/network/interfaces.
+
+
+ This plugin is read-only; any connections (of any type)
+ added from within NetworkManager when you are using this
+ plugin will be saved using the keyfile
+ plugin instead.
+
+
- ibft, no-ibft
-
-
- 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.
- 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.
-
-
+ ibft, no-ibft
+
+
+ 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.
+ 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.
+
+
diff --git a/man/NetworkManager.xml b/man/NetworkManager.xml
index 2df37d9a5..d50c206cc 100644
--- a/man/NetworkManager.xml
+++ b/man/NetworkManager.xml
@@ -286,79 +286,79 @@
- |
- Print the NetworkManager software version and exit.
-
+ |
+ Print the NetworkManager software version and exit.
+
- |
- Print NetworkManager's available options and exit.
-
+ |
+ Print NetworkManager's available options and exit.
+
- |
- Do not daemonize.
-
+ |
+ Do not daemonize.
+
- |
- Do not daemonize, and direct log output to the
- controlling terminal in addition to syslog.
-
+ |
+ Do not daemonize, and direct log output to the
+ controlling terminal in addition to syslog.
+
- |
- Specify location of a PID file. The PID file
- is used for storing PID of the running process and prevents
- running multiple instances.
-
+ |
+ Specify location of a PID file. The PID file
+ is used for storing PID of the running process and prevents
+ running multiple instances.
+
-
- Specify file for storing state of the
- NetworkManager persistently. If not specified, the default
- value of /var/lib/NetworkManager/NetworkManager.state is used.
-
+
+ Specify file for storing state of the
+ NetworkManager persistently. If not specified, the default
+ 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
- a fallback to the older 'nm-system-settings.conf' if located
- in the same directory. See
- NetworkManager.conf5
- for more information on configuration file.
-
+
+ Specify configuration file to set up various
+ settings for NetworkManager. If not specified, the default
+ 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
+ for more information on configuration file.
+
-
- List plugins used to manage system-wide
- connection settings. This list has preference over plugins
- specified in the configuration file. Currently supported
- plugins are: keyfile, ,
- , .
-
+
+ List plugins used to manage system-wide
+ connection settings. This list has preference over plugins
+ specified in the configuration file. Currently supported
+ plugins are: keyfile, ,
+ , .
+
-
-
- Sets how much information NetworkManager sends to the log destination (usually
- syslog's "daemon" facility). By default, only informational, warning, and error
- messages are logged. See the section on logging in
- NetworkManager.conf5
- for more information.
-
+
+
+ Sets how much information NetworkManager sends to the log destination (usually
+ syslog's "daemon" facility). By default, only informational, warning, and error
+ messages are logged. See the section on logging in
+ NetworkManager.conf5
+ for more information.
+
-
-
- A comma-separated list specifying which operations are logged to the log
- destination (usually syslog). By default, most domains are logging-enabled.
- See the section on logging in
- NetworkManager.conf5
- for more information.
-
+
+
+ A comma-separated list specifying which operations are logged to the log
+ destination (usually syslog). By default, most domains are logging-enabled.
+ See the section on logging in
+ NetworkManager.conf5
+ for more information.
+
@@ -380,18 +380,18 @@
- NM_UNMANAGED
-
- No default connection will be created and automatic activation
- will not be attempted when this property of a device is set to a
- true value ("1" or "true"). You will still be able to attach a
- connection to the device manually or observe externally added
- configuration such as addresses or routes.
-
- Create an udev rule that sets this property to prevent NetworkManager
- from interfering with virtual Ethernet device interfaces that are
- managed by virtualization tools.
-
+ NM_UNMANAGED
+
+ No default connection will be created and automatic activation
+ will not be attempted when this property of a device is set to a
+ true value ("1" or "true"). You will still be able to attach a
+ connection to the device manually or observe externally added
+ configuration such as addresses or routes.
+
+ Create an udev rule that sets this property to prevent NetworkManager
+ from interfering with virtual Ethernet device interfaces that are
+ managed by virtualization tools.
+
diff --git a/man/nmcli-examples.xml b/man/nmcli-examples.xml
index a0da09cc2..d4ba71722 100644
--- a/man/nmcli-examples.xml
+++ b/man/nmcli-examples.xml
@@ -284,20 +284,20 @@ export LC_ALL=C
enable_disable_wifi ()
{
- result=$(nmcli dev | grep "ethernet" | grep -w "connected")
- if [ -n "$result" ]; then
- nmcli radio wifi off
- else
- nmcli radio wifi on
- fi
+ result=$(nmcli dev | grep "ethernet" | grep -w "connected")
+ if [ -n "$result" ]; then
+ nmcli radio wifi off
+ else
+ nmcli radio wifi on
+ fi
}
if [ "$2" = "up" ]; then
- enable_disable_wifi
+ enable_disable_wifi
fi
if [ "$2" = "down" ]; then
- enable_disable_wifi
+ enable_disable_wifi
fi