diff -ru pmap-orig/pmap.9 pmap-new/pmap.9
--- pmap-orig/pmap.9	Mon Sep 22 17:52:30 2003
+++ pmap-new/pmap.9	Mon Sep 22 17:57:03 2003
@@ -26,7 +26,7 @@
 .\" $FreeBSD$
 .\"
 .Dd July 21, 2003
-.Dt pmap 9
+.Dt PMAP 9
 .Sh NAME
 .Nm pmap
 .Nd machine-dependent portion of virtual memory subsystem
@@ -39,15 +39,15 @@
 .Nm
 module is the machine-dependent portion of the
 .Fx
-VM.
-Each function documented herein must have its own implementation on
-each architecture which
-.Fx
-supports.
+VM (Virtual Memory) sub-system.
+Each function documented herein must have its own
+architecture-dependent implementation.
 .Pp
+The
 .Nm
+module
 is responsible for managing hardware-dependent objects such as page tables,
-address maps, TLBs, et cetera.
+address maps, TLBs, etc.
 .Pp
 Machine-dependent code must provide the header file
 .Em <machine/pmap.h> .
@@ -61,10 +61,9 @@
 typedef struct pmap *pmap_t;
 .Ed
 .Pp
-This header file may also define other data structures that the
-machine-dependent
+This header file may also define other data structures used by the
 .Nm
-implementation uses.
+implementation.
 .Pp
 The header file
 .Em <vm/pmap.h>
@@ -118,5 +117,5 @@
 .Xr pmap_zero_idle 9 ,
 .Xr vm_map 9
 .Sh AUTHORS
-This man page was written by
+This manual page was written by
 .An Bruce M Simpson Aq bms@spc.org .
diff -ru pmap-orig/pmap_activate.9 pmap-new/pmap_activate.9
--- pmap-orig/pmap_activate.9	Mon Sep 22 17:52:30 2003
+++ pmap-new/pmap_activate.9	Mon Sep 22 16:12:11 2003
@@ -26,7 +26,7 @@
 .\" $FreeBSD$
 .\"
 .Dd July 21, 2003
-.Dt pmap_activate 9
+.Dt PMAP_ACTIVATE 9
 .Sh NAME
 .Nm pmap_activate
 .Nd activate a physical map
@@ -41,10 +41,10 @@
 .Fn pmap_activate
 function activates the physical map for a user thread
 .Fa td .
-This function must called before the thread's address space can be
-accessed in any way.
+This function must be called before the thread's address space can be
+accessible.
 .Sh SEE ALSO
 .Xr pmap 9
 .Sh AUTHORS
-This man page was written by
+This manual page was written by
 .An Bruce M Simpson Aq bms@spc.org .
diff -ru pmap-orig/pmap_addr_hint.9 pmap-new/pmap_addr_hint.9
--- pmap-orig/pmap_addr_hint.9	Mon Sep 22 17:52:30 2003
+++ pmap-new/pmap_addr_hint.9	Mon Sep 22 18:02:51 2003
@@ -26,10 +26,10 @@
 .\" $FreeBSD$
 .\"
 .Dd July 21, 2003
-.Dt pmap_addr_hint 9
+.Dt PMAP_ADDR_HINT 9
 .Sh NAME
 .Nm pmap_addr_hint
-.Nd get a hint for the best-fit mapping of a vm object
+.Nd get a hint for the best-fit mapping of a VM object
 .Sh SYNOPSIS
 .In sys/param.h
 .In vm/vm.h
@@ -46,16 +46,16 @@
 of
 .Fa size
 bytes.
+.Sh IMPLEMENTATION NOTES
+This function is typically called on behalf of
+.Fn mmap .
 .Sh RETURN VALUES
 If the implementation can use the address unchanged, it will simply
 return
 .Fa addr .
-.Sh NOTES
-This function is typically called on behalf of
-.Xr mmap 2 .
 .Sh SEE ALSO
 .Xr mmap 2 ,
 .Xr pmap 9
 .Sh AUTHORS
-This man page was written by
+This manual page was written by
 .An Bruce M Simpson Aq bms@spc.org .
