X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/8e0f9bd3daae9d05dec58026d5a5924367e4e874..9f8418e870a70c264eda1598f2d470e5428c216d:/man/mhbuild.man

diff --git a/man/mhbuild.man b/man/mhbuild.man
index 3d2fbbaf..1ff55303 100644
--- a/man/mhbuild.man
+++ b/man/mhbuild.man
@@ -1,4 +1,4 @@
-.TH MHBUILD %manext1% "December 14, 2014" "%nmhversion%"
+.TH MHBUILD %manext1% "October 15, 2016" "%nmhversion%"
 .\"
 .\" %nmhwarning%
 .\"
@@ -8,6 +8,8 @@ mhbuild \- translate MIME composition draft
 .na
 .HP 5
 .B mhbuild
+.RB [ \-help ]
+.RB [ \-version ]
 .I file
 .RB [ \-auto " | " \-noauto ]
 .RB [ \-list " | " \-nolist ]
@@ -25,8 +27,6 @@ mhbuild \- translate MIME composition draft
 .RB [ \-maxunencoded
 .IR line\-length ]
 .RB [ \-dist ]
-.RB [ \-version ]
-.RB [ \-help ]
 .ad
 .SH DESCRIPTION
 The
@@ -194,6 +194,7 @@ entry, e.g.,
 excludes parts of that
 .I TYPE
 from the draft.
+.PP
 The
 .I mhn.defaults
 file
@@ -204,7 +205,9 @@ and
 entries.
 Profile entries can be used to override corresponding
 .I mhn.defaults
-entries, as usual.
+entries, as usual.  Text converters should limit text line lengths
+to a maximum of 78 characters, and must limit them to a maximum of 998
+characters, per RFC 5322 Sec.\& 2.1.1.
 .PP
 For each
 .I TYPE
@@ -214,14 +217,13 @@ part in
 runs
 .I CONVERTER ARGSTRING
 on the content of the part.
-.PP
 Each part in
 .I FILE
 that has no corresponding TYPE entry in the profile or
 .I mhn.defaults
 is
 excluded from the draft; the user can include them using mhbuild
-directives as usual.
+directives.
 .PP
 .B repl
 inserts
@@ -765,14 +767,19 @@ switch will indicate which algorithm to use when encoding any message headers
 that contain 8\-bit characters.
 The valid arguments are
 .I base64
-for based\-64 encoding and
+for base\-64 encoding,
 .I quoted
-for quoted\-printable encoding.
+for quoted\-printable encoding, and
+.I utf\-8
+which requires that all 8\-bit header field bodies be encoded as UTF\-8
+(RFC 6530) and that the message be sent to a SMTP server that supports
+SMTPUTF8 (RFC 6531).
 The
 .B \-autoheaderencoding
-switch will instruct
+switch instructs
 .B mhbuild
-to automatically pick the algorithm that results in a shorter encoded string.
+to automatically pick the encoding, either base64 or quoted\-printable,
+that results in a shorter encoded string.
 .PP
 Putting this all together,
 here is an example of a more complicated message draft.
@@ -826,7 +833,7 @@ the
 switch, then
 .B mhbuild
 will encode each content with
-a transfer encoding, even it the content contains only 7\-bit data.
+a transfer encoding, even if the content contains only 7\-bit data.
 This
 is to increase the likelihood that the content is not changed while in
 transport.
@@ -1038,25 +1045,34 @@ Template for composing contents.
 .IR mhstore (1)
 .PP
 .I "Multipurpose Internet Mail Extensions (MIME) Part One: Format of Internet Message Bodies"
-(RFC 2045),
+(RFC 2045)
 .PP
 .I "Multipurpose Internet Mail Extensions (MIME) Part Two: Media Types"
-(RFC 2046),
+(RFC 2046)
 .PP
 .I "Multipurpose Internet Mail Extensions (MIME) Part Three: Message Header Extensions for Non-ASCII Text"
-(RFC 2047),
+(RFC 2047)
+.PP
+.I "Internet Message Format"
+(RFC 5322)
 .PP
 .I "MIME Parameter Value and Encoded Word Extensions: Character Sets, Languages, and Continuations"
 (RFC 2231)
 .PP
 .I "Proposed Standard for Message Encapsulation"
-(RFC 934),
+(RFC 934)
 .PP
 .I "The Content-MD5 Header Field"
-(RFC 1864),
+(RFC 1864)
 .PP
 .I "Definition of the URL MIME External-Body Access-Type"
-(RFC 2017),
+(RFC 2017)
+.PP
+.I "Overview and Framework for Internationalized Email"
+(RFC 6530)
+.PP
+.I "SMTP Extension for Internationalized Email"
+(RFC 6531)
 .SH DEFAULTS
 .nf
 \-autoheaderencoding