diff --git a/share/sgml/man-refs.ent b/share/sgml/man-refs.ent
index 2565a093e3..d7adc13742 100644
--- a/share/sgml/man-refs.ent
+++ b/share/sgml/man-refs.ent
@@ -1,183 +1,203 @@
 <!-- 
      Names of Unix manual pages. Syntactic sugar making it easier to
      pretty print the SGML source.
 
      "_" is not a valid character in an entity name, so use "." instead.
      This runs the risk that two manual pages, one for "foo_bar" and one
      for "foo.bar" would exist. Hopefully the chance of this is 
      sufficiently small that it is not an issue.
 
-     $FreeBSD: doc/share/sgml/man-refs.ent,v 1.23 2000/03/08 11:17:59 nbm Exp $
+     $FreeBSD: doc/share/sgml/man-refs.ent,v 1.24 2000/03/09 05:52:04 jhb Exp $
 -->
 
 <!ENTITY man.at.1 "<citerefentry/<refentrytitle/at/<manvolnum/1//">
 <!ENTITY man.awk.1 "<citerefentry/<refentrytitle/awk/<manvolnum/1//">
 <!ENTITY man.bash.1 "<citerefentry/<refentrytitle/bash/<manvolnum/1//">
 <!ENTITY man.brandelf.1 "<citerefentry/<refentrytitle/brandelf/<manvolnum/1//">
 <!ENTITY man.chio.1 "<citerefentry/<refentrytitle/chio/<manvolnum/1//">
 <!ENTITY man.chmod.1 "<citerefentry/<refentrytitle/chmod/<manvolnum/1//">
 <!ENTITY man.cpio.1 "<citerefentry/<refentrytitle/cpio/<manvolnum/1//">
 <!ENTITY man.crontab.1 "<citerefentry/<refentrytitle/crontab/<manvolnum/1//">
 <!ENTITY man.csh.1 "<citerefentry/<refentrytitle/csh/<manvolnum/1//">
 <!ENTITY man.ctm.rmail.1 "<citerefentry/<refentrytitle/ctm.rmail/<manvolnum/1//">
 <!ENTITY man.cvs.1 "<citerefentry/<refentrytitle/cvs/<manvolnum/1//">
 <!ENTITY man.cvsup.1 "<citerefentry/<refentrytitle/cvsup/<manvolnum/1//">
 <!ENTITY man.date.1 "<citerefentry/<refentrytitle/date/<manvolnum/1//">
 <!ENTITY man.dd.1 "<citerefentry/<refentrytitle/dd/<manvolnum/1//">
 <!ENTITY man.diff.1 "<citerefentry/<refentrytitle/diff/<manvolnum/1//">
 <!ENTITY man.file.1 "<citerefentry/<refentrytitle/file/<manvolnum/1//">
