diff --git a/lib/libc/stdio/funopen.3 b/lib/libc/stdio/funopen.3
index 8ed9b3074a2b..dbdd5cab661b 100644
--- a/lib/libc/stdio/funopen.3
+++ b/lib/libc/stdio/funopen.3
@@ -44,7 +44,7 @@
 .Sh SYNOPSIS
 .Fd #include <stdio.h>
 .Ft FILE *
-.Fn funopen "void  *cookie" "int  (*readfn)(void *, char *, int)" "int (writefn*)(void *, const char *, int)" "fpos_t (seekfn*)(void *, fpos_t, int)" "int (closefn*)(void *)"
+.Fn funopen "void  *cookie" "int  (*readfn)(void *, char *, int)" "int (*writefn)(void *, const char *, int)" "fpos_t (*seekfn)(void *, fpos_t, int)" "int (*closefn)(void *)"
 .Ft FILE *
 .Fn fropen "void  *cookie" "int  (*readfn)(void *, char *, int)"
 .Ft FILE *
diff --git a/share/man/man5/link.5 b/share/man/man5/link.5
index c27e84ee9a2e..0b3428d1da22 100644
--- a/share/man/man5/link.5
+++ b/share/man/man5/link.5
@@ -26,7 +26,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\"	$Id: link.5,v 1.1 1994/12/23 22:41:46 nate Exp $
+.\"	$Id: link.5,v 1.2 1995/04/16 12:35:13 ats Exp $
 .\"
 .Dd October 23, 1993
 .Dt LINK 5
@@ -62,8 +62,8 @@ format offers no room for it elsewhere.
 Several utilities cooperate to ensure that the task of getting a program
 ready to run can complete successfully in a way that optimizes the use
 of system resources. The compiler emits PIC code from which shared libraries
-can be build by
-.Xr ld 1.
+can be built by
+.Xr ld 1 .
 The compiler also includes size information of any initialized data items
 through the .size assembler directive. PIC code differs from conventional code
 in that it accesses data variables through an indirection table, the
diff --git a/usr.bin/fstat/fstat.1 b/usr.bin/fstat/fstat.1
index 715e09aaa9f3..5a7edeb0b0ef 100644
--- a/usr.bin/fstat/fstat.1
+++ b/usr.bin/fstat/fstat.1
@@ -209,9 +209,9 @@ of time.
 .Xr nfsstat 1 ,
 .Xr ps 1 ,
 .Xr systat 1 ,
-.Xr vmstat 1 ,
 .Xr iostat 8 ,
-.Xr pstat 8
+.Xr pstat 8 ,
+.Xr vmstat 8
 .Sh HISTORY
 The
 .Nm
diff --git a/usr.bin/indent/indent.1 b/usr.bin/indent/indent.1
index c44964ad59d6..524253dfce4a 100644
--- a/usr.bin/indent/indent.1
+++ b/usr.bin/indent/indent.1
@@ -171,8 +171,8 @@ this option enabled, comments look like this:
 .Bd -literal -offset indent
 .ne 3
 	/*
-	* this is a comment
-	*/
+	 * this is a comment
+	 */
 .Ed
 .Pp
 Rather than like this:
diff --git a/usr.bin/netstat/netstat.1 b/usr.bin/netstat/netstat.1
index da890c912c06..e2d1ce425754 100644
--- a/usr.bin/netstat/netstat.1
+++ b/usr.bin/netstat/netstat.1
@@ -271,16 +271,16 @@ The first line of each screen of information contains a summary since the
 system was last rebooted.  Subsequent lines of output show values
 accumulated over the preceding interval.
 .Sh SEE ALSO
-.Xr iostat 1 ,
 .Xr nfsstat 1 ,
 .Xr ps 1 ,
-.Xr vmstat 1 ,
 .Xr hosts 5 ,
 .Xr networks 5 ,
 .Xr protocols 5 ,
 .Xr services 5 ,
+.Xr iostat 8 ,
 .Xr trpt 8 ,
-.Xr trsp 8
+.Xr trsp 8 ,
+.Xr vmstat 8
 .Sh HISTORY
 The
 .Nm netstat
diff --git a/usr.bin/nfsstat/nfsstat.1 b/usr.bin/nfsstat/nfsstat.1
index 9e778c7aec87..5e798b7289ed 100644
--- a/usr.bin/nfsstat/nfsstat.1
+++ b/usr.bin/nfsstat/nfsstat.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)nfsstat.1	8.1 (Berkeley) 6/6/93
-.\"	$Id$
+.\"	$Id: nfsstat.1,v 1.3 1994/10/23 23:25:42 wollman Exp $
 .\"
 .Dd June 6, 1993
 .Dt NFSSTAT 1
@@ -79,10 +79,10 @@ default memory file
 .Xr netstat 1 ,
 .Xr ps 1 ,
 .Xr systat 1 ,
-.Xr vmstat 1 ,
 .Xr sysctl 3 ,
 .Xr iostat 8 ,
 .Xr pstat 8 ,
+.Xr vmstat 8
 .Sh HISTORY
 The
 .Nm nfsstat
