* man/man1/apropos.man1 (OPTIONS), man/man1/lexgrog.man1 (OPTIONS),

  man/man1/man.man1 (OPTIONS), man/man1/manconv.man1 (OPTIONS),
  man/man1/manpath.man1 (OPTIONS), man/man1/whatis.man1 (OPTIONS),
  man/man1/zsoelim.man1 (OPTIONS), man/man8/accessdb.man8 (OPTIONS),
  man/man8/catman.man8 (OPTIONS), man/man8/mandb.man8 (OPTIONS):
  Print commas in roman rather than bold.  Based on a patch from
  David Prévot (Debian bug #600002).
* man/po4a/po/man-db-manpages.pot, man/po4a/po/*.po: Update.
  Manually unfuzzy translations.

7 files changed, 72 insertions, 72 deletions

diff --git a/man/man1/apropos.man1 b/man/man1/apropos.man1
index ca57d497..6ab1c94d 100644
--- a/man/man1/apropos.man1
+++ b/man/man1/apropos.man1
@@ -60,13 +60,13 @@ Depending on your installation, this may be run by a periodic cron job, or
 may need to be run manually after new manual pages have been installed.
 .SH OPTIONS
 .TP
-.if !'po4a'hide' .B \-d, \-\-debug
+.if !'po4a'hide' .BR \-d ", " \-\-debug
 Print debugging information.
 .TP
-.if !'po4a'hide' .B \-v, \-\-verbose
+.if !'po4a'hide' .BR \-v ", " \-\-verbose
 Print verbose warning messages.
 .TP
-.if !'po4a'hide' .B \-r, \-\-regex
+.if !'po4a'hide' .BR \-r ", " \-\-regex
 Interpret each keyword as a regular expression.
 This is the default behaviour.
 Each keyword will be matched against the page names and the descriptions
@@ -74,7 +74,7 @@ independently.
 It can match any part of either.
 The match is not limited to word boundaries.
 .TP
-.if !'po4a'hide' .B \-w, \-\-wildcard
+.if !'po4a'hide' .BR \-w ", " \-\-wildcard
 Interpret each keyword as a pattern containing shell style wildcards.
 Each keyword will be matched against the page names and the descriptions
 independently.
@@ -86,15 +86,15 @@ description or page name.
 Otherwise the keyword is also allowed to match on word boundaries in the
 description.
 .TP
-.if !'po4a'hide' .B \-e, \-\-exact
+.if !'po4a'hide' .BR \-e ", " \-\-exact
 Each keyword will be exactly matched against the page names and the
 descriptions.
 .TP
-.if !'po4a'hide' .B \-a, \-\-and
+.if !'po4a'hide' .BR \-a ", " \-\-and
 Only display items that match all the supplied keywords.
 The default is to display items that match any keyword.
 .TP
-.if !'po4a'hide' .B \-l, \-\-long
+.if !'po4a'hide' .BR \-l ", " \-\-long
 Do not trim output to the terminal width.
 Normally, output will be truncated to the terminal width to avoid ugly
 results from poorly-written
@@ -123,7 +123,7 @@ pages in that exact part of the manual section.
 .PP
 .B \-m 
 .I system\c 
-.RB \|[\|,.\|.\|.\|]\| ,
+\|[\|,.\|.\|.\|]\|,
 .BI \-\-systems= system\c 
 \|[\|,.\|.\|.\|]
 .RS
@@ -146,7 +146,7 @@ This option will override the
 environment variable.
 .RE
 .TP
-.BI \-M\  path ,\ \-\-manpath= path
+.BI \-M\  path \fR,\ \fB\-\-manpath= path
 Specify an alternate set of colon-delimited manual page hierarchies to
 search.
 By default, 
@@ -160,7 +160,7 @@ environment variable.
 This option overrides the contents of
 .RB $ MANPATH .
 .TP
-.BI \-L\  locale ,\ \-\-locale= locale
+.BI \-L\  locale \fR,\ \fB\-\-locale= locale
 .B %program%
 will normally determine your current locale by a call to the C function
 .BR setlocale (3)
@@ -177,14 +177,14 @@ begins.
 Output such as the help message will always be displayed in the initially
 determined locale.
 .TP
-.BI \-C\  file ,\ \-\-config\-file= file
+.BI \-C\  file \fR,\ \fB\-\-config\-file= file
 Use this user configuration file rather than the default of
 .IR ~/.manpath .
 .TP
-.if !'po4a'hide' .B \-h, \-\-help
+.if !'po4a'hide' .BR \-h ", " \-\-help
 Print a help message and exit.
 .TP
-.if !'po4a'hide' .B \-V, \-\-version
+.if !'po4a'hide' .BR \-V ", " \-\-version
 Display version information.
 .SH "EXIT STATUS"
 .TP
diff --git a/man/man1/lexgrog.man1 b/man/man1/lexgrog.man1
index be54bb9d..fa775318 100644
--- a/man/man1/lexgrog.man1
+++ b/man/man1/lexgrog.man1
@@ -44,7 +44,7 @@ input files is \(lq\-\(rq, it will read from standard input; if any input
 file is compressed, a decompressed version will be read automatically.
 .SH OPTIONS
 .TP
-.if !'po4a'hide' .B \-m, \-\-man
+.if !'po4a'hide' .BR \-m ", " \-\-man
 Parse input as man page source files.
 This is the default if neither
 .B \-\-man
@@ -52,14 +52,14 @@ nor
 .B \-\-cat
 is given.
 .TP
-.if !'po4a'hide' .B \-c, \-\-cat
+.if !'po4a'hide' .BR \-c ", " \-\-cat
 Parse input as preformatted man pages (\(lqcat pages\(rq).
 .B \-\-man
 and
 .B \-\-cat
 may not be given simultaneously.
 .TP
-.if !'po4a'hide' .B \-w, \-\-whatis
+.if !'po4a'hide' .BR \-w ", " \-\-whatis
 Display the name and description from the man page's header, as used by
 .B apropos
 and
@@ -70,7 +70,7 @@ nor
 .B \-\-filters
 is given.
 .TP
-.if !'po4a'hide' .B \-f, \-\-filters
+.if !'po4a'hide' .BR \-f ", " \-\-filters
 Display the list of filters needed to preprocess the man page before
 formatting with
 .B nroff
@@ -81,10 +81,10 @@ or
 Override the guessed character set for the page to
 .IR encoding .
 .TP
-.if !'po4a'hide' .B \-h, \-\-help
+.if !'po4a'hide' .BR \-h ", " \-\-help
 Print a help message and exit.
 .TP
-.if !'po4a'hide' .B \-V, \-\-version
+.if !'po4a'hide' .BR \-V ", " \-\-version
 Display version information.
 .SH "EXIT STATUS"
 .TP
diff --git a/man/man1/man.man1 b/man/man1/man.man1
index 14bfc75a..e4b5c343 100644
--- a/man/man1/man.man1
+++ b/man/man1/man.man1
@@ -550,14 +550,14 @@ For options that require an argument, each duplication will override the
 previous argument value.
 .SS "General options"
 .TP
-.BI \-C\  file ,\ \-\-config\-file= file
+.BI \-C\  file \fR,\ \fB\-\-config\-file= file
 Use this user configuration file rather than the default of
 .IR ~/.manpath .
 .TP
-.if !'po4a'hide' .B \-d, \-\-debug
+.if !'po4a'hide' .BR \-d ", " \-\-debug
 Print debugging information.
 .TP
-.if !'po4a'hide' .B \-D, \-\-default
+.if !'po4a'hide' .BR \-D ", " \-\-default
 This option is normally issued as the very first option and resets
 .B %man%'s
 behaviour to its default.
@@ -580,14 +580,14 @@ See the \(lqWarnings\(rq node in
 for a list of available warning names.
 .SS "Main modes of operation"
 .TP
-.if !'po4a'hide' .B \-f, \-\-whatis
+.if !'po4a'hide' .BR \-f ", " \-\-whatis
 Equivalent to
 .BR %whatis% .
 Display a short description from the manual page, if available. See
 .BR %whatis% (1)
 for details.
 .TP
-.if !'po4a'hide' .B \-k, \-\-apropos
+.if !'po4a'hide' .BR \-k ", " \-\-apropos
 Equivalent to
 .BR %apropos% .
 Search the short manual page descriptions for keywords and display any
@@ -596,7 +596,7 @@ See
 .BR %apropos% (1)
 for details.
 .TP
-.if !'po4a'hide' .B \-K, \-\-global\-apropos
+.if !'po4a'hide' .BR \-K ", " \-\-global\-apropos
 Search for text in all manual pages.
 This is a brute-force search, and is likely to take some time; if you can,
 you should specify a section to reduce the number of pages that need to be
@@ -606,7 +606,7 @@ the
 .B \-\-regex
 option is used.
 .TP
-.if !'po4a'hide' .B \-l, \-\-local\-file
+.if !'po4a'hide' .BR \-l ", " \-\-local\-file
 Activate `local' mode.
 Format and display local manual files instead of searching through the
 system's manual collection.
@@ -622,16 +622,16 @@ before displaying the error message, it attempts to act as if this
 option was supplied, using the name as a filename and looking for an
 exact match.
 .TP
-.if !'po4a'hide' .B \-w, \-\-where, \-\-location
+.if !'po4a'hide' .BR \-w ", " \-\-where ", " \-\-location
 Don't actually display the manual pages, but do print the location(s) of
 the source nroff files that would be formatted.
 .TP
-.if !'po4a'hide' .B \-W, \-\-where\-cat, \-\-location\-cat
+.if !'po4a'hide' .BR \-W ", " \-\-where\-cat ", " \-\-location\-cat
 Don't actually display the manual pages, but do print the location(s) of
 the cat files that would be displayed.
 If \-w and \-W are both specified, print both separated by a space.
 .TP
-.if !'po4a'hide' .B \-c, \-\-catman
+.if !'po4a'hide' .BR \-c ", " \-\-catman
 This option is not for general use and should only be used by the
 .B %catman%
 program.
@@ -649,7 +649,7 @@ that they were already installed in a structure similar to a manual page
 hierarchy.
 .SS "Finding manual pages"
 .TP
-.BI \-L\  locale ,\ \-\-locale= locale
+.BI \-L\  locale \fR,\ \fB\-\-locale= locale
 .B %program%
 will normally determine your current locale by a call to the C function
 .BR setlocale (3)
@@ -675,7 +675,7 @@ determined locale.
 .PP
 .B \-m
 .I system\c
-.RB \|[\|,.\|.\|.\|]\| ,
+\|[\|,.\|.\|.\|]\|,
 .BI \-\-systems= system\c
 \|[\|,.\|.\|.\|]
 .RS
@@ -698,7 +698,7 @@ This option will override the
 environment variable.
 .RE
 .TP
-.BI \-M\  path ,\ \-\-manpath= path
+.BI \-M\  path \fR,\ \fB\-\-manpath= path
 Specify an alternate manpath to use.
 By default,
 .B %man%
@@ -718,7 +718,7 @@ To view manual pages outside such hierarchies, see the
 .B \-l
 option.
 .TP
-.BI \-S\  list ,\ \-s\  list ,\ \-\-sections= list
+.BI \-S\  list \fR,\ \fB\-s\  list \fR,\ \fB\-\-sections= list
 List is a colon- or comma-separated list of `order specific' manual sections
 to search.
 This option overrides the
@@ -728,7 +728,7 @@ environment variable.
 .B \-s
 spelling is for compatibility with System V.)
 .TP
-.BI \-e\  sub-extension ,\ \-\-extension= sub-extension
+.BI \-e\  sub-extension \fR,\ \fB\-\-extension= sub-extension
 Some systems incorporate large packages of manual pages, such as those that
 accompany the
 .B Tcl
@@ -762,11 +762,11 @@ to
 will restrict the search to pages having an extension of
 .BR *tcl .
 .TP
-.if !'po4a'hide' .B \-i, \-\-ignore\-case
+.if !'po4a'hide' .BR \-i ", " \-\-ignore\-case
 Ignore case when searching for manual pages.
 This is the default.
 .TP
-.if !'po4a'hide' .B \-I, \-\-match\-case
+.if !'po4a'hide' .BR \-I ", " \-\-match\-case
 Search for manual pages case-sensitively.
 .TP
 .if !'po4a'hide' .B \-\-regex
@@ -803,7 +803,7 @@ option is used, match only page names, not page descriptions, as with
 .BR whatis (1).
 Otherwise, no effect.
 .TP
-.if !'po4a'hide' .B \-a, \-\-all
+.if !'po4a'hide' .BR \-a ", " \-\-all
 By default,
 .B %man%
 will exit after displaying the most suitable manual page it finds.
@@ -811,7 +811,7 @@ Using this option forces
 .B %man%
 to display all the manual pages with names that match the search criteria.
 .TP
-.if !'po4a'hide' .B \-u, \-\-update
+.if !'po4a'hide' .BR \-u ", " \-\-update
 This option causes
 .B %man%
 to perform an `inode level' consistency check on its database caches to
@@ -849,7 +849,7 @@ option.
 .fi
 .SS "Controlling formatted output"
 .TP
-.BI \-P\  pager ,\ \-\-pager= pager
+.BI \-P\  pager \fR,\ \fB\-\-pager= pager
 Specify which output pager to use.
 By default,
 .B %man%
@@ -871,7 +871,7 @@ It may not use pipes to connect multiple commands; if you need that, use a
 wrapper script, which may take the file to display either as an argument or
 on standard input.
 .TP
-.BI \-r\  prompt ,\ \-\-prompt= prompt
+.BI \-r\  prompt \fR,\ \fB\-\-prompt= prompt
 If a recent version of
 .B less
 is used as the pager,
@@ -936,7 +936,7 @@ prompt string processing completely, use the
 .RB $ MANLESS
 environment variable described below.
 .TP
-.if !'po4a'hide' .B \-7, \-\-ascii
+.if !'po4a'hide' .BR \-7 ", " \-\-ascii
 When viewing a pure
 .IR ascii (7)
 manual page on a 7 bit terminal or terminal emulator, some characters may
@@ -1050,7 +1050,7 @@ from justifying certain paragraphs, do not use this option, but consult the
 documentation instead; for instance, you can use the ".na", ".nf", ".fi",
 and ".ad" requests to temporarily disable adjusting and filling.
 .TP
-.BI \-p\  string ,\ \-\-preprocessor= string
+.BI \-p\  string \fR,\ \fB\-\-preprocessor= string
 Specify the sequence of preprocessors to run before
 .B nroff
 or
@@ -1069,7 +1069,7 @@ environment variable.
 .B %zsoelim%
 is always run as the very first preprocessor.
 .TP
-.if !'po4a'hide' .B \-t, \-\-troff
+.if !'po4a'hide' .BR \-t ", " \-\-troff
 Use
 .I %troff%
 to format the manual page to stdout.
@@ -1121,7 +1121,7 @@ This option implies
 .B \-T
 with the X75, X75-12, X100, or X100-12 device respectively.
 .TP
-.if !'po4a'hide' .B \-Z, \-\-ditroff
+.if !'po4a'hide' .BR \-Z ", " \-\-ditroff
 .B groff
 will run
 .B troff
@@ -1138,10 +1138,10 @@ It implies
 .BR \-t .
 .SS "Getting help"
 .TP
-.if !'po4a'hide' .B \-h, \-\-help
+.if !'po4a'hide' .BR \-h ", " \-\-help
 Print a help message and exit.
 .TP
-.if !'po4a'hide' .B \-V, \-\-version
+.if !'po4a'hide' .BR \-V ", " \-\-version
 Display version information.
 .SH "EXIT STATUS"
 .TP
diff --git a/man/man1/manconv.man1 b/man/man1/manconv.man1
index 78f0f7e8..8ab8a2af 100644
--- a/man/man1/manconv.man1
+++ b/man/man1/manconv.man1
@@ -58,16 +58,16 @@ Try each of
 Convert the manual page to
 .IR encoding .
 .TP
-.if !'po4a'hide' .B \-q, \-\-quiet
+.if !'po4a'hide' .BR \-q ", " \-\-quiet
 Do not issue error messages when the page cannot be converted.
 .TP
-.if !'po4a'hide' .B \-d, \-\-debug
+.if !'po4a'hide' .BR \-d ", " \-\-debug
 Print debugging information.
 .TP
-.if !'po4a'hide' .B \-h, \-\-help
+.if !'po4a'hide' .BR \-h ", " \-\-help
 Print a help message and exit.
 .TP
-.if !'po4a'hide' .B \-V, \-\-version
+.if !'po4a'hide' .BR \-V ", " \-\-version
 Display version information.
 .SH "SEE ALSO"
 .if !'po4a'hide' .IR man (1),
diff --git a/man/man1/manpath.man1 b/man/man1/manpath.man1
index e4c8881c..3523c812 100644
--- a/man/man1/manpath.man1
+++ b/man/man1/manpath.man1
@@ -36,18 +36,18 @@ man-db configuration file -
 and the user's environment.
 .SH OPTIONS
 .TP
-.if !'po4a'hide' .B \-q, \-\-quiet
+.if !'po4a'hide' .BR \-q ", " \-\-quiet
 Do not issue warnings.
 .TP
-.if !'po4a'hide' .B \-d, \-\-debug
+.if !'po4a'hide' .BR \-d ", " \-\-debug
 Print debugging information.
 .TP
-.if !'po4a'hide' .B \-c, \-\-catpath
+.if !'po4a'hide' .BR \-c ", " \-\-catpath
 Produce a catpath as opposed to a manpath. 
 Once the manpath is determined,
 each path element is converted to its relative catpath.
 .TP
-.if !'po4a'hide' .B \-g, \-\-global
+.if !'po4a'hide' .BR \-g ", " \-\-global
 Produce a manpath consisting of all paths named as `global' within the
 man-db configuration file. 
 .\"
@@ -60,7 +60,7 @@ man-db configuration file.
 .PP
 .B \-m 
 .I system\c 
-.RB \|[\|,.\|.\|.\|]\| ,
+\|[\|,.\|.\|.\|]\|,
 .BI \-\-systems= system\c 
 \|[\|,.\|.\|.\|]
 .RS
@@ -83,14 +83,14 @@ This option will override the
 environment variable.
 .RE
 .TP
-.BI \-C\  file ,\ \-\-config\-file= file
+.BI \-C\  file \fR,\ \fB\-\-config\-file= file
 Use this user configuration file rather than the default of
 .IR ~/.manpath .
 .TP
-.if !'po4a'hide' .B \-h, \-\-help
+.if !'po4a'hide' .BR \-h ", " \-\-help
 Print a help message and exit.
 .TP
-.if !'po4a'hide' .B \-V, \-\-version
+.if !'po4a'hide' .BR \-V ", " \-\-version
 Display version information.
 .SH ENVIRONMENT
 .TP
diff --git a/man/man1/whatis.man1 b/man/man1/whatis.man1
index b1e46269..e3a0f832 100644
--- a/man/man1/whatis.man1
+++ b/man/man1/whatis.man1
@@ -70,13 +70,13 @@ is a manual page hierarchy such as
 .IR /usr/man .
 .SH OPTIONS
 .TP
-.if !'po4a'hide' .B \-d, \-\-debug
+.if !'po4a'hide' .BR \-d ", " \-\-debug
 Print debugging information.
 .TP
-.if !'po4a'hide' .B \-v, \-\-verbose
+.if !'po4a'hide' .BR \-v ", " \-\-verbose
 Print verbose warning messages.
 .TP
-.if !'po4a'hide' .B \-r, \-\-regex
+.if !'po4a'hide' .BR \-r ", " \-\-regex
 Interpret each 
 .I name 
 as a regular expression.
@@ -87,7 +87,7 @@ This option causes
 .B %whatis% 
 to be somewhat slower due to the nature of database searches.
 .TP
-.if !'po4a'hide' .B \-w, \-\-wildcard
+.if !'po4a'hide' .BR \-w ", " \-\-wildcard
 Interpret each 
 .I name 
 as a pattern containing shell style wildcards.
@@ -98,7 +98,7 @@ This option causes
 .B %whatis%
 to be somewhat slower due to the nature of database searches.
 .TP
-.if !'po4a'hide' .B \-l, \-\-long
+.if !'po4a'hide' .BR \-l ", " \-\-long
 Do not trim output to the terminal width.
 Normally, output will be truncated to the terminal width to avoid ugly
 results from poorly-written
@@ -127,7 +127,7 @@ pages in that exact part of the manual section.
 .PP
 .B \-m 
 .I system\c 
-.RB \|[\|,.\|.\|.\|]\| ,
+\|[\|,.\|.\|.\|]\|,
 .BI \-\-systems= system\c 
 \|[\|,.\|.\|.\|]
 .RS
@@ -150,7 +150,7 @@ This option will override the
 environment variable.
 .RE
 .TP
-.BI \-M\  path ,\ \-\-manpath= path
+.BI \-M\  path \fR,\ \fB\-\-manpath= path
 Specify an alternate set of colon-delimited manual page hierarchies to
 search.
 By default,
@@ -164,7 +164,7 @@ environment variable.
 This option overrides the contents of
 .RB $ MANPATH .
 .TP
-.BI \-L\  locale ,\ \-\-locale= locale
+.BI \-L\  locale \fR,\ \fB\-\-locale= locale
 .B %program%
 will normally determine your current locale by a call to the C function
 .BR setlocale (3)
@@ -181,14 +181,14 @@ begins.
 Output such as the help message will always be displayed in the initially
 determined locale.
 .TP
-.BI \-C\  file ,\ \-\-config\-file= file
+.BI \-C\  file \fR,\ \fB\-\-config\-file= file
 Use this user configuration file rather than the default of
 .IR ~/.manpath .
 .TP
-.if !'po4a'hide' .B \-h, \-\-help
+.if !'po4a'hide' .BR \-h ", " \-\-help
 Print a help message and exit.
 .TP
-.if !'po4a'hide' .B \-V, \-\-version
+.if !'po4a'hide' .BR \-V ", " \-\-version
 Display version information.
 .SH "EXIT STATUS"
 .TP
diff --git a/man/man1/zsoelim.man1 b/man/man1/zsoelim.man1
index cdaaa4a1..43db3bb9 100644
--- a/man/man1/zsoelim.man1
+++ b/man/man1/zsoelim.man1
@@ -54,7 +54,7 @@ This particular version was written to circumvent problems created by
 support for compressed manual pages.
 .SH OPTIONS
 .TP
-.if !'po4a'hide' .B \-C, \-\-compatible
+.if !'po4a'hide' .BR \-C ", " \-\-compatible
 This flag is available for compatibility with other 
 .B soelim
 programs.
@@ -62,10 +62,10 @@ Its use is to enable .so requests followed by something other than
 whitespace.
 As this is already the default behaviour, it is ignored.
 .TP
-.if !'po4a'hide' .B \-h, \-\-help
+.if !'po4a'hide' .BR \-h ", " \-\-help
 Print a help message and exit.
 .TP
-.if !'po4a'hide' .B \-V, \-\-version
+.if !'po4a'hide' .BR \-V ", " \-\-version
 Display version information.
 .SH "SEE ALSO"
 .if !'po4a'hide' .BR nroff (1),