[master] 32124b2 Clarify probe documentation.

Poul-Henning Kamp phk at FreeBSD.org
Thu Dec 7 10:36:07 UTC 2017


commit 32124b299059fb8f8786e4703cf1de4cc2f61f04
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Thu Dec 7 10:34:38 2017 +0000

    Clarify probe documentation.
    
    Fixes #2510
    
    Submitted by:	klean at github

diff --git a/doc/sphinx/reference/vcl.rst b/doc/sphinx/reference/vcl.rst
index e826779..a0f94db 100644
--- a/doc/sphinx/reference/vcl.rst
+++ b/doc/sphinx/reference/vcl.rst
@@ -270,11 +270,12 @@ There are no mandatory options. These are the options you can set:
 
   ``.url``
     The URL to query. Defaults to ``/``.
+    Mutually exclusive with ``.request``
 
   ``.request``
     Specify a full HTTP request using multiple strings. ``.request`` will
-    have ``\r\n`` automatically inserted after every string. If
-    specified, ``.request`` will take precedence over ``.url``.
+    have ``\r\n`` automatically inserted after every string. 
+    Mutually exclusive with ``.url``.
 
   ``.expected_response``
     The expected HTTP response code. Defaults to ``200``.
@@ -296,8 +297,9 @@ There are no mandatory options. These are the options you can set:
     Defaults to ``8``.
 
   ``.threshold``
-    How many of the polls in .window must have succeeded for us to
-    consider the backend healthy. Defaults to ``3``.
+    How many of the polls in ``.window`` must have succeeded to
+    for the backend to be healthy.
+    Defaults to ``3``.
 
 
 Access Control List (ACL)


More information about the varnish-commit mailing list