diff --git a/share/man/man7/hier.7 b/share/man/man7/hier.7
--- a/share/man/man7/hier.7
+++ b/share/man/man7/hier.7
@@ -34,8 +34,9 @@
 .Sh NAME
 .Nm hier
 .Nd layout of file systems
-.Sh DESCRIPTION
+.Sh SYNOPSIS
 A sketch of the file system hierarchy.
+.Sh DESCRIPTION
 .Bl -tag -width "/libexec/"
 .It Pa /
 root directory of the file system
@@ -294,7 +295,7 @@
 miscellaneous network C include files
 .Bl -tag -width Fl -compact
 .It Pa altq/
-C include files for alternate packet queueing; see
+C include files for alternate packet queuing; see
 .Xr altq 4
 .El
 .It Pa net80211/
@@ -330,7 +331,7 @@
 .Xr rpc 3
 .It Pa security/
 PAM; see
-.Xr pam 8
+.Xr pam 3
 .It Pa sys/
 system C include files (kernel data structures)
 .\" .It Pa tcl/
@@ -378,8 +379,7 @@
 .Pp
 .Bl -tag -width Fl -compact
 .It Pa gcc/
-.Xr gcc 1
-configuration data
+gcc configuration data
 .It Pa ldscripts/
 linker scripts;
 see
@@ -462,16 +462,14 @@
 .Fx Ns -specific
 terms, proper names, and jargon
 .It Pa web2
-words from Webster's 2nd International
+words from Webster's Second International
 .El
 .It Pa doc/
 miscellaneous documentation;
 source for most of the printed
 .Bx
 manuals (available
-from the
-.Tn USENIX
-association)
+from the USENIX association)
 .Bl -tag -width Fl -compact
 .It Pa FAQ/
 Frequently Asked Questions