Merge branch '1.1.x'

Conflicts:
	modoboa/locale/cs_CZ/LC_MESSAGES/django.po
	modoboa/locale/de/LC_MESSAGES/django.po
	modoboa/locale/en/LC_MESSAGES/django.po
	modoboa/locale/es/LC_MESSAGES/django.po
	modoboa/locale/fr/LC_MESSAGES/django.po
	modoboa/locale/it/LC_MESSAGES/django.po
	modoboa/locale/nl_NL/LC_MESSAGES/django.po
	modoboa/locale/pt_PT/LC_MESSAGES/django.po
	modoboa/locale/ru/LC_MESSAGES/django.po
	modoboa/locale/sv/LC_MESSAGES/django.po

doc/additional/migrating.rst

@@ -6,7 +6,7 @@ Migrating from other software
 PostfixAdmin
 ************
 
-Since version 0.8.5, Modoboa provides a simple script to migrate an
+Modoboa provides a simple script to migrate an
 existing `PostfixAdmin (version 2.3.3+)
 <http://postfixadmin.sourceforge.net/>`_ database to a Modoboa one.
 
@@ -21,40 +21,37 @@ connection named ``pfxadmin`` into the ``DATABASES`` variable
 corresponding to your PostfixAdmin setup::
 
   DATABASES = {
-    "default" : {
-      # default connection definition
-    },
-    "pfxadmin" : {
-      "ENGINE" : "<engine>",
-      "NAME" : "<database name>",
-      "USER" : "<database user>",
-      "PASSWORD" : "<user password>",
-    }  
+      "default" : {
+          # default connection definition
+      },
+      "pfxadmin" : {
+          "ENGINE" : "<engine>",
+          "NAME" : "<database name>",
+          "USER" : "<database user>",
+          "PASSWORD" : "<user password>",
+      }  
   }
 
 This connection should correspond to the one defined in PostfixAdmin's
 configuration file.
 
-You are now ready to start the migration. Enter Modoboa's root
-directory and execute the following command::
+Then, uncomment the line containing
+``'modoboa.tools.pfxadmin_migrate'`` inside the ``MODOBOA_APPS``
+variable and save your changes.
 
-  $ PYTHONPATH=$PWD/.. DJANGO_SETTINGS_MODULE=modoboa.settings \
-      ./tools/pfxadmin_migrate/migrate.py -r -p <directory that stores mailboxes>
+You are now ready to start the migration so run the following commands::
+
+  $ cd <modoboa_site>
+  $ python manage.py migrate_from_postfixadmin -r -p <directory that stores mailboxes>
 
 Depending on how many domains/mailboxes your existing setup contains,
 the migration can be long. Just wait for the script's ending.
 
-Once the migration has succeed, go the *Admin > Configuration* panel,
-click on the *admin* row and modify the value of ``MAILDIR_ROOT`` as
-follow::
+.. note::
 
-  MAILDIR_ROOT =
-
-The corresponding field must be empty. Don't touch other fields except
-``PASSWORD_SCHEME``, if needed. (set it to the same method as the one
-used by PostfixAdmin, check its configuration file if you're not sure)
-
-Click on the *Save* button.
+   The rename operation is not synchronous. If you choose this option,
+   you must enable **Handle mailboxes on filesystem** option. See
+   :ref:`fs_operations`.
 
 The procedure is over, edit the :file:`settings.py` file and:
 

doc/getting_started/configuration.rst

@@ -274,6 +274,14 @@ Modoboa should connect to your LDAP server. They are described just below:
 |                    |                                 |                    |
 |                    |                                 |                    |
 +--------------------+---------------------------------+--------------------+
+|Domain/mailbox      |Automatically create a domain and|yes                 |
+|creation            |a mailbox when a new user is     |                    |
+|                    |created just after the first     |                    |
+|                    |successful authentication. You   |                    |
+|                    |will generally want to disable   |                    |
+|                    |this feature when the relay      |                    |
+|                    |domains extension is in use      |                    |
++--------------------+---------------------------------+--------------------+
 
 
 If you need additional parameters, you will find a detailled

doc/getting_started/upgrade.rst

@@ -48,6 +48,17 @@ Finally, follow the common procedure::
   $ python manage.py syncdb --migrate
   $ python manage.py collectstatic
 
+1.1.6: Few bugfixes
+===================
+
+Catchall aliases were not really functional until this version as they
+were eating all domain traffic.
+
+To fix them, a postfix map file (``sql-mailboxes-self-aliases.cf``)
+has been re-introduced and must be listed into the
+``virtual_alias_maps`` setting. See :ref:`postfix_config` for the
+order.
+
 1.1.2: Audit trail issues
 =========================
 

doc/integration/imap_and_smtp.rst

@@ -443,6 +443,7 @@ 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,
         <driver>:/etc/postfix/sql-domain-aliases-mailboxes.cf,
+        <driver>:/etc/postfix/sql-mailboxes-self-aliases.cf,
         <driver>:/etc/postfix/sql-catchall-aliases.cf
 
   smtpd_recipient_restrictions =