use .Va for global variables, and .Vt where the type is included

5 files changed, 59 insertions, 73 deletions

diff --git a/lib/libc/rpc/rpc.3 b/lib/libc/rpc/rpc.3
index 10f899bb99f..bdaf2882483 100644
--- a/lib/libc/rpc/rpc.3
+++ b/lib/libc/rpc/rpc.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: rpc.3,v 1.46 2013/06/05 03:39:23 tedu Exp $
+.\"	$OpenBSD: rpc.3,v 1.47 2015/09/14 13:08:01 schwarze Exp $
 .\"
 .\" Copyright (c) 1998 Theo de Raadt
 .\" All rights reserved.
@@ -52,7 +52,7 @@
 .\"   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 .\"   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: June 5 2013 $
+.Dd $Mdocdate: September 14 2015 $
 .Dt RPC 3
 .Os
 .Sh NAME
@@ -175,22 +175,15 @@
 .Fn pmap_unset "u_long prognum" "u_long versnum"
 .Ft int
 .Fn registerrpc "u_long prognum" "u_long versnum" "u_long procnum" "char *(*procname)() " "xdrproc_t inproc" "xdrproc_t outproc"
-.Ft struct rpc_createerr
-.Fa rpc_createerr ;
+.Vt struct rpc_createerr rpc_createerr ;
 .Ft int
 .Fn svc_destroy "SVCXPRT *xprt"
-.Ft struct pollfd *
-.Fa svc_pollfd ;
-.Ft int
-.Fa svc_max_pollfd ;
-.Ft fd_set
-.Fa svc_fdset ;
-.Ft fd_set
-.Fa *__svc_fdset ;
-.Ft int
-.Fa __svc_fdsetsize ;
-.Ft int
-.Fa svc_fds ;
+.Vt struct pollfd *svc_pollfd ;
+.Vt int svc_max_pollfd ;
+.Vt fd_set svc_fdset ;
+.Vt fd_set *__svc_fdset ;
+.Vt int __svc_fdsetsize ;
+.Vt int svc_fds ;
 .Ft int
 .Fn svc_freeargs "SVCXPRT *xprt" "xdrproc_t inproc" "char *in"
 .Ft int
@@ -661,7 +654,7 @@ the RPC system failured to contact the remote
 .Xr portmap 8
 service.
 In the latter case, the global variable
-.Fn rpc_createerr
+.Va rpc_createerr
 contains the RPC status.
 .Pp
 .Fn pmap_rmtcall
@@ -746,7 +739,7 @@ are accessed using the UDP/IP transport; see
 .Fn svcudp_create
 for restrictions.
 .Pp
-.Fa rpc_createerr
+.Va rpc_createerr
 is a global variable whose value is set by any RPC client creation routine
 that does not succeed.
 Use the routine
@@ -764,7 +757,7 @@ Use of
 .Fa xprt
 is undefined after calling this routine.
 .Pp
-.Fa svc_pollfd
+.Va svc_pollfd
 is a global variable reflecting the RPC service side's
 read file descriptor array.
 This variable is only of interest if service implementors do not call
@@ -777,30 +770,30 @@ Do not pass it directly to
 .Xr poll 2 !
 Instead, make a copy and pass that instead.
 .Pp
-.Fa svc_max_pollfd
+.Va svc_max_pollfd
 is a global variable containing the maximum length of the
-.Fa svc_pollfd
+.Va svc_pollfd
 array.
-.Fa svc_max_pollfd
+.Va svc_max_pollfd
 is not a hard limit; it will grow automatically as needed.
 This variable is read-only, and it may change after calls to
 .Fn svc_getreq_poll
 or any creation routines.
 The purpose of
-.Fa svc_max_pollfd
+.Va svc_max_pollfd
 is to allow a service implementor to make a copy of
-.Fa svc_pollfd
+.Va svc_pollfd
 that may in turn be passed to
 .Xr poll 2 .
 .Pp
-.Fa __svc_fdset
+.Va __svc_fdset
 and
-.Fa __svc_fdsetsize
+.Va __svc_fdsetsize
 are global variables reflecting the RPC service side's
 read file descriptor bit mask.
-.Fa __svc_fdsetsize
+.Va __svc_fdsetsize
 is a count of the number of checkable bits in
-.Fa __svc_fdset ,
+.Va __svc_fdset ,
 and can expand to the full size that
 .Xr select 2
 supports, hence exceeding
@@ -817,14 +810,14 @@ Do not pass its address to
 .Xr select 2 !
 Instead, pass the address of a copy.
 These variables are considered obsolete; new programs should use
