diff --git a/man/NetworkManager.8.in b/man/NetworkManager.8.in index 4cd64c753a..a6be073170 100644 --- a/man/NetworkManager.8.in +++ b/man/NetworkManager.8.in @@ -8,7 +8,7 @@ .SH NAME NetworkManager \- network management daemon .SH SYNOPSIS -.B NetworkManager [\-\-no\-daemon] [\-\-pid\-file=] [\-\-state\-file=] [\-\-config=] [\-\-plugins=,plugin2>,...] [\-\-log-level=] [\-\-log-domain=,,...] +.B NetworkManager [\-\-no\-daemon] [\-\-pid\-file=] [\-\-state\-file=] [\-\-config=] [\-\-plugins=,plugin2>,...] [\-\-log\-level=] [\-\-log\-domains=,,...] .SH DESCRIPTION The \fINetworkManager\fP daemon attempts to make networking configuration and operation as painless and automatic as possible by managing the primary network @@ -55,7 +55,7 @@ The system hostname has been updated. Use gethostname(2) to retrieve it. .SH OPTIONS The following options are supported: .TP -.I "\-\-no-daemon" +.I "\-\-no\-daemon" Do not daemonize. This is useful for debugging, and directs log output to the controlling terminal in addition to syslog. .TP @@ -82,13 +82,13 @@ preference over plugins specified in the configuration file. Currently supporte plugins are: keyfile, ifcfg\-rh, ifcfg\-suse, ifupdown. See \fBNetworkManager.conf\fP(5) for more information on the plugins. .TP -.I "\-\-log-level= +.I "\-\-log\-level= 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 \fBNetworkManager.conf\fP(5) for more information on log levels and domains. .TP -.I "\-\-log-domains=,, ... +.I "\-\-log\-domains=,, ... Sets which operations are logged to the log destination (usually syslog). By default, most domains are logging-enabled. See \fBNetworkManager.conf\fP(5) for more information on log levels and domains. @@ -96,7 +96,7 @@ more information on log levels and domains. The following environment variables are supported to help debugging. When used in conjunction with the "\-\-no\-daemon" option (thus echoing PPP and DHCP helper output to stdout) these can quickly help pinpoint the source of connection -issues. Also see the \-\-log- and \-\-log-domains to enable debug logging inside +issues. Also see the \-\-log\-level and \-\-log\-domains to enable debug logging inside NetworkManager itself. .TP .I "NM_PPP_DEBUG" diff --git a/man/NetworkManager.conf.5.in b/man/NetworkManager.conf.5.in index 783bafbda6..c3af611675 100644 --- a/man/NetworkManager.conf.5.in +++ b/man/NetworkManager.conf.5.in @@ -16,8 +16,8 @@ where depends on your distribution or build. .SH DESCRIPTION .P .I NetworkManager.conf -is a configuration file for NetworkManager. As the name suggests, it configures -how NetworkManager handles system-wide connection settings. The location of +is a configuration file for NetworkManager. It is used to set up various +aspects of NetworkManager's behavior. The location of the file may be changed through use of the "\-\-config=" argument for \fBNetworkManager\fP (8). @@ -81,11 +81,26 @@ plugin is only provided for simple backward compatibility with SUSE and OpenSUSE Most setups should be using the \fIkeyfile\fP plugin instead. The \fIifcfg\-suse\fP plugin supports reading wired and WiFi connections, but does not support saving any connection types. .RE +.TP +.B dhcp=\fIdhclient\fP | \fIdhcpcd\fP +This key sets up what DHCP client NetworkManager will use. Presently +\fIdhclient\fP and \fIdhcpcd\fP are supported. The client configured here should +be available on your system too. If this key is missing, available DHCP clients +are looked for in this order: dhclient, dhcpcd. .SS [keyfile] This section contains keyfile-specific options and thus only has effect when using \fIkeyfile\fP plugin. .TP .B hostname=\fI\fP Set a persistent hostname when using the \fIkeyfile\fP plugin. +.TP +.B unmanaged-devices=\fImac:\fP;\fImac:\fP;... +Set devices that should be ignored by NetworkManager when using the \fIkeyfile\fP +plugin. Devices are specified in the following format: "mac:", where + is MAC address of the device to be ignored, in lowercase. Multiple +entries are separated by a semicolon. Example: +.nf +unmanaged-devices=mac:00:22:68:1c:59:b1;mac:00:1e:65:30:d1:c4 +.fi .SS [ifupdown] This section contains ifupdown-specific options and thus only has effect when using \fIifupdown\fP plugin. .TP @@ -99,7 +114,7 @@ some other interface. When the option is missing, \fIfalse\fP value is taken as default. .SS [logging] This section controls NetworkManager's logging. Any settings here are -overridden by the --log-level and --log-domain command-line options. +overridden by the \-\-log\-level and \-\-log\-domains command-line options. .TP .B level=\fI\fP One of [ERR, WARN, INFO, DEBUG]. The ERR level logs only critical errors. WARN