linux: unify proxy config docs

chrome/app/resources/manpage.1.in

Index: chrome/app/resources/manpage.1.in
diff --git a/chrome/app/resources/manpage.1.in b/chrome/app/resources/manpage.1.in
index 98a215d59a6f31b71f548c4465af45e23f77f316..719dcc906f89b5d7b87f5723dfad5040bf1a930d 100644
--- a/chrome/app/resources/manpage.1.in
+++ b/chrome/app/resources/manpage.1.in
@@ -52,8 +52,9 @@ or settings picked via the options dialog.
 
 .TP
 \fB\-\-proxy-pac-url\fR=\fIURL\fR
-Specify proxy autoconfiguration URL.  Overrides any environment variables
-or settings picked via the options dialog.
+Defined and empty means "autodetect proxy settings", while non-empty

[eroman, 2010/04/28 01:41:26]

Are you sure about this?

I thought you needed to pass --proxy-auto-detect to trigger autodetect.

[Evan Martin, 2010/04/28 01:48:23]

Oh, I got overzealous in merging docs.  The old docs should stay!.  (I see
proxy-auto-detect directly above!)

+specifies the proxy autoconfig URL.  Overrides any environment
+variables or settings picked via the options dialog.
 
 .PP
 As a GTK+ app, @@NAME@@ also obeys GTK+ command-line flags, such
@@ -86,6 +87,16 @@ command-line flags to set these when you want to force their values.
 Specify proxy autoconfiguration.  Defined and empty autodetects; otherwise,
 it should be an autoconfig URL.  But see above note about Gnome/KDE.
 
+.TP
+.B SOCKS_SERVER
+SOCKS proxy server (defaults to SOCKS v4, also set
+.B SOCKS_VERSION=5
+to use SOCKS v5).
+
+.TP
+.B no_proxy
+Comma separated list of hosts or patterns to bypass proxying.
+
 .SH FILES
 .TP
 .I ~/.config/@@CONFDIR@@