aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobin Houston <robin.houston@gmail.com>2012-07-04 10:53:18 +0100
committerRobin Houston <robin.houston@gmail.com>2012-07-04 10:53:18 +0100
commit525575961e656c812e7d1c2ab04b1fa0a351f6a2 (patch)
treed2ddd022d2a868aa2fa3251c5a1aa285214e4b39
parent14037c1aa2252f9a2048fa90d77732b078b3b8bb (diff)
parent152dcd176638f9285279d5ff3fb7f8bb0b027598 (diff)
Merge branch 'develop' of github.com:sebbacon/alaveteli into developrelease/0.6
-rw-r--r--doc/INSTALL.md14
1 files changed, 8 insertions, 6 deletions
diff --git a/doc/INSTALL.md b/doc/INSTALL.md
index 7ce9e4d74..383203a6a 100644
--- a/doc/INSTALL.md
+++ b/doc/INSTALL.md
@@ -33,15 +33,17 @@ used to parse documents, host the site, etc. There are also packages
that contain headers necessary to compile some of the gem dependencies
in the next step.
-If you are running Debian, you can use specially compiled mysociety
-packages by adding the following to `/etc/apt/sources.list` and
-running `apt-get update`:
+If you are running Debian, add the following repositories to
+`/etc/apt/sources.list` and run `apt-get update`:
deb http://debian.mysociety.org squeeze main
+ deb http://ftp.debian.org/debian/ testing main non-free contrib
-If you don't set up that mySociety Debian source (e.g. if you're
-running Ubuntu), you should comment out `wkhtmltopdf-static` from
-`config/packages`, as it won't install in the next step
+The repositories above allow us to install the packages
+`wkthmltopdf-static` and `bundler` using `apt`; so if you're running
+Ubuntu, you won't be able to use the above repositories, and you will
+need to comment out those two lines in `config/packages` before
+following the next step (and install bundler manually).
Now install the packages that are listed in config/packages using apt-get
e.g.: