diff --git a/lib/libc/sys/mount.2 b/lib/libc/sys/mount.2
index 11e06b6b6125..386f6741288e 100644
--- a/lib/libc/sys/mount.2
+++ b/lib/libc/sys/mount.2
@@ -1,4 +1,4 @@
-.\"	$NetBSD: mount.2,v 1.39 2008/10/19 20:54:22 christos Exp $
+.\"	$NetBSD: mount.2,v 1.40 2008/10/20 07:03:58 wiz Exp $
 .\"
 .\" Copyright (c) 1980, 1989, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -115,8 +115,7 @@ unwritten data is pending in kernel buffers.
 .It Dv MNT_SOFTDEP
 Use soft dependencies.
 This enhanced system performance in many cases compared
-to a default mount,
-\fIi.e.\fP one neither
+to a default mount, i.e. one neither
 .Dv MNT_ASYNC
 nor
 .Dv MNT_SYNCHRONOUS ,
@@ -136,7 +135,7 @@ This improves performance in most cases.
 .Pp
 The
 .Dv MNT_UPDATE ,
-.Dv MNT_RELOAD
+.Dv MNT_RELOAD ,
 and
 .Dv MNT_GETARGS
 flags indicate that the mount command is being applied
@@ -262,7 +261,7 @@ even if the file system is later remounted.
 returns the value 0 if the mount was successful,
 the number of bytes written to
 .Ar data
-for 
+for
 .Dv MNT_GETARGS ,
 otherwise \-1 is returned and the variable
 .Va errno
@@ -277,18 +276,23 @@ is set to indicate the error.
 .Fn mount
 will fail when one of the following occurs:
 .Bl -tag -width Er
-.It Bq Er EPERM
-The caller is not the super-user,
-and ordinary user mounts are not permitted or
 this particular request violates the rules.
-.It Bq Er ENAMETOOLONG
-A component of a pathname exceeded
-.Dv {NAME_MAX}
-characters, or an entire path name exceeded
-.Dv {PATH_MAX}
-characters.
+.It Bq Er EBUSY
+Another process currently holds a reference to
+.Fa dir ,
+or for an update from read-write to read-only
+there are files on the filesystem open for writes.
+.It Bq Er EFAULT
+.Fa dir
+points outside the process's allocated address space.
 .It Bq Er ELOOP
 Too many symbolic links were encountered in translating a pathname.
+.It Bq Er ENAMETOOLONG
+A component of a pathname exceeded
+.Dv NAME_MAX
+characters, or an entire path name exceeded
+.Dv PATH_MAX
+characters.
 .It Bq Er ENOENT
 A component of
 .Fa dir
@@ -300,24 +304,36 @@ is not a directory,
 or a path prefix of
 .Ar special
 is not a directory.
-.It Bq Er EBUSY
-Another process currently holds a reference to
-.Fa dir ,
-or for an update from read-write to read-only
-there are files on the filesystem open for writes.
-.It Bq Er EFAULT
-.Fa dir
-points outside the process's allocated address space.
+.It Bq Er EPERM
+The caller is not the super-user,
+and ordinary user mounts are not permitted or
 .El
 .Pp
 The following errors can occur for a
 .Em ufs
 file system mount:
 .Bl -tag -width Er
+.It Bq Er EBUSY
+.Ar Fspec
+is already mounted.
+.It Bq Er EFAULT
+.Ar Fspec
+points outside the process's allocated address space.
+.It Bq Er EINVAL
+The super block for the file system had a bad magic
+number or an out of range block size.
+.It Bq Er EIO
+An I/O error occurred while reading the super block or
+cylinder group information.
+.It Bq Er EMFILE
+No space remains in the mount table.
 .It Bq Er ENODEV
 A component of ufs_args
 .Ar fspec
 does not exist.
+.It Bq Er ENOMEM
+Not enough memory was available to read the cylinder
+group information for the file system.
 .It Bq Er ENOTBLK
 .Ar Fspec
 is not a block device.
