Mercurial > dovecot > core-2.2

changeset 18604:c469d8f4cde7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
man: Added description of option `-F file'.
author Pascal Volk <user@localhost.localdomain.org>
date Sat, 09 May 2015 15:29:21 +0000
parents e4b62ba0fb5a
children ceb9c13eb3c0
files doc/man/Makefile.am doc/man/doveadm-acl.1.in doc/man/doveadm-altmove.1.in doc/man/doveadm-batch.1.in doc/man/doveadm-deduplicate.1.in doc/man/doveadm-expunge.1.in doc/man/doveadm-fetch.1.in doc/man/doveadm-flags.1.in doc/man/doveadm-force-resync.1.in doc/man/doveadm-fts.1.in doc/man/doveadm-import.1.in doc/man/doveadm-index.1.in doc/man/doveadm-mailbox.1.in doc/man/doveadm-move.1.in doc/man/doveadm-purge.1.in doc/man/doveadm-quota.1.in doc/man/doveadm-search.1.in doc/man/doveadm-sync.1.in doc/man/option-F-file.inc doc/man/option-u-user.inc doc/man/sed.sh
diffstat 21 files changed, 236 insertions(+), 51 deletions(-) [+]
line wrap: on
line diff
--- a/doc/man/Makefile.am	Sat May 09 18:28:04 2015 +0300
+++ b/doc/man/Makefile.am	Sat May 09 15:29:21 2015 +0000
@@ -56,6 +56,7 @@
 	$(srcdir)/global-options-formatter.inc \
 	$(srcdir)/global-options.inc \
 	$(srcdir)/option-A.inc \
+	$(srcdir)/option-F-file.inc \
 	$(srcdir)/option-S-socket.inc \
 	$(srcdir)/option-u-user.inc \
 	$(srcdir)/reporting-bugs.inc
--- a/doc/man/doveadm-acl.1.in	Sat May 09 18:28:04 2015 +0300
+++ b/doc/man/doveadm-acl.1.in	Sat May 09 15:29:21 2015 +0000
@@ -1,5 +1,5 @@
 .\" Copyright (c) 2014-2015 Dovecot authors, see the included COPYING file
-.TH DOVEADM\-ACL 1 "2014-10-09" "Dovecot v2.2" "Dovecot"
+.TH DOVEADM\-ACL 1 "2015-05-09" "Dovecot v2.2" "Dovecot"
 .SH NAME
 doveadm\-acl \- Manage Access Control List (ACL)
 .\"------------------------------------------------------------------------
@@ -26,6 +26,8 @@
 .\"-------------------------------------
 @INCLUDE:option-A@
 .\"-------------------------------------
+@INCLUDE:option-F-file@
+.\"-------------------------------------
 @INCLUDE:option-S-socket@
 .\"-------------------------------------
 @INCLUDE:option-u-user@
@@ -80,7 +82,7 @@
 .fi
 .PP
 Now if timo is a member of the tempdisabled group, he has no access to the
-mailbox. 
+mailbox.
 This wouldn\(aqt be possible with a normal group identifier, because the
 .B user=timo
 would override it.
@@ -171,7 +173,7 @@
 .SH COMMANDS
 .SS acl add
 .B doveadm acl add
-[\fB\-u\fP \fIuser\fP|\fB\-A\fP]
+[\fB\-u\fP \fIuser\fP|\fB\-A\fP|\fB\-F\fP \fIfile\fP]
 [\fB\-S\fP \fIsocket_path\fP]
 .I mailbox id right
 .RI [ right " ...]"
@@ -184,7 +186,7 @@
 .\"-------------------------------------
 .SS acl debug
 .B doveadm acl debug
-[\fB\-u\fP \fIuser\fP|\fB\-A\fP]
+[\fB\-u\fP \fIuser\fP|\fB\-A\fP|\fB\-F\fP \fIfile\fP]
 [\fB\-S\fP \fIsocket_path\fP]
 .I mailbox
 .PP
@@ -194,7 +196,7 @@
 .\"-------------------------------------
 .SS acl delete
 .B doveadm acl delete
-[\fB\-u\fP \fIuser\fP|\fB\-A\fP]
+[\fB\-u\fP \fIuser\fP|\fB\-A\fP|\fB\-F\fP \fIfile\fP]
 [\fB\-S\fP \fIsocket_path\fP]
 .I mailbox id
 .PP
@@ -203,7 +205,7 @@
 .\"-------------------------------------
 .SS acl get
 .B doveadm acl get
-[\fB\-u\fP \fIuser\fP|\fB\-A\fP]
+[\fB\-u\fP \fIuser\fP|\fB\-A\fP|\fB\-F\fP \fIfile\fP]
 [\fB\-S\fP \fIsocket_path\fP]
 .RB [ \-m ]
 .I mailbox
@@ -213,7 +215,7 @@
 .\"-------------------------------------
 .SS acl recalc
 .B doveadm acl recalc
-[\fB\-u\fP \fIuser\fP|\fB\-A\fP]
+[\fB\-u\fP \fIuser\fP|\fB\-A\fP|\fB\-F\fP \fIfile\fP]
 [\fB\-S\fP \fIsocket_path\fP]
 .PP
 Make sure the
@@ -223,7 +225,7 @@
 .\"-------------------------------------
 .SS acl remove
 .B doveadm acl remove
-[\fB\-u\fP \fIuser\fP|\fB\-A\fP]
+[\fB\-u\fP \fIuser\fP|\fB\-A\fP|\fB\-F\fP \fIfile\fP]
 [\fB\-S\fP \fIsocket_path\fP]
 .I mailbox id right
 .RI [ right " ...]"
@@ -234,7 +236,7 @@
 .\"-------------------------------------
 .SS acl rights
 .B doveadm acl rights
-[\fB\-u\fP \fIuser\fP|\fB\-A\fP]
+[\fB\-u\fP \fIuser\fP|\fB\-A\fP|\fB\-F\fP \fIfile\fP]
 [\fB\-S\fP \fIsocket_path\fP]
 .I mailbox
 .PP
@@ -245,7 +247,7 @@
 .\"-------------------------------------
 .SS acl set
 .B doveadm acl set
-[\fB\-u\fP \fIuser\fP|\fB\-A\fP]
+[\fB\-u\fP \fIuser\fP|\fB\-A\fP|\fB\-F\fP \fIfile\fP]
 [\fB\-S\fP \fIsocket_path\fP]
 .I mailbox id right
 .RI [ right " ...]"
--- a/doc/man/doveadm-altmove.1.in	Sat May 09 18:28:04 2015 +0300
+++ b/doc/man/doveadm-altmove.1.in	Sat May 09 15:29:21 2015 +0000
@@ -1,5 +1,5 @@
 .\" Copyright (c) 2010-2015 Dovecot authors, see the included COPYING file
-.TH DOVEADM\-ALTMOVE 1 "2014-10-19" "Dovecot v2.2" "Dovecot"
+.TH DOVEADM\-ALTMOVE 1 "2015-05-09" "Dovecot v2.2" "Dovecot"
 .SH NAME
 doveadm\-altmove \- Move matching mails to the alternative storage (dbox\-only)
 .\"------------------------------------------------------------------------
@@ -15,6 +15,11 @@
 .\"-------------------------------------
 .BR doveadm " [" \-Dv "] " altmove " [" \-r "] ["\-S
 .IR socket_path "] "
+.BI \-F " file search_query"
+.br
+.\"-------------------------------------
+.BR doveadm " [" \-Dv "] " altmove " [" \-r "] ["\-S
+.IR socket_path "] "
 .BI \-u " user search_query"
 .\"------------------------------------------------------------------------
 .SH DESCRIPTION
@@ -30,7 +35,11 @@
 .PP
 In the second form, the command will be performed for all users.
 .PP
-In the third form, only matching mails of the given
+In the third form, the command will be performed for all users listed in
+the given
+.IR file .
+.PP
+In the fourth form, only matching mails of the given
 .IR user (s)
 will be moved to the alternative storage.
 .\"------------------------------------------------------------------------
@@ -42,6 +51,8 @@
 .\"-------------------------------------
 @INCLUDE:option-A@
 .\"-------------------------------------
+@INCLUDE:option-F-file@
+.\"-------------------------------------
 .TP
 .B \-r
 When the
--- a/doc/man/doveadm-batch.1.in	Sat May 09 18:28:04 2015 +0300
+++ b/doc/man/doveadm-batch.1.in	Sat May 09 15:29:21 2015 +0000
@@ -1,5 +1,5 @@
 .\" Copyright (c) 2013-2015 Dovecot authors, see the included COPYING file
-.TH DOVEADM\-BATCH 1 "2014-10-19" "Dovecot v2.2" "Dovecot"
+.TH DOVEADM\-BATCH 1 "2015-05-09" "Dovecot v2.2" "Dovecot"
 .SH NAME
 doveadm\-batch \- Execute multiple commands for multiple users
 .\"------------------------------------------------------------------------
@@ -12,6 +12,12 @@
 .\"-------------------------------------
 .BR doveadm " [" \-Dv "] " batch " [" \-S
 .IR socket_path "] "
+.BI \-F " file sep command sep command"
+[...]
+.br
+.\"-------------------------------------
+.BR doveadm " [" \-Dv "] " batch " [" \-S
+.IR socket_path "] "
 .BI \-u " usermask sep command sep command"
 [...]
 .\"------------------------------------------------------------------------
@@ -34,7 +40,12 @@
 .IR command s
 for each of them.
 .PP
-In the second form the
+In the second form
+.BR doveadm (1)
+will loop over all users, listed in the given
+.IR file .
+.PP
+In the third form the
 .IR command s
 will be executed for each user matching the given
 .IR usermask .
@@ -47,6 +58,8 @@
 .\"-------------------------------------
 @INCLUDE:option-A@
 .\"-------------------------------------
+@INCLUDE:option-F-file@
+.\"-------------------------------------
 @INCLUDE:option-S-socket@
 .\"-------------------------------------
 @INCLUDE:option-u-user@
--- a/doc/man/doveadm-deduplicate.1.in	Sat May 09 18:28:04 2015 +0300
+++ b/doc/man/doveadm-deduplicate.1.in	Sat May 09 15:29:21 2015 +0000
@@ -1,12 +1,14 @@
 .\" Copyright (c) 2013-2015 Dovecot authors, see the included COPYING file
-.TH DOVEADM\-DEDUPLICATE 1 "2014-10-19" "Dovecot v2.2" "Dovecot"
+.TH DOVEADM\-DEDUPLICATE 1 "2015-05-09" "Dovecot v2.2" "Dovecot"
 .SH NAME
 doveadm\-deduplicate \- expunge duplicate messages
 .\"------------------------------------------------------------------------
 .SH SYNOPSIS
 .BR doveadm " [" \-Dv "] " deduplicate " [" \-u
 .IR user |\c
-.BR \-A "] [" \-S
+.BR \-A |\c
+.BI \-F " file" \c
+.RB "] [" \-S
 .IR socket_path "] ["\c
 .BR \-m ]
 .I search_query
@@ -31,6 +33,8 @@
 .\"-------------------------------------
 @INCLUDE:option-A@
 .\"-------------------------------------
+@INCLUDE:option-F-file@
+.\"-------------------------------------
 @INCLUDE:option-S-socket@
 .\"-------------------------------------
 .TP
--- a/doc/man/doveadm-expunge.1.in	Sat May 09 18:28:04 2015 +0300
+++ b/doc/man/doveadm-expunge.1.in	Sat May 09 15:29:21 2015 +0000
@@ -1,5 +1,5 @@
 .\" Copyright (c) 2010-2015 Dovecot authors, see the included COPYING file
-.TH DOVEADM\-EXPUNGE 1 "2014-10-19" "Dovecot v2.2" "Dovecot"
+.TH DOVEADM\-EXPUNGE 1 "2015-05-09" "Dovecot v2.2" "Dovecot"
 .SH NAME
 doveadm\-expunge \- Expunge messages matching given search query
 .\"------------------------------------------------------------------------
@@ -19,6 +19,12 @@
 .BR doveadm " [" \-Dv "] " expunge " [" \-S
 .IR socket_path ]
 .RB [ \-d ]
+.BI \-F " file search_query"
+.br
+.\"-------------------------------------
+.BR doveadm " [" \-Dv "] " expunge " [" \-S
+.IR socket_path ]
+.RB [ \-d ]
 .BI \-u " user search_query"
 .\"------------------------------------------------------------------------
 .SH DESCRIPTION
@@ -39,7 +45,13 @@
 .PP
 In the second form, the command will be performed for all users.
 .PP
-In the third form, only matching mails of the given
+In the third form,
+.BR doveadm (1)
+will expunge messages of the users listed
+in the given
+.IR file .
+.PP
+In the fourth form, only matching mails of the given
 .IR user (s)
 will be expunged.
 .\"------------------------------------------------------------------------
@@ -51,6 +63,8 @@
 .\"-------------------------------------
 @INCLUDE:option-A@
 .\"-------------------------------------
+@INCLUDE:option-F-file@
+.\"-------------------------------------
 .TP
 .B \-d
 Delete the mailbox if it is empty after expunging.
--- a/doc/man/doveadm-fetch.1.in	Sat May 09 18:28:04 2015 +0300
+++ b/doc/man/doveadm-fetch.1.in	Sat May 09 15:29:21 2015 +0000
@@ -1,5 +1,5 @@
 .\" Copyright (c) 2010-2015 Dovecot authors, see the included COPYING file
-.TH DOVEADM\-FETCH 1 "2012-02-13" "Dovecot v2.2" "Dovecot"
+.TH DOVEADM\-FETCH 1 "2015-05-09" "Dovecot v2.2" "Dovecot"
 .SH NAME
 doveadm\-fetch \- Fetch partial/full messages or message information
 .\"------------------------------------------------------------------------
@@ -21,6 +21,13 @@
 .IR formatter ]
 .BR fetch " [" \-S
 .IR socket_path "]"
+.BI \-F " file fields search_query"
+.br
+.\"-------------------------------------
+.BR doveadm " [" \-Dv "] [" \-f
+.IR formatter ]
+.BR fetch " [" \-S
+.IR socket_path "]"
 .BI \-u " user fields search_query"
 .\"------------------------------------------------------------------------
 .SH DESCRIPTION
@@ -43,6 +50,8 @@
 .\"-------------------------------------
 @INCLUDE:option-A@
 .\"-------------------------------------
+@INCLUDE:option-F-file@
+.\"-------------------------------------
 @INCLUDE:option-S-socket@
 .\"-------------------------------------
 @INCLUDE:option-u-user@
--- a/doc/man/doveadm-flags.1.in	Sat May 09 18:28:04 2015 +0300
+++ b/doc/man/doveadm-flags.1.in	Sat May 09 15:29:21 2015 +0000
@@ -1,5 +1,5 @@
 .\" Copyright (c) 2013-2015 Dovecot authors, see the included COPYING file
-.TH DOVEADM\-FLAGS 1 "2014-10-19" "Dovecot v2.2" "Dovecot"
+.TH DOVEADM\-FLAGS 1 "2015-05-09" "Dovecot v2.2" "Dovecot"
 .SH NAME
 doveadm\-flags \- add, remove or replace messages\(aq flags
 .\"------------------------------------------------------------------------
@@ -15,6 +15,11 @@
 .br
 .BR doveadm " [" \-Dv "] " flags " [" \-S
 .IR socket_path "] " "command flags search_query"
+.BI "\-F " file
+.\"-------------------------------------
+.br
+.BR doveadm " [" \-Dv "] " flags " [" \-S
+.IR socket_path "] " "command flags search_query"
 .BI "\-u " user
 .\"------------------------------------------------------------------------
 .SH DESCRIPTION
@@ -28,6 +33,8 @@
 .\"-------------------------------------
 @INCLUDE:option-A@
 .\"-------------------------------------
+@INCLUDE:option-F-file@
+.\"-------------------------------------
 @INCLUDE:option-S-socket@
 .\"-------------------------------------
 @INCLUDE:option-u-user@
@@ -57,7 +64,9 @@
 .SS flags add
 .BR "doveadm flags add" " [" \-u
 .IR user |\c
-.BR \-A "] [" \-S
+.BR \-A | \-F
+.IR file ]
+.RB [ \-S
 .IR socket_path "] " "flags search_query"
 .PP
 This command is used to extend the current set of flags with the given
@@ -66,7 +75,9 @@
 .SS flags remove
 .BR "doveadm flags remove" " [" \-u
 .IR user |\c
-.BR \-A "] [" \-S
+.BR \-A | \-F
+.IR file ]
+.RB [ \-S
 .IR socket_path "] " "flags search_query"
 .PP
 In order to remove the given
@@ -76,7 +87,9 @@
 .SS flags replace
 .BR "doveadm flags replace" " [" \-u
 .IR user |\c
-.BR \-A "] [" \-S
+.BR \-A | \-F
+.IR file ]
+.RB [ \-S
 .IR socket_path "] " "flags search_query"
 .PP
 This command is used to replace ALL current flags with the given
--- a/doc/man/doveadm-force-resync.1.in	Sat May 09 18:28:04 2015 +0300
+++ b/doc/man/doveadm-force-resync.1.in	Sat May 09 15:29:21 2015 +0000
@@ -1,5 +1,5 @@
 .\" Copyright (c) 2010-2015 Dovecot authors, see the included COPYING file
-.TH DOVEADM\-FORCE\-RESYNC 1 "2010-11-25" "Dovecot v2.2" "Dovecot"
+.TH DOVEADM\-FORCE\-RESYNC 1 "2015-05-09" "Dovecot v2.2" "Dovecot"
 .SH NAME
 doveadm\-force\-resync \- Repair broken mailboxes
 .\"------------------------------------------------------------------------
@@ -15,6 +15,11 @@
 .br
 .BR doveadm " [" \-Dv "] " force\-resync " [" \-S
 .IR socket_path "] "
+.BI "\-F" " file mailbox"
+.\"-------------------------------------
+.br
+.BR doveadm " [" \-Dv "] " force\-resync " [" \-S
+.IR socket_path "] "
 .BI \-u " user mailbox"
 .\"------------------------------------------------------------------------
 .SH DESCRIPTION
@@ -35,6 +40,8 @@
 .\"-------------------------------------
 @INCLUDE:option-A@
 .\"-------------------------------------
+@INCLUDE:option-F-file@
+.\"-------------------------------------
 @INCLUDE:option-S-socket@
 .\"-------------------------------------
 @INCLUDE:option-u-user@
--- a/doc/man/doveadm-fts.1.in	Sat May 09 18:28:04 2015 +0300
+++ b/doc/man/doveadm-fts.1.in	Sat May 09 15:29:21 2015 +0000
@@ -1,5 +1,5 @@
 .\" Copyright (c) 2014-2015 Dovecot authors, see the included COPYING file
-.TH DOVEADM\-FTS 1 "2014-09-24" "Dovecot v2.2" "Dovecot"
+.TH DOVEADM\-FTS 1 "2015-05-09" "Dovecot v2.2" "Dovecot"
 .SH NAME
 doveadm\-fts \- Manipulate the Full Text Search (FTS) index
 .\"------------------------------------------------------------------------
@@ -30,6 +30,8 @@
 .\"-------------------------------------
 @INCLUDE:option-A@
 .\"-------------------------------------
+@INCLUDE:option-F-file@
+.\"-------------------------------------
 @INCLUDE:option-S-socket@
 .\"-------------------------------------
 @INCLUDE:option-u-user@
@@ -43,7 +45,7 @@
 .SH COMMANDS
 .SS fts optimize
 .B doveadm fts optimize
-[\fB\-u\fP \fIuser\fP|\fB\-A\fP]
+[\fB\-u\fP \fIuser\fP|\fB\-A\fP|\fB\-F\fP \fIfile\fP]
 [\fB\-S\fP \fIsocket_path\fP]
 .RI [ namespace ]
 .PP
@@ -53,7 +55,7 @@
 .\"-------------------------------------
 .SS fts rescan
 .B doveadm fts rescan
-[\fB\-u\fP \fIuser\fP|\fB\-A\fP]
+[\fB\-u\fP \fIuser\fP|\fB\-A\fP|\fB\-F\fP \fIfile\fP]
 [\fB\-S\fP \fIsocket_path\fP]
 .RI [ namespace ]
 .PP
--- a/doc/man/doveadm-import.1.in	Sat May 09 18:28:04 2015 +0300
+++ b/doc/man/doveadm-import.1.in	Sat May 09 15:29:21 2015 +0000
@@ -1,5 +1,5 @@
 .\" Copyright (c) 2010-2015 Dovecot authors, see the included COPYING file
-.TH DOVEADM\-IMPORT 1 "2013-11-24" "Dovecot v2.2" "Dovecot"
+.TH DOVEADM\-IMPORT 1 "2015-05-09" "Dovecot v2.2" "Dovecot"
 .SH NAME
 doveadm\-import \- Import messages matching given search query
 .\"------------------------------------------------------------------------
@@ -19,6 +19,12 @@
 .BR doveadm " [" \-Dv "] " import " [" \-S
 .IR socket_path ]
 .RB [ \-s ]
+.BI \-F " file source_location dest_parent search_query"
+.br
+.\"-------------------------------------
+.BR doveadm " [" \-Dv "] " import " [" \-S
+.IR socket_path ]
+.RB [ \-s ]
 .BI \-u " user source_location dest_parent search_query"
 .\"------------------------------------------------------------------------
 .SH DESCRIPTION
@@ -41,7 +47,11 @@
 .PP
 In the second form, the mails will be imported for all users.
 .PP
-In the third form, the mails will be imported only for given
+In the third form, the mails will be imported for all users listed in the
+given
+.IR file .
+.PP
+In the fourth form, the mails will be imported only for given
 .IR user (s).
 .\"------------------------------------------------------------------------
 @INCLUDE:global-options@
@@ -52,6 +62,8 @@
 .\"-------------------------------------
 @INCLUDE:option-A@
 .\"-------------------------------------
+@INCLUDE:option-F-file@
+.\"-------------------------------------
 @INCLUDE:option-S-socket@
 .\"-------------------------------------
 .TP
--- a/doc/man/doveadm-index.1.in	Sat May 09 18:28:04 2015 +0300
+++ b/doc/man/doveadm-index.1.in	Sat May 09 15:29:21 2015 +0000
@@ -1,5 +1,5 @@
 .\" Copyright (c) 2010-2015 Dovecot authors, see the included COPYING file
-.TH DOVEADM\-INDEX 1 "2013-11-23" "Dovecot v2.2" "Dovecot"
+.TH DOVEADM\-INDEX 1 "2015-05-09" "Dovecot v2.2" "Dovecot"
 .SH NAME
 doveadm\-index \- Index mailboxes
 .\"------------------------------------------------------------------------
@@ -19,6 +19,13 @@
 .br
 .BR doveadm " [" \-Dv "] " index " [" \-S
 .IR socket_path "] "
+.BI \-F " file"
+.RB [ \-q "] [" \-n
+.IR max_recent "] " mailbox
+.\"-------------------------------------
+.br
+.BR doveadm " [" \-Dv "] " index " [" \-S
+.IR socket_path "] "
 .BI \-u \ user
 .RB [ \-q "] [" \-n
 .IR max_recent "] " mailbox
@@ -52,6 +59,8 @@
 .\"-------------------------------------
 @INCLUDE:option-A@
 .\"-------------------------------------
+@INCLUDE:option-F-file@
+.\"-------------------------------------
 .TP
 .BI \-n \ max_recent
 An integer value, which specifies the maximum number of \(rsRecent
--- a/doc/man/doveadm-mailbox.1.in	Sat May 09 18:28:04 2015 +0300
+++ b/doc/man/doveadm-mailbox.1.in	Sat May 09 15:29:21 2015 +0000
@@ -1,5 +1,5 @@
 .\" Copyright (c) 2010-2015 Dovecot authors, see the included COPYING file
-.TH DOVEADM\-MAILBOX 1 "2014-10-19" "Dovecot v2.2" "Dovecot"
+.TH DOVEADM\-MAILBOX 1 "2015-05-09" "Dovecot v2.2" "Dovecot"
 .SH NAME
 doveadm\-mailbox \- Commands related to handling mailboxes
 .\"------------------------------------------------------------------------
@@ -19,6 +19,8 @@
 .\"-------------------------------------
 @INCLUDE:option-A@
 .\"-------------------------------------
+@INCLUDE:option-F-file@
+.\"-------------------------------------
 @INCLUDE:option-S-socket@
 .\"-------------------------------------
 @INCLUDE:option-u-user@
@@ -39,7 +41,7 @@
 .SH COMMANDS
 .SS mailbox create
 .B doveadm mailbox create
-[\fB\-A\fP|\fB\-u\fP \fIuser\fP]
+[\fB\-A\fP|\fB\-u\fP \fIuser\fP|\fB\-F\fP \fIfile\fP]
 [\fB\-S\fP \fIsocket_path\fP]
 .RB [ \-g
 .IR guid ]
@@ -64,7 +66,7 @@
 .\"------------------------------------------------------------------------
 .SS mailbox delete
 .B doveadm mailbox delete
-[\fB\-A\fP|\fB\-u\fP \fIuser\fP]
+[\fB\-A\fP|\fB\-u\fP \fIuser\fP|\fB\-F\fP \fIfile\fP]
 [\fB\-S\fP \fIsocket_path\fP]
 .RB [ \-s ]
 .IR mailbox\  ...
@@ -79,7 +81,7 @@
 .SS mailbox list
 .B doveadm mailbox list
 .RB [ \-7 | \-8 ]
-[\fB\-A\fP|\fB\-u\fP \fIuser\fP]
+[\fB\-A\fP|\fB\-u\fP \fIuser\fP|\fB\-F\fP \fIfile\fP]
 [\fB\-S\fP \fIsocket_path\fP]
 .RB [ \-s ]
 [\fImailbox\fP ...]
@@ -134,7 +136,7 @@
 .\"------------------------------------------------------------------------
 .SS mailbox rename
 .B doveadm mailbox rename
-[\fB\-A\fP|\fB\-u\fP \fIuser\fP]
+[\fB\-A\fP|\fB\-u\fP \fIuser\fP|\fB\-F\fP \fIfile\fP]
 [\fB\-S\fP \fIsocket_path\fP]
 .RB [ \-s ]
 .I old_name
@@ -160,7 +162,7 @@
 .BR doveadm " [" \-f
 .IR formatter ]
 .B mailbox status
-[\fB\-A\fP|\fB\-u\fP \fIuser\fP]
+[\fB\-A\fP|\fB\-u\fP \fIuser\fP|\fB\-F\fP \fIfile\fP]
 [\fB\-S\fP \fIsocket_path\fP] [\fB\-t\fP]
 .IR "fields mailbox\ " ...
 .PP
@@ -242,7 +244,7 @@
 .\"------------------------------------------------------------------------
 .SS mailbox subscribe
 .B doveadm mailbox subscribe
-[\fB\-A\fP|\fB\-u\fP \fIuser\fP]
+[\fB\-A\fP|\fB\-u\fP \fIuser\fP|\fB\-F\fP \fIfile\fP]
 [\fB\-S\fP \fIsocket_path\fP]
 .IR mailbox\  ...
 .PP
@@ -250,7 +252,7 @@
 .\"------------------------------------------------------------------------
 .SS mailbox unsubscribe
 .B doveadm mailbox unsubscribe
-[\fB\-A\fP|\fB\-u\fP \fIuser\fP]
+[\fB\-A\fP|\fB\-u\fP \fIuser\fP|\fB\-F\fP \fIfile\fP]
 [\fB\-S\fP \fIsocket_path\fP]
 .IR mailbox\  ...
 .PP
--- a/doc/man/doveadm-move.1.in	Sat May 09 18:28:04 2015 +0300
+++ b/doc/man/doveadm-move.1.in	Sat May 09 15:29:21 2015 +0000
@@ -1,5 +1,5 @@
 .\" Copyright (c) 2011-2015 Dovecot authors, see the included COPYING file
-.TH DOVEADM\-MOVE 1 "2014-10-19" "Dovecot v2.2" "Dovecot"
+.TH DOVEADM\-MOVE 1 "2015-05-09" "Dovecot v2.2" "Dovecot"
 .SH NAME
 doveadm\-move \- Move messages matching the given search query into another
 mailbox
@@ -23,6 +23,13 @@
 .\"-------------------------------------
 .BR doveadm " [" \-Dv "] " move " [" \-S
 .IR socket_path "] "
+.BI \-F " file destination"
+.RB [ user
+.IR source_user "] " search_query
+.br
+.\"-------------------------------------
+.BR doveadm " [" \-Dv "] " move " [" \-S
+.IR socket_path "] "
 .BI \-u " user destination
 .RB [ user
 .IR source_user "] " search_query
@@ -43,6 +50,13 @@
 .\"-------------------------------------
 .BR doveadm " [" \-Dv "] " copy " [" \-S
 .IR socket_path "] "
+.BI \-F " file destination"
+.RB [ user
+.IR source_user "] " search_query
+.br
+.\"-------------------------------------
+.BR doveadm " [" \-Dv "] " copy " [" \-S
+.IR socket_path "] "
 .BI \-u " user destination
 .RB [ user
 .IR source_user "] " search_query
@@ -76,7 +90,16 @@
 into the user\(aqs
 .IR destination " mailbox."
 .PP
-In the third form, matching mails will be moved or copied only for given
+In the third form,
+.BR doveadm (1)
+will iterate over all users, found in the given
+.IR file ,
+and move or copy each user\(aqs messages, matching the given
+.IR search_query ,
+into the user\(aqs
+.IR destination \ mailbox.
+.PP
+In the fourth form, matching mails will be moved or copied only for given
 .IR user (s).
 .\"------------------------------------------------------------------------
 @INCLUDE:global-options@
@@ -87,6 +110,8 @@
 .\"-------------------------------------
 @INCLUDE:option-A@
 .\"-------------------------------------
+@INCLUDE:option-F-file@
+.\"-------------------------------------
 @INCLUDE:option-S-socket@
 .\"-------------------------------------
 @INCLUDE:option-u-user@
--- a/doc/man/doveadm-purge.1.in	Sat May 09 18:28:04 2015 +0300
+++ b/doc/man/doveadm-purge.1.in	Sat May 09 15:29:21 2015 +0000
@@ -1,5 +1,5 @@
 .\" Copyright (c) 2010-2015 Dovecot authors, see the included COPYING file
-.TH DOVEADM\-PURGE 1 "2010-11-25" "Dovecot v2.2" "Dovecot"
+.TH DOVEADM\-PURGE 1 "2015-05-09" "Dovecot v2.2" "Dovecot"
 .SH NAME
 doveadm\-purge \- Remove messages with refcount=0 from mdbox files
 .\"------------------------------------------------------------------------
@@ -14,6 +14,11 @@
 .\"-------------------------------------
 .br
 .BR doveadm " [" \-Dv "] " purge " [" \-S
+.IR socket_path ]
+.BI \-F\  file
+.\"-------------------------------------
+.br
+.BR doveadm " [" \-Dv "] " purge " [" \-S
 .IR socket_path "] "
 .BI \-u \ user
 .\"------------------------------------------------------------------------
@@ -32,7 +37,11 @@
 .B purge
 action for the currently logged in user.
 .PP
-In the second form, the command will be executed for all users
+In the second form, the command will be executed for all users.
+.PP
+In the third form, the command will be executed for all users listed in
+the given
+.IR file .
 .PP
 In the last form, only messages of the given
 .IR user (s)
@@ -46,6 +55,8 @@
 .\"-------------------------------------
 @INCLUDE:option-A@
 .\"-------------------------------------
+@INCLUDE:option-F-file@
+.\"-------------------------------------
 @INCLUDE:option-S-socket@
 .\"-------------------------------------
 @INCLUDE:option-u-user@
--- a/doc/man/doveadm-quota.1.in	Sat May 09 18:28:04 2015 +0300
+++ b/doc/man/doveadm-quota.1.in	Sat May 09 15:29:21 2015 +0000
@@ -1,5 +1,5 @@
 .\" Copyright (c) 2010-2015 Dovecot authors, see the included COPYING file
-.TH DOVEADM\-QUOTA 1 "2011-02-17" "Dovecot v2.2" "Dovecot"
+.TH DOVEADM\-QUOTA 1 "2015-05-09" "Dovecot v2.2" "Dovecot"
 .SH NAME
 doveadm\-quota \- Initialize/recalculate or show current quota usage
 .\"------------------------------------------------------------------------
@@ -21,6 +21,13 @@
 .IR formatter ]
 .BR quota " [" \-S
 .IR socket_path "]"
+.IB command\  \-F \ file
+.\"-------------------------------------
+.br
+.BR doveadm " [" \-Dv "] [" \-f
+.IR formatter ]
+.BR quota " [" \-S
+.IR socket_path "]"
 .IB  command\  \-u \ user
 .\"------------------------------------------------------------------------
 .SH DESCRIPTION
@@ -36,6 +43,11 @@
 .PP
 In the third form, the
 .I command
+will be performed for all users listed in the given
+.IR file .
+.PP
+In the fourth form, the
+.I command
 will affect only the matching
 .IR user (s).
 .IP Note:
@@ -57,6 +69,8 @@
 .\"-------------------------------------
 @INCLUDE:option-A@
 .\"-------------------------------------
+@INCLUDE:option-F-file@
+.\"-------------------------------------
 @INCLUDE:option-S-socket@
 .\"-------------------------------------
 @INCLUDE:option-u-user@
@@ -66,7 +80,7 @@
 .BR doveadm " [" \-f
 .IR formatter ]
 .B quota get
-[\fB\-A\fP|\fB\-u\fP \fIuser\fP]
+[\fB\-A\fP|\fB\-u\fP \fIuser\fP|\fB\-F\fP \fIfile\fP]
 .PP
 The
 .B quota get
@@ -78,7 +92,7 @@
 .\"-------------------------------------
 .SS quota recalc
 .B doveadm quota recalc
-[\fB\-A\fP|\fB\-u\fP \fIuser\fP]
+[\fB\-A\fP|\fB\-u\fP \fIuser\fP|\fB\-F\fP \fIfile\fP]
 .PP
 The
 .B quota recalc
--- a/doc/man/doveadm-search.1.in	Sat May 09 18:28:04 2015 +0300
+++ b/doc/man/doveadm-search.1.in	Sat May 09 15:29:21 2015 +0000
@@ -1,5 +1,5 @@
 .\" Copyright (c) 2010-2015 Dovecot authors, see the included COPYING file
-.TH DOVEADM\-SEARCH 1 "2014-10-19" "Dovecot v2.2" "Dovecot"
+.TH DOVEADM\-SEARCH 1 "2015-05-09" "Dovecot v2.2" "Dovecot"
 .SH NAME
 doveadm\-search \- Show a list of mailbox GUIDs and message UIDs matching \
 given search query.
@@ -22,6 +22,13 @@
 .IR formatter ]
 .BR search " [" \-S
 .IR socket_path ]
+.BI \-F " file search_query"
+.br
+.\"-------------------------------------
+.BR doveadm " [" \-Dv "] [" \-f
+.IR formatter ]
+.BR search " [" \-S
+.IR socket_path ]
 .BI \-u " user search_query"
 .\"------------------------------------------------------------------------
 .SH DESCRIPTION
@@ -51,7 +58,11 @@
 .PP
 In the second form, the command will be performed for all users.
 .PP
-In the third form, only matching mails of the given
+In the third form, the command will be performed for all users listed in
+the given
+.IR file .
+.PP
+In the fourth form, only matching mails of the given
 .IR user (s)
 will be searched.
 .\"------------------------------------------------------------------------
@@ -69,6 +80,8 @@
 .\"-------------------------------------
 @INCLUDE:option-A@
 .\"-------------------------------------
+@INCLUDE:option-F-file@
+.\"-------------------------------------
 @INCLUDE:option-S-socket@
 .\"-------------------------------------
 @INCLUDE:option-u-user@
--- a/doc/man/doveadm-sync.1.in	Sat May 09 18:28:04 2015 +0300
+++ b/doc/man/doveadm-sync.1.in	Sat May 09 15:29:21 2015 +0000
@@ -1,5 +1,5 @@
 .\" Copyright (c) 2014-2015 Dovecot authors, see the included COPYING file
-.TH DOVEADM\-SYNC 1 "2015-05-04" "Dovecot v2.2" "Dovecot"
+.TH DOVEADM\-SYNC 1 "2015-05-09" "Dovecot v2.2" "Dovecot"
 .SH NAME
 doveadm\-sync \- Dovecot\(aqs two\-way mailbox synchronization utility
 .br
@@ -7,7 +7,7 @@
 .\"------------------------------------------------------------------------
 .SH SYNOPSIS
 .BR doveadm " [" \-Dv "] " sync
-[\fB\-u\fP \fIuser\fP|\fB\-A\fP]
+[\fB\-u\fP \fIuser\fP|\fB\-A\fP|\fB\-F\fP \fIfile\fP]
 [\fB\-S\fP \fIsocket_path\fP]
 .RB [ \-1fPRU ]
 [\fB\-l\fP \fIsecs\fP]
@@ -21,7 +21,7 @@
 .\"-------------------------------------
 .PP
 .BR doveadm " [" \-Dv "] " backup
-[\fB\-u\fP \fIuser\fP|\fB\-A\fP]
+[\fB\-u\fP \fIuser\fP|\fB\-A\fP|\fB\-F\fP \fIfile\fP]
 [\fB\-S\fP \fIsocket_path\fP]
 .RB [ \-fPRU ]
 [\fB\-l\fP \fIsecs\fP]
@@ -150,6 +150,8 @@
 .\"-------------------------------------
 @INCLUDE:option-A@
 .\"-------------------------------------
+@INCLUDE:option-F-file@
+.\"-------------------------------------
 .TP
 .B \-N
 Synchronize all the available namespaces.
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/doc/man/option-F-file.inc	Sat May 09 15:29:21 2015 +0000
@@ -0,0 +1,15 @@
+.TP
+.BI \-F\  file
+Execute the
+.I command
+for all the users in the
+.IR file .
+This is similar to the
+.B \-A
+option,
+but instead of getting the list of users from the userdb,
+they are read from the given
+.IR file .
+The
+.I file
+contains one username per line.
--- a/doc/man/option-u-user.inc	Sat May 09 18:28:04 2015 +0300
+++ b/doc/man/option-u-user.inc	Sat May 09 15:29:21 2015 +0000
@@ -12,7 +12,9 @@
 .br
 When neither the
 .B \-A
-option nor
+option, nor the
+.BI \-F\  file
+option, nor the
 .BI \-u\  user
 was specified, the
 .I command
--- a/doc/man/sed.sh	Sat May 09 18:28:04 2015 +0300
+++ b/doc/man/sed.sh	Sat May 09 15:29:21 2015 +0000
@@ -17,6 +17,10 @@
 		r ${SRCDIR}/option-A.inc
 		d
 	}" \
+	-e "/^@INCLUDE:option-F-file@$/{
+		r ${SRCDIR}/option-F-file.inc
+		d
+	}" \
 	-e "/^@INCLUDE:option-S-socket@$/{
 		r ${SRCDIR}/option-S-socket.inc
 		d