aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/CHANGES.md12
-rw-r--r--doc/INSTALL.md14
-rw-r--r--doc/THEMES.md2
3 files changed, 26 insertions, 2 deletions
diff --git a/doc/CHANGES.md b/doc/CHANGES.md
index ae9418ef4..15df1dce5 100644
--- a/doc/CHANGES.md
+++ b/doc/CHANGES.md
@@ -1,3 +1,15 @@
+# Version 0.6.6
+## Highlighted features
+* Adds deployment via Capistrano - see DEPLOY.md for details
+* Speeds up several admin pages that were slow in large installs
+
+* [List of issues on github](https://github.com/mysociety/alaveteli/issues?milestone=22&state=closed)
+
+## Upgrade notes
+
+* Check out this version and run `rails-post-deploy` as usual.
+* Run `rake temp:populate_request_classifications` to populate the new request_classifications table which is used in generating the request categorisation game league tables and progress widget.
+
# Version 0.6.5
* This is a minor release, to update all documentation and example files to reflect the move of the official repository to http://github.com/mysociety/alaveteli and the alavetelitheme and adminbootstraptheme themes to http://github.com/mysociety/alavetelitheme and http://github.com/mysociety/adminbootstraptheme respectively.
* Some basic versioning has been added for themes. An ALAVETELI_VERSION constant has been added in config/environment.rb. When loading themes, `rails-post-deploy` now looks for a tag on the theme repository in the form 'use-with-alaveteli-0.6.5' that matches the ALAVETELI_VERSION being deployed - if it finds such a tag, the theme will be checked out from that tag, rather than from the HEAD of the theme repository. If no such tag is found, HEAD is used, as before [issue #573](https://github.com/mysociety/alaveteli/issues/573).
diff --git a/doc/INSTALL.md b/doc/INSTALL.md
index 0cf6b0fc7..b805ee0c5 100644
--- a/doc/INSTALL.md
+++ b/doc/INSTALL.md
@@ -25,6 +25,18 @@ master branch (which always contains the latest stable release):
git checkout master
+# Package pinning
+
+You need to configure [apt-pinning](http://wiki.debian.org/AptPreferences#Pinning-1) preferences in order to prevent packages being pulled from the debian testing distribution in preference to the stable distribution once you have added the testing repository as described below.
+
+In order to configure apt-pinning and to keep most packages coming from the Debian stable repository while installing the ones required from testing and the mySociety repository you need to run the following commands:
+
+ echo "Package: *" >> /tmp/preferences
+ echo "Pin: release a=testing">> /tmp/preferences
+ echo "Pin-Priority: 50" >> /tmp/preferences
+ sudo cp /tmp/preferences /etc/apt/
+ rm /tmp/preferences
+
# Install system dependencies
These are packages that the software depends on: third-party software
@@ -39,7 +51,7 @@ If you are running Debian, add the following repositories to
deb http://ftp.debian.org/debian/ testing main non-free contrib
The repositories above allow us to install the packages
-`wkthmltopdf-static` and `bundler` using `apt`; so if you're running
+`wkhtmltopdf-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).
diff --git a/doc/THEMES.md b/doc/THEMES.md
index 6c22764fc..c5e4a3eee 100644
--- a/doc/THEMES.md
+++ b/doc/THEMES.md
@@ -123,7 +123,7 @@ do this in the `alavetelitheme`.
To do add states, create two modules in your theme,
`InfoRequestCustomStates` and `RequestControllerCustomStates`. The
-former must have these two methods:
+former must have these methods:
* `theme_calculate_status`: return a tag to identify the current state of the request
* `theme_extra_states`: return a list of tags which identify the extra states you'd like to support