X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=doc%2Fsource%2Fp-config.sgml;h=d1fbf295ec7678aa2961a67e292f385e7687b6d8;hp=2c3a9cf43cddd681ae99e6dd4b68a1897bf41f9b;hb=86de4d22ca6f1798818a5626bf65a31bbb75341a;hpb=109444c5d8200fffe1157ae4e823928adc229158

diff --git a/doc/source/p-config.sgml b/doc/source/p-config.sgml
index 2c3a9cf4..d1fbf295 100644
--- a/doc/source/p-config.sgml
+++ b/doc/source/p-config.sgml
@@ -1016,7 +1016,7 @@ actionsfile
     The available debug levels are:
    </para>
     <programlisting>
-  debug     1 # Log the destination for each request &my-app; let through. See also debug 1024.
+  debug     1 # Log the destination for each request. See also debug 1024.
   debug     2 # show each connection status
   debug     4 # show I/O status
   debug     8 # show header parsing
@@ -1677,7 +1677,7 @@ ACLs: permit-access and deny-access</title>
     If your system implements
     <ulink url="http://tools.ietf.org/html/rfc3493">RFC 3493</ulink>, then
     <replaceable class="parameter">src_addr</replaceable> and <replaceable
-    class="parameter">dst_addr</replaceable> can be IPv6 addresses delimeted by
+    class="parameter">dst_addr</replaceable> can be IPv6 addresses delimited by
     brackets, <replaceable class="parameter">port</replaceable> can be a number
     or a service name, and
     <replaceable class="parameter">src_masklen</replaceable> and
@@ -2951,7 +2951,7 @@ forward-socks4, forward-socks4a, forward-socks5 and forward-socks5t</title>
   </listitem>
  </varlistentry>
 </variablelist>
-<![%config-file;[<literallayout>@@#default-server-timeout 60</literallayout>]]>
+<![%config-file;[<literallayout>@@#default-server-timeout 5</literallayout>]]>
 </sect3>
 
 
@@ -3235,13 +3235,13 @@ forward-socks4, forward-socks4a, forward-socks5 and forward-socks5t</title>
   <listitem>
    <para>
     Under high load incoming connection may queue up before Privoxy
-    gets around to serve them. The queue length is limitted by the
+    gets around to serve them. The queue length is limited by the
     operating system. Once the queue is full, additional connections
     are dropped before Privoxy can accept and serve them.
    </para>
    <para>
     Increasing the queue length allows Privoxy to accept more
-    incomming connections that arrive roughly at the same time.
+    incoming connections that arrive roughly at the same time.
    </para>
    <para>
     Note that Privoxy can only request a certain queue length,
@@ -3901,7 +3901,7 @@ forward-socks4, forward-socks4a, forward-socks5 and forward-socks5t</title>
 
 
 <sect2 id="tls">
-<title>TLS/SSL</title>
+<title>TLS/SSL Inspection</title>
 
 <!--   ~~~~~       New section      ~~~~~     -->
 
@@ -4008,8 +4008,8 @@ forward-socks4, forward-socks4a, forward-socks5 and forward-socks5t</title>
    </para>
    <para>
     The file is used by &my-app; to generate website certificates
-    when https filtering is enabled with the
-    <literal><ulink url="actions-file.html#ENABLE-HTTPS-FILTERING">enable-https-filtering</ulink></literal>
+    when https inspection is enabled with the
+    <literal><ulink url="actions-file.html#HTTPS-INSPECTION">https-inspection</ulink></literal>
     action.
    </para>
    <para>
@@ -4089,7 +4089,7 @@ forward-socks4, forward-socks4a, forward-socks5 and forward-socks5t</title>
   </listitem>
  </varlistentry>
 </variablelist>
-<![%config-file;[<literallayout>@@#ca-key-file root.pem</literallayout>]]>
+<![%config-file;[<literallayout>@@#ca-key-file cakey.pem</literallayout>]]>
 </sect3>
 
 <!--  ~  End section  ~  -->
@@ -4164,7 +4164,7 @@ forward-socks4, forward-socks4a, forward-socks5 and forward-socks5t</title>
   <term>Specifies:</term>
   <listitem>
    <para>
-    Directory to safe generated keys and certificates.
+    Directory to save generated keys and certificates.
    </para>
   </listitem>
  </varlistentry>
@@ -4195,9 +4195,9 @@ forward-socks4, forward-socks4a, forward-socks5 and forward-socks5t</title>
   <listitem>
    <para>
     This directive specifies the directory where generated
-    TLS/SSL keys and certificates are saved when https filtering
+    TLS/SSL keys and certificates are saved when https inspection
     is enabled with the
-    <literal><ulink url="actions-file.html#ENABLE-HTTPS-FILTERING">enable-https-filtering</ulink></literal>
+    <literal><ulink url="actions-file.html#HTTPS-INSPECTION">https-inspection</ulink></literal>
     action.
    </para>
    <para>