[master] 09548e6 Fix links, update RedHat section, small language and content nits

Andreas Plesner Jacobsen apj at varnish-cache.org
Thu Sep 12 19:29:28 CEST 2013


commit 09548e6a04044235971c04e1ab8ffdb48ddd4872
Author: Andreas Plesner Jacobsen <apj at mutt.dk>
Date:   Thu Sep 12 19:28:19 2013 +0200

    Fix links, update RedHat section, small language and content nits

diff --git a/doc/sphinx/installation/install.rst b/doc/sphinx/installation/install.rst
index cf7501f..e0b0ceb 100644
--- a/doc/sphinx/installation/install.rst
+++ b/doc/sphinx/installation/install.rst
@@ -6,7 +6,7 @@ Installing Varnish
 With open source software, you can choose to install binary packages
 or compile stuff from source-code. To install a package or compile
 from source is a matter of personal taste. If you don't know which
-method too choose read the whole document and choose the method you
+method to choose, read the whole document and choose the method you
 are most comfortable with.
 
 
@@ -20,26 +20,24 @@ being:
 FreeBSD
 -------
 
-From source:
-		``cd /usr/ports/varnish && make install clean``
 Binary package:
 		``pkg_add -r varnish``
+From source:
+		``cd /usr/ports/varnish && make install clean``
 
 CentOS/RedHat
 -------------
 
-We try to keep the latest version available as prebuilt RPMs (el5) on
-`repo.varnish-cache.org <http://repo.varnish-cache.org/>`.  See the
+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
 `RedHat installation instructions
-<http://www.varnish-cache.org/installation/redhat>`  for more information.
+<http://www.varnish-cache.org/installation/redhat>`_ for more information.
 
 Varnish is included in the `EPEL
-<http://fedoraproject.org/wiki/EPEL>`_ repository.  Unfortunately we
-had a syntax change in Varnish 2.0.6->2.1.X. This means that we can
-not update Varnish in `EPEL 5 <http://fedoraproject.org/wiki/EPEL>`_ so
-the latest version there is Varnish 2.0.6.
-
-EPEL6 should have Varnish 2.1 available once it releases. 
+<http://fedoraproject.org/wiki/EPEL>`_ repository, however due to
+incompatible syntax changes in newer versions of Varnish, only older
+versions are available. We recommend that you install the latest
+version from our repository.
 
 Debian/Ubuntu
 -------------
@@ -49,18 +47,8 @@ Varnish up and running type `sudo apt-get install varnish`. Please
 note that this might not be the latest version of Varnish.  If you
 need a later version of Varnish, please follow the installation
 instructions for `Debian
-<http://www.varnish-cache.org/installation/debian>` or `Ubuntu
-<http://www.varnish-cache.org/installation/ubuntu>`.
-
-Other systems
--------------
-
-You are probably best of compiling your own code. See `Compiling
-Varnish from source`_.
-
-If that worked for you, you can skip the rest of this document for
-now, and and start reading the much more interesting
-:ref:`tutorial-index` instead.
+<http://www.varnish-cache.org/installation/debian>`_ or `Ubuntu
+<http://www.varnish-cache.org/installation/ubuntu>`_.
 
 
 Compiling Varnish from source
@@ -71,7 +59,7 @@ want to compile Varnish from source for other reasons, follow these
 steps:
 
 We recommend downloading a release tarball, which you can find on
-`repo.varnish-cache.org <http://repo.varnish-cache.org/source/>`.
+`repo.varnish-cache.org <http://repo.varnish-cache.org/source/>`_.
 
 Alternatively, if you want to hack on Varnish, you should clone our
 git repository by doing.
@@ -125,12 +113,12 @@ The ``configure`` script takes some arguments, but more likely than
 not, you can forget about that for now, almost everything in Varnish
 are run time parameters.
 
-Before you install, you may want to run the regression tests, make
-a cup of tea while it runs, it takes some minutes::
+Before you install, you may want to run the test suite, make a cup of
+tea while it runs, it takes some minutes::
 
 	make check
 
-Don't worry of a single or two tests fail, some of the tests are a
+Don't worry if a single or two tests fail, some of the tests are a
 bit too timing sensitive (Please tell us which so we can fix it) but
 if a lot of them fails, and in particular if the ``b00000.vtc`` test 
 fails, something is horribly wrong, and you will get nowhere without



More information about the varnish-commit mailing list