From 39e360bdf38712b8ad8e649c3ae1b483e0e50962 Mon Sep 17 00:00:00 2001
From: Antoine Nguyen <tonio@ngyn.org>
Date: Wed, 11 Nov 2015 16:44:24 +0100
Subject: [PATCH] Update documentation.

see #780
---
 doc/additional/migrating.rst          | 12 +++++++++---
 doc/integration/imap_and_smtp.rst     | 16 ++++++++++++----
 doc/plugins/limits.rst                |  5 -----
 doc/plugins/postfix_relay_domains.rst |  5 -----
 4 files changed, 21 insertions(+), 17 deletions(-)
 delete mode 100644 doc/plugins/limits.rst
 delete mode 100644 doc/plugins/postfix_relay_domains.rst

diff --git a/doc/additional/migrating.rst b/doc/additional/migrating.rst
index a094bbe77..5aafe99a9 100644
--- a/doc/additional/migrating.rst
+++ b/doc/additional/migrating.rst
@@ -1,6 +1,12 @@
-#############################
-Migrating from other software
-#############################
+###################
+Tools for migration
+###################
+
+******************************
+Migrate existing IMAP accounts
+******************************
+
+`OfflineIMAP extension <https://github.com/modoboa/modoboa-imap-migration>`_.
 
 ************
 PostfixAdmin
diff --git a/doc/integration/imap_and_smtp.rst b/doc/integration/imap_and_smtp.rst
index 3a73ca306..5d00ac62d 100644
--- a/doc/integration/imap_and_smtp.rst
+++ b/doc/integration/imap_and_smtp.rst
@@ -422,7 +422,7 @@ be used by Postfix to lookup into Modoboa tables.
 To automaticaly generate the requested map files and store them in a
 directory, run the following command::
 
-  $ modoboa-admin.py postfix_maps --extensions all --dbtype <mysql|postgres|sqlite> <directory>
+  $ modoboa-admin.py postfix_maps --dbtype <mysql|postgres|sqlite> <directory>
 
 ``<directory>`` is the directory where the files will be
 stored. Answer the few questions and you're done.
@@ -443,12 +443,20 @@ Use the following configuration in the :file:`/etc/postfix/main.cf` file
   virtual_alias_domains = <driver>:/etc/postfix/sql-domain-aliases.cf
   virtual_alias_maps = <driver>:/etc/postfix/sql-aliases.cf
 
+  relay_domains = <driver>:/etc/postfix/sql-relaydomains.cf
+  transport_maps =
+      <driver>:/etc/postfix/sql-spliteddomains-transport.cf
+      <driver>:/etc/postfix/sql-relaydomains-transport.cf
+
   smtpd_recipient_restrictions =
-        ...
-        check_recipient_access <driver>:/etc/postfix/sql-maintain.cf
+        # ...
+        check_recipient_access
+            <driver>:/etc/postfix/sql-maintain.cf
+            <driver>:/etc/postfix/sql-relay-recipient-verification.cf
         permit_mynetworks
+        reject_unauth_destination
         reject_unverified_recipient
-        ...
+        # ...
 
   smtpd_sender_login_maps =
         <driver>:/etc/postfix/sql-sender-login-mailboxes.cf
diff --git a/doc/plugins/limits.rst b/doc/plugins/limits.rst
deleted file mode 100644
index e190b6c28..000000000
--- a/doc/plugins/limits.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-################
-Per-admin limits
-################
-
-`Official documentation <http://modoboa-admin-limits.readthedocs.org>`_.
diff --git a/doc/plugins/postfix_relay_domains.rst b/doc/plugins/postfix_relay_domains.rst
deleted file mode 100644
index 7a7c8c7e5..000000000
--- a/doc/plugins/postfix_relay_domains.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-#############################
-Postfix relay domains support
-#############################
-
-`Official documentation <http://modoboa-admin-relaydomains.readthedocs.org>`_.