diff -ru pmap-orig/pmap_change_wiring.9 pmap-new/pmap_change_wiring.9
--- pmap-orig/pmap_change_wiring.9	Mon Sep 22 17:52:30 2003
+++ pmap-new/pmap_change_wiring.9	Mon Sep 22 16:17:57 2003
@@ -26,10 +26,10 @@
 .\" $FreeBSD$
 .\"
 .Dd July 21, 2003
-.Dt pmap_change_wiring 9
+.Dt PMAP_CHANGE_WIRING 9
 .Sh NAME
 .Nm pmap_change_wiring
-.Nd change physical wiring for a map/virtual address pair
+.Nd change physical wiring for a map or virtual address pair
 .Sh SYNOPSIS
 .In sys/param.h
 .In vm/vm.h
@@ -43,8 +43,13 @@
 .Fa va
 in the physical map
 .Fa pmap .
-A wired page gets its name from being 'wired' into the system page tables
-such that it will not be paged out.
+A wired page gets its name from being
+.Sq wired
+into the system page tables so that it will not be paged out.
+Another term often used instead of
+.Sq "page wiring"
+is
+.Sq "page pinning" .
 .Pp
 The mapping must already exist in the pmap.
 If
@@ -61,5 +66,5 @@
 .Sh SEE ALSO
 .Xr pmap 9
 .Sh AUTHORS
-This man page was written by
+This manual page was written by
 .An Bruce M Simpson Aq bms@spc.org .
diff -ru pmap-orig/pmap_clear_modify.9 pmap-new/pmap_clear_modify.9
--- pmap-orig/pmap_clear_modify.9	Mon Sep 22 17:52:30 2003
+++ pmap-new/pmap_clear_modify.9	Mon Sep 22 17:59:08 2003
@@ -26,7 +26,7 @@
 .\" $FreeBSD$
 .\"
 .Dd July 21, 2003
-.Dt pmap_clear_modify 9
+.Dt PMAP_CLEAR_MODIFY 9
 .Sh NAME
 .Nm pmap_clear_modify ,
 .Nm pmap_clear_reference
@@ -42,17 +42,21 @@
 .Sh DESCRIPTION
 The
 .Fn pmap_clear_modify
-clears the 'modified' bit on the physical page
+function clears the
+.Sq modified
+bit on the physical page
 .Fa m .
 .Pp
 The
 .Fn pmap_clear_reference
-clears the 'referenced' bit on the physical page
+function clears the
+.Sq referenced
+bit on the physical page
 .Fa m .
 .Sh SEE ALSO
 .Xr pmap 9 ,
 .Xr pmap_is_modified 9 ,
 .Xr pmap_ts_referenced 9
 .Sh AUTHORS
-This man page was written by
+This manual page was written by
 .An Bruce M Simpson Aq bms@spc.org .
diff -ru pmap-orig/pmap_copy.9 pmap-new/pmap_copy.9
--- pmap-orig/pmap_copy.9	Mon Sep 22 17:52:30 2003
+++ pmap-new/pmap_copy.9	Mon Sep 22 18:02:05 2003
@@ -26,7 +26,7 @@
 .\" $FreeBSD$
 .\"
 .Dd July 21, 2003
-.Dt pmap_copy 9
+.Dt PMAP_COPY 9
 .Sh NAME
 .Nm pmap_copy ,
 .Nm pmap_copy_page
@@ -36,13 +36,8 @@
 .In vm/vm.h
 .In vm/pmap.h
 .Ft void
-.Fo pmap_copy
-.Fa "pmap_t dst_pmap"
-.Fa "pmap_t src_pmap"
-.Fa "vm_offset_t dst_addr"
-.Fa "vm_size_t len"
-.Fa "vm_offset_t src_addr"
-.Fc
+.Fn pmap_copy "pmap_t dst_pmap" "pmap_t src_pmap" "vm_offset_t dst_addr" \
+"vm_size_t len" "vm_offset_t src_addr"
 .Ft void
 .Fn pmap_copy_page "vm_page_t src" "vm_page_t dst"
 .Sh DESCRIPTION
@@ -66,10 +61,10 @@
 .Fa src
 to the physical page
 .Fa dst ,
