1.1 --- a/man/Makefile.am	Sat Jun 19 18:08:55 2010 +0200
     1.2 +++ b/man/Makefile.am	Sat Jun 19 18:31:03 2010 +0200
     1.3 @@ -1,1 +1,1 @@
     1.4 -man_MANS=masqmail.8 mservdetect.8 masqmail.conf.5 masqmail.route.5 masqmail.get.5 masqmail.aliases.5
     1.5 +man_MANS=masqmail.8 mservdetect.1 masqmail.conf.5 masqmail.route.5 masqmail.get.5 masqmail.aliases.5

     2.1 --- a/man/Makefile.in	Sat Jun 19 18:08:55 2010 +0200
     2.2 +++ b/man/Makefile.in	Sat Jun 19 18:31:03 2010 +0200
     2.3 @@ -64,8 +64,10 @@
     2.4  am__base_list = \
     2.5    sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
     2.6    sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
     2.7 +man1dir = $(mandir)/man1
     2.8 +am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" \
     2.9 +	"$(DESTDIR)$(man8dir)"
    2.10  man5dir = $(mandir)/man5
    2.11 -am__installdirs = "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(man8dir)"
    2.12  man8dir = $(mandir)/man8
    2.13  NROFF = nroff
    2.14  MANS = $(man_MANS)
    2.15 @@ -174,7 +176,7 @@
    2.16  with_logdir = @with_logdir@
    2.17  with_spooldir = @with_spooldir@
    2.18  with_user = @with_user@
    2.19 -man_MANS = masqmail.8 mservdetect.8 masqmail.conf.5 masqmail.route.5 masqmail.get.5 masqmail.aliases.5
    2.20 +man_MANS = masqmail.8 mservdetect.1 masqmail.conf.5 masqmail.route.5 masqmail.get.5 masqmail.aliases.5
    2.21  all: all-am
    2.22  
    2.23  .SUFFIXES:
    2.24 @@ -208,6 +210,44 @@
    2.25  $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
    2.26  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
    2.27  $(am__aclocal_m4_deps):
    2.28 +install-man1: $(man_MANS)
    2.29 +	@$(NORMAL_INSTALL)
    2.30 +	test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
    2.31 +	@list=''; test -n "$(man1dir)" || exit 0; \
    2.32 +	{ for i in $$list; do echo "$$i"; done; \
    2.33 +	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
    2.34 +	  sed -n '/\.1[a-z]*$$/p'; \
    2.35 +	} | while read p; do \
    2.36 +	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
    2.37 +	  echo "$$d$$p"; echo "$$p"; \
    2.38 +	done | \
    2.39 +	sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
    2.40 +	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
    2.41 +	sed 'N;N;s,\n, ,g' | { \
    2.42 +	list=; while read file base inst; do \
    2.43 +	  if test "$$base" = "$$inst"; then list="$$list $$file"; else \
    2.44 +	    echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
    2.45 +	    $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst" || exit $$?; \
    2.46 +	  fi; \
    2.47 +	done; \
    2.48 +	for i in $$list; do echo "$$i"; done | $(am__base_list) | \
    2.49 +	while read files; do \
    2.50 +	  test -z "$$files" || { \
    2.51 +	    echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man1dir)'"; \
    2.52 +	    $(INSTALL_DATA) $$files "$(DESTDIR)$(man1dir)" || exit $$?; }; \
    2.53 +	done; }
    2.54 +
    2.55 +uninstall-man1:
    2.56 +	@$(NORMAL_UNINSTALL)
    2.57 +	@list=''; test -n "$(man1dir)" || exit 0; \
    2.58 +	files=`{ for i in $$list; do echo "$$i"; done; \
    2.59 +	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
    2.60 +	  sed -n '/\.1[a-z]*$$/p'; \
    2.61 +	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
    2.62 +	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
    2.63 +	test -z "$$files" || { \
    2.64 +	  echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \
    2.65 +	  cd "$(DESTDIR)$(man1dir)" && rm -f $$files; }
    2.66  install-man5: $(man_MANS)
    2.67  	@$(NORMAL_INSTALL)
    2.68  	test -z "$(man5dir)" || $(MKDIR_P) "$(DESTDIR)$(man5dir)"
    2.69 @@ -338,7 +378,7 @@
    2.70  check: check-am
    2.71  all-am: Makefile $(MANS)
    2.72  installdirs:
    2.73 -	for dir in "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(man8dir)"; do \
    2.74 +	for dir in "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(man8dir)"; do \
    2.75  	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
    2.76  	done
    2.77  install: install-am
    2.78 @@ -402,7 +442,7 @@
    2.79  
    2.80  install-info-am:
    2.81  
    2.82 -install-man: install-man5 install-man8
    2.83 +install-man: install-man1 install-man5 install-man8
    2.84  
    2.85  install-pdf: install-pdf-am
    2.86  
    2.87 @@ -432,7 +472,7 @@
    2.88  
    2.89  uninstall-am: uninstall-man
    2.90  
    2.91 -uninstall-man: uninstall-man5 uninstall-man8
    2.92 +uninstall-man: uninstall-man1 uninstall-man5 uninstall-man8
    2.93  
    2.94  .MAKE: install-am install-strip
    2.95  
    2.96 @@ -441,12 +481,12 @@
    2.97  	install install-am install-data install-data-am install-dvi \
    2.98  	install-dvi-am install-exec install-exec-am install-html \
    2.99  	install-html-am install-info install-info-am install-man \
   2.100 -	install-man5 install-man8 install-pdf install-pdf-am \
   2.101 -	install-ps install-ps-am install-strip installcheck \
   2.102 -	installcheck-am installdirs maintainer-clean \
   2.103 +	install-man1 install-man5 install-man8 install-pdf \
   2.104 +	install-pdf-am install-ps install-ps-am install-strip \
   2.105 +	installcheck installcheck-am installdirs maintainer-clean \
   2.106  	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
   2.107  	pdf-am ps ps-am uninstall uninstall-am uninstall-man \
   2.108 -	uninstall-man5 uninstall-man8
   2.109 +	uninstall-man1 uninstall-man5 uninstall-man8
   2.110  
   2.111  
   2.112  # Tell versions [3.59,3.63) of GNU make to not export all variables.

     3.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.2 +++ b/man/mservdetect.1	Sat Jun 19 18:31:03 2010 +0200
     3.3 @@ -0,0 +1,50 @@
     3.4 +.TH mservdetect 1 2010-06-19 masqmail-0.2.22 "User Commands"
     3.5 +
     3.6 +.SH NAME
     3.7 +mservdetect \- Helper for masqmail and masqdialer
     3.8 +
     3.9 +
    3.10 +.SH SYNOPSIS
    3.11 +\fB/usr/bin/masqmail \fIhost port\fR
    3.12 +
    3.13 +
    3.14 +.SH DESCRIPTION
    3.15 +
    3.16 +Mservdetect is a small helper application for masqmail to detect its online status
    3.17 +if the modem server masqdialer is used.
    3.18 +It connects to the\fIhost\fR at \fIport\fR and prints the connection name to stdout.
    3.19 +
    3.20 +If you want to use it, set \fBonline_detect\fR=\fIpipe\fR and
    3.21 +\fBonline_pipe\fR=\fI"/usr/bin/mservdetect host port"\fR in
    3.22 +masqmail.conf.
    3.23 +
    3.24 +.SH OPTIONS
    3.25 +
    3.26 +.TP
    3.27 +\fBhost\fR
    3.28 +
    3.29 +The hostname where the masqdialer server is running.
    3.30 +
    3.31 +.TP
    3.32 +\fBport\fR
    3.33 +
    3.34 +The port number where the masqdialer server is listening.
    3.35 +
    3.36 +
    3.37 +.SH AUTHOR
    3.38 +
    3.39 +Masqmail was written by Oliver Kurth.
    3.40 +It is now maintained by Markus Schnalke <meillo@marmaro.de>.
    3.41 +
    3.42 +You will find the newest version of masqmail at \fBhttp://prog.marmaro.de/masqmail/\fR.
    3.43 +There is also a mailing list, you will find information about it at masqmail's main site.
    3.44 +
    3.45 +
    3.46 +.SH BUGS
    3.47 +
    3.48 +Please report bugs to the mailing list.
    3.49 +
    3.50 +
    3.51 +.SH SEE ALSO
    3.52 +
    3.53 +\fBmasqmail(8)\fR, \fBmasqmail.conf(5)\fR

     4.1 --- a/man/mservdetect.8	Sat Jun 19 18:08:55 2010 +0200
     4.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.3 @@ -1,49 +0,0 @@
     4.4 -.TH mservdetect 8 2010-05-07 masqmail-0.2.22 "Maintenance Commands"
     4.5 -
     4.6 -.SH NAME
     4.7 -mservdetect \- Helper for masqmail and masqdialer
     4.8 -
     4.9 -
    4.10 -.SH SYNOPSIS
    4.11 -\fB/usr/bin/masqmail \fIhost port\fR
    4.12 -
    4.13 -
    4.14 -.SH DESCRIPTION
    4.15 -
    4.16 -Mservdetect is a small helper application for masqmail to detect its online status
    4.17 -if the modem server masqdialer is used.
    4.18 -It connects to the\fIhost\fR at \fIport\fR and prints the connection name to stdout.
    4.19 -
    4.20 -If you want to use it, set \fBonline_detect\fR=\fIpipe\fR and
    4.21 -\fBonline_pipe\fR=\fI"/usr/bin/mservdetect host port"\fR.
    4.22 -
    4.23 -.SH OPTIONS
    4.24 -
    4.25 -.TP
    4.26 -\fBhost\fR
    4.27 -
    4.28 -The hostname where the masqdialer server is running.
    4.29 -
    4.30 -.TP
    4.31 -\fBport\fR
    4.32 -
    4.33 -The port number where the masqdialer server is listening.
    4.34 -
    4.35 -
    4.36 -.SH AUTHOR
    4.37 -
    4.38 -Masqmail was written by Oliver Kurth.
    4.39 -It is now maintained by Markus Schnalke <meillo@marmaro.de>.
    4.40 -
    4.41 -You will find the newest version of masqmail at \fBhttp://prog.marmaro.de/masqmail/\fR.
    4.42 -There is also a mailing list, you will find information about it at masqmail's main site.
    4.43 -
    4.44 -
    4.45 -.SH BUGS
    4.46 -
    4.47 -Please report bugs to the mailing list.
    4.48 -
    4.49 -
    4.50 -.SH SEE ALSO
    4.51 -
    4.52 -\fBmasqmail.conf(5)\fR