[master] c1ee4c9 Random typos and grammar fixes

Federico G. Schwindt fgsch at lodoss.net
Wed Feb 3 09:18:41 CET 2016 

commit c1ee4c9f76da0a27305f5f022c86cad5628a2703
Author: Federico G. Schwindt <fgsch at lodoss.net>
Date:   Wed Feb 3 08:16:54 2016 +0000

    Random typos and grammar fixes
    
    Some submitted by: github::sublimino

diff --git a/doc/changes.rst b/doc/changes.rst
index 154c84d..6194011 100644
--- a/doc/changes.rst
+++ b/doc/changes.rst
@@ -566,7 +566,7 @@ Changes from 3.0.6 to 3.0.7-rc1 (2015-03-18)
 - Requests with multiple Content-Length headers will now fail.
 
 - Stop recognizing a single CR (\r) as a HTTP line separator.
-  This opened up a possible cache poisioning attack in stacked installations
+  This opened up a possible cache poisoning attack in stacked installations
   where sslterminator/varnish/backend had different CR handling.
 
 - Improved error detection on master-child process communication, leading to
diff --git a/doc/sphinx/phk/10goingon50.rst b/doc/sphinx/phk/10goingon50.rst
index 6960e1f..ffe4349 100644
--- a/doc/sphinx/phk/10goingon50.rst
+++ b/doc/sphinx/phk/10goingon50.rst
@@ -20,7 +20,7 @@ subversion commit number 9::
     commit 523166ad2dd3a65e3987f13bc54f571f98453976
     Author: Dag Erling Smørgrav <des at des.no>
     Date:   Wed Feb 22 14:31:39 2006 +0000
-    
+
         Additional subdivisions.
 
 We consider this the official birth-certificate of the Varnish Cache
@@ -39,13 +39,13 @@ One part of the celebration, somehow, sometime, will be the "VCL
 Obfuscated Code Contest #1" in the same spirit as the `International
 Obfuscated C Code Contest <http://www.ioccc.org/>`_.
 
-True afficionados of Obfuscated Code will also appreciate this
+True aficionados of Obfuscated Code will also appreciate this
 amazing `Obfuscated PL/1 <http://www.multicians.org/proc-proc.html>`_.
 
 The official VCLOCC1 contest rules are simple:
 
 * VCL code must work with Varnish 4.1.1
-* As many Varnishd instances as you'd like. 
+* As many Varnishd instances as you'd like.
 * No inline-C allowed
 * Any VMOD you want is OK
 * You get to choose the request(s) to send to Varnishd
@@ -63,7 +63,7 @@ you are more than welcome to start already now.
 Releases
 --------
 
-Our 10 year aniversary was a good excuse to take stock and look at
+Our 10 year anniversary was a good excuse to take stock and look at
 the way we work, and changes are and will be happening.
 
 Like any respectable FOSS project, the Varnish project has never been
