Index: share/man/man3/intro.3
===================================================================
--- share/man/man3/intro.3
+++ share/man/man3/intro.3
@@ -52,12 +52,14 @@
 option of the compiler.
 .Pp
 The various libraries (followed by the loader flag):
-.Bl -tag -width "libbluetooth (-lbluetooth)"
-.It Em libbluetooth Pq Fl l Ns Ar bluetooth
+.Bl -tag -width "libbluetooth"
+.It Em libbluetooth
+.Pq Fl l Ns Ar bluetooth
 The bluetooth library.
 See
 .Xr bluetooth 3 .
-.It Em libc Pq Fl l Ns Ar c
+.It Em libc
+.Pq Fl l Ns Ar c
 Standard C library functions.
 When using the C compiler
 .Xr cc 1 ,
@@ -97,28 +99,34 @@
 see
 .Xr signal 3
 .El
-.It Em libcalendar Pq Fl l Ns Ar calendar
+.It Em libcalendar
+.Pq Fl l Ns Ar calendar
 The calendar arithmetic library.
 See
 .Xr calendar 3 .
-.It Em libcam Pq Fl l Ns Ar cam
+.It Em libcam
+.Pq Fl l Ns Ar cam
 The common access method user library.
 See
 .Xr cam 3 .
-.It Em libcrypt Pq Fl l Ns Ar crypt
+.It Em libcrypt
+.Pq Fl l Ns Ar crypt
 The crypt library.
 See
 .Xr crypt 3 .
-.It Em libcurses Pq Fl l Ns Ar curses Fl l Ns Ar termcap
+.It Em libcurses
+.Pq Fl l Ns Ar curses Fl l Ns Ar termcap
 Terminal independent screen management routines
 for two dimensional non-bitmap display terminals.
 See
 .Xr ncurses 3 .
-.It Em libcuse Pq Fl l Ns Ar cuse
+.It Em libcuse
+.Pq Fl l Ns Ar cuse
 The userland character device library.
 See
 .Xr cuse 3 .
-.It Em libcompat Pq Fl l Ns Ar compat
+.It Em libcompat
+.Pq Fl l Ns Ar compat
 Functions which are obsolete but are available for compatibility with
 .Bx 4.3 .
 In particular,
@@ -128,57 +136,70 @@
 Use of these routines should, for the most part, be avoided.
 The manual page entry for each compatibility routine
 indicates the proper interface to use.
-.It Em libdevinfo Pq Fl l Ns Ar devinfo
+.It Em libdevinfo
+.Pq Fl l Ns Ar devinfo
 The Device and Resource Information Utility library.
 See
 .Xr devinfo 3 .
-.It Em libdevstat Pq Fl l Ns Ar devstat
+.It Em libdevstat
+.Pq Fl l Ns Ar devstat
 The Device Statistics library.
 See
 .Xr devstat 3 .
-.It Em libdwarf Pq Fl l Ns Ar dwarf
+.It Em libdwarf
+.Pq Fl l Ns Ar dwarf
 The DWARF access library.
 See
 .Xr dwarf 3 .
-.It Em libelf Pq Fl l Ns Ar elf
+.It Em libelf
+.Pq Fl l Ns Ar elf
 The ELF access library.
 See
 .Xr elf 3 .
-.It Em libfetch Pq Fl l Ns Ar fetch
+.It Em libfetch
+.Pq Fl l Ns Ar fetch
 The file transfer library.
 See
 .Xr fetch 3 .
-.It Em libfigpar Pq Fl l Ns Ar figpar
+.It Em libfigpar
+.Pq Fl l Ns Ar figpar
 The configuration file parsing library.
 See
 .Xr figpar 3 .
-.It Em libgpio Pq Fl l Ns Ar gpio
+.It Em libgpio
+.Pq Fl l Ns Ar gpio
 The general-purpose input output library (GPIO).
 See
 .Xr gpio 3 .
-.It Em libgssapi Pq Fl l Ns Ar gssapi
+.It Em libgssapi
+.Pq Fl l Ns Ar gssapi
 The generic security service application programming
 interface.
 See
 .Xr gssapi 3 .
-.It Em libjail Pq Fl l Ns Ar jail
+.It Em libjail
+.Pq Fl l Ns Ar jail
 The jail library.
 See
 .Xr jail 3 .
-.It Em libkvm Pq Fl l Ns Ar kvm
+.It Em libkvm
+.Pq Fl l Ns Ar kvm
 Functions used to access kernel memory are in this library.
 They can be used
 against both a running system and a crash dump.
 See
 .Xr kvm 3 .
-.It Em libl Pq Fl l Ns Ar l
+.It Em libl
+.Pq Fl l Ns Ar l
 The library for
 .Xr lex 1 .
-.It Em libm Pq Fl l Ns Ar m
+.It Em libm
+.Pq Fl l Ns Ar m
 The math library.
 See
 .Xr math 3 .
-.It Em libmd Pq Fl l Ns Ar md
+.It Em libmd
+.Pq Fl l Ns Ar md
 The message digest library.
 See
 .Xr md4 3 ,
@@ -188,43 +209,54 @@
 .Xr sha512 3 ,
 .Xr ripemd 3 ,
 .Xr skein 3 .
-.It Em libmp Pq Fl l Ns Ar mp
-.It Em libpam Pq Fl l Ns Ar pam
+.It Em libmp
+.Pq Fl l Ns Ar mp
+.It Em libpam
+.Pq Fl l Ns Ar pam
 The pluggable authentication module library.
 See
 .Xr pam 3 .
-.It Em libpcap Pq Fl l Ns Ar pcap
+.It Em libpcap
+.Pq Fl l Ns Ar pcap
 The packet capture library.
 See
 .Xr pcap 3 .
-.It Em libpmc Pq Fl l Ns Ar pmc
+.It Em libpmc
+.Pq Fl l Ns Ar pmc
 The performance counters library.
 See
 .Xr pmc 3 .
-.It Em libpthread Pq Fl l Ns Ar pthread
+.It Em libpthread
+.Pq Fl l Ns Ar pthread
 The POSIX threads library.
 See
 .Xr pthread 3 .
-.It Em libsysdecode Pq Fl l Ns Ar sysdecode
+.It Em libsysdecode
+.Pq Fl l Ns Ar sysdecode
 The system argument decoding library.
 See
 .Xr sysdecode 3 .
-.It Em libtermcap Pq Fl l Ns Ar termcap
+.It Em libtermcap
+.Pq Fl l Ns Ar termcap
 The terminal independent operation library package.
 See
 .Xr termcap 3 .
-.It Em libusb Pq Fl l Ns Ar usb
+.It Em libusb
+.Pq Fl l Ns Ar usb
 The USB access library.
 See
 .Xr usb 3 .
-.It Em libvgl Pq Fl l Ns Ar vgl
+.It Em libvgl
+.Pq Fl l Ns Ar vgl
 The video graphics library.
 See
 .Xr vgl 3 .
-.It Em liby Pq Fl l Ns Ar y
+.It Em liby
+.Pq Fl l Ns Ar y
 The library for
 .Xr yacc 1 .
-.It Em libz Pq Fl l Ns Ar z
+.It Em libz
+.Pq Fl l Ns Ar z
 The general-purpose data compression library.
 See
 .Xr zlib 3 .