Merge branch 'release/0.6.3'0.6.3

4 files changed, 37 insertions, 6 deletions

diff --git a/doc/CHANGES.md b/doc/CHANGES.md
index 34959f924..4115389d5 100644
--- a/doc/CHANGES.md
+++ b/doc/CHANGES.md
@@ -1,3 +1,24 @@
+# Version 0.6.3
+## Highlighted features
+* This is a minor release, mainly to publish new customisation
+  features required by the upcoming
+  [Czech Republic theme](https://github.com/pepe/ipvtheme)
+* Administrators can now use regular expressions when making Censor Rules
+* It is also now possible to create "global" Censor Rules that apply
+  to all content types in the site; however, this power is not exposed
+  to UI users.
+* Some new i18n fixes and template refactoring to allow more extensive
+  customisation in themes
+* Themes can now provide a `post_install.rb` script that is executed
+  by `rails-post-deploy`
+* [List of isses on github](https://github.com/sebbacon/alaveteli/issues?milestone=17&state=closed)
+* [List of commits since last release](https://github.com/sebbacon/alaveteli/compare/master...release/0.6.3)
+
+## Upgrade notes
+
+* No special action required -- just check out this version and run
+  `rails-post-deploy` as usual.
+
 # Version 0.6.2
 ## Highlighted features
 
diff --git a/doc/INSTALL.md b/doc/INSTALL.md
index 325ccfbdd..b71b89676 100644
--- a/doc/INSTALL.md
+++ b/doc/INSTALL.md
@@ -318,6 +318,9 @@ like `!!(*= $this *)!!`.  The variables are:
 * `user`: the user that the software runs as
 * `site`: a string to identify your alaveteli instance
 
+There is a dumb python script at `script/make-crontab` which you can
+edit and run to do some basic substitution for you.
+
 One of the cron jobs refers to a script at
 `/etc/init.d/foi-alert-tracks`.  This is an init script, a copy of
 which lives in `config/alert-tracks-debian.ugly`.  As with the cron
diff --git a/doc/THEMES.md b/doc/THEMES.md
index 50335c082..e33371df7 100644
--- a/doc/THEMES.md
+++ b/doc/THEMES.md
@@ -36,13 +36,17 @@ places:
 
 This document is about what you can do in a theme.
 
-To get started, install the sample theme by running 
+By default, the sample theme ("alavetelitheme") has already been 
+installed.  See the setting `THEME_URLS` in `general.yml` for an 
+explanation.
+
+You can also install the sample theme by hand, by running:
 
     ./script/plugin install git://github.com/sebbacon/alavetelitheme.git
     
-This downloads and installs the theme in
-`vendor/plugins/alavetelitheme` and contains examples for nearly
-everything you might want to customise.
+The sample theme contains examples for nearly everything you might 
+want to customise.  You should probably make a copy, rename it, and
+use that as the basis for your own theme.
 
 # Make sure your theme is as lightweight as possible
 
@@ -81,7 +85,7 @@ instead of the core "about us" file.
 Rails expects all its stylesheets to live at `<railshome>/public`,
 which presents a problem for plugins.  Here's how we solve it: the
 stylesheet and associated resources for your theme live (by
-convention) in at `alavetelitheme/public/`.  This is symlinked from
+convention) in `alavetelitheme/public/`.  This is symlinked from
 the main Rails app -- see `alavetelitheme/install.rb` to see how this
 happens.
 
diff --git a/doc/TRANSLATE.md b/doc/TRANSLATE.md
index 8330c5f24..97ef39954 100644
--- a/doc/TRANSLATE.md
+++ b/doc/TRANSLATE.md
@@ -59,7 +59,10 @@ must:
     * regenerate the POT file and individual PO files for each
       language, using `bundle exec rake
       gettext:store_model_attributes`, followed by `bundle exec rake
-      rake gettext:find`
+      gettext:find`
+        * careful of including msgids from themes in `vendor/plugin`;
+          you might want to move them out of the way before running
+          the above commands
         * this updates the PO template, but also merges it with the
           individual PO files, marking strings that have only changed
           slightly as "fuzzy"