Merge branch 'master' into debian

1 files changed, 9 insertions, 9 deletions

diff --git a/doc/development.md b/doc/development.md
index 406207a..49e8d74 100644
--- a/doc/development.md
+++ b/doc/development.md
@@ -1,5 +1,5 @@
-% Test environment setup for [`interimap`(1)] and [`pullimap`(1)]
-% Guilhem Moulin <guilhem@fripost.org>
+% Test environment setup
+% [Guilhem Moulin](mailto:guilhem@fripost.org)
 
 Introduction
 ============
@@ -83,7 +83,7 @@ pre-authenticated [IMAP4rev1] in the test environment for username
 `testuser`, list mailboxes, and exit, run:
 
     $ env -i PATH="/usr/bin:/bin" USER="testuser" \
-		doveadm -c "$BASEDIR/dovecot.conf" exec imap
+        doveadm -c "$BASEDIR/dovecot.conf" exec imap
     * PREAUTH [CAPABILITY IMAP4rev1 …] Logged in as testuser
     a LIST "" "*"
     * LIST (\HasNoChildren) "." INBOX
@@ -98,10 +98,10 @@ the latter to create a mailbox `foo`, add a sample message to it, and
 finally mark it as `\Seen`.
 
     $ env -i PATH="/usr/bin:/bin" USER="testuser" \
-		doveadm -c "$BASEDIR/dovecot.conf" mailbox create "foo"
+        doveadm -c "$BASEDIR/dovecot.conf" mailbox create "foo"
 <!-- -->
     $ env -i PATH="/usr/bin:/bin" USER="testuser" HOME="$BASEDIR/testuser" \
-		doveadm -c "$BASEDIR/dovecot.conf" exec dovecot-lda -e -m "foo" <<-EOF
+        doveadm -c "$BASEDIR/dovecot.conf" exec dovecot-lda -e -m "foo" <<-EOF
 			From: <sender@example.net>
 			To: <recipient@example.net>
 			Subject: Hello world!
@@ -112,7 +112,7 @@ finally mark it as `\Seen`.
 		EOF
 <!-- -->
     $ env -i PATH="/usr/bin:/bin" USER="testuser" \
-		doveadm -c "$BASEDIR/dovecot.conf" flags add "\\Seen" mailbox "foo" "*"
+        doveadm -c "$BASEDIR/dovecot.conf" flags add "\\Seen" mailbox "foo" "*"
 
 Normally [`dovecot-lda`(1)](https://wiki.dovecot.org/LDA) tries to do a
 userdb lookup in order to determine the user's home directory.  Since we
@@ -155,7 +155,7 @@ You can now run [`interimap`(1)] with `--watch` set, here to one second
 to observe synchronisation steps early.
 
     $ env -i PATH="$PATH" perl -I./lib -T ./interimap --config="$BASEDIR/interimap.conf" \
-		--watch=1 --debug
+        --watch=1 --debug
 
 Use instructions from the [previous section][Mail storage access]
 (substituting `testuser` with `local` or `remote`) in order to simulate
@@ -179,12 +179,12 @@ Create a [`pullimap`(1)] configuration file with as section `[foo]`.
 Run [`pullimap`(1)] without `--idle` in order to create the state file.
 
     $ env -i PATH="$PATH" perl -I./lib -T ./pullimap --config="$BASEDIR/pullimap.conf" \
-		--no-delivery foo
+        --no-delivery foo
 
 You can now run [`pullimap`(1)] with `--idle` set.
 
     $ env -i PATH="$PATH" perl -I./lib -T ./pullimap --config="$BASEDIR/pullimap.conf" \
-		--no-delivery --idle --debug foo
+        --no-delivery --idle --debug foo
 
 Use instructions from the [previous section][Mail storage access]
 in order to simulate activity on the “remote” server (in the relevant