diff options
author | Louise Crow <louise.crow@gmail.com> | 2014-06-18 17:15:39 +0100 |
---|---|---|
committer | Louise Crow <louise.crow@gmail.com> | 2014-06-18 17:15:39 +0100 |
commit | 52dd9cbd5c280695a11bb6de467359f7cbb58d5f (patch) | |
tree | 35a440feeee878941c61386d2d7ba181202054f5 | |
parent | 04145fbe231cdbbc88b9172dad1ae3d1ddfb65cc (diff) | |
parent | f7d63ef207c7cbf983d1a210d4f050bfd791b9f2 (diff) |
Merge branch 'reference-new-docs' into rails-3-develop
-rw-r--r-- | README.md | 12 | ||||
-rw-r--r-- | doc/README.md | 12 |
2 files changed, 12 insertions, 12 deletions
@@ -17,12 +17,12 @@ Please join our mailing list at https://groups.google.com/group/alaveteli-dev and introduce yourself, or drop a line to hello@alaveteli.org to let us know that you're using Alaveteli. -Some documentation can be found in the -[`doc/` folder](https://github.com/mysociety/alaveteli/tree/master/doc). -There's background information and more documentation on -[our wiki](https://github.com/mysociety/alaveteli/wiki/Home/), and lots -of useful information (including a blog) on -[the project website](http://alaveteli.org) +There's lots of useful information and documentation (including a blog) +on [the project website](http://alaveteli.org). There's background +information and notes on [our +wiki](https://github.com/mysociety/alaveteli/wiki/Home/), and upgrade +notes in the [`doc/` +folder](https://github.com/mysociety/alaveteli/tree/master/doc/CHANGES.md) ## How to contribute diff --git a/doc/README.md b/doc/README.md index d8e9b409c..181076f2c 100644 --- a/doc/README.md +++ b/doc/README.md @@ -1,9 +1,9 @@ -The main Alaveteli documentation now lives on the [Alaveteli documentation site](http://code.alaveteli.org/docs/) +The main Alaveteli documentation now lives on the [Alaveteli site](http://alaveteli.org/docs/) Specifically: -[Installation](http://code.alaveteli.org/docs/installing/) -[Themes](http://code.alaveteli.org/docs/customising/themes/) -[Translation](http://code.alaveteli.org/docs/customising/translation/) -[Email](http://code.alaveteli.org/docs/installing/email/) -[Deployment](http://code.alaveteli.org/docs/installing/deploy/) +* [Installation](http://alaveteli.org/docs/installing/) +* [Themes](http://alaveteli.org/docs/customising/themes/) +* [Translation](http://alaveteli.org/docs/customising/translation/) +* [Email](http://alaveteli.org/docs/installing/email/) +* [Deployment](http://alaveteli.org/docs/installing/deploy/) |