Merge remote-tracking branch 'origin/series/2.0' into merge

docs/releases/2.1.6.rst

@@ -0,0 +1,73 @@
+===============================
+Mayan EDMS v2.1.6 release notes
+===============================
+
+Released: November 23, 2016
+
+What's new
+==========
+
+This is a bug-fix release and all users are encouraged to upgrade.
+
+Changes
+-------------
+
+- Fix variable name typo in the rotation transformation class.
+- Update translations
+
+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
+===========================
+
+* None
+
+.. _PyPI: https://pypi.python.org/pypi/mayan-edms/

docs/releases/index.rst

@@ -23,6 +23,7 @@ versions of the documentation contain the release notes for any later releases.
    :maxdepth: 1
 
    2.2
+   2.1.6
    2.1.5
    2.1.4
    2.1.3

docs/topics/deploying.rst

@@ -196,8 +196,9 @@ Make the installation directory readable and writable by the webserver user::
 
 Restart the services::
 
-    /etc/init.d/nginx restart
-    /etc/init.d/supervisor restart
+    systemctl enable supervisor
+    systemctl restart supervisor
+    systemctl restart nginx
 
 Docker method
 =============