MFH: man page fixes.

diff --git a/NEWS b/NEWS
index 9a55ea85d9bda3bb9d2e26cdb59020f4a0ca603c..44cdfeb751797d7fb2af3f3d6b3089a22589fb29 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,8 @@
+Changes in 1.6.5
+================
+
+* FIX: Man page fixes. [Eric S. Raymond, Sebastian Rittau]
+
 Changes in 1.6.4
 ================
 

diff --git a/man/man1/.cvsignore b/man/man1/.cvsignore
index 0ac9461e8a4ab22a449d068e52155a4879735fd3..282522db0342d8750454b3dc162493b5fc709cc8 100644 (file)
--- a/man/man1/.cvsignore
+++ b/man/man1/.cvsignore
@@ -1,3 +1,2 @@
 Makefile
 Makefile.in
-*.1

diff --git a/man/man1/Makefile.am b/man/man1/Makefile.am
index ffcede474bf840f87d122f2f806e9337301f055a..b904471ecf90b240beaed889d077d0273fb3c002 100644 (file)
--- a/man/man1/Makefile.am
+++ b/man/man1/Makefile.am
@@ -1,44 +1,30 @@
 # Makefile.am for man/man1/
 
-pkgconfdir = @PKGCONFDIR@
-
-SUFFIXES= .tmpl .
-
-.tmpl:
-       sed -e s@:SBINDIR:@${sbindir}@ \
-           -e s@:BINDIR:@${bindir}@ \
-           -e s@:ETCDIR:@${pkgconfdir}@ \
-           -e s@:LIBDIR:@${libdir}@ \
-           <$< >$@
-
-GENERATED_MANS = apple_cp.1 apple_mv.1 apple_rm.1
-TEMPLATE_FILES = $(foreach f,$(GENERATED_MANS),$(f).tmpl)
-NONGENERATED_MANS      =       achfile.1  \
-                               acleandir.1 \
-                               aecho.1 \
-                               afile.1 \
-                               afppasswd.1 \
-                               getzones.1 \
-                               hqx2bin.1 \
-                               macbinary.1 \
-                               megatron.1 \
-                               nbp.1 \
-                               nbplkup.1 \
-                               nbprgstr.1 \
-                               nbpunrgstr.1 \
-                               netatalk-config.1 \
-                               pap.1 \
-                               papstatus.1 \
-                               psorder.1 \
-                               single2bin.1 \
-                               timeout.1 \
-                               unbin.1 \
-                               unhex.1 \
-                               unsingle.1
-
-man_MANS = $(GENERATED_MANS) $(NONGENERATED_MANS)
-
-CLEANFILES = $(GENERATED_MANS)
-
-EXTRA_DIST = $(TEMPLATE_FILES) $(NONGENERATED_MANS)
-
+man_MANS = \
+       achfile.1               \
+       acleandir.1             \
+       aecho.1                 \
+       afile.1                 \
+       afppasswd.1             \
+       apple_cp.1              \
+       apple_mv.1              \
+       apple_rm.1              \
+       getzones.1              \
+       hqx2bin.1               \
+       macbinary.1             \
+       megatron.1              \
+       nbp.1                   \
+       nbplkup.1               \
+       nbprgstr.1              \
+       nbpunrgstr.1            \
+       netatalk-config.1       \
+       pap.1                   \
+       papstatus.1             \
+       psorder.1               \
+       single2bin.1            \
+       timeout.1               \
+       unbin.1                 \
+       unhex.1                 \
+       unsingle.1
+
+EXTRA_DIST = $(man_MANS)

diff --git a/man/man1/aecho.1 b/man/man1/aecho.1
index c81620015d58b0d81f53574a63698f8f9e2848a6..eb799adfe7bf8a6dce52458ee71a0c4ec17de240 100644 (file)
--- a/man/man1/aecho.1
+++ b/man/man1/aecho.1
@@ -6,11 +6,11 @@ aecho \- send AppleTalk Echo Protocol packets to network hosts
 [
 .B \-c\fI count
 ]
-(
+{
 .I address
 |
 .I nbpname
-)
+}
 .SH DESCRIPTION
 .B aecho
 repeatedly sends an Apple Echo Protocol (AEP) packet to the host

