diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-28 01:50:30 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-28 01:50:30 +0000 |
| commit | 92b16aa35c651c1077a4738a348275ef10327b3c (patch) | |
| tree | 41be4ed24cee0c0bca55de06b0ec503fd6d7d1f1 /chrome/app/resources | |
| parent | 387535c50eac25f6c47d99cae085a0ceb40efbe9 (diff) | |
| download | chromium_src-92b16aa35c651c1077a4738a348275ef10327b3c.zip chromium_src-92b16aa35c651c1077a4738a348275ef10327b3c.tar.gz chromium_src-92b16aa35c651c1077a4738a348275ef10327b3c.tar.bz2 | |
linux: unify proxy config docs
We had some info in the man page and other info in the about page.
This change makes the about page refer to the man page, and updates
the man page with missing info.
While I'm at it, make the HTML slightly prettier.
Review URL: http://codereview.chromium.org/1695023
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45773 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app/resources')
| -rw-r--r-- | chrome/app/resources/manpage.1.in | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/chrome/app/resources/manpage.1.in b/chrome/app/resources/manpage.1.in index 98a215d..0fa1684 100644 --- a/chrome/app/resources/manpage.1.in +++ b/chrome/app/resources/manpage.1.in @@ -86,6 +86,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@@ |