aboutsummaryrefslogtreecommitdiffstats
diff options
authorAlejandro Colomar <alx@kernel.org>2025-06-06 13:27:02 +0200
committerAlejandro Colomar <alx@kernel.org>2025-06-28 16:51:43 +0200
commit8eea66b827a11bc8983da517499cc236c6cd97ba (patch)
treeaef545da6666369425609c27752453f9f9cf45d8
parent6569dd9b22d256f26928ddcc398db9f123546171 (diff)
downloadman-pages-master.tar.gz
man/: SYNOPSIS: Don't highlight forward declarations of function parametersHEADmaster
Previously, many people confused these for actual parameters, since it's hard to distinguish a ',' from ';'. By removing bold/italics from these, it will be easier to distinguish them. The cases have been found with a script: $ find -type f \ | xargs grep -l '^\.TH ' \ | sort \ | xargs mansect SYNOPSIS \ | man /dev/stdin \ | grep -e '^[^ ]' -e '[^ ]( [^ )].*[^)];' \ | less; Reported-by: Mark Naughton <mnaughto@redhat.com> Suggested-by: Mark Harris <mark.hsj@gmail.com> Acked-by: Mark Naughton <mnaughto@redhat.com> Signed-off-by: Alejandro Colomar <alx@kernel.org>
-rw-r--r--man/man2/add_key.22
-rw-r--r--man/man2/alloc_hugepages.22
-rw-r--r--man/man2/cacheflush.22
-rw-r--r--man/man2/epoll_wait.26
-rw-r--r--man/man2/get_mempolicy.22
-rw-r--r--man/man2/getdents.22
-rw-r--r--man/man2/getdomainname.24
-rw-r--r--man/man2/getrandom.22
-rw-r--r--man/man2/getsockopt.24
-rw-r--r--man/man2/getunwind.22
-rw-r--r--man/man2/getxattr.26
-rw-r--r--man/man2/init_module.22
-rw-r--r--man/man2/listmount.22
-rw-r--r--man/man2/lookup_dcookie.22
-rw-r--r--man/man2/madvise.22
-rw-r--r--man/man2/mbind.22
-rw-r--r--man/man2/mincore.22
-rw-r--r--man/man2/mlock.26
-rw-r--r--man/man2/mmap.24
-rw-r--r--man/man2/modify_ldt.22
-rw-r--r--man/man2/mprotect.24
-rw-r--r--man/man2/mremap.22
-rw-r--r--man/man2/msgop.24
-rw-r--r--man/man2/msync.22
-rw-r--r--man/man2/outb.212
-rw-r--r--man/man2/perfmonctl.22
-rw-r--r--man/man2/pread.24
-rw-r--r--man/man2/query_module.22
-rw-r--r--man/man2/read.22
-rw-r--r--man/man2/readlink.24
-rw-r--r--man/man2/recv.24
-rw-r--r--man/man2/remap_file_pages.22
-rw-r--r--man/man2/s390_pci_mmio_write.24
-rw-r--r--man/man2/send.24
-rw-r--r--man/man2/setxattr.26
-rw-r--r--man/man2/write.22
-rw-r--r--man/man2const/KEYCTL_DESCRIBE.2const2
-rw-r--r--man/man2const/KEYCTL_DH_COMPUTE.2const2
-rw-r--r--man/man2const/KEYCTL_GET_SECURITY.2const2
-rw-r--r--man/man2const/KEYCTL_INSTANTIATE.2const4
-rw-r--r--man/man2const/KEYCTL_READ.2const2
-rw-r--r--man/man2const/KEYCTL_UPDATE.2const2
-rw-r--r--man/man2const/PR_GET_AUXV.2const2
-rw-r--r--man/man3/aio_suspend.32
-rw-r--r--man/man3/arc4random.32
-rw-r--r--man/man3/backtrace.36
-rw-r--r--man/man3/bcmp.32
-rw-r--r--man/man3/bcopy.32
-rw-r--r--man/man3/bsearch.32
-rw-r--r--man/man3/bstring.322
-rw-r--r--man/man3/bzero.34
-rw-r--r--man/man3/cfree.34
-rw-r--r--man/man3/confstr.32
-rw-r--r--man/man3/des_crypt.34
-rw-r--r--man/man3/fgetc.32
-rw-r--r--man/man3/fgetws.32
-rw-r--r--man/man3/fmemopen.32
-rw-r--r--man/man3/fread.34
-rw-r--r--man/man3/getcwd.32
-rw-r--r--man/man3/getdirentries.32
-rw-r--r--man/man3/getentropy.32
-rw-r--r--man/man3/getgrent_r.34
-rw-r--r--man/man3/getgrnam.34
-rw-r--r--man/man3/gethostbyname.310
-rw-r--r--man/man3/getipnodebyname.32
-rw-r--r--man/man3/getlogin.32
-rw-r--r--man/man3/getmntent.32
-rw-r--r--man/man3/getnameinfo.32
-rw-r--r--man/man3/getnetent_r.36
-rw-r--r--man/man3/getprotoent_r.36
-rw-r--r--man/man3/getpwent_r.34
-rw-r--r--man/man3/getpwnam.34
-rw-r--r--man/man3/getrpcent_r.36
-rw-r--r--man/man3/getservent_r.36
-rw-r--r--man/man3/getspnam.38
-rw-r--r--man/man3/inet_net_pton.34
-rw-r--r--man/man3/inet_ntop.32
-rw-r--r--man/man3/lio_listio.32
-rw-r--r--man/man3/lsearch.34
-rw-r--r--man/man3/mblen.32
-rw-r--r--man/man3/mbrlen.32
-rw-r--r--man/man3/mbrtowc.32
-rw-r--r--man/man3/mbsnrtowcs.32
-rw-r--r--man/man3/mbsrtowcs.32
-rw-r--r--man/man3/mbstowcs.32
-rw-r--r--man/man3/mbtowc.32
-rw-r--r--man/man3/memccpy.32
-rw-r--r--man/man3/memchr.34
-rw-r--r--man/man3/memcmp.32
-rw-r--r--man/man3/memcpy.32
-rw-r--r--man/man3/memfrob.32
-rw-r--r--man/man3/memmem.32
-rw-r--r--man/man3/memmove.32
-rw-r--r--man/man3/mempcpy.34
-rw-r--r--man/man3/memset.32
-rw-r--r--man/man3/mq_receive.34
-rw-r--r--man/man3/mq_send.34
-rw-r--r--man/man3/posix_madvise.32
-rw-r--r--man/man3/printf.34
-rw-r--r--man/man3/pthread_attr_setstack.32
-rw-r--r--man/man3/pthread_setname_np.32
-rw-r--r--man/man3/ptsname.32
-rw-r--r--man/man3/qsort.34
-rw-r--r--man/man3/random.32
-rw-r--r--man/man3/regex.32
-rw-r--r--man/man3/resolver.324
-rw-r--r--man/man3/setaliasent.34
-rw-r--r--man/man3/setbuf.34
-rw-r--r--man/man3/setnetgrent.32
-rw-r--r--man/man3/stpncpy.34
-rw-r--r--man/man3/strcasecmp.32
-rw-r--r--man/man3/strcmp.32
-rw-r--r--man/man3/strdup.34
-rw-r--r--man/man3/strerror.34
-rw-r--r--man/man3/strfmon.34
-rw-r--r--man/man3/strfromd.36
-rw-r--r--man/man3/strftime.34
-rw-r--r--man/man3/strncat.32
-rw-r--r--man/man3/strnlen.32
-rw-r--r--man/man3/strxfrm.32
-rw-r--r--man/man3/swab.32
-rw-r--r--man/man3/ttyname.32
-rw-r--r--man/man3/unlocked_stdio.38
-rw-r--r--man/man3/wcpncpy.32
-rw-r--r--man/man3/wcscasecmp.32
-rw-r--r--man/man3/wcsncat.32
-rw-r--r--man/man3/wcsncmp.32
-rw-r--r--man/man3/wcsncpy.32
-rw-r--r--man/man3/wcsnlen.32
-rw-r--r--man/man3/wcsnrtombs.32
-rw-r--r--man/man3/wcsrtombs.32
-rw-r--r--man/man3/wcstombs.32
-rw-r--r--man/man3/wmemchr.32
-rw-r--r--man/man3/wmemcmp.32
-rw-r--r--man/man3/wmemcpy.32
-rw-r--r--man/man3/wmemmove.32
-rw-r--r--man/man3/wmemset.32
-rw-r--r--man/man3/wprintf.34
-rw-r--r--man/man7/string_copying.716
139 files changed, 237 insertions, 237 deletions
diff --git a/man/man2/add_key.2 b/man/man2/add_key.2
index 59da2d0bb3..535863bcb5 100644
--- a/man/man2/add_key.2
+++ b/man/man2/add_key.2
@@ -12,7 +12,7 @@ Standard C library
.nf
.B #include <keyutils.h>
.P
-.BI "key_serial_t add_key(size_t " size ;
+.BR "key_serial_t add_key(" "size_t size;"
.BI " const char *" type ", const char *" description ,
.BI " const void " payload [ size "], size_t " size ,
.BI " key_serial_t " keyring ");"
diff --git a/man/man2/alloc_hugepages.2 b/man/man2/alloc_hugepages.2
index 0a35ad9aec..05619bcb7c 100644
--- a/man/man2/alloc_hugepages.2
+++ b/man/man2/alloc_hugepages.2
@@ -7,7 +7,7 @@
alloc_hugepages, free_hugepages \- allocate or free huge pages
.SH SYNOPSIS
.nf
-.BI "void *syscall(size_t " size ;
+.BR "void *syscall(" "size_t size;"
.BI " SYS_alloc_hugepages, int " key ", void " addr [ size "], \
size_t " size ,
.BI " int " prot ", int " flag );
diff --git a/man/man2/cacheflush.2 b/man/man2/cacheflush.2
index c4c6ed1bf2..6832a780da 100644
--- a/man/man2/cacheflush.2
+++ b/man/man2/cacheflush.2
@@ -12,7 +12,7 @@ Standard C library
.nf
.B #include <sys/cachectl.h>
.P
-.BI "int cacheflush(int " nbytes;
+.BR "int cacheflush(" "int nbytes;"
.BI " void " addr [ nbytes "], int "nbytes ", int "cache );
.fi
.P
diff --git a/man/man2/epoll_wait.2 b/man/man2/epoll_wait.2
index 6d9a1e95c7..3d0fbc986d 100644
--- a/man/man2/epoll_wait.2
+++ b/man/man2/epoll_wait.2
@@ -13,14 +13,14 @@ Standard C library
.nf
.B #include <sys/epoll.h>
.P
-.BI "int epoll_wait(int " maxevents ;
+.BR "int epoll_wait(" "int maxevents;"
.BI " int " epfd ", struct epoll_event " events [ maxevents ],
.BI " int " maxevents ", int " timeout );
-.BI "int epoll_pwait(int " maxevents ;
+.BR "int epoll_pwait(" "int maxevents;"
.BI " int " epfd ", struct epoll_event " events [ maxevents ],
.BI " int " maxevents ", int " timeout ,
.BI " const sigset_t *_Nullable " sigmask );
-.BI "int epoll_pwait2(int " maxevents ;
+.BR "int epoll_pwait2(" "int maxevents;"
.BI " int " epfd ", struct epoll_event " events [ maxevents ],
.BI " int " maxevents ", \
const struct timespec *_Nullable " timeout ,
diff --git a/man/man2/get_mempolicy.2 b/man/man2/get_mempolicy.2
index ba40f34cab..49ddda9010 100644
--- a/man/man2/get_mempolicy.2
+++ b/man/man2/get_mempolicy.2
@@ -12,7 +12,7 @@ NUMA (Non-Uniform Memory Access) policy library
.B "#include <numaif.h>"
.nf
.P
-.BI "long get_mempolicy(unsigned long " maxnode ;
+.BR "long get_mempolicy(" "unsigned long maxnode;"
.BI " int *" mode ,
.BI " unsigned long " nodemask [( maxnode " + ULONG_WIDTH \- 1)"
.B " / ULONG_WIDTH],"
diff --git a/man/man2/getdents.2 b/man/man2/getdents.2
index d502f9a1af..0d4e25c023 100644
--- a/man/man2/getdents.2
+++ b/man/man2/getdents.2
@@ -20,7 +20,7 @@ Standard C library
.BR "#define _GNU_SOURCE" " /* See feature_test_macros(7) */"
.B #include <dirent.h>
.P
-.BI "ssize_t getdents64(size_t " count ;
+.BR "ssize_t getdents64(" "size_t count;"
.BI " int " fd ", void " dirp [ count "], size_t " count );
.fi
.P
diff --git a/man/man2/getdomainname.2 b/man/man2/getdomainname.2
index f697ee64df..2b64ce0bc9 100644
--- a/man/man2/getdomainname.2
+++ b/man/man2/getdomainname.2
@@ -12,9 +12,9 @@ Standard C library
.nf
.B #include <unistd.h>
.P
-.BI "int getdomainname(size_t " size ;
+.BR "int getdomainname(" "size_t size;"
.BI " char " name [ size "], size_t " size );
-.BI "int setdomainname(size_t " size ;
+.BR "int setdomainname(" "size_t size;"
.BI " const char " name [ size "], size_t " size );
.fi
.P
diff --git a/man/man2/getrandom.2 b/man/man2/getrandom.2
index e61206cb17..9e4f03c480 100644
--- a/man/man2/getrandom.2
+++ b/man/man2/getrandom.2
@@ -12,7 +12,7 @@ Standard C library
.nf
.B #include <sys/random.h>
.P
-.BI "ssize_t getrandom(size_t " buflen ;
+.BR "ssize_t getrandom(" "size_t buflen;"
.BI " void " buf [ buflen "], size_t " buflen ", \
unsigned int " flags );
.fi
diff --git a/man/man2/getsockopt.2 b/man/man2/getsockopt.2
index 2041e833c5..f306577050 100644
--- a/man/man2/getsockopt.2
+++ b/man/man2/getsockopt.2
@@ -13,11 +13,11 @@ Standard C library
.nf
.B #include <sys/socket.h>
.P
-.BI "int getsockopt(socklen *restrict " optlen ;
+.BR "int getsockopt(" "socklen *restrict optlen;"
.BI " int " sockfd ", int " level ", int " optname ,
.BI " void " optval "[_Nullable restrict *" optlen ],
.BI " socklen_t *restrict " optlen );
-.BI "int setsockopt(socklen_t " optlen ;
+.BR "int setsockopt(" "socklen_t optlen;"
.BI " int " sockfd ", int " level ", int " optname ,
.BI " const void " optval [ optlen ],
.BI " socklen_t " optlen );
diff --git a/man/man2/getunwind.2 b/man/man2/getunwind.2
index 8ab6caf719..b882b3f41b 100644
--- a/man/man2/getunwind.2
+++ b/man/man2/getunwind.2
@@ -14,7 +14,7 @@ Standard C library
.BR "#include <sys/syscall.h>" " /* Definition of " SYS_* " constants */"
.B #include <unistd.h>
.P
-.BI "[[deprecated]] long syscall(size_t " buf_size ;
+.BR "[[deprecated]] long syscall(" "size_t buf_size;"
.BI " SYS_getunwind, void " buf [ buf_size ],
.BI " size_t " buf_size );
.fi
diff --git a/man/man2/getxattr.2 b/man/man2/getxattr.2
index bddff7e571..8669624f71 100644
--- a/man/man2/getxattr.2
+++ b/man/man2/getxattr.2
@@ -12,13 +12,13 @@ Standard C library
.nf
.B #include <sys/xattr.h>
.P
-.BI "ssize_t getxattr(size_t " size ;
+.BR "ssize_t getxattr(" "size_t size;"
.BI " const char *" path ", const char *" name ,
.BI " void " value [ size "], size_t " size );
-.BI "ssize_t lgetxattr(size_t " size ;
+.BR "ssize_t lgetxattr(" "size_t size;"
.BI " const char *" path ", const char *" name ,
.BI " void " value [ size "], size_t " size );
-.BI "ssize_t fgetxattr(size_t " size ;
+.BR "ssize_t fgetxattr(" "size_t size;"
.BI " int " fd ", const char *" name ,
.BI " void " value [ size "], size_t " size );
.fi
diff --git a/man/man2/init_module.2 b/man/man2/init_module.2
index 3ba3780427..9ef4d5875f 100644
--- a/man/man2/init_module.2
+++ b/man/man2/init_module.2
@@ -15,7 +15,7 @@ Standard C library
.BR "#include <sys/syscall.h>" " /* Definition of " SYS_* " constants */"
.B #include <unistd.h>
.P
-.BI "int syscall(unsigned long " size ;
+.BR "int syscall(" "unsigned long size;"
.BI " SYS_init_module, void " module_image [ size "], \
unsigned long " size ,
.BI " const char *" param_values );
diff --git a/man/man2/listmount.2 b/man/man2/listmount.2
index 019e4dbf62..71fb331386 100644
--- a/man/man2/listmount.2
+++ b/man/man2/listmount.2
@@ -15,7 +15,7 @@ Standard C library
.BR "#include <linux/mount.h>" " /* Definition of struct mnt_id_req constants */"
.B #include <unistd.h>
.P
-.BI "int syscall(size_t " n ;
+.BR "int syscall(" "size_t n;"
.BI " SYS_listmount, struct mnt_id_req *" req ,
.BI " uint64_t " mnt_ids [ n "], size_t " n ,
.BI " unsigned long " flags );
diff --git a/man/man2/lookup_dcookie.2 b/man/man2/lookup_dcookie.2
index 664020a923..417441e23b 100644
--- a/man/man2/lookup_dcookie.2
+++ b/man/man2/lookup_dcookie.2
@@ -13,7 +13,7 @@ Standard C library
.BR "#include <sys/syscall.h>" " /* Definition of " SYS_* " constants */"
.B #include <unistd.h>
.P
-.BI "int syscall(size_t " size ;
+.BR "int syscall(" "size_t size;"
.BI " SYS_lookup_dcookie, uint64_t " cookie ", char " buffer [ size ],
.BI " size_t " size );
.fi
diff --git a/man/man2/madvise.2 b/man/man2/madvise.2
index 81884ee197..10cc21fa4d 100644
--- a/man/man2/madvise.2
+++ b/man/man2/madvise.2
@@ -12,7 +12,7 @@ Standard C library
.nf
.B #include <sys/mman.h>
.P
-.BI "int madvise(size_t " size ;
+.BR "int madvise(" "size_t size;"
.BI " void " addr [ size "], size_t " size ", int " advice );
.fi
.P
diff --git a/man/man2/mbind.2 b/man/man2/mbind.2
index a8eab1c4ae..0c173a9419 100644
--- a/man/man2/mbind.2
+++ b/man/man2/mbind.2
@@ -20,7 +20,7 @@ NUMA (Non-Uniform Memory Access) policy library
.nf
.B "#include <numaif.h>"
.P
-.BI "long mbind(unsigned long " size ", unsigned long " maxnode ;
+.BR "long mbind(" "unsigned long size, unsigned long maxnode;"
.BI " void " addr [ size "], unsigned long " size ", int " mode ,
.BI " const unsigned long " nodemask [( maxnode " + ULONG_WIDTH \- 1)"
.B " / ULONG_WIDTH],"
diff --git a/man/man2/mincore.2 b/man/man2/mincore.2
index 72c6a5c169..8574ed1922 100644
--- a/man/man2/mincore.2
+++ b/man/man2/mincore.2
@@ -12,7 +12,7 @@ Standard C library
.nf
.B #include <sys/mman.h>
.P
-.BI "int mincore(size_t " length ;
+.BR "int mincore(" "size_t length;"
.BI " void " addr [ length "], size_t " length ", unsigned char *" vec );
.fi
.P
diff --git a/man/man2/mlock.2 b/man/man2/mlock.2
index 377ba00bba..9bf711140e 100644
--- a/man/man2/mlock.2
+++ b/man/man2/mlock.2
@@ -12,12 +12,12 @@ Standard C library
.nf
.B #include <sys/mman.h>
.P
-.BI "int mlock(size_t " size ;
+.BR "int mlock(" "size_t size;"
.BI " const void " addr [ size "], size_t " size );
-.BI "int mlock2(size_t " size ;
+.BR "int mlock2(" "size_t size;"
.BI " const void " addr [ size "], size_t " size ", \
unsigned int " flags );
-.BI "int munlock(size_t " size ;
+.BR "int munlock(" "size_t size;"
.BI " const void " addr [ size "], size_t " size );
.P
.BI "int mlockall(int " flags );
diff --git a/man/man2/mmap.2 b/man/man2/mmap.2
index 036610f9de..28ad07198a 100644
--- a/man/man2/mmap.2
+++ b/man/man2/mmap.2
@@ -13,11 +13,11 @@ Standard C library
.nf
.B #include <sys/mman.h>
.P
-.BI "void *mmap(size_t " length ;
+.BR "void *mmap(" "size_t length;"
.BI " void " addr [ length "], size_t " length \
", int " prot ", int " flags ,
.BI " int " fd ", off_t " offset );
-.BI "int munmap(size_t " length ;
+.BR "int munmap(" "size_t length;"
.BI " void " addr [ length "], size_t " length );
.fi
.P
diff --git a/man/man2/modify_ldt.2 b/man/man2/modify_ldt.2
index 6ff505c6c9..2b6c4543fc 100644
--- a/man/man2/modify_ldt.2
+++ b/man/man2/modify_ldt.2
@@ -14,7 +14,7 @@ Standard C library
.BR "#include <sys/syscall.h>" " /* Definition of " SYS_* " constants */"
.B #include <unistd.h>
.P
-.BI "int syscall(unsigned long " bytecount ;
+.BR "int syscall(" "unsigned long bytecount;"
.BI " SYS_modify_ldt, int " func ", void " ptr [ bytecount ],
.BI " unsigned long " bytecount );
.fi
diff --git a/man/man2/mprotect.2 b/man/man2/mprotect.2
index 2457bdd6bd..773d93dc9c 100644
--- a/man/man2/mprotect.2
+++ b/man/man2/mprotect.2
@@ -12,13 +12,13 @@ Standard C library
.nf
.B #include <sys/mman.h>
.P
-.BI "int mprotect(size_t " size ;
+.BR "int mprotect(" "size_t size;"
.BI " void " addr [ size "], size_t " size ", int " prot );
.P
.BR "#define _GNU_SOURCE" " /* See feature_test_macros(7) */"
.B #include <sys/mman.h>
.P
-.BI "int pkey_mprotect(size_t " size ;
+.BR "int pkey_mprotect(" "size_t size;"
.BI " void " addr [ size "], size_t " size ", int " prot ", int " pkey ");"
.fi
.SH DESCRIPTION
diff --git a/man/man2/mremap.2 b/man/man2/mremap.2
index 2c80978821..2168ca728b 100644
--- a/man/man2/mremap.2
+++ b/man/man2/mremap.2
@@ -13,7 +13,7 @@ Standard C library
.BR "#define _GNU_SOURCE" " /* See feature_test_macros(7) */"
.B #include <sys/mman.h>
.P
-.BI "void *mremap(size_t " old_size ;
+.BR "void *mremap(" "size_t old_size;"
.BI " void " old_address [ old_size "], size_t " old_size ,
.BI " size_t " new_size ", int " flags ", ... /* void *" new_address " */);"
.fi
diff --git a/man/man2/msgop.2 b/man/man2/msgop.2
index 9ee6535116..6ed8a2038c 100644
--- a/man/man2/msgop.2
+++ b/man/man2/msgop.2
@@ -12,12 +12,12 @@ Standard C library
.nf
.B #include <sys/msg.h>
.P
-.BI "ssize_t msgrcv(size_t " msgsz ;
+.BR "ssize_t msgrcv(" "size_t msgsz;"
.BI " int " msqid ", void " msgp [ msgsz "], size_t " msgsz \
", long " msgtyp ,
.BI " int " msgflg );
.P
-.BI "int msgsnd(size_t " msgsz ;
+.BR "int msgsnd(" "size_t msgsz;"
.BI " int " msqid ", const void " msgp [ msgsz "], size_t " msgsz ,
.BI " int " msgflg );
.fi
diff --git a/man/man2/msync.2 b/man/man2/msync.2
index 4f391b3775..e4a8012985 100644
--- a/man/man2/msync.2
+++ b/man/man2/msync.2
@@ -12,7 +12,7 @@ Standard C library
.nf
.B #include <sys/mman.h>
.P
-.BI "int msync(size_t " length ;
+.BR "int msync(" "size_t length;"
.BI " void " addr [ length "], size_t " length ", int " flags );
.fi
.SH DESCRIPTION
diff --git a/man/man2/outb.2 b/man/man2/outb.2
index 8635dc30e8..df21f52a43 100644
--- a/man/man2/outb.2
+++ b/man/man2/outb.2
@@ -28,22 +28,22 @@ Standard C library
.BI "void outl(unsigned int " value ", unsigned short " port );
.BI "void outl_p(unsigned int " value ", unsigned short " port );
.P
-.BI "void insb(unsigned long " count ;
+.BR "void insb(" "unsigned long count;"
.BI " unsigned short " port ", void " addr [ count ],
.BI " unsigned long " count );
-.BI "void insw(unsigned long " count ;
+.BR "void insw(" "unsigned long count;"
.BI " unsigned short " port ", void " addr [ count ],
.BI " unsigned long " count );
-.BI "void insl(unsigned long " count ;
+.BR "void insl(" "unsigned long count;"
.BI " unsigned short " port ", void " addr [ count ],
.BI " unsigned long " count );
-.BI "void outsb(unsigned long " count ;
+.BR "void outsb(" "unsigned long count;"
.BI " unsigned short " port ", const void " addr [ count ],
.BI " unsigned long " count );
-.BI "void outsw(unsigned long " count ;
+.BR "void outsw(" "unsigned long count;"
.BI " unsigned short " port ", const void " addr [ count ],
.BI " unsigned long " count );
-.BI "void outsl(unsigned long " count ;
+.BR "void outsl(" "unsigned long count;"
.BI " unsigned short " port ", const void " addr [ count ],
.BI " unsigned long " count );
.fi
diff --git a/man/man2/perfmonctl.2 b/man/man2/perfmonctl.2
index 29023d7e7c..af839e184f 100644
--- a/man/man2/perfmonctl.2
+++ b/man/man2/perfmonctl.2
@@ -10,7 +10,7 @@ perfmonctl \- interface to IA-64 performance monitoring unit
.B #include <syscall.h>
.B #include <perfmon.h>
.P
-.BI "long perfmonctl(int " narg ;
+.BR "long perfmonctl(" "int narg;"
.BI " int " fd ", int " cmd ", void " arg [ narg "], int " narg );
.fi
.P
diff --git a/man/man2/pread.2 b/man/man2/pread.2
index cc47466b87..278e7ec814 100644
--- a/man/man2/pread.2
+++ b/man/man2/pread.2
@@ -12,10 +12,10 @@ Standard C library
.nf
.B #include <unistd.h>
.P
-.BI "ssize_t pread(size_t " count ;
+.BR "ssize_t pread(" "size_t count;"
.BI " int " fd ", void " buf [ count "], size_t " count ,
.BI " off_t " offset );
-.BI "ssize_t pwrite(size_t " count ;
+.BR "ssize_t pwrite(" "size_t count;"
.BI " int " fd ", const void " buf [ count "], size_t " count ,
.BI " off_t " offset );
.fi
diff --git a/man/man2/query_module.2 b/man/man2/query_module.2
index bc4c260d04..9595a5a175 100644
--- a/man/man2/query_module.2
+++ b/man/man2/query_module.2
@@ -10,7 +10,7 @@ query_module \- query the kernel for various bits pertaining to modules
.nf
.B #include <linux/module.h>
.P
-.BI "[[deprecated]] int query_module(size_t " bufsize ;
+.BR "[[deprecated]] int query_module(" "size_t bufsize;"
.BI " const char *" name ", int " which ,
.BI " void " buf [ bufsize "], \
size_t " bufsize ,
diff --git a/man/man2/read.2 b/man/man2/read.2
index 1e46aa61f7..26edce43ff 100644
--- a/man/man2/read.2
+++ b/man/man2/read.2
@@ -12,7 +12,7 @@ Standard C library
.nf
.B #include <unistd.h>
.P
-.BI "ssize_t read(size_t " count ;
+.BR "ssize_t read(" "size_t count;"
.BI " int " fd ", void " buf [ count "], size_t " count );
.fi
.SH DESCRIPTION
diff --git a/man/man2/readlink.2 b/man/man2/readlink.2
index 8e54385163..b6c663cd3a 100644
--- a/man/man2/readlink.2
+++ b/man/man2/readlink.2
@@ -13,14 +13,14 @@ Standard C library
.nf
.B #include <unistd.h>
.P
-.BI "ssize_t readlink(size_t " bufsiz ;
+.BR "ssize_t readlink(" "size_t bufsiz;"
.BI " const char *restrict " path ,
.BI " char " buf "[restrict " bufsiz "], size_t " bufsiz );
.P
.BR "#include <fcntl.h> " "/* Definition of " AT_* " constants */"
.B #include <unistd.h>
.P
-.BI "ssize_t readlinkat(size_t " bufsiz ;
+.BR "ssize_t readlinkat(" "size_t bufsiz;"
.BI " int " dirfd ", const char *restrict " path ,
.BI " char " buf "[restrict " bufsiz "], size_t " bufsiz );
.P
diff --git a/man/man2/recv.2 b/man/man2/recv.2
index 9b4a984add..3f14394476 100644
--- a/man/man2/recv.2
+++ b/man/man2/recv.2
@@ -13,10 +13,10 @@ Standard C library
.nf
.B #include <sys/socket.h>
.P
-.BI "ssize_t recv(size_t " size ;
+.BR "ssize_t recv(" "size_t size;"
.BI " int " sockfd ", void " buf [ size "], size_t " size ,
.BI " int " flags );
-.BI "ssize_t recvfrom(size_t " size ;
+.BR "ssize_t recvfrom(" "size_t size;"
.BI " int " sockfd ", void " buf "[restrict " size "], size_t " size ,
.BI " int " flags ,
.BI " struct sockaddr *_Nullable restrict " src_addr ,
diff --git a/man/man2/remap_file_pages.2 b/man/man2/remap_file_pages.2
index 4e9f73e924..9c3059f442 100644
--- a/man/man2/remap_file_pages.2
+++ b/man/man2/remap_file_pages.2
@@ -13,7 +13,7 @@ Standard C library
.BR "#define _GNU_SOURCE" " /* See feature_test_macros(7) */"
.B #include <sys/mman.h>
.P
-.BI "[[deprecated]] int remap_file_pages(size_t " size ;
+.BR "[[deprecated]] int remap_file_pages(" "size_t size;"
.BI " void " addr [ size "], size_t " size ,
.BI " int " prot ", size_t " pgoff ", \
int " flags );
diff --git a/man/man2/s390_pci_mmio_write.2 b/man/man2/s390_pci_mmio_write.2
index 1442dc37c9..b47b919a61 100644
--- a/man/man2/s390_pci_mmio_write.2
+++ b/man/man2/s390_pci_mmio_write.2
@@ -14,10 +14,10 @@ Standard C library
.BR "#include <sys/syscall.h>" " /* Definition of " SYS_* " constants */"
.B #include <unistd.h>
.P
-.BI "int syscall(size_t " length ;
+.BR "int syscall(" "size_t length;"
.BI " SYS_s390_pci_mmio_write, unsigned long " mmio_addr ,
.BI " const void " user_buffer [ length "], size_t " length );
-.BI "int syscall(size_t " length ;
+.BR "int syscall(" "size_t length;"
.BI " SYS_s390_pci_mmio_read, unsigned long " mmio_addr ,
.BI " void " user_buffer [ length "], size_t " length );
.fi
diff --git a/man/man2/send.2 b/man/man2/send.2
index 7093c73452..84ac2695ab 100644
--- a/man/man2/send.2
+++ b/man/man2/send.2
@@ -13,10 +13,10 @@ Standard C library
.nf
.B #include <sys/socket.h>
.P
-.BI "ssize_t send(size_t " size ;
+.BR "ssize_t send(" "size_t size;"
.BI " int " sockfd ", const void " buf [ size "], size_t " size \
", int " flags );
-.BI "ssize_t sendto(size_t " size ;
+.BR "ssize_t sendto(" "size_t size;"
.BI " int " sockfd ", const void " buf [ size "], size_t " size \
", int " flags ,
.BI " const struct sockaddr *" dest_addr ", socklen_t " addrlen );
diff --git a/man/man2/setxattr.2 b/man/man2/setxattr.2
index a4a1f65930..12dc76cbdd 100644
--- a/man/man2/setxattr.2
+++ b/man/man2/setxattr.2
@@ -12,13 +12,13 @@ Standard C library
.nf
.B #include <sys/xattr.h>
.P
-.BI "int setxattr(size_t " size ;
+.BR "int setxattr(" "size_t size;"
.BI " const char *" path ", const char *" name ,
.BI " const void " value [ size "], size_t " size ", int " flags );
-.BI "int lsetxattr(size_t " size ;
+.BR "int lsetxattr(" "size_t size;"
.BI " const char *" path ", const char *" name ,
.BI " const void " value [ size "], size_t " size ", int " flags );
-.BI "int fsetxattr(size_t " size ;
+.BR "int fsetxattr(" "size_t size;"
.BI " int " fd ", const char *" name ,
.BI " const void " value [ size "], size_t " size ", int " flags );
.fi
diff --git a/man/man2/write.2 b/man/man2/write.2
index 79706ea089..5392de0ac0 100644
--- a/man/man2/write.2
+++ b/man/man2/write.2
@@ -12,7 +12,7 @@ Standard C library
.nf
.B #include <unistd.h>
.P
-.BI "ssize_t write(size_t " count ;
+.BR "ssize_t write(" "size_t count;"
.BI " int " fd ", const void " buf [ count "], size_t " count );
.fi
.SH DESCRIPTION
diff --git a/man/man2const/KEYCTL_DESCRIBE.2const b/man/man2const/KEYCTL_DESCRIBE.2const
index 6522627bf2..8721ab6fb1 100644
--- a/man/man2const/KEYCTL_DESCRIBE.2const
+++ b/man/man2const/KEYCTL_DESCRIBE.2const
@@ -16,7 +16,7 @@ Standard C library
.BR "#include <sys/syscall.h>" " /* Definition of " SYS_* " constants */"
.B #include <unistd.h>
.P
-.BI "long syscall(size_t " size ;
+.BR "long syscall(" "size_t size;"
.BI " SYS_keyctl, KEYCTL_DESCRIBE, key_serial_t " key ,
.BI " char " desc "[_Nullable " size "], size_t " size );
.fi
diff --git a/man/man2const/KEYCTL_DH_COMPUTE.2const b/man/man2const/KEYCTL_DH_COMPUTE.2const
index ea074287e6..2fdbd8161b 100644
--- a/man/man2const/KEYCTL_DH_COMPUTE.2const
+++ b/man/man2const/KEYCTL_DH_COMPUTE.2const
@@ -16,7 +16,7 @@ Standard C library
.BR "#include <sys/syscall.h>" " /* Definition of " SYS_* " constants */"
.B #include <unistd.h>
.P
-.BI "long syscall(size_t " n ;
+.BR "long syscall(" "size_t n;"
.B " SYS_keyctl, KEYCTL_DH_COMPUTE,"
.BI " struct keyctl_dh_params *" dh_params ,
.BI " char " buf [ n "], size_t " n ,
diff --git a/man/man2const/KEYCTL_GET_SECURITY.2const b/man/man2const/KEYCTL_GET_SECURITY.2const
index c53be7ac53..18ceeabe70 100644
--- a/man/man2const/KEYCTL_GET_SECURITY.2const
+++ b/man/man2const/KEYCTL_GET_SECURITY.2const
@@ -16,7 +16,7 @@ Standard C library
.BR "#include <sys/syscall.h>" " /* Definition of " SYS_* " constants */"
.B #include <unistd.h>
.P
-.BI "long syscall(size_t " n ;
+.BR "long syscall(" "size_t n;"
.BI " SYS_keyctl, KEYCTL_GET_SECURITY, key_serial_t " key ,
.BI " char " buf "[_Nullable " n "], size_t " n );
.fi
diff --git a/man/man2const/KEYCTL_INSTANTIATE.2const b/man/man2const/KEYCTL_INSTANTIATE.2const
index cfb15a2918..c53237b9c5 100644
--- a/man/man2const/KEYCTL_INSTANTIATE.2const
+++ b/man/man2const/KEYCTL_INSTANTIATE.2const
@@ -19,11 +19,11 @@ Standard C library
.BR "#include <sys/syscall.h>" " /* Definition of " SYS_* " constants */"
.B #include <unistd.h>
.P
-.BI "long syscall(size_t " n ;
+.BR "long syscall(" "size_t n;"
.BI " SYS_keyctl, KEYCTL_INSTANTIATE, key_serial_t " key ,
.BI " const void " payload [ n "], size_t " n ,
.BI " key_serial_t " keyring );
-.BI "long syscall(size_t " n ;
+.BR "long syscall(" "size_t n;"
.BI " SYS_keyctl, KEYCTL_INSTANTIATE_IOV, key_serial_t " key ,
.BI " const struct iovec " payload [ n "], unsigned int " n ,
.BI " key_serial_t " keyring );
diff --git a/man/man2const/KEYCTL_READ.2const b/man/man2const/KEYCTL_READ.2const
index 9067ec6cb6..46cc26be5d 100644
--- a/man/man2const/KEYCTL_READ.2const
+++ b/man/man2const/KEYCTL_READ.2const
@@ -16,7 +16,7 @@ Standard C library
.BR "#include <sys/syscall.h>" " /* Definition of " SYS_* " constants */"
.B #include <unistd.h>
.P
-.BI "long syscall(size_t " size ;
+.BR "long syscall(" "size_t size;"
.BI " SYS_keyctl, KEYCTL_READ, key_serial_t " key ,
.BI " char " buf "[_Nullable " size "], size_t " size );
.fi
diff --git a/man/man2const/KEYCTL_UPDATE.2const b/man/man2const/KEYCTL_UPDATE.2const
index 46917a5e1d..13f2d05cdb 100644
--- a/man/man2const/KEYCTL_UPDATE.2const
+++ b/man/man2const/KEYCTL_UPDATE.2const
@@ -16,7 +16,7 @@ Standard C library
.BR "#include <sys/syscall.h>" " /* Definition of " SYS_* " constants */"
.B #include <unistd.h>
.P
-.BI "long syscall(size_t " size ;
+.BR "long syscall(" "size_t size;"
.BI " SYS_keyctl, KEYCTL_UPDATE, key_serial_t " key ,
.BI " void " payload [ size "], size_t " size );
.fi
diff --git a/man/man2const/PR_GET_AUXV.2const b/man/man2const/PR_GET_AUXV.2const
index 2bc8ceee65..b3484220a4 100644
--- a/man/man2const/PR_GET_AUXV.2const
+++ b/man/man2const/PR_GET_AUXV.2const
@@ -15,7 +15,7 @@ Standard C library
.BR "#include <linux/prctl.h>" " /* Definition of " PR_* " constants */"
.B #include <sys/prctl.h>
.P
-.BI "int prctl(size_t " size ;
+.BR "int prctl(" "size_t size;"
.BI " PR_GET_AUXV, void " auxv [ size "], unsigned long " size ", 0L, 0L);"
.fi
.SH DESCRIPTION
diff --git a/man/man3/aio_suspend.3 b/man/man3/aio_suspend.3
index 4b63200160..8a3931d993 100644
--- a/man/man3/aio_suspend.3
+++ b/man/man3/aio_suspend.3
@@ -14,7 +14,7 @@ Real-time library
.P
.B "#include <aio.h>"
.P
-.BI "int aio_suspend(int " n ;
+.BR "int aio_suspend(" "int n;"
.BI " const struct aiocb *const " aiocb_list [ n "], int " n ,
.BI " const struct timespec *restrict " timeout );
.fi
diff --git a/man/man3/arc4random.3 b/man/man3/arc4random.3
index 1068f6c5db..1b9c85d13b 100644
--- a/man/man3/arc4random.3
+++ b/man/man3/arc4random.3
@@ -16,7 +16,7 @@ Standard C library
.P
.B uint32_t arc4random(void);
.BI "uint32_t arc4random_uniform(uint32_t " upper_bound );
-.BI "void arc4random_buf(size_t " n ;
+.BR "void arc4random_buf(" "size_t n;"
.BI " void " buf [ n "], size_t " n );
.fi
.SH DESCRIPTION
diff --git a/man/man3/backtrace.3 b/man/man3/backtrace.3
index ca44623aa7..420b2551c9 100644
--- a/man/man3/backtrace.3
+++ b/man/man3/backtrace.3
@@ -33,12 +33,12 @@ Standard C library
.nf
.B #include <execinfo.h>
.P
-.BI "int backtrace(int " size ;
+.BR "int backtrace(" "int size;"
.BI " void *" buffer [ size "], int " size );
.P
-.BI "char **backtrace_symbols(int " size ;
+.BR "char **backtrace_symbols(" "int size;"
.BI " void *const " buffer [ size "], int " size );
-.BI "void backtrace_symbols_fd(int " size ;
+.BR "void backtrace_symbols_fd(" "int size;"
.BI " void *const " buffer [ size "], int " size ", int " fd );
.fi
.SH DESCRIPTION
diff --git a/man/man3/bcmp.3 b/man/man3/bcmp.3
index 925f9f1983..153c2f141f 100644
--- a/man/man3/bcmp.3
+++ b/man/man3/bcmp.3
@@ -12,7 +12,7 @@ Standard C library
.nf
.B #include <strings.h>
.P
-.BI "[[deprecated]] int bcmp(size_t " n ;
+.BR "[[deprecated]] int bcmp(" "size_t n;"
.BI " const void " s1 [ n "], const void " s2 [ n "], \
size_t " n );
.fi
diff --git a/man/man3/bcopy.3 b/man/man3/bcopy.3
index 3ef19d853d..9f234c7611 100644
--- a/man/man3/bcopy.3
+++ b/man/man3/bcopy.3
@@ -13,7 +13,7 @@ Standard C library
.nf
.B #include <strings.h>
.P
-.BI "[[deprecated]] void bcopy(size_t " n ;
+.BR "[[deprecated]] void bcopy(" "size_t n;"
.BI " const void " src [ n "], void " dest [ n "], \
size_t " n );
.fi
diff --git a/man/man3/bsearch.3 b/man/man3/bsearch.3
index 90896c514b..03b00d9aad 100644
--- a/man/man3/bsearch.3
+++ b/man/man3/bsearch.3
@@ -13,7 +13,7 @@ Standard C library
.nf
.B #include <stdlib.h>
.P
-.BI "void *bsearch(size_t " n ", size_t " size ;
+.BR "void *bsearch(" "size_t n, size_t size;"
.BI " const void " key [ size "], const void " base [ size " * " n ],
.BI " size_t " n ", size_t " size ,
.BI " typeof(int (const void [" size "], const void [" size ]))
diff --git a/man/man3/bstring.3 b/man/man3/bstring.3
index 2ac954c587..d4022dbe82 100644
--- a/man/man3/bstring.3
+++ b/man/man3/bstring.3
@@ -13,38 +13,38 @@ Standard C library
.nf
.B #include <string.h>
.P
-.BI "int bcmp(size_t " n ;
+.BR "int bcmp(" "size_t n;"
.BI " const void " s1 [ n "], const void " s2 [ n "], size_t " n );
.P
-.BI "void bcopy(size_t " n ;
+.BR "void bcopy(" "size_t n;"
.BI " const void " src [ n "], void " dest [ n "], size_t " n );
.P
-.BI "void bzero(size_t " n ;
+.BR "void bzero(" "size_t n;"
.BI " void " s [ n "], size_t " n );
.P
-.BI "void *memccpy(size_t " n ;
+.BR "void *memccpy(" "size_t n;"
.BI " void " dest [ n "], const void " src [ n "], int " c ", size_t " n );
.P
-.BI "void *memchr(size_t " n ;
+.BR "void *memchr(" "size_t n;"
.BI " const void " s [ n "], int " c ", size_t " n );
.P
-.BI "int memcmp(size_t " n ;
+.BR "int memcmp(" "size_t n;"
.BI " const void " s1 [ n "], const void " s2 [ n "], size_t " n );
.P
-.BI "void *memcpy(size_t " n ;
+.BR "void *memcpy(" "size_t n;"
.BI " void " dest [ n "], const void " src [ n "], size_t " n );
.P
-.BI "void *memfrob(size_t " n ;
+.BR "void *memfrob(" "size_t n;"
.BI " void " s [ n "], size_t " n );
.P
-.BI "void *memmem(size_t " hsize ", size_t " nsize ;
+.BR "void *memmem(" "size_t hsize, size_t nsize;"
.BI " const void " haystack [ hsize "], size_t " hsize ,
.BI " const void " needle [ nsize "], size_t " nsize );
.P
-.BI "void *memmove(size_t " n ;
+.BR "void *memmove(" "size_t n;"
.BI " void " dest [ n "], const void " src [ n "], size_t " n );
.P
-.BI "void *memset(size_t " n ;
+.BR "void *memset(" "size_t n;"
.BI " void " s [ n "], int " c ", size_t " n );
.fi
.SH DESCRIPTION
diff --git a/man/man3/bzero.3 b/man/man3/bzero.3
index 437bb5ae9c..b2c50a883b 100644
--- a/man/man3/bzero.3
+++ b/man/man3/bzero.3
@@ -13,12 +13,12 @@ Standard C library
.nf
.B #include <strings.h>
.P
-.BI "void bzero(size_t " n ;
+.BR "void bzero(" "size_t n;"
.BI " void " s [ n "], size_t " n );
.P
.B #include <string.h>
.P
-.BI "void explicit_bzero(size_t " n ;
+.BR "void explicit_bzero(" "size_t n;"
.BI " void " s [ n "], size_t " n );
.fi
.SH DESCRIPTION
diff --git a/man/man3/cfree.3 b/man/man3/cfree.3
index 65854f6e32..b117539be9 100644
--- a/man/man3/cfree.3
+++ b/man/man3/cfree.3
@@ -21,12 +21,12 @@ Standard C library
.BI "void cfree(void *" ptr );
.P
/* In SCO OpenServer */
-.BI "void cfree(unsigned int " n ", unsigned int " size ;
+.BR "void cfree(" "unsigned int n, unsigned int size;"
.BI " char " ptr [ size " * " n "], unsigned int " n ", \
unsigned int " size );
.P
/* In Solaris watchmalloc.so.1 */
-.BI "void cfree(size_t " n ", size_t " size ;
+.BR "void cfree(" "size_t n, size_t size;"
.BI " void " ptr [ size " * " n "], size_t " n ", size_t " size );
.fi
.P
diff --git a/man/man3/confstr.3 b/man/man3/confstr.3
index 030d874055..c19f4163e4 100644
--- a/man/man3/confstr.3
+++ b/man/man3/confstr.3
@@ -19,7 +19,7 @@ Standard C library
.nf
.B #include <unistd.h>
.P
-.BI "size_t confstr(size_t " size ;
+.BR "size_t confstr(" "size_t size;"
.BI " int " "name" ", char " buf [ size "], size_t " size );
.fi
.P
diff --git a/man/man3/des_crypt.3 b/man/man3/des_crypt.3
index 176222d54f..ed46030660 100644
--- a/man/man3/des_crypt.3
+++ b/man/man3/des_crypt.3
@@ -16,10 +16,10 @@ Standard C library
.\" .B #include <des_crypt.h>
.B #include <rpc/des_crypt.h>
.P
-.BI "[[deprecated]] int ecb_crypt(unsigned int " datalen ;
+.BR "[[deprecated]] int ecb_crypt(" "unsigned int datalen;"
.BI " char *" key ", char " data [ datalen ],
.BI " unsigned int " datalen ", unsigned int " mode );
-.BI "[[deprecated]] int cbc_crypt(unsigned int " datalen ;
+.BR "[[deprecated]] int cbc_crypt(" "unsigned int datalen;"
.BI " char *" key ", char " data [ datalen ],
.BI " unsigned int " datalen ", unsigned int " mode ,
.BI " char *" ivec );
diff --git a/man/man3/fgetc.3 b/man/man3/fgetc.3
index d083b52aea..b2c5b37ebf 100644
--- a/man/man3/fgetc.3
+++ b/man/man3/fgetc.3
@@ -17,7 +17,7 @@ Standard C library
.BI "int getc(FILE *" stream );
.B "int getchar(void);"
.P
-.BI "char *fgets(int " size ;
+.BR "char *fgets(" "int size;"
.BI " char " s "[restrict " size "], int " size ", \
FILE *restrict " stream );
.P
diff --git a/man/man3/fgetws.3 b/man/man3/fgetws.3
index b46a512ffc..41b8ab36e3 100644
--- a/man/man3/fgetws.3
+++ b/man/man3/fgetws.3
@@ -13,7 +13,7 @@ Standard C library
.nf
.B #include <wchar.h>
.P
-.BI "wchar_t *fgetws(int " n ;
+.BR "wchar_t *fgetws(" "int n;"
.BI " wchar_t " ws "[restrict " n "], int " n \
", FILE *restrict " stream );
.fi
diff --git a/man/man3/fmemopen.3 b/man/man3/fmemopen.3
index c3dcfb9163..d0d27ffea0 100644
--- a/man/man3/fmemopen.3
+++ b/man/man3/fmemopen.3
@@ -13,7 +13,7 @@ Standard C library
.nf
.B #include <stdio.h>
.P
-.BI "FILE *fmemopen(size_t " size ;
+.BR "FILE *fmemopen(" "size_t size;"
.BI " void " buf [ size "], size_t " size ", const char *" mode );
.fi
.P
diff --git a/man/man3/fread.3 b/man/man3/fread.3
index 55b74b93a6..1b6c77a665 100644
--- a/man/man3/fread.3
+++ b/man/man3/fread.3
@@ -14,11 +14,11 @@ Standard C library
.nf
.B #include <stdio.h>
.P
-.BI "size_t fread(size_t " size ", size_t " n ;
+.BR "size_t fread(" "size_t size, size_t n;"
.BI " void " ptr "[restrict " size " * " n ],
.BI " size_t " size ", size_t " n ,
.BI " FILE *restrict " stream );
-.BI "size_t fwrite(size_t " size ", size_t " n ;
+.BR "size_t fwrite(" "size_t size, size_t n;"
.BI " const void " ptr "[restrict " size " * " n ],
.BI " size_t " size ", size_t " n ,
.BI " FILE *restrict " stream );
diff --git a/man/man3/getcwd.3 b/man/man3/getcwd.3
index 1ca682e0b2..4346db386d 100644
--- a/man/man3/getcwd.3
+++ b/man/man3/getcwd.3
@@ -13,7 +13,7 @@ Standard C library
.nf
.B #include <unistd.h>
.P
-.BI "char *getcwd(size_t " size ;
+.BR "char *getcwd(" "size_t size;"
.BI " char " buf [ size "], size_t " size );
.B "char *get_current_dir_name(void);"
.P
diff --git a/man/man3/getdirentries.3 b/man/man3/getdirentries.3
index 43b66e3578..255297feb8 100644
--- a/man/man3/getdirentries.3
+++ b/man/man3/getdirentries.3
@@ -14,7 +14,7 @@ Standard C library
.nf
.B #include <dirent.h>
.P
-.BI "ssize_t getdirentries(size_t " nbytes ;
+.BR "ssize_t getdirentries(" "size_t nbytes;"
.BI " int " fd ", char " buf "[restrict " nbytes "], \
size_t " nbytes ,
.BI " off_t *restrict " basep );
diff --git a/man/man3/getentropy.3 b/man/man3/getentropy.3
index 2179ead42a..2c8605b82b 100644
--- a/man/man3/getentropy.3
+++ b/man/man3/getentropy.3
@@ -12,7 +12,7 @@ Standard C library
.nf
.B #include <unistd.h>
.P
-.BI "int getentropy(size_t " length ;
+.BR "int getentropy(" "size_t length;"
.BI " void " buffer [ length "], size_t " length );
.fi
.P
diff --git a/man/man3/getgrent_r.3 b/man/man3/getgrent_r.3
index f6e6ec9328..3bb3ccec8a 100644
--- a/man/man3/getgrent_r.3
+++ b/man/man3/getgrent_r.3
@@ -13,11 +13,11 @@ Standard C library
.nf
.B #include <grp.h>
.P
-.BI "int getgrent_r(size_t " size ;
+.BR "int getgrent_r(" "size_t size;"
.BI " struct group *restrict " gbuf ,
.BI " char " buf "[restrict " size "], size_t " size ,
.BI " struct group **restrict " gbufp );
-.BI "int fgetgrent_r(size_t " size ;
+.BR "int fgetgrent_r(" "size_t size;"
.BI " FILE *restrict " stream ", struct group *restrict " gbuf ,
.BI " char " buf "[restrict " size "], size_t " size ,
.BI " struct group **restrict " gbufp );
diff --git a/man/man3/getgrnam.3 b/man/man3/getgrnam.3
index aad2ebf4d6..e495eaed94 100644
--- a/man/man3/getgrnam.3
+++ b/man/man3/getgrnam.3
@@ -17,12 +17,12 @@ Standard C library
.BI "struct group *getgrnam(const char *" name );
.BI "struct group *getgrgid(gid_t " gid );
.P
-.BI "int getgrnam_r(size_t " size ;
+.BR "int getgrnam_r(" "size_t size;"
.BI " const char *restrict " name \
", struct group *restrict " grp ,
.BI " char " buf "[restrict " size "], size_t " size ,
.BI " struct group **restrict " result );
-.BI "int getgrgid_r(size_t " size ;
+.BR "int getgrgid_r(" "size_t size;"
.BI " gid_t " gid ", struct group *restrict " grp ,
.BI " char " buf "[restrict " size "], size_t " size ,
.BI " struct group **restrict " result );
diff --git a/man/man3/gethostbyname.3 b/man/man3/gethostbyname.3
index 4351b214ea..b09bd923b5 100644
--- a/man/man3/gethostbyname.3
+++ b/man/man3/gethostbyname.3
@@ -24,7 +24,7 @@ Standard C library
.B [[deprecated]] extern int h_errno;
.P
.BI "[[deprecated]] struct hostent *gethostbyname(const char *" name );
-.BI "[[deprecated]] struct hostent *gethostbyaddr(socklen_t " size ;
+.BR "[[deprecated]] struct hostent *gethostbyaddr(" "socklen_t size;"
.BI " const void " addr [ size ],
.BI " socklen_t " size ", int " type );
.P
@@ -38,14 +38,14 @@ Standard C library
.B [[deprecated]]
.BI "struct hostent *gethostbyname2(const char *" name ", int " af );
.P
-.BI "int gethostent_r(size_t " bufsize ;
+.BR "int gethostent_r(" "size_t bufsize;"
.BI " struct hostent *restrict " ret ,
.BI " char " buf "[restrict " bufsize "], size_t " bufsize ,
.BI " struct hostent **restrict " result ,
.BI " int *restrict " h_errnop );
.P
.B [[deprecated]]
-.BI "int gethostbyaddr_r(socklen_t " size ", size_t " bufsize ;
+.BR "int gethostbyaddr_r(" "socklen_t size, size_t bufsize;"
.BI " const void " addr "[restrict " size "], socklen_t " size ,
.BI " int " type ,
.BI " struct hostent *restrict " ret ,
@@ -53,14 +53,14 @@ Standard C library
.BI " struct hostent **restrict " result ,
.BI " int *restrict " h_errnop );
.B [[deprecated]]
-.BI "int gethostbyname_r(size_t " bufsize ;
+.BR "int gethostbyname_r(" "size_t bufsize;"
.BI " const char *restrict " name ,
.BI " struct hostent *restrict " ret ,
.BI " char " buf "[restrict " bufsize "], size_t " bufsize ,
.BI " struct hostent **restrict " result ,
.BI " int *restrict " h_errnop );
.B [[deprecated]]
-.BI "int gethostbyname2_r(size_t " bufsize ;
+.BR "int gethostbyname2_r(" "size_t bufsize;"
.BI " const char *restrict " name ", int " af,
.BI " struct hostent *restrict " ret ,
.BI " char " buf "[restrict " bufsize "], size_t " bufsize ,
diff --git a/man/man3/getipnodebyname.3 b/man/man3/getipnodebyname.3
index 0489e44c5b..28d1c3ccd4 100644
--- a/man/man3/getipnodebyname.3
+++ b/man/man3/getipnodebyname.3
@@ -19,7 +19,7 @@ Standard C library
.P
.BI "[[deprecated]] struct hostent *getipnodebyname(const char *" name ", int " af ,
.BI " int " flags ", int *" error_num );
-.BI "[[deprecated]] struct hostent *getipnodebyaddr(size_t " size ;
+.BR "[[deprecated]] struct hostent *getipnodebyaddr(" "size_t size;"
.BI " const void " addr [ size ],
.BI " size_t " size ", int " af ,
.BI " int *" "error_num" );
diff --git a/man/man3/getlogin.3 b/man/man3/getlogin.3
index 366630f875..ea17967cd5 100644
--- a/man/man3/getlogin.3
+++ b/man/man3/getlogin.3
@@ -14,7 +14,7 @@ Standard C library
.B #include <unistd.h>
.P
.B "char *getlogin(void);"
-.BI "int getlogin_r(size_t " bufsize ;
+.BR "int getlogin_r(" "size_t bufsize;"
.BI " char " buf [ bufsize "], size_t " bufsize );
.P
.B #include <stdio.h>
diff --git a/man/man3/getmntent.3 b/man/man3/getmntent.3
index d720f5f75b..1145fc3499 100644
--- a/man/man3/getmntent.3
+++ b/man/man3/getmntent.3
@@ -29,7 +29,7 @@ Standard C library
/* GNU extension */
.B #include <mntent.h>
.P
-.BI "struct mntent *getmntent_r(int " size ;
+.BR "struct mntent *getmntent_r(" "int size;"
.BI " FILE *restrict " streamp ,
.BI " struct mntent *restrict " mntbuf ,
.BI " char " buf "[restrict " size "], int " size );
diff --git a/man/man3/getnameinfo.3 b/man/man3/getnameinfo.3
index f3d6244efd..7fa13bcb62 100644
--- a/man/man3/getnameinfo.3
+++ b/man/man3/getnameinfo.3
@@ -14,7 +14,7 @@ Standard C library
.B #include <sys/socket.h>
.B #include <netdb.h>
.P
-.BI "int getnameinfo(socklen_t " hostlen ", socklen_t " servlen ;
+.BR "int getnameinfo(" "socklen_t hostlen, socklen_t servlen;"
.BI " const struct sockaddr *restrict " addr \
", socklen_t " addrlen ,
.BI " char " host "[_Nullable restrict " hostlen ],
diff --git a/man/man3/getnetent_r.3 b/man/man3/getnetent_r.3
index e400828150..0960d9cc91 100644
--- a/man/man3/getnetent_r.3
+++ b/man/man3/getnetent_r.3
@@ -14,18 +14,18 @@ Standard C library
.nf
.B #include <netdb.h>
.P
-.BI "int getnetent_r(size_t " size ;
+.BR "int getnetent_r(" "size_t size;"
.BI " struct netent *restrict " result_buf ,
.BI " char " buf "[restrict " size "], size_t " size ,
.BI " struct netent **restrict " result ,
.BI " int *restrict " h_errnop );
-.BI "int getnetbyname_r(size_t " size ;
+.BR "int getnetbyname_r(" "size_t size;"
.BI " const char *restrict " name ,
.BI " struct netent *restrict " result_buf ,
.BI " char " buf "[restrict " size "], size_t " size ,
.BI " struct netent **restrict " result ,
.BI " int *restrict " h_errnop );
-.BI "int getnetbyaddr_r(size_t " size ;
+.BR "int getnetbyaddr_r(" "size_t size;"
.BI " uint32_t " net ", int " type ,
.BI " struct netent *restrict " result_buf ,
.BI " char " buf "[restrict " size "], size_t " size ,
diff --git a/man/man3/getprotoent_r.3 b/man/man3/getprotoent_r.3
index 23ba783f38..a467fb9e15 100644
--- a/man/man3/getprotoent_r.3
+++ b/man/man3/getprotoent_r.3
@@ -14,16 +14,16 @@ Standard C library
.nf
.B #include <netdb.h>
.P
-.BI "int getprotoent_r(size_t " size ;
+.BR "int getprotoent_r(" "size_t size;"
.BI " struct protoent *restrict " result_buf ,
.BI " char " buf "[restrict " size "], size_t " size ,
.BI " struct protoent **restrict " result );
-.BI "int getprotobyname_r(size_t " size ;
+.BR "int getprotobyname_r(" "size_t size;"
.BI " const char *restrict " name ,
.BI " struct protoent *restrict " result_buf ,
.BI " char " buf "[restrict " size "], size_t " size ,
.BI " struct protoent **restrict " result );
-.BI "int getprotobynumber_r(size_t " size ;
+.BR "int getprotobynumber_r(" "size_t size;"
.BI " int " proto ,
.BI " struct protoent *restrict " result_buf ,
.BI " char " buf "[restrict " size "], size_t " size ,
diff --git a/man/man3/getpwent_r.3 b/man/man3/getpwent_r.3
index e58a675080..8c4c41b825 100644
--- a/man/man3/getpwent_r.3
+++ b/man/man3/getpwent_r.3
@@ -13,11 +13,11 @@ Standard C library
.nf
.B #include <pwd.h>
.P
-.BI "int getpwent_r(size_t " size ;
+.BR "int getpwent_r(" "size_t size;"
.BI " struct passwd *restrict " pwbuf ,
.BI " char " buf "[restrict " size "], size_t " size ,
.BI " struct passwd **restrict " pwbufp );
-.BI "int fgetpwent_r(size_t " size ;
+.BR "int fgetpwent_r(" "size_t size;"
.BI " FILE *restrict " stream ", struct passwd *restrict " pwbuf ,
.BI " char " buf "[restrict " size "], size_t " size ,
.BI " struct passwd **restrict " pwbufp );
diff --git a/man/man3/getpwnam.3 b/man/man3/getpwnam.3
index 5c35711f8d..f02b028af0 100644
--- a/man/man3/getpwnam.3
+++ b/man/man3/getpwnam.3
@@ -17,12 +17,12 @@ Standard C library
.BI "struct passwd *getpwnam(const char *" name );
.BI "struct passwd *getpwuid(uid_t " uid );
.P
-.BI "int getpwnam_r(size_t " size ;
+.BR "int getpwnam_r(" "size_t size;"
.BI " const char *restrict " name ", \
struct passwd *restrict " pwd ,
.BI " char " buf "[restrict " size "], size_t " size ,
.BI " struct passwd **restrict " result );
-.BI "int getpwuid_r(size_t " size ;
+.BR "int getpwuid_r(" "size_t size;"
.BI " uid_t " uid ", struct passwd *restrict " pwd ,
.BI " char " buf "[restrict " size "], size_t " size ,
.BI " struct passwd **restrict " result );
diff --git a/man/man3/getrpcent_r.3 b/man/man3/getrpcent_r.3
index b993e2b5a4..2678c3907a 100644
--- a/man/man3/getrpcent_r.3
+++ b/man/man3/getrpcent_r.3
@@ -14,14 +14,14 @@ Standard C library
.nf
.B #include <netdb.h>
.P
-.BI "int getrpcent_r(size_t " size ;
+.BR "int getrpcent_r(" "size_t size;"
.BI " struct rpcent *" result_buf ", char " buf [ size ],
.BI " size_t " size ", struct rpcent **" result );
-.BI "int getrpcbyname_r(size_t " size ;
+.BR "int getrpcbyname_r(" "size_t size;"
.BI " const char *" name ,
.BI " struct rpcent *" result_buf ", char " buf [ size ],
.BI " size_t " size ", struct rpcent **" result );
-.BI "int getrpcbynumber_r(size_t " size ;
+.BR "int getrpcbynumber_r(" "size_t size;"
.BI " int " number ,
.BI " struct rpcent *" result_buf ", char " buf [ size ],
.BI " size_t " size ", struct rpcent **" result );
diff --git a/man/man3/getservent_r.3 b/man/man3/getservent_r.3
index e3879f2ed3..64b397df1e 100644
--- a/man/man3/getservent_r.3
+++ b/man/man3/getservent_r.3
@@ -14,17 +14,17 @@ Standard C library
.nf
.B #include <netdb.h>
.P
-.BI "int getservent_r(size_t " size ;
+.BR "int getservent_r(" "size_t size;"
.BI " struct servent *restrict " result_buf ,
.BI " char " buf "[restrict " size "], size_t " size ,
.BI " struct servent **restrict " result );
-.BI "int getservbyname_r(size_t " size ;
+.BR "int getservbyname_r(" "size_t size;"
.BI " const char *restrict " name ,
.BI " const char *restrict " proto ,
.BI " struct servent *restrict " result_buf ,
.BI " char " buf "[restrict " size "], size_t " size ,
.BI " struct servent **restrict " result );
-.BI "int getservbyport_r(size_t " size ;
+.BR "int getservbyport_r(" "size_t size;"
.BI " int " port ,
.BI " const char *restrict " proto ,
.BI " struct servent *restrict " result_buf ,
diff --git a/man/man3/getspnam.3 b/man/man3/getspnam.3
index 16b57fa361..f49d877273 100644
--- a/man/man3/getspnam.3
+++ b/man/man3/getspnam.3
@@ -33,20 +33,20 @@ Standard C library
/* GNU extension */
.B #include <shadow.h>
.P
-.BI "int getspent_r(size_t " size ;
+.BR "int getspent_r(" "size_t size;"
.BI " struct spwd *" spbuf ,
.BI " char " buf [ size "], size_t " size ", \
struct spwd **" spbufp );
-.BI "int getspnam_r(size_t " size ;
+.BR "int getspnam_r(" "size_t size;"
.BI " const char *" name ", struct spwd *" spbuf ,
.BI " char " buf [ size "], size_t " size ", \
struct spwd **" spbufp );
.P
-.BI "int fgetspent_r(size_t " size ;
+.BR "int fgetspent_r(" "size_t size;"
.BI " FILE *" stream ", struct spwd *" spbuf ,
.BI " char " buf [ size "], size_t " size ", \
struct spwd **" spbufp );
-.BI "int sgetspent_r(size_t " size ;
+.BR "int sgetspent_r(" "size_t size;"
.BI " const char *" s ", struct spwd *" spbuf ,
.BI " char " buf [ size "], size_t " size ", \
struct spwd **" spbufp );
diff --git a/man/man3/inet_net_pton.3 b/man/man3/inet_net_pton.3
index 751bfbf763..78c43f153a 100644
--- a/man/man3/inet_net_pton.3
+++ b/man/man3/inet_net_pton.3
@@ -12,10 +12,10 @@ Resolver library
.nf
.B #include <arpa/inet.h>
.P
-.BI "int inet_net_pton(size_t " nsize ;
+.BR "int inet_net_pton(" "size_t nsize;"
.BI " int " af ", const char *" pres ,
.BI " void " netp [ nsize "], size_t " nsize );
-.BI "char *inet_net_ntop(int " bits ", size_t " psize ;
+.BR "char *inet_net_ntop(" "int bits, size_t psize;"
.BI " int " af ,
.BI " const void " netp [( bits " \- CHAR_BIT + 1) / CHAR_BIT],"
.BI " int " bits ,
diff --git a/man/man3/inet_ntop.3 b/man/man3/inet_ntop.3
index 3c69fbeda7..bf3259f8aa 100644
--- a/man/man3/inet_ntop.3
+++ b/man/man3/inet_ntop.3
@@ -15,7 +15,7 @@ Standard C library
.nf
.B #include <arpa/inet.h>
.P
-.BI "const char *inet_ntop(socklen_t " size ;
+.BR "const char *inet_ntop(" "socklen_t size;"
.BI " int " af ", const void *restrict " src ,
.BI " char " dst "[restrict " size "], socklen_t " size );
.fi
diff --git a/man/man3/lio_listio.3 b/man/man3/lio_listio.3
index 7397355cfb..0c61aeba09 100644
--- a/man/man3/lio_listio.3
+++ b/man/man3/lio_listio.3
@@ -13,7 +13,7 @@ Real-time library
.nf
.B "#include <aio.h>"
.P
-.BI "int lio_listio(int " n ;
+.BR "int lio_listio(" "int n;"
.BI " int " mode ,
.BI " struct aiocb *restrict const " aiocb_list "[restrict " n ],
.BI " int " n ", struct sigevent *restrict " sevp );
diff --git a/man/man3/lsearch.3 b/man/man3/lsearch.3
index 6514c1cc6c..8576ab86be 100644
--- a/man/man3/lsearch.3
+++ b/man/man3/lsearch.3
@@ -13,13 +13,13 @@ Standard C library
.nf
.B #include <search.h>
.P
-.BI "void *lfind(size_t *" n ", size_t " size ;
+.BR "void *lfind(" "size_t *n, size_t size;"
.BI " const void " key [ size "], \
const void " base [* n " * " size ],
.BI " size_t *" n ", size_t " size ,
.BI " typeof(int (const void [" size "], const void [" size ]))
.BI " *" compar );
-.BI "void *lsearch(size_t *" n ", size_t " size ;
+.BR "void *lsearch(" "size_t *n, size_t size;"
.BI " const void " key [ size "], \
void " base [* n " * " size ],
.BI " size_t *" n ", size_t " size ,
diff --git a/man/man3/mblen.3 b/man/man3/mblen.3
index 6cd43baf14..d55f828132 100644
--- a/man/man3/mblen.3
+++ b/man/man3/mblen.3
@@ -13,7 +13,7 @@ Standard C library
.nf
.B #include <stdlib.h>
.P
-.BI "int mblen(size_t " n ;
+.BR "int mblen(" "size_t n;"
.BI " const char " s [ n "], size_t " n );
.fi
.SH DESCRIPTION
diff --git a/man/man3/mbrlen.3 b/man/man3/mbrlen.3
index be44b3c7d4..6596f03ec6 100644
--- a/man/man3/mbrlen.3
+++ b/man/man3/mbrlen.3
@@ -13,7 +13,7 @@ Standard C library
.nf
.B #include <wchar.h>
.P
-.BI "size_t mbrlen(size_t " n ;
+.BR "size_t mbrlen(" "size_t n;"
.BI " const char " s "[restrict " n "], size_t " n ,
.BI " mbstate_t *restrict " ps );
.fi
diff --git a/man/man3/mbrtowc.3 b/man/man3/mbrtowc.3
index 81751d32e1..caa3944c1a 100644
--- a/man/man3/mbrtowc.3
+++ b/man/man3/mbrtowc.3
@@ -13,7 +13,7 @@ Standard C library
.nf
.B #include <wchar.h>
.P
-.BI "size_t mbrtowc(size_t " n ;
+.BR "size_t mbrtowc(" "size_t n;"
.BI " wchar_t *restrict " pwc ", const char " s "[restrict " n ],
.BI " size_t " n ", mbstate_t *restrict " ps );
.fi
diff --git a/man/man3/mbsnrtowcs.3 b/man/man3/mbsnrtowcs.3
index 2e855c5a2d..2d9a66693c 100644
--- a/man/man3/mbsnrtowcs.3
+++ b/man/man3/mbsnrtowcs.3
@@ -13,7 +13,7 @@ Standard C library
.nf
.B #include <wchar.h>
.P
-.BI "size_t mbsnrtowcs(size_t " size ;
+.BR "size_t mbsnrtowcs(" "size_t size;"
.BI " wchar_t " dest "[restrict " size "], const char **restrict " src ,
.BI " size_t " nms ", size_t " size \
", mbstate_t *restrict " ps );
diff --git a/man/man3/mbsrtowcs.3 b/man/man3/mbsrtowcs.3
index c71572d594..a2852a550d 100644
--- a/man/man3/mbsrtowcs.3
+++ b/man/man3/mbsrtowcs.3
@@ -13,7 +13,7 @@ Standard C library
.nf
.B #include <wchar.h>
.P
-.BI "size_t mbsrtowcs(size_t " dsize ;
+.BR "size_t mbsrtowcs(" "size_t dsize;"
.BI " wchar_t " dest "[restrict " dsize ],
.BI " const char **restrict " src ,
.BI " size_t " dsize ", mbstate_t *restrict " ps );
diff --git a/man/man3/mbstowcs.3 b/man/man3/mbstowcs.3
index 5928d4def6..655af0d978 100644
--- a/man/man3/mbstowcs.3
+++ b/man/man3/mbstowcs.3
@@ -13,7 +13,7 @@ Standard C library
.nf
.B #include <stdlib.h>
.P
-.BI "size_t mbstowcs(size_t " dsize ;
+.BR "size_t mbstowcs(" "size_t dsize;"
.BI " wchar_t " dest "[restrict " dsize "], \
const char *restrict " src ,
.BI " size_t " dsize );
diff --git a/man/man3/mbtowc.3 b/man/man3/mbtowc.3
index 977a74fc56..22f0cbc2e9 100644
--- a/man/man3/mbtowc.3
+++ b/man/man3/mbtowc.3
@@ -13,7 +13,7 @@ Standard C library
.nf
.B #include <stdlib.h>
.P
-.BI "int mbtowc(size_t " n ;
+.BR "int mbtowc(" "size_t n;"
.BI " wchar_t *restrict " pwc ", const char " s "[restrict " n "], \
size_t " n );
.fi
diff --git a/man/man3/memccpy.3 b/man/man3/memccpy.3
index b885f90940..ba06f96aa7 100644
--- a/man/man3/memccpy.3
+++ b/man/man3/memccpy.3
@@ -13,7 +13,7 @@ Standard C library
.nf
.B #include <string.h>
.P
-.BI "void *memccpy(size_t " n ;
+.BR "void *memccpy(" "size_t n;"
.BI " void " dest "[restrict " n "], const void " src "[restrict " n ],
.BI " int " c ", size_t " n );
.fi
diff --git a/man/man3/memchr.3 b/man/man3/memchr.3
index 252a627104..566176c156 100644
--- a/man/man3/memchr.3
+++ b/man/man3/memchr.3
@@ -13,9 +13,9 @@ Standard C library
.nf
.B #include <string.h>
.P
-.BI "void *memchr(size_t " n ;
+.BR "void *memchr(" "size_t n;"
.BI " const void " s [ n "], int " c ", size_t " n );
-.BI "void *memrchr(size_t " n ;
+.BR "void *memrchr(" "size_t n;"
.BI " const void " s [ n "], int " c ", size_t " n );
.P
.BI "[[deprecated]] void *rawmemchr(const void *" s ", int " c );
diff --git a/man/man3/memcmp.3 b/man/man3/memcmp.3
index b280be536c..95e23f1f47 100644
--- a/man/man3/memcmp.3
+++ b/man/man3/memcmp.3
@@ -13,7 +13,7 @@ Standard C library
.nf
.B #include <string.h>
.P
-.BI "int memcmp(size_t " n ;
+.BR "int memcmp(" "size_t n;"
.BI " const void " s1 [ n "], const void " s2 [ n "], size_t " n );
.fi
.SH DESCRIPTION
diff --git a/man/man3/memcpy.3 b/man/man3/memcpy.3
index 7c580a909e..03ddaa8314 100644
--- a/man/man3/memcpy.3
+++ b/man/man3/memcpy.3
@@ -13,7 +13,7 @@ Standard C library
.nf
.B #include <string.h>
.P
-.BI "void *memcpy(size_t " n ;
+.BR "void *memcpy(" "size_t n;"
.BI " void " dest "[restrict " n "], const void " src "[restrict " n ],
.BI " size_t " n );
.fi
diff --git a/man/man3/memfrob.3 b/man/man3/memfrob.3
index 11deebb5aa..1959cf6b2e 100644
--- a/man/man3/memfrob.3
+++ b/man/man3/memfrob.3
@@ -14,7 +14,7 @@ Standard C library
.BR "#define _GNU_SOURCE" " /* See feature_test_macros(7) */"
.B #include <string.h>
.P
-.BI "void *memfrob(size_t " n ;
+.BR "void *memfrob(" "size_t n;"
.BI " void " s [ n "], size_t " n );
.fi
.SH DESCRIPTION
diff --git a/man/man3/memmem.3 b/man/man3/memmem.3
index 5dd53cb969..51aca7d29a 100644
--- a/man/man3/memmem.3
+++ b/man/man3/memmem.3
@@ -14,7 +14,7 @@ Standard C library
.BR "#define _GNU_SOURCE" " /* See feature_test_macros(7) */"
.B #include <string.h>
.P
-.BI "void *memmem(size_t " hsize ", size_t " nsize ;
+.BR "void *memmem(" "size_t hsize, size_t nsize;"
.BI " const void " haystack [ hsize "], size_t " hsize ,
.BI " const void " needle [ nsize "], size_t " nsize );
.fi
diff --git a/man/man3/memmove.3 b/man/man3/memmove.3
index 534c59f3b1..cf68705380 100644
--- a/man/man3/memmove.3
+++ b/man/man3/memmove.3
@@ -13,7 +13,7 @@ Standard C library
.nf
.B #include <string.h>
.P
-.BI "void *memmove(size_t " n ;
+.BR "void *memmove(" "size_t n;"
.BI " void " dest [ n "], const void " src [ n "], size_t " n );
.fi
.SH DESCRIPTION
diff --git a/man/man3/mempcpy.3 b/man/man3/mempcpy.3
index 843e2b2a02..3dce9caea3 100644
--- a/man/man3/mempcpy.3
+++ b/man/man3/mempcpy.3
@@ -15,14 +15,14 @@ Standard C library
.BR "#define _GNU_SOURCE" " /* See feature_test_macros(7) */"
.B #include <string.h>
.P
-.BI "void *mempcpy(size_t " n ;
+.BR "void *mempcpy(" "size_t n;"
.BI " void " dest "[restrict " n "], const void " src "[restrict " n ],
.BI " size_t " n );
.P
.BR "#define _GNU_SOURCE" " /* See feature_test_macros(7) */"
.B #include <wchar.h>
.P
-.BI "wchar_t *wmempcpy(size_t " n ;
+.BR "wchar_t *wmempcpy(" "size_t n;"
.BI " wchar_t " dest "[restrict " n "], const wchar_t " src "[restrict " n ],
.BI " size_t " n );
.fi
diff --git a/man/man3/memset.3 b/man/man3/memset.3
index 7d0089a483..f6858055af 100644
--- a/man/man3/memset.3
+++ b/man/man3/memset.3
@@ -13,7 +13,7 @@ Standard C library
.nf
.B #include <string.h>
.P
-.BI "void *memset(size_t " n ;
+.BR "void *memset(" "size_t n;"
.BI " void " s [ n "], int " c ", size_t " n );
.fi
.SH DESCRIPTION
diff --git a/man/man3/mq_receive.3 b/man/man3/mq_receive.3
index 462a43a67a..173a0f60e2 100644
--- a/man/man3/mq_receive.3
+++ b/man/man3/mq_receive.3
@@ -13,14 +13,14 @@ Real-time library
.nf
.B #include <mqueue.h>
.P
-.BI "ssize_t mq_receive(size_t " msg_len ;
+.BR "ssize_t mq_receive(" "size_t msg_len;"
.BI " mqd_t " mqdes ", char " msg_ptr [ msg_len ],
.BI " size_t " msg_len ", unsigned int *" msg_prio );
.P
.B #include <time.h>
.B #include <mqueue.h>
.P
-.BI "ssize_t mq_timedreceive(size_t " msg_len ;
+.BR "ssize_t mq_timedreceive(" "size_t msg_len;"
.BI " mqd_t " mqdes ", char *restrict " msg_ptr [ msg_len ],
.BI " size_t " msg_len ", unsigned int *restrict " msg_prio ,
.BI " const struct timespec *restrict " abs_timeout );
diff --git a/man/man3/mq_send.3 b/man/man3/mq_send.3
index e936772157..a52d966af2 100644
--- a/man/man3/mq_send.3
+++ b/man/man3/mq_send.3
@@ -13,14 +13,14 @@ Real-time library
.nf
.B #include <mqueue.h>
.P
-.BI "int mq_send(size_t " msg_len ;
+.BR "int mq_send(" "size_t msg_len;"
.BI " mqd_t " mqdes ", const char " msg_ptr [ msg_len ],
.BI " size_t " msg_len ", unsigned int " msg_prio );
.P
.B #include <time.h>
.B #include <mqueue.h>
.P
-.BI "int mq_timedsend(size_t " msg_len ;
+.BR "int mq_timedsend(" "size_t msg_len;"
.BI " mqd_t " mqdes ", const char " msg_ptr [ msg_len ],
.BI " size_t " msg_len ", unsigned int " msg_prio ,
.BI " const struct timespec *" abs_timeout );
diff --git a/man/man3/posix_madvise.3 b/man/man3/posix_madvise.3
index ccb16f5ba8..059d00a2b1 100644
--- a/man/man3/posix_madvise.3
+++ b/man/man3/posix_madvise.3
@@ -12,7 +12,7 @@ Standard C library
.nf
.B #include <sys/mman.h>
.P
-.BI "int posix_madvise(size_t " size ;
+.BR "int posix_madvise(" "size_t size;"
.BI " void " addr [ size "], size_t " size ", int " advice );
.fi
.P
diff --git a/man/man3/printf.3 b/man/man3/printf.3
index 759539381e..22fe065761 100644
--- a/man/man3/printf.3
+++ b/man/man3/printf.3
@@ -21,7 +21,7 @@ Standard C library
.BI " const char *restrict " format ", ...);"
.BI "int sprintf(char *restrict " str ,
.BI " const char *restrict " format ", ...);"
-.BI "int snprintf(size_t " size ;
+.BR "int snprintf(" "size_t size;"
.BI " char " str "[restrict " size "], size_t " size ,
.BI " const char *restrict " format ", ...);"
.P
@@ -32,7 +32,7 @@ Standard C library
.BI " const char *restrict " format ", va_list " ap );
.BI "int vsprintf(char *restrict " str ,
.BI " const char *restrict " format ", va_list " ap );
-.BI "int vsnprintf(size_t " size ;
+.BR "int vsnprintf(" "size_t size;"
.BI " char " str "[restrict " size "], size_t " size ,
.BI " const char *restrict " format ", va_list " ap );
.fi
diff --git a/man/man3/pthread_attr_setstack.3 b/man/man3/pthread_attr_setstack.3
index 5686ce1dc8..e04640d1ea 100644
--- a/man/man3/pthread_attr_setstack.3
+++ b/man/man3/pthread_attr_setstack.3
@@ -14,7 +14,7 @@ POSIX threads library
.nf
.B #include <pthread.h>
.P
-.BI "int pthread_attr_setstack(size_t " stacksize ;
+.BR "int pthread_attr_setstack(" "size_t stacksize;"
.BI " pthread_attr_t *" attr ,
.BI " void " stackaddr [ stacksize ],
.BI " size_t " stacksize );
diff --git a/man/man3/pthread_setname_np.3 b/man/man3/pthread_setname_np.3
index 66ed1c4b5f..02ec1b3777 100644
--- a/man/man3/pthread_setname_np.3
+++ b/man/man3/pthread_setname_np.3
@@ -15,7 +15,7 @@ POSIX threads library
.B #include <pthread.h>
.P
.BI "int pthread_setname_np(pthread_t " thread ", const char *" name );
-.BI "int pthread_getname_np(size_t " size ;
+.BR "int pthread_getname_np(" "size_t size;"
.BI " pthread_t " thread ", char " name [ size "], \
size_t " size );
.fi
diff --git a/man/man3/ptsname.3 b/man/man3/ptsname.3
index 748f1e19a6..db9e995afa 100644
--- a/man/man3/ptsname.3
+++ b/man/man3/ptsname.3
@@ -14,7 +14,7 @@ Standard C library
.B #include <stdlib.h>
.P
.BI "char *ptsname(int " fd );
-.BI "int ptsname_r(size_t " size ;
+.BR "int ptsname_r(" "size_t size;"
.BI " int " fd ", char " buf [ size "], size_t " size );
.fi
.P
diff --git a/man/man3/qsort.3 b/man/man3/qsort.3
index f7ba16e2e4..da20b2a40a 100644
--- a/man/man3/qsort.3
+++ b/man/man3/qsort.3
@@ -13,11 +13,11 @@ Standard C library
.nf
.B #include <stdlib.h>
.P
-.BI "void qsort(size_t " n ", size_t " size ;
+.BR "void qsort(" "size_t n, size_t size;"
.BI " void " base [ n " * " size "], size_t " n ", size_t " size ,
.BI " typeof(int (const void [" size "], const void [" size "]))"
.BI " *" compar );
-.BI "void qsort_r(size_t " n ", size_t " size ;
+.BR "void qsort_r(" "size_t n, size_t size;"
.BI " void " base [ n " * " size "], size_t " n ", size_t " size ,
.BI " typeof(int (const void [" size "], const void [" size "], void *))"
.BI " *" compar ,
diff --git a/man/man3/random.3 b/man/man3/random.3
index 8ec1001666..55c3e25c85 100644
--- a/man/man3/random.3
+++ b/man/man3/random.3
@@ -16,7 +16,7 @@ Standard C library
.B long random(void);
.BI "void srandom(unsigned int " seed );
.P
-.BI "char *initstate(size_t " n ;
+.BR "char *initstate(" "size_t n;"
.BI " unsigned int " seed ", char " state [ n "], size_t " n );
.BI "char *setstate(char *" state );
.fi
diff --git a/man/man3/regex.3 b/man/man3/regex.3
index a5c3e9debb..6c37ecafe8 100644
--- a/man/man3/regex.3
+++ b/man/man3/regex.3
@@ -21,7 +21,7 @@ Standard C library
regmatch_t " pmatch "[_Nullable restrict " nmatch ],
.BI " int " eflags );
.P
-.BI "size_t regerror(size_t " errbuf_size ;
+.BR "size_t regerror(" "size_t errbuf_size;"
.BI " int " errcode ", const regex_t *_Nullable restrict " preg ,
.BI " char " errbuf "[_Nullable restrict " errbuf_size ],
.BI " size_t " errbuf_size );
diff --git a/man/man3/resolver.3 b/man/man3/resolver.3
index 2246f296fb..7a16e8d5ea 100644
--- a/man/man3/resolver.3
+++ b/man/man3/resolver.3
@@ -26,23 +26,23 @@ Resolver library
.P
.BI "void res_nclose(res_state " statep );
.P
-.BI "int res_nquery(int " anslen ;
+.BR "int res_nquery(" "int anslen;"
.BI " res_state " statep ,
.BI " const char *" dname ", int " class ", int " type ,
.BI " unsigned char " answer [ anslen "], int " anslen );
.P
-.BI "int res_nsearch(int " anslen ;
+.BR "int res_nsearch(" "int anslen;"
.BI " res_state " statep ,
.BI " const char *" dname ", int " class ", int " type ,
.BI " unsigned char " answer [ anslen "], int " anslen );
.P
-.BI "int res_nquerydomain(int " anslen ;
+.BR "int res_nquerydomain(" "int anslen;"
.BI " res_state " statep ,
.BI " const char *" name ", const char *" domain ,
.BI " int " class ", int " type ", unsigned char " answer [ anslen ],
.BI " int " anslen );
.P
-.BI "int res_nmkquery(int " datalen ", int " buflen ;
+.BR "int res_nmkquery(" "int datalen, int buflen;"
.BI " res_state " statep ,
.BI " int " op ", const char *" dname ", int " class ,
.BI " int " type ", const unsigned char " data [ datalen "], \
@@ -50,17 +50,17 @@ int " datalen ,
.BI " const unsigned char *" newrr ,
.BI " unsigned char " buf [ buflen "], int " buflen );
.P
-.BI "int res_nsend(int " msglen ", int " anslen ;
+.BR "int res_nsend(" "int msglen, int anslen;"
.BI " res_state " statep ,
.BI " const unsigned char " msg [ msglen "], int " msglen ,
.BI " unsigned char " answer [ anslen "], int " anslen );
.P
-.BI "int dn_comp(int " length ;
+.BR "int dn_comp(" "int length;"
.BI " const char *" exp_dn ", unsigned char " comp_dn [ length ],
.BI " int " length ", unsigned char **" dnptrs ,
.BI " unsigned char **" lastdnptr );
.P
-.BI "int dn_expand(int " length ;
+.BR "int dn_expand(" "int length;"
.BI " const unsigned char *" msg ,
.BI " const unsigned char *" eomorig ,
.BI " const unsigned char *" comp_dn ", char " exp_dn [ length ],
@@ -71,23 +71,23 @@ int " datalen ,
.B [[deprecated]] int res_init(void);
.P
.B [[deprecated]]
-.BI "int res_query(int " anslen ;
+.BR "int res_query(" "int anslen;"
.BI " const char *" dname ", int " class ", int " type ,
.BI " unsigned char " answer [ anslen "], int " anslen );
.P
.B [[deprecated]]
-.BI "int res_search(int " anslen ;
+.BR "int res_search(" "int anslen;"
.BI " const char *" dname ", int " class ", int " type ,
.BI " unsigned char " answer [ anslen "], int " anslen );
.P
.B [[deprecated]]
-.BI "int res_querydomain(int " anslen ;
+.BR "int res_querydomain(" "int anslen;"
.BI " const char *" name ", const char *" domain ,
.BI " int " class ", int " type ", unsigned char " answer [ anslen ],
.BI " int " anslen );
.P
.B [[deprecated]]
-.BI "int res_mkquery(int " datalen ", int " buflen ;
+.BR "int res_mkquery(" "int datalen, int buflen;"
.BI " int " op ", const char *" dname ", int " class ,
.BI " int " type ", const unsigned char " data [ datalen "], \
int " datalen ,
@@ -95,7 +95,7 @@ int " datalen ,
.BI " unsigned char " buf [ buflen "], int " buflen );
.P
.B [[deprecated]]
-.BI "int res_send(int " msglen ", int " anslen ;
+.BR "int res_send(" "int msglen, int anslen;"
.BI " const unsigned char " msg [ msglen "], int " msglen ,
.BI " unsigned char " answer [ anslen "], int " anslen );
.fi
diff --git a/man/man3/setaliasent.3 b/man/man3/setaliasent.3
index 84c1ebbb96..d073eb5336 100644
--- a/man/man3/setaliasent.3
+++ b/man/man3/setaliasent.3
@@ -18,13 +18,13 @@ Standard C library
.B "void endaliasent(void);"
.P
.B "struct aliasent *getaliasent(void);"
-.BI "int getaliasent_r(size_t " size ;
+.BR "int getaliasent_r(" "size_t size;"
.BI " struct aliasent *restrict " result ,
.BI " char " buffer "[restrict " size "], size_t " size ,
.BI " struct aliasent **restrict " res );
.P
.BI "struct aliasent *getaliasbyname(const char *" name );
-.BI "int getaliasbyname_r(size_t " size ;
+.BR "int getaliasbyname_r(" "size_t size;"
.BI " const char *restrict " name ,
.BI " struct aliasent *restrict " result ,
.BI " char " buffer "[restrict " size "], size_t " size ,
diff --git a/man/man3/setbuf.3 b/man/man3/setbuf.3
index 6e6b1f2697..f73a8b52c5 100644
--- a/man/man3/setbuf.3
+++ b/man/man3/setbuf.3
@@ -14,12 +14,12 @@ Standard C library
.nf
.B #include <stdio.h>
.P
-.BI "int setvbuf(size_t " size ;
+.BR "int setvbuf(" "size_t size;"
.BI " FILE *restrict " stream ", char " buf "[restrict " size ],
.BI " int " mode ", size_t " size );
.P
.BI "void setbuf(FILE *restrict " stream ", char *restrict " buf );
-.BI "void setbuffer(size_t " size ;
+.BR "void setbuffer(" "size_t size;"
.BI " FILE *restrict " stream ", char " buf "[restrict " size ],
.BI " size_t " size );
.BI "void setlinebuf(FILE *" stream );
diff --git a/man/man3/setnetgrent.3 b/man/man3/setnetgrent.3
index aac183cd0c..76cefbad95 100644
--- a/man/man3/setnetgrent.3
+++ b/man/man3/setnetgrent.3
@@ -19,7 +19,7 @@ Standard C library
.P
.BI "int getnetgrent(char **restrict " host ,
.BI " char **restrict " user ", char **restrict " domain );
-.BI "int getnetgrent_r(size_t " size ;
+.BR "int getnetgrent_r(" "size_t size;"
.BI " char **restrict " host ,
.BI " char **restrict " user ", char **restrict " domain ,
.BI " char " buf "[restrict " size "], size_t " size );
diff --git a/man/man3/stpncpy.3 b/man/man3/stpncpy.3
index d9c8fd5447..99fc347019 100644
--- a/man/man3/stpncpy.3
+++ b/man/man3/stpncpy.3
@@ -16,11 +16,11 @@ Standard C library
.nf
.B #include <string.h>
.P
-.BI "char *strncpy(size_t " dsize ;
+.BR "char *strncpy(" "size_t dsize;"
.BI " char " dst "[restrict " dsize "], \
const char *restrict " src ,
.BI " size_t " dsize );
-.BI "char *stpncpy(size_t " dsize ;
+.BR "char *stpncpy(" "size_t dsize;"
.BI " char " dst "[restrict " dsize "], \
const char *restrict " src ,
.BI " size_t " dsize );
diff --git a/man/man3/strcasecmp.3 b/man/man3/strcasecmp.3
index 282d4d27b1..8db52225b7 100644
--- a/man/man3/strcasecmp.3
+++ b/man/man3/strcasecmp.3
@@ -14,7 +14,7 @@ Standard C library
.B #include <strings.h>
.P
.BI "int strcasecmp(const char *" s1 ", const char *" s2 );
-.BI "int strncasecmp(size_t " n ;
+.BR "int strncasecmp(" "size_t n;"
.BI " const char " s1 [ n "], const char " s2 [ n "], \
size_t " n );
.fi
diff --git a/man/man3/strcmp.3 b/man/man3/strcmp.3
index c5ce6e159f..e2b83e448d 100644
--- a/man/man3/strcmp.3
+++ b/man/man3/strcmp.3
@@ -14,7 +14,7 @@ Standard C library
.B #include <string.h>
.P
.BI "int strcmp(const char *" s1 ", const char *" s2 );
-.BI "int strncmp(size_t " n ;
+.BR "int strncmp(" "size_t n;"
.BI " const char " s1 [ n "], const char " s2 [ n "], size_t " n );
.fi
.SH DESCRIPTION
diff --git a/man/man3/strdup.3 b/man/man3/strdup.3
index 0f2c737d2e..185722e3df 100644
--- a/man/man3/strdup.3
+++ b/man/man3/strdup.3
@@ -15,10 +15,10 @@ Standard C library
.P
.BI "char *strdup(const char *" s );
.P
-.BI "char *strndup(size_t " n ;
+.BR "char *strndup(" "size_t n;"
.BI " const char " s [ n "], size_t " n );
.BI "char *strdupa(const char *" s );
-.BI "char *strndupa(size_t " n ;
+.BR "char *strndupa(" "size_t n;"
.BI " const char " s [ n "], size_t " n );
.fi
.P
diff --git a/man/man3/strerror.3 b/man/man3/strerror.3
index e1d9d274e1..a378b21fc0 100644
--- a/man/man3/strerror.3
+++ b/man/man3/strerror.3
@@ -18,11 +18,11 @@ Standard C library
.BI "const char *strerrorname_np(int " errnum );
.BI "const char *strerrordesc_np(int " errnum );
.P
-.BI "int strerror_r(size_t " size ;
+.BR "int strerror_r(" "size_t size;"
.BI " int " errnum ", char " buf [ size "], size_t " size );
/* XSI-compliant */
.P
-.BI "char *strerror_r(size_t " size ;
+.BR "char *strerror_r(" "size_t size;"
.BI " int " errnum ", char " buf [ size "], size_t " size );
/* GNU-specific */
.P
diff --git a/man/man3/strfmon.3 b/man/man3/strfmon.3
index 6fc08fb491..2a469c1c67 100644
--- a/man/man3/strfmon.3
+++ b/man/man3/strfmon.3
@@ -13,10 +13,10 @@ Standard C library
.nf
.B #include <monetary.h>
.P
-.BI "ssize_t strfmon(size_t " max ;
+.BR "ssize_t strfmon(" "size_t max;"
.BI " char " s "[restrict " max "], size_t " max ,
.BI " const char *restrict " format ", ...);"
-.BI "ssize_t strfmon_l(size_t " max ;
+.BR "ssize_t strfmon_l(" "size_t max;"
.BI " char " s "[restrict " max "], size_t " max ", \
locale_t " locale ,
.BI " const char *restrict " format ", ...);"
diff --git a/man/man3/strfromd.3 b/man/man3/strfromd.3
index fdd365c744..d727483575 100644
--- a/man/man3/strfromd.3
+++ b/man/man3/strfromd.3
@@ -14,13 +14,13 @@ Standard C library
.nf
.B #include <stdlib.h>
.P
-.BI "int strfromd(size_t " n ;
+.BR "int strfromd(" "size_t n;"
.BI " char " str "[restrict " n "], size_t " n ,
.BI " const char *restrict " format ", double " fp ");"
-.BI "int strfromf(size_t " n ;
+.BR "int strfromf(" "size_t n;"
.BI " char " str "[restrict " n "], size_t " n ,
.BI " const char *restrict " format ", float "fp ");"
-.BI "int strfroml(size_t " n ;
+.BR "int strfroml(" "size_t n;"
.BI " char " str "[restrict " n "], size_t " n ,
.BI " const char *restrict " format ", long double " fp ");"
.fi
diff --git a/man/man3/strftime.3 b/man/man3/strftime.3
index 21ad7e9387..4a3f805bbc 100644
--- a/man/man3/strftime.3
+++ b/man/man3/strftime.3
@@ -13,12 +13,12 @@ Standard C library
.nf
.B #include <time.h>
.P
-.BI "size_t strftime(size_t " max ;
+.BR "size_t strftime(" "size_t max;"
.BI " char " s "[restrict " max "], size_t " max ,
.BI " const char *restrict " format ,
.BI " const struct tm *restrict " tm );
.P
-.BI "size_t strftime_l(size_t " max ;
+.BR "size_t strftime_l(" "size_t max;"
.BI " char " s "[restrict " max "], size_t " max ,
.BI " const char *restrict " format ,
.BI " const struct tm *restrict " tm ,
diff --git a/man/man3/strncat.3 b/man/man3/strncat.3
index 4edeb2d2ba..13ea833345 100644
--- a/man/man3/strncat.3
+++ b/man/man3/strncat.3
@@ -16,7 +16,7 @@ Standard C library
.nf
.B #include <string.h>
.P
-.BI "char *strncat(size_t " ssize ;
+.BR "char *strncat(" "size_t ssize;"
.BI " char *restrict " dst ", const char " src "[restrict " ssize ],
.BI " size_t " ssize );
.fi
diff --git a/man/man3/strnlen.3 b/man/man3/strnlen.3
index 1a8cfdaa9e..b966f578a6 100644
--- a/man/man3/strnlen.3
+++ b/man/man3/strnlen.3
@@ -13,7 +13,7 @@ Standard C library
.nf
.B #include <string.h>
.P
-.BI "size_t strnlen(size_t " maxlen ;
+.BR "size_t strnlen(" "size_t maxlen;"
.BI " const char " s [ maxlen "], size_t " maxlen );
.fi
.P
diff --git a/man/man3/strxfrm.3 b/man/man3/strxfrm.3
index d071ec62a3..9c408d5500 100644
--- a/man/man3/strxfrm.3
+++ b/man/man3/strxfrm.3
@@ -13,7 +13,7 @@ Standard C library
.nf
.B #include <string.h>
.P
-.BI "size_t strxfrm(size_t " n ;
+.BR "size_t strxfrm(" "size_t n;"
.BI " char " dest "[restrict " n "], \
const char " src "[restrict " n ],
.BI " size_t " n );
diff --git a/man/man3/swab.3 b/man/man3/swab.3
index 6cd232efec..4291f0d334 100644
--- a/man/man3/swab.3
+++ b/man/man3/swab.3
@@ -14,7 +14,7 @@ Standard C library
.BR "#define _XOPEN_SOURCE" " /* See feature_test_macros(7) */"
.B #include <unistd.h>
.P
-.BI "void swab(ssize_t " n ;
+.BR "void swab(" "ssize_t n;"
.BI " const void " from "[restrict " n "], void " to "[restrict " n ],
.BI " ssize_t " n );
.fi
diff --git a/man/man3/ttyname.3 b/man/man3/ttyname.3
index 3b162bfa96..63f22b3f45 100644
--- a/man/man3/ttyname.3
+++ b/man/man3/ttyname.3
@@ -14,7 +14,7 @@ Standard C library
.B #include <unistd.h>
.P
.BI "char *ttyname(int " fd );
-.BI "int ttyname_r(size_t " size ;
+.BR "int ttyname_r(" "size_t size;"
.BI " int " fd ", char " buf [ size "], size_t " size );
.fi
.SH DESCRIPTION
diff --git a/man/man3/unlocked_stdio.3 b/man/man3/unlocked_stdio.3
index ad1c120775..2aaa5133bd 100644
--- a/man/man3/unlocked_stdio.3
+++ b/man/man3/unlocked_stdio.3
@@ -28,16 +28,16 @@ Standard C library
.BI "int fgetc_unlocked(FILE *" stream );
.BI "int fputc_unlocked(int " c ", FILE *" stream );
.P
-.BI "size_t fread_unlocked(size_t " size ", size_t " n ;
+.BR "size_t fread_unlocked(" "size_t size, size_t n;"
.BI " void " ptr "[restrict " size " * " n ],
.BI " size_t " size ", size_t " n ,
.BI " FILE *restrict " stream );
-.BI "size_t fwrite_unlocked(size_t " size ", size_t " n ;
+.BR "size_t fwrite_unlocked(" "size_t size, size_t n;"
.BI " const void " ptr "[restrict " size " * " n ],
.BI " size_t " size ", size_t " n ,
.BI " FILE *restrict " stream );
.P
-.BI "char *fgets_unlocked(int " n ;
+.BR "char *fgets_unlocked(" "int n;"
.BI " char " s "[restrict " n "], int " n \
", FILE *restrict " stream );
.BI "int fputs_unlocked(const char *restrict " s ", FILE *restrict " stream );
@@ -52,7 +52,7 @@ Standard C library
.BI "wint_t putwc_unlocked(wchar_t " wc ", FILE *" stream );
.BI "wint_t putwchar_unlocked(wchar_t " wc );
.P
-.BI "wchar_t *fgetws_unlocked(int " n ;
+.BR "wchar_t *fgetws_unlocked(" "int n;"
.BI " wchar_t " ws "[restrict " n "], int " n ,
.BI " FILE *restrict " stream );
.BI "int fputws_unlocked(const wchar_t *restrict " ws ,
diff --git a/man/man3/wcpncpy.3 b/man/man3/wcpncpy.3
index 96912eb414..636c1cdac0 100644
--- a/man/man3/wcpncpy.3
+++ b/man/man3/wcpncpy.3
@@ -14,7 +14,7 @@ Standard C library
.nf
.B #include <wchar.h>
.P
-.BI "wchar_t *wcpncpy(size_t " n ;
+.BR "wchar_t *wcpncpy(" "size_t n;"
.BI " wchar_t " dest "[restrict " n ],
.BI " const wchar_t *restrict " src ,
.BI " size_t " n );
diff --git a/man/man3/wcscasecmp.3 b/man/man3/wcscasecmp.3
index 48c2e140af..a8f1c897d7 100644
--- a/man/man3/wcscasecmp.3
+++ b/man/man3/wcscasecmp.3
@@ -17,7 +17,7 @@ Standard C library
.B #include <wchar.h>
.P
.BI "int wcscasecmp(const wchar_t *" s1 ", const wchar_t *" s2 );
-.BI "int wcsncasecmp(size_t " n ;
+.BR "int wcsncasecmp(" "size_t n;"
.BI " const wchar_t " s1 [ n "], const wchar_t " s2 [ n "], \
size_t " n );
.fi
diff --git a/man/man3/wcsncat.3 b/man/man3/wcsncat.3
index 1d2371831c..621cbacf0b 100644
--- a/man/man3/wcsncat.3
+++ b/man/man3/wcsncat.3
@@ -13,7 +13,7 @@ Standard C library
.nf
.B #include <wchar.h>
.P
-.BI "wchar_t *wcsncat(size_t " n ;
+.BR "wchar_t *wcsncat(" "size_t n;"
.BI " wchar_t *restrict " dest ,
.BI " const wchar_t " src "[restrict " n ],
.BI " size_t " n );
diff --git a/man/man3/wcsncmp.3 b/man/man3/wcsncmp.3
index fac604e88a..873ea3da33 100644
--- a/man/man3/wcsncmp.3
+++ b/man/man3/wcsncmp.3
@@ -13,7 +13,7 @@ Standard C library
.nf
.B #include <wchar.h>
.P
-.BI "int wcsncmp(size_t " n ;
+.BR "int wcsncmp(" "size_t n;"
.BI " const wchar_t " s1 [ n "], const wchar_t " s2 [ n "], \
size_t " n );
.fi
diff --git a/man/man3/wcsncpy.3 b/man/man3/wcsncpy.3
index 690cde1895..abe67fee79 100644
--- a/man/man3/wcsncpy.3
+++ b/man/man3/wcsncpy.3
@@ -13,7 +13,7 @@ Standard C library
.nf
.B #include <wchar.h>
.P
-.BI "wchar_t *wcsncpy(size_t " n ;
+.BR "wchar_t *wcsncpy(" "size_t n;"
.BI " wchar_t " dest "[restrict " n ],
.BI " const wchar_t *restrict " src ,
.BI " size_t " n );
diff --git a/man/man3/wcsnlen.3 b/man/man3/wcsnlen.3
index a46cc5632d..8e5b1fe3a3 100644
--- a/man/man3/wcsnlen.3
+++ b/man/man3/wcsnlen.3
@@ -13,7 +13,7 @@ Standard C library
.nf
.B #include <wchar.h>
.P
-.BI "size_t wcsnlen(size_t " maxlen ;
+.BR "size_t wcsnlen(" "size_t maxlen;"
.BI " const wchar_t " s [ maxlen "], size_t " maxlen );
.fi
.P
diff --git a/man/man3/wcsnrtombs.3 b/man/man3/wcsnrtombs.3
index 88809e3c01..703645423a 100644
--- a/man/man3/wcsnrtombs.3
+++ b/man/man3/wcsnrtombs.3
@@ -13,7 +13,7 @@ Standard C library
.nf
.B #include <wchar.h>
.P
-.BI "size_t wcsnrtombs(size_t " size ;
+.BR "size_t wcsnrtombs(" "size_t size;"
.BI " char " dest "[restrict " size "], \
const wchar_t **restrict " src ,
.BI " size_t " nwc ", size_t " size ", \
diff --git a/man/man3/wcsrtombs.3 b/man/man3/wcsrtombs.3
index 8482d7ca2b..541bc144b7 100644
--- a/man/man3/wcsrtombs.3
+++ b/man/man3/wcsrtombs.3
@@ -13,7 +13,7 @@ Standard C library
.nf
.B #include <wchar.h>
.P
-.BI "size_t wcsrtombs(size_t " size ;
+.BR "size_t wcsrtombs(" "size_t size;"
.BI " char " dest "[restrict " size "], \
const wchar_t **restrict " src ,
.BI " size_t " size ", mbstate_t *restrict " ps );
diff --git a/man/man3/wcstombs.3 b/man/man3/wcstombs.3
index 2ee54637f7..7ef158212f 100644
--- a/man/man3/wcstombs.3
+++ b/man/man3/wcstombs.3
@@ -13,7 +13,7 @@ Standard C library
.nf
.B #include <stdlib.h>
.P
-.BI "size_t wcstombs(size_t " n ;
+.BR "size_t wcstombs(" "size_t n;"
.BI " char " dest "[restrict " n "], \
const wchar_t *restrict " src ,
.BI " size_t " n );
diff --git a/man/man3/wmemchr.3 b/man/man3/wmemchr.3
index 802a6d1b87..4a5a63a2d5 100644
--- a/man/man3/wmemchr.3
+++ b/man/man3/wmemchr.3
@@ -13,7 +13,7 @@ Standard C library
.nf
.B #include <wchar.h>
.P
-.BI "wchar_t *wmemchr(size_t " n ;
+.BR "wchar_t *wmemchr(" "size_t n;"
.BI " const wchar_t " s [ n "], wchar_t " c ", size_t " n );
.fi
.SH DESCRIPTION
diff --git a/man/man3/wmemcmp.3 b/man/man3/wmemcmp.3
index 1cc86f0ed3..4530760348 100644
--- a/man/man3/wmemcmp.3
+++ b/man/man3/wmemcmp.3
@@ -13,7 +13,7 @@ Standard C library
.nf
.B #include <wchar.h>
.P
-.BI "int wmemcmp(size_t " n ;
+.BR "int wmemcmp(" "size_t n;"
.BI " const wchar_t " s1 [ n "], const wchar_t " s2 [ n "], \
size_t " n );
.fi
diff --git a/man/man3/wmemcpy.3 b/man/man3/wmemcpy.3
index bae244ef5b..18af5761dc 100644
--- a/man/man3/wmemcpy.3
+++ b/man/man3/wmemcpy.3
@@ -13,7 +13,7 @@ Standard C library
.nf
.B #include <wchar.h>
.P
-.BI "wchar_t *wmemcpy(size_t " n ;
+.BR "wchar_t *wmemcpy(" "size_t n;"
.BI " wchar_t " dest "[restrict " n ],
.BI " const wchar_t " src "[restrict " n ],
.BI " size_t " n );
diff --git a/man/man3/wmemmove.3 b/man/man3/wmemmove.3
index 402b2ad2d5..847d428051 100644
--- a/man/man3/wmemmove.3
+++ b/man/man3/wmemmove.3
@@ -13,7 +13,7 @@ Standard C library
.nf
.B #include <wchar.h>
.P
-.BI "wchar_t *wmemmove(size_t " n ;
+.BR "wchar_t *wmemmove(" "size_t n;"
.BI " wchar_t " dest [ n "], const wchar_t " src [ n "], \
size_t " n );
.fi
diff --git a/man/man3/wmemset.3 b/man/man3/wmemset.3
index d6e1c65fda..f389f78c73 100644
--- a/man/man3/wmemset.3
+++ b/man/man3/wmemset.3
@@ -13,7 +13,7 @@ Standard C library
.nf
.B #include <wchar.h>
.P
-.BI "wchar_t *wmemset(size_t " n ;
+.BR "wchar_t *wmemset(" "size_t n;"
.BI " wchar_t " wcs [ n "], wchar_t " wc ", size_t " n );
.fi
.SH DESCRIPTION
diff --git a/man/man3/wprintf.3 b/man/man3/wprintf.3
index a7324426b9..bdc74d5dae 100644
--- a/man/man3/wprintf.3
+++ b/man/man3/wprintf.3
@@ -18,14 +18,14 @@ Standard C library
.BI "int wprintf(const wchar_t *restrict " format ", ...);"
.BI "int fwprintf(FILE *restrict " stream ,
.BI " const wchar_t *restrict " format ", ...);"
-.BI "int swprintf(size_t " n ;
+.BR "int swprintf(" "size_t n;"
.BI " wchar_t " wcs "[restrict " n "], size_t " n ,
.BI " const wchar_t *restrict " format ", ...);"
.P
.BI "int vwprintf(const wchar_t *restrict " format ", va_list " args );
.BI "int vfwprintf(FILE *restrict " stream ,
.BI " const wchar_t *restrict " format ", va_list " args );
-.BI "int vswprintf(size_t " n ;
+.BR "int vswprintf(" "size_t n;"
.BI " wchar_t " wcs "[restrict " n "], size_t " n ,
.BI " const wchar_t *restrict " format ", va_list " args );
.fi
diff --git a/man/man7/string_copying.7 b/man/man7/string_copying.7
index 39332d83b8..cfefde3054 100644
--- a/man/man7/string_copying.7
+++ b/man/man7/string_copying.7
@@ -30,15 +30,15 @@ strncat
.BI "char *stpecpy(char *" dst ", char " end "[0], const char *restrict " src );
.P
// Copy/catenate a string with truncation.
-.BI "ssize_t strtcpy(size_t " dsize ;
+.BR "ssize_t strtcpy(" "size_t dsize;"
.BI " char " dst "[restrict " dsize "], \
const char *restrict " src ,
.BI " size_t " dsize );
-.BI "size_t strlcpy(size_t " dsize ;
+.BR "size_t strlcpy(" "size_t dsize;"
.BI " char " dst "[restrict " dsize "], \
const char *restrict " src ,
.BI " size_t " dsize );
-.BI "size_t strlcat(size_t " dsize ;
+.BR "size_t strlcat(" "size_t dsize;"
.BI " char " dst "[restrict " dsize "], \
const char *restrict " src ,
.BI " size_t " dsize );
@@ -48,11 +48,11 @@ const char *restrict " src ,
.nf
// Fill a fixed-size buffer with characters from a string
// and pad with null bytes.
-.BI "char *strncpy(size_t " dsize ;
+.BR "char *strncpy(" "size_t dsize;"
.BI " char " dst "[restrict " dsize "], \
const char *restrict " src ,
.BI " size_t " dsize );
-.BI "char *stpncpy(size_t " dsize ;
+.BR "char *stpncpy(" "size_t dsize;"
.BI " char " dst "[restrict " dsize "], \
const char *restrict " src ,
.BI " size_t " dsize );
@@ -64,19 +64,19 @@ const char *restrict " src ,
.I stpcpy(mempcpy(dst, src, strnlen(src, NITEMS(src))), \[dq]\[dq]);
.P
// Catenate a null-padded character sequence into a string.
-.BI "char *strncat(size_t " ssize ;
+.BR "char *strncat(" "size_t ssize;"
.BI " char *restrict " dst ", const char " src "[restrict " ssize ],
.BI " size_t " ssize );
.P
// Duplicate a null-padded character sequence into a string.
-.BI "char *strndup(size_t " ssize ;
+.BR "char *strndup(" "size_t ssize;"
.BI " const char " src [ ssize "], size_t " ssize );
.fi
.\" ----- SYNOPSIS :: Length-bounded character sequences --------------/
.SS Length-bounded character sequences
.nf
// Chain-copy a length-bounded character sequence.
-.BI "void *mempcpy(size_t " len ;
+.BR "void *mempcpy(" "size_t len;"
.BI " void " dst "[restrict " len "], \
const void " src "[restrict " len ],
.BI " size_t " len );