-by mapping the page into kernel virtual address space, and using
+by mapping the page into kernel virtual address space (KVA), and using
 .Fn bcopy
 to copy the page.
-.Sh NOTES
+.Sh IMPLEMENTATION NOTES
 The
 .Fn pmap_copy
 routine is only advisory and need not do anything.
@@ -82,5 +77,5 @@
 .Xr bcopy 3 ,
 .Xr pmap 9
 .Sh AUTHORS
-This man page was written by
+This manual page was written by
 .An Bruce M Simpson Aq bms@spc.org .
diff -ru pmap-orig/pmap_enter.9 pmap-new/pmap_enter.9
--- pmap-orig/pmap_enter.9	Mon Sep 22 17:52:30 2003
+++ pmap-new/pmap_enter.9	Mon Sep 22 16:49:16 2003
@@ -26,7 +26,7 @@
 .\" $FreeBSD$
 .\"
 .Dd July 21, 2003
-.Dt pmap_enter 9
+.Dt PMAP_ENTER 9
 .Sh NAME
 .Nm pmap_enter
 .Nd insert a virtual page into a physical map
@@ -35,13 +35,8 @@
 .In vm/vm.h
 .In vm/pmap.h
 .Ft void
-.Fo pmap_enter
-.Fa "pmap_t pmap"
-.Fa "vm_offset_t va"
-.Fa "vm_page_t p"
-.Fa "vm_prot_t prot"
-.Fa "boolean_t wired"
-.Fc
+.Fn pmap_enter "pmap_t pmap" "vm_offset_t va" "vm_page_t p" "vm_prot_t prot" \
+"boolean_t wired"
 .Sh DESCRIPTION
 The
 .Fn pmap_enter
@@ -58,13 +53,13 @@
 is
 .Dv TRUE ,
 then increment the wired count for the page as soon as the mapping
-is entered into
+is inserted into
 .Fa pmap .
-.Sh NOTES
+.Sh IMPLEMENTATION NOTES
 This routine MAY NOT lazy-evaluate the entry; it is required by
 specification to make the requested entry at the time it is called.
 .Sh SEE ALSO
 .Xr pmap 9
 .Sh AUTHORS
-This man page was written by
+This manual page was written by
 .An Bruce M Simpson Aq bms@spc.org .
diff -ru pmap-orig/pmap_extract.9 pmap-new/pmap_extract.9
--- pmap-orig/pmap_extract.9	Mon Sep 22 17:52:30 2003
+++ pmap-new/pmap_extract.9	Mon Sep 22 17:01:40 2003
@@ -26,9 +26,10 @@
 .\" $FreeBSD$
 .\"
 .Dd July 21, 2003
-.Dt pmap_extract 9
+.Dt PMAP_EXTRACT 9
 .Sh NAME
-.Nm pmap_extract
+.Nm pmap_extract ,
+.Nm pmap_extract_and_hold
 .Nd map a virtual address to a physical page
 .Sh SYNOPSIS
 .In sys/param.h
@@ -36,13 +37,26 @@
 .In vm/pmap.h
 .Ft vm_paddr_t
 .Fn pmap_extract "pmap_t pmap" "vm_offset_t va"
+.Ft vm_paddr_t
+.Fn pmap_extract_and_hold "pmap_t pmap" "vm_offset_t va" "vm_prot_t prot"
 .Sh DESCRIPTION
 The
 .Fn pmap_extract
 function maps a virtual address to a physical page.
-In certain situations, callers may use to use
-.Xr pmap_extract_and_hold 9
+In certain situations, callers may use
+.Fn pmap_extract_and_hold
 instead, to ensure that the returned page is held.
+.Pp
+The
+.Fn pmap_extract_and_hold
+function maps a virtual address to a physical page, and atomically holds
+the returned page for use by the caller, only if the mapping permits
+the given page protection.
+.Sh IMPLEMENTATION NOTES
+Currently, the page protection requested by the caller is not verified.
+Serialization is implemented using the
+.Dv Giant
+lock.
 .Sh RETURN VALUES
 The
 .Fn pmap_extract
@@ -52,9 +66,24 @@
 inside the physical map
 .Fa pmap .
 If the mapping does not exist, the result is undefined.
