[4.1] f8a913d Grammar and minor corrections

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


commit f8a913d576b86195be86ee2174f47d0537e7af25
Author: Federico G. Schwindt <fgsch at lodoss.net>
Date:   Wed Aug 12 23:10:18 2015 +0100

    Grammar and minor corrections

diff --git a/doc/changes.rst b/doc/changes.rst
index 3caf9f0..a2e4598 100644
--- a/doc/changes.rst
+++ b/doc/changes.rst
@@ -614,7 +614,7 @@ Other
 Changes from 3.0.2 to 3.0.3 (2012-08-20)
 ========================================
 
-Varnishd
+varnishd
 --------
 
 - Fix a race on the n_sess counter. This race made varnish do excessive
@@ -731,7 +731,7 @@ Other
 Changes from 3.0.2 rc 1 to 3.0.2 (2011-10-26)
 =============================================
 
-Varnishd
+varnishd
 --------
 
 - Make the size of the synthetic object workspace equal to
@@ -762,7 +762,7 @@ Other
 Changes from 3.0.1 to 3.0.2 rc 1 (2011-10-06)
 =============================================
 
-Varnishd
+varnishd
 --------
 
 - Only log the first 20 bytes of extra headers to prevent overflows.
@@ -824,7 +824,7 @@ Other
 Changes from 3.0.1 rc 1 to 3.0.1 (2011-08-30)
 =============================================
 
-Varnishd
+varnishd
 --------
 
 - Fix crash in streaming code.
@@ -856,7 +856,7 @@ Other
 Changes from 3.0.0 to 3.0.1 rc 1 (2011-08-24)
 =============================================
 
-Varnishd
+varnishd
 --------
 
 - Avoid sending an empty end-chunk when sending bodyless responsed.
@@ -933,7 +933,7 @@ Other
 Changes from 3.0 beta 2 to 3.0.0 (2011-06-16)
 =============================================
 
-Varnishd
+varnishd
 --------
 
 - Avoid sending an empty end-chunk when sending bodyless responsed.
@@ -961,7 +961,7 @@ varnishadm
 Changes from 3.0 beta 1 to 3.0 beta 2
 =====================================
 
-Varnishd
+varnishd
 --------
 
 - thread_pool_min and thread_pool_max now each refer to the number of
@@ -1023,7 +1023,7 @@ Upcoming changes
   to do ``ban("req.url == " + req.url)`` instead.  This syntax already
   works and is recommended.
 
-Varnishd
+varnishd
 --------
 
 - Add streaming on ``pass`` and ``miss``.  This is controlled by the
@@ -1296,7 +1296,7 @@ varnishd
 
 -  Do not filter out Content-Range headers in pass.
 
--  Require -d, -b, -f, -S or -T when starting Varnishd. In human terms,
+-  Require -d, -b, -f, -S or -T when starting varnishd. In human terms,
    this means that it is legal to start varnishd without a Vcl or
    backend, but only if you have a CLI channel of some kind.
 
diff --git a/doc/sphinx/glossary/index.rst b/doc/sphinx/glossary/index.rst
index 2f9250e..a3d9761 100644
--- a/doc/sphinx/glossary/index.rst
+++ b/doc/sphinx/glossary/index.rst
@@ -21,7 +21,7 @@ Varnish Glossary
 
    master (process)
 	One of the two processes in the varnishd program.
-	The master proces is a manager/nanny process which handles
+	The master process is a manager/nanny process which handles
 	configuration, parameters, compilation of :term:VCL etc.
 	but it does never get near the actual HTTP traffic.
 
@@ -55,7 +55,7 @@ Varnish Glossary
 	Program which presents varnish transaction log in "NCSA" format.
 
    varnishhist
-	Eye-candy program showing responsetime histogram in 1980ies
+	Eye-candy program showing response time histogram in 1980s
 	ASCII-art style.
 
    varnishtest
@@ -86,8 +86,8 @@ Varnish Glossary
 	to varnishd they are just bytes.
 
    object
-	The (possibly) cached version of a backend response. Varnishd
-	receives a reponse from the backend and creates an object,
+	The (possibly) cached version of a backend response. varnishd
+	receives a response from the backend and creates an object,
 	from which it may deliver cached responses to clients. If the
 	object is created as a result of a request which is passed, it
 	will not be stored for caching.
diff --git a/doc/sphinx/reference/vsm.rst b/doc/sphinx/reference/vsm.rst
index 13afbdd..fbea284 100644
--- a/doc/sphinx/reference/vsm.rst
+++ b/doc/sphinx/reference/vsm.rst
@@ -67,7 +67,7 @@ off" period.
 The Varnish way:
 ----------------
 
-If Varnishd starts, and finds a locked shared memory file, it will
+If varnishd starts, and finds a locked shared memory file, it will
 exit with a message about using different -n arguments if you want
 multiple instances of varnishd.
 
diff --git a/doc/sphinx/users-guide/run_security.rst b/doc/sphinx/users-guide/run_security.rst
index d83ea18..41c68a8 100644
--- a/doc/sphinx/users-guide/run_security.rst
+++ b/doc/sphinx/users-guide/run_security.rst
@@ -47,7 +47,7 @@ CLI interface access
 
 The command line interface can be accessed in three ways.
 
-`Varnishd` can be told to listen and offer CLI connections
+`varnishd` can be told to listen and offer CLI connections
 on a TCP socket. You can bind the socket to pretty
 much anything the kernel will accept::
 
diff --git a/include/vsm_priv.h b/include/vsm_priv.h
index 0cc1a9f..e6893cc 100644
--- a/include/vsm_priv.h
+++ b/include/vsm_priv.h
@@ -56,7 +56,7 @@
  * Subscribers will have to monitor three things to make sure they look at
  * the right thing: The alloc_seq field, the age counter and the dev+inode
  * of the path-name.  The former check is by far the cheaper, the second
- * can be used to check that Varnishd is still alive and the last check
+ * can be used to check that varnishd is still alive and the last check
  * should only be employed when lack of activity in the VSM segment raises
  * suspicion that something has happened.
  *



More information about the varnish-commit mailing list