# HG changeset patch
# User Oleksandr Gavenko <gavenkoa@gmail.com>
# Date 1290803985 -7200
# Node ID 991c7ffa6f44ef8491ad659298eb2d0727c1e088
# Parent  02bd68afca426397070a3b8f663bc47da8192e07# Parent  7b90e8428f8a8c5a57d2ab59eb633fed8bd203a4
merged

diff -r 7b90e8428f8a -r 991c7ffa6f44 net.rst
--- a/net.rst	Thu Nov 25 23:17:45 2010 +0200
+++ b/net.rst	Fri Nov 26 22:39:45 2010 +0200
@@ -98,3 +98,8 @@
 
   cmd> rundll32.exe keymgr.dll, KRShowKeyMgr
   cmd> control userpasswords2                 # another way
+
+* Proxy auto-config.
+
+  http://en.wikipedia.org/wiki/Proxy_auto-config
+