From 929487b5c52715a8334e80152f626a7cd066f1df Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Wed, 20 May 2015 22:52:39 -0400 Subject: [PATCH] Documentation update --- HISTORY.rst | 17 +++++++++++++++++ docs/index.rst | 4 ++-- docs/releases/1.1.1.rst | 2 +- docs/topics/index.rst | 4 ++-- docs/topics/installation.rst | 2 +- 5 files changed, 23 insertions(+), 6 deletions(-) diff --git a/HISTORY.rst b/HISTORY.rst index de2906472f..21a4998ec9 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -1,3 +1,20 @@ +1.1.1 (2015-05-21) +================== + +- Update to Django 1.6.11 +- Fix make_dist.sh script +- Add test for issue #163 +- Activate tests for the sources app +- Removal of the registration app +- New simplified official project description +- Improvements to the index admin interface +- Removal of installation statistics gathering +- Remove unused folder tag +- Fix usage of ugettext to ugettext_lazy +- Increase size of the lock name field +- New style documentation + + 1.1 (2015-02-10) ================ diff --git a/docs/index.rst b/docs/index.rst index e9599b0eb2..a505830c88 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -26,8 +26,8 @@ account. Features Installation Getting started - Release notes and upgrading instructions - Understanding Mayan EDMS + Release notes and upgrading + Concepts Development Contributors Licensing diff --git a/docs/releases/1.1.1.rst b/docs/releases/1.1.1.rst index d8bcbd1c5f..6234d13d7e 100644 --- a/docs/releases/1.1.1.rst +++ b/docs/releases/1.1.1.rst @@ -2,7 +2,7 @@ Mayan EDMS v1.1.1 release notes =============================== -Released: April XX, 2015 +Released: May 21, 2015 What's new ========== diff --git a/docs/topics/index.rst b/docs/topics/index.rst index f39b871712..8ec133f1e9 100644 --- a/docs/topics/index.rst +++ b/docs/topics/index.rst @@ -1,5 +1,5 @@ -Understanding Mayan EDMS -======================== +Concepts +======== Introductions to all the key parts of Mayan EDMS you'll need to know: diff --git a/docs/topics/installation.rst b/docs/topics/installation.rst index 88b6a60dde..da025e1f0e 100644 --- a/docs/topics/installation.rst +++ b/docs/topics/installation.rst @@ -128,7 +128,7 @@ in the directory: venv/lib/python2.7/site-packages/mayan/settings/ with the foll from __future__ import unicode_literals - from . import * + from .local import *