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

3 files changed, 27 insertions, 21 deletions

diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index dedc25c..4a3fe4c 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -7666,30 +7666,21 @@ Keep your key file in a safe place. You will need it to create new versions of y
 	Password
       </message>
     </if>
-     <message name="IDS_BOOKMARK_BAR_IMPORT_LINK" desc="text shown for importing ">
-       Import bookmarks now...
-     </message>
+    <message name="IDS_BOOKMARK_BAR_IMPORT_LINK" desc="text shown for importing ">
+      Import bookmarks now...
+    </message>
 
+    <if expr="os == 'linux2' or os == 'openbsd4' or os=='freebsd6'">
       <!-- Linux proxy configuration fallback help -->
       <message name="IDS_ABOUT_LINUX_PROXY_CONFIG_TITLE" desc="Title of HTML page shown on systems where system proxy configuration is unsupported.">
-        Linux Proxy Configuration Help
+        Proxy Configuration Help
       </message>
       <message name="IDS_ABOUT_LINUX_PROXY_CONFIG_BODY" desc="HTML body of page shown on systems where system proxy configuration is unsupported.">
-        When running <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> under a supported Desktop Environment, the system proxy settings will be used.  However, either your system is not supported or there was a problem launching your system configuration.  You may use the following environment variables to configure your proxy:
-        <ph name="BEGIN_LIST">&lt;ul&gt;</ph>
-          <ph name="BEGIN_LIST_ITEM">&lt;li&gt;</ph><ph name="BEGIN_CODE">&lt;code&gt;</ph>auto_proxy<ph name="END_CODE">&lt;/code&gt;</ph><ph name="END_LIST_ITEM">&lt;/li&gt;</ph>
-          <ph name="BEGIN_LIST">&lt;ul&gt;</ph>
-            <ph name="BEGIN_LIST_ITEM">&lt;li&gt;</ph>Defined and empty → autodetect<ph name="END_LIST_ITEM">&lt;/li&gt;</ph>
-            <ph name="BEGIN_LIST_ITEM">&lt;li&gt;</ph>Non-empty → specifies autoconfig URL<ph name="END_LIST_ITEM">&lt;/li&gt;</ph>
-          <ph name="END_LIST">&lt;/ul&gt;</ph>
-          <ph name="BEGIN_LIST_ITEM">&lt;li&gt;</ph><ph name="BEGIN_CODE">&lt;code&gt;</ph>all_proxy<ph name="END_CODE">&lt;/code&gt;</ph>: proxy server to use for all types<ph name="END_LIST_ITEM">&lt;/li&gt;</ph>
-          <ph name="BEGIN_LIST_ITEM">&lt;li&gt;</ph><ph name="BEGIN_CODE">&lt;code&gt;</ph>http_proxy<ph name="END_CODE">&lt;/code&gt;</ph>: HTTP proxy server<ph name="END_LIST_ITEM">&lt;/li&gt;</ph>
-          <ph name="BEGIN_LIST_ITEM">&lt;li&gt;</ph><ph name="BEGIN_CODE">&lt;code&gt;</ph>https_proxy<ph name="END_CODE">&lt;/code&gt;</ph>: HTTPS proxy server<ph name="END_LIST_ITEM">&lt;/li&gt;</ph>
-          <ph name="BEGIN_LIST_ITEM">&lt;li&gt;</ph><ph name="BEGIN_CODE">&lt;code&gt;</ph>ftp_proxy<ph name="END_CODE">&lt;/code&gt;</ph>: FTP proxy server<ph name="END_LIST_ITEM">&lt;/li&gt;</ph>
-          <ph name="BEGIN_LIST_ITEM">&lt;li&gt;</ph><ph name="BEGIN_CODE">&lt;code&gt;</ph>SOCKS_SERVER<ph name="END_CODE">&lt;/code&gt;</ph>: SOCKS proxy server (defaults to SOCKS v4, also specify SOCKS_VERSION=5 to use SOCKS v5)<ph name="END_LIST_ITEM">&lt;/li&gt;</ph>
-          <ph name="BEGIN_LIST_ITEM">&lt;li&gt;</ph><ph name="BEGIN_CODE">&lt;code&gt;</ph>no_proxy<ph name="END_CODE">&lt;/code&gt;</ph>: comma separated list of hosts or patterns to bypass proxying<ph name="END_LIST_ITEM">&lt;/li&gt;</ph>
-        <ph name="END_LIST">&lt;/ul&gt;</ph>
+        &lt;p&gt;When running <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> under a supported desktop environment, the system proxy settings will be used.  However, either your system is not supported or there was a problem launching your system configuration.&lt;/p&gt;
+
+        &lt;p&gt;But you can still configure via the command line.  Please see &lt;code&gt;man <ph name="PRODUCT_BINARY_NAME">$2<ex>google-chrome</ex></ph>&lt;/code&gt; for more information on flags and environment variables.&lt;/p&gt;
       </message>
+    </if>
 
     </messages>
 
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@@
diff --git a/chrome/browser/browser_about_handler.cc b/chrome/browser/browser_about_handler.cc
index fa6bbe4..13950f7 100644
--- a/chrome/browser/browser_about_handler.cc
+++ b/chrome/browser/browser_about_handler.cc
@@ -458,9 +458,14 @@ std::string AboutLinuxProxyConfig() {
   data.append("<!DOCTYPE HTML>\n");
   data.append("<html><head><meta charset=\"utf-8\"><title>");
   data.append(l10n_util::GetStringUTF8(IDS_ABOUT_LINUX_PROXY_CONFIG_TITLE));
-  data.append("</title></head><body>\n");
-  data.append(l10n_util::GetStringFUTF8(IDS_ABOUT_LINUX_PROXY_CONFIG_BODY,
-              l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)));
+  data.append("</title>");
+  data.append("<style>body { max-width: 70ex; padding: 2ex 5ex; }</style>");
+  data.append("</head><body>\n");
+  FilePath binary = CommandLine::ForCurrentProcess()->GetProgram();
+  data.append(l10n_util::GetStringFUTF8(
+                  IDS_ABOUT_LINUX_PROXY_CONFIG_BODY,
+                  l10n_util::GetStringUTF16(IDS_PRODUCT_NAME),
+                  ASCIIToUTF16(binary.BaseName().value())));
   data.append("</body></html>\n");
   return data;
 }