[4.1] 0bdcee4 Spelling and minor fixes

Federico G. Schwindt fgsch at lodoss.net
Fri Sep 4 15:54:51 CEST 2015

commit 0bdcee4f4a7c38f0e718d53b246b76c952966fc4
Author: Federico G. Schwindt <fgsch at lodoss.net>
Date:   Tue Jul 21 00:50:02 2015 +0100

    Spelling and minor fixes

diff --git a/doc/sphinx/installation/help.rst b/doc/sphinx/installation/help.rst
index 14746e7..22cd106 100644
--- a/doc/sphinx/installation/help.rst
+++ b/doc/sphinx/installation/help.rst
@@ -65,7 +65,7 @@ usually quite focused on source-code and such. Everybody on
 the `-dev` list is also on `-misc`, so cross-posting only serves to annoy
 those people.
-We also maintain a community wiki_ for Varnish, there you will find information on planned events, meetings, current backlog, troube tickets ,  and links to resources and documentation. 
+We also maintain a community wiki_ for Varnish, there you will find information on planned events, meetings, current backlog, trouble tickets ,  and links to resources and documentation.
 .. XXX: we should introduce the wiki (if we care about it) before
 .. we start referring to it (below). Make a wiki chapter?
diff --git a/doc/sphinx/reference/index.rst b/doc/sphinx/reference/index.rst
index ec73438..8eb11ed 100644
--- a/doc/sphinx/reference/index.rst
+++ b/doc/sphinx/reference/index.rst
@@ -32,9 +32,9 @@ The Varnish Reference Manual
         . - counters explained
         . common filtering options for shmlog tools
         . varnishlog ..
-        . varnsihtop ..
-        . varnsihncsa ..
-        . varnsihhist ..
+        . varnishtop ..
+        . varnishncsa ..
+        . varnishhist ..
         The CLI:
         . connections: -T -S -M
         . varnishadm
diff --git a/doc/sphinx/reference/varnishadm.rst b/doc/sphinx/reference/varnishadm.rst
index 76f5d3f..f671d8f 100644
--- a/doc/sphinx/reference/varnishadm.rst
+++ b/doc/sphinx/reference/varnishadm.rst
@@ -50,7 +50,7 @@ OPTIONS
 The syntax and operation of the actual CLI interface is described in
-the :ref:`varnish-cli(7)` manual page. Parameteres are described in
+the :ref:`varnish-cli(7)` manual page. Parameters are described in
 :ref:`varnishd(1)` manual page.
 Additionally, a summary of commands can be obtained by issuing the
diff --git a/doc/sphinx/reference/varnishstat.rst b/doc/sphinx/reference/varnishstat.rst
index e2c1fc8..e833706 100644
--- a/doc/sphinx/reference/varnishstat.rst
+++ b/doc/sphinx/reference/varnishstat.rst
@@ -58,7 +58,7 @@ The following options are available:
 	any seconds. If zero the connection is attempted only once and
 	will fail immediately if unsuccessful. If set to "off", the
 	connection will not fail, allowing the utility to start and
-	wait indefinetely for the Varnish instance to appear.
+	wait indefinitely for the Varnish instance to appear.
 	Defaults to 5 seconds.
diff --git a/doc/sphinx/reference/vcl.rst b/doc/sphinx/reference/vcl.rst
index 2246dd6..b6d7702 100644
--- a/doc/sphinx/reference/vcl.rst
+++ b/doc/sphinx/reference/vcl.rst
@@ -306,15 +306,14 @@ To match an IP address against an ACL, simply use the match operator::
 VCL objects
-A VCL object can be made with the *new* keyword.
+A VCL object can be instantiated with the *new* keyword::
     sub vcl_init {
         new b = directors.round_robin()
+This is only available in vcl_init.
@@ -379,9 +378,6 @@ hash_data(input)
   Adds an input to the hash input. In the built-in VCL hash_data()
   is called on the host and URL of the *request*. Available in vcl_hash.
-  Instanciate a new VCL object. Available in vcl_init.
   Restore *req* HTTP headers to their original state. This function is
   deprecated.  Use std.rollback() instead.
diff --git a/doc/sphinx/reference/vsm.rst b/doc/sphinx/reference/vsm.rst
index cdae8e7..13afbdd 100644
--- a/doc/sphinx/reference/vsm.rst
+++ b/doc/sphinx/reference/vsm.rst
@@ -34,7 +34,7 @@ tricky in ways a regular logfile is not.
 When you open a file in "append" mode, the operating system guarantees
 that whatever you write will not overwrite existing data in the file.
-The neat result of this is that multiple procesess or threads writing
+The neat result of this is that multiple processes or threads writing
 to the same file does not even need to know about each other, it all
 works just as you would expect.

More information about the varnish-commit mailing list