Merge

diff --git a/Makefile.in b/Makefile.in
index 058e7d8..83af4c2 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -69,8 +69,11 @@ DIST = COPYRIGHT DATE INSTALL README VERSION \
        acconfig.h config.h.in configure.ac configure stamp-h.in \
        config.sub config.guess
 
+# these directories included in the distribution
+DISTDIRS = docs test
+
 # subdirectories in distribution
-SUBDIRS = h config sbr uip etc man docs
+SUBDIRS = h config sbr uip etc man
 
 # ========== DEPENDENCIES FOR BUILDING AND INSTALLING ==========
 
@@ -171,6 +174,10 @@ mmhdist: $(DIST) distname
        @for file in $(DIST); do \
          cp -p $(srcdir)/$$file $(distdir); \
        done
+       @echo "Copying distribution dirs in main directory"
+       @for dir in $(DISTDIRS); do \
+         cp -rp $(srcdir)/$$dir $(distdir); \
+       done
        @for subdir in $(SUBDIRS); do \
          mkdir $(distdir)/$$subdir; \
          chmod 755 $(distdir)/$$subdir; \

diff --git a/configure.ac b/configure.ac
index 2cda6e0..9e32e21 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -547,7 +547,7 @@ dnl ----------------
 dnl OUTPUT MAKEFILES
 dnl ----------------
 AC_CONFIG_FILES(Makefile config/Makefile h/Makefile sbr/Makefile uip/Makefile \
-                etc/Makefile docs/Makefile man/Makefile)
+                etc/Makefile man/Makefile)
 AC_CONFIG_COMMANDS([stamp],[test -z "$CONFIG_HEADERS" || echo > stamp-h])
 AC_OUTPUT
 

diff --git a/docs/Makefile.in b/docs/Makefile.in
deleted file mode 100644 (file)
index 4d6c696..0000000
--- a/docs/Makefile.in
+++ /dev/null
@@ -1,63 +0,0 @@
-#
-# Makefile for h subdirectory
-#
-
-SHELL = /bin/sh
-
-srcdir = @srcdir@
-datarootdir = @datarootdir@
-VPATH  = @srcdir@
-
-# header files included in distribution
-FILES = COMPLETION-BASH COMPLETION-TCSH COMPLETION-ZSH               \
-        ChangeLog_MH-3_to_MH-6.6 ChangeLog_MH-6.7.0_to_MH-6.8.4.html \
-        ChangeLog_nmh DIFFERENCES_nmh_MH DIFFERENCES_mmh_nmh MACHINES \
-        FAQ README.mail-filtering MAILING-LISTS \
-        README.attachments README.hooks README.SASL                  \
-        README.developers README.manpages TODO schnalke-mmh.pdf \
-        README.mhsign-mhpgp README.start-devel m_getfld.c.humor
-
-# auxiliary files
-AUX = Makefile.in
-
-# all files in this directory included in the distribution
-DIST = $(FILES) $(AUX)
-
-# ========== DEPENDENCIES FOR BUILDING AND INSTALLING ==========
-
-all:
-
-install:
-
-uninstall:
-
-lint:
-
-# ========== DEPENDENCIES FOR CLEANUP ==========
-
-mostlyclean:
-       rm -f *~
-
-clean: mostlyclean
-
-distclean: clean
-       rm -f Makefile
-
-realclean: distclean
-
-superclean: realclean
-
-# ========== DEPENDENCIES FOR MAINTENANCE ==========
-
-subdir = docs
-
-Makefile: Makefile.in ../config.status
-       cd .. && ./config.status $(subdir)/$@
-
-distdir = ../`cat ../distname`/$(subdir)
-mmhdist:
-       @echo "Copying distribution files in $(subdir)"
-       @for file in $(DIST); do \
-         cp -p $(srcdir)/$$file $(distdir); \
-       done
-

diff --git a/etc/Makefile.in b/etc/Makefile.in
index 8277cc8..8b8a1c3 100644 (file)
--- a/etc/Makefile.in
+++ b/etc/Makefile.in
@@ -26,10 +26,10 @@ SED = sed
 .SUFFIXES:
 
 # static configuration, format, and components files
-STATIC_FILES = components digestcomps distcomps forwcomps  \
-               mhl.body mhl.format mhl.forward mhl.headers  \
-               mhl.reply rcvdistcomps rcvdistcomps.outbox              \
-               replcomps replgroupcomps scan.MMDDYY scan.YYYYMMDD      \
+STATIC_FILES = components digestcomps distcomps forwcomps \
+               mhl.body mhl.format mhl.forward mhl.headers \
+               mhl.reply rcvdistcomps rcvdistcomps.outbox \
+               replcomps replgroupcomps scan.MMDDYY scan.YYYYMMDD \
                scan.nmh scan.mailx scan.nomime scan.size scan.time \
                scan.timely scan.unseen scan.meillo mhn.defaults
 

