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=-c

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

ef02b5cfad61304c9745f112a9a5b76f12b6c1ed
diff --combined Makefile.am
index cb1c39fb,42f18966..33c7e2ca
--- a/Makefile.am
+++ b/Makefile.am
@@@ -94,8 -94,7 +94,8 @@@ TESTS = test/ali/test-ali test/anno/tes
  	test/post/test-post-dcc test/post/test-post-fcc \
  	test/post/test-post-multifrom test/post/test-post-envelope \
  	test/post/test-post-group test/post/test-mts test/post/test-messageid \
 -	test/post/test-sendfiles test/prompter/test-prompter \
 +	test/post/test-rfc6531 test/post/test-sendfiles \
 +	test/prompter/test-prompter \
  	test/rcv/test-rcvdist test/rcv/test-rcvpack test/rcv/test-rcvstore \
  	test/rcv/test-rcvtty test/refile/test-refile test/repl/test-convert \
  	test/repl/test-if-str test/repl/test-trailing-newline \
@@@ -248,7 -247,7 +248,7 @@@ dist_docs_contrib_DATA = docs/contrib/r
  ##
  ## 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 -266,8 +267,8 @@@
  ##
  ## 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 \