+<!ENTITY man.ftp.1 "<citerefentry/<refentrytitle/ftp/<manvolnum/1//">
 <!ENTITY man.gcc.1 "<citerefentry/<refentrytitle/gcc/<manvolnum/1//">
 <!ENTITY man.grep.1 "<citerefentry/<refentrytitle/grep/<manvolnum/1//">
 <!ENTITY man.groff.1 "<citerefentry/<refentrytitle/groff/<manvolnum/1//">
 <!ENTITY man.gs.1 "<citerefentry/<refentrytitle/gs/<manvolnum/1//">
 <!ENTITY man.gunzip.1 "<citerefentry/<refentrytitle/gunzip/<manvolnum/1//">
 <!ENTITY man.gzip.1 "<citerefentry/<refentrytitle/gzip/<manvolnum/1//">
 <!ENTITY man.imwheel.1 "<citerefentry/<refentrytitle/imwheel/<manvolnum/1//">
 <!ENTITY man.info.1 "<citerefentry/<refentrytitle/info/<manvolnum/1//">
 <!ENTITY man.ipcs.1 "<citerefentry/<refentrytitle/ipcs/<manvolnum/1//">
 <!ENTITY man.ldd.1 "<citerefentry/<refentrytitle/ldd/<manvolnum/1//">
 <!ENTITY man.ln.1 "<citerefentry/<refentrytitle/ln/<manvolnum/1//">
 <!ENTITY man.lndir.1 "<citerefentry/<refentrytitle/lndir/<manvolnum/1//">
 <!ENTITY man.lpq.1 "<citerefentry/<refentrytitle/lpq/<manvolnum/1//">
 <!ENTITY man.lpr.1 "<citerefentry/<refentrytitle/lpr/<manvolnum/1//">
 <!ENTITY man.lprm.1 "<citerefentry/<refentrytitle/lprm/<manvolnum/1//">
 <!ENTITY man.lptest.1 "<citerefentry/<refentrytitle/lptest/<manvolnum/1//">
 <!ENTITY man.ls.1 "<citerefentry/<refentrytitle/ls/<manvolnum/1//">
 <!ENTITY man.lynx.1 "<citerefentry/<refentrytitle/lynx/<manvolnum/1//">
 <!ENTITY man.make.1 "<citerefentry/<refentrytitle/make/<manvolnum/1//">
 <!ENTITY man.mkdir.1 "<citerefentry/<refentrytitle/mkdir/<manvolnum/1//">
 <!ENTITY man.mt.1 "<citerefentry/<refentrytitle/mt/<manvolnum/1//">
 <!ENTITY man.nsgmls.1 "<citerefentry/<refentrytitle/nsgmls/<manvolnum/1//">
 <!ENTITY man.patch.1 "<citerefentry/<refentrytitle/patch/<manvolnum/1//">
 <!ENTITY man.pax.1 "<citerefentry/<refentrytitle/pax/<manvolnum/1//">
 <!ENTITY man.pfbtops.1 "<citerefentry/<refentrytitle/pfbtops/<manvolnum/1//">
 <!ENTITY man.pkg.add.1 "<citerefentry/<refentrytitle/pkg_add/<manvolnum/1//">
 <!ENTITY man.pkg.create.1 "<citerefentry/<refentrytitle/pkg_create/<manvolnum/1//">
 <!ENTITY man.pkg.delete.1 "<citerefentry/<refentrytitle/pkg_delete/<manvolnum/1//">
 <!ENTITY man.portlint.1 "<citerefentry/<refentrytitle/portlint/<manvolnum/1//">
 <!ENTITY man.pr.1 "<citerefentry/<refentrytitle/pr/<manvolnum/1//">
 <!ENTITY man.ps.1 "<citerefentry/<refentrytitle/ps/<manvolnum/1//">
 <!ENTITY man.rcp.1 "<citerefentry/<refentrytitle/rcp/<manvolnum/1//">
 <!ENTITY man.rlogin.1 "<citerefentry/<refentrytitle/rlogin/<manvolnum/1//">
 <!ENTITY man.rm.1 "<citerefentry/<refentrytitle/rm/<manvolnum/1//">
 <!ENTITY man.rsh.1 "<citerefentry/<refentrytitle/rsh/<manvolnum/1//">
 <!ENTITY man.scp.1 "<citerefentry/<refentrytitle/scp/<manvolnum/1//">
 <!ENTITY man.script.1 "<citerefentry/<refentrytitle/script/<manvolnum/1//">
 <!ENTITY man.send-pr.1 "<citerefentry/<refentrytitle/send-pr/<manvolnum/1//">
 <!ENTITY man.sgmlnorm.1 "<citerefentry/<refentrytitle/sgmlnorm/<manvolnum/1//">
 <!ENTITY man.sh.1 "<citerefentry/<refentrytitle/sh/<manvolnum/1//">
 <!ENTITY man.shar.1 "<citerefentry/<refentrytitle/shar/<manvolnum/1//">
 <!ENTITY man.size.1 "<citerefentry/<refentrytitle/size/<manvolnum/1//">
 <!ENTITY man.ssh.1 "<citerefentry/<refentrytitle/ssh/<manvolnum/1//">
 <!ENTITY man.ssh-add.1 "<citerefentry/<refentrytitle/ssh-add/<manvolnum/1//">
 <!ENTITY man.ssh-agent.1 "<citerefentry/<refentrytitle/ssh-agent/<manvolnum/1//">
 <!ENTITY man.ssh-keygen.1 "<citerefentry/<refentrytitle/ssh-keygen/<manvolnum/1//">
 <!ENTITY man.strings.1 "<citerefentry/<refentrytitle/strings/<manvolnum/1//">
 <!ENTITY man.stty.1 "<citerefentry/<refentrytitle/stty/<manvolnum/1//">
 <!ENTITY man.su.1 "<citerefentry/<refentrytitle/su/<manvolnum/1//">
 <!ENTITY man.tar.1 "<citerefentry/<refentrytitle/tar/<manvolnum/1//">
 <!ENTITY man.tcpdump.1 "<citerefentry/<refentrytitle/tcpdump/<manvolnum/1//">
 <!ENTITY man.tcsh.1 "<citerefentry/<refentrytitle/tcsh/<manvolnum/1//">
 <!ENTITY man.tip.1 "<citerefentry/<refentrytitle/tip/<manvolnum/1//">
 <!ENTITY man.telnet.1 "<citerefentry/<refentrytitle/telnet/<manvolnum/1//">
 <!ENTITY man.top.1 "<citerefentry/<refentrytitle/top/<manvolnum/1//">
 <!ENTITY man.troff.1 "<citerefentry/<refentrytitle/troff/<manvolnum/1//">
 <!ENTITY man.uname.1 "<citerefentry/<refentrytitle/uname/<manvolnum/1//">
 <!ENTITY man.uuencode.1 "<citerefentry/<refentrytitle/uuencode/<manvolnum/1//">
 <!ENTITY man.vi.1 "<citerefentry/<refentrytitle/vi/<manvolnum/1//">
 <!ENTITY man.vidcontrol.1 "<citerefentry/<refentrytitle/vidcontrol/<manvolnum/1//">
 <!ENTITY man.xfontsel.1 "<citerefentry/<refentrytitle/xfontsel/<manvolnum/1//">
 <!ENTITY man.xmodmap.1 "<citerefentry/<refentrytitle/xmodmap/<manvolnum/1//">
 <!ENTITY man.xset.1 "<citerefentry/<refentrytitle/xset/<manvolnum/1//">
 <!ENTITY man.zcat.1 "<citerefentry/<refentrytitle/zcat/<manvolnum/1//">
 