diff --git a/usr.bin/systat/systat.1 b/usr.bin/systat/systat.1
index a4d82e257d01..8911401505e0 100644
--- a/usr.bin/systat/systat.1
+++ b/usr.bin/systat/systat.1
@@ -62,9 +62,9 @@ displays the processes getting the largest percentage of the processor
 in the lower window.  Other displays show swap space usage, disk
 .Tn I/O
 statistics (a la
-.Xr iostat  1  ) ,
+.Xr iostat  8  ) ,
 virtual memory statistics (a la
-.Xr vmstat  1  ) ,
+.Xr vmstat  8  ) ,
 network ``mbuf'' utilization, and network connections (a la
 .Xr netstat  1  ) .
 .Pp
diff --git a/usr.sbin/ac/ac.8 b/usr.sbin/ac/ac.8
index 83cbeb715893..42b88cf69a04 100644
--- a/usr.sbin/ac/ac.8
+++ b/usr.sbin/ac/ac.8
@@ -28,7 +28,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\"	$Id: ac.8,v 1.2 1994/09/26 22:12:25 davidg Exp $
+.\"	$Id: ac.8,v 1.3 1995/10/07 12:02:33 joerg Exp $
 .\"
 .Dd March 15, 1994
 .Dt AC 8
@@ -132,7 +132,7 @@ rotated files
 .Xr init 8 ,
 .Xr sa 8 ,
 .Xr login 1 ,
-.Xr utmp
+.Xr utmp 5
 .\" .Sh NOTES
 .\" If COMPAT_SUNOS is defined
 .\" .Nm ac
diff --git a/usr.sbin/amd/amq/amq.8 b/usr.sbin/amd/amq/amq.8
index 5485925b809f..f5cb68131ba1 100644
--- a/usr.sbin/amd/amq/amq.8
+++ b/usr.sbin/amd/amq/amq.8
@@ -37,7 +37,7 @@
 .\"
 .\"     @(#)amq.8	8.3 (Berkeley) 4/18/94
 .\"
-.\" $Id: amq.8,v 5.2.2.1 1992/02/09 15:11:41 jsp beta $
+.\" $Id: amq.8,v 1.1.1.1 1994/05/26 05:22:04 rgrimes Exp $
 .\"
 .Dd March 16, 1991
 .Dt AMQ 8
@@ -127,4 +127,5 @@ database.
 <jsp@doc.ic.ac.uk>, Department of Computing, Imperial College, London, UK.
 .Sh HISTORY
 .Nm Amq
+first appeared in 4.4BSD.
 .At
diff --git a/usr.sbin/iostat/iostat.8 b/usr.sbin/iostat/iostat.8
index 034bf71de0a1..861acefb301a 100644
--- a/usr.sbin/iostat/iostat.8
+++ b/usr.sbin/iostat/iostat.8
@@ -135,10 +135,10 @@ Default memory file.
 .Xr fstat 1 ,
 .Xr netstat 1 ,
 .Xr nfsstat 1 ,
-.Xr \&ps 1 ,
+.Xr ps 1 ,
 .Xr systat 1 ,
-.Xr vmstat 1 ,
-.Xr pstat 8
+.Xr pstat 8 ,
+.Xr vmstat 8
 .Pp
 The sections starting with ``Interpreting system activity'' in
 .%T "Installing and Operating 4.3BSD" .
diff --git a/usr.sbin/pstat/pstat.8 b/usr.sbin/pstat/pstat.8
index c3899350c161..1c632114a301 100644
--- a/usr.sbin/pstat/pstat.8
+++ b/usr.sbin/pstat/pstat.8
@@ -31,7 +31,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	From: @(#)pstat.8	8.4 (Berkeley) 4/19/94
-.\"	$Id$
+.\"	$Id: pstat.8,v 1.5 1995/10/06 20:58:24 bde Exp $
 .\"
 .Dd October 7, 1995
 .Dt PSTAT 8
@@ -355,12 +355,12 @@ namelist
 default source of tables
 .El
 .Sh SEE ALSO
-.Xr iostat 1 ,
 .Xr ps 1 ,
 .Xr systat 1 ,
-.Xr vmstat 1 ,
 .Xr stat 2 ,
 .Xr fs 5 ,
+.Xr iostat 8 ,
+.Xr vmstat 8
 .Rs
 .Rt Tn UNIX Rt Implementation ,
 .Ra K. Thompson
diff --git a/usr.sbin/zic/zic.8 b/usr.sbin/zic/zic.8
index 6972d0e38b33..f587fdb7c422 100644
--- a/usr.sbin/zic/zic.8
+++ b/usr.sbin/zic/zic.8
@@ -406,7 +406,7 @@ you may need to use local standard time in the
 field of the earliest transition time's rule to ensure that
 the earliest transition time recorded in the compiled file is correct.
 .SH FILE
-/usr/local/etc/zoneinfo	standard directory used for created files
+/usr/share/zoneinfo	standard directory used for created files
 .SH "SEE ALSO"
 newctime(3), tzfile(5), zdump(8)
 .\" @(#)zic.8	7.7