@@ -326,82 +342,65 @@ The major device number of
 .Ar fspec
 is out of range (this indicates no device driver exists
 for the associated hardware).
-.It Bq Er EBUSY
-.Ar Fspec
-is already mounted.
-.It Bq Er EMFILE
-No space remains in the mount table.
-.It Bq Er EINVAL
-The super block for the file system had a bad magic
-number or an out of range block size.
-.It Bq Er ENOMEM
-Not enough memory was available to read the cylinder
-group information for the file system.
-.It Bq Er EIO
-An I/O error occurred while reading the super block or
-cylinder group information.
-.It Bq Er EFAULT
-.Ar Fspec
-points outside the process's allocated address space.
 .El
 .Pp
 The following errors can occur for a
 .Em nfs
 file system mount:
 .Bl -tag -width Er
-.It Bq Er ETIMEDOUT
-.Em Nfs
-timed out trying to contact the server.
 .It Bq Er EFAULT
 Some part of the information described by nfs_args
 points outside the process's allocated address space.
+.It Bq Er ETIMEDOUT
+.Em Nfs
+timed out trying to contact the server.
 .El
 .Pp
 The following errors can occur for a
 .Em mfs
 file system mount:
 .Bl -tag -width Er
-.It Bq Er EMFILE
-No space remains in the mount table.
-.It Bq Er EINVAL
-The super block for the file system had a bad magic
-number or an out of range block size.
-.It Bq Er ENOMEM
-Not enough memory was available to read the cylinder
-group information for the file system.
-.It Bq Er EIO
-A paging error occurred while reading the super block or
-cylinder group information.
 .It Bq Er EFAULT
 .Em Name
 points outside the process's allocated address space.
+.It Bq Er EINVAL
+The super block for the file system had a bad magic
+number or an out of range block size.
+.It Bq Er EIO
+A paging error occurred while reading the super block or
+cylinder group information.
+.It Bq Er EMFILE
+No space remains in the mount table.
+.It Bq Er ENOMEM
+Not enough memory was available to read the cylinder
+group information for the file system.
 .El
 .Pp
 .Fn unmount
 may fail with one of the following errors:
 .Bl -tag -width Er
-.It Bq Er EPERM
-The caller is not the super-user.
-.It Bq Er ENOTDIR
-A component of the path is not a directory.
-.It Bq Er ENAMETOOLONG
-A component of a pathname exceeded
-.Dv {NAME_MAX}
-characters, or an entire path name exceeded
-.Dv {PATH_MAX}
-characters.
-.It Bq Er ELOOP
-Too many symbolic links were encountered in translating the pathname.
-.It Bq Er EINVAL
-The requested directory is not in the mount table.
 .It Bq Er EBUSY
 A process is holding a reference to a file located
 on the file system.
-.It Bq Er EIO
-An I/O error occurred while writing cached file system information.
 .It Bq Er EFAULT
 .Fa dir
 points outside the process's allocated address space.
+.It Bq Er EINVAL
+The requested directory is not in the mount table.
+.It Bq Er EIO
+An I/O error occurred while writing cached file system information.
+.It Bq Er ELOOP
+Too many symbolic links were encountered in translating the pathname.
+.It Bq Er ENAMETOOLONG
+A component of a pathname exceeded
+.Dv NAME_MAX
+characters, or an entire path name exceeded
+.Dv PATH_MAX
+characters.
+.It Bq Er ENOTDIR
+A component of the path is not a directory.
+.It Bq Er EPERM
+The caller is not the super-user.
 .El
 .Pp
 A
@@ -429,7 +428,9 @@ and
 function calls were all present in
 .At v6 .
 .Pp
-Prior to NetBSD 4.0 the
+Prior to
+.Nx 4.0
+the
 .Nm
 call was used to export NFS filesystems.
 This is now done through
@@ -437,7 +438,8 @@ This is now done through
 .Pp
 The
 .Dv data_len
-argument was added for NetBSD 5.0.
+argument was added for
+.Nx 5.0 .
 .Sh BUGS
 Some of the error codes need translation to more obvious messages.
 .Pp