+<!ENTITY man.bind.2 "<citerefentry/<refentrytitle/bind/<manvolnum/2//">
 <!ENTITY man.chmod.2 "<citerefentry/<refentrytitle/chmod/<manvolnum/2//">
 <!ENTITY man.execve.2 "<citerefentry/<refentrytitle/execve/<manvolnum/2//">
+<!ENTITY man.setsockopt.2 "<citerefentry/<refentrytitle/setsockopt/<manvolnum/2//">
+<!ENTITY man.socket.2 "<citerefentry/<refentrytitle/socket/<manvolnum/2//">
 
 <!ENTITY man.cgetent.3 "<citerefentry/<refentrytitle/cgetent/<manvolnum/3//">
 <!ENTITY man.crypt.3 "<citerefentry/<refentrytitle/crypt/<manvolnum/3//">
+<!ENTITY man.getaddrinfo.3 "<citerefentry/<refentrytitle/getaddrinfo/<manvolnum/3//">
+<!ENTITY man.getipnodebyname.3 "<citerefentry/<refentrytitle/getipnodebyname/<manvolnum/3//">
+<!ENTITY man.getnameinfo.3 "<citerefentry/<refentrytitle/getnameinfo/<manvolnum/3//">
+<!ENTITY man.ipsec.set.policy.3 "<citerefentry/<refentrytitle/ipsec_set_policy/<manvolnum/3//">
 <!ENTITY man.popen.3 "<citerefentry/<refentrytitle/popen/<manvolnum/3//">
 <!ENTITY man.rcmd.3 "<citerefentry/<refentrytitle/rcmd/<manvolnum/3//">
 <!ENTITY man.ruserok.3 "<citerefentry/<refentrytitle/ruserok/<manvolnum/3//">
 <!ENTITY man.setlocale.3 "<citerefentry/<refentrytitle/setlocale/<manvolnum/3//">
 <!ENTITY man.system.3 "<citerefentry/<refentrytitle/system/<manvolnum/3//">
 
 <!ENTITY man.ccd.4 "<citerefentry/<refentrytitle/ccd/<manvolnum/4//">
 <!ENTITY man.ch.4 "<citerefentry/<refentrytitle/ch/<manvolnum/4//">
 <!ENTITY man.ddb.4 "<citerefentry/<refentrytitle/ddb/<manvolnum/4//">
