[master] 5941d35 Spelling and minor changes

Federico G. Schwindt fgsch at lodoss.net
Sat May 23 14:30:15 CEST 2015


commit 5941d35ce6e60bb15bea7bf5eb0d2b66717712d4
Author: Federico G. Schwindt <fgsch at lodoss.net>
Date:   Sat May 23 11:29:04 2015 +0100

    Spelling and minor changes

diff --git a/doc/sphinx/whats-new/changes.rst b/doc/sphinx/whats-new/changes.rst
index e461f4c..2dd4a16 100644
--- a/doc/sphinx/whats-new/changes.rst
+++ b/doc/sphinx/whats-new/changes.rst
@@ -9,7 +9,7 @@ Varnish 4.1 is the continuation of the new streaming architecture seen in Varnis
 Proactive security features
 ===========================
 
-New in 4.1 is support for different kinds of privilege seperation methods,
+New in 4.1 is support for different kinds of privilege separation methods,
 collectively described as jails.
 
 On most systems, the Varnish parent process will now drop effective privileges
@@ -42,7 +42,8 @@ Output from `vcl.list`::
     available  auto/warm       0 62f5275f-a937-4df9-9fbb-c12336bdfdb8
 
 
-A single VCL's state can be chanced with the `vcl.state` call in ``varnishadm``::
+A single VCL's state can be chanced with the `vcl.state` call in
+``varnishadm``::
 
     vcl.state <configname> [auto|cold|warm]
         Force the state of the named configuration.
@@ -74,22 +75,20 @@ The ``-a`` startup argument syntax has been expanded to allow for this::
 
     $ varnishd -f /etc/varnish/default.vcl -a :6081 -a 127.0.0.1:6086,PROXY
 
-
 Both PROXY1 and PROXY2 protocols are supported on the resulting listening
 socket.
 
 For connections coming in over a PROXY socket, ``client.ip`` and
-``server.ip`` will contain the adresses given to Varnish in the PROXY
-header/preamble. (the "real" client IP.)
-
-The new VCL variables ``remote.ip`` and ``local.ip`` contains the local TCP
-connection endpoints. On non-PROXY connections these will be identical to
-``client.ip`` and ``server.ip``.
+``server.ip`` will contain the addresses given to Varnish in the PROXY
+header/preamble (the "real" IPs).
 
-An expected pattern following this is `if (std.port(local.ip) == 80) { }` in
-``vcl_recv`` to see if traffic came in over the HTTP listening socket. (so a client
-redirect to HTTPS can be served.)
+The new VCL variables ``remote.ip`` and ``local.ip`` contains the local
+TCP connection endpoints. On non-PROXY connections these will be identical
+to ``client.ip`` and ``server.ip``.
 
+An expected pattern following this is `if (std.port(local.ip) == 80) { }`
+in ``vcl_recv`` to see if traffic came in over the HTTP listening socket
+(so a client redirect to HTTPS can be served).
 
 
 VMOD backends



More information about the varnish-commit mailing list