Skip to content

Commit

Permalink
Merge branch 'franciscovg-master'
Browse files Browse the repository at this point in the history
  • Loading branch information
mbgrydeland committed Nov 16, 2015
2 parents b4902bf + dd31fc2 commit 5d099e9
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 3 deletions.
14 changes: 11 additions & 3 deletions doc/sphinx/installation/install.rst
Expand Up @@ -141,9 +141,17 @@ Installing

And finally, the true test of a brave heart: ``sudo make install``

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`.
Varnish will now be installed in ``/usr/local``. The ``varnishd`` binary is in
`/usr/local/sbin/varnishd`. To make sure that the necessary links and caches
of the most recent shared libraries are found, run ``sudo ldconfig``.

Next steps
==========

After successful installation you are ready to proceed to the :ref:`tutorial-index`.

This tutorial is written for installations from binary packages.
In practice, it means that some configurations are not in place for installations from source code.
For example, instead of calling ``service varnish start``, you start the varnish daemon manually by typing::

varnishd -a :6081 -T localhost:6082 -b localhost:8080
1 change: 1 addition & 0 deletions doc/sphinx/users-guide/vcl-actions.rst
Expand Up @@ -18,6 +18,7 @@ The most common actions to return are these:
should be passed.

*pipe*

.. XXX:What is pipe? benc
Pipe can be returned from `vcl_recv` as well. Pipe short circuits the
Expand Down

0 comments on commit 5d099e9

Please sign in to comment.