From c2c0a514db504383ce9b98bceeaa11fbbf5df20d Mon Sep 17 00:00:00 2001
From: Antoine Nguyen <tonio@ngyn.org>
Date: Fri, 21 Mar 2014 09:10:45 +0100
Subject: [PATCH] Documentation fixes.

---
 doc/getting_started/plugins.rst   | 20 ++++++++++----------
 doc/integration/imap_and_smtp.rst |  8 ++++----
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/doc/getting_started/plugins.rst b/doc/getting_started/plugins.rst
index 9fbdb0130..61556029e 100644
--- a/doc/getting_started/plugins.rst
+++ b/doc/getting_started/plugins.rst
@@ -58,16 +58,16 @@ Replace values between ``<>`` by yours.
 Edit the :file:`/etc/postfix/main.cf` file and copy the following
 lines inside::
 
-  relay_domains = <driver>:/etc/postfix/maps/sql-relaydomains.cf
+  relay_domains = <driver>:/etc/postfix/sql-relaydomains.cf
   transport_maps = 
-      <driver>:/etc/postfix/maps/sql-relaydomains-transport.cf
-      <driver>:/etc/postfix/maps/sql-relaydomain-aliases-transport.cf
+      <driver>:/etc/postfix/sql-relaydomains-transport.cf
+      <driver>:/etc/postfix/sql-relaydomain-aliases-transport.cf
 
   smtpd_recipient_restrictions =
       permit_mynetworks
       reject_unauth_destination
       check_recipient_access 
-          <driver>:/etc/postfix/maps/sql-relay-recipient-verification.cf
+          <driver>:/etc/postfix/sql-relay-recipient-verification.cf
 
 Replace ``<driver>`` by the name of the database you use.
 
@@ -332,11 +332,11 @@ configuration files as follows:
 
 ``/etc/postfix/main.cf``::
 
-  transport_maps = mysql:/etc/postfix/maps/sql-autoreplies-transport.cf
-  virtual_alias_maps = <driver>:/etc/postfix/maps/sql-aliases.cf
-          <driver>:/etc/postfix/mapfiles/sql-domain-aliases-mailboxes.cf,
-          <driver>:/etc/postfix/maps/sql-autoreplies.cf,
-          <driver>:/etc/postfix/mapfiles/sql-catchall-aliases.cf
+  transport_maps = <driver>:/etc/postfix/sql-autoreplies-transport.cf
+  virtual_alias_maps = <driver>:/etc/postfix/sql-aliases.cf
+          <driver>:/etc/postfix/sql-domain-aliases-mailboxes.cf,
+          <driver>:/etc/postfix/sql-autoreplies.cf,
+          <driver>:/etc/postfix/sql-catchall-aliases.cf
 
 .. note::
 
@@ -345,7 +345,7 @@ configuration files as follows:
 ``/etc/postfix/master.cf``::
 
   autoreply unix        -       n       n       -       -       pipe
-            flags= user=vmail:<group> argv=<modoboa_site>/manage.py autoreply $sender $mailbox
+            flags= user=vmail:<group> argv=python <modoboa_site>/manage.py autoreply $sender $mailbox
 
 Replace ``<driver>`` by the name of the database you
 use. ``<modoboa_site>`` is the path of your Modoboa instance.
diff --git a/doc/integration/imap_and_smtp.rst b/doc/integration/imap_and_smtp.rst
index 79ab8e016..b0f0df61c 100644
--- a/doc/integration/imap_and_smtp.rst
+++ b/doc/integration/imap_and_smtp.rst
@@ -28,19 +28,19 @@ Then, edit the ``inbox`` namespace and add the following lines::
   inbox = yes
 
   mailbox Drafts {
-    auto = create
+    auto = subscribe
     special_use = \Drafts
   }
   mailbox Junk {
-    auto = create
+    auto = subscribe
     special_use = \Junk
   }
   mailbox Sent {
-    auto = create
+    auto = subscribe
     special_use = \Sent
   }
   mailbox Trash {
-    auto = create
+    auto = subscribe
     special_use = \Trash
   }