about summary refs log tree commit diff
path: root/docs/api/html/NetworkManager.conf.html
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2017-11-10 19:02:48 +0100
committerMichael Biebl <biebl@debian.org>2017-11-10 19:02:48 +0100
commit4e1c814f22fad7d608be50c06da48dc0cce5e6ab (patch)
treed09d385427d3c44eb9466947d3f594d634c70bd5 /docs/api/html/NetworkManager.conf.html
parent0ff08df7a88ff2db7224c42fb116760583ccc9e5 (diff)
parent417f6015c3dc8c47cf27daa59f64e0e36c521b9c (diff)
Update upstream source from tag 'upstream/1.10.0'
Update to upstream version '1.10.0'
with Debian dir af7806badea58a4a163c33d4c52e9411052b4e15
Diffstat (limited to 'docs/api/html/NetworkManager.conf.html')
-rw-r--r--docs/api/html/NetworkManager.conf.html3
1 files changed, 2 insertions, 1 deletions
diff --git a/docs/api/html/NetworkManager.conf.html b/docs/api/html/NetworkManager.conf.html
index c4e0d23e..39597511 100644
--- a/docs/api/html/NetworkManager.conf.html
+++ b/docs/api/html/NetworkManager.conf.html
@@ -536,7 +536,8 @@ 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, DISPATCH, AUDIT, SYSTEMD, VPN_PLUGIN.</p>
+          TEAM, CONCHECK, DCB, DISPATCH, AUDIT, SYSTEMD, VPN_PLUGIN,
+          PROXY.</p>
 <p>In addition, these special domains can be used: NONE,
           ALL, DEFAULT, DHCP, IP.</p>
 <p>You can specify per-domain log level overrides by