[Nmh-commits] [SCM] The nmh Mail Handling System branch, master, updated. ef85387bf79a9922c51ad4a279bd3acad4c3c9ab

[David Levine]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The nmh Mail Handling System".

The branch, master has been updated
       via  ef85387bf79a9922c51ad4a279bd3acad4c3c9ab (commit)
       via  7cc0e9952d85f30d1d8ce85cc7a9eb0a5e52e202 (commit)
      from  67c56bad23525bd3d5f4d155b4f602a4183c6170 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/nmh.git/commit/?id=ef85387bf79a9922c51ad4a279bd3acad4c3c9ab


commit ef85387bf79a9922c51ad4a279bd3acad4c3c9ab
Merge: 7cc0e99 67c56ba
Author: David Levine <address@hidden>
Date:   Fri Mar 16 22:11:09 2012 -0500

    Merge branch 'master' of git.sv.nongnu.org:/srv/git/nmh
    
    Conflicts:
        Makefile.am


http://git.savannah.gnu.org/cgit/nmh.git/commit/?id=7cc0e9952d85f30d1d8ce85cc7a9eb0a5e52e202


commit 7cc0e9952d85f30d1d8ce85cc7a9eb0a5e52e202
Author: David Levine <address@hidden>
Date:   Fri Mar 16 21:07:52 2012 -0500

    Automated generation of mh-chart.man.

