summaryrefslogtreecommitdiffstats
path: root/chrome/app/resources
diff options
context:
space:
mode:
authoreroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-27 19:28:16 +0000
committereroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-27 19:28:16 +0000
commit05905a1057c8022d9b9ce7fbb012faf991359851 (patch)
treec6b7293cd6bca10cc4b8fd8f4b2e8d6383801f16 /chrome/app/resources
parent96f81a54c6639515a68ede374707d1301ac3951d (diff)
downloadchromium_src-05905a1057c8022d9b9ce7fbb012faf991359851.zip
chromium_src-05905a1057c8022d9b9ce7fbb012faf991359851.tar.gz
chromium_src-05905a1057c8022d9b9ce7fbb012faf991359851.tar.bz2
Update the man page to better document the --proxy-server command line flag.
In particular, explain how it can be used to specify SOCKS v4 / SOCKS v5 proxies, and give some examples. Review URL: http://codereview.chromium.org/2221006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48418 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app/resources')
-rw-r--r--chrome/app/resources/manpage.1.in34
1 files changed, 32 insertions, 2 deletions
diff --git a/chrome/app/resources/manpage.1.in b/chrome/app/resources/manpage.1.in
index 0fa1684..6f1baf9 100644
--- a/chrome/app/resources/manpage.1.in
+++ b/chrome/app/resources/manpage.1.in
@@ -37,8 +37,38 @@ in "app mode": with no browser toolbars.
.TP
\fB\-\-proxy-server\fR=\fIhost:port\fR
-Specify the HTTP/HTTPS proxy server. Overrides any environment variables
-or settings picked via the options dialog.
+Specify the HTTP/SOCKS4/SOCKS5 proxy server to use for requests. This
+overrides any environment variables or settings picked via the options dialog.
+An individual proxy server is specified using the format:
+
+ [<proxy-scheme>://]<proxy-host>[:<proxy-port>]
+
+Where <proxy-scheme> is the protocol of the proxy server, and is one of:
+
+ "http", "socks", "socks4", "socks5".
+
+If the <proxy-scheme> is omitted, it defaults to "http". Also note that
+"socks" is equivlent to "socks4".
+
+Examples:
+
+ --proxy-server="foopy:99"
+ Use the HTTP proxy "foopy:99" to load all URLs.
+
+ --proxy-server="socks5://foobar:66"
+ Use the SOCKS v5 proxy "foobar:66" to load all URLs.
+
+ --proxy-server="socks://foobar:1080"
+ Use the SOCKS v4 proxy "foobar:1080" to load all URLs.
+
+It is also possible to specify a separate proxy server for different URL types,
+by prefixing the proxy server specifier with a URL specifier:
+
+Example:
+
+ --proxy-server="https=proxy1:80;http=socks4://baz:1080"
+ Load https://* URLs using the HTTP proxy "proxy1:80". And load http://*
+ URLs using the SOCKS v4 proxy "baz:1080".
.TP
\fB\-\-no-proxy-server\fR