@@ -80,7 +80,7 @@ Come hell or high water [#f1]_, Varnish 5.0 will be released September
 15th 2016.
 
 And the next big release, whatever we call it, will be middle of
-march 2017, and until we change our mind, you can trust a major
+March 2017, and until we change our mind, you can trust a major
 release of Varnish to happen every six months.
 
 Minor releases, typically bugfixes, will be released as need arise,
@@ -95,7 +95,7 @@ We have plans and ideas for what *should* be there, and we will work
 to reach those milestones, but we will not hold the release for "just this
 one more feature" if they are not ready.
 
-If it is in on september 15th, it will be in the release, if not, it wont.
+If it is in on September 15th, it will be in the release, if not, it wont.
 
 And since the next release is guaranteed to come six months later,
 it's not a catastrophe to miss the deadline.
@@ -131,8 +131,8 @@ with the 4.1 release.
 All this obviously changes the dynamics of the project, and it we
 find out it is a disaster, we'll change our mind.
 
-But until then:  Two major releases a year, as clock-work, mid-september
-and mid-march.
+But until then:  Two major releases a year, as clock-work, mid-September
+and mid-March.
 
 ----------------
 Moving to github
@@ -176,7 +176,7 @@ If you are a contributor to Varnish, you should already have the
 nice blue T-shirt and the mug to prove it.  (Thanks Varnish-Software!)
 
 If you merely stumble over a spelling mistake, you merely
-stumbled over a spelling mistake, and we will happily 
+stumbled over a spelling mistake, and we will happily
 correct it, and put your name in the commit message.
 
 But it takes a lot more that fixing a spelling mistake to
@@ -190,7 +190,7 @@ Speaking of which...
 Where does 50 come into it ?
 ----------------------------
 
-On january 20th I celebrated my 50 year birthday, and this was a
+On January 20th I celebrated my 50 year birthday, and this was a
 much more serious affair than I had anticipated:  For the first
 time in my life I have received a basket with wine and flowers on
 my birthday.
diff --git a/doc/sphinx/phk/dough.rst b/doc/sphinx/phk/dough.rst
index aef598b..ea38a2e 100644
--- a/doc/sphinx/phk/dough.rst
+++ b/doc/sphinx/phk/dough.rst
@@ -86,7 +86,7 @@ at least at that time, there were no way to prevent people from
 dropping money into it, no matter how much you wanted to stop them.
 
 In the end I managed to yell loud enough and only got overfunded
-a few percent, and I belive that my attempt to deflect the surplus
+a few percent, and I believe that my attempt to deflect the surplus
 to the FreeBSD Foundation gave them a little boost that year.
 
 So about PayPal:  The first thing they did was to shut my account,
@@ -184,7 +184,7 @@ the message to other communities, that Free and Open Source Software
 does not materialize out of empty space, it is written by people.
 
 People who love what we do, which is why I'm sitting here,
-way past midnight on a friday evening, writing this pamphlet.
+way past midnight on a Friday evening, writing this pamphlet.
 
 But software *is* written by people, real people with kids, cars,
 mortgages, leaky roofs, sick pets, infirm parents and all other
@@ -225,25 +225,25 @@ collect money and hire developers.  This is a relatively complex
 thing to do, and it will only be available for larger projects.
 
 The Apache Foundation "adopts" smaller projects inside their field
-of interest, and I belive that works OK, but I'm not sure if it
+of interest, and I believe that works OK, but I'm not sure if it
 can easily be transplanted to different topics.
 
 The final way is to simply throw money a the developers, the
 way the FreeBSD and Varnish communities have done with me.
 
 It is a far more flexible solution with respect to level of
-engangement, national boundaries etc. etc, but in many ways it
+engagement, national boundaries etc. etc, but in many ways it
 demands more from both sides of the deal, in particular
 with respect to paperwork, taxes and so on.
 
 Conclusion
 ==========
 
-I am obiously biased, I derive a large fraction of my relatively
+I am obviously biased, I derive a large fraction of my relatively
 modest income from community funding, for which I am the Varnish
 community deeply grateful.
 
-But biased as I may be, I belive that the Varnish community and I
+But biased as I may be, I believe that the Varnish community and I
 has shown that a tiny investment goes a long way in Free and Open
 Source Software.
 
diff --git a/doc/sphinx/phk/persistent.rst b/doc/sphinx/phk/persistent.rst
index 536e406..6587e67 100644
--- a/doc/sphinx/phk/persistent.rst
+++ b/doc/sphinx/phk/persistent.rst
@@ -52,7 +52,7 @@ this.
 And in a sense I did.
 
 Varnish has the advantage over databases and filesystems that we
-can actually loose objects without it being a catastrophy.  It would
+can actually loose objects without it being a catastrophe.  It would
 be better if we didn't, but we can simply ditch stuff which doesn't
 look consistent and we'll be safe.
 
diff --git a/doc/sphinx/phk/platforms.rst b/doc/sphinx/phk/platforms.rst
index e85f925..047196b 100644
--- a/doc/sphinx/phk/platforms.rst
+++ b/doc/sphinx/phk/platforms.rst
@@ -108,4 +108,4 @@ are right about Oracles intentions, Solaris may get demoted.
 Until next time,
 
 Poul-Henning, 2010-08-03
-Edited Nils, 2014-03-18 with Poul-Hennings concent
+Edited Nils, 2014-03-18 with Poul-Hennings consent
diff --git a/doc/sphinx/phk/ssl_again.rst b/doc/sphinx/phk/ssl_again.rst
index 31b6efe..d0f8323 100644
--- a/doc/sphinx/phk/ssl_again.rst
+++ b/doc/sphinx/phk/ssl_again.rst
@@ -11,7 +11,7 @@ revisit that issue.
 A SSL/TLS library
 ~~~~~~~~~~~~~~~~~
 
-In 2011 I critized OpenSSL's source-code as being a nightmare,
+In 2011 I criticized OpenSSL's source-code as being a nightmare,
 and as much as I Hate To Say I Told You So, I Told You So:  See also
 "HeartBleed".
 
@@ -19,15 +19,15 @@ The good news is that HeartBleed made people realize that FOSS
 maintainers also have mortgages and hungry kids.
 
 Various initiatives have been launched to make prevent critical
-infrastructure software from being maintained sunday evening between
+infrastructure software from being maintained Sunday evening between
 11 and 12PM by a sleep-deprived and overworked parent, worried about
 about being able to pay the bills come the next month.
 
 We're not there yet, but it's certainly getting better.
 
-However, implementing TLS and SSL is stil insanely complex, and
+However, implementing TLS and SSL is still insanely complex, and
 thanks to Edward Snowdens whistle-blowing, we have very good reasons
-to belive that didn't happen by accident.
+to believe that didn't happen by accident.
 
 The issue of finding a good TLS/SSL implementation is still the
 same and I still don't see one I would want my name associated with.
@@ -40,7 +40,7 @@ Handling Certificates
 ~~~~~~~~~~~~~~~~~~~~~
 
 I still don't see a way to do that.  The Varnish worker-process is not
-built to compartementalize bits at a cryptographic level and making it
+built to compartmentalize bits at a cryptographic level and making it
 do that would be a non-trivial undertaking.
 
 But there is new loop-hole here.
@@ -148,7 +148,7 @@ the privacy of every human being with an internet connection, because
 it takes a lot more skill to look into a SSL connection than a
 plaintext HTTP connection.
 
-"Sunshine is said to be the best of disinfectantants" wrote supreme
+"Sunshine is said to be the best of disinfectants" wrote supreme
 court justice Brandeis, SSL Everywhere puts all traffic in the shade.
 
 Poul-Henning, 2015-04-28
diff --git a/doc/sphinx/phk/thetoolsweworkwith.rst b/doc/sphinx/phk/thetoolsweworkwith.rst
index 4ee56db..1ab4fc5 100644
--- a/doc/sphinx/phk/thetoolsweworkwith.rst
+++ b/doc/sphinx/phk/thetoolsweworkwith.rst
@@ -148,7 +148,7 @@ Because it's not like the call is actually guaranteed to return at
 later than that, so you have to wrap the call in a loop.
 
 Whoever defined the select(2) and poll(2) systemcalls knew better
-than the POSIX and ISO-C group-think:  They specifed a maximum
+than the POSIX and ISO-C group-think:  They specified a maximum
 duration for the call, because then it doesn't matter what time
 it is, only how long time has transpired.
 
diff --git a/doc/sphinx/phk/vcl_expr.rst b/doc/sphinx/phk/vcl_expr.rst
index 6ef02dc..254384d 100644
--- a/doc/sphinx/phk/vcl_expr.rst
+++ b/doc/sphinx/phk/vcl_expr.rst
@@ -32,7 +32,7 @@ precedence operators have.
 
 The C programming language is famous for having a couple of gottchas
 in its precedence rules and given our limited and narrow type
-repetoire, blindly importing a set of precedence rules may confuse
+repertoire, blindly importing a set of precedence rules may confuse
 a lot more than it may help.
 
 Here are the precedence rules I have settled on, from highest to
diff --git a/doc/sphinx/reference/varnish-cli.rst b/doc/sphinx/reference/varnish-cli.rst
index 3149b83..55a2528 100644
--- a/doc/sphinx/reference/varnish-cli.rst
+++ b/doc/sphinx/reference/varnish-cli.rst
@@ -15,7 +15,7 @@ Varnish Command Line Interface
 DESCRIPTION
 ===========
 
-Varnish as a command line interface (CLI) which can control and change
+Varnish has a command line interface (CLI) which can control and change
 most of the operational parameters and the configuration of Varnish,
 without interrupting the running service.
 
diff --git a/doc/sphinx/users-guide/performance.rst b/doc/sphinx/users-guide/performance.rst
index cd00ff5..68c20a2 100644
--- a/doc/sphinx/users-guide/performance.rst
+++ b/doc/sphinx/users-guide/performance.rst
@@ -11,7 +11,7 @@ functions of Varnish that you should be aware of. The next subsection focuses
 on the how to purge content out of your cache. Purging of content is
 essential in a performance context because it allows you to extend the
 *time-to-live* (TTL) of your cached objects. Having a long TTL allows
-Varnish to keep the content in cache longer, meaning Varnish will make fewer requests to your relativly slower backend.
+Varnish to keep the content in cache longer, meaning Varnish will make fewer requests to your relatively slower backend.
 
 The final subsection deals with compression of web content. Varnish can
 gzip content when fetching it from the backend and then deliver it
diff --git a/doc/sphinx/users-guide/vcl-actions.rst b/doc/sphinx/users-guide/vcl-actions.rst
index e66250f..57b2ea8 100644
--- a/doc/sphinx/users-guide/vcl-actions.rst
+++ b/doc/sphinx/users-guide/vcl-actions.rst
@@ -14,7 +14,7 @@ The most common actions to return are these:
 
 *hash*
   When you return hash from `vcl_recv` you tell Varnish to deliver content
-  from cache even if the request othervise indicates that the request
+  from cache even if the request otherwise indicates that the request
   should be passed.
 
 *pipe*
diff --git a/doc/sphinx/users-guide/vcl-built-in-subs.rst b/doc/sphinx/users-guide/vcl-built-in-subs.rst
index a1eba28..21e5873 100644
--- a/doc/sphinx/users-guide/vcl-built-in-subs.rst
+++ b/doc/sphinx/users-guide/vcl-built-in-subs.rst
@@ -230,7 +230,7 @@ vcl_synth
 ~~~~~~~~~
 
 Called to deliver a synthetic object. A synthetic object is generated
-in VCL, not fetched from the backend. Its body may be contructed using
+in VCL, not fetched from the backend. Its body may be constructed using
 the ``synthetic()`` function.
 
 A `vcl_synth` defined object never enters the cache, contrary to a
@@ -325,7 +325,7 @@ vcl_backend_error
 This subroutine is called if we fail the backend fetch or if
 *max_retries* has been exceeded.
 
-A synthetic object is generated in VCL, whose body may be contructed
+A synthetic object is generated in VCL, whose body may be constructed
 using the ``synthetic()`` function.
 
 The `vcl_backend_error` subroutine may terminate with calling ``return()``
diff --git a/doc/sphinx/users-guide/vcl-variables.rst b/doc/sphinx/users-guide/vcl-variables.rst
index 4531537..1e0c832 100644
--- a/doc/sphinx/users-guide/vcl-variables.rst
+++ b/doc/sphinx/users-guide/vcl-variables.rst
@@ -14,7 +14,7 @@ objects can be accessed and manipulated using VCL.
  do on or with the `req` object.
 
 *bereq*
- The backend request object. Varnish contructs this before sending it to the
+ The backend request object. Varnish constructs this before sending it to the
  backend. It is based on the `req` object.
 
 .. XXX:in what way? benc

More information about the varnish-commit mailing list