Merge branch 'development'

docs/conf.py

@@ -38,7 +38,6 @@ extensions = ['djangodocs', 'sphinxcontrib.blockdiag']
 blockdiag_antialias = True
 blockdiag_html_image_format = "SVG"
 blockdiag_latex_image_format = "PDF"
-blockdiag_tex_image_format = "PDF"
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']

docs/index.rst

@@ -10,7 +10,7 @@ and install it from PyPI with the following commands:
 
 .. code-block:: bash
 
-    sudo apt-get install libjpeg-dev libmagic1 libpng-dev libreoffice libtiff-dev gcc ghostscript gpgv python-dev python-virtualenv tesseract-ocr poppler-utils -y
+    sudo apt-get install libjpeg-dev libmagic1 libpng-dev libreoffice libtiff-dev gcc ghostscript gnupg1 python-dev python-virtualenv tesseract-ocr poppler-utils -y
     virtualenv venv
     source venv/bin/activate
     pip install mayan-edms

docs/releases/2.1.4.rst

@@ -0,0 +1,75 @@
+===============================
+Mayan EDMS v2.1.4 release notes
+===============================
+
+Released: XX, 2016
+
+What's new
+==========
+
+This is a bug-fix release and all users are encouraged to upgrade.
+
+Other changes
+-------------
+- Fix statistics namespace list display view
+- Fix events list display view
+- Update to Django 1.8.15
+
+Removals
+--------
+* None
+
+Upgrading from a previous version
+---------------------------------
+
+Using PIP
+~~~~~~~~~
+
+Type in the console::
+
+    $ pip install -U mayan-edms
+
+the requirements will also be updated automatically.
+
+Using Git
+~~~~~~~~~
+
+If you installed Mayan EDMS by cloning the Git repository issue the commands::
+
+    $ git reset --hard HEAD
+    $ git pull
+
+otherwise download the compressed archived and uncompress it overriding the
+existing installation.
+
+Next upgrade/add the new requirements::
+
+    $ pip install --upgrade -r requirements.txt
+
+Common steps
+~~~~~~~~~~~~
+
+Migrate existing database schema with::
+
+    $ mayan-edms.py performupgrade
+
+Add new static media::
+
+    $ mayan-edms.py collectstatic --noinput
+
+The upgrade procedure is now complete.
+
+
+Backward incompatible changes
+=============================
+
+* None
+
+Bugs fixed or issues closed
+===========================
+
+* `GitLab issue #311 <https://gitlab.com/mayan-edms/mayan-edms/issues/311>`_ acl page return ContentType:Document
+* `GitLab issue #316 <https://gitlab.com/mayan-edms/mayan-edms/issues/316>`_ Error when trying to access the statistics
+* `GitLab issue #324 <https://gitlab.com/mayan-edms/mayan-edms/issues/324>`_ Document signature tests fail in Ubuntu 16.10
+
+.. _PyPI: https://pypi.python.org/pypi/mayan-edms/

docs/releases/index.rst

@@ -22,6 +22,8 @@ versions of the documentation contain the release notes for any later releases.
 .. toctree::
    :maxdepth: 1
 
+=======
+   2.1.4
    2.1.3
    2.1.2
    2.1.1

docs/topics/deploying.rst

@@ -2,15 +2,17 @@
 Deploying
 =========
 
-OS "bare metal"
-===============
+Below are some ways to deploye and use Mayan EDMS. Do use more than one method.
+
+OS "bare metal" method
+======================
 
 Like other Django based projects Mayan EDMS can be deployed in a wide variety
 of ways. The method provided below is only a bare minimum example.
 These instructions are independent of the instructions mentioned in the
 :doc:`installation` chapter but assume you have already made a test install to
 test the compatibility of your operating system. These instruction are for
-Ubuntu 15.04.
+Ubuntu 16.10.
 
 Switch to superuser::
 
@@ -20,8 +22,8 @@ Install all system dependencies::
 
     apt-get install nginx supervisor redis-server postgresql \
     libpq-dev libjpeg-dev libmagic1 libpng-dev libreoffice \
-    libtiff-dev gcc ghostscript gpgv python-dev python-virtualenv \
-    tesseract-ocr unpaper poppler-utils -y
+    libtiff-dev gcc ghostscript gnupg1 python-dev python-virtualenv \
+    tesseract-ocr poppler-utils -y
 
 Change to the directory where the project will be deployed::
 
@@ -79,6 +81,7 @@ Append the following to the ``mayan/settings/local.py`` file, paying attention t
 
     BROKER_URL = 'redis://127.0.0.1:6379/0'
     CELERY_RESULT_BACKEND = 'redis://127.0.0.1:6379/0'
+    SIGNATURES_GPG_PATH = '/usr/bin/gpg1'
 
 Migrate the database or initialize the project::
 
@@ -189,8 +192,8 @@ Restart the services::
     /etc/init.d/nginx restart
     /etc/init.d/supervisor restart
 
-Docker
-======
+Docker method
+=============
 
 Deploy the Docker image stack::
 
@@ -205,8 +208,8 @@ with::
     docker logs mayan-edms
 
 
-Docker Compose
-==============
+Docker Compose method
+=====================
 
 Create a file named ``environment`` with the following content::
 
@@ -248,8 +251,8 @@ with::
 
     docker logs mayanedms_mayan-edms_1
 
-Vagrant
-=======
+Vagrant method
+==============
 Make sure you have Vagrant and a provider properly installed as per
 https://docs.vagrantup.com/v2/installation/index.html
 Clone the repository and execute::

docs/topics/ocr_backend.rst

@@ -2,8 +2,9 @@
 OCR backend
 ===========
 
-Mayan EDMS ships an OCR backend that uses the FLOSS engine Tesseract, but it can
-use other engines. To support other engines a wrapper that subclasess the
+Mayan EDMS ships an OCR backend that uses the FLOSS engine Tesseract
+(https://github.com/tesseract-ocr/tesseract/), but it can
+use other engines. To support other engines crate a wrapper that subclasess the
 ``OCRBackendBase`` class defined in mayan/apps/ocr/classes. This subclass should
 expose the ``execute`` method. For an example of how the Tesseract backend
 is implemented take a look at the file ``mayan/apps/ocr/backends/tesseract.py``
@@ -13,3 +14,8 @@ OCR_BACKEND and point it to your new OCR backend class path.
 
 The default value of OCR_BACKEND is ``"ocr.backends.tesseract.Tesseract"``
 
+To add support to OCR more languages when using Tesseract, install the
+corresponding language file. If using a Debian based OS, this command will
+display the available language files:
+
+   apt-cache search tesseract-ocr

docs/topics/signatures.rst

@@ -21,4 +21,6 @@ keys no longer needed can also be deleted from this menu.
 
 Only `GNU Privacy Guard`_ signatures are support at the moment.
 
+Only version 1 of `GNU Privacy Guard`_ is supported for now.
+
 .. _`GNU Privacy Guard`: www.gnupg.org/