diff --git a/man/man1/apple_cp.1 b/man/man1/apple_cp.1
new file mode 100644 (file)
index 0000000..c088772
--- /dev/null
+++ b/man/man1/apple_cp.1
@@ -0,0 +1,34 @@
+.TH APPLE_CP 1 "15 Oct 2001" "Netatalk 1.5"
+.SH NAME
+apple_cp \- Do an apple copy, copying the resource fork as well
+.SH SYNOPSIS
+.BR apple_cp
+\fISOURCE DEST\fR
+.br
+.BR apple_cp
+\fISOURCE\fR... \fIDIRECTORY\fR
+
+.SH DESCRIPTION
+.BR apple_cp
+is a perl script to copy SOURCE to DEST or multiple SOURCE(s) to
+DIRECTORY. It also copies the resource forks to the .AppleDouble
+directory for DEST or DIRECTORY. If the .AppleDouble directory doesn't
+exist for DEST or DIRECTORY it will create it.
+
+.SH EXAMPLES
+
+.BR apple_cp
+test.text /target/directory/
+
+.BR apple_cp
+test.text /target/directory/test2.text
+
+.BR apple_cp
+test.text testing.text /target/directory/
+
+.SH REPORTING BUGS
+Report bugs to the Netatalk-devel list <netatalk-devel@lists.sourceforge.net>.
+
+.SH SEE ALSO
+.BR apple_mv (1),
+.BR apple_rm (1).

diff --git a/man/man1/apple_cp.1.tmpl b/man/man1/apple_cp.1.tmpl
deleted file mode 100644 (file)
index 787e736..0000000
--- a/man/man1/apple_cp.1.tmpl
+++ /dev/null
@@ -1,34 +0,0 @@
-.TH APPLE_CP 1 "15 Oct 2001" "Netatalk 1.5"
-.SH NAME
-apple_cp \- Do an apple copy, copying the resource fork as well
-.SH SYNOPSIS
-.BR :BINDIR:/apple_cp
-\fISOURCE DEST\fR
-.br
-.BR :BINDIR:/apple_cp
-\fISOURCE\fR... \fIDIRECTORY\fR
-
-.SH DESCRIPTION
-.BR apple_cp
-is a perl script to copy SOURCE to DEST or multiple SOURCE(s) to
-DIRECTORY. It also copies the resource forks to the .AppleDouble
-directory for DEST or DIRECTORY. If the .AppleDouble directory doesn't
-exist for DEST or DIRECTORY it will create it.
-
-.SH EXAMPLES
-
-.BR :BINDIR:/apple_cp
-test.text /target/directory/
-
-.BR :BINDIR:/apple_cp
-test.text /target/directory/test2.text
-
-.BR :BINDIR:/apple_cp
-test.text testing.text /target/directory/
-
-.SH REPORTING BUGS
-Report bugs to the Netatalk-devel list <netatalk-devel@lists.sourceforge.net>.
-
-.SH SEE ALSO
-.BR apple_mv (1),
-.BR apple_rm (1).

diff --git a/man/man1/apple_mv.1 b/man/man1/apple_mv.1
new file mode 100644 (file)
index 0000000..4450605
--- /dev/null
+++ b/man/man1/apple_mv.1
@@ -0,0 +1,34 @@
+.TH APPLE_MV 1 "16 Oct 2001" "Netatalk 1.5"
+.SH NAME
+apple_mv \- Do an apple move, moving the resource fork as well
+.SH SYNOPSIS
+.BR apple_mv
+\fISOURCE DEST\fR
+.br
+.BR apple_mv
+\fISOURCE\fR... \fIDIRECTORY\fR
+
+.SH DESCRIPTION
+.BR apple_mv
+is a perl script to move SOURCE to DEST or multiple SOURCE(s) to
+DIRECTORY. It also moves the resource forks to the .AppleDouble
+directory for DEST or DIRECTORY. If the .AppleDouble directory doesn't
+exist for DEST or DIRECTORY it will create it.
+
+.SH EXAMPLES
+
+.BR apple_mv
+test.text /target/directory/
+
+.BR apple_mv
+test.text /target/directory/test2.text
+
+.BR apple_mv
+test.text testing.text /target/directory/
+
+.SH REPORTING BUGS
+Report bugs to the Netatalk-devel list <netatalk-devel@lists.sourceforge.net>.
+
+.SH SEE ALSO
+.BR apple_cp (1),
+.BR apple_rm (1).

