Bug 4458: Squid 4 behaviour change with external ACL arguments

[thirdparty/squid.git] / src / cf.data.pre

diff --git a/src/cf.data.pre b/src/cf.data.pre
index 430e77e51b159aa83646edbc866108fe9c7588b9..b538696ac2800d818a93194362403fe0524030fc 100644 (file)
--- a/src/cf.data.pre
+++ b/src/cf.data.pre
@@ -774,8 +774,14 @@ DOC_START
 
          %ACL          The name of the ACL being tested.
 
-         %DATA         The ACL arguments separated by spaces (an
-                       "argument string").
+         %DATA         The ACL arguments specified in the referencing config
+                       'acl ... external' line, separated by spaces (an
+                       "argument string"). see acl external.
+
+                       If there are no ACL arguments %DATA expands to '-'.
+
+                       If you do not specify a DATA macro inside FORMAT,
+                       Squid automatically appends %DATA to your FORMAT.
 
                        By default, Squid applies URL-encoding to each ACL
                        argument inside the argument string. If an explicit
@@ -784,9 +790,6 @@ DOC_START
                        (e.g., with %#DATA, spaces between arguments become
                        %20).
 
-                       If you do not specify a DATA macro inside FORMAT,
-                       Squid automatically appends %DATA to your FORMAT.
-
        If SSL is enabled, the following formating codes become available:
 
          %USER_CERT            SSL User certificate in PEM format
@@ -801,16 +804,13 @@ DOC_START
 
        General request syntax:
 
-         [channel-ID] FORMAT-values [acl-values ...]
+         [channel-ID] FORMAT-values
 
 
        FORMAT-values consists of transaction details expanded with
        whitespace separation per the config file FORMAT specification
        using the FORMAT macros listed above.
 
-       acl-values consists of any string specified in the referencing
-       config 'acl ... external' line. see the "acl external" directive.
-
        Request values sent to the helper are URL escaped to protect
        each value in requests against whitespaces.