From: David Levine <levinedl@acm.org>
Date: Mon, 26 Sep 2016 12:58:55 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin' into smtputf8
X-Git-Url: https://diplodocus.org/git/nmh/commitdiff_plain/ef02b5cfad61304c9745f112a9a5b76f12b6c1ed?hp=aaf014c77a4fb19bdc33370f5b6af5b8497decf8

Merge remote-tracking branch 'origin' into smtputf8
---

diff --git a/Makefile.am b/Makefile.am
index cb1c39fb..33c7e2ca 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -248,7 +248,7 @@ dist_docs_contrib_DATA = docs/contrib/replaliases
 ##
 ## Our man pages
 ##
-man_MANS = man/ali.1 man/anno.1 man/ap.8 man/burst.1 man/comp.1 \
+man_MANS = man/MH.7 man/ali.1 man/anno.1 man/ap.8 man/burst.1 man/comp.1 \
 	   man/dist.1 man/dp.8 man/flist.1 man/flists.1 \
 	   man/fmtdump.8 man/fmttest.1 man/fnext.1 man/folder.1 man/folders.1 \
 	   man/forw.1 man/fprev.1 man/inc.1 man/install-mh.1 man/mark.1 \
@@ -267,8 +267,8 @@ man_MANS = man/ali.1 man/anno.1 man/ap.8 man/burst.1 man/comp.1 \
 ##
 ## Sources for our man pages
 ##
-man_SRCS = man/ali.man man/anno.man man/ap.man man/burst.man man/comp.man \
-	   man/dist.man man/dp.man man/flist.man \
+man_SRCS = man/MH.man man/ali.man man/anno.man man/ap.man man/burst.man  \
+	   man/comp.man man/dist.man man/dp.man man/flist.man \
 	   man/flists.man man/fmtdump.man man/fmttest.man man/fnext.man \
 	   man/folder.man man/folders.man man/forw.man man/fprev.man \
 	   man/inc.man man/install-mh.man man/mark.man man/mh-alias.man \
diff --git a/man/MH.man b/man/MH.man
new file mode 100644
index 00000000..108c3784
--- /dev/null
+++ b/man/MH.man
@@ -0,0 +1 @@
+.so man7/nmh.7
diff --git a/man/mh-mime.man b/man/mh-mime.man
index 7a4bc813..6a3c06be 100644
--- a/man/mh-mime.man
+++ b/man/mh-mime.man
@@ -1,4 +1,4 @@
-.TH MH\-MIME %manext7% "December 14, 2014" "%nmhversion%"
+.TH MH\-MIME %manext7% "September 25, 2016" "%nmhversion%"
 .\"
 .\" %nmhwarning%
 .\"
@@ -176,8 +176,10 @@ boundary indicators and invalid Content-Transfer-Encoding values.
 .IR nmh (7),
 .IR repl (1),
 .IR whatnow (1),
-.PP
-.I %docdir%/contrib/replyfilter
+.br
+.IR %docdir%/contrib/replyfilter ,
+.br
+.I %docdir%/contrib/replaliases
 .SH BUGS
 MIME support should be more integrated into all of the
 .B nmh