[master] 001f86f Merge branch 'master' of ssh://git.varnish-cache.org/git/varnish-cache

Per Andreas Buer perbu at varnish-cache.org
Fri May 20 11:12:12 CEST 2011

commit 001f86f8deb9e1e9e6dde3d2c4fe95016204a0a6
Merge: 29d4914 5840a2a
Author: Per Buer <perbu at varnish-software.com>
Date:   Fri May 20 11:11:08 2011 +0200

    Merge branch 'master' of ssh://git.varnish-cache.org/git/varnish-cache

diff --cc doc/sphinx/reference/vcl.rst
index 8837142,cfb1c38..4a88dd1
--- a/doc/sphinx/reference/vcl.rst
+++ b/doc/sphinx/reference/vcl.rst
@@@ -323,11 -323,8 +323,10 @@@ regsub(str, regex, sub
  regsuball(str, regex, sub)
    As regsuball() but this replaces all occurrences.
 +ban(ban expression)
-   Executes a ban.
 -  Ban all objects in cache whose URLs match regex.
 +  Bans all objects in cache whose URLs match regex.

More information about the varnish-commit mailing list