121 files changed, 331 insertions, 171 deletions

diff --git a/lib/libc_r/man/pthread_cancel.3 b/lib/libc_r/man/pthread_cancel.3
index dd03f613ab127..9a741d8950f1a 100644
--- a/lib/libc_r/man/pthread_cancel.3
+++ b/lib/libc_r/man/pthread_cancel.3
@@ -5,6 +5,8 @@
 .Sh NAME
 .Nm pthread_cancel
 .Nd cancel execution of a thread
+.Sh LIBRARY
+.Lb libc_r
 .Sh SYNOPSIS
 .Fd #include <pthread.h>
 .Ft int
diff --git a/lib/libc_r/man/pthread_cleanup_pop.3 b/lib/libc_r/man/pthread_cleanup_pop.3
index 009a85e91d9a7..a2f78945b0627 100644
--- a/lib/libc_r/man/pthread_cleanup_pop.3
+++ b/lib/libc_r/man/pthread_cleanup_pop.3
@@ -33,6 +33,8 @@
 .Sh NAME
 .Nm pthread_cleanup_pop
 .Nd call the first cleanup routine
+.Sh LIBRARY
+.Lb libc_r
 .Sh SYNOPSIS
 .Fd #include <pthread.h>
 .Ft void
diff --git a/lib/libc_r/man/pthread_cleanup_push.3 b/lib/libc_r/man/pthread_cleanup_push.3
index 4f260affbc325..103daa68a7c24 100644
--- a/lib/libc_r/man/pthread_cleanup_push.3
+++ b/lib/libc_r/man/pthread_cleanup_push.3
@@ -33,6 +33,8 @@
 .Sh NAME
 .Nm pthread_cleanup_push
 .Nd add a cleanup function for thread exit
+.Sh LIBRARY
+.Lb libc_r
 .Sh SYNOPSIS
 .Fd #include <pthread.h>
 .Ft void
diff --git a/lib/libc_r/man/pthread_cond_broadcast.3 b/lib/libc_r/man/pthread_cond_broadcast.3
index 6112695c9893e..c380ecebbb621 100644
--- a/lib/libc_r/man/pthread_cond_broadcast.3
+++ b/lib/libc_r/man/pthread_cond_broadcast.3
@@ -33,6 +33,8 @@
 .Sh NAME
 .Nm pthread_cond_broadcast
 .Nd unblock all threads waiting for a condition variable
+.Sh LIBRARY
+.Lb libc_r
 .Sh SYNOPSIS
 .Fd #include <pthread.h>
 .Ft int
diff --git a/lib/libc_r/man/pthread_cond_destroy.3 b/lib/libc_r/man/pthread_cond_destroy.3
index a9c4a9dbbdf78..bf8bbf38d6e26 100644
--- a/lib/libc_r/man/pthread_cond_destroy.3
+++ b/lib/libc_r/man/pthread_cond_destroy.3
@@ -33,6 +33,8 @@
 .Sh NAME
 .Nm pthread_cond_destroy
 .Nd destroy a condition variable
+.Sh LIBRARY
+.Lb libc_r
 .Sh SYNOPSIS
 .Fd #include <pthread.h>
 .Ft int
diff --git a/lib/libc_r/man/pthread_cond_init.3 b/lib/libc_r/man/pthread_cond_init.3
index 2783672ce3d97..6c7ccca5108e7 100644
--- a/lib/libc_r/man/pthread_cond_init.3
+++ b/lib/libc_r/man/pthread_cond_init.3
@@ -33,6 +33,8 @@
 .Sh NAME
 .Nm pthread_cond_init
 .Nd create a condition variable
+.Sh LIBRARY
+.Lb libc_r
 .Sh SYNOPSIS
 .Fd #include <pthread.h>
 .Ft int
diff --git a/lib/libc_r/man/pthread_cond_signal.3 b/lib/libc_r/man/pthread_cond_signal.3
index e3a22f88cf6ca..7ad985e2b4c4a 100644
--- a/lib/libc_r/man/pthread_cond_signal.3
+++ b/lib/libc_r/man/pthread_cond_signal.3
@@ -33,6 +33,8 @@
 .Sh NAME
 .Nm pthread_cond_signal
 .Nd unblock a thread waiting for a condition variable
+.Sh LIBRARY
+.Lb libc_r
 .Sh SYNOPSIS
 .Fd #include <pthread.h>
 .Ft int
diff --git a/lib/libc_r/man/pthread_cond_timedwait.3 b/lib/libc_r/man/pthread_cond_timedwait.3
index 15f4bb3d64c39..a5fa52b3a0310 100644
--- a/lib/libc_r/man/pthread_cond_timedwait.3
+++ b/lib/libc_r/man/pthread_cond_timedwait.3
@@ -33,6 +33,8 @@
 .Sh NAME
 .Nm pthread_cond_timedwait
 .Nd wait on a condition variable for a specific amount of time
+.Sh LIBRARY
+.Lb libc_r
 .Sh SYNOPSIS
 .Fd #include <pthread.h>
 .Ft int
diff --git a/lib/libc_r/man/pthread_cond_wait.3 b/lib/libc_r/man/pthread_cond_wait.3
index e93114c7d9247..9d70318ed3357 100644
--- a/lib/libc_r/man/pthread_cond_wait.3
+++ b/lib/libc_r/man/pthread_cond_wait.3
@@ -33,6 +33,8 @@
 .Sh NAME
 .Nm pthread_cond_wait
 .Nd wait on a condition variable
+.Sh LIBRARY
+.Lb libc_r
 .Sh SYNOPSIS
 .Fd #include <pthread.h>
 .Ft int
diff --git a/lib/libc_r/man/pthread_create.3 b/lib/libc_r/man/pthread_create.3
index 3e1ed04e80aa0..2f760d0c6b510 100644
--- a/lib/libc_r/man/pthread_create.3
+++ b/lib/libc_r/man/pthread_create.3
@@ -36,6 +36,8 @@
 .Sh NAME
 .Nm pthread_create
 .Nd create a new thread
+.Sh LIBRARY
+.Lb libc_r
 .Sh SYNOPSIS
 .Fd #include <pthread.h>
 .Ft int
diff --git a/lib/libc_r/man/pthread_detach.3 b/lib/libc_r/man/pthread_detach.3
index 120248d19d985..05154fc085d51 100644
--- a/lib/libc_r/man/pthread_detach.3
+++ b/lib/libc_r/man/pthread_detach.3
@@ -36,6 +36,8 @@
 .Sh NAME
 .Nm pthread_detach
 .Nd detach a thread
+.Sh LIBRARY
+.Lb libc_r
 .Sh SYNOPSIS
 .Fd #include <pthread.h>
 .Ft int
diff --git a/lib/libc_r/man/pthread_equal.3 b/lib/libc_r/man/pthread_equal.3
index 5d443b3cb2c69..9e9f5c7829ff1 100644
--- a/lib/libc_r/man/pthread_equal.3
+++ b/lib/libc_r/man/pthread_equal.3
@@ -36,6 +36,8 @@
 .Sh NAME
 .Nm pthread_equal
 .Nd compare thread IDs
+.Sh LIBRARY
+.Lb libc_r
 .Sh SYNOPSIS
 .Fd #include <pthread.h>
 .Ft int
diff --git a/lib/libc_r/man/pthread_exit.3 b/lib/libc_r/man/pthread_exit.3
index a5ff1b96ea9d9..491856e1637e9 100644
--- a/lib/libc_r/man/pthread_exit.3
+++ b/lib/libc_r/man/pthread_exit.3
@@ -36,6 +36,8 @@
 .Sh NAME
 .Nm pthread_exit
 .Nd terminate the calling thread
+.Sh LIBRARY
+.Lb libc_r
 .Sh SYNOPSIS
 .Fd #include <pthread.h>
 .Ft void
diff --git a/lib/libc_r/man/pthread_getspecific.3 b/lib/libc_r/man/pthread_getspecific.3
index a56254108f6e9..9900d29652230 100644
--- a/lib/libc_r/man/pthread_getspecific.3
+++ b/lib/libc_r/man/pthread_getspecific.3
@@ -36,6 +36,8 @@
 .Sh NAME
 .Nm pthread_getspecific
 .Nd get a thread-specific data value
+.Sh LIBRARY
+.Lb libc_r
 .Sh SYNOPSIS
 .Fd #include <pthread.h>
 .Ft void *
diff --git a/lib/libc_r/man/pthread_join.3 b/lib/libc_r/man/pthread_join.3
index 2e5ae40c105a3..d6a42e536829c 100644
--- a/lib/libc_r/man/pthread_join.3
+++ b/lib/libc_r/man/pthread_join.3
@@ -36,6 +36,8 @@
 .Sh NAME
 .Nm pthread_join
 .Nd wait for thread termination
+.Sh LIBRARY
+.Lb libc_r
 .Sh SYNOPSIS
 .Fd #include <pthread.h>
 .Ft int
diff --git a/lib/libc_r/man/pthread_key_create.3 b/lib/libc_r/man/pthread_key_create.3
index 376ecf2fb542b..f6a1d9c9e150b 100644
--- a/lib/libc_r/man/pthread_key_create.3
+++ b/lib/libc_r/man/pthread_key_create.3
@@ -36,6 +36,8 @@
 .Sh NAME
 .Nm pthread_key_create
 .Nd thread-specific data key creation
+.Sh LIBRARY
+.Lb libc_r
 .Sh SYNOPSIS
 .Fd #include <pthread.h>
 .Ft int
diff --git a/lib/libc_r/man/pthread_key_delete.3 b/lib/libc_r/man/pthread_key_delete.3
index 25f110f3be0ba..e735eb62063db 100644
--- a/lib/libc_r/man/pthread_key_delete.3
+++ b/lib/libc_r/man/pthread_key_delete.3
@@ -36,6 +36,8 @@
 .Sh NAME
 .Nm pthread_key_delete
 .Nd delete a thread-specific data key
+.Sh LIBRARY
+.Lb libc_r
 .Sh SYNOPSIS
 .Fd #include <pthread.h>
 .Ft int
diff --git a/lib/libc_r/man/pthread_mutex_destroy.3 b/lib/libc_r/man/pthread_mutex_destroy.3
index 517d6ebadf5df..87384dc925a00 100644
--- a/lib/libc_r/man/pthread_mutex_destroy.3
+++ b/lib/libc_r/man/pthread_mutex_destroy.3
@@ -33,6 +33,8 @@
 .Sh NAME
 .Nm pthread_mutex_destroy
 .Nd free resources allocated for a mutex
