Merge branch 'master' of ssh://git.varnish-cache.org/git/varnish-cache

doc/sphinx/tutorial/putting_varnish_on_port_80.rst

@@ -2,19 +2,24 @@
 Put Varnish on port 80
 ----------------------
 
-If your application works OK we can now switch the ports so Varnish
-will listen to port 80. Kill varnish.::
+Until now we've been running with Varnish on a high port, for testing
+purposes. You should test your application and if it works OK we can
+switch, so Varnish will be running on port 80 and your web server on a
+high port.
+
+First we kill off varnishd.::
 
      # pkill varnishd
 
 and stop your web server. Edit the configuration for your web server
 and make it bind to port 8080 instead of 80. Now open the Varnish
-default.vcl and change the port of the default backend to 8080.
+default.vcl and change the port of the *default* backend to 8080.
 
 Start up your web server and then start varnish.::
 
       # varnishd -f /usr/local/etc/varnish/default.vcl -s malloc,1G -T 127.0.0.1:2000
 
-We're removed the -a option. Now Varnish will bind to the http port as
-it is its default. Now try your web application and see if it works
-OK.
+Note that we've removed the -a option. Now Varnish, as its default
+setting dictates, will bind to the http port (80). Now everyone thats
+accessing your site will be accessing through Varnish.
+