Skip to content

Commit

Permalink
Merge branch 'main' into doveadm-stats
Browse files Browse the repository at this point in the history
  • Loading branch information
sirainen authored Jan 13, 2025
2 parents 04170bd + 19099b0 commit 01e6491
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 6 deletions.
2 changes: 1 addition & 1 deletion data/doveadm.js
Original file line number Diff line number Diff line change
Expand Up @@ -2266,7 +2266,7 @@ returned.`,
//example: `testuser001`,
positional: true,
type: doveadm_arg_types.ARRAY,
text: `UID mask.`,
text: `UID -or- IP Address mask.`,
},
},
man: 'doveadm-who',
Expand Down
16 changes: 12 additions & 4 deletions docs/core/man/doveadm-save.1.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,22 @@ quota is enforced.
: Store mail to specified mailbox instead of INBOX.

**-U** *uid*
: Save the mail using the given UID, if possible.
: Save the mail using the given UID, if possible.

**-g** *guid*
: Save the mail using the given GUID.
: Save the mail using the given GUID.

**-r** *received-date*
: Save the mail using the given received-date timestamp. This is in the
"human timestamp" format as described by [[man,doveadm-search-query,,7]].
: Save the mail using the given received-date timestamp. This is in the
"human timestamp" format as described by [[man,doveadm-search-query,,7]].

## ARGUMENTS

*mail-file*
: The message data to save.

- If *mail-file* is `-`, the message is read from stdin (default).
- Otherwise, *mail-file* resolves as a file path.

## EXAMPLE

Expand Down
2 changes: 1 addition & 1 deletion docs/core/man/doveadm-who.1.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ This command uses by default the output formatter **table**.
setting was overridden in */etc/dovecot/dovecot.conf*.

**-f** *passdb_field*
: Alternative username field to use for kicking, as returned by passdb.
: Alternative username field to use for querying, as returned by passdb.
Only the passdb fields beginning with the *user_* prefix are
tracked.

Expand Down

0 comments on commit 01e6491

Please sign in to comment.