diff --git a/h/Makefile.in b/h/Makefile.in
index 31987b5..31237d0 100644 (file)
--- a/h/Makefile.in
+++ b/h/Makefile.in
@@ -8,10 +8,9 @@ srcdir = @srcdir@
 VPATH  = @srcdir@
 
 # header files included in distribution
-HDRS = addrsbr.h aliasbr.h crawl_folders.h dropsbr.h fmt_compile.h     \
-       fmt_scan.h mf.h mh.h mhparse.h mime.h        \
-       prototypes.h rcvmail.h         \
-       scansbr.h signals.h tws.h utils.h
+HDRS = addrsbr.h aliasbr.h crawl_folders.h dropsbr.h fmt_compile.h \
+       fmt_scan.h mf.h mh.h mhparse.h mime.h \
+       prototypes.h rcvmail.h scansbr.h signals.h tws.h utils.h
 
 # auxiliary files
 AUX = Makefile.in

diff --git a/man/mh-alias.man5 b/man/mh-alias.man5
index 990ea42..e05358a 100644 (file)
--- a/man/mh-alias.man5
+++ b/man/mh-alias.man5
@@ -4,10 +4,6 @@
 .TH MH-ALIAS %manext5% "%nmhdate%" MH.6.8 [%nmhversion%]
 .SH NAME
 mh-alias \- alias file for nmh message system
-.SH SYNOPSIS
-any
-.B nmh
-command
 .SH DESCRIPTION
 This describes
 .B nmh
@@ -15,6 +11,7 @@ personal alias files.
 It does
 .B not
 describe aliases files used by the message transport system.
+.PP
 Each line of the alias file has the format:
 .PP
 .RS 5
@@ -98,7 +95,8 @@ UNIX\-group named after the `+'.  Each login name occurring in the
 file whose group\-id is indicated by this group is
 added to the
 .I address\-list
-for the alias.
+for the alias. I.e. only those users that have this group as their
+initial login group are added.
 .PP
 In match, a trailing `*' on an alias will match just about anything
 appropriate.  (See example below.)

diff --git a/man/mh-draft.man7 b/man/mh-draft.man7
index 04c8446..b721aa6 100644 (file)
--- a/man/mh-draft.man7
+++ b/man/mh-draft.man7
@@ -4,10 +4,6 @@
 .TH MH-DRAFT %manext7% "%nmhdate%" MH.6.8 [%nmhversion%]
 .SH NAME
 mh-draft \- draft folder facility for nmh message system
-.SH SYNOPSIS
-any
-.B nmh
-command
 .SH DESCRIPTION
 There are a number of interesting advanced facilities for the composition of
 outgoing mail.

diff --git a/man/mh-mail.man5 b/man/mh-mail.man5
index a6e6677..9b3334d 100644 (file)
--- a/man/mh-mail.man5
+++ b/man/mh-mail.man5
@@ -4,10 +4,6 @@
 .TH MH-MAIL %manext5% "%nmhdate%" MH.6.8 [%nmhversion%]
 .SH NAME
 mh-mail \- message format for nmh message system
-.SH SYNOPSIS
-any
-.B nmh
-command
 .SH DESCRIPTION
 .B nmh
 processes messages in a particular format.  It should be noted

diff --git a/man/mh-profile.man5 b/man/mh-profile.man5
index 9b052c9..fd4adbf 100644 (file)
--- a/man/mh-profile.man5
+++ b/man/mh-profile.man5
@@ -3,11 +3,7 @@
 .\"
 .TH MH-PROFILE %manext5% "%nmhdate%" MH.6.8 [%nmhversion%]
 .SH NAME
-mh-profile \- user profile customization for mmh message handler
-.SH SYNOPSIS
-.I $HOME/.mmh/profile
-.br
-.I $HOME/.mmh/context
+mh-profile \- user profile customization for the mmh message handler
 .SH DESCRIPTION
 Each user of
 .B mmh
@@ -715,10 +711,13 @@ distributed or replied to.
 .ta \w'%etcdir%/ExtraBigFileName  'u
 ^$HOME/.mmh~^The user's mmh directory
 ^or $MMH~^Rather than the standard mmh directory
+.sp
 ^$HOME/.mmh/profile~^The user's profile
 ^or $MMHP~^Rather than the standard profile
+.sp
 ^$HOME/.mmh/context~^The user's context
 ^or $MMHC~^Rather than the standard context
+.sp
 ^<folder>/.mh_sequences~^Public sequences for <folder>
 .fi
 

diff --git a/man/mh-sequence.man7 b/man/mh-sequence.man7
index 516b8af..4e4b443 100644 (file)
--- a/man/mh-sequence.man7
+++ b/man/mh-sequence.man7
@@ -4,10 +4,6 @@
 .TH MH-SEQUENCE %manext7% "%nmhdate%" MH.6.8 [%nmhversion%]
 .SH NAME
 mh-sequence \- sequence specification for nmh message system
-.SH SYNOPSIS
-most
-.B nmh
-commands
 .SH DESCRIPTION
 A sequence (or sequence set) is a symbolic name representing a
 message or collection of messages.