зеркало из https://github.com/mozilla/pjs.git
Bug 279054 Document new proxy pref pane in Help
p=giacomo.magnini@portalis.it r=me
This commit is contained in:
Родитель
570c61da1e
Коммит
0f09ece84f
|
@ -43,7 +43,7 @@
|
|||
<h2 id="advanced">Advanced Preferences - Advanced</h2>
|
||||
|
||||
<p>This section describes how to use the main Advanced preferences panel. If
|
||||
you're not already viewing it, follow these steps:</p>
|
||||
you're not already viewing it, follow these steps:</p>
|
||||
|
||||
<ol>
|
||||
<li>Open the <span class="mac">&brandShortName;</span>
|
||||
|
@ -63,6 +63,13 @@ you're not already viewing it, follow these steps:</p>
|
|||
to start &brandShortName;. See
|
||||
<q><a href="nav_help.xhtml#using_quick_launch">Using Quick
|
||||
Launch</a></q> for more information about using Quick Launch.</li>
|
||||
<li class="unix"><strong>Use Preferences from System</strong>: Select this to
|
||||
use the already set system preferences, overriding &brandShortName;'
|
||||
ones.
|
||||
|
||||
<p><strong>Note</strong>: This option is available only in XFT/GTK2
|
||||
builds.</p>
|
||||
</li>
|
||||
</ul>
|
||||
|
||||
<p>[<a href="#advanced_preferences">Return to beginning of section</a>]</p>
|
||||
|
@ -202,7 +209,7 @@ you're not already viewing it, follow these steps:</p>
|
|||
it.</li>
|
||||
<li><strong>When the page is out of date</strong>: Select this if you
|
||||
want &brandShortName; to compare a web page to the cache when the page
|
||||
is determined by the server to have expired.</li>
|
||||
is determined by the server to have expired.</li>
|
||||
<li><strong>Once per session</strong>: Select this if you want
|
||||
&brandShortName; to compare a web page to the cache once for each time
|
||||
you start &brandShortName;.</li>
|
||||
|
@ -234,7 +241,7 @@ you're not already viewing it, follow these steps:</p>
|
|||
</ol>
|
||||
|
||||
<p>The Proxies preferences panel allows you to set up &brandShortName; to use a
|
||||
proxy:</p>
|
||||
<a href="glossary.xhtml#proxy">proxy</a>:</p>
|
||||
|
||||
<p><strong>Before you start:</strong> Ask your network administrator if you
|
||||
have a proxy configuration file or for the names and port numbers of the
|
||||
|
@ -243,43 +250,64 @@ you're not already viewing it, follow these steps:</p>
|
|||
<ul>
|
||||
<li><strong>Direct connection to the Internet</strong>: Choose this if you
|
||||
don't want to use a proxy.</li>
|
||||
<li><strong>Manual proxy configuration</strong>: Choose this if you
|
||||
don't have a proxy location (URL).
|
||||
<li><strong>Automatically discover the proxy configuration</strong>: Choose
|
||||
this if you want &brandShortName; to automatically detect and configure the
|
||||
proxy settings, using the <a href="glossary.xhtml#wpad">WPAD protocol</a>.</li>
|
||||
<li><strong>Automatic proxy configuration URL</strong>: Choose this if you
|
||||
have a proxy configuration file or URL, then enter the configuration
|
||||
URL.
|
||||
<ul>
|
||||
<li><strong>HTTP Proxy</strong>, <strong>SSL Proxy</strong>, <strong>FTP
|
||||
Proxy, Gopher Proxy</strong>: Type the name or numeric IP address of
|
||||
the proxy server. Type the port in the Ports field.
|
||||
|
||||
<p><strong>Note</strong>: If you're using the same settings for
|
||||
all types of proxies, click on <q>Use these settings for SSL,
|
||||
FTP and Gopher</q> when you've filled in the fields for HTTP
|
||||
Proxy.</p>
|
||||
<li><strong>Reload</strong>: Click this to reload the configuration file.
|
||||
|
||||
<p>For more information about Automatic Proxy Configuration, see the
|
||||
online
|
||||
<a href="http://www.mozilla.org/catalog/end-user/customizing/enduserPAC.html">End
|
||||
User Guide to Proxy AutoConfiguration</a>.</p>
|
||||
</li>
|
||||
<li><strong>SOCKS Host</strong>: Type the name or numeric IP address of
|
||||
the proxy server. Type the port in the Ports field.
|
||||
<ul>
|
||||
<li><strong>SOCKS v4, SOCKS v5</strong>: When entering a SOCK Host,
|
||||
select <q>SOCKS v4</q> or <q>SOCKS v5</q>, depending on
|
||||
what version of SOCKS is used for the proxy.</li>
|
||||
</ul>
|
||||
</li>
|
||||
<li><strong>No Proxy for</strong>: Type the domains and/or IP address
|
||||
that you do not want to use a proxy for. Separate each entry with a
|
||||
comma. (Example: <kbd>.yourcompany.com, .yourcompany.co.nz,
|
||||
192.168.1.0/24</kbd>.)</li>
|
||||
</ul>
|
||||
</li>
|
||||
<li><strong>Automatic proxy configuration URL</strong>: Choose this if you
|
||||
have a proxy configuration file or URL, then type the configuration
|
||||
URL.</li>
|
||||
<li><strong>Reload</strong>: Click this to reload the configuration file.
|
||||
|
||||
<p>For more information about Automatic Proxy Configuration, see the online
|
||||
<a href=
|
||||
"http://www.mozilla.org/catalog/end-user/customizing/enduserPAC.html">End
|
||||
User Guide to Proxy AutoConfiguration</a>.</p>
|
||||
<li><strong>Manual proxy configuration</strong>: Choose this if you
|
||||
don't have a proxy location (URL), or the automatic proxy discovery
|
||||
was unable to setup the proxy settings correctly.
|
||||
<ul>
|
||||
<li><strong>Proxy</strong>: Enter the name or numeric IP address of
|
||||
the proxy server.</li>
|
||||
<li><strong>Port</strong>: Enter the port number in the Port field. Click
|
||||
on <q>Advanced</q> to set
|
||||
<a href="#advanced_proxy_preferences">Advanced Proxy Preferences</a></li>
|
||||
<li><strong>No Proxy for</strong>: Type the domains and/or IP addresses
|
||||
that you do not want to use a proxy for. Separate each entry with a
|
||||
comma. (Example: <kbd>.mozilla.org, .net.nz, 192.168.1.0/24</kbd>.)
|
||||
</li>
|
||||
</ul>
|
||||
</li>
|
||||
</ul>
|
||||
|
||||
<h3 id="advanced_proxy_preferences">Advanced Proxy Preferences</h3>
|
||||
|
||||
<p>If you want to use different proxies for different protocols or need to use
|
||||
a SOCKS proxy:</p>
|
||||
|
||||
<ul>
|
||||
<li><strong>HTTP Proxy</strong>, <strong>SSL Proxy</strong>,
|
||||
<strong>FTP Proxy</strong>, <strong>Gopher Proxy</strong>: Enter the name
|
||||
or numeric IP address of the proxy server. Type the port in the Port fields.
|
||||
|
||||
<p><strong>Note</strong>: If you're using the same settings
|
||||
for all types of proxies, click on <q>Use HTTP Proxy settings
|
||||
for all protocols</q>.</p>
|
||||
|
||||
</li>
|
||||
<li><strong>SOCKS Host</strong>: Enter the name or numeric IP address
|
||||
of the proxy server. Enter the port number in the Port field.
|
||||
<ul>
|
||||
<li><strong>SOCKS v4, SOCKS v5</strong>: When entering a SOCKS Host,
|
||||
select <q>SOCKS v4</q> or <q>SOCKS v5</q>, depending on what version
|
||||
of <a href="glossary.xhtml#socks">SOCKS</a> is used for the proxy.</li>
|
||||
<li><strong>Use for resolving hostnames</strong>: Select this to
|
||||
use the SOCKS Host for resolving hostnames. This is
|
||||
recommended for SOCKS v5 hosts.</li>
|
||||
</ul>
|
||||
</li>
|
||||
</ul>
|
||||
|
||||
|
@ -308,17 +336,17 @@ you're not already viewing it, follow these steps:</p>
|
|||
version of HTTP, standardized in 1996.</li>
|
||||
<li><strong>Use HTTP 1.1</strong>: Choose this to use the new version of
|
||||
HTTP, which offers performance enhancements, including more efficient
|
||||
use of HTTP connections, better support for client-side caching,
|
||||
multiple HTTP requests (pipelining), and more refined control over
|
||||
cache expiration and replacement policies.</li>
|
||||
use of HTTP connections, better support for client-side caching,
|
||||
multiple HTTP requests (pipelining), and more refined control over
|
||||
cache expiration and replacement policies.</li>
|
||||
<li><strong>Enable Keep-Alive</strong>: Select this to keep a connection
|
||||
open to make additional HTTP requests, increasing speed.</li>
|
||||
<li><strong>Enable Pipelining</strong>: Select this to
|
||||
enable pipelining, which allows for more than one HTTP request to be
|
||||
sent to the server at once, reducing delays loading web
|
||||
pages.
|
||||
sent to the server at once, reducing delays loading web pages.
|
||||
|
||||
<p><strong>Note</strong>: Pipelining is only available with
|
||||
HTTP 1.1.</p></li>
|
||||
HTTP 1.1.</p></li>
|
||||
</ul>
|
||||
</li>
|
||||
</ul>
|
||||
|
@ -403,7 +431,7 @@ you're not already viewing it, follow these steps:</p>
|
|||
wheel.</li>
|
||||
<li><strong>Move back and forward in the browsing history</strong>:
|
||||
Choose this to use the mouse wheel to navigate back or forward to
|
||||
previous pages you've visited.</li>
|
||||
previous pages you've visited.</li>
|
||||
<li><strong>Make the text larger or smaller</strong>: Choose this to use
|
||||
the mouse wheel to increase or decrease the size of text on a web page.
|
||||
This setting can help you better read a page, or make text fit on the
|
||||
|
@ -451,7 +479,7 @@ you're not already viewing it, follow these steps:</p>
|
|||
(in milliseconds) between the flashes.</li>
|
||||
<li><strong>Invert Color</strong>: Check this option to paint the
|
||||
selected element with the inverted border color. This will cause the
|
||||
whole element—including its border—to flash.</li>
|
||||
whole element—including its border—to flash.</li>
|
||||
</ul>
|
||||
</li>
|
||||
</ul>
|
||||
|
@ -499,7 +527,7 @@ you're not already viewing it, follow these steps:</p>
|
|||
|
||||
<p>[<a href="#advanced_preferences">Return to beginning of section</a>]</p>
|
||||
|
||||
<p>Copyright © 2003-2004 The Mozilla Foundation.</p>
|
||||
<p>Copyright © 2003-2005 The Mozilla Foundation.</p>
|
||||
|
||||
</body>
|
||||
</html>
|
||||
|
|
|
@ -278,7 +278,7 @@
|
|||
|
||||
<p>[<a href="#appearance_preferences">Return to beginning of section</a>]</p>
|
||||
|
||||
<p>Copyright © 2003-2004 The Mozilla Foundation.</p>
|
||||
<p>Copyright © 2003-2005 The Mozilla Foundation.</p>
|
||||
|
||||
</body>
|
||||
</html>
|
||||
|
|
|
@ -464,6 +464,10 @@
|
|||
additional modules on your computer to control smart card readers or other
|
||||
hardware devices.</dd>
|
||||
|
||||
<dt id="pki">PKI (public-key infrastructure)</dt><dd>The standards and services
|
||||
that facilitate the use of public-key cryptography and certificates in a
|
||||
networked environment.</dd>
|
||||
|
||||
<dt id="plug-in">plug-in</dt><dd>A type of
|
||||
<a href="#helper_application">helper application</a> that adds new
|
||||
capabilities to your browser, such as the ability to play audio or video
|
||||
|
@ -511,10 +515,6 @@
|
|||
encrypted with the public key can be decrypted only with the private key.
|
||||
</dd>
|
||||
|
||||
<dt id="pki">PKI (public-key infrastructure)</dt><dd>The standards and services
|
||||
that facilitate the use of public-key cryptography and certificates in a
|
||||
networked environment.</dd>
|
||||
|
||||
<dt id="roaming_profile">roaming profile</dt><dd>A user profile (or parts of
|
||||
it) stored on a remote <a href="#server">server</a> and used for sharing the
|
||||
same settings and data across multiple computers.</dd>
|
||||
|
@ -597,6 +597,10 @@
|
|||
<dt id="smtp">SMTP (Simple Mail Transfer Protocol)</dt><dd>A protocol that
|
||||
sends e-mail messages across the <a href="#internet">Internet</a>.</dd>
|
||||
|
||||
<dt id="socks">SOCKS</dt><dd>A protocol that a <a href="proxy">proxy</a>
|
||||
server can use to accept requests from client users in an internal network
|
||||
so that it can forward them across the <a href="#internet">Internet</a>.</dd>
|
||||
|
||||
<dt id="software_security_device">software security device</dt><dd>The default
|
||||
<a href="#security_device">security device</a> used by
|
||||
<a href="#certificate_manager">Certificate Manager</a> to store private keys
|
||||
|
@ -708,6 +712,10 @@
|
|||
<a href="#client">clients</a> called web browsers (such as
|
||||
&brandShortName;).</dd>
|
||||
|
||||
<dt id="wpad">WPAD (Web Proxy AutoDiscovery)</dt><dd>A proposed Internet
|
||||
protocol that allows a Web browser to automatically locate and interface
|
||||
with <a href="#proxy">proxy</a> services in a network.</dd>
|
||||
|
||||
<dt id="xml">XML (Extensible Markup Language)</dt><dd>An open standard for
|
||||
describing data. Unlike <a href="#html">HTML</a>, XML allows the developer of
|
||||
a web page to define special tags. For more information, see the online W3C
|
||||
|
|
|
@ -97,9 +97,10 @@
|
|||
<rdf:li> <rdf:Description nc:name="server SSL certificate" nc:link="glossary.xhtml#server_ssl_certificate"/> </rdf:li>
|
||||
<rdf:li> <rdf:Description nc:name="signing certificate" nc:link="glossary.xhtml#signing_certificate"/> </rdf:li>
|
||||
<rdf:li> <rdf:Description nc:name="signing key" nc:link="glossary.xhtml#signing_key"/> </rdf:li>
|
||||
<rdf:li> <rdf:Description nc:name="SMTP" nc:link="glossary.xhtml#smtp"/> </rdf:li>
|
||||
<rdf:li> <rdf:Description nc:name="slot" nc:link="glossary.xhtml#slot"/> </rdf:li>
|
||||
<rdf:li> <rdf:Description nc:name="smart card" nc:link="glossary.xhtml#smart_card"/> </rdf:li>
|
||||
<rdf:li> <rdf:Description nc:name="SMTP" nc:link="glossary.xhtml#smtp"/> </rdf:li>
|
||||
<rdf:li> <rdf:Description nc:name="SOCKS" nc:link="glossary.xhtml#socks"/> </rdf:li>
|
||||
<rdf:li> <rdf:Description nc:name="software security device" nc:link="glossary.xhtml#software_security_device"/> </rdf:li>
|
||||
<rdf:li> <rdf:Description nc:name="spoofing" nc:link="glossary.xhtml#spoofing"/> </rdf:li>
|
||||
<rdf:li> <rdf:Description nc:name="SSL" nc:link="glossary.xhtml#ssl"/> </rdf:li>
|
||||
|
@ -118,8 +119,9 @@
|
|||
<rdf:li> <rdf:Description nc:name="URL" nc:link="glossary.xhtml#url"/> </rdf:li>
|
||||
<rdf:li> <rdf:Description nc:name="web page" nc:link="glossary.xhtml#web_page"/> </rdf:li>
|
||||
<rdf:li> <rdf:Description nc:name="website" nc:link="glossary.xhtml#web_site"/> </rdf:li>
|
||||
<rdf:li> <rdf:Description nc:name="XML" nc:link="glossary.xhtml#xml"/> </rdf:li>
|
||||
<rdf:li> <rdf:Description nc:name="World Wide Web (WWW)" nc:link="glossary.xhtml#world_wide_web"/> </rdf:li>
|
||||
<rdf:li> <rdf:Description nc:name="WPAD" nc:link="glossary.xhtml#wpad"/> </rdf:li>
|
||||
<rdf:li> <rdf:Description nc:name="XML" nc:link="glossary.xhtml#xml"/> </rdf:li>
|
||||
<rdf:li> <rdf:Description nc:name="XSLT" nc:link="glossary.xhtml#xslt"/> </rdf:li>
|
||||
<rdf:li> <rdf:Description nc:name="XUL" nc:link="glossary.xhtml#xul"/> </rdf:li>
|
||||
</rdf:Seq>
|
||||
|
|
|
@ -529,7 +529,7 @@
|
|||
<rdf:li>
|
||||
<rdf:Description ID="Download_Manager"
|
||||
nc:name="Download Manager"
|
||||
nc:link="nav_help.xhtml#managing_different_file_types"/>
|
||||
nc:link="nav_help.xhtml#plugins_and_downloads"/>
|
||||
</rdf:li></rdf:Seq>
|
||||
</nc:subheadings>
|
||||
</rdf:Description>
|
||||
|
@ -608,7 +608,7 @@
|
|||
<rdf:Seq><rdf:li>
|
||||
<rdf:Description ID="file_types"
|
||||
nc:name="file types"
|
||||
nc:link="nav_help.xhtml#managing_different_file_types"/>
|
||||
nc:link="nav_help.xhtml#plugins_and_downloads"/>
|
||||
</rdf:li>
|
||||
<rdf:li>
|
||||
<rdf:Description ID="Filing_messages"
|
||||
|
@ -718,7 +718,7 @@
|
|||
<rdf:Seq><rdf:li>
|
||||
<rdf:Description ID="helper_applications"
|
||||
nc:name="helper applications"
|
||||
nc:link="nav_help.xhtml#managing_different_file_types"/>
|
||||
nc:link="nav_help.xhtml#plugins_and_downloads"/>
|
||||
</rdf:li>
|
||||
<rdf:li>
|
||||
<rdf:Description ID="home_page"
|
||||
|
@ -895,7 +895,7 @@
|
|||
<rdf:Seq><rdf:li>
|
||||
<rdf:Description ID="java"
|
||||
nc:name="Java"
|
||||
nc:link="nav_help.xhtml#managing_different_file_types"/>
|
||||
nc:link="nav_help.xhtml#plugins_and_downloads"/>
|
||||
</rdf:li>
|
||||
<rdf:li>
|
||||
<rdf:Description ID="JavaScript"
|
||||
|
@ -935,6 +935,11 @@
|
|||
<rdf:Description ID="keyboard_shortcuts"
|
||||
nc:name="keyboard shortcuts"
|
||||
nc:link="shortcuts.xhtml"/>
|
||||
</rdf:li>
|
||||
<rdf:li>
|
||||
<rdf:Description ID="keywords"
|
||||
nc:name="keyboards"
|
||||
nc:link="nav_help.xhtml#custom_keywords"/>
|
||||
</rdf:li></rdf:Seq>
|
||||
</nc:subheadings>
|
||||
</rdf:Description>
|
||||
|
@ -1334,7 +1339,7 @@
|
|||
<rdf:li>
|
||||
<rdf:Description ID="Navigator:Download_Manager"
|
||||
nc:name="Download Manager"
|
||||
nc:link="nav_help.xhtml#managing_different_file_types"/>
|
||||
nc:link="nav_help.xhtml#plugins_and_downloads"/>
|
||||
</rdf:li>
|
||||
<rdf:li>
|
||||
<rdf:Description ID="Navigator:full_screen_mode"
|
||||
|
@ -1443,7 +1448,7 @@
|
|||
<rdf:li>
|
||||
<rdf:Description ID="plugins"
|
||||
nc:name="plug-ins"
|
||||
nc:link="nav_help.xhtml#managing_different_file_types"/>
|
||||
nc:link="nav_help.xhtml#plugins_and_downloads"/>
|
||||
</rdf:li>
|
||||
<rdf:li>
|
||||
<rdf:Description ID="POP"
|
||||
|
@ -1791,6 +1796,11 @@
|
|||
<rdf:Description about="#proxies">
|
||||
<nc:subheadings>
|
||||
<rdf:Seq><rdf:li>
|
||||
<rdf:Description ID="proxies:advanced"
|
||||
nc:name="advanced proxy preferences"
|
||||
nc:link="cs_nav_prefs_advanced.xhtml#advanced_proxy_preferences"/>
|
||||
</rdf:li>
|
||||
<rdf:li>
|
||||
<rdf:Description ID="proxies:preferences"
|
||||
nc:name="proxy preferences"
|
||||
nc:link="cs_nav_prefs_advanced.xhtml#proxies"/>
|
||||
|
|
Загрузка…
Ссылка в новой задаче