+<!ENTITY man.gif.4 "<citerefentry/<refentrytitle/gif/<manvolnum/4//">
 <!ENTITY man.lkm.4 "<citerefentry/<refentrytitle/lkm/<manvolnum/4//">
 <!ENTITY man.mse.4 "<citerefentry/<refentrytitle/mse/<manvolnum/4//">
 <!ENTITY man.pcm.4 "<citerefentry/<refentrytitle/pcm/<manvolnum/4//">
 <!ENTITY man.sio.4 "<citerefentry/<refentrytitle/sio/<manvolnum/4//">
 <!ENTITY man.st.4 "<citerefentry/<refentrytitle/st/<manvolnum/4//">
 <!ENTITY man.termios.4 "<citerefentry/<refentrytitle/termios/<manvolnum/4//">
 <!ENTITY man.ukbd.4 "<citerefentry/<refentrytitle/ukbd/<manvolnum/4//">
 
 <!ENTITY man.fstab.5 "<citerefentry/<refentrytitle/fstab/<manvolnum/5//">
 <!ENTITY man.gettytab.5 "<citerefentry/<refentrytitle/gettytab/<manvolnum/5//">
 <!ENTITY man.groff.font.5 "<citerefentry/<refentrytitle/groff_font/<manvolnum/5//">
 <!ENTITY man.hosts.5 "<citerefentry/<refentrytitle/hosts/<manvolnum/5//">
 <!ENTITY man.loader.conf.5 "<citerefentry/<refentrytitle/loader.conf/<manvolnum/5//">
 <!ENTITY man.login.conf.5 "<citerefentry/<refentrytitle/login.conf/<manvolnum/5//">
 <!ENTITY man.passwd.5 "<citerefentry/<refentrytitle/passwd/<manvolnum/5//">
 <!ENTITY man.printcap.5 "<citerefentry/<refentrytitle/printcap/<manvolnum/5//">
 <!ENTITY man.resolv.conf.5 "<citerefentry/<refentrytitle/resolv.conf/<manvolnum/5//">
 <!ENTITY man.skey.access.5 "<citerefentry/<refentrytitle/skey.access/<manvolnum/5//">
 <!ENTITY man.syslog.conf.5 "<citerefentry/<refentrytitle/syslog.conf/<manvolnum/5//">
 <!ENTITY man.termcap.5 "<citerefentry/<refentrytitle/termcap/<manvolnum/5//">
 <!ENTITY man.ttys.5 "<citerefentry/<refentrytitle/ttys/<manvolnum/5//">
 
 <!ENTITY man.groff.char.7 "<citerefentry/<refentrytitle/groff_char/<manvolnum/7//">
 <!ENTITY man.hier.7 "<citerefentry/<refentrytitle/hier/<manvolnum/7//">
 
 <!ENTITY man.MAKEDEV.8 "<citerefentry/<refentrytitle/MAKEDEV/<manvolnum/8//">
 <!ENTITY man.adduser.8 "<citerefentry/<refentrytitle/adduser/<manvolnum/8//">
 <!ENTITY man.arp.8 "<citerefentry/<refentrytitle/arp/<manvolnum/8//">
 <!ENTITY man.boot.8 "<citerefentry/<refentrytitle/boot/<manvolnum/8//">
 <!ENTITY man.ccdconfig.8 "<citerefentry/<refentrytitle/ccdconfig/<manvolnum/8//">
 <!ENTITY man.chat.8 "<citerefentry/<refentrytitle/chat/<manvolnum/8//">
 <!ENTITY man.config.8 "<citerefentry/<refentrytitle/config/<manvolnum/8//">
 <!ENTITY man.cron.8 "<citerefentry/<refentrytitle/cron/<manvolnum/8//">
 <!ENTITY man.cvsupd.8 "<citerefentry/<refentrytitle/cvsupd/<manvolnum/8//">
 <!ENTITY man.disklabel.8 "<citerefentry/<refentrytitle/disklabel/<manvolnum/8//">
 <!ENTITY man.dmesg.8 "<citerefentry/<refentrytitle/dmesg/<manvolnum/8//">
 <!ENTITY man.dump.8 "<citerefentry/<refentrytitle/dump/<manvolnum/8//">
 <!ENTITY man.dumpon.8 "<citerefentry/<refentrytitle/dumpon/<manvolnum/8//">
+<!ENTITY man.faithd.8 "<citerefentry/<refentrytitle/faithd/<manvolnum/8//">
 <!ENTITY man.fastboot.8 "<citerefentry/<refentrytitle/fastboot/<manvolnum/8//">
 <!ENTITY man.fdisk.8 "<citerefentry/<refentrytitle/fdisk/<manvolnum/8//">
 <!ENTITY man.ft.8 "<citerefentry/<refentrytitle/ft/<manvolnum/8//">
 <!ENTITY man.getty.8 "<citerefentry/<refentrytitle/getty/<manvolnum/8//">
+<!ENTITY man.gifconfig.8 "<citerefentry/<refentrytitle/gifconfig/<manvolnum/8//">
 <!ENTITY man.ifconfig.8 "<citerefentry/<refentrytitle/ifconfig/<manvolnum/8//">
