[master] ef058a0 Fix up links and update for git.
Tollef Fog Heen
tfheen at varnish-cache.org
Tue Feb 22 09:16:51 CET 2011
commit ef058a0c84cfcba3e6d47b2bb61ceecf251b6770
Author: Tollef Fog Heen <tfheen at varnish-software.com>
Date: Tue Feb 22 09:14:52 2011 +0100
Fix up links and update for git.
diff --git a/doc/sphinx/installation/install.rst b/doc/sphinx/installation/install.rst
index 06010d6..d725f81 100644
--- a/doc/sphinx/installation/install.rst
+++ b/doc/sphinx/installation/install.rst
@@ -28,13 +28,15 @@ Binary package:
CentOS/RedHat
~~~~~~~~~~~~~
-We try to keep the latest version available as prebuilt RPMs (el4 &
-el5) on `SourceForge <http://sourceforge.net/projects/varnish/files/>`_.
+We try to keep the latest version available as prebuilt RPMs (el5) 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.
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 <http://fedoraproject.org/wiki/EPEL>`_ so
+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.
@@ -44,7 +46,11 @@ Debian/Ubuntu
Varnish is distributed with both Debian and Ubuntu. In order to get
Varnish up and running type `sudo apt-get install varnish`. Please
-note that this might not be the latest version of Varnish.
+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
~~~~~~~~~~~~~
@@ -64,18 +70,16 @@ If there are no binary packages available for your system, or if you
want to compile Varnish from source for other reasons, follow these
steps:
-First get a copy of the source code using the ``svn`` command. If
-you do not have this command, you need to install Subversion_ on
-your system. There is usually a binary package, try substituting
-"subversion" for "varnish" in the examples above, it might just work.
+We recommend downloading a release tarball, which you can find on
+`repo.varnish-cache.org <http://repo.varnish-cache.org/source/>`.
-To fetch the current (2.1) production branch:::
+Alternatively, if you want to hack on Varnish, you should clone our
+git repository by doing.
- svn co http://varnish-cache.org/svn/branches/2.1
+ git clone git://git.varnish-cache.org/varnish-cache
-To get the development source code:::
-
- svn co http://varnish-cache.org/svn/trunk
+Please note that a git checkout will need some more build-dependencies
+than listed below, in particular the Python Docutils and Sphinx.
Build dependencies on Debian / Ubuntu
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -126,7 +130,7 @@ 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::
- (cd bin/varnishtest && ./varnishtest tests/*.vtc)
+ make check
Don't worry of 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
@@ -146,5 +150,3 @@ Varnish will now be installed in /usr/local. The varnishd binary is in
/usr/local/etc/varnish/default.vcl.
You can now proceed to the :ref:`tutorial-index`.
-
-.. _Subversion: http://subversion.tigris.org/
More information about the varnish-commit
mailing list