[4.1] eab2be2 Fold history and copyright into an authors section.

Lasse Karstensen lkarsten at varnish-software.com
Thu Jan 14 15:15:07 CET 2016

commit eab2be292133945a6ff6556b61bcb85ce9dd3e04
Author: Lasse Karstensen <lkarsten at varnish-software.com>
Date:   Fri Dec 4 11:30:23 2015 +0100

    Fold history and copyright into an authors section.

diff --git a/doc/sphinx/reference/varnish-cli.rst b/doc/sphinx/reference/varnish-cli.rst
index 390bbe9..cc716f6 100644
--- a/doc/sphinx/reference/varnish-cli.rst
+++ b/doc/sphinx/reference/varnish-cli.rst
@@ -305,24 +305,16 @@ the backend contains "USERID=1663"::
     req.http.host ~ "^(?i)(www\.)example.com$" && obj.http.set-cookie ~ "USERID=1663"
+This manual page was originally written by Per Buer and later modified by
+Federico G. Schwindt, Dridi Boukelmoune, Lasse Karstensen and Poul-Henning
 * :ref:`varnishadm(1)`
 * :ref:`varnishd(1)`
 * :ref:`vcl(7)`
-The Varnish manual page was written by Per Buer in 2011. Some of the
-text was taken from the Varnish Cache wiki, the :ref:`varnishd(1)` man
-page or the Varnish source code.
-This document is licensed under the same licence as Varnish
-itself. See LICENCE for details.
-* Copyright (c) 2011-2015 Varnish Software AS

More information about the varnish-commit mailing list