From 46551ecf743197ea7e07f8d0212efa47cce12ae6 Mon Sep 17 00:00:00 2001
From: Antoine Nguyen <tonio@ngyn.org>
Date: Fri, 3 Mar 2017 12:55:36 +0100
Subject: [PATCH] Documentation updated.

---
 doc/contributing/quota_res | 16 ----------------
 doc/upgrade.rst            | 34 ++++++++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 16 deletions(-)
 delete mode 100644 doc/contributing/quota_res

diff --git a/doc/contributing/quota_res b/doc/contributing/quota_res
deleted file mode 100644
index 3675aac94..000000000
--- a/doc/contributing/quota_res
+++ /dev/null
@@ -1,16 +0,0 @@
-Notes about quota changes and Reseller user
----------------------------------------------
-
-Reseller user has a quota option in Resources tab. This is the quota that the Reseller can share between all their domains.
-
-There are two quotas for a domain in the new version:
-
-1. Quota & 
-2. Default mailbox quota.
-
-[1]. Quota: quota shared between mailboxes
-This quota is shared between all the mailboxes of this domain. This value cannot exceed Reseller's quota and hence cannot be 0(unlimited) if Resller has finite quota.
-
-[2]. Default mailbox quota: default quota applied to mailboxes
-This quota is the default quota applied to new mailboxes. This value cannot exceed Quota[1] and hence cannot be 0(unlimited) if Quota[1] is finite.
-
diff --git a/doc/upgrade.rst b/doc/upgrade.rst
index a2cb4f199..da23f4f00 100644
--- a/doc/upgrade.rst
+++ b/doc/upgrade.rst
@@ -186,6 +186,40 @@ Finally, upgrade your extensions and reactivate them.
 |modoboa-webmail               |1.1.0                         |
 +------------------------------+------------------------------+
 
+Command line shortcuts:
+
+.. sourcecode:: bash
+
+   $ pip install modoboa-amavis==1.1.0
+   $ pip install modoboa-dmarc==1.0.0
+   $ pip install modoboa-imap-migration==1.1.0
+   $ pip install modoboa-pdfcredentials==1.1.0
+   $ pip install modoboa-postfix-autoreply==1.2.0
+   $ pip install modoboa-radicale==1.1.0
+   $ pip install modoboa-sievefilters==1.1.0
+   $ pip install modoboa-stats==1.1.0
+   $ pip install modoboa-webmail==1.1.0
+
+Notes about quota changes and Reseller user
+-------------------------------------------
+
+Reseller users now have a quota option in Resources tab. This is the quota
+that a reseller can share between all its domains.
+
+There are two quotas for a domain in the new version:
+
+1. Quota &
+2. Default mailbox quota.
+
+[1]. Quota: quota shared between mailboxes
+This quota is shared between all the mailboxes of this domain. This
+value cannot exceed reseller's quota and hence cannot be 0(unlimited)
+if reseller has finite quota.
+
+[2]. Default mailbox quota: default quota applied to mailboxes
+This quota is the default quota applied to new mailboxes. This value
+cannot exceed Quota[1] and hence cannot be 0(unlimited) if Quota[1] is
+finite.
 
 1.6.1
 =====