summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2014-04-24 17:27:47 +0200
committerThomas Haller <thaller@redhat.com>2014-04-24 17:27:47 +0200
commit9305c5bbf7fcfb9f58c59bcb3621cbe1fff964bc (patch)
treecbc8d0dae242965f66e12fdd2f4653bfc19f352e
parentf69842aa57310ec2cf86466119c02c27aac5ac8e (diff)
downloadNetworkManager-9305c5bbf7fcfb9f58c59bcb3621cbe1fff964bc.tar.gz
man/cli: add missing log domains to manual page and nmcli bash completion
Signed-off-by: Thomas Haller <thaller@redhat.com>
-rw-r--r--cli/completion/nmcli2
-rw-r--r--man/NetworkManager.conf.xml3
-rw-r--r--man/nmcli-examples.xml2
3 files changed, 4 insertions, 3 deletions
diff --git a/cli/completion/nmcli b/cli/completion/nmcli
index c15fde34ee..7967010f90 100644
--- a/cli/completion/nmcli
+++ b/cli/completion/nmcli
@@ -275,7 +275,7 @@ _nmcli_compl_ARGS()
;;
domains)
if [[ "${#words[@]}" -eq 2 ]]; then
- local OPTIONS_DOM=(ALL DEFAULT PLATFORM RFKILL ETHER WIFI BT MB DHCP4 DHCP6 PPP WIFI_SCAN IP4 IP6 AUTOIP4 DNS VPN SHARING SUPPLICANT AGENTS SETTINGS SUSPEND CORE DEVICE OLPC_MESH WIMAX INFINIBAND FIREWALL ADSL BOND VLAN BRIDGE DBUS_PROPS TEAM CONCHECK)
+ local OPTIONS_DOM=(ALL DEFAULT PLATFORM RFKILL ETHER WIFI BT MB DHCP4 DHCP6 PPP WIFI_SCAN IP4 IP6 AUTOIP4 DNS VPN SHARING SUPPLICANT AGENTS SETTINGS SUSPEND CORE DEVICE OLPC_MESH WIMAX INFINIBAND FIREWALL ADSL BOND VLAN BRIDGE DBUS_PROPS TEAM CONCHECK DCB DISPATCH)
if [[ "${words[1]}" != "" ]]; then
# split the comma separaeted domain string into its parts LOGD
diff --git a/man/NetworkManager.conf.xml b/man/NetworkManager.conf.xml
index afff8ab895..6a7a4b9fd0 100644
--- a/man/NetworkManager.conf.xml
+++ b/man/NetworkManager.conf.xml
@@ -305,7 +305,7 @@ unmanaged-devices=mac:00:22:68:1c:59:b1;mac:00:1E:65:30:D1:C4;interface-name:eth
WIFI_SCAN, IP4, IP6, AUTOIP4, DNS, VPN, SHARING, SUPPLICANT,
AGENTS, SETTINGS, SUSPEND, CORE, DEVICE, OLPC, WIMAX,
INFINIBAND, FIREWALL, ADSL, BOND, VLAN, BRIDGE, DBUS_PROPS,
- TEAM, CONCHECK, DCB.</para>
+ TEAM, CONCHECK, DCB, DISPATCH.</para>
<para>In addition, these special domains can be used: NONE,
ALL, DEFAULT, DHCP, IP.</para>
<para>You can specify per-domain log level overrides by
@@ -349,6 +349,7 @@ unmanaged-devices=mac:00:22:68:1c:59:b1;mac:00:1E:65:30:D1:C4;interface-name:eth
<member>TEAM : Teaming operations</member>
<member>CONCHECK : Connectivity check</member>
<member>DCB : Data Center Bridging (DCB) operations</member>
+ <member>DISPATCH : Dispatcher scripts</member>
<member> </member>
<member>NONE : when given by itself logging is disabled</member>
<member>ALL : all log domains</member>
diff --git a/man/nmcli-examples.xml b/man/nmcli-examples.xml
index e486c48c27..51db0a1e1f 100644
--- a/man/nmcli-examples.xml
+++ b/man/nmcli-examples.xml
@@ -154,7 +154,7 @@ $ nmcli general logging
</emphasis></synopsis>
<screen>
LEVEL DOMAINS
-INFO PLATFORM,RFKILL,ETHER,WIFI,BT,MB,DHCP4,DHCP6,PPP,IP4,IP6,AUTOIP4,DNS,VPN,SHARING,SUPPLICANT,AGENTS,SETTINGS,SUSPEND,CORE,DEVICE,OLPC,WIMAX,INFINIBAND,FIREWALL,ADSL,BOND,VLAN,BRIDGE,TEAM,CONCHECK,DCB
+INFO PLATFORM,RFKILL,ETHER,WIFI,BT,MB,DHCP4,DHCP6,PPP,IP4,IP6,AUTOIP4,DNS,VPN,SHARING,SUPPLICANT,AGENTS,SETTINGS,SUSPEND,CORE,DEVICE,OLPC,WIMAX,INFINIBAND,FIREWALL,ADSL,BOND,VLAN,BRIDGE,TEAM,CONCHECK,DCB,DISPATCH
</screen>
</example>
<para>