+.Pp
+The
+.Fn pmap_extract_and_hold
+function will return the physical page address associated with the
+virtual address
+.Fa va
+inside the physical map
+.Fa pmap .
+If the mapping does not exist, the result is a no-op, and NULL will
+be returned.
 .Sh SEE ALSO
-.Xr pmap 9 ,
-.Xr pmap_extract_and_hold 9
+.Xr mutex 9 ,
+.Xr pmap 9
 .Sh AUTHORS
-This man page was written by
+.An -nosplit
+The
+.Fn pmap_extract_and_hold
+function was implemented by
+.An Alan L. Cox Aq alc@imimic.com .
+This manual page was written by
 .An Bruce M Simpson Aq bms@spc.org .
Only in pmap-orig: pmap_extract_and_hold.9
diff -ru pmap-orig/pmap_growkernel.9 pmap-new/pmap_growkernel.9
--- pmap-orig/pmap_growkernel.9	Mon Sep 22 17:52:30 2003
+++ pmap-new/pmap_growkernel.9	Mon Sep 22 17:03:32 2003
@@ -26,10 +26,10 @@
 .\" $FreeBSD$
 .\"
 .Dd July 21, 2003
-.Dt pmap_growkernel 9
+.Dt PMAP_GROWKERNEL 9
 .Sh NAME
 .Nm pmap_growkernel
-.Nd grow the kernel virtual address space
+.Nd grow the kernel virtual address (KVA) space
 .Sh SYNOPSIS
 .In sys/param.h
 .In vm/vm.h
@@ -46,5 +46,5 @@
 .Sh SEE ALSO
 .Xr pmap 9
 .Sh AUTHORS
-This man page was written by
+This manual page was written by
 .An Bruce M Simpson Aq bms@spc.org .
diff -ru pmap-orig/pmap_init.9 pmap-new/pmap_init.9
--- pmap-orig/pmap_init.9	Mon Sep 22 17:52:30 2003
+++ pmap-new/pmap_init.9	Mon Sep 22 17:07:47 2003
@@ -26,7 +26,7 @@
 .\" $FreeBSD$
 .\"
 .Dd July 21, 2003
-.Dt pmap_init 9
+.Dt PMAP_INIT 9
 .Sh NAME
 .Nm pmap_init ,
 .Nm pmap_init2
@@ -42,16 +42,18 @@
 .Sh DESCRIPTION
 The
 .Fn pmap_init
-function initializes the pmap subsystem.
+function initializes the
+.Xr pmap 9
+sub-system.
 It is called during system initialization by
 .Fn vm_init ,
 to initialize any structures that the
 .Nm
 system needs in order to map between physical and virtual memory.
 .Pp
+The
 .Fn pmap_init
-has been enhanced to support discontiguous physical memory in a fairly
-consistent way.
+supports discontiguous physical memory in a fairly consistent way.
 The module will manage the range of physical pages between
 .Fa phys_start
 and
@@ -59,21 +61,12 @@
 .Pp
 The
 .Fn pmap_init2
-function initializes a zone for the pv entries.
+function initializes a zone for the PV entries.
 These are used to implement page sharing at the physical level.
 A high water mark is set so that the system can recover from
-excessive numbers of pv entries.
-.Sh NOTES
-If shared memory is heavily used within a system,
-the default pv entry count can be exhausted.
-The compile-time kernel tunable
-.Dv MAP_SHPGPERPROC
-can be used to increase this high water mark.
-This tunable was deprecated in
-.Fx 5.0 ,
-as the pv entries are now dynamically allocated.
+excessive numbers of PV entries.
 .Sh SEE ALSO
 .Xr pmap 9
 .Sh AUTHORS
-This man page was written by
+This manual page was written by
 .An Bruce M Simpson Aq bms@spc.org .
diff -ru pmap-orig/pmap_is_modified.9 pmap-new/pmap_is_modified.9
--- pmap-orig/pmap_is_modified.9	Mon Sep 22 17:52:30 2003
+++ pmap-new/pmap_is_modified.9	Mon Sep 22 17:10:55 2003
@@ -26,7 +26,7 @@
 .\" $FreeBSD$
 .\"
 .Dd July 21, 2003
