[4.0] 31a4724 Formatting cleanup

Lasse Karstensen lkarsten at varnish-software.com
Tue Apr 1 15:09:52 CEST 2014


commit 31a472467f331836d82b60e3fd32a7bc6f3ac330
Author: Lasse Karstensen <lkarsten at varnish-software.com>
Date:   Thu Mar 20 16:29:34 2014 +0100

    Formatting cleanup

diff --git a/doc/sphinx/installation/install.rst b/doc/sphinx/installation/install.rst
index a407624..f95f4b4 100644
--- a/doc/sphinx/installation/install.rst
+++ b/doc/sphinx/installation/install.rst
@@ -25,12 +25,12 @@ Binary package:
 From source:
 		``cd /usr/ports/varnish && make install clean``
 
-CentOS/RedHat
--------------
+Red Hat / CentOS
+----------------
 
 We try to keep the latest version available as prebuilt RPMs (el5 and el6)
 on `repo.varnish-cache.org <http://repo.varnish-cache.org/>`_.  See the online
-`RedHat installation instructions
+`Red Hat installation instructions
 <http://www.varnish-cache.org/installation/redhat>`_ for more information.
 
 Varnish is included in the `EPEL
@@ -92,10 +92,10 @@ If you're building from git, you also need the following:
 * `python-docutils`
 * `python-sphinx` (optional, if you want to build the documentation)
 
-Build dependencies on RedHat / CentOS
+Build dependencies on Red Hat / CentOS
 --------------------------------------
 
-To build Varnish on a RedHat or CentOS system you need the following
+To build Varnish on a Red Hat or CentOS system you need the following
 packages installed:
 
 * `automake`
diff --git a/doc/sphinx/tutorial/putting_varnish_on_port_80.rst b/doc/sphinx/tutorial/putting_varnish_on_port_80.rst
index 0fc2ddc..3e57917 100644
--- a/doc/sphinx/tutorial/putting_varnish_on_port_80.rst
+++ b/doc/sphinx/tutorial/putting_varnish_on_port_80.rst
@@ -2,17 +2,12 @@
 Put Varnish on port 80
 ----------------------
 
-Until now we've been running with Varnish on a high port, which is
-great for testing purposes. Lets put Varnish on the default HTTP port.
+Until now we've been running with Varnish on a high port which is great for
+testing purposes. Let's now put Varnish on the default HTTP port 80.
 
-First we stop varnish::
-
-     # service varnish stop
-
-.. XXX:This renders to a different font than other commands. it should be the double backtick format for the command. benc
-
-Now we need to edit the configuration file that starts Varnish. 
+First we stop varnish: ``service varnish stop``
 
+Now we need to edit the configuration file that starts Varnish.
 
 Debian/Ubuntu
 ~~~~~~~~~~~~~
@@ -34,17 +29,17 @@ Change it to::
                -S /etc/varnish/secret \
                -s malloc,256m"
 
-Red Hat EL / Centos
-~~~~~~~~~~~~~~~~~~~
+Red Hat Enterprise Linux / CentOS
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+On Red Hat/CentOS you can find a similar configuration file in
+`/etc/sysconfig/varnish`.
 
-On Red Hat EL / Centos
-On Red Hat/Centos it is `/etc/sysconfig/varnish`
 
+Restarting Varnish again
+------------------------
 
-Restarting Varnish
-------------------
+Once the change is done, restart Varnish: ``service varnish start``.
 
-Once the change is done. Restart varnish: ``service varnish
-restart``. Now everyone accessing your site will be accessing through
-Varnish.
+Now everyone accessing your site will be accessing through Varnish.
 



More information about the varnish-commit mailing list