[master] 63dce4f Reformat and rewrite for readability

Per Buer perbu at varnish-software.com
Thu Feb 6 14:33:11 CET 2014


commit 63dce4fed739d953729aeb7f170568bb8f9f7c17
Author: Per Buer <perbu at varnish-software.com>
Date:   Thu Feb 6 14:18:35 2014 +0100

    Reformat and rewrite for readability

diff --git a/doc/sphinx/users-guide/intro.rst b/doc/sphinx/users-guide/intro.rst
index e497e00..bd1ec46 100644
--- a/doc/sphinx/users-guide/intro.rst
+++ b/doc/sphinx/users-guide/intro.rst
@@ -4,24 +4,21 @@ The Big Varnish Picture
 =======================
 
 What is in this package called "Varnish", what are all the different
-bits and pieces named and will you need a hex-wrench for assembly ?
+bits and pieces named and will you need a hex-wrench for assembly?
 
 The two main parts of Varnish are the two processes in the varnishd
-program.
-
-The first process is called "the manager", and its job is to talk
-to you, the administrator, and make the things you ask for happen.
+program. The first process is called "the manager", and its job is to
+talk to you, the administrator, and make the things you ask for
+happen.
 
 The second process is called "the worker" or just "the child" and
 this is the process which does all the actual work with your HTTP
 traffic.
 
-When you start varnishd, you start the manager process, and once
-it is done handling all the command line flags, it will start the
-child process for you.
-
-Should the child process die, the manager will start it again for
-you, automatically and right away.
+When you start varnishd, you start the manager process, and once it is
+done handling all the command line flags, it will start the child
+process for you. Should the child process die, the manager will start
+it again for you, automatically and right away.
 
 The main reason for this division of labor is security:  The manager
 process will typically run with "root" permissions, in order to
@@ -29,12 +26,11 @@ open TCP socket port 80, but it starts the child process with minimal
 permissions, as a defensive measure.
 
 The manager process is interactive, it offers a CLI -- Command Line
-Interface, which can be used manually, from scripts or programs.
-
-The CLI offers almost full control of what Varnish actually does
-to your HTTP traffic, and we have gone to great lengths to ensure
-that you should not need to restart the Varnish processes, unless
-you need to change something very fundamental.
+Interface, which can be used manually, from scripts or programs. The
+CLI offers almost full control of what Varnish actually does to your
+HTTP traffic, and we have gone to great lengths to ensure that you
+should not need to restart the Varnish processes, unless you need to
+change something very fundamental.
 
 The CLI can be safely accessed remotely, using a simple and flexible
 PSK -- Pre Shared Key, access control scheme, so it is easy to
@@ -46,7 +42,6 @@ All this is covered in :ref:`users_running`.
 How the child process should deal with the HTTP requests, what to
 cache, which headers to remove etc, is al specified in a small
 programming language called VCL -- Varnish Configuration Language.
-
 The manager process will compile the VCL program and check it for
 errors, but it is the child process which runs the VCL program, for
 each and every HTTP request which comes in.
@@ -75,13 +70,10 @@ can do for your HTTP traffic, there really is no limit.
 :ref:`users_vcl` describes VCL and what it can do in great detail.
 
 Varnish uses a piece of shared memory to report its activity and
-status.
-
-For each HTTP request, a number of very detailed records will be
-appended to the log segment in this shared memory.
-
-Other processes can subscribe to log-records, filter them, and
-format them, for instance as NCSA style log records.
+status. For each HTTP request, a number of very detailed records will
+be appended to the log segment in this shared memory.  Other processes
+can subscribe to log-records, filter them, and format them, for
+instance as NCSA style log records.
 
 Another segment in shared memory is used for statistics counters,
 this allows real-time, down to microsecond resolution monitoring
@@ -95,24 +87,21 @@ writing
 
 :ref:`users_report` explains how all that work.
 
-Presumably the reason why you are interested in Varnish, is that
-you want your website to work better.
-
-There are many aspects of performance tuning a website, from
-relatively simple policy decisions about what to cache, to designing
-a geographically diverse multilevel CDNs using ESI and automatic
-failover.
+Presumably the reason why you are interested in Varnish, is that you
+want your website to work better. There are many aspects of
+performance tuning a website, from relatively simple policy decisions
+about what to cache, to designing a geographically diverse multilevel
+CDNs using ESI and automatic failover.
 
 :ref:`users_performance` will take you through the possibilities
 and facilities Varnish offers.
 
-Finally, Murphys Law must be contended with:  Things will go wrong,
-and more likely than not, they will do so at zero-zero-dark O'clock.
-
-...during a hurricane, when your phones battery is flat and your
+Finally, Murphys Law must be contended with: Things will go wrong, and
+more likely than not, they will do so at zero-zero-dark O'clock. Most
+likely during a hurricane, when your phones battery is flat and your
 wife had prepared a intimate evening to celebrate your aniversary.
 
-Yes, we've all been there, havn't we ?
+Yes, we've all been there, havn't we?
 
 When things go wrong :ref:`users_trouble` will hopefully be of some help.
 



More information about the varnish-commit mailing list