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

bin/varnishd/storage/stevedore_utils.c

@@ -141,7 +141,7 @@ STV_GetFile(const char *fn, int *fdp, const char **fnp, const char *ctx)
 /*--------------------------------------------------------------------
  * Decide file size.
  *
- * If the sizespecification is empty and the file exists with non-zero
+ * If the size specification is empty and the file exists with non-zero
  * size, use that, otherwise, interpret the specification.
  *
  * Handle off_t sizes and pointer width limitations.

doc/sphinx/reference/vcl.rst

@@ -236,7 +236,7 @@ Probes
 ------
 
 Probes will query the backend for status on a regular basis and mark
-the backend as down it they fail. A probe is defined as this:::
+the backend as down it they fail. A probe is defined as this::
 
     probe name {
          .attribute = "value";
@@ -249,8 +249,8 @@ There are no mandatory options. These are the options you can set:
 
   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. If
+    specified, .request will take precedence over .url.
 
   expected_response
     The expected HTTP response code. Defaults to 200.

doc/sphinx/tutorial/backend_servers.rst

@@ -13,7 +13,7 @@ file. If you installed from source this is
 is probably `/etc/varnish/default.vcl`.
 
 If you've been following the tutorial there is probably a section of
-the configuration that looks like this:::
+the configuration that looks like this::
 
   vcl 4.0;
   

doc/sphinx/users-guide/vcl-backends.rst

@@ -84,7 +84,7 @@ explicitly. You set up the routing of incoming HTTP requests in
 `vcl_recv`. If you want this routing to be done on the basis of virtual
 hosts you just need to inspect `req.http.host`.
 
-You can have something like this:::
+You can have something like this::
 
     sub vcl_recv {
         if (req.http.host ~ "foo.com") {
@@ -97,7 +97,7 @@ You can have something like this:::
 Note that the first regular expressions will match "foo.com",
 "www.foo.com", "zoop.foo.com" and any other host ending in "foo.com". In
 this example this is intentional but you might want it to be a bit
-more tight, maybe relying on the ``==`` operator in stead, like this:::
+more tight, maybe relying on the ``==`` operator in stead, like this::
 
     sub vcl_recv {
         if (req.http.host == "foo.com" || req.http.host == "www.foo.com") {

doc/sphinx/users-guide/vcl-grace.rst

@@ -37,7 +37,7 @@ the object. This will happen asynchronously and the moment the new
 object is in it will replace the one we've already got.
 
 You can influence how this logic works by adding code in vcl_hit. The
-default looks like this:::
+default looks like this::
 
   sub vcl_hit {
      if (obj.ttl >= 0s) {
@@ -56,7 +56,7 @@ default looks like this:::
 The grace logic is pretty obvious here. If you have enabled
 :ref:`users-guide-advanced_backend_servers-health` you can check if
 the backend is sick and only serve graced object then. Replace the
-second if-clause with something like this:::
+second if-clause with something like this::
 
    if (!std.healthy(req.backend_hint) && (obj.ttl + obj.grace > 0s)) {
          return (deliver);

doc/sphinx/users-guide/vcl-syntax.rst

@@ -19,7 +19,7 @@ Strings
 Basic strings are enclosed in " ... ", and may not contain newlines.
 
 Backslash is not special, so for instance in `regsub()` you do not need
-to do the "count-the-backslashes" polka:::
+to do the "count-the-backslashes" polka::
 
   regsub("barf", "(b)(a)(r)(f)", "\4\3\2p") -> "frap"
 

lib/libvmod_directors/vmod.vcc

@@ -37,14 +37,14 @@ also serves as an example on how one could extend the load balancing
 capabilities of Varnish.
 
 To enable load balancing you must import this vmod (directors) in your
-VCL:::
+VCL::
 
   import directors;
 
 Then you define your backends. Once you have the backends declared you
 can add them to a director. This happens in executed VCL code. If you
 want to emulate the previous behavior of Varnish 3.0 you can just
-initialize the directors in vcl_init, like this:::
+initialize the directors in vcl_init, like this::
 
     sub vcl_init {
 	new vdir = directors.round_robin();