-.Fa svc_pollfd
+.Va svc_pollfd
 and
-.Fa svc_max_pollfd
+.Va svc_max_pollfd
 instead.
 .Pp
-.Fa svc_fdset
+.Va svc_fdset
 is similar to
-.Fa __svc_fdset
+.Va __svc_fdset
 but limited to
 .Fa FD_SETSIZE
 descriptors.
@@ -846,15 +839,15 @@ this variable will only be usable for the first
 .Fa FD_SETSIZE
 descriptors.
 This variable is considered obsolete; new programs should use
-.Fa svc_pollfd
+.Va svc_pollfd
 which does not have this limit.
 .Pp
-.Fa svc_fds
+.Va svc_fds
 is similar to
-.Fa svc_fedset ,
+.Va svc_fdset ,
 but limited to 32 descriptors.
 This interface is obsoleted by
-.Fa svc_fdset
+.Va svc_fdset
 and is included for source compatibility only.
 .Pp
 .Fn svc_freeargs
@@ -1187,13 +1180,13 @@ is used to register transport handles.
 After RPC service transport handles are created,
 they should register themselves with the RPC service package.
 This routine modifies the global variables
-.Fa svc_pollfd ,
-.Fa svc_fdset ,
-.Fa __svc_fdset
+.Va svc_pollfd ,
+.Va svc_fdset ,
+.Va __svc_fdset
 and may modify
-.Fa svc_max_pollfd
+.Va svc_max_pollfd
 and
-.Fa __svc_fdsetsize .
+.Va __svc_fdsetsize .
 Service implementors usually do not need this routine.
 .Pp
 .Fn xprt_unregister
@@ -1201,10 +1194,10 @@ is used to unregister a transport handle.
 Before an RPC service transport handle is destroyed,
 it should unregister itself with the RPC service package.
 This routine modifies the global variable
-.Fa svc_pollfd ,
-.Fa svc_fdset ,
+.Va svc_pollfd ,
+.Va svc_fdset ,
 and
-.Fa __svc_fdset .
+.Va __svc_fdset .
 Service implementors usually do not need this routine.
 .Sh SEE ALSO
 .\"Xr rpc_secure 3 ,
diff --git a/lib/libc/stdlib/malloc.3 b/lib/libc/stdlib/malloc.3
index 32f36bd6496..27645b5a805 100644
--- a/lib/libc/stdlib/malloc.3
+++ b/lib/libc/stdlib/malloc.3
@@ -30,9 +30,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$OpenBSD: malloc.3,v 1.90 2015/03/14 08:07:17 tedu Exp $
+.\"	$OpenBSD: malloc.3,v 1.91 2015/09/14 13:08:01 schwarze Exp $
 .\"
-.Dd $Mdocdate: March 14 2015 $
+.Dd $Mdocdate: September 14 2015 $
 .Dt MALLOC 3
 .Os
 .Sh NAME
@@ -54,8 +54,7 @@
 .Fn realloc "void *ptr" "size_t size"
 .Ft void
 .Fn free "void *ptr"
-.Ft char * Ns
-.Va malloc_options ;
+.Vt char *malloc_options ;
 .Sh DESCRIPTION
 The
 .Fn malloc
diff --git a/lib/libc/time/ctime.3 b/lib/libc/time/ctime.3
index fc02e5de668..284f5f0d3b2 100644
--- a/lib/libc/time/ctime.3
+++ b/lib/libc/time/ctime.3
@@ -1,7 +1,7 @@
-.\"	$OpenBSD: ctime.3,v 1.43 2014/01/23 08:15:13 otto Exp $
+.\"	$OpenBSD: ctime.3,v 1.44 2015/09/14 13:08:01 schwarze Exp $
 .\"
 .\"
-.Dd $Mdocdate: January 23 2014 $
+.Dd $Mdocdate: September 14 2015 $
 .Dt CTIME 3
 .Os
 .Sh NAME
@@ -21,8 +21,7 @@
 .Sh SYNOPSIS
 .In sys/types.h
 .In time.h
-.Pp
-.Fd extern char *tzname[2];
+.Vt extern char *tzname[2] ;
 .Ft "char *"
 .Fn ctime "const time_t *clock"
 .Ft "char *"
@@ -86,7 +85,7 @@ Unlike
 the thread-safe version
 .Fn ctime_r
 is not required to set
-.Fa tzname .
+.Va tzname .
 .Pp
 The
 .Fn localtime
