Updated man pages to remove dependence on tmac.h and have a more modern look

diff --git a/man/Makefile.in b/man/Makefile.in
index c81c15d580a7f739e1ddaeabc9fad4f5e2d067fd..cc4e832138123fba2d39051c0fb21ac1f007b9f5 100644 (file)
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -5,6 +5,7 @@
 #
 
 VERSION = @VERSION@
 #
 
 VERSION = @VERSION@

+DATE = @DATE@

 
 SHELL = /bin/sh
 
 
 SHELL = /bin/sh
 


@@ -110,6 +111,7 @@ tmac.h: man.sed tmac.h.in
 man.sed: Makefile
        echo 's,%nmhwarning%,THIS FILE HAS BEEN AUTOMATICALLY GENERATED.  DO NOT EDIT.,g' > $@
        echo 's,%nmhversion%,nmh-$(VERSION),g' >> $@
 man.sed: Makefile
        echo 's,%nmhwarning%,THIS FILE HAS BEEN AUTOMATICALLY GENERATED.  DO NOT EDIT.,g' > $@
        echo 's,%nmhversion%,nmh-$(VERSION),g' >> $@

+       echo 's,%nmhdate%,$(DATE),g' >> $@

        echo 's,%bindir%,$(bindir),g' >> $@
        echo 's,%etcdir%,$(etcdir),g' >> $@
        echo 's,%libdir%,$(libdir),g' >> $@
        echo 's,%bindir%,$(bindir),g' >> $@
        echo 's,%etcdir%,$(etcdir),g' >> $@
        echo 's,%libdir%,$(libdir),g' >> $@

diff --git a/man/ali.man b/man/ali.man
index 7e0c18175fd122ff3c75768b5bd6a47864c7ea32..e0bd11a97a0f6c738917ea2cf81575689ce8efb0 100644 (file)
--- a/man/ali.man
+++ b/man/ali.man
@@ -2,68 +2,93 @@
 .\" %nmhwarning%
 .\" $Id$
 .\"
 .\" %nmhwarning%
 .\" $Id$
 .\"

-.\" include the -mh macro file
-.so %etcdir%/tmac.h
-.\"
-.TH ALI %manext1% MH.6.8 [%nmhversion%]
+.TH ALI %manext1% "%nmhdate%" MH.6.8 [%nmhversion%]

 .SH NAME
 ali \- list mail aliases
 .SH SYNOPSIS
 .SH NAME
 ali \- list mail aliases
 .SH SYNOPSIS

-.in +.5i
-.ti -.5i
-ali
-\%[\-alias\ aliasfile]
-\%[\-list] \%[\-nolist]
-\%[\-normalize]
-.br
-\%[\-nonormalize]
-\%[\-user] \%[\-nouser]
-\%[aliases\ ...]
-.br
-\%[\-version]
-\%[\-help] 
-.in -.5i
+.B ali
+.RB [ \-alias
+.IR aliasfile ]
+.RB [ \-list " | " \-nolist ]
+.RB [ \-normalize " | " \-nonormalize ]
+.RB [ \-user " | " \-nouser ]
+.RB [ \-version ]
+.RB [ \-help ] 
+.RI [ aliases " ...]"

 .SH DESCRIPTION
 .SH DESCRIPTION

-\fIAli\fR searches the named mail alias files for each of the given
-\fIaliases\fR.  It creates a list of addresses for those \fIaliases\fR,
+.B Ali
+searches the named mail alias files for each of the given
+.IR aliases .
+It creates a list of addresses for those
+.IR aliases ,

 and writes that list on standard output.  If no arguments are given,
 and writes that list on standard output.  If no arguments are given,

-\fIali\fR outputs all alias entries.
-
+.B ali
+outputs all alias entries.
+.PP

 By default, when an aliases expands to multiple addresses, the addresses
 are separated by commas and printed on as few lines as possible.  If the
 By default, when an aliases expands to multiple addresses, the addresses
 are separated by commas and printed on as few lines as possible.  If the

-`\-list' option is specified, then when an address expands to multiple
+.B \-list
+option is specified, then when an address expands to multiple

 addresses, each address will appear on a separate line.
 addresses, each address will appear on a separate line.

-
-The switch `\-user' directs \fIali\fR to perform its processing in
+.PP
+The switch
+.B \-user
+directs
+.B ali
+to perform its processing in

 an inverted fashion: instead of listing the addresses that each given
 an inverted fashion: instead of listing the addresses that each given

-alias expands to, \fIali\fR will list the aliases that expand to each
-given address.  If the `\-normalize' switch is given, \fIali\fR will
+alias expands to,
+.B ali
+will list the aliases that expand to each
+given address.  If the
+.B \-normalize
+switch is given,
+.B ali
+will

 try to track down the official hostname of the address.
 try to track down the official hostname of the address.

-
+.PP

 The files specified by the profile entry \*(lqAliasfile:\*(rq and any
 The files specified by the profile entry \*(lqAliasfile:\*(rq and any

-additional alias files given by the `\-alias aliasfile' switch will be
-read.  Each \fIalias\fR is processed as described in \fImh\-alias\fR\0(5).
-.Fi
+additional alias files given by the
+.RB ` \-alias
+.IR aliasfile '
+switch will be read.  Each
+.I alias
+is processed as described in
+.BR mh\-alias (5).
+
+.SH FILES
+.fc ^ ~
+.nf
+.ta \w'/usr/local/nmh/etc/ExtraBigFileName  'u

 ^$HOME/\&.mh\(ruprofile~^The user profile
 ^/etc/passwd~^List of users
 ^/etc/group~^List of groups
 ^$HOME/\&.mh\(ruprofile~^The user profile
 ^/etc/passwd~^List of users
 ^/etc/group~^List of groups

-.Pr
+
+.SH "PROFILE COMPONENTS"
+.fc ^ ~
+.nf
+.ta 2.4i
+.ta \w'ExtraBigProfileName  'u

 ^Path:~^To determine the user's nmh directory
 ^Path:~^To determine the user's nmh directory

-.Ps

 ^Aliasfile:~^For a default alias file
 ^Aliasfile:~^For a default alias file

-.Sa
+
+.SH "SEE ALSO"

 mh\-alias(5)
 mh\-alias(5)

-.De
-`\-alias %etcdir%/MailAliases'
-.Ds
-`\-nolist'
-.Ds
-`\-nonormalize'
-.Ds
-`\-nouser'
-.Co
+
+.SH "DEFAULTS"
+.nf
+.RB ` \-alias " %etcdir%/MailAliases'"
+.RB ` \-nolist '
+.RB ` \-nonormalize '
+.RB ` \-nouser '
+
+.SH CONTEXT

 None
 None

-.Bu
-The `\-user' option with `\-nonormalize' is not entirely accurate, as it
+
+.SH BUGS
+The
+.B \-user
+option with
+.B \-nonormalize
+is not entirely accurate, as it

 does not replace local nicknames for hosts with their official site names.
 does not replace local nicknames for hosts with their official site names.

-.En