diff --git a/lib/libc/rpc/rpc.3 b/lib/libc/rpc/rpc.3
index fc777e0668cd..222d19e48de8 100644
--- a/lib/libc/rpc/rpc.3
+++ b/lib/libc/rpc/rpc.3
@@ -1,6 +1,6 @@
 .\" @(#)rpc.3n 1.31 93/08/31 SMI; from SVr4
 .\" Copyright 1989 AT&T
-.\"	$NetBSD: rpc.3,v 1.20 2006/09/16 08:29:08 yamt Exp $
+.\"	$NetBSD: rpc.3,v 1.21 2009/04/11 15:51:44 joerg Exp $
 .Dd May 7, 1993
 .Dt RPC 3
 .Os
@@ -104,7 +104,7 @@ This refers to Internet TCP, both version 4 and 6.
 .El
 .Pp
 If
-.I nettype
+.Fa nettype
 is
 .Dv NULL ,
 it defaults to
@@ -312,178 +312,92 @@ pages on which they are described:
 .Bl -column "authunix_create_default()" "rpc_clnt_create(3)"
 .It Em "RPC Routine" Ta Em "Manual Reference Page"
 .Pp
-.It Fn auth_destroy Ta
-.Xr rpc_clnt_auth 3 ,
-.It Fn authdes_create Ta
-.Xr rpc_soc 3 ,
-.It Fn authnone_create Ta
-.Xr rpc_clnt_auth 3 ,
-.It Fn authsys_create Ta
-.Xr rpc_clnt_auth 3 ,
-.It Fn authsys_create_default Ta
-.Xr rpc_clnt_auth 3 ,
-.It Fn authunix_create Ta
-.Xr rpc_soc 3 ,
-.It Fn authunix_create_default Ta
-.Xr rpc_soc 3 ,
-.It Fn callrpc Ta
-.Xr rpc_soc 3 ,
-.It Fn clnt_broadcast Ta
-.Xr rpc_soc 3 ,
-.It Fn clnt_call Ta
-.Xr rpc_clnt_calls 3 ,
-.It Fn clnt_control Ta
-.Xr rpc_clnt_create 3 ,
-.It Fn clnt_create Ta
-.Xr rpc_clnt_create 3 ,
-.It Fn clnt_destroy Ta
-.Xr rpc_clnt_create 3 ,
-.It Fn clnt_dg_create Ta
-.Xr rpc_clnt_create 3 ,
-.It Fn clnt_freeres Ta
-.Xr rpc_clnt_calls 3 ,
-.It Fn clnt_geterr Ta
-.Xr rpc_clnt_calls 3 ,
-.It Fn clnt_pcreateerror Ta
-.Xr rpc_clnt_create 3 ,
-.It Fn clnt_perrno Ta
-.Xr rpc_clnt_calls 3 ,
-.It Fn clnt_perror Ta
-.Xr rpc_clnt_calls 3 ,
-.It Fn clnt_raw_create Ta
-.Xr rpc_clnt_create 3 ,
-.It Fn clnt_spcreateerror Ta
-.Xr rpc_clnt_create 3 ,
-.It Fn clnt_sperrno Ta
-.Xr rpc_clnt_calls 3 ,
-.It Fn clnt_sperror Ta
-.Xr rpc_clnt_calls 3 ,
-.It Fn clnt_tli_create Ta
-.Xr rpc_clnt_create 3 ,
-.It Fn clnt_tp_create Ta
-.Xr rpc_clnt_create 3 ,
-.It Fn clnt_udpcreate Ta
-.Xr rpc_soc 3 ,
-.It Fn clnt_vc_create Ta
-.Xr rpc_clnt_create 3 ,
-.It Fn clntraw_create Ta
-.Xr rpc_soc 3 ,
-.It Fn clnttcp_create Ta
-.Xr rpc_soc 3 ,
-.It Fn clntudp_bufcreate Ta
-.Xr rpc_soc 3 ,
-.It Fn get_myaddress Ta
-.Xr rpc_soc 3 ,
-.It Fn pmap_getmaps Ta
-.Xr rpc_soc 3 ,
-.It Fn pmap_getport Ta
-.Xr rpc_soc 3 ,
-.It Fn pmap_rmtcall Ta
-.Xr rpc_soc 3 ,
-.It Fn pmap_set Ta
-.Xr rpc_soc 3 ,
-.It Fn pmap_unset Ta
-.Xr rpc_soc 3 ,
-.It Fn registerrpc Ta
-.Xr rpc_soc 3 ,
-.It Fn rpc_broadcast Ta
-.Xr rpc_clnt_calls 3 ,
-.It Fn rpc_broadcast_exp Ta
-.Xr rpc_clnt_calls 3 ,
-.It Fn rpc_call Ta
-.Xr rpc_clnt_calls 3 ,
-.It Fn rpc_reg Ta
-.Xr rpc_svc_calls 3 ,
-.It Fn svc_create Ta
-.Xr rpc_svc_create 3 ,
-.It Fn svc_destroy Ta
-.Xr rpc_svc_create 3 ,
-.It Fn svc_dg_create Ta
-.Xr rpc_svc_create 3 ,
-.It Fn svc_dg_enablecache Ta
-.Xr rpc_svc_calls 3 ,
-.It Fn svc_fd_create Ta
-.Xr rpc_svc_create 3 ,
-.It Fn svc_fds Ta
-.Xr rpc_soc 3 ,
-.It Fn svc_freeargs Ta
-.Xr rpc_svc_reg 3 ,
-.It Fn svc_getargs Ta
-.Xr rpc_svc_reg 3 ,
-.It Fn svc_getcaller Ta
-.Xr rpc_soc 3 ,
-.It Fn svc_getreq Ta
-.Xr rpc_soc 3 ,
-.It Fn svc_getreqset Ta
-.Xr rpc_svc_calls 3 ,
-.It Fn svc_getrpccaller Ta
-.Xr rpc_svc_calls 3 ,
-.It Fn svc_kerb_reg Ta
-.Xr kerberos_rpc 3 ,
-.It Fn svc_raw_create Ta
-.Xr rpc_svc_create 3 ,
-.It Fn svc_reg Ta
-.Xr rpc_svc_calls 3 ,
-.It Fn svc_register Ta
-.Xr rpc_soc 3 ,
-.It Fn svc_run Ta
-.Xr rpc_svc_reg 3 ,
-.It Fn svc_sendreply Ta
-.Xr rpc_svc_reg 3 ,
-.It Fn svc_tli_create Ta
-.Xr rpc_svc_create 3 ,
-.It Fn svc_tp_create Ta
-.Xr rpc_svc_create 3 ,
-.It Fn svc_unreg Ta
-.Xr rpc_svc_calls 3 ,
-.It Fn svc_unregister Ta
-.Xr rpc_soc 3 ,
-.It Fn svc_vc_create Ta
-.Xr rpc_svc_create 3 ,
-.It Fn svcerr_auth Ta
-.Xr rpc_svc_err 3 ,
-.It Fn svcerr_decode Ta
-.Xr rpc_svc_err 3 ,
-.It Fn svcerr_noproc Ta
-.Xr rpc_svc_err 3 ,
-.It Fn svcerr_noprog Ta
-.Xr rpc_svc_err 3 ,
-.It Fn svcerr_progvers Ta
-.Xr rpc_svc_err 3 ,
-.It Fn svcerr_systemerr Ta
-.Xr rpc_svc_err 3 ,
-.It Fn svcerr_weakauth Ta
-.Xr rpc_svc_err 3 ,
-.It Fn svcfd_create Ta
-.Xr rpc_soc 3 ,
-.It Fn svcraw_create Ta
-.Xr rpc_soc 3 ,
-.It Fn svctcp_create Ta
-.Xr rpc_soc 3 ,
-.It Fn svcudp_bufcreate Ta
-.Xr rpc_soc 3 ,
-.It Fn svcudp_create Ta
-.Xr rpc_soc 3 ,
-.It Fn xdr_accepted_reply Ta
-.Xr rpc_xdr 3 ,
-.It Fn xdr_authsys_parms Ta
-.Xr rpc_xdr 3 ,
-.It Fn xdr_authunix_parms Ta
-.Xr rpc_soc 3 ,
-.It Fn xdr_callhdr Ta
-.Xr rpc_xdr 3 ,
-.It Fn xdr_callmsg Ta
-.Xr rpc_xdr 3 ,
-.It Fn xdr_opaque_auth Ta
-.Xr rpc_xdr 3 ,
-.It Fn xdr_rejected_reply Ta
-.Xr rpc_xdr 3 ,
-.It Fn xdr_replymsg Ta
-.Xr rpc_xdr 3 ,
-.It Fn xprt_register Ta
-.Xr rpc_svc_calls 3 ,
-.It Fn xprt_unregister Ta
-.Xr rpc_svc_calls 3 ,
+.It Fn auth_destroy Ta Xr rpc_clnt_auth 3 ,
+.It Fn authdes_create Ta Xr rpc_soc 3 ,
+.It Fn authnone_create Ta Xr rpc_clnt_auth 3 ,
+.It Fn authsys_create Ta Xr rpc_clnt_auth 3 ,
+.It Fn authsys_create_default Ta Xr rpc_clnt_auth 3 ,
+.It Fn authunix_create Ta Xr rpc_soc 3 ,
+.It Fn authunix_create_default Ta Xr rpc_soc 3 ,
+.It Fn callrpc Ta Xr rpc_soc 3 ,
+.It Fn clnt_broadcast Ta Xr rpc_soc 3 ,
+.It Fn clnt_call Ta Xr rpc_clnt_calls 3 ,
+.It Fn clnt_control Ta Xr rpc_clnt_create 3 ,
+.It Fn clnt_create Ta Xr rpc_clnt_create 3 ,
+.It Fn clnt_destroy Ta Xr rpc_clnt_create 3 ,
+.It Fn clnt_dg_create Ta Xr rpc_clnt_create 3 ,
+.It Fn clnt_freeres Ta Xr rpc_clnt_calls 3 ,
+.It Fn clnt_geterr Ta Xr rpc_clnt_calls 3 ,
+.It Fn clnt_pcreateerror Ta Xr rpc_clnt_create 3 ,
+.It Fn clnt_perrno Ta Xr rpc_clnt_calls 3 ,
+.It Fn clnt_perror Ta Xr rpc_clnt_calls 3 ,
+.It Fn clnt_raw_create Ta Xr rpc_clnt_create 3 ,
+.It Fn clnt_spcreateerror Ta Xr rpc_clnt_create 3 ,
+.It Fn clnt_sperrno Ta Xr rpc_clnt_calls 3 ,
+.It Fn clnt_sperror Ta Xr rpc_clnt_calls 3 ,
+.It Fn clnt_tli_create Ta Xr rpc_clnt_create 3 ,
+.It Fn clnt_tp_create Ta Xr rpc_clnt_create 3 ,
+.It Fn clnt_udpcreate Ta Xr rpc_soc 3 ,
+.It Fn clnt_vc_create Ta Xr rpc_clnt_create 3 ,
+.It Fn clntraw_create Ta Xr rpc_soc 3 ,
+.It Fn clnttcp_create Ta Xr rpc_soc 3 ,
+.It Fn clntudp_bufcreate Ta Xr rpc_soc 3 ,
+.It Fn get_myaddress Ta Xr rpc_soc 3 ,
+.It Fn pmap_getmaps Ta Xr rpc_soc 3 ,
+.It Fn pmap_getport Ta Xr rpc_soc 3 ,
+.It Fn pmap_rmtcall Ta Xr rpc_soc 3 ,
+.It Fn pmap_set Ta Xr rpc_soc 3 ,
+.It Fn pmap_unset Ta Xr rpc_soc 3 ,
+.It Fn registerrpc Ta Xr rpc_soc 3 ,
+.It Fn rpc_broadcast Ta Xr rpc_clnt_calls 3 ,
+.It Fn rpc_broadcast_exp Ta Xr rpc_clnt_calls 3 ,
+.It Fn rpc_call Ta Xr rpc_clnt_calls 3 ,
+.It Fn rpc_reg Ta Xr rpc_svc_calls 3 ,
+.It Fn svc_create Ta Xr rpc_svc_create 3 ,
+.It Fn svc_destroy Ta Xr rpc_svc_create 3 ,
+.It Fn svc_dg_create Ta Xr rpc_svc_create 3 ,
+.It Fn svc_dg_enablecache Ta Xr rpc_svc_calls 3 ,
+.It Fn svc_fd_create Ta Xr rpc_svc_create 3 ,
+.It Fn svc_fds Ta Xr rpc_soc 3 ,
+.It Fn svc_freeargs Ta Xr rpc_svc_reg 3 ,
+.It Fn svc_getargs Ta Xr rpc_svc_reg 3 ,
+.It Fn svc_getcaller Ta Xr rpc_soc 3 ,
+.It Fn svc_getreq Ta Xr rpc_soc 3 ,
+.It Fn svc_getreqset Ta Xr rpc_svc_calls 3 ,
+.It Fn svc_getrpccaller Ta Xr rpc_svc_calls 3 ,
+.It Fn svc_kerb_reg Ta Xr kerberos_rpc 3 ,
+.It Fn svc_raw_create Ta Xr rpc_svc_create 3 ,
+.It Fn svc_reg Ta Xr rpc_svc_calls 3 ,
+.It Fn svc_register Ta Xr rpc_soc 3 ,
+.It Fn svc_run Ta Xr rpc_svc_reg 3 ,
+.It Fn svc_sendreply Ta Xr rpc_svc_reg 3 ,
+.It Fn svc_tli_create Ta Xr rpc_svc_create 3 ,
+.It Fn svc_tp_create Ta Xr rpc_svc_create 3 ,
+.It Fn svc_unreg Ta Xr rpc_svc_calls 3 ,
+.It Fn svc_unregister Ta  Xr rpc_soc 3 ,
+.It Fn svc_vc_create Ta Xr rpc_svc_create 3 ,
+.It Fn svcerr_auth Ta Xr rpc_svc_err 3 ,
+.It Fn svcerr_decode Ta Xr rpc_svc_err 3 ,
+.It Fn svcerr_noproc Ta Xr rpc_svc_err 3 ,
+.It Fn svcerr_noprog Ta Xr rpc_svc_err 3 ,
+.It Fn svcerr_progvers Ta Xr rpc_svc_err 3 ,
+.It Fn svcerr_systemerr Ta Xr rpc_svc_err 3 ,
+.It Fn svcerr_weakauth Ta Xr rpc_svc_err 3 ,
+.It Fn svcfd_create Ta Xr rpc_soc 3 ,
+.It Fn svcraw_create Ta Xr rpc_soc 3 ,
+.It Fn svctcp_create Ta Xr rpc_soc 3 ,
+.It Fn svcudp_bufcreate Ta Xr rpc_soc 3 ,
+.It Fn svcudp_create Ta Xr rpc_soc 3 ,
+.It Fn xdr_accepted_reply Ta Xr rpc_xdr 3 ,
+.It Fn xdr_authsys_parms Ta Xr rpc_xdr 3 ,
+.It Fn xdr_authunix_parms Ta Xr rpc_soc 3 ,
+.It Fn xdr_callhdr Ta Xr rpc_xdr 3 ,
+.It Fn xdr_callmsg Ta Xr rpc_xdr 3 ,
+.It Fn xdr_opaque_auth Ta Xr rpc_xdr 3 ,
+.It Fn xdr_rejected_reply Ta Xr rpc_xdr 3 ,
+.It Fn xdr_replymsg Ta Xr rpc_xdr 3 ,
+.It Fn xprt_register Ta Xr rpc_svc_calls 3 ,
+.It Fn xprt_unregister Ta Xr rpc_svc_calls 3 ,
 .El
 .Sh FILES
 .Pa /etc/netconfig