4.1 (#236)

* v4.1 release notes (#234)

* Release Notes update for 4.1

* Update CONTRIBUTORS from changeset records

* Add ChangeLog entries for scheduled backports

* 4.1

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index f6bc5e306ae195f75b2a6f32c662c922d586da22..36957f2e11f25006c078872f1632ddac97d1d893 100644 (file)
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -10,6 +10,8 @@ Thank you!
     Aleksa <susulic@gmail.com>
     Aleksa ??u??uli?? <susulic@gmail.com>
     Alexander B. Demenshin <aldem@barnet.kharkov.ua>
+    Alexander Gozman <a.gozman@securitycode.ru>
+    Alexander Gozman <goal81@gmail.com>
     Alexander Komyagin <komyagin@altell.ru>
     Alexander Lukyanov <lav@netis.ru>
     Alexander Lukyanov <lav@yar.ru>
@@ -20,15 +22,20 @@ Thank you!
     Alexis Robert <alexis.robert@gmail.com>
     Alex Rousskov <rousskov@measurement-factory.com>
     Alex Rousskov <rousskov@squid-cache.org>
+    Alex Wu <alex_wu2012@hotmail.com>
     Alin Nastac <mrness@gentoo.org>
     Alter <alter@alter.org.ua>
+    Amos Jeffries
     Amos Jeffries <amosjeffries@squid-cache.org>
     Amos Jeffries <squid3@treenet.co.nz>
+    Amos Jeffries <yadij@users.noreply.github.com>
     Amos <squid3@treenet.co.nz>
     Anatoli <me@anatoli.ws>
     Andrea Gagliardi <andrea@netlite.it>
+    Andre Albsmeier <Andre.Albsmeier@siemens.com>
     Andreas Jaeger <aj@suse.com>
     Andreas Lamprecht <Andreas.Lamprecht@siemens.at>
+    Andreas Weigel <andreas.weigel@securepoint.de>
     Andres Kroonmaa <andre@ml.ee>
     Andrew Balabohin
     Andrew Beverley <andy@andybev.com>
@@ -36,7 +43,9 @@ Thank you!
     Andrew Evdokimov <ae@elahi.ru>
     Andrew Hoying <andrew_hoying@blm.gov>
     Andrew Tridgell
+    Andrey <rybakovandrey85@gmail.com>
     Andrey Shorin <tolsty@tushino.com>
+    Anonymous <bigparrot@pirateperfection.com>
     Anonymous Pootle User
     Anonymous <redskilldough@gmail.com>
     Ansgar Hockmann <Ansgar.Hockmann@hrz.uni-dortmund.de>
@@ -52,6 +61,7 @@ Thank you!
     Assar Westerlund <assar@pdc.kth.se>
     Automatic source maintenance <squidadm@squid-cache.org>
     Axel Westerhold <ml.awesterhold@dts.de>
+    Aymeric Vincent <aymericvincent@free.fr>
     Barry Dobyns <barry@dobyns.com>
     Benjamin Kerensa <bkerensa@ubuntu.com>
     Benno Rice <benno@jeamland.net>
@@ -67,11 +77,13 @@ Thank you!
     Brian <hiryuu@envisiongames.net>
     Bruce Murphy <pack-squid@rattus.net>
     Carson Gaspar (carson@lehman.com, carson@cs.columbia.edu)
+    Carsten Grzemba <cgrzemba@opencsw.org>
     Cephas <squidwin@gmail.com>
     Chad E. Naugle <chad.naugle@travimp.com>
     Chad Naugle <chad.naugle@travimp.com>
     Changming <me@sunchangming.com>
     Chao <chao_83@126.com>
+    Chris Addie <chris.addie@datacom.com.au>
     Chris Hills <chaz@chaz6.com>
     Christian Wittmer <chris@computersalat.de>
     Christopher Kerr
@@ -79,15 +91,19 @@ Thank you!
     Christoph Lechleitner <lech@ibcl.at>
     Christos Tsantilas <christos@chtsanti.net>
     Christos Tsantilas <chtsanti@users.sourceforge.net>
+    Chudy Fernandez <chudy.fernandez@gmail.com>
     Cloyce <cloyce.spradling@sun.com>
     Clytie Siddall <clytie@riverland.net.au>
     Colin Coe <colin.coe@gmail.com>
     Constantin Rack
     Cord Beermann <cord@cc.fh-lippe.de>
+    Craig Gowing <craiggowing@gmail.com>
     Daniel Beschorner <daniel.beschorner@evlks.de>
     Daniel O'Callaghan <danny@miriworld.its.unimelb.EDU.AU>
     Daniel Walter <d.walter@0x90.at>
+    Dan Searle <dan@censornet.com>
     Dan Searle <dan.searle@censornet.com>
+    Dave Dykstra <dwd@fnal.gov>
     David Hill <david.hill@ubisoft.com>
     David Isaacs <david.isaacs@sbhs.nsw.edu.au>
     David J N Begley
@@ -99,23 +115,29 @@ Thank you!
     Dennis Glatting
     Dhaval Varia <dhavalkvaria@gmail.com>
     Diego Woitasen <diegows@xtech.com.ar>
+    Diogenes S. Jesus <splash@gmail.com>
     D Kazarov <d.y.kazarov@mail.ru>
     Dmitry Kurochkin <dmitry.kurochkin@measurement-factory.com>
     Don Hopkins <dhopkins@DonHopkins.com>
     Doug Dixon <doug.dixon@gmail.com>
     Doug Urner <dlu@bsdi.com>
     Dragutin Cirkovic <painkiller@gromnet.net>
+    DrDaveD <dwdgithub@drdykstra.us>
     drserge <drserge@inbox.ru>
     Dr. Tilmann Bubeck <t.bubeck@reinform.de>
     Duane Wessels <wessels@squid-cache.org>
     Dustin J. Mitchell
     Ed Knowles <ed@fatboy.geog.unsw.edu.au>
+    Eduard Bagdasaryan <dictiano@gmail.com>
+    Eduard Bagdasaryan <eduard.bagdasaryan@measurement-factory.com>
     Edward Chernenko <edwardspec@gmail.com>
     Edward Moy <moy@parc.xerox.com>
+    Egervary Gergely <gergely@egervary.hu>
     Eldar Akchurin <al.akchurin@googlemail.com>
     Eliezer Croitoru <eliezer@ngtech.co.il>
     Elmar Vonlanthen <Elmar.Vonlanthen@united-security-providers.ch>
     Emilio Casbas <ecasbas@unav.es>
+    Emmanuel Fuste <emmanuel.fuste@thalesgroup.com>
     Endre Balint Nagy <bne@CareNet.hu>
     Eray Aslan <eraya@a21an.org>
     Eray Aslan <eray.aslan@caf.com.tr>
@@ -144,6 +166,7 @@ Thank you!
     Fred <fred.maranhao@gmail.com>
     F Wolff <friedel@translate.org.za>
     Fyodor <fygrave@gmail.com>
+    Garri Djavadyan <garryd@comnet.uz>
     Geoff Keating <Geoff.Keating@anu.edu.au>
     George Michaelson <ggm@connect.com.au>
     Georgy Salnikov <sge@nmr.nioch.nsc.ru>
@@ -171,30 +194,38 @@ Thank you!
     Henrik Nordstrom <hno@squid-cache.org>
     Hide Nagaoka <hide@cc.meisei-u.ac.jp>
     HONDA Hirofumi <honda.hirofumi@nttcom.co.jp>
+    huaraz <huaraz@moeller.plus.com>
     Hussam Al-Tayeb <hussam@visp.net.lb>
     Ian Castle <ian.castle@coldcomfortfarm.net>
+    Ian Clark <mrrooster@gmail.com>
     Ian Turner <vectro@pipeline.com>
     Igor Vinokurov <igor@cs.ibank.ru>
     IIDA Yosiaki <y-iida@secom.co.jp>
+    Ingo Schwarze
     isaac <isaacarsenal@gmail.com>
     Isnard <isnardjaquet@gmail.com>
+    Ivan Larionov <xeron.oskom@gmail.com>
     Ivan Mas??r <helix84@centrum.sk>
     Jakob Bohm <jb-debbugs@wisemo.com>
     Jakub Wilk <jwilk@jwilk.net>
     James Bowe <minijb@gmail.com>
     James Brotchie <brotchie@gmail.com>
     James R Grinter <jrg@demon.net>
+    Jamie Strandboge
     Jan Klemkow <j.klemkow@wemelug.de>
     Jan Niehusmann <jan@anduin.gondor.mcs.de>
     Jan Sievers <sievers@zedat.fu-berlin.de>
+    Javad Kouhi <javad.kouhi@gmail.com>
     Jean-Francois Micouleau <Jean-Francois.Micouleau@utc.fr>
     Jean-Gabriel Dick <jean-gabriel.dick@curie.fr>
     Jean-Philippe Menil <jean-philippe.menil@univ-nantes.fr>
+    Jeff Licquia <jlicquia@scinet.springfieldclinic.com>
     Jens-S. V?ckler <voeckler@rvs.uni-hannover.de>
     Jeremy Allison
     Jerry Murdock <jmurdock@itraktech.com>
     Jiri Skala <jaskalnik@gmail.com>
     Jiri Skala <jskala@redhat.com>
+    jltallon
     Joachim Bauch <jojo@fistofbenztown.de>
     Joachim Bauch (mail@joachim-bauch.de)
     Joao Alves Neto <alves_joao@hotmail.com>
@@ -205,9 +236,10 @@ Thank you!
     Joe Ramey <ramey@jello.csc.ti.com>
     Joerg Lehrke <jlehrke@noc.de>
     Johnathan Conley <johnathan.conley@gmail.com>
+    John Dilley <jad@hpl.hp.com>
     John@MCC.ac.uk
+    John M Cooper <john.cooper@yourcommunications.co.uk>
     John@Pharmweb.NET
-    John Dilley <jad@hpl.hp.com>
     John Saunders <johns@rd.scitec.com.au>
     John Xue <xgxjohn@gmail.com>
     Jonathan Larmour <JLarmour@origin-at.co.uk>
@@ -215,6 +247,7 @@ Thank you!
     Jon Kinred
     Jon Thackray <jrmt@uk.gdscorp.com>
     Jorge Ivan Burgos Aguilar <jorgeivanburgosaguilar@gmail.com>
+    Jose Luis Godoy <joseluis.godoy@correo.aeat.es>
     Jose-Marcio Martins da Cruz <Jose-Marcio.Martins@mines-paristech.fr>
     Joshua Root <jmr@macports.org>
     Joshua Root <josh+squid@root.id.au>
@@ -231,8 +264,10 @@ Thank you!
     Lab10 <lab10@bt-anlagenbau.at>
     Laszlo Attilla Toth <panther@balabit.hu>
     Leeann Bent <lbent@cs.ucsd.edu>
+    Leonardo Taccari
     Leonid Evdokimov <leon@darkk.net.ru>
     libit <sambabug.lb@gmail.com>
+    Lubos Uhliarik <luhliari@redhat.com>
     Luigi Gangitano <luigi@debian.org>
     Luis Daniel Lucio Quiroz <dlucio@okay.com.mx>
     Lukas B??gelei <unknown>
@@ -242,6 +277,8 @@ Thank you!
     Marcello Romani <marcello.romani@libero.it>
     Marcin Wisnicki <mwisnicki@gmail.com>
     Marco Beck <mbeck@miamod.de>
+    Marcos Mello <marcosfrm@gmail.com>
+    Marcos Mello <marcosfrm@users.noreply.github.com>
     Marcus Kool <marcus.kool@urlfilterdb.com>
     Marc van Selm <selm@cistron.nl>
     Marin Stavrev <mstavrev@gmail.com>
@@ -252,6 +289,7 @@ Thank you!
     Marko <mr_4u2@yahoo.com>
     Mark Treacy <mark@aone.com.au>
     Markus Gyger <mgyger@itr.ch>
+    Markus Mayer <code@mmayer.net>
     Markus Moeller <huaraz@moeller.plus.com>
     Markus Moeller (markus_moeller at compuserve.com)
     Markus Rietzler <markus.rietzler@rzf.fin-nrw.de>
@@ -261,6 +299,7 @@ Thank you!
     Martin Huter <mhuter@barracuda.com>
     Martin Huter <m.huter@phion.com>
     Martin Stolle <martin.stolle@ekom21.de>
+    Martin von Gagern <martin.vgagern@gmx.net>
     Masashi Fujita <objectx@bandit.co.jp>
     Massimo Zito <zmax.linkedin at gmail dot com>
     Mathias Fischer <maf@open.ch>
@@ -270,6 +309,7 @@ Thank you!
     Max Okumoto <okumoto@ucsd.edu>
     Merik Karman
     <mgd@swarm.org>
+    Michael Buchau <mike@m-buchau.de>
     Michael Cunningham <m.cunningham@xpedite.com>
     Michael Lupp <mike@nemesis.saar.de>
     Michael Mansour <mic@shell.gnxs.com.au>
@@ -278,6 +318,7 @@ Thank you!
     Michael van Elst
     Michael Weiser <michael@weiser.dinsnail.net>
     Michal Luscon <mluscon@redhat.com>
+    Michele Bergonzoni <bergonz@labs.it>
     Miguel A.L. Paraz <map@iphil.net>
     Mike Groeneweg <mikeg@scorpion.murdoch.edu.au>
     Mike Mitchell <mike.mitchell@sas.com>
@@ -286,6 +327,7 @@ Thank you!
     Milen Pankov <mail@milen.pankov.eu>
     Ming Fu <mfu@watchguard.com>
     Miquel van Smoorenburg <miquels@cistron.nl>
+    mkishi <mkishi@104.net>
     Moez Mahfoudh <moez.mahfoudh@imag.fr>
     Mohsen Saeedi <mohsen.saeedi@gmail.com>
     Mukaigawa Shin'ichi <shin@nff.ncl.omron.co.jp>
@@ -303,8 +345,11 @@ Thank you!
     Olivier W.
     OpenSolaris Project
     Oskar Pearson <oskar@is.co.za>
+    Patrick Welche <prlw1@cam.ac.uk>
+    Paulo Matias <matias@ufscar.br>
     Paul Z <paulz42@gmail.com>
     Pavel Timofeev
+    Pavel Timofeev <timp87@gmail.com>
     Pawel Worach <pawel.worach@gmail.com>
     Pedro Lineu Orso <orso@pop.hsbcbamerindus.com.br>
     Pedro Ribeiro <pribeiro@isel.pt>
@@ -326,6 +371,7 @@ Thank you!
     Rafael Martinez <rmartine@fdi.ucm.es>
     Rafael Martinez Torres <rmartine@fdi.ucm.es>
     Rafal Ramocki <maniac@sistbg.net>
+    Rainer Tammer <rainer.tammer@schulergroup.com>
     Rajiv Desai <rajiv@maginatics.com>
     Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
     Ralph Loader <loader@maths.ox.ac.uk>
@@ -355,7 +401,9 @@ Thank you!
     R Phillips <r.phillips@uq.edu.au>
     Russell Street <r.street@auckland.ac.nz>
     Russell Vincent <vincent@ucthpx.uct.ac.za>
+    Rusty Bird <rustybird@net-c.com>
     Ryan Troll <ryan+@andrew.cmu.edu>
+    Rybakov Andrey <rybakovandrey85@gmail.com>
     Samba Project
     Santiago Garcia Mantinan <manty@debian.org>
     Scott James Remnant <scott@netsplit.com>
@@ -367,8 +415,13 @@ Thank you!
     Sergio Rabellino <rabellino@di.unito.it>
     Shigechika Aikawa <shige@luck.imasy.or.jp>
     Silamael <Silamael@coronamundi.de>
+    Simon Deziel
+    SquidAdm <noc@lists.squid-cache.org>
+    squidadm <squidadm@users.noreply.github.com>
     Stefan Fritsch <sf@sfritsch.de>
+    Stefan Kruger <stadtkind2@gmx.de>
     Stefano Cordibella <stefano.cordibella@edalab.it>
+    Stephen Baynes <sbaynes@mail.com>
     Stephen R. van den Berg <srb@cuci.nl>
     Stephen Thorne <stephen@thorne.id.au>
     Steve Bennett <S.Bennett@lancaster.ac.uk>
@@ -380,9 +433,12 @@ Thank you!
     Stuart Henderson <sthen@openbsd.org>
     Stuart Henderson <stu@spacehopper.org>
     Susant Sahani <ssahani@redhat.com>
+    Sven Eisenberg <sven.eisenberg@lairdtech.com>
     Svenx <svensven@gmail.com>
     Taavi Talvik <taavi@uninet.ee>
+    Takahiro Kambe <taca@back-street.net>
     Taketo Kabe <kabe@shiratori.riec.tohoku.ac.jp>
+    tangqinghao <tangqinghao@360.cn>
     The Measurement Factory <info@measurement-factory.com>
     The Squid Software Foundation
     Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
@@ -399,10 +455,13 @@ Thank you!
     Todd C. Miller <Todd.Miller@courtesan.com>
     Tomas Hozza <thozza@redhat.com>
     Tony Lorimer <tlorimer@au.mdis.com>
+    Trever Adams <trever@middleearth.sapphiresunday.org>
     Tsantilas Christos <chtsanti@users.sourceforge.net>
     Unknown
+    Unknown - Debian Project
     Unknown FreeBSD Contributor
     Unknown - NetBSD Project
+    Vadim Aleksandrov <v.verdel@gmail.com>
     Various
     Various Translators
     Victor Jose Hernandez Gomez <vjhergom@cic.upo.es>
@@ -410,11 +469,13 @@ Thank you!
     Vincent Regnard
     Vitaliy Matytsyn (main) <vm@if.bank.gov.ua>
     Vitaliy Matytsyn <vm@if.bank.gov.ua>
+    Vitaly Lavrov <vel21ripn@gmail.com>
     vollkommen <vollkommen@gmx.net>
     Walter <bundestrojaner2@googlemail.com>
     Wang DaQing <wdq@bigfoot.com>
     Warren Baker <warren@decoy.co.za>
     Wesha <wesha@iname.com>
+    William Lima <william.lima@hscbrasil.com.br>
     Will Roberts <squid@bigwillystyle42.com>
     Wojciech Zatorski <zator@bg.szczecin.pl>
     Wojtek Sylwestrzak <W.Sylwestrzak@icm.edu.pl>
@@ -424,4 +485,5 @@ Thank you!
     yabuki <yabuki@sraoss.co.jp>
     Yannick Bergeron <yaberger@ca.ibm.com>
     Yuhua Wu <ywu@bitglass.com>
+    Yuriy M. Kaminskiy <yumkam@gmail.com>
     Zhanpeng Chen <lowstz@gmail.com>

diff --git a/ChangeLog b/ChangeLog
index 0a7aa98f5c2ac9e7ca0a1dab7f06596759ab3ee6..2d758a63cc481cd076c442e6cc02f091af131dd6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Changes to squid-4.1 (02 Jul 2018):
+
+       - Bug 4223: fixed retries of failed re-forwardable transactions
+       - Bug 4791: Build failure on MacOS
+       - Fix --with-netfilter-conntrack error message
+       - ... and many documentation updates
+
 Changes to squid-4.0.25 (11 Jun 2018):
 
        - Regression Bug 4855: querying private entries for HTCP/ICP

diff --git a/configure.ac b/configure.ac
index 794ec5fd45ea6a46c20e161c62b35aeae3276a22..e03ce2cdf000045d9c286f92e8a96e32ea84211d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,7 @@
 ## Please see the COPYING and CONTRIBUTORS files for details.
 ##
 
-AC_INIT([Squid Web Proxy],[4.0.25-VCS],[http://bugs.squid-cache.org/],[squid])
+AC_INIT([Squid Web Proxy],[4.1-VCS],[http://bugs.squid-cache.org/],[squid])
 AC_PREREQ(2.61)
 AC_CONFIG_HEADERS([include/autoconf.h])
 AC_CONFIG_AUX_DIR(cfgaux)

diff --git a/doc/release-notes/release-4.sgml b/doc/release-notes/release-4.sgml
index b7b8b54ab3cb94fa3405657db6e7527323e2b2e4..cfaf96ef28aced3a91738217644d3e024775ac82 100644 (file)
--- a/doc/release-notes/release-4.sgml
+++ b/doc/release-notes/release-4.sgml
@@ -1,6 +1,6 @@
 <!doctype linuxdoc system>
 <article>
-<title>Squid 4.0.25 release notes</title>
+<title>Squid 4.1 release notes</title>
 <author>Squid Developers</author>
 
 <abstract>
@@ -12,19 +12,17 @@ for Applied Network Research and members of the Web Caching community.
 <toc>
 
 <sect>Notice
-<p>The Squid Team are pleased to announce the release of Squid-4.0.25 for testing.
+<p>The Squid Team are pleased to announce the release of Squid-4.1 for testing.
 
 This new release is available for download from <url url="http://www.squid-cache.org/Versions/v4/"> or the
  <url url="http://www.squid-cache.org/Download/http-mirrors.html" name="mirrors">.
 
-<p>While this release is not deemed ready for production use, we believe it is ready for wider testing by the community.
-
 <p>We welcome feedback and bug reports. If you find a bug, please see <url url="http://wiki.squid-cache.org/SquidFaq/BugReporting">
    for how to submit a report with a stack trace.
 
 <sect1>Known issues
-<p>Although this release is deemed good enough for use in many setups, please note the existence of 
-<url url="http://bugs.squid-cache.org/buglist.cgi?query_format=advanced&amp;product=Squid&amp;bug_status=UNCONFIRMED&amp;bug_status=NEW&amp;bug_status=ASSIGNED&amp;bug_status=REOPENED&amp;version=4" name="open bugs against Squid-4">.
+<p>Although this release is deemed good enough for use in production, please note the existence of
+   <url url="http://bugs.squid-cache.org/buglist.cgi?query_format=advanced&amp;product=Squid&amp;bug_status=UNCONFIRMED&amp;bug_status=NEW&amp;bug_status=ASSIGNED&amp;bug_status=REOPENED&amp;version=4" name="open bugs against Squid-4">.
 
 <p>This release adds a dependency on C++11 support in any compiler used to build Squid.
   As a result older C++03 -only and most C++0x compilers will no longer build successfully.
@@ -100,11 +98,11 @@ Most user-facing changes are reflected in squid.conf (see below).
    when an old TLS version is requested by the remote endpoint.
 
 <p>The system Trusted CAs are no longer used by default when verifying client
-   certificates. The <em>cafile=</em> option should be used instead to load
-   the specific CA which signed acceptible client certificates explicitly,
+   certificates. The <em>cafile=</em> option should be used instead to
+   explicitly load the specific CA which signed acceptible client certificates,
    even if that CA is one of the system Trusted CAs.
    The <em>tls-default-ca</em> option can be used to restore the old
-   behaviour explicitly if needed.
+   behaviour if needed.
 
 
 <sect1>Helper Binary Changes
@@ -126,7 +124,8 @@ Most user-facing changes are reflected in squid.conf (see below).
    and is now built and installed by default whenever OpenSSL support is enabled.
    Building the helper can be controlled using the <em>--enable-security-cert-generators="file"</em>
    option.
-   NOTE: The <em>--enable-ssl-crtd</em> option is still required to enable the
+
+<p>NOTE: The <em>--enable-ssl-crtd</em> option is still required to enable the
    <em>sslcrtd_program</em> helper interface within Squid that uses the helper.
 
 <p>The <em>ntlm_smb_lm_auth</em> helper is now built using <em>--enable-auth-ntlm="SMB_LM"</em>.
@@ -148,8 +147,8 @@ Most user-facing changes are reflected in squid.conf (see below).
 <sect1>Improved SMP support
 <p>Use of C++11 atomic operations instead of GNU atomics allows a wider range of
    operating systems and compilers to build Squid SMP and multi-process features.
-   However this does require a C++11 or C++0x compiler with a recent version of
-   the C++ standard library.
+   However this does require a C++11 compiler with a recent version of the C++
+   standard library.
 
 <p>IpcIo and Mmapped disk I/O modules are now auto-detected properly which
    enables Rock storage on more systems by default than previously.
@@ -195,6 +194,8 @@ Most user-facing changes are reflected in squid.conf (see below).
 <p>Advanced configuration with specific selection of ciphers and similar settings
    should still work, but needs the GnuTLS <em>Priority Strings</em> instead of
    the OpenSSL options when using GnuTLS.
+   See <url url="https://www.gnutls.org/manual/gnutls.html#Priority-Strings" name="GnuTLS manual">
+   for more details.
 
 
 <sect1>ESI Custom Parser removal
@@ -262,7 +263,7 @@ This section gives a thorough account of those changes in three categories:
           connections. For example to HTTPS servers.
 
        <tag>url_rewrite_timeout</tag>
-       <p>Squid times active requests to redirector. This option sets
+       <p>Squid times active requests to redirector. This directive sets
           the timeout value and the Squid reaction to a timed out
           request.
 
@@ -274,7 +275,7 @@ This section gives a thorough account of those changes in three categories:
        <tag>access_log</tag>
        <p>TCP accept(2) errors logged with URI <em>error:accept-client-connection</em>.
        <p>Unused connections received in <em>http_port</em> or <em>https_port</em>
-          or transactions terminated before reading[parsing] request headers
+          or transactions terminated before reading[parsing] request headers are
           logged with URI <em>error:transaction-end-before-headers</em>.
        <p>New option <em>rotate=</em> to control the number of log file rotations
           to make when <em>-k rotate</em> command is received. Default is to