Release Notes 3.5

diff --git a/doc/release-notes/release-3.5.sgml b/doc/release-notes/release-3.5.sgml
index bfb2a4b82fa519015e31584ad62e13815fa57064..4783a0f7fbbb0b41d951ebcec0f58ba4055fcddb 100644 (file)
--- a/doc/release-notes/release-3.5.sgml
+++ b/doc/release-notes/release-3.5.sgml
@@ -122,9 +122,9 @@ Most user-facing changes are reflected in squid.conf (see below).
 <p>When Squid is built with the GnuTLS encryption library the tool is able
    to open TLS (or SSL/3.0) connections to servers.
 
-<p>The <em>--https<em> option enables TLS using default values.
+<p>The <em>--https</em> option enables TLS using default values.
 
-<p>The <em>--cert</em> option specifies a fiel containing X.509 client
+<p>The <em>--cert</em> option specifies a file containing X.509 client
    certificate and private key in PEM format to be loaded for use. Multiple
    certificates are supported and the option may be used multiple times to
    load certificates.
@@ -171,6 +171,9 @@ There have been changes to Squid's configuration file since Squid-3.4.
     acl whitelist dstdomain parameters("/etc/squid/whitelist.txt")
 </verb>
 
+<p>The squid.conf macro ${service_name} is added to provide the service name
+   of the process parsing the config.
+
 <p>There have also been changes to individual directives in the config file.
 
 This section gives a thorough account of those changes in three categories:
@@ -204,10 +207,10 @@ This section gives a thorough account of those changes in three categories:
        <p>New directive to send additional lookup parameters to the configured
           Store-ID helper program. It takes a string which may contain logformat %macros.
        <p>The Store-ID helper input format is now:
-       <verbatim>
+       <verb>
          [channel-ID] url [extras]
-       </verbatim>
-       <p>The default value for extras is: "%>a/%>A %un %>rm myip=%la myport=%lp"
+       </verb>
+       <p>The default value for extras is: "%&gt;a/%>A %un %>rm myip=%la myport=%lp"
 
        <tag>store_miss</tag>
        <p>New configuration directive to enable/disable caching of MISS responses.
@@ -218,9 +221,9 @@ This section gives a thorough account of those changes in three categories:
           URL-rewriter/redirector helper program. It takes a string which may
           contain logformat %macros.
        <p>The url rewrite and redirector helper input format is now:
-       <verbatim>
+       <verb>
          [channel-ID] url [extras]
-       </verbatim>
+       </verb>
        <p>The default value for extras is: "%>a/%>A %un %>rm myip=%la myport=%lp"
 
 </descrip>
@@ -257,7 +260,7 @@ This section gives a thorough account of those changes in three categories:
           same keep-alive critera any HTTP connection is checked for.
 
        <tag>forward_max_tries</tag>
-       <p>Default value increased to <em>25 destinations/em> to allow better
+       <p>Default value increased to <em>25 destinations</em> to allow better
           contact and IPv4 failover with domains using long lists of IPv6
           addresses.
 
@@ -272,6 +275,10 @@ This section gives a thorough account of those changes in three categories:
        <p><em>protocol=</em> option altered to accept protocol version details.
           Currently supported values are: HTTP, HTTP/1.1, HTTPS, HTTPS/1.1
 
+       <tag>https_port</tag>
+       <p><em>protocol=</em> option altered to accept protocol version details.
+          Currently supported values are: HTTP, HTTP/1.1, HTTPS, HTTPS/1.1
+
        <tag>logformat</tag>
        <p>New format code <em>%credentials</em> to log the client credentials
           token.
@@ -349,6 +356,10 @@ This section gives an account of those changes in three categories:
        <tag>--enable-ssl</tag>
        <p>Removed. Use <em>--with-openssl</em> to enable OpenSSL library support.
 
+       <tag>--with-coss-membuf-size</tag>
+       <p>The COSS cache type has been removed.
+          It has been replaced by <em>rock</em> cache type.
+
 </descrip>
 
 

diff --git a/src/cf.data.pre b/src/cf.data.pre
index 43c3902edd45d26d8cb43905dbad71e6f60d6bb4..f6fedf3689ca2ce16cc764e9ac85c28aab3effb6 100644 (file)
--- a/src/cf.data.pre
+++ b/src/cf.data.pre
@@ -360,8 +360,8 @@ DOC_START
 
        "program" cmdline
        Specify the command for the external authenticator.  Such a program
-       reads a request_format line ("username password" by default) and
-       replies with one of three results:
+       reads a request line ("username password" by default) and replies
+       with one of three results:
 
          OK
                the user exists.