Use | between equivalent options in manual

Also only use \- for the first one in long options. This lets the
auto-tagger do a good job.

1 files changed, 16 insertions, 16 deletions

diff --git a/git-fetch-email.1 b/git-fetch-email.1
index fcf2ed5..23ccb80 100644
--- a/git-fetch-email.1
+++ b/git-fetch-email.1
@@ -39,24 +39,24 @@ It fetches patches to be applied with
 .Pp
 The arguments are as follows:
 .Bl -tag -width Ds
-.It Fl C Ar cc , Fl \-cc Ns = Ns Ar cc , Fl \-no\-cc
+.It Fl C Ar cc | Fl \-cc Ns = Ns Ar cc | Fl \-no-cc
 Fetch patches with matching
 .Cm Cc
 headers.
 The default is the value of
 .Cm fetchemail.cc .
 .
-.It Fl F Ar from , Fl \-from Ns = Ns Ar from , Fl \-no\-from
+.It Fl F Ar from | Fl \-from Ns = Ns Ar from | Fl \-no-from
 Fetch patches with matching
 .Cm From
 headers.
 The default is the value of
 .Cm fetchemail.from .
 .
-.It Fl H , Fl \-headers
+.It Fl H | Fl \-headers
 Fetch only patch headers.
 .
-.It Fl M Ar mailbox , Fl \-move\-to Ns = Ns Ar mailbox , Fl \-no\-move\-to
+.It Fl M Ar mailbox | Fl \-move-to Ns = Ns Ar mailbox | Fl \-no-move-to
 Move matching patches to
 .Ar mailbox .
 With
@@ -67,7 +67,7 @@ is successful.
 The default is the value of
 .Cm fetchemail.moveTo .
 .
-.It Fl S Ar subject, Fl \-subject Ns = Ns Ar subject , Fl \-no\-subject
+.It Fl S Ar subject | Fl \-subject Ns = Ns Ar subject | Fl \-no-subject
 Fetch patches with matching
 .Cm Subject
 headers.
@@ -76,23 +76,23 @@ The default is the value of
 or
 .Ql [PATCH .
 .
-.It Fl T Ar to , Fl \-to Ns = Ns Ar to , Fl \-no\-to
+.It Fl T Ar to | Fl \-to Ns = Ns Ar to | Fl \-no-to
 Fetch patches with matching
 .Cm To
 headers.
 The default is the value of
 .Cm fetchemail.to .
 .
-.It Fl U , Fl \-unseen , Fl \-no-unseen
+.It Fl U | Fl \-unseen | Fl \-no-unseen
 Fetch only patches which are unseen.
 The default is the value of
 .Cm fetchemail.unseen .
 .
-.It Fl a , Fl \-apply
+.It Fl a | Fl \-apply
 Apply patches with
 .Xr git-am 1 .
 The arguments
-.Fl \-patch\-format Ns = Ns mboxrd
+.Fl \-patch-format Ns = Ns mboxrd
 are passed to
 .Xr git-am 1
 along with any arguments following
@@ -100,7 +100,7 @@ along with any arguments following
 passed to
 .Nm .
 .
-.It Fl h Ar host , Fl \-host Ns = Ns Ar host
+.It Fl h Ar host | Fl \-host Ns = Ns Ar host
 Connect to IMAP on
 .Ar host .
 The default is the value of
@@ -108,18 +108,18 @@ The default is the value of
 or as inferred by
 .Xr imbox 1 .
 .
-.It Fl i , Fl \-idle
+.It Fl i | Fl \-idle
 Wait for matching patches
 using IMAP IDLE.
 .
-.It Fl m Ar mailbox , Fl \-mailbox Ns = Ns Ar mailbox
+.It Fl m Ar mailbox | Fl \-mailbox Ns = Ns Ar mailbox
 Fetch patches from
 .Ar mailbox .
 The default is the value of
 .Cm fetchemail.imapMailbox ,
 or INBOX.
 .
-.It Fl p Ar port , Fl \-port Ns = Ns Ar port
+.It Fl p Ar port | Fl \-port Ns = Ns Ar port
 Connect to IMAP on
 .Ar port .
 The default is the value of
@@ -127,7 +127,7 @@ The default is the value of
 or as inferred by
 .Xr imbox 1 .
 .
-.It Fl s , Fl \-mark\-seen , Fl \-no\-mark\-seen
+.It Fl s | Fl \-mark-seen | Fl \-no-mark-seen
 Mark matching patches as seen.
 With
 .Fl \-apply ,
@@ -137,13 +137,13 @@ is successful.
 The default is the value of
 .Cm fetchemail.markSeen .
 .
-.It Fl u Ar user , Fl \-user Ns = Ns Ar user
+.It Fl u Ar user | Fl \-user Ns = Ns Ar user
 Log in to IMAP as
 .Ar user .
 The default is the value of
 .Cm fetchemail.imapUser .
 .
-.It Fl v , Fl \-verbose
+.It Fl v | Fl \-verbose
 Log IMAP protocol to standard error.
 .El
 .