diff --git a/man/man1/apple_mv.1.tmpl b/man/man1/apple_mv.1.tmpl
deleted file mode 100644 (file)
index 5b8fe29..0000000
--- a/man/man1/apple_mv.1.tmpl
+++ /dev/null
@@ -1,34 +0,0 @@
-.TH APPLE_MV 1 "16 Oct 2001" "Netatalk 1.5"
-.SH NAME
-apple_mv \- Do an apple move, moving the resource fork as well
-.SH SYNOPSIS
-.BR :BINDIR:/apple_mv
-\fISOURCE DEST\fR
-.br
-.BR :BINDIR:/apple_mv
-\fISOURCE\fR... \fIDIRECTORY\fR
-
-.SH DESCRIPTION
-.BR apple_mv
-is a perl script to move SOURCE to DEST or multiple SOURCE(s) to
-DIRECTORY. It also moves the resource forks to the .AppleDouble
-directory for DEST or DIRECTORY. If the .AppleDouble directory doesn't
-exist for DEST or DIRECTORY it will create it.
-
-.SH EXAMPLES
-
-.BR :BINDIR:/apple_mv
-test.text /target/directory/
-
-.BR :BINDIR:/apple_mv
-test.text /target/directory/test2.text
-
-.BR :BINDIR:/apple_mv
-test.text testing.text /target/directory/
-
-.SH REPORTING BUGS
-Report bugs to the Netatalk-devel list <netatalk-devel@lists.sourceforge.net>.
-
-.SH SEE ALSO
-.BR apple_cp (1),
-.BR apple_rm (1).

diff --git a/man/man1/apple_rm.1 b/man/man1/apple_rm.1
new file mode 100644 (file)
index 0000000..fa8a1a1
--- /dev/null
+++ b/man/man1/apple_rm.1
@@ -0,0 +1,30 @@
+.TH APPLE_RM 1 "16 Oct 2001" "Netatalk 1.5"
+.SH NAME
+apple_rm \- Do an apple remove, remove the resource fork as well
+
+.SH SYNOPSIS
+.BR apple_rm
+\fIFILE\fR...
+
+.SH DESCRIPTION
+.BR apple_rm
+is a perl script that removes FILE(s) as well as the .AppleDouble
+resource fork file(s) that corresponds to FILE(s). 
+.BR apple_rm
+does not delete directories.
+
+.SH EXAMPLES
+
+.BR apple_rm
+test.text 
+
+.BR apple_rm
+test.text testing.text
+
+.SH REPORTING BUGS
+Report bugs to the Netatalk-devel list <netatalk-devel@lists.sourceforge.net>.
+
+.SH SEE ALSO
+.BR apple_cp (1),
+.BR apple_mv (1).
+

diff --git a/man/man1/apple_rm.1.tmpl b/man/man1/apple_rm.1.tmpl
deleted file mode 100644 (file)
index 9f8cded..0000000
--- a/man/man1/apple_rm.1.tmpl
+++ /dev/null
@@ -1,30 +0,0 @@
-.TH APPLE_RM 1 "16 Oct 2001" "Netatalk 1.5"
-.SH NAME
-apple_rm \- Do an apple remove, remove the resource fork as well
-
-.SH SYNOPSIS
-.BR :BINDIR:/apple_rm
-\fIFILE\fR...
-
-.SH DESCRIPTION
-.BR apple_rm
-is a perl script that removes FILE(s) as well as the .AppleDouble
-resource fork file(s) that corresponds to FILE(s). 
-.BR apple_rm
-does not delete directories.
-
-.SH EXAMPLES
-
-.BR :BINDIR:/apple_rm
-test.text 
-
-.BR :BINDIR:/apple_rm
-test.text testing.text
-
-.SH REPORTING BUGS
-Report bugs to the Netatalk-devel list <netatalk-devel@lists.sourceforge.net>.
-
-.SH SEE ALSO
-.BR apple_cp (1),
-.BR apple_mv (1).
-

diff --git a/man/man3/nbp_name.3 b/man/man3/nbp_name.3
index 9c41cc472e3348104e436304752d0cf208ad42ef..4cc4625af13a7a9f4089b875a13c34b07935739b 100644 (file)
--- a/man/man3/nbp_name.3
+++ b/man/man3/nbp_name.3
@@ -3,8 +3,7 @@
 nbp_name \- NBP name parsing
 .SH SYNOPSIS
 .nf
-nbp_name( name, obj, type, zone )
-char *name, **obj, **type, **zone;
+int nbp_name(char * name, char **obj, char **type, char **zone)
 .fi
 .SH DESCRIPTION
 .B nbp_name()