Imported Upstream version 0.8.3.998 upstream/0.8.3.998

5 files changed, 23 insertions, 10 deletions

diff --git a/man/Makefile.in b/man/Makefile.in
index 828a60e8..0be51b3c 100644
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -182,6 +182,10 @@ MSGFMT_OPTS = @MSGFMT_OPTS@
 MSGMERGE = @MSGMERGE@
 NM = @NM@
 NMEDIT = @NMEDIT@
+NM_MAJOR_VERSION = @NM_MAJOR_VERSION@
+NM_MICRO_VERSION = @NM_MICRO_VERSION@
+NM_MINOR_VERSION = @NM_MINOR_VERSION@
+NM_VERSION = @NM_VERSION@
 NSS_CFLAGS = @NSS_CFLAGS@
 NSS_LIBS = @NSS_LIBS@
 OBJDUMP = @OBJDUMP@
@@ -196,6 +200,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
+PKGCONFIG_PATH = @PKGCONFIG_PATH@
 PKG_CONFIG = @PKG_CONFIG@
 PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
diff --git a/man/NetworkManager.8 b/man/NetworkManager.8
index 4f700e9a..92c6e5aa 100644
--- a/man/NetworkManager.8
+++ b/man/NetworkManager.8
@@ -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.8.in b/man/NetworkManager.8.in
index 4f700e9a..92c6e5aa 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 b/man/NetworkManager.conf.5
index ba575c94..acacb432 100644
--- a/man/NetworkManager.conf.5
+++ b/man/NetworkManager.conf.5
@@ -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.
@@ -158,7 +160,7 @@ from earlier levels; thus setting the log level to INFO also logs error and
 warning messages.
 .TP
 .B domains=\fI<domain1>,<domain2>, ...\fP
-The following log domains are available: [NONE, HW, RKILL, ETHER, WIFI, BT, MB,
+The following log domains are available: [NONE, HW, RFKILL, ETHER, WIFI, BT, MB,
 DHCP4, DHCP6, PPP, WIFI_SCAN, IP4, IP6, AUTOIP4, DNS, VPN, SHARING, SUPPLICANT,
 USER_SET, SYS_SET, SUSPEND, CORE, DEVICE, OLPC].  When "NONE" is given by itself,
 logging is disabled.  MB = Mobile Broadband, USER_SET = user settings operations
diff --git a/man/NetworkManager.conf.5.in b/man/NetworkManager.conf.5.in
index ba575c94..acacb432 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.
@@ -158,7 +160,7 @@ from earlier levels; thus setting the log level to INFO also logs error and
 warning messages.
 .TP
 .B domains=\fI<domain1>,<domain2>, ...\fP
-The following log domains are available: [NONE, HW, RKILL, ETHER, WIFI, BT, MB,
+The following log domains are available: [NONE, HW, RFKILL, ETHER, WIFI, BT, MB,
 DHCP4, DHCP6, PPP, WIFI_SCAN, IP4, IP6, AUTOIP4, DNS, VPN, SHARING, SUPPLICANT,
 USER_SET, SYS_SET, SUSPEND, CORE, DEVICE, OLPC].  When "NONE" is given by itself,
 logging is disabled.  MB = Mobile Broadband, USER_SET = user settings operations