+.Sh LIBRARY
+.Lb libc_r
 .Sh SYNOPSIS
 .Fd #include <pthread.h>
 .Ft int
diff --git a/lib/libc_r/man/pthread_mutex_init.3 b/lib/libc_r/man/pthread_mutex_init.3
index 926b034b6011a..ba19e3ba5005b 100644
--- a/lib/libc_r/man/pthread_mutex_init.3
+++ b/lib/libc_r/man/pthread_mutex_init.3
@@ -33,6 +33,8 @@
 .Sh NAME
 .Nm pthread_mutex_init
 .Nd create a mutex
+.Sh LIBRARY
+.Lb libc_r
 .Sh SYNOPSIS
 .Fd #include <pthread.h>
 .Ft int
diff --git a/lib/libc_r/man/pthread_mutex_lock.3 b/lib/libc_r/man/pthread_mutex_lock.3
index 36473733ce11d..0c6419ae819e8 100644
--- a/lib/libc_r/man/pthread_mutex_lock.3
+++ b/lib/libc_r/man/pthread_mutex_lock.3
@@ -33,6 +33,8 @@
 .Sh NAME
 .Nm pthread_mutex_lock
 .Nd lock a mutex
+.Sh LIBRARY
+.Lb libc_r
 .Sh SYNOPSIS
 .Fd #include <pthread.h>
 .Ft int
diff --git a/lib/libc_r/man/pthread_mutex_trylock.3 b/lib/libc_r/man/pthread_mutex_trylock.3
index 30faaa81bd4da..268a558d3bab6 100644
--- a/lib/libc_r/man/pthread_mutex_trylock.3
+++ b/lib/libc_r/man/pthread_mutex_trylock.3
@@ -33,6 +33,8 @@
 .Sh NAME
 .Nm pthread_mutex_trylock
 .Nd attempt to lock a mutex without blocking
+.Sh LIBRARY
+.Lb libc_r
 .Sh SYNOPSIS
 .Fd #include <pthread.h>
 .Ft int
diff --git a/lib/libc_r/man/pthread_mutex_unlock.3 b/lib/libc_r/man/pthread_mutex_unlock.3
index 27a4c337fe37c..29d5c61a7f357 100644
--- a/lib/libc_r/man/pthread_mutex_unlock.3
+++ b/lib/libc_r/man/pthread_mutex_unlock.3
@@ -33,6 +33,8 @@
 .Sh NAME
 .Nm pthread_mutex_unlock
 .Nd unlock a mutex
+.Sh LIBRARY
+.Lb libc_r
 .Sh SYNOPSIS
 .Fd #include <pthread.h>
 .Ft int
diff --git a/lib/libc_r/man/pthread_once.3 b/lib/libc_r/man/pthread_once.3
index 8cd894abbd19e..af203fc31a2d8 100644
--- a/lib/libc_r/man/pthread_once.3
+++ b/lib/libc_r/man/pthread_once.3
@@ -36,6 +36,8 @@
 .Sh NAME
 .Nm pthread_once
 .Nd dynamic package initialization
+.Sh LIBRARY
+.Lb libc_r
 .Sh SYNOPSIS
 .Fd #include <pthread.h>
 .Pp
diff --git a/lib/libc_r/man/pthread_rwlock_destroy.3 b/lib/libc_r/man/pthread_rwlock_destroy.3
index 14691c44bbf89..bd1bfe8360f7f 100644
--- a/lib/libc_r/man/pthread_rwlock_destroy.3
+++ b/lib/libc_r/man/pthread_rwlock_destroy.3
@@ -30,6 +30,8 @@
 .Sh NAME
 .Nm pthread_rwlock_destroy
 .Nd destroy a read/write lock
+.Sh LIBRARY
+.Lb libc_r
 .Sh SYNOPSIS
 .Fd #include <pthread.h>
 .Ft int
diff --git a/lib/libc_r/man/pthread_rwlock_init.3 b/lib/libc_r/man/pthread_rwlock_init.3
index 306af61bbeb4c..128f5d12d47e8 100644
--- a/lib/libc_r/man/pthread_rwlock_init.3
+++ b/lib/libc_r/man/pthread_rwlock_init.3
@@ -30,6 +30,8 @@
 .Sh NAME
 .Nm pthread_rwlock_init
 .Nd initialize a read/write lock
+.Sh LIBRARY
+.Lb libc_r
 .Sh SYNOPSIS
 .Fd #include <pthread.h>
 .Ft int
diff --git a/lib/libc_r/man/pthread_rwlock_rdlock.3 b/lib/libc_r/man/pthread_rwlock_rdlock.3
index bea219de0100f..d3ec9efe14cc5 100644
--- a/lib/libc_r/man/pthread_rwlock_rdlock.3
+++ b/lib/libc_r/man/pthread_rwlock_rdlock.3
@@ -31,6 +31,8 @@
 .Nm pthread_rwlock_rdlock ,
 .Nm pthread_rwlock_tryrdlock
 .Nd acquire a read/write lock for reading
+.Sh LIBRARY
+.Lb libc_r
 .Sh SYNOPSIS
 .Fd #include <pthread.h>
 .Ft int
diff --git a/lib/libc_r/man/pthread_rwlock_unlock.3 b/lib/libc_r/man/pthread_rwlock_unlock.3
index 7ad52b2571201..f99b9558663a1 100644
--- a/lib/libc_r/man/pthread_rwlock_unlock.3
+++ b/lib/libc_r/man/pthread_rwlock_unlock.3
@@ -30,6 +30,8 @@
 .Sh NAME
 .Nm pthread_rwlock_unlock
 .Nd release a read/write lock
+.Sh LIBRARY
+.Lb libc_r
 .Sh SYNOPSIS
 .Fd #include <pthread.h>
 .Ft int
diff --git a/lib/libc_r/man/pthread_rwlock_wrlock.3 b/lib/libc_r/man/pthread_rwlock_wrlock.3
index b6a2312a79d6d..149a7a0fb450e 100644
--- a/lib/libc_r/man/pthread_rwlock_wrlock.3
+++ b/lib/libc_r/man/pthread_rwlock_wrlock.3
@@ -31,6 +31,8 @@
 .Nm pthread_rwlock_wrlock ,
 .Nm pthread_rwlock_trywrlock
 .Nd acquire a read/write lock for writing
+.Sh LIBRARY
+.Lb libc_r
 .Sh SYNOPSIS
 .Fd #include <pthread.h>
 .Ft int
diff --git a/lib/libc_r/man/pthread_rwlockattr_destroy.3 b/lib/libc_r/man/pthread_rwlockattr_destroy.3
index 2d67041ba1614..80db1a95882de 100644
--- a/lib/libc_r/man/pthread_rwlockattr_destroy.3
+++ b/lib/libc_r/man/pthread_rwlockattr_destroy.3
@@ -30,6 +30,8 @@
 .Sh NAME
 .Nm pthread_rwlockattr_destroy
 .Nd destroy a read/write lock
+.Sh LIBRARY
+.Lb libc_r
 .Sh SYNOPSIS
 .Fd #include <pthread.h>
 .Ft int
diff --git a/lib/libc_r/man/pthread_rwlockattr_getpshared.3 b/lib/libc_r/man/pthread_rwlockattr_getpshared.3
index d2028dc58c6d9..7637a4f7494c5 100644
--- a/lib/libc_r/man/pthread_rwlockattr_getpshared.3
+++ b/lib/libc_r/man/pthread_rwlockattr_getpshared.3
@@ -30,6 +30,8 @@
 .Sh NAME
 .Nm pthread_rwlockattr_getpshared
 .Nd get the process shared attribute
+.Sh LIBRARY
+.Lb libc_r
 .Sh SYNOPSIS
 .Fd #include <pthread.h>
 .Ft int
diff --git a/lib/libc_r/man/pthread_rwlockattr_init.3 b/lib/libc_r/man/pthread_rwlockattr_init.3
index ac191260c66d6..c35510468e962 100644
--- a/lib/libc_r/man/pthread_rwlockattr_init.3
+++ b/lib/libc_r/man/pthread_rwlockattr_init.3
@@ -30,6 +30,8 @@
 .Sh NAME
 .Nm pthread_rwlockattr_init
 .Nd initialize a read/write lock
+.Sh LIBRARY
+.Lb libc_r
 .Sh SYNOPSIS
 .Fd #include <pthread.h>
 .Ft int
diff --git a/lib/libc_r/man/pthread_rwlockattr_setpshared.3 b/lib/libc_r/man/pthread_rwlockattr_setpshared.3
index 4e4b15812c260..b2c16eb5b7363 100644
--- a/lib/libc_r/man/pthread_rwlockattr_setpshared.3
+++ b/lib/libc_r/man/pthread_rwlockattr_setpshared.3
@@ -30,6 +30,8 @@
 .Sh NAME
 .Nm pthread_rwlockattr_setpshared
 .Nd set the process shared attribute
+.Sh LIBRARY
+.Lb libc_r
 .Sh SYNOPSIS
 .Fd #include <pthread.h>
 .Ft int
diff --git a/lib/libc_r/man/pthread_self.3 b/lib/libc_r/man/pthread_self.3
index be524b9345b98..c196875cc529c 100644
--- a/lib/libc_r/man/pthread_self.3
+++ b/lib/libc_r/man/pthread_self.3
@@ -36,6 +36,8 @@
 .Sh NAME
 .Nm pthread_self
 .Nd get the calling thread's ID
+.Sh LIBRARY
+.Lb libc_r
 .Sh SYNOPSIS
 .Fd #include <pthread.h>
 .Ft pthread_t
diff --git a/lib/libc_r/man/pthread_setspecific.3 b/lib/libc_r/man/pthread_setspecific.3
index ca141deb3c81c..2ab28de623c34 100644
--- a/lib/libc_r/man/pthread_setspecific.3
+++ b/lib/libc_r/man/pthread_setspecific.3
@@ -36,6 +36,8 @@
 .Sh NAME
 .Nm pthread_setspecific
 .Nd set a thread-specific data value
+.Sh LIBRARY
+.Lb libc_r
 .Sh SYNOPSIS
 .Fd #include <pthread.h>
 .Ft int
