# HG changeset patch
# User Pascal Volk <user@localhost.localdomain.org>
# Date 1370704336 0
# Node ID 18a528d440555dc6c94f6581ece4c3259f9f99b6
# Parent  45f76850c7e943c61170fd0775438487fea95b25# Parent  61aaa7a98ec04853dd72ee09d334c9cf64cd2f62
merged changes from default(61aaa7a98ec0).

diff -r 45f76850c7e9 -r 18a528d44055 doc/web/source/ext_references.rst
--- a/doc/web/source/ext_references.rst	Sun Mar 17 17:07:14 2013 +0000
+++ b/doc/web/source/ext_references.rst	Sat Jun 08 15:12:16 2013 +0000
@@ -9,6 +9,7 @@
 .. _GPG: http://en.wikipedia.org/wiki/GNU_Privacy_Guard
 .. _IDN: http://en.wikipedia.org/wiki/Internationalized_domain_name
 .. _LDA: http://wiki.dovecot.org/LDA
+.. _LMTP: http://master.wiki2.dovecot.org/LMTP
 .. _Maildir: http://wiki2.dovecot.org/MailboxFormat/Maildir
 .. _MainConfig: http://wiki.dovecot.org/MainConfig
 .. _Mercurial: http://mercurial.selenic.com/
diff -r 45f76850c7e9 -r 18a528d44055 doc/web/source/howto/manage_domains.rst
--- a/doc/web/source/howto/manage_domains.rst	Sun Mar 17 17:07:14 2013 +0000
+++ b/doc/web/source/howto/manage_domains.rst	Sat Jun 08 15:12:16 2013 +0000
@@ -184,6 +184,8 @@
 
 .. versionadded:: 0.6.0
 
+.. _domaintransport:
+
 domaintransport
 ---------------
 Syntax:
diff -r 45f76850c7e9 -r 18a528d44055 doc/web/source/installation/dovecot_configuration.rst
--- a/doc/web/source/installation/dovecot_configuration.rst	Sun Mar 17 17:07:14 2013 +0000
+++ b/doc/web/source/installation/dovecot_configuration.rst	Sat Jun 08 15:12:16 2013 +0000
@@ -168,6 +168,8 @@
  # uncomment if you want to use the quota plugin
  #mail_plugins = quota
 
+.. _conf-d-10-master.conf:
+
 conf.d/10-master.conf
 ^^^^^^^^^^^^^^^^^^^^^
 .. code-block:: text
diff -r 45f76850c7e9 -r 18a528d44055 doc/web/source/installation/postfix_configuration.rst
--- a/doc/web/source/installation/postfix_configuration.rst	Sun Mar 17 17:07:14 2013 +0000
+++ b/doc/web/source/installation/postfix_configuration.rst	Sat Jun 08 15:12:16 2013 +0000
@@ -72,4 +72,18 @@
 For more details about the `flags` used above see: `pipe(8)`_.
 All other arguments are explained in the Dovecot LDA_ documentation.
 
+Using Dovecot's LMTP
+--------------------
+In order to use Dovecot's LMTP_ as `virtual_transport` with Postfix make sure
+you have have:
+
+ ‣ `lmtp` in your `protocols` setting (:ref:`dovecot2.conf`)
+ ‣ configured a `lmtp` listener: `service lmtp {}`
+   (:ref:`conf-d-10-master.conf`)
+ ‣ set `lmtp:unix:private/dovecot-lmtp` as the `domain.transport` in your
+   :file:`vmm.cfg`.
+
+If you want to switch the transport of existing domains and/or accounts, you
+can use the subcommands :ref:`domaintransport` and :ref:`usertransport`.
+
 .. include:: ../ext_references.rst