From: Karl Hasselström Date: Sat, 11 Nov 2006 23:31:06 GMT Subject: [PATCH 2/3] Don't mention deprecated template variables Message-ID: <20061111233106.17760.23118.stgit@localhost> In-Reply-To: <20061111232322.17760.26214.stgit@localhost> From: Karl Hasselström %(endofheaders)s and %(date)s are deprecated and expand to the empty string, so don't mention them in the help text. Signed-off-by: Karl Hasselström --- stgit/commands/mail.py | 13 ++++--------- 1 files changed, 4 insertions(+), 9 deletions(-) diff --git a/stgit/commands/mail.py b/stgit/commands/mail.py index 78abfa4..d4fc293 100644 --- a/stgit/commands/mail.py +++ b/stgit/commands/mail.py @@ -52,19 +52,14 @@ SMTP authentication is also possible wit '--smtp-password' options, also available as configuration settings: 'smtpuser' and 'smtppassword'. -The template e-mail headers and body must be separated by -'%(endofheaders)s' variable, which is replaced by StGIT with -additional headers and a blank line. The patch e-mail template accepts -the following variables: +The patch e-mail template accepts the following variables: %(patch)s - patch name %(maintainer)s - 'authname ' as read from the config file %(shortdescr)s - the first line of the patch description %(longdescr)s - the rest of the patch description, after the first line - %(endofheaders)s - delimiter between e-mail headers and body %(diff)s - unified diff of the patch %(diffstat)s - diff statistics - %(date)s - current date/time %(version)s - ' version' string passed on the command line (or empty) %(prefix)s - 'prefix ' string passed on the command line %(patchnr)s - patch number @@ -76,9 +71,9 @@ the following variables: %(commname)s - committer's name %(commemail)s - committer's e-mail -For the preamble e-mail template, only the %(maintainer)s, %(date)s, -%(endofheaders)s, %(version)s, %(patchnr)s, %(totalnr)s and %(number)s -variables are supported.""" +For the preamble e-mail template, only the %(maintainer)s, +%(version)s, %(patchnr)s, %(totalnr)s and %(number)s variables are +supported.""" options = [make_option('-a', '--all',