diff --git a/lib/libc_r/man/pthread_testcancel.3 b/lib/libc_r/man/pthread_testcancel.3
index d911d2c647f3d..c1bbc7d07c7ba 100644
--- a/lib/libc_r/man/pthread_testcancel.3
+++ b/lib/libc_r/man/pthread_testcancel.3
@@ -7,6 +7,8 @@
 .Nm pthread_setcanceltype ,
 .Nm pthread_testcancel
 .Nd set cancelability state
+.Sh LIBRARY
+.Lb libc_r
 .Sh SYNOPSIS
 .Fd #include <pthread.h>
 .Ft int
diff --git a/lib/libc_r/man/sem_destroy.3 b/lib/libc_r/man/sem_destroy.3
index 770349dee2811..59889a282fdea 100644
--- a/lib/libc_r/man/sem_destroy.3
+++ b/lib/libc_r/man/sem_destroy.3
@@ -32,6 +32,8 @@
 .Sh NAME
 .Nm sem_destroy
 .Nd destroy an unnamed semaphore
+.Sh LIBRARY
+.Lb libc_r
 .Sh SYNOPSIS
 .Fd #include <semaphore.h>
 .Ft int
diff --git a/lib/libc_r/man/sem_getvalue.3 b/lib/libc_r/man/sem_getvalue.3
index be0cbae8ca7b6..bc71e4d6c3e02 100644
--- a/lib/libc_r/man/sem_getvalue.3
+++ b/lib/libc_r/man/sem_getvalue.3
@@ -32,6 +32,8 @@
 .Sh NAME
 .Nm sem_getvalue
 .Nd get the value of a semaphore
+.Sh LIBRARY
+.Lb libc_r
 .Sh SYNOPSIS
 .Fd #include <semaphore.h>
 .Ft int
diff --git a/lib/libc_r/man/sem_init.3 b/lib/libc_r/man/sem_init.3
index 059a9c6aeba51..bc5a5ddf7f13e 100644
--- a/lib/libc_r/man/sem_init.3
+++ b/lib/libc_r/man/sem_init.3
@@ -32,6 +32,8 @@
 .Sh NAME
 .Nm sem_init
 .Nd initialize an unnamed semaphore
+.Sh LIBRARY
+.Lb libc_r
 .Sh SYNOPSIS
 .Fd #include <semaphore.h>
 .Ft int
diff --git a/lib/libc_r/man/sem_open.3 b/lib/libc_r/man/sem_open.3
index a4729f97961bb..b2fe7ff26adf7 100644
--- a/lib/libc_r/man/sem_open.3
+++ b/lib/libc_r/man/sem_open.3
@@ -34,6 +34,8 @@
 .Nm sem_close , 
 .Nm sem_unlink
 .Nd named semaphore operations
+.Sh LIBRARY
+.Lb libc_r
 .Sh SYNOPSIS
 .Fd #include <semaphore.h>
 .Ft sem_t *
diff --git a/lib/libc_r/man/sem_post.3 b/lib/libc_r/man/sem_post.3
index c578e6d04e845..ee8d7e56137f3 100644
--- a/lib/libc_r/man/sem_post.3
+++ b/lib/libc_r/man/sem_post.3
@@ -32,6 +32,8 @@
 .Sh NAME
 .Nm sem_post
 .Nd increment (unlock) a semaphore
+.Sh LIBRARY
+.Lb libc_r
 .Sh SYNOPSIS
 .Fd #include <semaphore.h>
 .Ft int
diff --git a/lib/libc_r/man/sem_wait.3 b/lib/libc_r/man/sem_wait.3
index c60c8ee6cc677..9c4107e14101e 100644
--- a/lib/libc_r/man/sem_wait.3
+++ b/lib/libc_r/man/sem_wait.3
@@ -33,6 +33,8 @@
 .Nm sem_wait , 
 .Nm sem_trywait
 .Nd decrement (lock) a semaphore
+.Sh LIBRARY
+.Lb libc_r
 .Sh SYNOPSIS
 .Fd #include <semaphore.h>
 .Ft int
diff --git a/lib/libcalendar/calendar.3 b/lib/libcalendar/calendar.3
index 1c760e6ebadbb..090e119172430 100644
--- a/lib/libcalendar/calendar.3
+++ b/lib/libcalendar/calendar.3
@@ -38,6 +38,8 @@
 .Nm week ,
 .Nm weekday
 .Nd Calendar arithmetic for the Christian era.
+.Sh LIBRARY
+.Lb libcalendar
 .Sh SYNOPSIS
 .Fd #include <calendar.h>
 .Ft struct date *
diff --git a/lib/libcam/cam.3 b/lib/libcam/cam.3
index 8cd898c74da78..dede35284cefe 100644
--- a/lib/libcam/cam.3
+++ b/lib/libcam/cam.3
@@ -45,6 +45,8 @@
 .Nm cam_device_copy ,
 .Nm cam_get_device
 .Nd CAM user library
+.Sh LIBRARY
+.Lb libcam
 .Sh SYNOPSIS
 .Fd #include <stdio.h>
 .Fd #include <camlib.h>
diff --git a/lib/libcam/cam_cdbparse.3 b/lib/libcam/cam_cdbparse.3
index 42c5dac442254..ef14f2de848f7 100644
--- a/lib/libcam/cam_cdbparse.3
+++ b/lib/libcam/cam_cdbparse.3
@@ -75,6 +75,8 @@
 .Nm csio_encode_visit ,
 .Nm buff_encode_visit
 .Nd CAM user library SCSI buffer parsing routines
+.Sh LIBRARY
+.Lb libcam
 .Sh SYNOPSIS
 .Fd #include <stdio.h>
 .Fd #include <camlib.h>
diff --git a/lib/libcrypt/crypt.3 b/lib/libcrypt/crypt.3
index 7059e6032c1e8..46dab45b1ab42 100644
--- a/lib/libcrypt/crypt.3
+++ b/lib/libcrypt/crypt.3
@@ -37,6 +37,8 @@
 .Sh NAME
 .Nm crypt
 .Nd Trapdoor encryption
+.Sh LIBRARY
+.Lb libcrypt
 .Sh SYNOPSIS
 .Fd #include <unistd.h>
 .Ft char *
@@ -54,12 +56,17 @@ in the hash.
 .\"
 Currently these include the
 .Tn NBS
-Data Encryption Standard (DES), MD5 or SHS.  The algorithm
-used will depend upon the format of the Salt--following the Modular
-Crypt Format (MCF)--and if DES is installed or not.
+.Tn Data Encryption Standard (DES) ,
+.Tn MD5
+or
+.Tn SHS .
+The algorithm used will depend upon the format of the Salt--following
+the Modular Crypt Format (MCF)--and if
+.Tn DES
+is installed or not.
 .Pp
 The first argument to
-.Nm crypt
+.Nm
 is the data to hash (usually a password), in a
 .Dv null Ns -terminated
 string.
@@ -67,18 +74,26 @@ The second is the salt, in one of three forms:
 .Pp
 .Bl -tag -width Traditional -compact -offset indent
 .It Extended
-If it begins with an underscore (``_'') then the DES Extended Format
+If it begins with an underscore
+.Pq Dq _
+then the
+.Tn DES
+Extended Format
 is used in interpreting both the the key and the salt, as outlined below.
 .It Modular
-If it begins with the string ``$digit$'' then the Modular Crypt Format
-is used, as outlined below.
+If it begins with the string
+.Dq $digit$
+then the Modular Crypt Format is used, as outlined below.
 .It Traditional
 If neither of the above is true, it assumes the Traditional Format,
 using the entire string as the salt (or the first portion).
 .El
 .Pp
 All routines are designed to be time-consuming.  A brief test on a
-Pentium 166/MMX shows the DES crypt to do approximately 2640 crypts
+.Tn Pentium
+166/MMX shows the
+.Tn DES
+crypt to do approximately 2640 crypts
 a CPU second and MD5 to do about 62 crypts a CPU second.
 .Ss DES Extended Format:
 .Pp
@@ -86,10 +101,17 @@ The
 .Ar key
 is divided into groups of 8 characters (the last group is null-padded)
 and the low-order 7 bits of each each character (56 bits per group) are
-used to form the DES key as follows:
-the first group of 56 bits becomes the initial DES key.
-For each additional group, the XOR of the encryption of the current DES
-key with itself and the group bits becomes the next DES key.
+used to form the
+.Tn DES
+key as follows:
+the first group of 56 bits becomes the initial
+.Tn DES
+key.
+For each additional group, the XOR of the encryption of the current
+.Tn DES
+key with itself and the group bits becomes the next
+.Tn DES
+key.
 .Pp
 The salt is a 9-character array consisting of an underscore followed
 by 4 bytes of iteration count and 4 bytes of salt.
@@ -118,7 +140,9 @@ are swapped in the
 .Tn DES
 E-box output).
 .Pp
-The DES key is used to encrypt a 64-bit constant using
+The
+.Tn DES
+key is used to encrypt a 64-bit constant using
 .Ar count
 iterations of
 .Tn DES .
@@ -153,8 +177,11 @@ Other crypt formats may be easilly added.  An example salt would be:
 .Pp
 .Ss "Traditional" crypt:
 .Pp
-The algorithm used will depend upon whether DES is installed or not.  If it is,
-DES will be used.  Otherwise, the best algorithm is used, which is currently
+The algorithm used will depend upon whether
+.Tn DES
+is installed or not.  If it is,
+.Tn DES
+will be used.  Otherwise, the best algorithm is used, which is currently
 .\"
 .\" NOTICE: Also make sure to update this
 .\"
@@ -191,11 +218,19 @@ The current style
 first appeared in
 .At v7 .
 .Pp
-The DES section of the code (FreeSec 1.0) was developed outside the United
-States of America as an unencumbered replacement for the U.S.-only NetBSD
+The
+.Tn DES
+section of the code (FreeSec 1.0) was developed outside the United
+States of America as an unencumbered replacement for the U.S.-only
+.Nx
 libcrypt encryption library.
 Users should be aware that this code (and programs staticly linked with it)
 may not be exported from the U.S., although it apparently can be imported.
 .Sh AUTHORS