-.Dt pmap_is_modified 9
+.Dt PMAP_IS_MODIFIED 9
 .Sh NAME
 .Nm pmap_is_modified ,
 .Nm pmap_ts_modified
@@ -48,8 +48,9 @@
 .Sh RETURN VALUES
 The
 .Fn pmap_is_modified
-function returns the status of the 'page modified' bit for the
-physical page
+function returns the status of the
+.Sq "page modified"
+bit for the physical page
 .Fa m .
 .Pp
 The
@@ -58,12 +59,12 @@
 .Fa m ,
 clearing those bits.
 It is not necessary for every reference bit to be cleared, but it is
-necessary that 0 only be returned when there are truly no reference
-bits set.
+necessary that 0 only be returned when there are no remaining reference
+bits set on the page.
 .Sh SEE ALSO
 .Xr pmap 9 ,
 .Xr pmap_clear_modify 9 ,
 .Xr pmap_clear_reference 9
 .Sh AUTHORS
-This man page was written by
+This manual page was written by
 .An Bruce M Simpson Aq bms@spc.org .
diff -ru pmap-orig/pmap_map.9 pmap-new/pmap_map.9
--- pmap-orig/pmap_map.9	Mon Sep 22 17:52:30 2003
+++ pmap-new/pmap_map.9	Mon Sep 22 17:22:44 2003
@@ -26,25 +26,21 @@
 .\" $FreeBSD$
 .\"
 .Dd July 21, 2003
-.Dt pmap_map 9
+.Dt PMAP_MAP 9
 .Sh NAME
 .Nm pmap_map
-.Nd map a physical memory range into kernel address space
+.Nd map a physical memory range into kernel virtual address (KVA) space
 .Sh SYNOPSIS
 .In sys/param.h
 .In vm/vm.h
 .In vm/pmap.h
 .Ft vm_offset_t
-.Fo pmap_map
-.Fa "vm_offset_t *virt"
-.Fa "vm_paddr_t start"
-.Fa "vm_paddr_t end"
-.Fa "int prot"
-.Fc
+.Fn pmap_map "vm_offset_t *virt" "vm_paddr_t start" "vm_paddr_t end" \
+"int prot"
 .Sh DESCRIPTION
 The
 .Fn pmap_map
-function maps a range of physical addresses into kernel virtual address
+function maps a range of physical addresses into kernel virtual address (KVA)
 space, from
 .Fa start
 to
@@ -55,6 +51,15 @@
 The value passed in
 .Fa *virt
 is treated as a hint for the virtual address of the beginning of the mapping.
+.Sh IMPLEMENTATION NOTES
+The
+.Fa prot
+argument is currently ignored by machine-dependent implementations.
+.Pp
+Architectures which can support a direct mapped physical to virtual region
+can return the appropriate address within that region, leaving
+.Fa *virt
+unchanged.
 .Sh RETURN VALUES
 The
 .Fn pmap_map
@@ -63,16 +68,11 @@
 .Fa *virt
 will also be updated with the first usable address after the mapped region.
 .Pp
-Architectures which can support a direct mapped physical to virtual region
-can return the appropriate address within that region, leaving
-.Fa *virt
-unchanged.
-.Pp
 If the function is unsuccessful,
 .Dv NULL
 is returned.
 .Sh SEE ALSO
 .Xr pmap 9
 .Sh AUTHORS
-This man page was written by
+This manual page was written by
 .An Bruce M Simpson Aq bms@spc.org .
diff -ru pmap-orig/pmap_mincore.9 pmap-new/pmap_mincore.9
--- pmap-orig/pmap_mincore.9	Mon Sep 22 17:52:30 2003
+++ pmap-new/pmap_mincore.9	Mon Sep 22 17:25:17 2003
@@ -26,7 +26,7 @@
 .\" $FreeBSD$
 .\"
 .Dd July 21, 2003
-.Dt pmap_mincore 9
+.Dt PMAP_MINCORE 9
 .Sh NAME
 .Nm pmap_mincore
 .Nd determine if a virtual address is resident in physical memory
@@ -53,20 +53,21 @@
 whose meaning is documented in
 .Xr mincore 2 ;
 otherwise,
