diff options
Diffstat (limited to 'man/NetworkManager.conf.5.in')
| -rw-r--r-- | man/NetworkManager.conf.5.in | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/man/NetworkManager.conf.5.in b/man/NetworkManager.conf.5.in index 0f061ea048..20a8e3ad9b 100644 --- a/man/NetworkManager.conf.5.in +++ b/man/NetworkManager.conf.5.in @@ -2,7 +2,7 @@ .\" .\" Copyright (C) 2010 Red Hat, Inc. .\" -.TH "NetworkManager.conf" "5" "16 September 2010" "" +.TH "NetworkManager.conf" "5" "23 November 2010" "" .SH NAME NetworkManager.conf \- NetworkManager configuration file .SH SYNOPSIS @@ -129,10 +129,12 @@ Set a persistent hostname when using the \fIkeyfile\fP plugin. .B unmanaged-devices=\fImac:<hwaddr>\fP;\fImac:<hwaddr>\fP;... Set devices that should be ignored by NetworkManager when using the \fIkeyfile\fP plugin. Devices are specified in the following format: "mac:<hwaddr>", where -<hwaddr> is MAC address of the device to be ignored, in lowercase. Multiple -entries are separated by a semicolon. Example: +<hwaddr> is MAC address of the device to be ignored, in hex-digits-and-colons notation. +Multiple entries are separated by a semicolon. No spaces are allowed in the value. +.br +Example: .nf -unmanaged-devices=mac:00:22:68:1c:59:b1;mac:00:1e:65:30:d1:c4 +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. @@ -160,11 +162,11 @@ warning messages. .B domains=\fI<domain1>,<domain2>, ...\fP The following log domains are available: [NONE, HW, RKILL, ETHER, WIFI, BT, MB, DHCP4, DHCP6, PPP, WIFI_SCAN, IP4, IP6, AUTOIP4, DNS, VPN, SHARING, SUPPLICANT, -USER_SET, SETTINGS, SUSPEND, CORE, DEVICE, OLPC]. When "NONE" is given by itself, -logging is disabled. MB = Mobile Broadband, AGENTS = secret agents operations -and communication, SETTINGS = settings/config service operations, OLPC = OLPC -Mesh device operations, CORE = core daemon operations, DEVICE = activation and -general interface operations. +AGENTS, SETTINGS, SUSPEND, CORE, DEVICE, OLPC, WIMAX]. When "NONE" is given by +itself, logging is disabled. MB = Mobile Broadband, AGENTS = secret agents +operations and communication, SETTINGS = settings/config service operations, +OLPC = OLPC Mesh device operations, CORE = core daemon operations, DEVICE = +activation and general interface operations. .SH "SEE ALSO" .BR http://live.gnome.org/NetworkManager/SystemSettings .sp |