Merging upstream version 6.7.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 34 insertions, 20 deletions

diff --git a/man1/locale.1 b/man1/locale.1
index 31ca0ea..2e71e68 100644
--- a/man1/locale.1
+++ b/man1/locale.1
@@ -2,7 +2,7 @@
 .\"
 .\" SPDX-License-Identifier: Linux-man-pages-copyleft
 .\"
-.TH locale 1 2023-05-03 "Linux man-pages 6.05.01"
+.TH locale 1 2023-10-31 "Linux man-pages 6.7"
 .SH NAME
 locale \- get locale-specific information
 .SH SYNOPSIS
@@ -17,7 +17,7 @@ The
 .B locale
 command displays information about the current locale, or all locales,
 on standard output.
-.PP
+.P
 When invoked without arguments,
 .B locale
 displays the current locale settings for each locale category (see
@@ -27,7 +27,7 @@ based on the settings of the environment variables that control the locale
 .BR locale (7)).
 Values for variables set in the environment are printed without double
 quotes, implied values are printed with double quotes.
-.PP
+.P
 If either the
 .B \-a
 or the
@@ -35,7 +35,9 @@ or the
 option (or one of their long-format equivalents) is specified,
 the behavior is as follows:
 .TP
-.BR \-a ", " \-\-all\-locales
+.B \-\-all\-locales
+.TQ
+.B \-a
 Display a list of all available locales.
 The
 .B \-v
@@ -43,11 +45,13 @@ option causes the
 .B LC_IDENTIFICATION
 metadata about each locale to be included in the output.
 .TP
-.BR \-m ", " \-\-charmaps
+.B \-\-charmaps
+.TQ
+.B \-m
 Display the available charmaps (character set description files).
 To display the current character set for the locale, use
 \fBlocale \-c charmap\fR.
-.PP
+.P
 The
 .B locale
 command can also be provided with one or more arguments,
@@ -67,10 +71,12 @@ For a locale keyword, the value of that keyword to be displayed.
 .IP \[bu]
 For a locale category,
 the values of all keywords in that category are displayed.
-.PP
+.P
 When arguments are supplied, the following options are meaningful:
 .TP
-.BR \-c ", " \-\-category\-name
+.B \-\-category\-name
+.TQ
+.B \-c
 For a category name argument,
 write the name of the locale category
 on a separate line preceding the list of keyword values for that category.
@@ -84,7 +90,9 @@ It can be combined with the
 .B \-k
 option.
 .TP
-.BR \-k ", " \-\-keyword\-name
+.B \-\-keyword\-name
+.TQ
+.B \-k
 For each keyword whose value is being displayed,
 include also the name of that keyword,
 so that the output has the format:
@@ -94,22 +102,28 @@ so that the output has the format:
 .IR keyword =\[dq] value \[dq]
 .EE
 .in
-.PP
+.P
 The
 .B locale
 command also knows about the following options:
 .TP
-.BR \-v ", " \-\-verbose
+.B \-\-verbose
+.TQ
+.B \-v
 Display additional information for some command-line option and argument
 combinations.
 .TP
-.BR \-? ", " \-\-help
+.B \-\-help
+.TQ
+.B \-?
 Display a summary of command-line options and arguments and exit.
 .TP
 .B \-\-usage
 Display a short usage message and exit.
 .TP
-.BR \-V ", " \-\-version
+.B \-\-version
+.TQ
+.B \-V
 Display the program version and exit.
 .SH FILES
 .TP
@@ -139,24 +153,24 @@ LC_TELEPHONE="en_US.UTF\-8"
 LC_MEASUREMENT="en_US.UTF\-8"
 LC_IDENTIFICATION="en_US.UTF\-8"
 LC_ALL=
-.PP
+.P
 $ \fBlocale date_fmt\fP
 %a %b %e %H:%M:%S %Z %Y
-.PP
+.P
 $ \fBlocale \-k date_fmt\fP
 date_fmt="%a %b %e %H:%M:%S %Z %Y"
-.PP
+.P
 $ \fBlocale \-ck date_fmt\fP
 LC_TIME
 date_fmt="%a %b %e %H:%M:%S %Z %Y"
-.PP
+.P
 $ \fBlocale LC_TELEPHONE\fP
 +%c (%a) %l
 (%a) %l
 11
 1
 UTF\-8
-.PP
+.P
 $ \fBlocale \-k LC_TELEPHONE\fP
 tel_int_fmt="+%c (%a) %l"
 tel_dom_fmt="(%a) %l"
@@ -164,7 +178,7 @@ int_select="11"
 int_prefix="1"
 telephone\-codeset="UTF\-8"
 .EE
-.PP
+.P
 The following example compiles a custom locale from the
 .I ./wrk
 directory with the
@@ -179,7 +193,7 @@ and
 .B LANG
 in the shell profile file so that the custom locale will be used in the
 subsequent user sessions:
-.PP
+.P
 .EX
 $ \fBmkdir \-p $HOME/.locale\fP
 $ \fBI18NPATH=./wrk/ localedef \-f UTF\-8 \-i fi_SE $HOME/.locale/fi_SE.UTF\-8\fP