-.Dv 0
+.Ql 0
 is returned.
 .Pp
 The
 .Fa pmap
 must exist and
 .Fa addr
-must be mapped into it.
-If any other error occurs, the machine-dependent implementation should
+must be mapped into the
+.Fa pmap .
+If any other errors occur, the machine-dependent implementation should
 return
-.Dv 0 .
+.Ql 0 .
 .Sh SEE ALSO
 .Xr mincore 2 ,
 .Xr pmap 9
 .Sh AUTHORS
-This man page was written by
+This manual page was written by
 .An Bruce M Simpson Aq bms@spc.org .
diff -ru pmap-orig/pmap_object_init_pt.9 pmap-new/pmap_object_init_pt.9
--- pmap-orig/pmap_object_init_pt.9	Mon Sep 22 17:52:30 2003
+++ pmap-new/pmap_object_init_pt.9	Mon Sep 22 18:03:16 2003
@@ -26,23 +26,17 @@
 .\" $FreeBSD$
 .\"
 .Dd July 21, 2003
-.Dt pmap_object_init_pt 9
+.Dt PMAP_OBJECT_INIT_PT 9
 .Sh NAME
 .Nm pmap_object_init_pt
-.Nd initialize page tables for a vm_object
+.Nd initialize page tables for a VM object
 .Sh SYNOPSIS
 .In sys/param.h
 .In vm/vm.h
 .In vm/pmap.h
 .Ft void
-.Fo pmap_object_init_pt
-.Fa "pmap_t pmap"
-.Fa "vm_offset_t addr"
-.Fa "vm_object_t object"
-.Fa "vm_pindex_t pindex"
-.Fa "vm_size_t size"
-.Fa "int limit"
-.Fc
+.Fn pmap_object_init_pt "pmap_t pmap" "vm_offset_t addr" "vm_object_t object" \
+"vm_pindex_t pindex" "vm_size_t size" "int limit"
 .Sh DESCRIPTION
 The
 .Fn pmap_object_init_pt
@@ -60,7 +54,7 @@
 The map bits
 .Fa limit
 are heeded when creating the mapping.
-.Sh NOTES
+.Sh IMPLEMENTATION NOTES
 This function is not strictly required by an architecture's
 .Xr pmap 9
 implementation, but it does provide performance benefits if implemented.
@@ -72,5 +66,5 @@
 .Xr pmap 9 ,
 .Xr vm_map 9
 .Sh AUTHORS
-This man page was written by
+This manual page was written by
 .An Bruce M Simpson Aq bms@spc.org .
diff -ru pmap-orig/pmap_page_exists_quick.9 pmap-new/pmap_page_exists_quick.9
--- pmap-orig/pmap_page_exists_quick.9	Mon Sep 22 17:52:30 2003
+++ pmap-new/pmap_page_exists_quick.9	Mon Sep 22 17:34:25 2003
@@ -29,7 +29,7 @@
 .Dt pmap_page_exists_quick 9
 .Sh NAME
 .Nm pmap_page_exists_quick
-.Nd determine if a page exists
+.Nd determine if a page exists in a physical map
 .Sh SYNOPSIS
 .In sys/param.h
 .In vm/vm.h
@@ -49,17 +49,17 @@
 .Fn pmap_page_exists_quick
 returns
 .Dv TRUE
-if and only if the pv entry for the physical map
+only if the PV entry for the physical map
 .Fa pmap
-is one of the first 16 pvs linked to from the page
+is one of the first 16 PVs linked from the page
 .Fa m .
-.Sh NOTES
-The pv count used above may be changed upwards or downwards in future;
+.Sh IMPLEMENTATION NOTES
+The PV count used above may be changed upwards or downwards in future;
 it is only necessary that
 .Dv TRUE
 be returned for a small subset of pmaps for proper page aging.
 .Sh SEE ALSO
 .Xr pmap 9
 .Sh AUTHORS
-This man page was written by
+This manual page was written by
 .An Bruce M Simpson Aq bms@spc.org .
