From 7fb19df18b44bc616d4b438b8700d9714ada8710 Mon Sep 17 00:00:00 2001
From: Roberto Rosario <roberto.rosario.gonzalez@gmail.com>
Date: Sat, 22 Jul 2017 03:04:20 -0400
Subject: [PATCH] Update changelog. Add release notes for 2.6.2.

Signed-off-by: Roberto Rosario <roberto.rosario.gonzalez@gmail.com>
---
 HISTORY.rst             |  2 +-
 docs/releases/2.6.2.rst | 78 +++++++++++++++++++++++++++++++++++++++++
 docs/releases/index.rst |  1 +
 3 files changed, 80 insertions(+), 1 deletion(-)
 create mode 100644 docs/releases/2.6.2.rst

diff --git a/HISTORY.rst b/HISTORY.rst
index f7cd302f6e..6ba282607f 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -1,4 +1,4 @@
-2.6.2 (2017-07-XX)
+2.6.2 (2017-07-19)
 ==================
 - Fix deprecation warning to prepare upgrade to Django 1.11 and 2.0.
 - Fix document page zoom.
diff --git a/docs/releases/2.6.2.rst b/docs/releases/2.6.2.rst
new file mode 100644
index 0000000000..720e0490f7
--- /dev/null
+++ b/docs/releases/2.6.2.rst
@@ -0,0 +1,78 @@
+===============================
+Mayan EDMS v2.6.2 release notes
+===============================
+
+Released: July 22, 2017
+
+What's new
+==========
+
+This is a bug fix release and users are encouraged to upgrade.
+
+Other Changes
+-------------
+- Fix deprecation warning to prepare upgrade to Django 1.11 and 2.0.
+- Fix zoom feature in document page view.
+- Add support to run tests against a MySQL or Postgres container.
+- Improve tag widget customization by moving the markup to its own template.
+- Fix document page widget appearance in the document page list view.
+- Make document version order deterministic.
+- Allow total page number instrospection of encrypted PDF with non ASCII
+  user properties. GitLab issue #411.
+
+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/
diff --git a/docs/releases/index.rst b/docs/releases/index.rst
index b35ec751c2..8ff48f0aca 100644
--- a/docs/releases/index.rst
+++ b/docs/releases/index.rst
@@ -22,6 +22,7 @@ versions of the documentation contain the release notes for any later releases.
 .. toctree::
    :maxdepth: 1
 
+   2.6.2
    2.6.1
    2.6
    2.5.2