Description: the upstream man-pages are generated for org-mode sources
 by Emacs.  The troff output is not fully compatible with Debian's
 groff, and elicits a lot of warnings from Lintian.  This patch modifies
 the sources for Debian
Author: Jerey Sowden <jeremy@azazel.net>
Last-Update: 2023-11-03
Forwarded: not-needed

--- a/man/common-options.inc
+++ b/man/common-options.inc
@@ -17,8 +17,8 @@
 them to the log file.
 
 ** --nocolor
-do not use ANSI colors. The environment variable ~NO_COLOR~ can be used as an
-alternative to ~--nocolor~.
+do not use ANSI colors. The environment variable *NO_COLOR* can be used as an
+alternative to *--nocolor*.
 
 ** -V, --version
 prints mu version and copyright information.
--- a/man/exit-code.inc
+++ b/man/exit-code.inc
@@ -10,7 +10,7 @@
 
 ** database schema mismatch (11)
 
-You need to re-initialize ~mu~, see *mu-init(1*)
+You need to re-initialize *mu*, see *mu-init(1*)
 
 ** failed to acquire lock (19)
 
--- a/man/mu.1.org
+++ b/man/mu.1.org
@@ -3,79 +3,79 @@
 
 * NAME
 
-~mu~ - a set of tools to deal with Maildirs and message files, in particular to
+*mu* - a set of tools to deal with Maildirs and message files, in particular to
 index and search e-mail messages.
 
 * SYNOPSIS
 
-~mu~ [COMMON-OPTIONS] [[COMMAND] [COMMAND-OPTIONS]]
+*mu* [COMMON-OPTIONS] [[COMMAND] [COMMAND-OPTIONS]]
 
 For information about the commmon options, see *COMMON OPTIONS*.
 
 * DESCRIPTION
 
-~mu~ is the general command shows help about the specific commands:
+*mu* is the general command shows help about the specific commands:
 
-- ~add~:  add specific messages to the database.
-- ~cfind~: find contacts
-- ~extract~: extract attachments and other MIME-parts
-- ~find~: find messages in the database
-- ~help~: get help for some command
-- ~index~: (re)index the messages in a Maildir
-- ~info~: show information about the mu database
-- ~init~: initialize the mu database
-- ~mkdir~: create a new Maildir
-- ~remove~: remove specific messages from the database
-- ~server~: start a server process (for ~mu4e~-internal use)
-- ~view~: view a specific message
+- *add*:  add specific messages to the database.
+- *cfind*: find contacts
+- *extract*: extract attachments and other MIME-parts
+- *find*: find messages in the database
+- *help*: get help for some command
+- *index*: (re)index the messages in a Maildir
+- *info*: show information about the mu database
+- *init*: initialize the mu database
+- *mkdir*: create a new Maildir
+- *remove*: remove specific messages from the database
+- *server*: start a server process (for *mu4e*-internal use)
+- *view*: view a specific message
 
-Each of the commands have their own manpage ~mu-<command~>~.
+Each of the commands have their own manpage *mu-<command*>~.
 
-~mu~ is a set of tools for dealing with Maildirs and the e-mail messages
+*mu* is a set of tools for dealing with Maildirs and the e-mail messages
 in them.
 
-~mu~'s main purpose is to enable searching of e-mail messages. It
+*mu*'s main purpose is to enable searching of e-mail messages. It
 does so by periodically scanning a Maildir directory tree and
 analyzing the e-mail messages found (this is called 'indexing'). The
 results of this analysis are stored in a database, which can then be
 queried.
 
-In addition to indexing and searching, ~mu~ also offers
+In addition to indexing and searching, *mu* also offers
 functionality for viewing messages, extracting attachments and
 creating maildirs, and searching and exporting contact information.
 
-~mu~ can be used from the command line or can be integrated with various
+*mu* can be used from the command line or can be integrated with various
 e-mail clients.
 
 This manpage gives a general overview of the available commands
-(~index~, ~find~, etc.); each ~mu~ command has its own
+(*index*, *find*, etc.); each *mu* command has its own
 man-page as well.
 
 * COLORS
 
-Some ~mu~ commands support colorized output, and do so by default. If you don't
-want colors, you can use ~--nocolor~.
+Some *mu* commands support colorized output, and do so by default. If you don't
+want colors, you can use *--nocolor*.
 
 * ENCODING
 
-~mu~'s output is in the current locale, with the exceptions of the output
+*mu*'s output is in the current locale, with the exceptions of the output
 specifically meant for output to UTF8-encoded files. In practice, this means