-Originally written by David Burren <davidb@werj.com.au>, later additions
-and changes by Poul-henning Kamp, Mark R V Murray and Kris Kennaway.
+Originally written by
+.An David Burren Aq davidb@werj.com.au ,
+later additions and changes by
+.An Poul-henning Kamp ,
+.An Mark R V Murray
+and
+.An Kris Kennaway .
diff --git a/lib/libdevstat/devstat.3 b/lib/libdevstat/devstat.3
index 69a4d741bd828..df2b9dc144f59 100644
--- a/lib/libdevstat/devstat.3
+++ b/lib/libdevstat/devstat.3
@@ -42,6 +42,8 @@
 .Nm compute_stats ,
 .Nm compute_etime
 .Nd device statistics utility library
+.Sh LIBRARY
+.Lb libdevstat
 .Sh SYNOPSIS
 .Fd #include <sys/dkstat.h>
 .Fd #include <devstat.h>
diff --git a/lib/libdisk/libdisk.3 b/lib/libdisk/libdisk.3
index 07c1ffe721b43..d1bbda67ba570 100644
--- a/lib/libdisk/libdisk.3
+++ b/lib/libdisk/libdisk.3
@@ -59,7 +59,9 @@
 .Nm ChunkCanBeRoot ,
 .Nm chunk_n ,
 .Nm slice_type_name
-.Nd library interface to slice and partition labels (libdisk)
+.Nd library interface to slice and partition labels
+.Sh LIBRARY
+.Lb libdisk
 .Sh SYNOPSIS
 .Fd #include <sys/types.h>
 .Fd #include <libdisk.h>
diff --git a/lib/libedit/editline.3 b/lib/libedit/editline.3
index c1fed73e09deb..7528f5fa86f25 100644
--- a/lib/libedit/editline.3
+++ b/lib/libedit/editline.3
@@ -59,6 +59,8 @@
 .Nm history_end ,
 .Nm history
 .Nd line editor and history functions
+.Sh LIBRARY
+.Lb libedit
 .Sh SYNOPSIS
 .Fd #include <histedit.h>
 .Ft EditLine *
diff --git a/lib/libfetch/fetch.3 b/lib/libfetch/fetch.3
index 0ee591219a5b3..5879dee63ba07 100644
--- a/lib/libfetch/fetch.3
+++ b/lib/libfetch/fetch.3
@@ -46,10 +46,12 @@
 .Nm fetchStatHTTP ,
 .Nm fetchListHTTP ,
 .Nm fetchGetFTP ,
-.Nm fetchPutFTP
-.Nm fetchStatFTP
-.Nm fetchListFTP ,
-.Nd file transfer library
+.Nm fetchPutFTP ,
+.Nm fetchStatFTP ,
+.Nm fetchListFTP
+.Nd file transfer functions
+.Sh LIBRARY
+.Lb libfetch
 .Sh SYNOPSIS
 .Fd #include <sys/param.h>
 .Fd #include <stdio.h>
@@ -298,7 +300,7 @@ to report errors.
 The error code passed to
 .Fn com_err
 is one of:
-.Bl -tag -width Er
+.Bl -tag -width 18n
 .It Bq Er FETCH_ABORT
 Operation aborted    
 .It Bq Er FETCH_AUTH
@@ -407,7 +409,7 @@ examples of this are
 .Fn fetchPutHTTP ,
 .Fn fetchStatHTTP ,
 .Fn fetchListHTTP ,
-.Fn fetchListFTP ,
+.Fn fetchListFTP
 and FTP proxy support.
 .Pp
 There's no way to select a proxy at run-time other than setting the
diff --git a/lib/libipx/ipx.3 b/lib/libipx/ipx.3
index c005a4d8e2204..04fbe9aa5730e 100644
--- a/lib/libipx/ipx.3
+++ b/lib/libipx/ipx.3
@@ -38,6 +38,8 @@
 .Nm ipx_addr ,
 .Nm ipx_ntoa
 .Nd IPX address conversion routines
+.Sh LIBRARY
+.Lb libipx
 .Sh SYNOPSIS
 .Fd #include <sys/types.h>
 .Fd #include <netipx/ipx.h>
diff --git a/lib/libkvm/kvm.3 b/lib/libkvm/kvm.3
index 7647ca676081e..5382ae3b7773d 100644
--- a/lib/libkvm/kvm.3
+++ b/lib/libkvm/kvm.3
@@ -42,13 +42,15 @@
 .Sh NAME
 .Nm kvm
 .Nd kernel memory interface
+.Sh LIBRARY
+.Lb libkvm
 .Sh DESCRIPTION
 The
 .Xr kvm 3
 library provides a uniform interface for accessing kernel virtual memory
 images, including live systems and crash dumps.
 Access to live systems is via
-/dev/mem
+.Pa /dev/mem
 while crash dumps can be examined via the core file generated by
 .Xr savecore 8 .
 The interface behaves identically in both cases.
diff --git a/lib/libkvm/kvm_geterr.3 b/lib/libkvm/kvm_geterr.3
index bab730e75cb3d..f3288c9b91653 100644
--- a/lib/libkvm/kvm_geterr.3
+++ b/lib/libkvm/kvm_geterr.3
@@ -42,6 +42,8 @@
 .Sh NAME
 .Nm kvm_geterr
 .Nd get error message on kvm descriptor
+.Sh LIBRARY
+.Lb libkvm
 .Sh SYNOPSIS
 .Fd #include <kvm.h>
 .br
diff --git a/lib/libkvm/kvm_getfiles.3 b/lib/libkvm/kvm_getfiles.3
index b8dc3b4170daa..fd15ec1a1f598 100644
--- a/lib/libkvm/kvm_getfiles.3
+++ b/lib/libkvm/kvm_getfiles.3
@@ -42,6 +42,8 @@
 .Sh NAME
 .Nm kvm_getfiles
 .Nd survey open files
+.Sh LIBRARY
+.Lb libkvm
 .Sh SYNOPSIS
 .Fd #include <kvm.h>
 .Fd #include <sys/types.h>
diff --git a/lib/libkvm/kvm_getloadavg.3 b/lib/libkvm/kvm_getloadavg.3
index 7df1847158e70..a6137fdc7dbcd 100644
--- a/lib/libkvm/kvm_getloadavg.3
+++ b/lib/libkvm/kvm_getloadavg.3
@@ -38,6 +38,8 @@
 .Sh NAME
 .Nm kvm_getloadavg
 .Nd get load average of the system
+.Sh LIBRARY
+.Lb libkvm
 .Sh SYNOPSIS
 .Fd #include <kvm.h>
 .Ft int
diff --git a/lib/libkvm/kvm_getprocs.3 b/lib/libkvm/kvm_getprocs.3
index bd6bb74e9bb9f..100a8b622dfb8 100644
--- a/lib/libkvm/kvm_getprocs.3
+++ b/lib/libkvm/kvm_getprocs.3
@@ -44,6 +44,8 @@
 .Nm kvm_getargv ,
 .Nm kvm_getenvv 
 .Nd access user process state
+.Sh LIBRARY
+.Lb libkvm
 .Sh SYNOPSIS
 .Fd #include <kvm.h>
 .Fd #include <sys/param.h>
diff --git a/lib/libkvm/kvm_getswapinfo.3 b/lib/libkvm/kvm_getswapinfo.3
index c749af2700fef..908566176732d 100644
--- a/lib/libkvm/kvm_getswapinfo.3
+++ b/lib/libkvm/kvm_getswapinfo.3
@@ -12,6 +12,8 @@
 .Sh NAME
 .Nm kvm_getswapinfo
 .Nd return swap summary statistics for the system
+.Sh LIBRARY
+.Lb libkvm
 .Sh SYNOPSIS
 .Fd #include <kvm.h>
 .Ft int
diff --git a/lib/libkvm/kvm_nlist.3 b/lib/libkvm/kvm_nlist.3
index b01930bd15b80..4aba1e53d7957 100644
--- a/lib/libkvm/kvm_nlist.3
+++ b/lib/libkvm/kvm_nlist.3
@@ -42,6 +42,8 @@
 .Sh NAME
 .Nm kvm_nlist
 .Nd retrieve symbol table names from a kernel image
+.Sh LIBRARY
+.Lb libkvm
 .Sh SYNOPSIS
 .Fd #include <kvm.h>
 .Fd #include <nlist.h>
diff --git a/lib/libkvm/kvm_open.3 b/lib/libkvm/kvm_open.3
index b79170873e7e8..8ff197e615921 100644
--- a/lib/libkvm/kvm_open.3
+++ b/lib/libkvm/kvm_open.3
@@ -44,6 +44,8 @@
 .Nm kvm_openfiles ,
 .Nm kvm_close
 .Nd initialize kernel virtual memory access
+.Sh LIBRARY
+.Lb libkvm
 .Sh SYNOPSIS
 .Fd #include <fcntl.h>
 .Fd #include <kvm.h>
diff --git a/lib/libkvm/kvm_read.3 b/lib/libkvm/kvm_read.3
index f8d5e0a88fa2b..183df72d252cc 100644
--- a/lib/libkvm/kvm_read.3
+++ b/lib/libkvm/kvm_read.3
@@ -43,6 +43,8 @@
 .Nm kvm_read ,
 .Nm kvm_write
 .Nd read or write kernel virtual memory
+.Sh LIBRARY
+.Lb libkvm
 .Sh SYNOPSIS
 .Fd #include <kvm.h>
 .Ft ssize_t
diff --git a/lib/libm/common_source/acos.3 b/lib/libm/common_source/acos.3
index a3e5e7a549a65..75f293657bb9e 100644
--- a/lib/libm/common_source/acos.3
+++ b/lib/libm/common_source/acos.3
@@ -38,6 +38,8 @@
 .Sh NAME
 .Nm acos
 .Nd arc cosine function
+.Sh LIBRARY
+.Lb libm
 .Sh SYNOPSIS
 .Fd #include <math.h>
 .Ft double
diff --git a/lib/libm/common_source/acosh.3 b/lib/libm/common_source/acosh.3
index 578a0dfc8da8c..49dd7b2bcf4e5 100644
--- a/lib/libm/common_source/acosh.3
+++ b/lib/libm/common_source/acosh.3
@@ -38,6 +38,8 @@
 .Sh NAME
 .Nm acosh
 .Nd inverse hyperbolic cosine function
+.Sh LIBRARY
+.Lb libm
 .Sh SYNOPSIS
 .Fd #include <math.h>
 .Ft double