@@ -105,7 +104,7 @@ structure,
 sets the
 .Fa tm_isdst Ns 'th
 element of
-.Fa tzname
+.Va tzname
 to a pointer to an
 ASCII string that's the time zone abbreviation to be used with
 the return value of
@@ -130,7 +129,7 @@ but instead store the result directly into the structure pointed to by
 Unlike
 .Fn localtime ,
 the reentrant version is not required to set
-.Fa tzname .
+.Va tzname .
 .Pp
 .Fn asctime
 converts a time value contained in a
diff --git a/lib/libm/man/lgamma.3 b/lib/libm/man/lgamma.3
index 624567c118b..432925c21c5 100644
--- a/lib/libm/man/lgamma.3
+++ b/lib/libm/man/lgamma.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: lgamma.3,v 1.22 2015/01/15 19:06:31 schwarze Exp $
+.\"	$OpenBSD: lgamma.3,v 1.23 2015/09/14 13:08:01 schwarze Exp $
 .\" Copyright (c) 1985, 1991 Regents of the University of California.
 .\" All rights reserved.
 .\"
@@ -28,7 +28,7 @@
 .\"
 .\"     from: @(#)lgamma.3	6.6 (Berkeley) 12/3/92
 .\"
-.Dd $Mdocdate: January 15 2015 $
+.Dd $Mdocdate: September 14 2015 $
 .Dt LGAMMA 3
 .Os
 .Sh NAME
@@ -44,9 +44,7 @@
 .Nd log gamma functions
 .Sh SYNOPSIS
 .In math.h
-.Ft extern int
-.Fa signgam ;
-.sp
+.Vt extern int signgam ;
 .Ft double
 .Fn lgamma "double x"
 .Ft float
@@ -79,7 +77,7 @@ returns ln\||\(*G(x)| where
 returns ln\||\(*G(x)|.
 .Pp
 The external integer
-.Fa signgam
+.Va signgam
 returns the sign of \(*G(x).
 The
 .Fn lgammaf
@@ -103,7 +101,7 @@ and
 that return the sign via the
 .Fa signgamp
 pointer instead of modifying
-.Fa signgam .
+.Va signgam .
 .Pp
 The
 .Fn tgamma x ,
@@ -111,7 +109,7 @@ The
 and
 .Fn tgammal x
 functions return \(*G(x), with no effect on
-.Fa signgam .
+.Va signgam .
 .Sh IDIOSYNCRASIES
 Do not use the expression
 .Sq Li signgam\(**exp(lgamma(x))
@@ -123,7 +121,9 @@ lg = lgamma(x); g = signgam\(**exp(lg);
 .Pp
 Only after
 .Fn lgamma
-has returned can signgam be correct.
+has returned can
+.Va signgam
+be correct.
 .Pp
 For arguments in its range,
 .Fn tgamma
diff --git a/lib/libpthread/man/pthread_once.3 b/lib/libpthread/man/pthread_once.3
index 1a4a37bc991..852e41913e8 100644
--- a/lib/libpthread/man/pthread_once.3
+++ b/lib/libpthread/man/pthread_once.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: pthread_once.3,v 1.14 2014/01/21 03:15:45 schwarze Exp $
+.\" $OpenBSD: pthread_once.3,v 1.15 2015/09/14 13:08:01 schwarze Exp $
 .\"
 .\" Copyright (c) 1996 John Birrell <jb@cimlogic.com.au>.
 .\" All rights reserved.
@@ -32,7 +32,7 @@
 .\"
 .\" $FreeBSD: pthread_once.3,v 1.5 1999/08/28 00:03:09 peter Exp $
 .\"
-.Dd $Mdocdate: January 21 2014 $
+.Dd $Mdocdate: September 14 2015 $
 .Dt PTHREAD_ONCE 3
 .Os
 .Sh NAME
@@ -40,12 +40,7 @@
 .Nd dynamic package initialization
 .Sh SYNOPSIS
 .In pthread.h
-.Pp
-.Ft pthread_once_t
-.Fa once_control
-\&=
-.Dv PTHREAD_ONCE_INIT ;
-.Pp
+.Vt pthread_once_t once_control No = Dv PTHREAD_ONCE_INIT ;
 .Ft int
 .Fn pthread_once "pthread_once_t *once_control" "void (*init_routine)(void)"
 .Sh DESCRIPTION
@@ -78,7 +73,7 @@ is not a cancellation point.
 However, if
 .Fn init_routine
 is a cancellation point and is cancelled, the effect on
-.Fa once_control
+.Va once_control
 is as if
 .Fn pthread_once
 was never called.