[master] 2211bcc73 Add documentation for new long string format

Dridi Boukelmoune dridi.boukelmoune at gmail.com
Tue Nov 24 14:26:10 UTC 2020


commit 2211bcc7355ee4b965cebcfc62575a1a6938da52
Author: Andrew Wiik <andrew at varnish-software.com>
Date:   Fri Nov 20 11:39:05 2020 -0500

    Add documentation for new long string format

diff --git a/doc/sphinx/reference/vcl.rst b/doc/sphinx/reference/vcl.rst
index a532c96fd..2e7767c17 100644
--- a/doc/sphinx/reference/vcl.rst
+++ b/doc/sphinx/reference/vcl.rst
@@ -84,7 +84,7 @@ Strings
 
 Basic strings are enclosed in double quotes ``"``\ *...*\ ``"``, and
 may not contain newlines. Long strings are enclosed in
-``{"``\ *...*\ ``"}``. They may contain any character including single
+``{"``\ *...*\ ``"}`` or ``"""``\ *...*\ ``"""``. They may contain any character including single
 double quotes ``"``, newline and other control characters except for the
 *NUL* (0x00) character.
 
@@ -511,7 +511,7 @@ ban(STRING)
 
       Either a literal string or a regular expression. Note that
       *<arg>* does not use any of the string delimiters like ``"`` or
-      ``{"``\ *...*\ ``"}`` used elsewhere in varnish. To match
+      ``{"``\ *...*\ ``"}`` or ``"""``\ *...*\ ``"""`` used elsewhere in varnish. To match
       against strings containing whitespace, regular expressions
       containing ``\s`` can be used.
 
diff --git a/doc/sphinx/users-guide/vcl-syntax.rst b/doc/sphinx/users-guide/vcl-syntax.rst
index ea97402cc..22b71ac57 100644
--- a/doc/sphinx/users-guide/vcl-syntax.rst
+++ b/doc/sphinx/users-guide/vcl-syntax.rst
@@ -23,7 +23,7 @@ to do the "count-the-backslashes" polka::
 
   regsub("barf", "(b)(a)(r)(f)", "\4\3\2p") -> "frap"
 
-Long strings are enclosed in {" ... "}. They may contain any character
+Long strings are enclosed in {" ... "} or """ ... """. They may contain any character
 including ", newline and other control characters except for the NUL
 (0x00) character. If you really want NUL characters in a string there
 is a VMOD that makes it possible to create such strings.


More information about the varnish-commit mailing list