diff --git a/lib/libm/common_source/asin.3 b/lib/libm/common_source/asin.3
index 5f04c598b0b08..a712e9c0e5b24 100644
--- a/lib/libm/common_source/asin.3
+++ b/lib/libm/common_source/asin.3
@@ -38,6 +38,8 @@
 .Sh NAME
 .Nm asin
 .Nd arc sine function
+.Sh LIBRARY
+.Lb libm
 .Sh SYNOPSIS
 .Fd #include <math.h>
 .Ft double
diff --git a/lib/libm/common_source/asinh.3 b/lib/libm/common_source/asinh.3
index 657451fadd468..fbf8f163f2182 100644
--- a/lib/libm/common_source/asinh.3
+++ b/lib/libm/common_source/asinh.3
@@ -38,6 +38,8 @@
 .Sh NAME
 .Nm asinh
 .Nd inverse hyperbolic sine function
+.Sh LIBRARY
+.Lb libm
 .Sh SYNOPSIS
 .Fd #include <math.h>
 .Ft double
diff --git a/lib/libm/common_source/atan.3 b/lib/libm/common_source/atan.3
index a1564bda8092c..7805dff36c8fe 100644
--- a/lib/libm/common_source/atan.3
+++ b/lib/libm/common_source/atan.3
@@ -38,6 +38,8 @@
 .Sh NAME
 .Nm atan
 .Nd arc tangent function of one variable
+.Sh LIBRARY
+.Lb libm
 .Sh SYNOPSIS
 .Fd #include <math.h>
 .Ft double
diff --git a/lib/libm/common_source/atan2.3 b/lib/libm/common_source/atan2.3
index 027ab8bcac677..bf4ddcd1acfc1 100644
--- a/lib/libm/common_source/atan2.3
+++ b/lib/libm/common_source/atan2.3
@@ -38,6 +38,8 @@
 .Sh NAME
 .Nm atan2
 .Nd arc tangent function of two variables
+.Sh LIBRARY
+.Lb libm
 .Sh SYNOPSIS
 .Fd #include <math.h>
 .Ft double
diff --git a/lib/libm/common_source/atanh.3 b/lib/libm/common_source/atanh.3
index 2ddcc3a5c2a3b..25bdd4d9fcb4b 100644
--- a/lib/libm/common_source/atanh.3
+++ b/lib/libm/common_source/atanh.3
@@ -38,6 +38,8 @@
 .Sh NAME
 .Nm atanh
 .Nd inverse hyperbolic tangent function
+.Sh LIBRARY
+.Lb libm
 .Sh SYNOPSIS
 .Fd #include <math.h>
 .Ft double
diff --git a/lib/libm/common_source/ceil.3 b/lib/libm/common_source/ceil.3
index aed159f38f92f..a585194e6cb1a 100644
--- a/lib/libm/common_source/ceil.3
+++ b/lib/libm/common_source/ceil.3
@@ -38,6 +38,8 @@
 .Sh NAME
 .Nm ceil
 .Nd smallest integral value greather than or equal to x
+.Sh LIBRARY
+.Lb libm
 .Sh SYNOPSIS
 .Fd #include <math.h>
 .Ft double
diff --git a/lib/libm/common_source/cos.3 b/lib/libm/common_source/cos.3
index 9de38c141df84..d6cf6480810d9 100644
--- a/lib/libm/common_source/cos.3
+++ b/lib/libm/common_source/cos.3
@@ -38,6 +38,8 @@
 .Sh NAME
 .Nm cos
 .Nd cosine function
+.Sh LIBRARY
+.Lb libm
 .Sh SYNOPSIS
 .Fd #include <math.h>
 .Ft double
diff --git a/lib/libm/common_source/cosh.3 b/lib/libm/common_source/cosh.3
index 311b794fb2046..e6c40160427e9 100644
--- a/lib/libm/common_source/cosh.3
+++ b/lib/libm/common_source/cosh.3
@@ -38,6 +38,8 @@
 .Sh NAME
 .Nm cosh
 .Nd hyperbolic cosine function
+.Sh LIBRARY
+.Lb libm
 .Sh SYNOPSIS
 .Fd #include <math.h>
 .Ft double
diff --git a/lib/libm/common_source/erf.3 b/lib/libm/common_source/erf.3
index 4618fb915ce33..4baf476d4a99f 100644
--- a/lib/libm/common_source/erf.3
+++ b/lib/libm/common_source/erf.3
@@ -39,6 +39,8 @@
 .Nm erf ,
 .Nm erfc
 .Nd error function operators
+.Sh LIBRARY
+.Lb libm
 .Sh SYNOPSIS
 .Fd #include <math.h>
 .Ft double
diff --git a/lib/libm/common_source/exp.3 b/lib/libm/common_source/exp.3
index f3f580029bdd4..71d58a50c3762 100644
--- a/lib/libm/common_source/exp.3
+++ b/lib/libm/common_source/exp.3
@@ -43,6 +43,8 @@
 .Nm log1p ,
 .Nm pow
 .Nd exponential, logarithm, power functions
+.Sh LIBRARY
+.Lb libm
 .Sh SYNOPSIS
 .Fd #include <math.h>
 .Ft double
diff --git a/lib/libm/common_source/fabs.3 b/lib/libm/common_source/fabs.3
index 7e2c0a7e33787..b4874dccda751 100644
--- a/lib/libm/common_source/fabs.3
+++ b/lib/libm/common_source/fabs.3
@@ -39,6 +39,8 @@
 .Sh NAME
 .Nm fabs
 .Nd floating-point absolute value function
+.Sh LIBRARY
+.Lb libm
 .Sh SYNOPSIS
 .Fd #include <math.h>
 .Ft double
diff --git a/lib/libm/common_source/floor.3 b/lib/libm/common_source/floor.3
index 5517f00fc493b..b71e37d03c255 100644
--- a/lib/libm/common_source/floor.3
+++ b/lib/libm/common_source/floor.3
@@ -38,6 +38,8 @@
 .Sh NAME
 .Nm floor
 .Nd largest integral value less than or equal to x
+.Sh LIBRARY
+.Lb libm
 .Sh SYNOPSIS
 .Fd #include <math.h>
 .Ft double
diff --git a/lib/libm/common_source/fmod.3 b/lib/libm/common_source/fmod.3
index 43309a58c92c7..39713bee99980 100644
--- a/lib/libm/common_source/fmod.3
+++ b/lib/libm/common_source/fmod.3
@@ -38,6 +38,8 @@
 .Sh NAME
 .Nm fmod
 .Nd floating-point remainder function
+.Sh LIBRARY
+.Lb libm
 .Sh SYNOPSIS
 .Fd #include <math.h>
 .Ft double
diff --git a/lib/libm/common_source/hypot.3 b/lib/libm/common_source/hypot.3
index 2d2ad3eefe698..281ec0c667084 100644
--- a/lib/libm/common_source/hypot.3
+++ b/lib/libm/common_source/hypot.3
@@ -39,6 +39,8 @@
 .Nm hypot ,
 .Nm cabs
 .Nd euclidean distance and complex absolute value functions
+.Sh LIBRARY
+.Lb libm
 .Sh SYNOPSIS
 .Fd #include <math.h>
 .Ft double
diff --git a/lib/libm/common_source/ieee.3 b/lib/libm/common_source/ieee.3
index 29eb44c6bfa18..c47334c3251ff 100644
--- a/lib/libm/common_source/ieee.3
+++ b/lib/libm/common_source/ieee.3
@@ -42,6 +42,8 @@
 .Nm logb ,
 .Nm scalb
 .Nd "IEEE 754 floating point support
+.Sh LIBRARY
+.Lb libm
 .Sh SYNOPSIS
 .Fd #include <math.h>
 .Ft double 
diff --git a/lib/libm/common_source/infnan.3 b/lib/libm/common_source/infnan.3
index abb77830a9a36..274ba31706957 100644
--- a/lib/libm/common_source/infnan.3
+++ b/lib/libm/common_source/infnan.3
@@ -40,6 +40,8 @@
 .Nd signals invalid floating\-point operations on a
 .Tn VAX
 (temporary)
+.Sh LIBRARY
+.Lb libm
 .Sh SYNOPSIS
 .Fd #include <math.h>
 .Ft double 
diff --git a/lib/libm/common_source/j0.3 b/lib/libm/common_source/j0.3
index 0532b1bde4c14..c83fcc578c981 100644
--- a/lib/libm/common_source/j0.3
+++ b/lib/libm/common_source/j0.3
@@ -43,6 +43,8 @@
 .Nm y1 ,
 .Nm yn
 .Nd bessel functions of first and second kind
+.Sh LIBRARY
+.Lb libm
 .Sh SYNOPSIS
 .Fd #include <math.h>
 .Ft double
diff --git a/lib/libm/common_source/lgamma.3 b/lib/libm/common_source/lgamma.3
index d15c7a462a8d8..db61beff2f2d3 100644
--- a/lib/libm/common_source/lgamma.3
+++ b/lib/libm/common_source/lgamma.3
@@ -39,6 +39,8 @@
 .Nm lgamma
 .Nm gamma
 .Nd log gamma function, gamma function
+.Sh LIBRARY
+.Lb libm
 .Sh SYNOPSIS
 .Fd #include <math.h>
 .Ft extern int
diff --git a/lib/libm/common_source/rint.3 b/lib/libm/common_source/rint.3
index b8986f172cd29..010ec60d14b45 100644
--- a/lib/libm/common_source/rint.3
+++ b/lib/libm/common_source/rint.3
@@ -38,6 +38,8 @@
 .Sh NAME
 .Nm rint
 .Nd round-to-closest integer functions
+.Sh LIBRARY
+.Lb libm
 .Sh SYNOPSIS
 .Fd #include <math.h>
 .Ft double
diff --git a/lib/libm/common_source/sin.3 b/lib/libm/common_source/sin.3
index 87ddc238d5798..07d87d2ba68f4 100644
--- a/lib/libm/common_source/sin.3
+++ b/lib/libm/common_source/sin.3
@@ -39,6 +39,8 @@
 .Sh NAME
 .Nm sin
 .Nd sine function
+.Sh LIBRARY
+.Lb libm
 .Sh SYNOPSIS
 .Fd #include <math.h>
 .Ft double
