diff options
| author | Louise Crow <louise.crow@gmail.com> | 2012-08-28 10:45:20 +0100 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2012-08-28 10:45:20 +0100 |
| commit | ee723d9e6645bc7987cb2b7cc9cd320950536201 (patch) | |
| tree | f5beec1ffc37c9530485c0cd5be15c56210ae2da /doc | |
| parent | e98bfd6e9ed7e6bb151d0eb5c216cad0fed6a40c (diff) | |
| parent | 5c1a88c88ba69cec3924ec8a1d69d8784acaef3c (diff) | |
Merge branch 'release/0.6.4'0.6.4
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/CHANGES.md | 14 | ||||
| -rw-r--r-- | doc/INSTALL.md | 9 | ||||
| -rw-r--r-- | doc/TRANSLATE.md | 2 |
3 files changed, 17 insertions, 8 deletions
diff --git a/doc/CHANGES.md b/doc/CHANGES.md index 4115389d5..42f408bab 100644 --- a/doc/CHANGES.md +++ b/doc/CHANGES.md @@ -1,3 +1,14 @@ +# Version 0.6.4 +## Highlighted features +* This is a minor bugfix release, mainly to fix bugs related to external request handling. +* [List of issues on github](https://github.com/sebbacon/alaveteli/issues?milestone=18&state=closed) +* [List of commits since last release](https://github.com/sebbacon/alaveteli/compare/master...release/0.6.4) + +## Upgrade notes + +* No special action required -- just check out this version and run + `rails-post-deploy` as usual. + # Version 0.6.3 ## Highlighted features * This is a minor release, mainly to publish new customisation @@ -11,8 +22,7 @@ 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) +* [List of issues on github](https://github.com/sebbacon/alaveteli/issues?milestone=17&state=closed) ## Upgrade notes diff --git a/doc/INSTALL.md b/doc/INSTALL.md index b71b89676..588f8e4fe 100644 --- a/doc/INSTALL.md +++ b/doc/INSTALL.md @@ -19,12 +19,11 @@ Next, get hold of the Alaveteli source code from github: git clone https://github.com/sebbacon/alaveteli.git cd alaveteli -This will get the current stable release from the master branch (which -always contains the latest release). If you are a developer and want -to add or try new features, you might want to swap to the development -branch: +This will get the development branch, which has the latest (possibly +buggy) code. If you don't want to add or try new features, swap to the +master branch (which always contains the latest stable release): - git checkout develop + git checkout master # Install system dependencies diff --git a/doc/TRANSLATE.md b/doc/TRANSLATE.md index 97ef39954..543c16cd9 100644 --- a/doc/TRANSLATE.md +++ b/doc/TRANSLATE.md @@ -66,7 +66,7 @@ must: * this updates the PO template, but also merges it with the individual PO files, marking strings that have only changed slightly as "fuzzy" - * reupload (`tx push -s -t`) the POT and PO files to Transifex to the + * reupload (`tx push -s -t`) the POT and PO files to Transifex from the current release branch * The point of uploading the PO files is that Transifex converts the "fuzzy" suggestions from Transifex into |