diff -ru pmap-orig/pmap_page_protect.9 pmap-new/pmap_page_protect.9
--- pmap-orig/pmap_page_protect.9	Mon Sep 22 17:52:30 2003
+++ pmap-new/pmap_page_protect.9	Mon Sep 22 17:35:49 2003
@@ -26,7 +26,7 @@
 .\" $FreeBSD$
 .\"
 .Dd July 21, 2003
-.Dt pmap_protect 9
+.Dt PMAP_PROTECT 9
 .Sh NAME
 .Nm pmap_page_protect ,
 .Nm pmap_protect
@@ -38,7 +38,8 @@
 .Ft void
 .Fn pmap_page_protect "vm_page_t m" "vm_prot_t prot"
 .Ft void
-.Fn pmap_protect "pmap_t pmap" "vm_offset_t sva" "vm_offset_t eva" "vm_prot_t pr
+.Fn pmap_protect "pmap_t pmap" "vm_offset_t sva" "vm_offset_t eva" \
+"vm_prot_t pr"
 .Sh DESCRIPTION
 The
 .Fn pmap_page_protect
@@ -60,5 +61,5 @@
 .Sh SEE ALSO
 .Xr pmap 9
 .Sh AUTHORS
-This man page was written by
+This manual page was written by
 .An Bruce M Simpson Aq bms@spc.org .
diff -ru pmap-orig/pmap_pinit.9 pmap-new/pmap_pinit.9
--- pmap-orig/pmap_pinit.9	Mon Sep 22 17:52:30 2003
+++ pmap-new/pmap_pinit.9	Mon Sep 22 17:39:17 2003
@@ -26,7 +26,7 @@
 .\" $FreeBSD$
 .\"
 .Dd July 21, 2003
-.Dt pmap_pinit 9
+.Dt PMAP_PINIT 9
 .Sh NAME
 .Nm pmap_pinit ,
 .Nm pmap_pinit0 ,
@@ -47,7 +47,9 @@
 .Fn pmap_pinit
 function initializes the preallocated and zeroed structure
 .Fa pmap ,
-such as one in a vmspace structure.
+such as one in a
+.Vt vmspace
+structure.
 .Pp
 The
 .Fn pmap_pinit0
@@ -71,13 +73,14 @@
 is attached to the process but before this
 .Fa pmap
 is activated.
-.Sh NOTES
+.Sh IMPLEMENTATION NOTES
 The
 .Fn pmap_pinit2
 function has been deprecated, and should be implemented as a stub
 until further notice.
 .Sh SEE ALSO
-.Xr pmap 9
+.Xr pmap 9 ,
+.Xr pmap_growkernel 9
 .Sh AUTHORS
-This man page was written by
+This manual page was written by
 .An Bruce M Simpson Aq bms@spc.org .
diff -ru pmap-orig/pmap_prefault.9 pmap-new/pmap_prefault.9
--- pmap-orig/pmap_prefault.9	Mon Sep 22 17:52:30 2003
+++ pmap-new/pmap_prefault.9	Mon Sep 22 17:41:19 2003
@@ -26,10 +26,10 @@
 .\" $FreeBSD$
 .\"
 .Dd July 21, 2003
-.Dt pmap_prefault 9
+.Dt PMAP_PREFAULT 9
 .Sh NAME
 .Nm pmap_prefault
-.Nd cluster page faults into a process address space
+.Nd cluster page faults into a process's address space
 .Sh SYNOPSIS
 .In sys/param.h
 .In vm/vm.h
@@ -63,5 +63,5 @@
 .Xr execve 2 ,
 .Xr pmap 9
 .Sh AUTHORS
-This man page was written by
+This manual page was written by
 .An Bruce M Simpson Aq bms@spc.org .
diff -ru pmap-orig/pmap_qenter.9 pmap-new/pmap_qenter.9
--- pmap-orig/pmap_qenter.9	Mon Sep 22 17:52:30 2003
+++ pmap-new/pmap_qenter.9	Mon Sep 22 17:46:26 2003
@@ -17,7 +17,8 @@
 .\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
 .\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 .\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) .\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
@@ -25,7 +26,7 @@
 .\" $FreeBSD$
 .\"
 .Dd July 21, 2003
