14 files changed, 93 insertions, 72 deletions

diff --git a/lib/libc/locale/big5.5 b/lib/libc/locale/big5.5
index ebe7125..13d0c7b 100644
--- a/lib/libc/locale/big5.5
+++ b/lib/libc/locale/big5.5
@@ -23,12 +23,15 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD$
+.\"
 .Dd August 7, 2003
 .Dt BIG5 5
 .Os
 .Sh NAME
 .Nm big5
-.Nd "``Big Five'' encoding for Traditional Chinese text"
+.Nd
+.Dq "Big Five"
+encoding for Traditional Chinese text
 .Sh SYNOPSIS
 .Nm ENCODING
 .Qq BIG5
diff --git a/lib/libc/locale/euc.5 b/lib/libc/locale/euc.5
index 3361e77..d4e128b 100644
--- a/lib/libc/locale/euc.5
+++ b/lib/libc/locale/euc.5
@@ -72,7 +72,8 @@ implements a system of 4 multibyte codesets.
 A multibyte character in the first codeset consists of
 .Ar len1
 bytes starting with a byte in the range of 0x00 to 0x7f.
-To allow use of ASCII,
+To allow use of
+.Tn ASCII ,
 .Ar len1
 is always 1.
 A multibyte character in the second codeset consists of
@@ -86,7 +87,7 @@ A multibyte character in the fourth codeset consists of
 bytes starting with the byte 0x8f.
 .Pp
 The
-.Va wchar_t
+.Vt wchar_t
 encoding of
 .Nm EUC
 multibyte characters is dependent on the
@@ -95,7 +96,7 @@ and
 .Ar mask
 arguments.
 First, the bytes are moved into a
-.Va wchar_t
+.Vt wchar_t
 as follows:
 .Bd -literal
 byte0 << ((\fIlen\fPN-1) * 8) | byte1 << ((\fIlen\fPN-2) * 8) | ... | byte\fIlen\fPN-1
@@ -113,7 +114,7 @@ argument is reduced by 1.
 For example, the
 .Li ja_JP.eucJP
 locale has the following
-.Ev VARIABLE
+.Va VARIABLE
 line:
 .Bd -literal
 VARIABLE	1 0x0000 2 0x8080 2 0x0080 3 0x8000 0x8080
@@ -132,6 +133,6 @@ Notice that the global
 .Ar mask
 is set to 0x8080, this implies that from those 2 bits the codeset can
 be determined.
-.Sh "SEE ALSO"
+.Sh SEE ALSO
 .Xr mklocale 1 ,
 .Xr setlocale 3
diff --git a/lib/libc/locale/gb18030.5 b/lib/libc/locale/gb18030.5
index afe4b85..3a296c0 100644
--- a/lib/libc/locale/gb18030.5
+++ b/lib/libc/locale/gb18030.5
@@ -23,6 +23,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD$
+.\"
 .Dd August 10, 2003
 .Dt GB18030 5
 .Os
@@ -47,8 +48,7 @@ encoding can be one byte, two bytes, or
 four bytes long.
 There are a total of over 1.5 million code positions.
 .Pp
-.No GB\ 11383-1981 ( Ns
-.Tn ASCII )
+.No GB\ 11383-1981 Pq Tn ASCII
 characters are represented by single bytes in the range 0x00 to 0x7F.
 .Pp
 Chinese characters are represented as either two bytes or four bytes.
diff --git a/lib/libc/locale/gb2312.5 b/lib/libc/locale/gb2312.5
index 754fcb4..5f1f712 100644
--- a/lib/libc/locale/gb2312.5
+++ b/lib/libc/locale/gb2312.5
@@ -23,6 +23,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD$
+.\"
 .Dd November 7, 2003
 .Dt GB2312 5
 .Os
@@ -40,8 +41,7 @@ for the encoding of simplified Chinese characters.
 .Pp
 Multibyte characters in the GB2312
 encoding can be one byte or two bytes long.
-.No GB\ 11383-1981 ( Ns
-.Tn ASCII )
+.No GB\ 11383-1981 Pq Tn ASCII
 characters are represented by single bytes in the range 0x00 to 0x7F.
 Simplified Chinese characters are represented by two bytes, both in
 the range 0xA1-0xFE.
@@ -53,5 +53,5 @@ the range 0xA1-0xFE.
 The
 .Nm GB2312
 encoding is believed to be compatible with GB\ 2312-1980.
-This standard has been superceded by GB\ 18030-2000, but is still
+This standard has been superseded by GB\ 18030-2000, but is still
 in wide use.
