Latest round of fixes per RM and AL.  Fix bugs found in man.c.

@@ -9,21 +9,22 @@
 .\" http://www.illumos.org/license/CDDL.
 .\"
 .\"
 .\" Copyright 2014 Garrett D'Amore <garrett@damore.org>
 .\"
-.Dd Jul 16, 2014
-.Dt CATAMN 1M
+.Dd Jul 19, 2014
+.Dt CATMAN 1M
 .Os
 .Sh NAME
 .Nm catman
 .Nd generate
 .Nm whatis
 database files
 .Sh SYNOPSIS
 .Nm
 .Op Fl M Ar path
+.Op Fl w
 .Sh DESCRIPTION
 The
 .Nm
 utility generates a set of
 .Nm whatis

@@ -35,18 +36,21 @@
 be generated using the
 .Fl w
 option with
 .Xr man 1 ,
 and that command should be used instead.
+.Sh OPTIONS
 .Bl -tag -width ".Fl d"
 .It Fl M Ar path
 Generate the
 .Nm whatis
 database files within the specified colon separated manual paths.
 Overrides the
 .Ev MANPATH
 environment variable.
+.It Fl w
+This option is present for backwards compatibility, and is ignored.
 .El
 .Sh ENVIRONMENT
 The following environment variables affect the execution of
 .Nm :
 .Bl -tag -width ".Ev MANPATH"

@@ -54,14 +58,12 @@
 Used to specify a colon seperated list of manual paths within
 which to generate
 .Nm whatis
 database files.
 .El
-.Sh DIAGNOSTICS
-The
-.Nm
-utility exits 0 on success, and non-zero otherwise.
+.Sh EXIT STATUS
+.Ex -std
 .Sh INTERFACE STABILITY
 .Nm "Obsolete Committed" .
 .Sh CODE SET INDEPENDENCE
 Enabled.
 .Sh SEE ALSO