-that the output of commands ~index~, ~view~, ~extract~ is always encoded according to
+that the output of commands *index*, *view*, *extract* is always encoded according to
 the current locale.
 
-The same is true for ~find~ and ~cfind~, with some exceptions, where
+The same is true for *find* and *cfind*, with some exceptions, where
 the output is always UTF-8, regardless of the locale:
 
-- For ~cfind~ the exception is ~--format=bbdb~. This is hard-coded to UTF-8, and as
+- For *cfind* the exception is *--format=bbdb*. This is hard-coded to UTF-8, and as
   such specified in the output-file, so emacs/bbdb can handle it correctly
   without guessing.
-- For ~find~ the output is encoded according the locale for ~--format=plain~ (the
+- For *find* the output is encoded according the locale for *--format=plain* (the
   default), and UTF-8 for all other formats.
 
 * DATABASE AND FILE
 
-Commands ~mu index~ and ~find~ and ~cfind~ work with the database, while the other
-ones work on individual mail files. Hence, running ~view~, ~mkdir~ and ~extract~ does
+Commands *mu index* and *find* and *cfind* work with the database, while the other
+ones work on individual mail files. Hence, running *view*, *mkdir* and *extract* does
 not require the mu database.
 
 #+include: "common-options.inc" :minlevel 1
@@ -85,6 +85,6 @@
 #+include: "prefooter.inc" :minlevel 1
 
 * SEE ALSO
-~mu-add(1)~, ~mu-cfind(1)~, ~mu-extract(1)~, ~mu-find(1)~, ~mu-help(1)~, ~mu-index(1)~,
-~mu-info(1)~, ~mu-init(1)~, ~mu-mkdir(1)~, ~mu-remove(1)~, ~mu-server(1)~, ~mu-view(1)~,
-~mu-query(7)~, ~mu-easy(1)~
+*mu-add(1)*, *mu-cfind(1)*, *mu-extract(1)*, *mu-find(1)*, *mu-help(1)*, *mu-index(1)*,
+*mu-info(1)*, *mu-init(1)*, *mu-mkdir(1)*, *mu-remove(1)*, *mu-server(1)*, *mu-view(1)*,
+*mu-query(7)*, *mu-easy(1)*
--- a/man/mu-add.1.org
+++ b/man/mu-add.1.org
@@ -3,7 +3,7 @@
 
 * NAME
 
-~mu add~ - add one or more messages to the database
+*mu_add* - add one or more messages to the database
 
 * SYNOPSIS
 
@@ -11,7 +11,7 @@
 
 * DESCRIPTION
 
-~mu add~ is the command to add specific message files to the database. Each file
+*mu add* is the command to add specific message files to the database. Each file
 must be specified with an absolute path.
 
 * ADD OPTIONS
--- a/man/mu-bookmarks.5.org
+++ b/man/mu-bookmarks.5.org
@@ -12,7 +12,7 @@
 mu experimental user interfaces, =mug= and =mug2=.
 
 The bookmarks file is read from =<muhome>/bookmarks=. On Unix this would typically
-be w be =~/.config/mu/bookmarks=, but this can be influenced using the ~--muhome~
+be w be =~/.config/mu/bookmarks=, but this can be influenced using the *--muhome*
 parameter for *mu-find(1)*.
 
 The bookmarks file is a typical key=value *.ini*-file, which is best shown by
--- a/man/mu-cfind.1.org
+++ b/man/mu-cfind.1.org
@@ -3,7 +3,7 @@
 
 * NAME
 
-*mu cfind* is the *mu* command to find contacts in the *mu* database and export them
+*mu_cfind* - find contacts in the *mu* database and export them
 for use in other programs.
 
 * SYNOPSIS
@@ -49,6 +49,7 @@
 ** --format=plain|mutt-alias|mutt-ab|wl|org-contact|bbdb|csv
 sets the output format to the given value. The following are available:
 
+#+ATTR_MAN: :disable-caption t
 | --format=   | description                       |
 |-------------+-----------------------------------|
 | plain       | default, simple list              |
@@ -61,14 +62,14 @@
 | json        | JSON format                       |
 
 
-[1] *CSV is not fully standardized, but *mu cfind* follows some common practices:
+[1] *CSV* is not fully standardized, but *mu cfind* follows some common practices:
 any double-quote is replaced by a double-double quote (thus, "hello" become
 ""hello"", and fields with commas are put in double-quotes. Normally, this
 should only apply to name fields.
 
 ** --personal,-p only show addresses seen in messages where one of 'my' e-mail
 addresses was seen in one of the address fields; this is to exclude addresses
-only seen in mailing-list messages. See the ~--my-address~ parameter to *mu init*.
+only seen in mailing-list messages. See the *--my-address* parameter to *mu init*.
 
 ** --after=<timestamp> only show addresses last seen after
 =<timestamp>=. =<timestamp>= is a UNIX *time_t* value, the number of
@@ -86,7 +87,7 @@
 
 * JSON FORMAT
 
-With ~--format=json~, the matching contacts come out as a JSON array, e.g.,
+With *--format=json*, the matching contacts come out as a JSON array, e.g.,
 #+begin_example
 [
   {
@@ -112,15 +113,16 @@
 
 Each contact has the following fields:
 
+#+ATTR_MAN: :disable-caption t
 | property      | description                                                              |
 |---------------+--------------------------------------------------------------------------|
-| ~email~         | the email-address                                                        |
-| ~name~          | the name (or ~none~)                                                       |
-| ~display~       | the combination name and e-mail address for display purposes             |
-| ~last-seen~     | date of most recent message with this contact (Unix time)                |
-| ~last-seen-iso~ | ~last-seen~ represented as an ISO-8601 timestamp                           |
-| ~personal~      | whether the email was seen in a message together with a personal address |
-| ~frequency~     | approximation of the number of times this contact was seen in messages   |
+| *email*         | the email-address                                                        |
+| *name*          | the name (or *none*)                                                       |
+| *display*       | the combination name and e-mail address for display purposes             |
+| *last-seen*     | date of most recent message with this contact (Unix time)                |
+| *last-seen-iso* | *last-seen* represented as an ISO-8601 timestamp                           |
+| *personal*      | whether the email was seen in a message together with a personal address |
+| *frequency*     | approximation of the number of times this contact was seen in messages   |
 
 The JSON format is useful for further processing, e.g. using the *jq(1)* tool:
 
--- a/man/mu-easy.7.org
+++ b/man/mu-easy.7.org
@@ -3,7 +3,7 @@
 
 * NAME
 
-mu easy - a quick introduction to mu
+mu_easy - a quick introduction to mu
 
 * DESCRIPTION
 
@@ -105,8 +105,8 @@
 This is the same message found before, only with some different fields
 displayed.
 
-By default, *mu* uses the logical ~AND~ for the search parameters -- that is, it
-displays messages that match all the parameters. However, we can use logical ~OR~
+By default, *mu* uses the logical *AND* for the search parameters -- that is, it
+displays messages that match all the parameters. However, we can use logical *OR*
 as well:
 
 #+begin_example
@@ -122,8 +122,8 @@
 #+end_example
 
 What if we want to see some of the body of the message? You can get a 'summary'
-of the first lines of the message using the =--summary-len= option, which will
-'summarize' the first =n= lines of the message:
+of the first lines of the message using the =--summary-len= option, which
+will 'summarize' the first =n= lines of the message:
 
 #+begin_example
 $ mu find --summary-len=3 napoleon m:/archive
@@ -140,7 +140,7 @@
 whitespace removed.
 
 Also note the *m:/archive* parameter in the query. This means that we only match
-messages in a maildir called ~'/archive'~.
+messages in a maildir called *'/archive'*.
 
 * MORE QUERIES
 
--- a/man/mu-extract.1.org
+++ b/man/mu-extract.1.org
@@ -3,7 +3,7 @@
 
 * NAME
 
-*mu extract* is the *mu* command to display and save message parts
+*mu_extract* - display and save message parts
 (attachments), and open them with other tools.
 
 * SYNOPSIS
@@ -52,7 +52,7 @@
 allowed.
 
 ** -u,--uncooked
-by default, ~mu~ transforms the attachment filenames a bit (such as by replacing
+by default, *mu* transforms the attachment filenames a bit (such as by replacing
 spaces by dashes); with this option, leave that to the minimum for creating
 a legal filename in the target directory.
 
--- a/man/mu-find.1.org
+++ b/man/mu-find.1.org
@@ -3,7 +3,7 @@
 
 * NAME
 
-*mu find* - find e-mail messages in the *mu* database.
+*mu_find* - find e-mail messages in the *mu* database.
 
 * SYNOPSIS
 
@@ -48,8 +48,8 @@
 and not here, as they apply to multiple mu-commands.
 
 The *find*-command has various options that influence the way *mu* displays the
-results. If you don't specify anything, the defaults are ~fields="d f s"~,
-~--sortfield=date~ and ~--reverse~.
+results. If you don't specify anything, the defaults are *fields="d f s"*,
+*--sortfield=date* and *--reverse*.
 
 ** -f, --fields=<fields>
 specifies a string that determines which fields are shown in the output. This
@@ -86,8 +86,9 @@
 output string, while an encrypted new message would have 'nx'.
 
 ** -s, --sortfield=<field> and -z,--reverse
-specify the field to sort the search results by and the direction (i.e.,
-'reverse' means that the sort should be reverted - Z-A). Examples include:
+specify the field to sort the search results by and the direction
+(i.e., 'reverse' means that the sort should be reverted - Z-A). Examples
+include:
 
 #+begin_example
 	cc,c            Cc (carbon-copy) recipient(s)
@@ -134,11 +135,11 @@
   meant for for debugging purposes.
 
 ** --linksdir=<dir> and -c, --clearlinks
-when using ~-format=links~, output the results as a maildir with symbolic links to
+when using *-format=links*, output the results as a maildir with symbolic links to
 the found messages. This enables easy integration with mail-clients (see below
 for more information). *mu* will create the maildir if it does not exist yet.
 
-If you specify ~--clearlinks~, existing symlinks will be cleared from the target
+If you specify *--clearlinks*, existing symlinks will be cleared from the target
 directories; this allows for re-use of the same maildir. However, this option
 will delete any symlink it finds, so be careful.
 
@@ -165,7 +166,7 @@
 This is assuming the GNU *date* command.
 
 ** --exec=<command>
-the ~--exec~ coption causes the =command= to be executed on each matched message;
+the *--exec* coption causes the =command= to be executed on each matched message;
 for example, to see the raw text of all messages matching 'milkshake', you could
 use:
 #+begin_example
--- a/man/muhome.inc
+++ b/man/muhome.inc
@@ -1,10 +1,10 @@
 ** --muhome
 use a non-default directory to store and read the database, write the logs, etc.
-By default, ~mu~ uses the XDG Base Directory Specification (e.g. on GNU/Linux this
-defaults to =~/.cache/mu= and =~/.config/mu=). Earlier versions of ~mu~ defaulted to
+By default, *mu* uses the XDG Base Directory Specification (e.g. on GNU/Linux this
+defaults to =~/.cache/mu= and =~/.config/mu=). Earlier versions of *mu* defaulted to
 =~/.mu=, which now requires =--muhome=~/.mu=.
 
-The environment variable ~MUHOME~ can be used as an alternative to ~--muhome~. The
+The environment variable *MUHOME* can be used as an alternative to *--muhome*. The
 latter has precedence.
 
 # Local Variables:
--- a/man/mu-index.1.org
+++ b/man/mu-index.1.org
@@ -3,7 +3,7 @@
 
 * NAME
 
-*mu index* -- index e-mail messages stored in Maildirs
+*mu_index* -- index e-mail messages stored in Maildirs
 
 * SYNOPSIS
 
@@ -53,7 +53,7 @@
 
 The optional 'phase two' of the indexing-process is the removal of messages from
 the database for which there is no longer a corresponding file in the Maildir.
-If you do not want this, you can use ~-n~, ~--nocleanup~.
+If you do not want this, you can use *-n*, *--nocleanup*.
 
 When *mu index* catches one of the signals *SIGINT*, *SIGHUP* or *SIGTERM* (e.g., when
 you press Ctrl-C during the indexing process), it attempts to shutdown
@@ -69,7 +69,7 @@
 indexing run. This is much faster than the non-lazy check, but won't update
 messages that have change (rather than having been added or removed), since
 merely editing a message does not update the directory time-stamp. Of course,
-you can run *mu-index* occasionally without ~--lazy-check~, to pick up such
+you can run *mu-index* occasionally without *--lazy-check*, to pick up such
 messages.
 
 ** --nocleanup
--- a/man/mu-info.1.org
+++ b/man/mu-info.1.org
@@ -3,7 +3,7 @@
 
 * NAME
 
-~mu info~  - show information about the mu database
+*mu_info*  - show information about the mu database
 
 * SYNOPSIS
 
@@ -11,8 +11,8 @@
 
 * DESCRIPTION
 
-~mu info~ is the ~mu~ command for getting information about the mu database. Note
-that while running (e.g. ~mu4e~), some of the information may be slightly delayed
+*mu info* is the *mu* command for getting information about the mu database. Note
+that while running (e.g. *mu4e*), some of the information may be slightly delayed
 due to database caching.
 
 #+include: "common-options.inc" :minlevel 1
--- a/man/mu-init.1.org
+++ b/man/mu-init.1.org
@@ -3,7 +3,7 @@
 
 * NAME
 
-mu init -- initialize the mu message database
+mu_init -- initialize the mu message database
 
 * SYNOPSIS
 
@@ -38,7 +38,7 @@
 
 reinitialize the database from an earlier version; that is, create a new
 empty database witht the existing settings. This cannot be combined
-with the other ~init~ options.
+with the other *init* options.
 
 #+include: "exit-code.inc" :minlevel 1
 
--- a/man/mu-server.1.org
+++ b/man/mu-server.1.org
@@ -3,7 +3,7 @@
 
 * NAME
 
-mu server - the mu backend for the mu4e e-mail client
+mu_server - the mu backend for the mu4e e-mail client
 
 * SYNOPSIS
 
@@ -54,7 +54,7 @@
 
 ** --commands
 
-List available commands (and try with ~--verbose~)
+List available commands (and try with *--verbose*)
 
 ** --eval <expression>
 
--- a/man/mu-query.7.org
+++ b/man/mu-query.7.org
@@ -3,7 +3,7 @@
 
 * NAME
 
-mu query language -- a language for finding messages in *mu* databases.
+mu_query - a language for finding messages in *mu* databases.
 
 * DESCRIPTION
 
@@ -24,9 +24,9 @@
 
 * TERMS
 
-The basic building blocks of a query are *terms*; these are just normal words like
-'banana' or 'hello', or words prefixed with a field-name which make them apply
-to just that field. See *mu find* for all the available fields.
+The basic building blocks of a query are *terms*; these are just normal words
+like 'banana' or 'hello', or words prefixed with a field-name which make them
+apply to just that field. See *mu find* for all the available fields.
 
 Some example queries:
 #+begin_example
@@ -168,9 +168,9 @@
 
 Dates are expressed in local time and using ISO-8601 format (YYYY-MM-DD
 HH:MM:SS); you can leave out the right part, and *mu* adds the rest, depending on
-whether this is the beginning or end of the range (e.g., as a lower bound,
-'2015' would be interpreted as the start of that year; as an upper bound as the
-end of the year).
+whether this is the beginning or end of the range (e.g., as a lower
+bound, '2015' would be interpreted as the start of that year; as an upper bound
+as the end of the year).
 
 You can use '/' , '.', '-' and 'T' to make dates more human readable.
 
--- a/man/mu-view.1.org
+++ b/man/mu-view.1.org
@@ -3,7 +3,7 @@
 
 * NAME
 
-mu view - display an e-mail message file
+mu_view - display an e-mail message file
 
 * SYNOPSIS
 
--- a/man/mu-fields.1.org
+++ b/man/mu-fields.1.org
@@ -4,7 +4,7 @@
 
 * NAME
 
-*mu fields* - list all message fields
+*mu_fields* - list all message fields
 
 * SYNOPSIS
 
--- a/man/mu-help.1.org
+++ b/man/mu-help.1.org
@@ -3,7 +3,7 @@
 
 * NAME
 
-*mu help* is a *mu* command that gives help information about mu commands.
+*mu_help* - show help information about mu commands.
 
 * SYNOPSIS
 
--- a/man/mu-mkdir.1.org
+++ b/man/mu-mkdir.1.org
@@ -3,7 +3,7 @@
 
 * NAME
 
-*mu mkdir* - create a new Maildir
+*mu_mkdir* - create a new Maildir
 
 * SYNOPSIS
 
@@ -12,7 +12,7 @@
 * DESCRIPTION
 
 *mu mkdir* is the command for creating Maildirs as per *maildir(5)*. A maildir is a
-a directory with subdirectories ~new~, ~cur~ and ~tmp~.
+a directory with subdirectories *new*, *cur* and *tmp*.
 
 The command require or use the mu database.
 
--- a/man/mu-remove.1.org
+++ b/man/mu-remove.1.org
@@ -4,7 +4,7 @@
 
 * NAME
 
-*mu remove* - command to remove messages from the database.
+*mu_remove* - remove messages from the database.
 
 * SYNOPSIS
 
--- a/man/mu-verify.1.org
+++ b/man/mu-verify.1.org
@@ -3,7 +3,7 @@
 
 * NAME
 
-mu verify - verify message signatures and display information about them
+mu_verify - verify message signatures and display information about them
 
 * SYNOPSIS
 
--- a/man/copyright.inc.in
+++ b/man/copyright.inc.in
@@ -1,6 +1,6 @@
 * COPYRIGHT
 
-This manpage is part of ~mu~ @VERSION@.
+This manpage is part of *mu* @VERSION@.
 
 Copyright © 2022-@YEAR@ Dirk-Jan C. Binnema. License GPLv3+: GNU GPL version 3
 or later <https://gnu.org/licenses/gpl.html>. This is free software: you are