diff --git a/.gitignore b/.gitignore
index 9031616..c880284 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,6 +42,7 @@ a.out.DSYM/
 /etc/sendfiles
 /man/*.[158]
 /man/man.sed
+/man/mh-chart.man
 /mts/libmts.a
 /sbr/*.a
 /sbr/sigmsg.h
diff --git a/Makefile.am b/Makefile.am
index a6ddbfe..2dbab2f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -75,7 +75,7 @@ check_PROGRAMS = test/getfullname test/getfqdn test/fakesmtp
 ## Stuff that should be cleaned via "make clean"
 ##
 CLEANFILES = config/version.c sbr/sigmsg.h etc/mts.conf etc/sendfiles \
-            etc/mhn.defaults man/man.sed $(man_MANS)
+            etc/mhn.defaults man/man.sed man/mh-chart.man $(man_MANS)
 clean-local:
        @rm -rf RPM a.out.DSYM uip/a.out.DSYM
        @rm -rf test/testdir
@@ -198,21 +198,22 @@ EXTRA_DIST = config/version.sh sbr/sigmsg.awk 
etc/mts.conf.in etc/sendfiles.in \
             man/conflict.man man/dist.man man/dp.man man/flist.man \
             man/flists.man man/fmtdump.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 man/mh-chart.man \
-            man/mh-draft.man man/mh-format.man man/mh-mail.man \
-            man/mh-profile.man man/mh-sequence.man man/mh-tailor.man \
-            man/mhbuild.man man/mhl.man man/mhlist.man man/mhmail.man \
-            man/mhn.man man/mhparam.man man/mhpath.man man/mhshow.man \
-            man/mhstore.man man/msgchk.man man/msh.man man/mts.conf.man \
-            man/new.man man/next.man man/nmh.man man/packf.man man/pick.man \
-            man/post.man man/prev.man man/prompter.man man/rcvdist.man \
-            man/rcvpack.man man/rcvstore.man man/rcvtty.man man/refile.man \
-            man/repl.man man/rmf.man man/rmm.man man/scan.man man/send.man \
+            man/install-mh.man man/mark.man man/mh-alias.man \
+            man/mh-chart-gen.sh man/mh-draft.man man/mh-format.man \
+            man/mh-mail.man man/mh-profile.man man/mh-sequence.man \
+            man/mh-tailor.man man/mhbuild.man man/mhl.man man/mhlist.man \
+            man/mhmail.man man/mhn.man man/mhparam.man man/mhpath.man \
+            man/mhshow.man man/mhstore.man man/msgchk.man man/msh.man \
+            man/mts.conf.man man/new.man man/next.man man/nmh.man \
+            man/packf.man man/pick.man man/post.man man/prev.man \
+            man/prompter.man man/rcvdist.man man/rcvpack.man \
+            man/rcvstore.man man/rcvtty.man man/refile.man man/repl.man \
+            man/rmf.man man/rmm.man man/scan.man man/send.man \
             man/sendfiles.man man/show.man man/slocal.man man/sortm.man \
-            man/unseen.man man/whatnow.man man/whom.man test/README $(TESTS) \
-            test/inc/deb359167.mbox test/inc/fromline.txt \
-            test/inc/msgheader.txt test/inc/filler.txt test/inc/md5sums \
-            test/post/test-post-common.sh
+            man/unseen.man man/whatnow.man man/whom.man \
+            test/README $(TESTS) test/inc/deb359167.mbox \
+            test/inc/fromline.txt test/inc/msgheader.txt test/inc/filler.txt \
+            test/inc/md5sums test/post/test-post-common.sh
 
 ##
 ## These are all of the definitions for each of the programs listed above.
@@ -520,6 +521,9 @@ man/man.sed: Makefile
        @echo '/%mhl_reply%/r $(top_srcdir)/etc/mhl.reply' >> $@
        @echo ' s,%mhl_reply%,,g' >> $@
 
+man/mh-chart.man:
+       @$(srcdir)/man/mh-chart-gen.sh > $@
+
 .man.$(manext1):
        @$(SED) -f man/man.sed $< > $@
 
diff --git a/man/mh-chart-gen.sh b/man/mh-chart-gen.sh
new file mode 100755
index 0000000..33e2a4c
--- /dev/null
+++ b/man/mh-chart-gen.sh
@@ -0,0 +1,36 @@
+#! /bin/sh
+#
+# Generates mh-chart.man from other .man files that have a
+# SYNOPSIS section.
+
+nmhmandir=`dirname $0`
+
+cat <<'EOF'
+.\"
+.\" %nmhwarning%
+.\"
+.TH MH-CHART %manext1% "%nmhdate%" MH.6.8 [%nmhversion%]
+.SH NAME
+mh-chart \- Chart of nmh Commands
+.SH SYNOPSIS
+.na
+EOF
+
+for i in $nmhmandir/*.man; do
+  if ! echo $i | grep 'mh-chart.man' >/dev/null; then
+    if grep '^\.ad' "$i" >/dev/null; then
+      #### Extract lines from just after .SH SYNOPSIS to just before .ad.
+      #### Filter out the "typical usage:" section in pick.man.
+      awk '/.SH SYNOPSIS/,/^(\.ad|typical usage:)/' "$i" | \
+        grep -Ev '^(\.SH SYNOPSIS|\.na|\.ad|typical usage:)'
+      echo
+    fi
+  fi
+done
+
+cat <<'EOF'
+.ad
+
+.SH "SEE ALSO"
+nmh(1)
+EOF
diff --git a/man/mh-chart.man b/man/mh-chart.man
deleted file mode 100644
index 8e74e09..0000000
--- a/man/mh-chart.man
+++ /dev/null
@@ -1,976 +0,0 @@
-.\"
-.\" %nmhwarning%
-.\"
-.TH MH-CHART %manext1% "%nmhdate%" MH.6.8 [%nmhversion%]
-.SH NAME
-mh-chart \- Chart of nmh Commands
-.SH SYNOPSIS
-.na
-.HP 5
-.B ali
-.RB [ \-alias
-.IR aliasfile ]
-.RB [ \-list " | " \-nolist ]
-.RB [ \-normalize " | " \-nonormalize ]
-.RB [ \-user " | " \-nouser ]
-.RB [ \-version ]
-.RB [ \-help ] 
-.RI [ aliases " ...]"
-
-.HP 5
-.B anno
-.RI [ +folder ]
-.RI [ msgs ]
-.RB [ \-component
-.IR field ]
-.RB [ \-inplace " | " \-noinplace ]
-.RB [ \-date " | " \-nodate ]
-.RB [ \-draft ]
-.RB [ \-append ]
-.RB [ \-list ]
-.RB [ \-delete ]
-.RB [ \-number
-.IR [ num|all ]]
-.RB [ \-preserve " | " \-nopreserve ]
-.RB [ \-version ]
-.RB [ \-help ]
-.RB [ \-text
-.IR body ]
-
-.HP 5
-.B %libdir%/ap
-.RB [ \-form
-.IR formatfile ]
-.RB [ \-format
-.IR string ]
-.RB [ \-normalize " | " \-nonormalize ]
-.RB [ \-width
-.IR columns ]
-.RB [ \-version ]
-.RB [ \-help ] 
-.I addrs
-\&...
-
-.HP 5
-.B burst
-.RI [ +folder ]
-.RI [ msgs ]
-.RB [ \-inplace " | " \-noinplace ]
-.RB [ \-quiet " | " \-noquiet ]
-.RB [ \-verbose " | " \-noverbose ]
-.RB [ \-version ]
-.RB [ \-help ]
-
-.HP 5
-.B comp 
-.RI [ +folder ]
-.RI [ msgs ]
-.RB [ \-form
-.IR formfile ]
-.RB [ \-use " | " \-nouse ]
-.RB [ \-file
-.IR file ]
-.RB [ \-draftfolder
-.IR +folder ]
-.RB [ \-draftmessage
-.IR msg ]
-.RB [ \-nodraftfolder ]
-.RB [ \-editor
-.IR editor ]
-.RB [ \-noedit ]
-.RB [ \-width
-.IR columns ]
-.RB [ \-from
-.IR address ]
-.RB [ \-to
-.IR address ]
-.RB [ \-cc
-.IR address ]
-.RB [ \-fcc
-.IR +folder ]
-.RB [ \-subject
-.IR text ]
-.RB [ \-whatnowproc
-.IR program ]
-.RB [ \-nowhatnowproc ]
-.RB [ \-version ]
-.RB [ \-help ]
-
-.HP 5
-.B %libdir%/conflict
-.RB [ \-search
-.IR directory ]
-.RB [ \-mail
-.IR name ]
-.RB [ \-version ]
-.RB [ \-help ] 
-.RI [ aliasfiles
-\&...]
-
-.HP 5
-.B dist
-.RI [ +folder ]
-.RI [ msgs ]
-.RB [ \-form
-.IR formfile ]
-.RB [ \-annotate " | " \-noannotate ] 
-.RB [ \-inplace " | " \-noinplace ] 
-.RB [ \-draftfolder
-.IR +folder ]
-.RB [ \-draftmessage
-.IR msg ]
-.RB [ \-nodraftfolder ]
-.RB [ \-editor
-.IR editor ]
-.RB [ \-noedit ]
-.RB [ \-width
-.IR columns ]
-.RB [ \-from
-.IR address ]
-.RB [ \-to
-.IR address ]
-.RB [ \-cc
-.IR address ]
-.RB [ \-fcc
-.IR +folder ]
-.RB [ \-whatnowproc
-.IR program ]
-.RB [ \-nowhatnowproc ]
-.RB [ \-atfile ]
-.RB [ \-noatfile ]
-.RB [ \-version ]
-.RB [ \-help ]
-
-.HP 5
-.B %libdir%/dp
-.RB [ \-form
-.IR formatfile ]
-.RB [ \-format
-.IR string ]
-.RB [ \-width
-.IR columns ]
-.RB [ \-version ]
-.RB [ \-help ] 
-.I dates
-\&...
-
-.HP 5
-.B flist
-.RI [ +folder1
-.RI [ +folder2
-\&...]]
-.RB [ \-sequence
-.I name1
-.RB [ \-sequence
-.I name2
-\&...]]
-.RB [ \-all " | " \-noall ]
-.RB [ \-showzero " | " \-noshowzero ]
-.RB [ \-recurse " | " \-norecurse ]
-.RB [ \-fast " | " \-nofast ]
-.RB [ \-alpha " | " \-noalpha ]
-.RB [ \-version ]
-.RB [ \-help ]
-.PP
-.HP 5
-.B flists
-is equivalent to
-.B flist
-.B \-all
-
-.HP 5
-.B %libdir%/fmtdump
-.RB [ \-form
-.IR formatfile ]
-.RB [ \-format
-.IR string ]
-.RB [ \-version ]
-.RB [ \-help ] 
-
-.HP 5
-.B folder
-.RI [ +folder ]
-.RI [ msg ]
-.RB [ \-all " | " \-noall ]
-.RB [ \-create " | " \-nocreate ]
-.RB [ \-fast " | " \-nofast ]
-.RB [ \-header " | " \-noheader ]
-.RB [ \-recurse " | " \-norecurse ]
-.RB [ \-total " | " \-nototal ]
-.RB [ \-list " | " \-nolist ]
-.RB [ \-push " | " \-pop ]
-.RB [ \-pack " | " \-nopack ]
-.RB [ \-print ]
-.RB [ \-verbose " | " \-noverbose ]
-.RB [ \-version ]
-.RB [ \-help ]
-.PP
-.HP 5
-.B folders
-is equivalent to
-.B folder
-.B \-all
-
-.HP 5
-.B forw
-.RI [ +folder ]
-.RI [ msgs ]
-.RB [ \-annotate " | " \-noannotate ] 
-.RB [ \-form
-.IR formfile ]
-.RB [ \-format " | " \-noformat ]
-.RB [ \-filter
-.IR filterfile ]
-.RB [ \-inplace " | " \-noinplace ]
-.RB [ \-mime " | " \-nomime ]
-.RB [ \-draftfolder
-.IR +folder ]
-.RB [ \-draftmessage
-.IR msg ]
-.RB [ \-nodraftfolder ]
-.RB [ \-editor
-.IR editor ]
-.RB [ \-noedit ]
-.RB [ \-width
-.IR colums ]
-.RB [ \-from
-.IR address ]
-.RB [ \-to
-.IR address ]
-.RB [ \-cc
-.IR address ]
-.RB [ \-fcc
-.IR +folder ]
-.RB [ \-subject
-.IR text ]
-.RB [ \-whatnowproc
-.IR program ]
-.RB [ \-nowhatnowproc ]
-.RB [ \-dashstuffing " | " \-nodashstuffing ]
-.RB [ \-build ]
-.RB [ \-file
-.IR msgfile ]
-.RB [ \-version ]
-.RB [ \-help ]
-.PP
-.HP 5
-.B forw
-.RI [ +folder ]
-.RI [ msgs ]
-.RB [ \-digest
-.IR list ]
-.RB [ \-issue
-.IR number ]
-.RB [ \-volume
-.IR number ]
-[other\ switches\ for\ 
-.BR forw ]
-.RB [ \-version ]
-.RB [ \-help ]
-
-.HP 5
-.B inc
-.RI [ +folder ]
-.RB [ \-audit
-.IR audit\-file ]
-.RB [ \-noaudit ]
-.RB [ \-changecur " | " \-nochangecur ]
-.RB [ \-form
-.IR formfile ]
-.RB [ \-format
-.IR string ]
-.RB [ \-file
-.IR name ]
-.RB [ \-silent " | " \-nosilent ]
-.RB [ \-truncate " | " \-notruncate ]
-.RB [ \-width
-.IR columns ]
-.RB [ \-host
-.IR hostname ]
-.RB [ \-user
-.IR username ]
-.RB [ \-pack
-.IR file ]
-.RB [ \-nopack ]
-.RB [ \-proxy
-.IR command ]
-.RB [ \-sasl ]
-.RB [ \-saslmech
-.IR mechanism ]
-.RB [ \-snoop ]
-.RB [ \-version ]
-.RB [ \-help ]
-
-.HP 5
-.B %libdir%/install\-mh
-.RB [ \-auto ]
-.RB [ \-check ]
-.RB [ \-version ]
-.RB [ \-help ]
-
-.HP 5
-.B mark
-.RI [ +folder ]
-.RI [ msgs ]
-.RB [ \-sequence
-.I name
-\&...]
-.RB [ \-add " | " \-delete ]
-.RB [ \-list ] 
-.RB [ \-public " | " \-nopublic ]
-.RB [ \-zero " | " \-nozero ]
-.RB [ \-version ]
-.RB [ \-help ]
-
-.HP 5
-.B mhbuild
-.I file
-.RB [ \-list " | " \-nolist ]
-.RB [ \-realsize " | " \-norealsize ]
-.RB [ \-headers " | " \-noheaders ]
-.RB [ \-ebcdicsafe " | " \-noebcdicsafe ]
-.RB [ \-rfc934mode " | " \-norfc934mode ]
-.RB [ \-contentid " | " \-nocontentid ]
-.RB [ \-verbose " | " \-noverbose ]
-.RB [ \-check " | " \-nocheck ]
-.RB [ \-version ]
-.RB [ \-help ]
-
-.HP 5
-.B mhlist
-.RI [ +folder ]
-.RI [ msgs ]
-.RB [ \-file
-.IR file ]
-.RB [ \-part
-.IR number ]
-\&...
-.RB [ \-type
-.IR content ]
-\&...
-.RB [ \-headers " | " \-noheaders ]
-.RB [ \-realsize " | " \-norealsize ]
-.RB [ \-rcache
-.IR policy ]
-.RB [ \-wcache
-.IR policy ]
-.RB [ \-check " | " \-nocheck ]
-.RB [ \-verbose " | " \-noverbose ]
-.RB [ \-version ]
-.RB [ \-help ]
-
-.HP 5
-.B %libdir%/mhl
-.RB [ \-bell " | " \-nobell ]
-.RB [ \-clear " | " \-noclear ]
-.RB [ \-folder
-.IR +folder ]
-.RB [ \-form
-.IR formfile ]
-.RB [ \-length
-.IR lines ]
-.RB [ \-width
-.IR columns ]
-.RB [ \-moreproc
-.IR program ]
-.RB [ \-nomoreproc ]
-.RI [ files
-.IR \&... ]
-.RB [ \-version ]
-.RB [ \-help ]
-
-.HP 5
-.B mhmail
-.RI [ addrs
-\&...]
-.RB [ \-body
-.IR text ]
-.RB [ \-cc
-.I addrs
-\&...]
-.RB [ \-from
-.IR addr ]
-.RB [ \-subject
-.IR subject ]
-.RB [ \-version ]
-.RB [ \-help ] 
-
-.HP 5
-.B mhn
-.RI [ +folder ]
-.RI [ msgs ]
-.RB [ \-file
-.IR file ]
-.RB [ \-part
-.IR number ]
-\&...
-.RB [ \-type
-.IR content ]
-\&...
-.RB [ \-show " | " \-noshow ]
-.RB [ \-list " | " \-nolist ]
-.RB [ \-store " | " \-nostore ]
-.RB [ \-cache " | " \-nocache ]
-.RB [ \-headers " | " \-noheaders ]
-.RB [ \-realsize " | " \-norealsize ]
-.RB [ \-serialonly " | " \-noserialonly ]
-.RB [ \-form
-.IR formfile ]
-.RB [ \-pause " | " \-nopause ]
-.RB [ \-auto " | " \-noauto ]
-.RB [ \-rcache
-.IR policy ]
-.RB [ \-wcache
-.IR policy ]
-.RB [ \-check " | " \-nocheck ]
-.RB [ \-version ]
-.RB [ \-help ]
-.PP
-.HP 5
-.B mhn
-.B \-build
-.I file
-.RB [ \-ebcdicsafe " | " \-noebcdicsafe ]
-.RB [ \-rfc934mode " | " \-norfc934mode ]
-
-.HP 5
-.B mhparam
-.RI [ components ]
-.RB [ \-all ]
-.RB [ \-component " | " \-nocomponent ]
-.RB [ \-version ]
-.RB [ \-help ]
-
-.HP 5
-.B mhpath
-.RI [ +folder ]
-.RI [ msgs ]
-.RB [ \-version ]
-.RB [ \-help ]
-
-.HP 5
-.B mhshow
-.RI [ +folder ]
-.RI [ msgs ]
-.RB [ \-file
-.IR file ]
-.RB [ \-part
-.IR number ]
-\&...
-.RB [ \-type
-.IR content ]
-\&...
-.RB [ \-serialonly " | " \-noserialonly ]
-.RB [ \-pause " | " \-nopause ]
-.RB [ \-form
-.IR formfile ]
-.RB [ \-rcache
-.IR policy ]
-.RB [ \-wcache
-.IR policy ]
-.RB [ \-check " | " \-nocheck ]
-.RB [ \-version ]
-.RB [ \-help ]
-
-.HP 5
-.B mhstore
-.RI [ +folder ]
-.RI [ msgs ]
-.RB [ \-file
-.IR file ]
-.RB [ \-part
-.IR number ]
-\&...
-.RB [ \-type
-.IR content ]
-\&...
-.RB [ \-auto " | " \-noauto ]
-.RB [ \-rcache
-.IR policy ]
-.RB [ \-wcache
-.IR policy ]
-.RB [ \-check " | " \-nocheck ]
-.RB [ \-version ]
-.RB [ \-help ]
-
-.HP 5
-.B msgchk
-.RB [ \-date " | " \-nodate ]
-.RB [ \-notify
-all/mail/nomail ]
-.RB [ \-nonotify
-all/mail/nomail ]
-.RB [ \-host
-.IR hostname ]
-.RB [ \-user
-.IR username ]
-.RB [ \-sasl ]
-.RB [ \-saslmech
-.IR mechanism ]
-.RB [ \-snoop ]
-.RI [ users
-\&... ]
-.RB [ \-version ]
-.RB [ \-help ]
-
-.HP 5
-.B msh
-.RB [ \-prompt
-.IR string ]
-.RB [ \-scan " | " \-noscan ]
-.RB [ \-topcur " | " \-notopcur ]
-.RI [ file ]
-.RB [ \-version ]
-.RB [ \-help ]
-
-.HP 5
-.B new
-.RI [ sequences ]
-.RB [ \-mode
-.IR mode ]
-.RB [ \-folders
-.IR foldersfile ]
-.RB [ \-version ]
-.RB [ \-help ]
-.PP
-.HP 5
-.B fnext
-is equivalent to
-.B new \-mode fnext
-.PP
-.HP 5
-.B fprev
-is equivalent to
-.B new \-mode fprev
-.PP
-.HP 5
-.B unseen
-is equivalent to
-.B new \-mode unseen
-
-.HP 5
-.B next 
-.RI [ +folder ]
-.RB [\-showproc
-.IR program ]
-.RB [ \-showmimeproc
-.IR program ]
-.RB [ \-header " | " \-noheader ]
-.RB [ \-checkmime " | " \-nocheckmime ]
-[switches\ for
-.I showproc
-or
-.IR showmimeproc ]
-.RB [ \-version ]
-.RB [ \-help ]
-
-.HP 5
-.B packf
-.RI [ +folder ]
-.RI [ msgs ]
-.RB [ \-file
-.IR name ]
-.RB [ \-mbox ]
-.RB [ \-mmdf ]
-.RB [ \-version ]
-.RB [ \-help ]
-
-.HP 5
-.B pick
-.RI [ +folder ]
-.RI [ msgs ]
-.RB [ \-and
-\&...]
-.RB [ \-or
-\&...]
-.RB [ \-not
-\&...]
-.RB [ \-lbrace
-\&...
-.BR \-rbrace ]
-.RB [ \-\|\-component
-.IR pattern ]
-.RB [ \-cc
-.IR pattern ]
-.RB [ \-date
-.IR pattern ]
-.RB [ \-from
-.IR pattern ]
-.RB [ \-search
-.IR pattern ]
-.RB [ \-subject
-.IR pattern ]
-.RB [ \-to
-.IR pattern ]
-.RB [ \-after
-.IR date ]
-.RB [ \-before
-.IR date ]
-.RB [ \-datefield
-.IR field ]
-.RB [ \-sequence
-.I name
-\&...]
-.RB [ \-public " | " \-nopublic ]
-.RB [ \-zero " | " \-nozero ]
-.RB [ \-list " | " \-nolist ] 
-.RB [ \-version ]
-.RB [ \-help ]
-.PP
-
-.HP 5
-.B %libdir%/post 
-.RB [ \-alias
-.IR aliasfile ]
-.RB [ \-filter
-.IR filterfile ]
-.RB [ \-nofilter ]
-.RB [ \-format " | " \-noformat ]
-.RB [ \-mime " | " \-nomime ]
-.RB [ \-msgid " | " \-nomsgid ]
-.RB [ \-verbose " | " \-noverbose ]
-.RB [ \-watch " | " \-nowatch ]
-.RB [ \-width
-.IR columns ]
-.RB [ \-server
-.IR servername ]
-.RB [ \-port
-.IR portname/number ]
-.RB [ \-sasl ]
-.RB [ \-nosasl ]
-.RB [ \-saslmaxssf
-.IR ssf ]
-.RB [ \-saslmech
-.IR mechanism ]
-.RB [ \-user
-.IR username ]
-.RB [ \-tls ]
-.RB [ \-notls ]
-.I file
-.RB [ \-version ]
-.RB [ \-help ]
-
-.HP 5
-.B prev 
-.RI [ +folder ]
-.RB [\-showproc
-.IR program ]
-.RB [ \-showmimeproc
-.IR program ]
-.RB [ \-header " | " \-noheader ]
-.RB [ \-checkmime " | " \-nocheckmime ]
-[switches\ for
-.I showproc
-or
-.IR showmimeproc ]
-.RB [ \-version ]
-.RB [ \-help ]
-
-.HP 5
-.B prompter
-.RB [ \-erase
-.IR chr ]
-.RB [ \-kill
-.IR chr ]
-.RB [ \-prepend " | " \-noprepend ]
-.RB [ \-rapid " | " \-norapid ]
-.RB [ \-doteof " | " \-nodoteof ]
-.I file
-.RB [ \-version ]
-.RB [ \-help ]
-
-.HP 5
-.B %libdir%/rcvdist
-.RB [ \-form
-.IR formfile ]
-[switches\ for
-.IR postproc ]
-.I address1
-\&...
-.RB [ \-version ]
-.RB [ \-help ]
-
-.HP 5
-.B %libdir%/rcvpack
-.I file
-.RB [ \-mbox ]
-.RB [ \-mmdf ]
-.RB [ \-version ]
-.RB [ \-help ]
-
-.HP 5
-.B %libdir%/rcvstore
-.RI [ +folder ]
-.RB [ \-create " | " \-nocreate ]
-.RB [ \-unseen " | " \-nounseen ]
-.RB [ \-zero " | " \-nozero ]
-.RB [ \-sequence
-.I name
-\&...]
-.RB [ \-public " | " \-nopublic ]
-.RB [ \-version ]
-.RB [ \-help ]
-
-.HP 5
-.B %libdir%/rcvtty
-.RI [ command ]
-.RB [ \-form
-.IR formatfile ]
-.RB [ \-format
-.IR string ]
-.RB [ \-width
-.IR columns ]
-.RB [ \-bell " | " \-nobell ]
-.RB [ \-newline " | " \-nonewline ]
-.RB [ \-biff ]
-.RB [ \-version ]
-.RB [ \-help ]
-
-.HP 5
-.B refile 
-.RI [ msgs ]
-.RB [ \-draft ]
-.RB [ \-link " | " \-nolink ]
-.RB [ \-preserve " | " \-nopreserve ]
-.RB [ \-unlink " | " \-nounlink ]
-.RB [ \-src
-.IR +folder ]
-.RB [ \-file
-.IR file ]
-.RB [ \-rmmproc
-.IR program ]
-.RB [ \-normmproc ]
-.I +folder1
-\&...
-.RB [ \-version ]
-.RB [ \-help ]
-
-.HP 5
-.B repl
-.RI [ +folder ]
-.RI [ msgs ]
-.RB [ \-annotate " | " \-noannotate ] 
-.RB [ \-group " | " \-nogroup ]
-.RB [ \-cc
-all/to/cc/me]
-.RB [ \-nocc
-all/to/cc/me]
-.RB [ \-query " | " \-noquery ]
-.RB [ \-form
-.IR formfile ]
-.RB [ \-format " | " \-noformat ]
-.RB [ \-filter
-.IR filterfile ]
-.RB [ \-inplace " | " \-noinplace ]
-.RB [ \-mime " | " \-nomime ]
-.RB [ \-fcc
-.IR +folder ]
-.RB [ \-width
-.IR columns ]
-.RB [ \-draftfolder
-.IR +folder ]
-.RB [ \-draftmessage
-.IR msg ]
-.RB [ \-nodraftfolder ]
-.RB [ \-editor
-.IR editor ]
-.RB [ \-noedit ]
-.RB [ \-whatnowproc
-.IR program ]
-.RB [ \-nowhatnowproc ]
-.RB [ \-atfile ]
-.RB [ \-noatfile ]
-.RB [ \-build ]
-.RB [ \-file
-.IR msgfile ]
-.RB [ \-version ]
-.RB [ \-help ]
-
-.HP 5
-.B rmf 
-.RI [ +folder ]
-.RB [ \-interactive " | " \-nointeractive ]
-.RB [ \-version ]
-.RB [ \-help ]
-
-.HP 5
-.B rmm
-.RI [ +folder ]
-.RI [ msgs ]
-.RB [ \-unlink " | " \-nounlink ]
-.RB [ \-version ]
-.RB [ \-help ]
-
-.HP 5
-.B scan
-.RI [ +folder ]
-.RI [ msgs ]
-.RB [ \-clear " | " \-noclear ]
-.RB [ \-form
-.IR formatfile ]
-.RB [ \-format
-.IR string ]
-.RB [ \-header " | " \-noheader ]
-.RB [ \-width
-.IR columns ]
-.RB [ \-reverse " | " \-noreverse ]
-.RB [ \-file
-.IR filename ]
-.RB [ \-version ]
-.RB [ \-help ]
-
-.HP 5
-.B sendfiles
-.RB [ delay ]
-.I mailpath
-.I subject
-.I file1
-.RI [ file2
-\&...]
-
-.HP 5
-.B send
-.RB [ \-alias
-.IR aliasfile ]
-.RB [ \-draft ]
-.RB [ \-draftfolder
-.IR +folder ]
-.RB [ \-draftmessage
-.IR msg ]
-.RB [ \-nodraftfolder ]
-.RB [ \-filter
-.IR filterfile ]
-.RB [ \-nofilter ]
-.RB [ \-format " | " \-noformat ]
-.RB [ \-forward " | " \-noforward ]
-.RB [ \-mime " | " \-nomime ]
-.RB [ \-msgid " | " \-nomsgid ]
-.RB [ \-push " | " \-nopush ]
-.RB [ \-split
-.IR seconds ]
-.RB [ \-verbose " | " \-noverbose ]
-.RB [ \-watch " | " \-nowatch ]
-.RB [ \-server
-.IR servername ]
-.RB [ \-port
-.IR port-name/number ]
-.RB [ \-sasl ]
-.RB [ \-nosasl ]
-.RB [ \-saslmaxssf
-.IR ssf ]
-.RB [ \-saslmech
-.IR mechanism ]
-.RB [ \-snoop ]
-.RB [ \-user
-.IR username ]
-.RB [ \-tls ]
-.RB [ \-notls ]
-.RB [ \-width
-.IR columns ]
-.RB [ file
-\&...] 
-.RB [ \-version ]
-.RB [ \-help ]
-.RB [ \-attach
-.IR header-field-name ]
-.RB [ \-noattach ]
-.RB [ \-attachformat
-.IR 0 " | " 1 " | " 2 ]
-
-.HP 5
-.B show
-.RI [ +folder ]
-.RI [ msgs ]
-.RB [ \-draft ]
-.RB [\-showproc
-.IR program ]
-.RB [ \-showmimeproc
-.IR program ]
-.RB [ \-header " | " \-noheader ]
-.RB [ \-checkmime " | " \-nocheckmime ]
-[switches\ for
-.I showproc
-or
-.IR showmimeproc ]
-.RB [ \-version ]
-.RB [ \-help ]
-
-.HP 5
-.B %libdir%/slocal
-[address\ info\ sender]
-.RB [ \-addr
-.IR address ]
-.RB [ \-info
-.IR data ]
-.RB [ \-sender
-.IR sender ]
-.RB [ \-user
-.IR username ]
-.RB [ \-mailbox
-.IR mbox ]
-.\" \%[\-home\ homedir]
-.RB [ \-file
-.IR file ]
-.RB [ \-maildelivery
-.IR deliveryfile ]
-.RB [ \-verbose " | " \-noverbose ]
-.RB [ \-suppressdup " | " \-nosuppressdup ]
-.RB [ \-debug ]
-.RB [ \-version ]
-.RB [ \-help ]
-
-.HP 5
-.B sortm
-.RI [ +folder ]
-.RI [ msgs ]
-.RB [ \-datefield
-.IR field ]
-.RB [ \-textfield
-.IR field ]
-.RB [ \-notextfield ]
-.RB [ \-limit
-.IR days ]
-.RB [ \-nolimit ]
-.RB [ \-verbose " | " \-noverbose ]
-.RB [ \-version ]
-.RB [ \-help ]
-
-.HP 5
-.B whatnow
-.RB [ \-draftfolder
-.IR +folder ]
-.RB [ \-draftmessage
-.IR msg ]
-.RB [ \-nodraftfolder ]
-.RB [ \-editor
-.IR editor ]
-.RB [ \-noedit ]
-.RB [ \-prompt
-.IR string ]
-.RI [ file ]
-.RB [ \-version ]
-.RB [ \-help ]
-.RB [ \-attach
-.IR header-field-name ]
-.RB [ \-noattach ]
-
-.HP 5
-.B whom
-.RB [ \-alias
-.IR aliasfile ]
-.RB [ \-check " | " \-nocheck ]
-.RB [ \-draft ]
-.RB [ \-draftfolder
-.IR +folder ]
-.RB [ \-draftmessage
-.IR msg ]
-.RB [ \-nodraftfolder ]
-.RB [ \-snoop ]
-.RI [ file ]
-.RB [ \-version ]
-.RB [ \-help ]
-
-.ad
-
-.SH "SEE ALSO"
-nmh(1)
diff --git a/man/prompter.man b/man/prompter.man
index 623abba..2512a0f 100644
--- a/man/prompter.man
+++ b/man/prompter.man
@@ -18,7 +18,7 @@ prompter \- prompting editor front-end for nmh
 .I file
 .RB [ \-version ]
 .RB [ \-help ]
-.fi
+.ad
 .SH DESCRIPTION
 .B Prompter
 is an editor front\-end for
diff --git a/man/sendfiles.man b/man/sendfiles.man
index 76b793a..94f193e 100644
--- a/man/sendfiles.man
+++ b/man/sendfiles.man
@@ -5,7 +5,7 @@
 .SH NAME
 sendfiles \- send multiple files via a MIME message
 .SH SYNOPSIS
-.HP
+.HP 5
 .na
 .B sendfiles
 .RB [ delay ]

-----------------------------------------------------------------------

Summary of changes:
 .gitignore  |    1 +
 Makefile.am |   33 +++++++++++++++++----------------
 2 files changed, 18 insertions(+), 16 deletions(-)


hooks/post-receive
-- 
The nmh Mail Handling System