diff --git a/lib/libm/common_source/sinh.3 b/lib/libm/common_source/sinh.3
index f285d7ec5c726..f004596e8f296 100644
--- a/lib/libm/common_source/sinh.3
+++ b/lib/libm/common_source/sinh.3
@@ -38,6 +38,8 @@
 .Sh NAME
 .Nm sinh
 .Nd hyperbolic sine function
+.Sh LIBRARY
+.Lb libm
 .Sh SYNOPSIS
 .Fd #include <math.h>
 .Ft double
diff --git a/lib/libm/common_source/sqrt.3 b/lib/libm/common_source/sqrt.3
index 067a70ef1eb7b..2d091a2f837ce 100644
--- a/lib/libm/common_source/sqrt.3
+++ b/lib/libm/common_source/sqrt.3
@@ -39,6 +39,8 @@
 .Nm cbrt ,
 .Nm sqrt
 .Nd cube root and square root functions
+.Sh LIBRARY
+.Lb libm
 .Sh SYNOPSIS
 .Fd #include <math.h>
 .Ft double
diff --git a/lib/libm/common_source/tan.3 b/lib/libm/common_source/tan.3
index 801464b42dafe..2f63bb72295ac 100644
--- a/lib/libm/common_source/tan.3
+++ b/lib/libm/common_source/tan.3
@@ -38,6 +38,8 @@
 .Sh NAME
 .Nm tan
 .Nd tangent function
+.Sh LIBRARY
+.Lb libm
 .Sh SYNOPSIS
 .Fd #include <math.h>
 .Ft double
diff --git a/lib/libm/common_source/tanh.3 b/lib/libm/common_source/tanh.3
index 102e60618a634..3af1f4d5e8a9e 100644
--- a/lib/libm/common_source/tanh.3
+++ b/lib/libm/common_source/tanh.3
@@ -38,6 +38,8 @@
 .Sh NAME
 .Nm tanh
 .Nd hyperbolic tangent function
+.Sh LIBRARY
+.Lb libm
 .Sh SYNOPSIS
 .Fd #include <math.h>
 .Ft double
diff --git a/lib/libmd/mdX.3 b/lib/libmd/mdX.3
index ebd8b30485427..401b5e3b49977 100644
--- a/lib/libmd/mdX.3
+++ b/lib/libmd/mdX.3
@@ -20,6 +20,8 @@
 .Nm MDXFile ,
 .Nm MDXData
 .Nd calculate the RSA Data Security, Inc., ``MDX'' message digest
+.Sh LIBRARY
+.Lb libmd
 .Sh SYNOPSIS
 .Fd #include <sys/types.h>
 .Fd #include <mdX.h>
diff --git a/lib/libmd/ripemd.3 b/lib/libmd/ripemd.3
index 12fa3df2f7367..25d34b44004d6 100644
--- a/lib/libmd/ripemd.3
+++ b/lib/libmd/ripemd.3
@@ -20,6 +20,8 @@
 .Nm RIPEMD160_File ,
 .Nm RIPEMD160_Data
 .Nd calculate the RIPEMD160 message digest
+.Sh LIBRARY
+.Lb libmd
 .Sh SYNOPSIS
 .Fd #include <sys/types.h>
 .Fd #include <ripemd.h>
diff --git a/lib/libmd/sha.3 b/lib/libmd/sha.3
index 5af126d9cd567..28574a2ddd67c 100644
--- a/lib/libmd/sha.3
+++ b/lib/libmd/sha.3
@@ -26,6 +26,8 @@
 .Nm SHA1_File ,
 .Nm SHA1_Data
 .Nd calculate the FIPS 160 and 160-1 ``SHA'' message digests
+.Sh LIBRARY
+.Lb libmd
 .Sh SYNOPSIS
 .Fd #include <sys/types.h>
 .Fd #include <sha.h>
diff --git a/lib/libnetgraph/netgraph.3 b/lib/libnetgraph/netgraph.3
index c30dc1bdb48ed..2403c0a6c641c 100644
--- a/lib/libnetgraph/netgraph.3
+++ b/lib/libnetgraph/netgraph.3
@@ -48,6 +48,8 @@
 .Nm NgSetDebug ,
 .Nm NgSetErrLog
 .Nd netgraph user library
+.Sh LIBRARY
+.Lb libnetgraph
 .Sh SYNOPSIS
 .Fd #include <netgraph.h>
 .Ft int
diff --git a/lib/libposix1e/acl.3 b/lib/libposix1e/acl.3
index 20208fabeb15c..51b7d089d4e4a 100644
--- a/lib/libposix1e/acl.3
+++ b/lib/libposix1e/acl.3
@@ -31,6 +31,8 @@
 .Sh NAME
 .Nm acl
 .Nd introduction to the POSIX.1e ACL security API
+.Sh LIBRARY
+.Lb libposix1e
 .Sh SYNOPSIS
 .Fd #include <sys/types.h>
 .Fd #include <sys/acl.h>
diff --git a/lib/libposix1e/acl_delete.3 b/lib/libposix1e/acl_delete.3
index ef559d5f75330..6120563fbb0d8 100644
--- a/lib/libposix1e/acl_delete.3
+++ b/lib/libposix1e/acl_delete.3
@@ -30,9 +30,11 @@
 .Os FreeBSD 4.0
 .Sh NAME
 .Nm acl_delete_def_file ,
-.Nm acl_delete_file_np ,
-.Nm acl_delete_fd_np
-.Nd Delete an ACL from a file
+.Nm acl_delete_fd_np ,
+.Nm acl_delete_file_np
+.Nd delete an ACL from a file
+.Sh LIBRARY
+.Lb libposix1e
 .Sh SYNOPSIS
 .Fd #include <sys/types.h>
 .Fd #include <sys/acl.h>
diff --git a/lib/libposix1e/acl_dup.3 b/lib/libposix1e/acl_dup.3
index aaceb54f77645..be2fc1ca8f45f 100644
--- a/lib/libposix1e/acl_dup.3
+++ b/lib/libposix1e/acl_dup.3
@@ -30,7 +30,9 @@
 .Os FreeBSD 4.0
 .Sh NAME
 .Nm acl_dup
-.Nd Duplicate an ACL
+.Nd duplicate an ACL
+.Sh LIBRARY
+.Lb libposix1e
 .Sh SYNOPSIS
 .Fd #include <sys/types.h>
 .Fd #include <sys/acl.h>
diff --git a/lib/libposix1e/acl_free.3 b/lib/libposix1e/acl_free.3
index e02569b264a6f..ee7fd4d673221 100644
--- a/lib/libposix1e/acl_free.3
+++ b/lib/libposix1e/acl_free.3
@@ -30,7 +30,9 @@
 .Os FreeBSD 4.0
 .Sh NAME
 .Nm acl_free
-.Nd Free ACL working state
+.Nd free ACL working state
+.Sh LIBRARY
+.Lb libposix1e
 .Sh SYNOPSIS
 .Fd #include <sys/types.h>
 .Fd #include <sys/acl.h>
diff --git a/lib/libposix1e/acl_from_text.3 b/lib/libposix1e/acl_from_text.3
index 7763761632842..27d9edc79e455 100644
--- a/lib/libposix1e/acl_from_text.3
+++ b/lib/libposix1e/acl_from_text.3
@@ -30,7 +30,9 @@
 .Os FreeBSD 4.0
 .Sh NAME
 .Nm acl_from_text
-.Nd Create an ACL from text
+.Nd create an ACL from text
+.Sh LIBRARY
+.Lb libposix1e
 .Sh SYNOPSIS
 .Fd #include <sys/types.h>
 .Fd #include <sys/acl.h>
diff --git a/lib/libposix1e/acl_get.3 b/lib/libposix1e/acl_get.3
index 7781e40c5c113..104b2fc5b3b57 100644
--- a/lib/libposix1e/acl_get.3
+++ b/lib/libposix1e/acl_get.3
@@ -29,10 +29,12 @@
 .Dt ACL_GET 3
 .Os FreeBSD 4.0
 .Sh NAME
-.Nm acl_get_file ,
 .Nm acl_get_fd ,
-.Nm acl_get_fd_np
-.Nd Get an ACL for a file
+.Nm acl_get_fd_np ,
+.Nm acl_get_file
+.Nd get an ACL for a file
+.Sh LIBRARY
+.Lb libposix1e
 .Sh SYNOPSIS
 .Fd #include <sys/types.h>
 .Fd #include <sys/acl.h>
diff --git a/lib/libposix1e/acl_init.3 b/lib/libposix1e/acl_init.3
index 51b7c2a8f93f7..d2f217256d617 100644
--- a/lib/libposix1e/acl_init.3
+++ b/lib/libposix1e/acl_init.3
@@ -30,7 +30,9 @@
 .Os FreeBSD 4.0
 .Sh NAME
 .Nm acl_init
-.Nd Initialize ACL working storage
+.Nd initialize ACL working storage
+.Sh LIBRARY
+.Lb libposix1e
 .Sh SYNOPSIS
 .Fd #include <sys/types.h>
 .Fd #include <sys/acl.h>
diff --git a/lib/libposix1e/acl_set.3 b/lib/libposix1e/acl_set.3
index 916292c9d1eb4..da5f64880dc58 100644
--- a/lib/libposix1e/acl_set.3
+++ b/lib/libposix1e/acl_set.3
@@ -29,10 +29,12 @@
 .Dt ACL_SET 3
 .Os FreeBSD 4.0
 .Sh NAME
-.Nm acl_set_file ,
 .Nm acl_set_fd ,
-.Nm acl_set_fd_np
-.Nd Get an ACL for a file
+.Nm acl_set_fd_np ,
+.Nm acl_set_file
+.Nd get an ACL for a file
+.Sh LIBRARY
+.Lb libposix1e
 .Sh SYNOPSIS
 .Fd #include <sys/types.h>
 .Fd #include <sys/acl.h>
diff --git a/lib/libposix1e/acl_to_text.3 b/lib/libposix1e/acl_to_text.3
index 483dea7324eef..020f2d0c05bf5 100644
--- a/lib/libposix1e/acl_to_text.3
+++ b/lib/libposix1e/acl_to_text.3
@@ -30,7 +30,9 @@
 .Os FreeBSD 4.0
 .Sh NAME
 .Nm acl_to_text
-.Nd Convert an ACL to Text
+.Nd convert an ACL to Text
+.Sh LIBRARY
+.Lb libposix1e
 .Sh SYNOPSIS
 .Fd #include <sys/types.h>
 .Fd #include <sys/acl.h>
