[3.0] c9366e5 :: need to be on a separate line in RST.

Tollef Fog Heen tfheen at varnish-cache.org
Thu May 24 14:51:11 CEST 2012


commit c9366e5f2eaba0f27701a5bbe55862b6202e1cef
Author: Per Buer <perbu at varnish-software.com>
Date:   Mon Apr 16 13:37:47 2012 +0200

    :: need to be on a separate line in RST.

diff --git a/doc/sphinx/reference/vcl.rst b/doc/sphinx/reference/vcl.rst
index ff92c56..01d783f 100644
--- a/doc/sphinx/reference/vcl.rst
+++ b/doc/sphinx/reference/vcl.rst
@@ -96,14 +96,16 @@ file as a quoted string.
 Backend declarations
 --------------------
 
-A backend declaration creates and initializes a named backend object::
+A backend declaration creates and initializes a named backend object:
+::
 
   backend www {
     .host = "www.example.com";
     .port = "http";
   }
 
-The backend object can later be used to select a backend at request time::
+The backend object can later be used to select a backend at request time:
+::
 
   if (req.http.host ~ "(?i)^(www.)?example.com$") {
     set req.backend = www;
@@ -118,7 +120,8 @@ backend connection, .first_byte_timeout for the time to wait for the
 first byte from the backend and .between_bytes_timeout for time to
 wait between each received byte.
 
-These can be set in the declaration like this::
+These can be set in the declaration like this:
+::
 
   backend www {
     .host = "www.example.com";
@@ -145,7 +148,8 @@ be used.
 There are several types of directors. The different director types
 use different algorithms to choose which backend to use.
 
-Configuring a director may look like this::
+Configuring a director may look like this:
+::
 
   director b2 random {
     .retries = 5;
@@ -226,7 +230,8 @@ The DNS director
 ~~~~~~~~~~~~~~~~
 
 The DNS director can use backends in two different ways. Either like the
-random or round-robin director or using .list::
+random or round-robin director or using .list:
+::
 
   director directorname dns {
           .list = {
@@ -266,7 +271,8 @@ considers them in the order in which they are listed in its definition.
 
 The fallback director does not take any options.
 
-An example of a fallback director::
+An example of a fallback director:
+::
 
   director b3 fallback {
     { .backend = www1; }
@@ -312,7 +318,8 @@ Probes take the following parameters:
   Default is 2 seconds.
 
 A backend with a probe can be defined like this, together with the
-backend or director::
+backend or director:
+::
 
   backend www {
     .host = "www.example.com";
@@ -326,7 +333,8 @@ backend or director::
     }
   }
 
-Or it can be defined separately and then referenced::
+Or it can be defined separately and then referenced:
+::
 
   probe healthcheck {
      .url = "/status.cgi";
@@ -347,7 +355,8 @@ Or it can be defined separately and then referenced::
 If you have many backends this can simplify the config a lot.
 
 
-It is also possible to specify the raw HTTP request::
+It is also possible to specify the raw HTTP request:
+::
 
   probe rawprobe {
       # NB: \r\n automatically inserted after each string!
@@ -361,7 +370,8 @@ ACLs
 ----
 
 An ACL declaration creates and initializes a named access control list
-which can later be used to match client addresses::
+which can later be used to match client addresses:
+::
 
   acl local {
     "localhost";         // myself
@@ -375,7 +385,8 @@ if it is preceded by a negation mark, it will reject any address it is
 compared to, which may not be what you intended.  If the entry is
 enclosed in parentheses, however, it will simply be ignored.
 
-To match an IP address against an ACL, simply use the match operator::
+To match an IP address against an ACL, simply use the match operator:
+::
 
   if (client.ip ~ local) {
     return (pipe);
@@ -390,7 +401,8 @@ PCRE(3) man page.
 
 To send flags to the PCRE engine, such as to turn on *case
 insensitivity* add the flag within parens following a question mark,
-like this::
+like this:
+::
 
   if (req.http.host ~ "(?i)example.com$") {
           ...
@@ -424,7 +436,8 @@ ban_url(regex)
 Subroutines
 ~~~~~~~~~~~
 
-A subroutine is used to group code for legibility or reusability::
+A subroutine is used to group code for legibility or reusability:
+::
   
   sub pipe_if_local {
     if (client.ip ~ local) {
@@ -640,7 +653,8 @@ appear in the source.
 The default versions distributed with Varnish will be implicitly
 concatenated as a last resort at the end.
 
-Example::
+Example:
+::
 
 	# in file "main.vcl"
 	include "backends.vcl";
@@ -887,7 +901,8 @@ resp.response
 resp.http.header
   The corresponding HTTP header.
 
-Values may be assigned to variables using the set keyword::
+Values may be assigned to variables using the set keyword:
+::
 
   sub vcl_recv {
     # Normalize the Host: header
@@ -896,7 +911,8 @@ Values may be assigned to variables using the set keyword::
     }
   }
 
-HTTP headers can be removed entirely using the remove keyword::
+HTTP headers can be removed entirely using the remove keyword:
+::
 
   sub vcl_fetch {
     # Don't cache cookies
@@ -913,7 +929,8 @@ fresh object is being generated by the backend.
 
 The following vcl code will make Varnish serve expired objects.  All
 object will be kept up to two minutes past their expiration time or a
-fresh object is generated.::
+fresh object is generated.
+::
 
   sub vcl_recv {
     set req.grace = 2m;
@@ -938,7 +955,8 @@ EXAMPLES
 
 The following code is the equivalent of the default configuration with
 the backend address set to "backend.example.com" and no backend port
-specified::
+specified:
+::
 
   backend default {
    .host = "backend.example.com";
@@ -950,7 +968,8 @@ specified::
 
 The following example shows how to support multiple sites running on
 separate backends in the same Varnish instance, by selecting backends
-based on the request URL::
+based on the request URL:
+::
 
   backend www {
     .host = "www.example.com";
@@ -976,7 +995,8 @@ based on the request URL::
 The following snippet demonstrates how to force a minimum TTL for
 all documents.  Note that this is not the same as setting the
 default_ttl run-time parameter, as that only affects document for
-which the backend did not specify a TTL::
+which the backend did not specify a TTL:
+::
   
   import std; # needed for std.log
 
@@ -988,7 +1008,8 @@ which the backend did not specify a TTL::
   }
 
 The following snippet demonstrates how to force Varnish to cache
-documents even when cookies are present::
+documents even when cookies are present:
+::
 
   sub vcl_recv {
     if (req.request == "GET" && req.http.cookie) {
@@ -1003,7 +1024,8 @@ documents even when cookies are present::
   }
 
 The following code implements the HTTP PURGE method as used by Squid
-for object invalidation::
+for object invalidation:
+::
 
   acl purge {
     "localhost";



More information about the varnish-commit mailing list