X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/13ae67e6d208deea2382c2901488d8a7f278ee23..7711f3fc00259e55f630cfe6104eff3083dc9d77:/man/mh-format.man

diff --git a/man/mh-format.man b/man/mh-format.man
index 82128e80..4b58b3ff 100644
--- a/man/mh-format.man
+++ b/man/mh-format.man
@@ -1,4 +1,4 @@
-.TH MH-FORMAT %manext5% "November 4, 2012" "%nmhversion%"
+.TH MH-FORMAT %manext5% "January 10, 2015" "%nmhversion%"
 .\"
 .\" %nmhwarning%
 .\"
@@ -45,7 +45,8 @@ A format string consists of ordinary text, and special multi-character
 escape sequences which begin with `%'.  When specifying a format
 string, the usual C backslash characters are honored: `\\b', `\\f',
 `\\n', `\\r', and `\\t'.  Continuation lines in format files end with
-`\\' followed by the newline character.
+`\\' followed by the newline character. A literal `%' can be inserted into
+a format file by using the sequence `%%'.
 .\" TALK ABOUT SYNTAX FIRST, THEN SEMANTICS
 .SS SYNTAX
 Format strings are built around
@@ -267,6 +268,7 @@ match	literal	boolean	\fIstr\fR contains \fIarg\fR
 amatch	literal	boolean	\fIstr\fR starts with \fIarg\fR
 plus	literal	integer	\fIarg\fR plus \fInum\fR
 minus	literal	integer	\fIarg\fR minus \fInum\fR
+multiply	literal	integer	\fInum\fR multiplied by \fIarg\fR
 divide	literal	integer	\fInum\fR divided by \fIarg\fR
 modulo	literal	integer	\fInum\fR modulo \fIarg\fR
 num	literal	integer	Set \fInum\fR to \fIarg\fR.
@@ -291,6 +293,9 @@ decode	expr	string	decode \fIstr\fR as RFC 2047 (MIME-encoded)
 unquote	expr	string	remove RFC 2822 quotes from \fIstr\fR
 trim	expr		trim trailing whitespace from \fIstr\fR
 kilo	expr	string	express in SI units: 15.9K, 2.3M, etc.
+			%(kilo) scales by factors of 1000,
+kibi	expr	string	express in IEC units: 15.5Ki, 2.2Mi.
+			%(kibi) scales by factors of 1024.
 putstr	expr		print \fIstr\fR
 putstrf	expr		print \fIstr\fR in a fixed width
 putnum	expr		print \fInum\fR
@@ -362,7 +367,7 @@ mon	date	integer	month of the year
 month	date	string	month of the year (abbrev.)
 lmonth	date	string	month of the year
 year	date	integer	year (may be > 100)
-zone	date	integer	timezone in hours
+zone	date	integer	timezone in minutes
 tzone	date	string	timezone string
 szone	date	integer	timezone explicit?
 			(1=explicit,0=implicit,\-1=unknown)
@@ -391,7 +396,11 @@ addr	addr	string	mbox@host or host!mbox rendering*
 pers	addr	string	the personal name*
 note	addr	string	commentary text*
 mbox	addr	string	the local mailbox*
-mymbox	addr	integer	List has the user's address? (0 or 1)
+mymbox	addr	integer	list has the user's address? (0 or 1)
+getmymbox	addr	string	the user's (first) address,
+			with personal name
+getmyaddr	addr	string	the user's (first) address,
+			without personal name
 host	addr	string	the host domain*
 nohost	addr	integer	no host was present (0 or 1)*
 type	addr	integer	host type* (0=local,1=network,