diff --git a/lib/libposix1e/acl_valid.3 b/lib/libposix1e/acl_valid.3
index 53ee879d20df2..6480574e1ebcf 100644
--- a/lib/libposix1e/acl_valid.3
+++ b/lib/libposix1e/acl_valid.3
@@ -32,7 +32,9 @@
 .Nm acl_valid ,
 .Nm acl_valid_fd_np ,
 .Nm acl_valid_file_np
-.Nd Validate an ACL
+.Nd validate an ACL
+.Sh LIBRARY
+.Lb libposix1e
 .Sh SYNOPSIS
 .Fd #include <sys/types.h>
 .Fd #include <sys/acl.h>
diff --git a/lib/libposix1e/posix1e.3 b/lib/libposix1e/posix1e.3
index 3d433826ca5f8..8820609139fbc 100644
--- a/lib/libposix1e/posix1e.3
+++ b/lib/libposix1e/posix1e.3
@@ -31,6 +31,8 @@
 .Sh NAME
 .Nm posix1e
 .Nd introduction to the POSIX.1e security API
+.Sh LIBRARY
+.Lb libposix1e
 .Sh SYNOPSIS
 .Fd #include <sys/acl.h>
 .Fd #include <sys/audit.h>
diff --git a/lib/libskey/skey.3 b/lib/libskey/skey.3
index 060fc7d8c4c31..b52da5b4328a6 100644
--- a/lib/libskey/skey.3
+++ b/lib/libskey/skey.3
@@ -35,7 +35,9 @@
 .Nm skeyaccess ,
 .Nm skey_getpass ,
 .Nm skey_crypt
-.Nd Library routines for S/Key password control table access
+.Nd library routines for S/Key password control table access
+.Sh LIBRARY
+.Lb libskey
 .Sh SYNOPSIS
 .Fd #include <stdio.h>
 .Fd #include <skey.h>
diff --git a/lib/libutil/_secure_path.3 b/lib/libutil/_secure_path.3
index 5e762a1606616..d4e316fed134e 100644
--- a/lib/libutil/_secure_path.3
+++ b/lib/libutil/_secure_path.3
@@ -25,17 +25,13 @@
 .Sh NAME
 .Nm _secure_path
 .Nd determine if a file appears to be secure
+.Sh LIBRARY
+.Lb libutil
 .Sh SYNOPSIS
 .Fd #include <sys/types.h>
 .Fd #include <libutil.h>
 .Ft int
 .Fn _secure_path "const char *path" "uid_t uid" "gid_t gid"
-.Pp
-Link with
-.Va -lutil
-on the
-.Xr cc 1
-command line.
 .Sh DESCRIPTION
 This function does some basic security checking on a given path.
 It is intended to be used by processes running with root privileges
@@ -71,7 +67,7 @@ to eliminate race conditions between use of this function and
 access to the file referenced.
 .Sh SEE ALSO
 .Xr lstat 2 ,
-.Xr syslog 3 .
+.Xr syslog 3
 .Sh HISTORY
 Code from which this function was derived was contributed to the
 .Fx
diff --git a/lib/libutil/auth.3 b/lib/libutil/auth.3
index 67a63b7b610b2..323d2f6de625c 100644
--- a/lib/libutil/auth.3
+++ b/lib/libutil/auth.3
@@ -32,17 +32,13 @@
 .Nm auth_getval
 .Nd functions for reading values from
 .Pa /etc/auth.conf
+.Sh LIBRARY
+.Lb libutil
 .Sh SYNOPSIS
 .Fd #include <sys/types.h>
 .Fd #include <libutil.h>
 .Ft char *
 .Fn auth_getval "const char *name"
-.Pp
-Link with
-.Va -lutil
-on the
-.Xr cc 1
-command line.
 .Sh DESCRIPTION
 
 The function
@@ -51,8 +47,8 @@ returns the value assocated with the field called
 .Fa name
 or NULL if no such field is found or the auth file cannot be opened.
 .Sh SEE ALSO
-.Xr properties_read 3 ,
 .Xr properties_free 3 ,
+.Xr properties_read 3 ,
 .Xr property_find 3 ,
 .Xr auth.conf 5
 .Sh FILES
diff --git a/lib/libutil/fparseln.3 b/lib/libutil/fparseln.3
index 6681bed742efb..8727d10a1603a 100644
--- a/lib/libutil/fparseln.3
+++ b/lib/libutil/fparseln.3
@@ -44,12 +44,6 @@
 .Fa "FILE *stream" "size_t *len" "size_t *lineno"
 .Fa "const char delim[3]" "int flags"
 .Fc
-.Pp
-Link with
-.Va -lutil
-on the
-.Xr cc 1
-command line.
 .Sh DESCRIPTION
 The
 .Fn fparseln
diff --git a/lib/libutil/login.3 b/lib/libutil/login.3
index c8f592c0bd204..ed6d72883b7ff 100644
--- a/lib/libutil/login.3
+++ b/lib/libutil/login.3
@@ -31,18 +31,14 @@
 .Sh NAME
 .Nm login
 .Nd "log a new login record to the utmp and wtmp files"
+.Sh LIBRARY
+.Lb libutil
 .Sh SYNOPSIS
 .Fd #include <sys/types.h>
 .Fd #include <utmp.h>
 .Fd #include <libutil.h>
 .Ft void
 .Fn login "struct utmp *ut"
-.Pp
-Link with
-.Va -lutil
-on the
-.Xr cc 1
-command line.
 .Sh DESCRIPTION
 The function
 .Fn login
diff --git a/lib/libutil/login_auth.3 b/lib/libutil/login_auth.3
index 29986cce5b1e0..ed57fec5f8bf8 100644
--- a/lib/libutil/login_auth.3
+++ b/lib/libutil/login_auth.3
@@ -34,6 +34,8 @@
 .\" .Nm auth_hostok 
 .\" .Nm auth_timesok
 .Nd authentication style support library for login class capabilities database.
+.Sh LIBRARY
+.Lb libutil
 .Sh SYNOPSIS
 .Fd #include <sys/types.h>
 .Fd #include <login_cap.h>
@@ -57,12 +59,6 @@
 .\" .Fn auth_hostok "login_cap_t *lc" "const char *hostname" "char const *ip"
 .\" .Ft int
 .\" .Fn auth_timesok "login_cap_t *lc" "time_t now"
-.Pp
-Link with
-.Va -lutil
-on the
-.Xr cc 1
-command line.
 .Sh DESCRIPTION
 This set of functions support the login class authorisation style interface provided
 by
diff --git a/lib/libutil/login_cap.3 b/lib/libutil/login_cap.3
index e5cc17b2711f8..aab53da9d6286 100644
--- a/lib/libutil/login_cap.3
+++ b/lib/libutil/login_cap.3
@@ -23,19 +23,21 @@
 .Os FreeBSD
 .Dt LOGIN_CAP 3
 .Sh NAME
-.Nm login_getclassbyname ,
 .Nm login_close ,
-.Nm login_getclass ,
-.Nm login_getpwclass ,
-.Nm login_getuserclass ,
-.Nm login_getcapstr ,
+.Nm login_getcapbool ,
 .Nm login_getcaplist ,
-.Nm login_getcaptime ,
 .Nm login_getcapnum ,
+.Nm login_getcapstr ,
 .Nm login_getcapsize ,
-.Nm login_getcapbool ,
-.Nm login_getstyle
+.Nm login_getcaptime ,
+.Nm login_getclass ,
+.Nm login_getclassbyname ,
+.Nm login_getpwclass ,
+.Nm login_getstyle ,
+.Nm login_getuserclass
 .Nd functions for accessing the login class capabilities database.
+.Sh LIBRARY
+.Lb libutil
 .Sh SYNOPSIS
 .Fd #include <sys/types.h>
 .Fd #include <login_cap.h>
@@ -65,12 +67,6 @@
 .Fn login_getcapbool "login_cap_t *lc" "const char *cap" "int def"
 .Ft char *
 .Fn login_getstyle "login_cap_t *lc" "char *style" "const char *auth"
-.Pp
-Link with
-.Va -lutil
-on the
-.Xr cc 1
-command line.
 .Sh DESCRIPTION
 These functions represent a programming interface to the login
 classes database provided in
@@ -318,7 +314,8 @@ Case of the units suffix is ignored.
 Time values are normally used for setting resource, accounting and
 session limits.
 If supported by the operating system and compiler (which is true of
-FreeBSD), the value returned is a quad (long long), of type
+.Fx ),
+the value returned is a quad (long long), of type
 .Em rlim_t .
 A value "inf" or "infinity" may be used to express an infinite
 value, in which case RLIM_INFINITY is returned.
diff --git a/lib/libutil/login_class.3 b/lib/libutil/login_class.3
index 53633f4e3543c..72848839c1b1b 100644
--- a/lib/libutil/login_class.3
+++ b/lib/libutil/login_class.3
@@ -24,10 +24,12 @@
 .Dt LOGIN_CLASS 3
 .Sh NAME
 .Nm setclasscontext ,
-.Nm setusercontext ,
+.Nm setclassenvironment ,
 .Nm setclassresources ,
-.Nm setclassenvironment
+.Nm setusercontext
 .Nd functions for using the login class capabilities database.
+.Sh LIBRARY
+.Lb libutil
 .Sh SYNOPSIS
 .Fd #include <sys/types.h>
 .Fd #include <login_cap.h>
@@ -39,12 +41,6 @@
 .Fn setclassresources "login_cap_t *lc"
 .Ft void
 .Fn setclassenvironment "login_cap_t *lc" "const struct passwd *pwd" "int paths"
-.Pp
-Link with
-.Va -lutil
-on the
-.Xr cc 1
-command line.
 .Sh DESCRIPTION
 These functions provide a higher level interface to the login class
 database than those documented in
diff --git a/lib/libutil/login_ok.3 b/lib/libutil/login_ok.3
index 01d61c9071680..7242acc88eb1a 100644
--- a/lib/libutil/login_ok.3
+++ b/lib/libutil/login_ok.3
@@ -27,6 +27,8 @@
 .Nm auth_hostok ,
 .Nm auth_timeok
 .Nd functions for checking login class based login restrictions
+.Sh LIBRARY
+.Lb libutil
 .Sh SYNOPSIS
 .Fd #include <sys/types.h>
 .Fd #include <time.h>