+<!ENTITY man.ifmcstat.8 "<citerefentry/<refentrytitle/ifmcstat/<manvolnum/8//">
 <!ENTITY man.init.8 "<citerefentry/<refentrytitle/init/<manvolnum/8//">
 <!ENTITY man.ipfw.8 "<citerefentry/<refentrytitle/ipfw/<manvolnum/8//">
 <!ENTITY man.loader.8 "<citerefentry/<refentrytitle/loader/<manvolnum/8//">
 <!ENTITY man.lpc.8 "<citerefentry/<refentrytitle/lpc/<manvolnum/8//">
 <!ENTITY man.lpd.8 "<citerefentry/<refentrytitle/lpd/<manvolnum/8//">
 <!ENTITY man.lptcontrol.8 "<citerefentry/<refentrytitle/lptcontrol/<manvolnum/8//">
 <!ENTITY man.modload.8 "<citerefentry/<refentrytitle/modload/<manvolnum/8//">
 <!ENTITY man.moused.8 "<citerefentry/<refentrytitle/moused/<manvolnum/8//">
 <!ENTITY man.mount.8 "<citerefentry/<refentrytitle/mount/<manvolnum/8//">
 <!ENTITY man.mount.msdos.8 "<citerefentry/<refentrytitle/mount.msdos/<manvolnum/8//">
+<!ENTITY man.netstat.8 "<citerefentry/<refentrytitle/netstat/<manvolnum/8//">
 <!ENTITY man.newfs.8 "<citerefentry/<refentrytitle/newfs/<manvolnum/8//">
 <!ENTITY man.pac.8 "<citerefentry/<refentrytitle/pac/<manvolnum/8//">
+<!ENTITY man.pim6dd.8 "<citerefentry/<refentrytitle/pim6dd/<manvolnum/8//">
+<!ENTITY man.pim6sd.8 "<citerefentry/<refentrytitle/pim6sd/<manvolnum/8//">
 <!ENTITY man.ping.8 "<citerefentry/<refentrytitle/ping/<manvolnum/8//">
+<!ENTITY man.ping6.8 "<citerefentry/<refentrytitle/ping6/<manvolnum/8//">
 <!ENTITY man.ppp.8 "<citerefentry/<refentrytitle/ppp/<manvolnum/8//">
 <!ENTITY man.pppctl.8 "<citerefentry/<refentrytitle/pppctl/<manvolnum/8//">
 <!ENTITY man.pw.8 "<citerefentry/<refentrytitle/pw/<manvolnum/8//">
 <!ENTITY man.rc.8 "<citerefentry/<refentrytitle/rc/<manvolnum/8//">
 <!ENTITY man.rdump.8 "<citerefentry/<refentrytitle/rdump/<manvolnum/8//">
 <!ENTITY man.restore.8 "<citerefentry/<refentrytitle/restore/<manvolnum/8//">
+<!ENTITY man.route6d.8 "<citerefentry/<refentrytitle/route6d/<manvolnum/8//">
 <!ENTITY man.rrestore.8 "<citerefentry/<refentrytitle/rrestore/<manvolnum/8//">
+<!ENTITY man.rtadvd.8 "<citerefentry/<refentrytitle/rtadvd/<manvolnum/8//">
+<!ENTITY man.rtsold.8 "<citerefentry/<refentrytitle/rtsold/<manvolnum/8//">
 <!ENTITY man.savecore.8 "<citerefentry/<refentrytitle/savecore/<manvolnum/8//">
 <!ENTITY man.scsi.8 "<citerefentry/<refentrytitle/scsi/<manvolnum/8//">
+<!ENTITY man.setkey.8 "<citerefentry/<refentrytitle/setkey/<manvolnum/8//">
 <!ENTITY man.sliplogin.8 "<citerefentry/<refentrytitle/sliplogin/<manvolnum/8//">
 <!ENTITY man.swapon.8 "<citerefentry/<refentrytitle/swapon/<manvolnum/8//">
 <!ENTITY man.sysctl.8 "<citerefentry/<refentrytitle/sysctl/<manvolnum/8//">
 <!ENTITY man.syslogd.8 "<citerefentry/<refentrytitle/syslogd/<manvolnum/8//">
 <!ENTITY man.traceroute.8 "<citerefentry/<refentrytitle/traceroute/<manvolnum/8//">
 <!ENTITY man.vipw.8 "<citerefentry/<refentrytitle/vipw/<manvolnum/8//">
 <!ENTITY man.vmstat.8 "<citerefentry/<refentrytitle/vmstat/<manvolnum/8//">
 <!ENTITY man.vnconfig.8 "<citerefentry/<refentrytitle/vnconfig/<manvolnum/8//">
 <!ENTITY man.watch.8 "<citerefentry/<refentrytitle/watch/<manvolnum/8//">
 <!ENTITY man.ypbind.8 "<citerefentry/<refentrytitle/ypbind/<manvolnum/8//">