diff --git a/lib/libc/locale/gbk.5 b/lib/libc/locale/gbk.5
index 09fb999..cec22c6 100644
--- a/lib/libc/locale/gbk.5
+++ b/lib/libc/locale/gbk.5
@@ -23,6 +23,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD$
+.\"
 .Dd August 10, 2003
 .Dt GBK 5
 .Os
@@ -39,8 +40,7 @@ Unified Han portion of the Unicode 2.1 standard.
 .Pp
 Multibyte characters in the GBK
 encoding can be one byte or two bytes long.
-.No GB\ 11383-1981 ( Ns
-.Tn ASCII )
+.No GB\ 11383-1981 Pq Tn ASCII
 characters are represented by single bytes in the range 0x00 to 0x7F.
 Chinese characters are represented by two bytes, beginning with a byte in
 the range 0x80-0xFE and ending with a byte in the range 0x40-0xFE.
@@ -59,5 +59,5 @@ the range 0x80-0xFE and ending with a byte in the range 0x40-0xFE.
 .%D "March 2000"
 .Re
 .Sh STANDARDS
-GBK is not a standard, but has been superceded by
+GBK is not a standard, but has been superseded by
 GB\ 18030-2000.
diff --git a/lib/libc/locale/localeconv.3 b/lib/libc/locale/localeconv.3
index 11a0802..d3a5783 100644
--- a/lib/libc/locale/localeconv.3
+++ b/lib/libc/locale/localeconv.3
@@ -86,16 +86,16 @@ struct lconv {
 The individual fields have the following meanings:
 .Pp
 .Bl -tag -width mon_decimal_point
-.It Fa decimal_point
+.It Va decimal_point
 The decimal point character, except for currency values,
 cannot be an empty string.
-.It Fa thousands_sep
+.It Va thousands_sep
 The separator between groups of digits
 before the decimal point, except for currency values.
-.It Fa grouping
+.It Va grouping
 The sizes of the groups of digits, except for currency values.
 This is a pointer to a vector of integers, each of size
-.Va char ,
+.Vt char ,
 representing group size from low order digit groups
 to high order (right to left).
 The list may be terminated with 0 or
@@ -105,50 +105,51 @@ the last group size before the 0 is repeated to account for all the digits.
 If the list is terminated with
 .Dv CHAR_MAX ,
 no more grouping is performed.
-.It Fa int_curr_symbol
+.It Va int_curr_symbol
 The standardized international currency symbol.
-.It Fa currency_symbol
+.It Va currency_symbol
 The local currency symbol.
-.It Fa mon_decimal_point
+.It Va mon_decimal_point
 The decimal point character for currency values.
-.It Fa mon_thousands_sep
+.It Va mon_thousands_sep
 The separator for digit groups in currency values.
-.It Fa mon_grouping
+.It Va mon_grouping
 Like
-.Fa grouping
+.Va grouping
 but for currency values.
-.It Fa positive_sign
+.It Va positive_sign
 The character used to denote nonnegative currency values,
 usually the empty string.
-.It Fa negative_sign
+.It Va negative_sign
 The character used to denote negative currency values,
 usually a minus sign.
-.It Fa int_frac_digits
+.It Va int_frac_digits
 The number of digits after the decimal point
 in an international-style currency value.
-.It Fa frac_digits
+.It Va frac_digits
 The number of digits after the decimal point
 in the local style for currency values.
-.It Fa p_cs_precedes
+.It Va p_cs_precedes
 1 if the currency symbol precedes the currency value
 for nonnegative values, 0 if it follows.
-.It Fa p_sep_by_space
+.It Va p_sep_by_space
 1 if a space is inserted between the currency symbol
 and the currency value for nonnegative values, 0 otherwise.
-.It Fa n_cs_precedes
+.It Va n_cs_precedes
 Like
-.Fa p_cs_precedes
+.Va p_cs_precedes
 but for negative values.
-.It Fa n_sep_by_space
+.It Va n_sep_by_space
 Like
-.Fa p_sep_by_space
+.Va p_sep_by_space
 but for negative values.
-.It Fa p_sign_posn
+.It Va p_sign_posn
 The location of the
-.Fa positive_sign
+.Va positive_sign
 with respect to a nonnegative quantity and the
-.Fa currency_symbol ,
+.Va currency_symbol ,
 coded as follows:
+.Pp
 .Bl -tag -width 3n -compact
 .It Li 0
 Parentheses around the entire string.
@@ -158,38 +159,38 @@ Before the string.
 After the string.
 .It Li 3
 Just before
-.Fa currency_symbol .
+.Va currency_symbol .
 .It Li 4
 Just after
-.Fa currency_symbol .
+.Va currency_symbol .
 .El
-.It Fa n_sign_posn
+.It Va n_sign_posn
 Like
-.Fa p_sign_posn
+.Va p_sign_posn
 but for negative currency values.
-.It Fa int_p_cs_precedes
+.It Va int_p_cs_precedes
 Same as
-.Fa p_cs_precedes ,
+.Va p_cs_precedes ,
 but for internationally formatted monetary quantities.
-.It Fa int_n_cs_precedes
+.It Va int_n_cs_precedes
 Same as
-.Fa n_cs_precedes ,
+.Va n_cs_precedes ,
 but for internationally formatted monetary quantities.
-.It Fa int_p_sep_by_space
+.It Va int_p_sep_by_space
 Same as
-.Fa p_sep_by_space ,
+.Va p_sep_by_space ,
 but for internationally formatted monetary quantities.
-.It Fa int_n_sep_by_space
+.It Va int_n_sep_by_space
 Same as
-.Fa n_sep_by_space ,
+.Va n_sep_by_space ,
 but for internationally formatted monetary quantities.
-.It Fa int_p_sign_posn
+.It Va int_p_sign_posn
 Same as
-.Fa p_sign_posn ,
+.Va p_sign_posn ,
 but for internationally formatted monetary quantities.
-.It Fa int_n_sign_posn
+.It Va int_n_sign_posn
 Same as
-.Fa n_sign_posn ,
+.Va n_sign_posn ,
 but for internationally formatted monetary quantities.
 .El
 .Pp
@@ -205,7 +206,7 @@ The
 .Fn localeconv
 function returns a pointer to a static object
 which may be altered by later calls to
-.Fn setlocale
+.Xr setlocale 3
 or
 .Fn localeconv .
 .Sh ERRORS
diff --git a/lib/libc/locale/mblen.3 b/lib/libc/locale/mblen.3
index 514a485..26f2c52 100644
--- a/lib/libc/locale/mblen.3
+++ b/lib/libc/locale/mblen.3
@@ -87,7 +87,7 @@ the number of bytes processed in
 or returns \-1 if no multibyte character
 could be recognized or converted.
 In this case,
-.Fn mblen Ns No 's
+.Fn mblen Ns 's
 internal conversion state is undefined.
 .Sh ERRORS
 The
diff --git a/lib/libc/locale/mbstowcs.3 b/lib/libc/locale/mbstowcs.3
index d412b4d..2e344f8 100644
--- a/lib/libc/locale/mbstowcs.3
+++ b/lib/libc/locale/mbstowcs.3
@@ -48,7 +48,10 @@
 .Sh SYNOPSIS
 .In stdlib.h
 .Ft size_t
-.Fn mbstowcs "wchar_t * restrict wcstring" "const char * restrict mbstring" "size_t nwchars"
+.Fo mbstowcs
+.Fa "wchar_t * restrict wcstring" "const char * restrict mbstring"
+.Fa "size_t nwchars"
+.Fc
 .Sh DESCRIPTION
 The
 .Fn mbstowcs
diff --git a/lib/libc/locale/mbtowc.3 b/lib/libc/locale/mbtowc.3
index 850e055..1d5783a 100644
--- a/lib/libc/locale/mbtowc.3
+++ b/lib/libc/locale/mbtowc.3
@@ -48,7 +48,10 @@
 .Sh SYNOPSIS
 .In stdlib.h
 .Ft int
-.Fn mbtowc "wchar_t * restrict wcharp" "const char * restrict mbchar" "size_t nbytes"
+.Fo mbtowc
+.Fa "wchar_t * restrict wcharp" "const char * restrict mbchar"
+.Fa "size_t nbytes"
+.Fc
 .Sh DESCRIPTION
 The
 .Fn mbtowc
@@ -89,7 +92,7 @@ the number of bytes processed in
 or returns \-1 if no multibyte character
 could be recognized or converted.
 In this case,
-.Fn mbtowc Ns No 's
+.Fn mbtowc Ns 's
 internal conversion state is undefined.
 .Sh ERRORS
 The
diff --git a/lib/libc/locale/mskanji.5 b/lib/libc/locale/mskanji.5
index 1857c07..8ebaccd 100644
--- a/lib/libc/locale/mskanji.5
+++ b/lib/libc/locale/mskanji.5
@@ -23,6 +23,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD$
+.\"
 .Dd August 7, 2003
 .Dt MSKANJI 5
 .Os
@@ -51,16 +52,16 @@ Characters from the
 X 0208 character set are encoded as two bytes.
 The first ranges from
 0x81 - 0x9F, 0xE0 - 0xEA, 0xED - 0xEE (not
-.Tn JIS Ns :
+.Tn JIS :
 .Tn NEC Ns - Ns
 selected
 .Tn IBM
 extended characters),
 0xF0 - 0xF9 (not
-.Tn JIS Ns :
+.Tn JIS :
 user defined),
 or 0xFA - 0xFC (not
-.Tn JIS Ns :
+.Tn JIS :
 .Tn IBM
 extended characters).
 The second byte ranges from 0x40 - 0xFC, excluding 0x7F (delete).
diff --git a/lib/libc/locale/utf2.5 b/lib/libc/locale/utf2.5
index e41cad8..1b10ff2 100644
--- a/lib/libc/locale/utf2.5
+++ b/lib/libc/locale/utf2.5
@@ -40,7 +40,7 @@
 .Os
 .Sh NAME
 .Nm utf2
-.Nd "Universal character set Transformation Format encoding of wide characters
+.Nd "Universal character set Transformation Format encoding of wide characters"
 .Sh SYNOPSIS
 .Nm ENCODING
 .Qq UTF2
@@ -53,15 +53,21 @@ New applications should not use UTF2.
 The
 .Nm UTF2
 encoding is based on a proposed X-Open multibyte
-\s-1FSS-UCS-TF\s+1 (File System Safe Universal Character Set Transformation Format) encoding as used in
-.Sy "Plan 9 from Bell Labs" .
+.Tn FSS-UCS-TF
+(File System Safe Universal Character Set Transformation Format)
+encoding as used in
+.Tn "Plan 9"
+from Bell Labs.
 Although it is capable of representing more than 16 bits,
 the current implementation is limited to 16 bits as defined by the
 Unicode Standard.
 .Pp
 .Nm UTF2
-representation is backwards compatible with ASCII, so 0x00-0x7f refer to the
-ASCII character set.
+representation is backwards compatible with
+.Tn ASCII ,
+so 0x00-0x7f refer to the
+.Tn ASCII
+character set.
 The multibyte encodings of wide characters between
 0x0080 and 0xffff
 consist entirely of bytes whose high order bit is set.
@@ -91,7 +97,7 @@ The final three encodings provided by X-Open:
 .Pp
 which provides for the entire proposed ISO-10646 31 bit standard are currently
 not implemented.
-.Sh "SEE ALSO"
+.Sh SEE ALSO
 .Xr mklocale 1 ,
 .Xr setlocale 3 ,
 .Xr utf8 5
diff --git a/lib/libc/locale/wcstombs.3 b/lib/libc/locale/wcstombs.3
index 310ff95..0cb712a 100644
--- a/lib/libc/locale/wcstombs.3
+++ b/lib/libc/locale/wcstombs.3
@@ -41,14 +41,17 @@
 .Dt WCSTOMBS 3
 .Os
 .Sh NAME
-.Nm wcstombs ,
+.Nm wcstombs
 .Nd convert a wide-character string to a character string
 .Sh LIBRARY
 .Lb libc
 .Sh SYNOPSIS
 .In stdlib.h
 .Ft size_t
-.Fn wcstombs "char * restrict mbstring" "const wchar_t * restrict wcstring" "size_t nbytes"
+.Fo wcstombs
+.Fa "char * restrict mbstring" "const wchar_t * restrict wcstring"
+.Fa "size_t nbytes"
+.Fc
 .Sh DESCRIPTION
 The
 .Fn wcstombs
diff --git a/lib/libc/locale/wctomb.3 b/lib/libc/locale/wctomb.3
index d1fb165..a669f0e 100644
--- a/lib/libc/locale/wctomb.3
+++ b/lib/libc/locale/wctomb.3
@@ -88,7 +88,7 @@ the number of bytes processed in
 or \-1 if no multibyte character
 could be recognized or converted.
 In this case,
-.Fn wctomb Ns No 's
+.Fn wctomb Ns 's
 internal conversion state is undefined.
 .Sh ERRORS
 The
diff --git a/lib/libpam/modules/pam_guest/pam_guest.8 b/lib/libpam/modules/pam_guest/pam_guest.8
index cc9c061..0bd1755 100644
--- a/lib/libpam/modules/pam_guest/pam_guest.8
+++ b/lib/libpam/modules/pam_guest/pam_guest.8
@@ -62,11 +62,11 @@ module:
 .It Cm guests Ns = Ns Ar list
 Comma-separated list of guest account names.
 The default is
-.Dq guest .
+.Dq Li guest .
 A typical value for
 .Xr ftpd 8
 would be
-.Dq anonymous,ftp .
+.Dq Li anonymous,ftp .
 .It Cm nopass
 Omits the password prompt if the target account is on the list of
 guest accounts.