diff options
Diffstat (limited to 'man/NetworkManager.conf.5')
| -rw-r--r-- | man/NetworkManager.conf.5 | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/man/NetworkManager.conf.5 b/man/NetworkManager.conf.5 index f9588080..e595076a 100644 --- a/man/NetworkManager.conf.5 +++ b/man/NetworkManager.conf.5 @@ -1,8 +1,8 @@ .\" NetworkManager.conf(5) manual page .\" -.\" Copyright (C) 2010 - 2012 Red Hat, Inc. +.\" Copyright (C) 2010 - 2013 Red Hat, Inc. .\" -.TH "NetworkManager.conf" "5" "18 December 2012" "" +.TH "NetworkManager.conf" "5" "17 January 2013" "" .SH NAME NetworkManager.conf \- NetworkManager configuration file .SH SYNOPSIS @@ -160,7 +160,7 @@ warning messages. The following log domains are available: [HW, 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]. +VLAN, BRIDGE]. .br In addition to them, these special domains can be used: [NONE, ALL, DEFAULT, DHCP, IP]. .PP @@ -234,6 +234,8 @@ BOND = Bonding device operations .br VLAN = VLAN device operations .br +BRIDGE = Bridging device operations +.br .SS [connectivity] This section controls NetworkManager's optional connectivity checking functionality. This allows NetworkManager to detect whether or not the system @@ -260,4 +262,5 @@ URI for connectivity checking. If missing, defaults to "NetworkManager is onlin .BR NetworkManager (8), .BR nmcli (1), .BR nm\-tool (1), -.BR nm\-online (1). +.BR nm\-online (1), +.BR nm\-settings (5). |