Automated merge with file:///cygdrive/d/srv/hg-home/tips
authorOleksandr Gavenko <gavenkoa@gmail.com>
Fri, 26 Nov 2010 17:25:32 +0200
changeset 714 02bd68afca42
parent 712 c1def2bc1c95 (current diff)
parent 713 26d32cdbd408 (diff)
child 716 991c7ffa6f44
Automated merge with file:///cygdrive/d/srv/hg-home/tips
--- 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
+