[master] 64438cd Minor cleanups
Lasse Karstensen
lkarsten at varnish-software.com
Thu Mar 20 12:57:27 CET 2014
commit 64438cd0e89378430e55f86b349159e4564aa207
Author: Lasse Karstensen <lkarsten at varnish-software.com>
Date: Thu Mar 20 12:35:38 2014 +0100
Minor cleanups
diff --git a/doc/sphinx/installation/help.rst b/doc/sphinx/installation/help.rst
index 946e921..66433de 100644
--- a/doc/sphinx/installation/help.rst
+++ b/doc/sphinx/installation/help.rst
@@ -38,7 +38,7 @@ it mostly on topic, and please don't paste random links unless they are
Mailing Lists
=============
-Subscribing or unsubscribing to our mailing lists is handled through our Mailman_.
+Subscribing or unsubscribing to our mailing lists is handled through mailman_.
If you are going to use Varnish, subscribing to our `varnish-announce`
mailing list is a very good idea. The typical pattern is that
diff --git a/doc/sphinx/installation/install.rst b/doc/sphinx/installation/install.rst
index 348b6ef..2cddd59 100644
--- a/doc/sphinx/installation/install.rst
+++ b/doc/sphinx/installation/install.rst
@@ -106,11 +106,8 @@ packages installed:
* `pcre-devel`
* `pkgconfig`
* `libedit-devel`
-
-If you're building from git, you also need the following:
-
* `docutils`
-* `python-sphinx` (optional, if you want to build the documentation)
+* `python-sphinx`
Compiling Varnish
-----------------
@@ -144,9 +141,9 @@ And finally, the true test of a brave heart::
sudo make install
-Varnish will now be installed in `/usr/loca``l. The ``varnishd` binary is in
+Varnish will now be installed in `/usr/local`. The ``varnishd` binary is in
`/usr/local/sbin/varnishd` and its default configuration will be
`/usr/local/etc/varnish/default.vcl`.
-After succesful installation you are ready to proceed to the :ref:`tutorial-index`.
+After successful installation you are ready to proceed to the :ref:`tutorial-index`.
diff --git a/doc/sphinx/tutorial/backend_servers.rst b/doc/sphinx/tutorial/backend_servers.rst
index 1c9ab65..cb5f087 100644
--- a/doc/sphinx/tutorial/backend_servers.rst
+++ b/doc/sphinx/tutorial/backend_servers.rst
@@ -3,7 +3,7 @@
Backend servers
---------------
-Varnish has a concept of `backend` or `origin` servers. A backend
+Varnish has a concept of `backend` or origin servers. A backend
server is the server providing the content Varnish will accelerate via the cache.
Our first task is to tell Varnish where it can find its content. Start
@@ -41,15 +41,9 @@ localhost, port 8080.::
}
-Varnish can have several backends defined and can even join
-several backends together into clusters of backends for load balancing
-purposes, having Varnish pick one backend based on different
-algorithms.
-
-A lot of the power of Varnish Cache comes from it's design, which
-might not be what you are expecting.
-
-.. XXX:What am I expecting? benc
+Varnish can have several backends defined and can even join several backends
+together into clusters of backends for load balancing purposes, having Varnish
+pick one backend based on different algorithms.
Next, let's have a look at some of what makes Varnish unique and what you can do with it.
More information about the varnish-commit
mailing list