@@ -37,12 +39,6 @@
 .Fn auth_hostok "login_cap_t *lc" "const char *host" "char const *ip"
 .Ft int
 .Fn auth_timeok "login_cap_t *lc" "time_t t"
-.Pp
-Link with
-.Va -lutil
-on the
-.Xr cc 1
-command line.
 .Sh DESCRIPTION
 This set of functions checks to see if login is allowed based on login
 class capability entries in the login database,
diff --git a/lib/libutil/login_times.3 b/lib/libutil/login_times.3
index 1d8bd9f56a379..c097638d191d2 100644
--- a/lib/libutil/login_times.3
+++ b/lib/libutil/login_times.3
@@ -27,6 +27,8 @@
 .Nm in_ltm ,
 .Nm in_ltms
 .Nd functions for parsing and checking login time periods
+.Sh LIBRARY
+.Lb libutil
 .Sh SYNOPSIS
 .Fd #include <sys/types.h>
 .Fd #include <time.h>
@@ -37,12 +39,6 @@
 .Fn in_ltm "const login_time_t *lt" "struct tm *t" "time_t *ends"
 .Ft int
 .Fn in_ltms "const login_time_t *lt" "struct tm *t" "time_t *ends"
-.Pp
-Link with
-.Va -lutil
-on the
-.Xr cc 1
-command line.
 .Sh DESCRIPTION
 This set of functions may be used for parsing and checking login and
 session times against a predefined list of allowed login times as
diff --git a/lib/libutil/login_tty.3 b/lib/libutil/login_tty.3
index 2cde93f43e433..84a39e162ecd9 100644
--- a/lib/libutil/login_tty.3
+++ b/lib/libutil/login_tty.3
@@ -31,16 +31,12 @@
 .Sh NAME
 .Nm login_tty
 .Nd prepare a tty for a new login session
+.Sh LIBRARY
+.Lb libutil
 .Sh SYNOPSIS
 .Fd #include <libutil.h>
 .Ft int
 .Fn login_tty "int fd"
-.Pp
-Link with
-.Va -lutil
-on the
-.Xr cc 1
-command line.
 .Sh DESCRIPTION
 The function
 .Fn login_tty
diff --git a/lib/libutil/logout.3 b/lib/libutil/logout.3
index 580550ffdb23c..2f62b4d2f4eee 100644
--- a/lib/libutil/logout.3
+++ b/lib/libutil/logout.3
@@ -31,17 +31,13 @@
 .Sh NAME
 .Nm logout
 .Nd remove an entry from the utmp file
+.Sh LIBRARY
+.Lb libutil
 .Sh SYNOPSIS
 .Fd #include <sys/types.h>
 .Fd #include <libutil.h>
 .Ft int
 .Fn logout "char *line"
-.Pp
-Link with
-.Va -lutil
-on the
-.Xr cc 1
-command line.
 .Sh DESCRIPTION
 The function
 .Fn logout
diff --git a/lib/libutil/logwtmp.3 b/lib/libutil/logwtmp.3
index b7d3d0a0d7be0..1ba434749c46c 100644
--- a/lib/libutil/logwtmp.3
+++ b/lib/libutil/logwtmp.3
@@ -31,17 +31,13 @@
 .Sh NAME
 .Nm logwtmp
 .Nd append a new record to the wtmp file
+.Sh LIBRARY
+.Lb libutil
 .Sh SYNOPSIS
 .Fd #include <sys/types.h>
 .Fd #include <libutil.h>
 .Ft void
 .Fn logwtmp "const char *line" "const char *name" "const char *host"
-.Pp
-Link with
-.Va -lutil
-on the
-.Xr cc 1
-command line.
 .Sh DESCRIPTION
 The function
 .Fn logwtmp
diff --git a/lib/libutil/property.3 b/lib/libutil/property.3
index 0a0457ddea624..b23162f328210 100644
--- a/lib/libutil/property.3
+++ b/lib/libutil/property.3
@@ -33,6 +33,8 @@
 .Nm propery_find ,
 .Nm properties_free
 .Nd functions to allow creating simple property lists from ASCII file data.
+.Sh LIBRARY
+.Lb libutil
 .Sh SYNOPSIS
 .Fd #include <sys/types.h>
 .Fd #include <libutil.h>
@@ -42,12 +44,6 @@
 .Fn property_find "properties list" "const char *name"
 .Ft void
 .Fn properties_free "properties list"
-.Pp
-Link with
-.Va -lutil
-on the
-.Xr cc 1
-command line.
 .Sh DESCRIPTION
 .nf
 typedef struct _properties {
diff --git a/lib/libutil/pty.3 b/lib/libutil/pty.3
index e209fde13f279..cb2e461c42661 100644
--- a/lib/libutil/pty.3
+++ b/lib/libutil/pty.3
@@ -32,6 +32,8 @@
 .Nm openpty , 
 .Nm forkpty
 .Nd auxiliary functions to obtain a pseudo-terminal
+.Sh LIBRARY
+.Lb libutil
 .Sh SYNOPSIS
 .Fd #include <sys/types.h>
 .Fd #include <sys/ioctl.h>
@@ -41,12 +43,6 @@
 .Fn openpty "int *amaster" "int *aslave" "char *name" "struct termios *termp" "struct winsize *winp"
 .Ft int
 .Fn forkpty "int *amaster" "char *name" "struct termios *termp" "struct winsize *winp"
-.Pp
-Link with
-.Va -lutil
-on the
-.Xr cc 1
-command line.
 .Sh DESCRIPTION
 The function
 .Fn openpty
diff --git a/lib/libutil/realhostname.3 b/lib/libutil/realhostname.3
index acf370b9d168c..03b97d2934482 100644
--- a/lib/libutil/realhostname.3
+++ b/lib/libutil/realhostname.3
@@ -30,18 +30,14 @@
 .Sh NAME
 .Nm realhostname
 .Nd "convert an IP number to the real host name"
+.Sh LIBRARY
+.Lb libutil
 .Sh SYNOPSIS
 .Fd #include <sys/types.h>
 .Fd #include <netinet/in.h>
 .Fd #include <libutil.h>
 .Ft int
 .Fn realhostname "char *host" "size_t hsize" "const struct in_addr *ip"
-.Pp
-Link with
-.Va -lutil
-on the
-.Xr cc 1
-command line.
 .Sh DESCRIPTION
 The function
 .Fn realhostname
diff --git a/lib/libutil/realhostname_sa.3 b/lib/libutil/realhostname_sa.3
index c1bc40af32f3c..7ccff3c48b316 100644
--- a/lib/libutil/realhostname_sa.3
+++ b/lib/libutil/realhostname_sa.3
@@ -57,18 +57,14 @@
 .Sh NAME
 .Nm realhostname_sa
 .Nd "convert an struct sockaddr to the real host name"
+.Sh LIBRARY
+.Lb libutil
 .Sh SYNOPSIS
 .Fd #include <sys/types.h>
 .Fd #include <netinet/in.h>
 .Fd #include <libutil.h>
 .Ft int
 .Fn realhostname_sa "char *host" "size_t hsize" "struct sockaddr *addr" "int addrlen"
-.Pp
-Link with
-.Va -lutil
-on the
-.Xr cc 1
-command line.
 .Sh DESCRIPTION
 The function
 .Fn realhostname_sa
diff --git a/lib/libutil/setproctitle.3 b/lib/libutil/setproctitle.3
index 10eae654736a5..b2322b3397de5 100644
--- a/lib/libutil/setproctitle.3
+++ b/lib/libutil/setproctitle.3
@@ -27,17 +27,13 @@
 .Nm setproctitle
 .Nd set the process title for
 .Xr ps 1
+.Sh LIBRARY
+.Lb libutil
 .Sh SYNOPSIS
 .Fd #include <sys/types.h>
 .Fd #include <libutil.h>
 .Ft void
 .Fn setproctitle "const char *fmt" "..."
-.Pp
-Link with
-.Va -lutil
-on the
-.Xr cc 1
-command line.
 .Sh DESCRIPTION
 The
 .Fn setproctitle
diff --git a/lib/libutil/trimdomain.3 b/lib/libutil/trimdomain.3
index e4d70b8a711a5..fa27e147ac71a 100644
--- a/lib/libutil/trimdomain.3
+++ b/lib/libutil/trimdomain.3
@@ -30,17 +30,13 @@
 .Sh NAME
 .Nm trimdomain
 .Nd "trim the current domain name from a host name"
+.Sh LIBRARY
+.Lb libutil
 .Sh SYNOPSIS
 .Fd #include <sys/types.h>
 .Fd #include <libutil.h>
 .Ft void
 .Fn trimdomain "char *fullhost" "int hostsize"
-.Pp
-Link with
-.Va -lutil
-on the
-.Xr cc 1
-command line.
 .Sh DESCRIPTION
 The function
 .Fn trimdomain
diff --git a/lib/libutil/uucplock.3 b/lib/libutil/uucplock.3
index 99534a6fe7c97..24b891c6a2a15 100644
--- a/lib/libutil/uucplock.3
+++ b/lib/libutil/uucplock.3
@@ -33,6 +33,8 @@
 .Nm uu_unlock ,
 .Nm uu_lockerr
 .Nd acquire and release control of a serial device
+.Sh LIBRARY
+.Lb libutil
 .Sh SYNOPSIS
 .Fd #include <sys/types.h>
 .Fd #include <libutil.h>
@@ -44,12 +46,6 @@
 .Fn uu_unlock "const char *ttyname"
 .Ft const char *
 .Fn uu_lockerr "int uu_lockresult"
-.Pp
-Link with
-.Va -lutil
-on the
-.Xr cc 1
-command line.
 .Sh DESCRIPTION
 The
 .Fn uu_lock
diff --git a/lib/libvgl/vgl.3 b/lib/libvgl/vgl.3
index c05f5108b5dcf..c1b948b51b9b9 100644
--- a/lib/libvgl/vgl.3
+++ b/lib/libvgl/vgl.3
@@ -61,7 +61,9 @@
 .Nm VGLSetVScreenSize ,
 .Nm VGLSetXY ,
 .Nm VGLTextSetFontFile
-.Nd Video Graphics Library functions (libvgl)
+.Nd Video Graphics Library functions
+.Sh LIBRARY
+.Lb libvgl
 .Sh SYNOPSIS
 .Fd #include <machine/console.h>
 .Fd #include <vgl.h>