# HG changeset patch
# User Oleksandr Gavenko <gavenkoa@gmail.com>
# Date 1290785132 -7200
# Node ID 02bd68afca426397070a3b8f663bc47da8192e07
# Parent  c1def2bc1c9577c3c5d260d0331a58839a3fdc6c# Parent  26d32cdbd4082aedefbfb1634756ce1ed915d137
Automated merge with file:///cygdrive/d/srv/hg-home/tips

diff -r c1def2bc1c95 -r 02bd68afca42 net.rst
--- a/net.rst	Mon Nov 22 00:11:34 2010 +0200
+++ b/net.rst	Fri Nov 26 17:25:32 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
+