From 92bf89c3389b8e08cf99d30cf20a818529680f51 Mon Sep 17 00:00:00 2001 From: Robin Jarry Date: Wed, 19 Jan 2022 20:57:48 +0100 Subject: docs: mention missing -T options for compose and forward A template file may be specified for compose and forward as well. Signed-off-by: Robin Jarry --- commands/account/compose.go | 2 +- config/aerc.conf.in | 4 ++-- doc/aerc-config.5.scd | 4 ++-- doc/aerc.1.scd | 18 +++++++++++++++--- 4 files changed, 20 insertions(+), 8 deletions(-) diff --git a/commands/account/compose.go b/commands/account/compose.go index f48fa69..62bf11d 100644 --- a/commands/account/compose.go +++ b/commands/account/compose.go @@ -72,7 +72,7 @@ func buildBody(args []string) (string, string, error) { } posargs := args[optind:] if len(posargs) > 1 { - return "", template, errors.New("Usage: compose [-H] [body]") + return "", template, errors.New("Usage: compose [-H header] [-T template] [body]") } if len(posargs) == 1 { body = posargs[0] diff --git a/config/aerc.conf.in b/config/aerc.conf.in index 1f5c87d..4decaef 100644 --- a/config/aerc.conf.in +++ b/config/aerc.conf.in @@ -224,12 +224,12 @@ new-email= # default: @SHAREDIR@/templates/ template-dirs=@SHAREDIR@/templates/ -# The template to be used for quoted replies. +# The default template to be used for quoted replies. # # default: quoted_reply quoted-reply=quoted_reply -# The template to be used for forward as body. +# The default template to be used for forward as body. # # default: forward_as_body forwards=forward_as_body diff --git a/doc/aerc-config.5.scd b/doc/aerc-config.5.scd index 2ef4ebc..067ad91 100644 --- a/doc/aerc-config.5.scd +++ b/doc/aerc-config.5.scd @@ -383,12 +383,12 @@ These options are configured in the *[templates]* section of aerc.conf. Default: "/usr/share/aerc/templates" *quoted-reply* - The template to be used for quoted replies. + The default template to be used for quoted replies. Default: "quoted_reply" *forwards* - The template to be used for forward as body. + The default template to be used for forward as body. Default: "forward_as_body" diff --git a/doc/aerc.1.scd b/doc/aerc.1.scd index aa96637..bf870ea 100644 --- a/doc/aerc.1.scd +++ b/doc/aerc.1.scd @@ -126,11 +126,17 @@ message list, the message in the message viewer, etc). directory. The original message will be deleted only if it is in the postpone directory. -*forward* [-A] [address...] +*forward* [-A] [-T ] [address...] Opens the composer to forward the selected message to another recipient. *-A*: Forward the message as an RFC 2822 attachment. + *-T* + Use the specified template file for creating the initial + message body. Unless *-A* is specified, this defaults to what + is set as _forwards_ in the _[templates]_ section of + _aerc.conf_. + *move* Moves the selected message to the target folder. @@ -153,7 +159,10 @@ message list, the message in the message viewer, etc). *-q*: Insert a quoted version of the selected message into the reply editor - *-T*: Use the specified template file for creating the initial message body + *-T* + Use the specified template file for creating the initial + message body. If *-q* is specified, defaults to what is set as + _quoted-reply_ in the _[templates]_ section of _aerc.conf_. *read* [-t] Marks the marked or selected messages as read. @@ -210,7 +219,7 @@ message list, the message in the message viewer, etc). *cf* Change the folder shown in the message list. -*compose* [-H] [] +*compose* [-H] [] [-T ] Open the compose window to send a new email. The new email will be sent with the current account's outgoing transport configuration. For details on configuring outgoing mail delivery consult *aerc-config*(5). @@ -218,6 +227,9 @@ message list, the message in the message viewer, etc). *-H*

Add the specified header to the message, e.g. 'compose -H "X-Custom: custom value"' + *-T* + Use the specified template file for creating the initial + message body. *filter* [options] Similar to *search*, but filters the displayed messages to only the search -- cgit v1.2.3