diff options
| author | Dan Williams <dcbw@redhat.com> | 2011-01-12 15:46:37 -0600 |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2011-01-12 15:46:37 -0600 |
| commit | f9ceafd4a124142617280101eda5464ac67c5e39 (patch) | |
| tree | cd336e771bf30ba1ee0347037a7f47095fc04c58 /man | |
| parent | 7de13fa58dca796493b623fcba00d468f3aaa9f6 (diff) | |
| parent | 5a35862a1d24fb8d515ea09339123646370c2845 (diff) | |
| download | NetworkManager-f9ceafd4a124142617280101eda5464ac67c5e39.tar.gz | |
Merge remote branch 'origin/master' into rm-userset
Diffstat (limited to 'man')
| -rw-r--r-- | man/NetworkManager.8.in | 2 | ||||
| -rw-r--r-- | man/NetworkManager.conf.5.in | 20 |
2 files changed, 13 insertions, 9 deletions
diff --git a/man/NetworkManager.8.in b/man/NetworkManager.8.in index 4f700e9a38..92c6e5aa26 100644 --- a/man/NetworkManager.8.in +++ b/man/NetworkManager.8.in @@ -52,8 +52,10 @@ A VPN connection has been deactivated. .TP .I "hostname" The system hostname has been updated. Use gethostname(2) to retrieve it. +.TP .I "dhcp4\-change" The DHCPv4 lease has changed (renewed, rebound, etc). +.TP .I "dhcp6\-change" The DHCPv6 lease has changed (renewed, rebound, etc). .SH OPTIONS 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 |