From b5ffcf46f1ea794d5029a36e279e6a7e6277e0bc Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Mon, 12 May 2014 19:12:28 +0200 Subject: [PATCH] doc: update documentation to show all logging domains Also, mention the deprecated alias HW in man/NetworkManager.conf Signed-off-by: Thomas Haller --- introspection/nm-manager.xml | 11 ++++++----- man/NetworkManager.conf.xml | 2 ++ man/nmcli-examples.xml | 2 +- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/introspection/nm-manager.xml b/introspection/nm-manager.xml index 986aac12d1..6af2be3032 100644 --- a/introspection/nm-manager.xml +++ b/introspection/nm-manager.xml @@ -222,13 +222,14 @@ A combination of logging domains separated by commas (','), or "NONE" to disable logging. Each domain enables logging for operations - related to that domain. Available domains are: [HW, RFKILL, ETHER, + related to that domain. Available domains are: [PLATFORM, 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]. In addition to - these domains, the following special domains can be used: [NONE, ALL, - DEFAULT, DHCP, IP]. You can also specify that some domains should - log at a different level from the default by appending a colon (':') + OLPC, WIMAX, INFINIBAND, FIREWALL, ADSL, BOND, VLAN, BRIDGE, DBUS_PROPS, + TEAM, CONCHECK, DCB, DISPATCH]. + In addition to these domains, the following special domains can be used: + [NONE, ALL, DEFAULT, DHCP, IP]. You can also specify that some domains + should log at a different level from the default by appending a colon (':') and a log level (eg, 'WIFI:DEBUG'). If an empty string is given, the log level is changed but the current set of log domains remains unchanged. diff --git a/man/NetworkManager.conf.xml b/man/NetworkManager.conf.xml index 65c22a1a4a..f4460c24aa 100644 --- a/man/NetworkManager.conf.xml +++ b/man/NetworkManager.conf.xml @@ -370,6 +370,8 @@ unmanaged-devices=mac:00:22:68:1c:59:b1;mac:00:1E:65:30:D1:C4;interface-name:eth DEFAULT : default log domains DHCP : shortcut for "DHCP4,DHCP6" IP : shortcut for "IP4,IP6" + + HW : deprecated alias for "PLATFORM" diff --git a/man/nmcli-examples.xml b/man/nmcli-examples.xml index 51db0a1e1f..9efa94be32 100644 --- a/man/nmcli-examples.xml +++ b/man/nmcli-examples.xml @@ -154,7 +154,7 @@ $ nmcli general logging 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,DISPATCH +INFO PLATFORM,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,BRIDGE,DBUS_PROPS,TEAM,CONCHECK,DCB,DISPATCH