-.Dt pmap_qenter 9
+.Dt PMAP_QENTER 9
 .Sh NAME
 .Nm pmap_qenter ,
 .Nm pmap_qremove
@@ -45,7 +46,7 @@
 .Fa count
 pointers to wired pages
 .Fa *m ,
-and enters each of these pages into the kernel virtual address space,
+and enters each of these pages into the kernel virtual address (KVA) space,
 beginning at the address
 .Fa sva .
 .Pp
@@ -57,7 +58,7 @@
 and for
 .Fa count
 pages.
-.Sh NOTES
+.Sh IMPLEMENTATION NOTES
 The
 .Fn pmap_qenter
 function is intended for temporary mappings that do not require page
@@ -73,5 +74,5 @@
 .Sh SEE ALSO
 .Xr pmap 9
 .Sh AUTHORS
-This man page was written by
+This manual page was written by
 .An Bruce M Simpson Aq bms@spc.org .
diff -ru pmap-orig/pmap_release.9 pmap-new/pmap_release.9
--- pmap-orig/pmap_release.9	Mon Sep 22 17:52:30 2003
+++ pmap-new/pmap_release.9	Mon Sep 22 17:42:57 2003
@@ -26,7 +26,7 @@
 .\" $FreeBSD$
 .\"
 .Dd July 21, 2003
-.Dt pmap_release 9
+.Dt PMAP_RELEASE 9
 .Sh NAME
 .Nm pmap_release
 .Nd release resources held by a physical map
@@ -41,10 +41,11 @@
 .Fn pmap_release
 function releases any resources held by the physical map
 .Fa pmap .
-Called when a pmap initialized by the corresponding function,
+This function is
+called when a pmap initialized by the corresponding function,
 .Fn pmap_pinit
 is being released.
-.Sh NOTES
+.Sh IMPLEMENTATION NOTES
 This function should only be called if
 .Fa pmap
 no longer contains any valid mappings.
@@ -52,5 +53,5 @@
 .Xr pmap 9 ,
 .Xr pmap_pinit 9
 .Sh AUTHORS
-This man page was written by
+This manual page was written by
 .An Bruce M Simpson Aq bms@spc.org .
diff -ru pmap-orig/pmap_remove.9 pmap-new/pmap_remove.9
--- pmap-orig/pmap_remove.9	Mon Sep 22 17:52:30 2003
+++ pmap-new/pmap_remove.9	Mon Sep 22 17:48:10 2003
@@ -26,7 +26,7 @@
 .\" $FreeBSD$
 .\"
 .Dd July 21, 2003
-.Dt pmap_remove 9
+.Dt PMAP_REMOVE 9
 .Sh NAME
 .Nm pmap_remove ,
 .Nm pmap_remove_all ,
@@ -83,5 +83,5 @@
 .Sh SEE ALSO
 .Fn pmap 9
 .Sh AUTHORS
-This man page was written by
+This manual page was written by
 .An Bruce M Simpson Aq bms@spc.org .
diff -ru pmap-orig/pmap_zero_page.9 pmap-new/pmap_zero_page.9
--- pmap-orig/pmap_zero_page.9	Mon Sep 22 17:52:30 2003
+++ pmap-new/pmap_zero_page.9	Mon Sep 22 17:51:44 2003
@@ -26,7 +26,7 @@
 .\" $FreeBSD$
 .\"
 .Dd July 21, 2003
-.Dt pmap_zero 9
+.Dt PMAP_ZERO 9
 .Sh NAME
 .Nm pmap_zero_page ,
 .Nm pmap_zero_area ,
@@ -54,18 +54,18 @@
 .Pp
 The
 .Fn pmap_zero_page_idle
-interface is used by the 
+interface is used by the
 .Em vm_pagezero
 process.
 The system-wide
 .Fa Giant
 lock should not be required to be held in order to call this interface.
-.Sh NOTES
+.Sh IMPLEMENTATION NOTES
 This function is required to be implemented for each architecture supported by
 .Fx .
 .Sh SEE ALSO
 .Xr bzero 3 ,
 .Xr pmap 9
 .Sh AUTHORS
-This man page was written by
+This manual page was written by
 .An Bruce M Simpson Aq bms@spc.org .