diff --git a/doc/man/pam.man b/doc/man/pam.man
index b14a7b8..83ee440 100644
--- a/doc/man/pam.man
+++ b/doc/man/pam.man
@@ -1,5 +1,5 @@
 .\"
-.\" $P4: //depot/projects/openpam/doc/man/pam.man#1 $
+.\" $P4: //depot/projects/openpam/doc/man/pam.man#2 $
 .\"
 .Sh DESCRIPTION
 The Pluggable Authentication Modules (PAM) library abstracts a number
@@ -13,7 +13,7 @@ service name, which is often (but not necessarily) the program name.
 .Pp
 The user requesting authentication is called the applicant, while the
 user (usually, root) charged with verifying his identity and granting
-him the requested credentials is called the arbitrator.  
+him the requested credentials is called the arbitrator.
 .Pp
 The sequence of operations the server goes through to authenticate a
 user and perform whatever task he requested is a PAM transaction; the
@@ -32,7 +32,7 @@ devices.
 See
 .Xr pam_conv 3
 for details.
-.Ss Initialization And Cleanup
+.Ss Initialization and Cleanup
 The
 .Fn pam_start
 function initializes the PAM library and returns a handle which must
@@ -44,7 +44,7 @@ transactions in parallel.
 The
 .Fn pam_end
 function releases all resources associated with the specified context,
-and can be called at any time to terminate a PAM transaction.  
+and can be called at any time to terminate a PAM transaction.
 .Ss Storage
 The
 .Fn pam_set_item
@@ -54,12 +54,12 @@ functions set and retrieve a number of predefined items, including the
 service name, the names of the requesting and target users, the
 conversation function, and prompts.
 .Pp
-The 
+The
 .Fn pam_set_data
 and
 .Fn pam_get_data
-manage named chunks of free-form data, generally used by modules to
-store state from one invocation to another.
+functions manage named chunks of free-form data, generally used by
+modules to store state from one invocation to another.
 .Ss Authentication
 There are two authentication primitives:
 .Fn pam_authenticate
@@ -84,7 +84,7 @@ The
 function allows the server to change the user's password, either at
 the user's request or because the password has expired.
 .Ss Miscellaneous
-The 
+The
 .Fn pam_putenv ,
 .Fn pam_getenv
 and
@@ -94,5 +94,5 @@ variables they want the server to export during the session.
 .Pp
 The
 .Fn pam_strerror
-function returns a pointer to a string describing a the specified PAM
+function returns a pointer to a string describing the specified PAM
 error code.
diff --git a/misc/gendoc.pl b/misc/gendoc.pl
index 945c224..fc21d0f 100644
--- a/misc/gendoc.pl
+++ b/misc/gendoc.pl
@@ -32,7 +32,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $P4: //depot/projects/openpam/misc/gendoc.pl#25 $
+# $P4: //depot/projects/openpam/misc/gendoc.pl#26 $
 #
 
 use strict;
@@ -360,7 +360,7 @@ sub gendoc($) {
     if ($func->{'name'} =~ m/openpam/) {
 	$mdoc .= ".In security/openpam.h\n"
     }
-    $mdoc .= ".Ft $func->{'type'}
+    $mdoc .= ".Ft \"$func->{'type'}\"
 .Fn $func->{'name'} $func->{'args'}
 .Sh DESCRIPTION
 $func->{'man'}
@@ -411,10 +411,11 @@ function is an OpenPAM extension.
     $mdoc .= ".Sh AUTHORS
 The
 .Nm
-function and this manual page were developed for the FreeBSD Project
-by ThinkSec AS and Network Associates Laboratories, the Security
-Research Division of Network Associates, Inc.  under DARPA/SPAWAR
-contract N66001-01-C-8035
+function and this manual page were developed for the
+.Fx
+Project by ThinkSec AS and Network Associates Laboratories, the
+Security Research Division of Network Associates, Inc.  under
+DARPA/SPAWAR contract N66001-01-C-8035
 .Pq Dq CBOSS ,
 as part of the DARPA CHATS research program.
 ";
@@ -511,7 +512,7 @@ The following return codes are defined by
     }
     print FILE ".Sh SEE ALSO
 ";
-    print FILE ".Xr openpam 3\n"
+    print FILE ".Xr openpam 3 ,\n"
 	if ($page eq 'pam');
     foreach $func (keys(%FUNCTIONS)) {
 	$xref{$func} = 3;
@@ -530,8 +531,9 @@ The following return codes are defined by
 .Re
 .Sh AUTHORS
 The OpenPAM library and this manual page were developed for the
-FreeBSD Project by ThinkSec AS and Network Associates Laboratories,
-the Security Research Division of Network Associates, Inc.  under
+.Fx
+Project by ThinkSec AS and Network Associates Laboratories, the
+Security Research Division of Network Associates, Inc.  under
 DARPA/SPAWAR contract N66001-01-C-8035
 .Pq Dq CBOSS ,
 as part of the DARPA CHATS research program.