Fix hyphens in manpages. Closes #1937

diff --git a/doc/dotlock.man b/doc/dotlock.man
index 4d3256deb2a520570c37aac9ffd1f50c1645dbfa..02d43dea4fc982e8963deec08ab36a1bcfe8f49e 100644 (file)
--- a/doc/dotlock.man
+++ b/doc/dotlock.man
@@ -24,7 +24,7 @@ mutt_dotlock \- Lock mail spool files.
 .SH SYNOPSIS
 .PP
 .B mutt_dotlock 
-[-t|-f|-u|-d] [-p] [-r \fIretries\fP] \fIfile\fP
+[\-t|\-f|\-u|\-d] [\-p] [\-r \fIretries\fP] \fIfile\fP
 .SH DESCRIPTION
 .PP
 .B mutt_dotlock

diff --git a/doc/makedoc.c b/doc/makedoc.c
index a79cc720713b56b17441d9e0b154bc6a278d1e44..07d3405019e7ffedff8a56af6583e0d1c8ed207e 100644 (file)
--- a/doc/makedoc.c
+++ b/doc/makedoc.c
@@ -576,6 +576,8 @@ static void man_print_strval (const char *v, FILE *out)
       fputs ("\\(rq", out);
     else if (*v == '\\')
       fputs ("\\\\", out);
+    else if (*v == '-')
+      fputs ("\\-", out);
     else
       fputc (*v, out);
   }
@@ -697,8 +699,11 @@ static void print_confline (const char *varname, int type, const char *val, FILE
        man_print_strval (val, out);
        fputs ("\\(rq\n", out);
       }
-      else
-       fprintf (out, "Default: %s\n", val);
+      else {
+       fputs ("Default: ", out);
+       man_print_strval (val, out);
+       fputs ("\n", out);
+      }
 
       fputs (".fi", out);
 
@@ -1040,6 +1045,8 @@ static int print_it (int special, char *str, FILE *out, int docstat)
                fputs ("\\(rq", out);
              else if (*str == '\\')
                fputs ("\\\\", out);
+              else if (*str == '-')
+                fputs ("\\-", out);
              else if (!strncmp (str, "``", 2))
              {
                fputs ("\\(lq", out);

diff --git a/doc/mbox.man b/doc/mbox.man
index 1980d0d41306056815077fc3f3473af4e2a5ae7e..09eaf91f0ee581c424130935cceca569cc084355 100644 (file)
--- a/doc/mbox.man
+++ b/doc/mbox.man
@@ -60,15 +60,15 @@ line; the second (\fBMBOXRD\fP) also quotes already quoted "From "
 lines by prepending a '>' (i.e. ">From ", ">>From ", ...). The later
 has the advantage that lines like
 .IP "" 1
->From the command line you can use the '-p' option
+>From the command line you can use the '\-p' option
 .PP
 aren't dequoted wrongly as a \fBMBOXRD\fP-MDA would turn the line
 into
 .IP "" 1
->>From the command line you can use the '-p' option
+>>From the command line you can use the '\-p' option
 .PP
 before storing it. Besides \fBMBOXO\fP and \fBMBOXRD\fP there is also
-\fBMBOXCL\fP which is \fBMBOXO\fP with a "Content-Length:"-field with the
+\fBMBOXCL\fP which is \fBMBOXO\fP with a "Content-Length:"\-field with the
 number of bytes in the message body; some MUAs (like
 .BR mutt (1))
 do automatically transform \fBMBOXO\fP mailboxes into \fBMBOXCL\fP ones when

diff --git a/doc/mmdf.man b/doc/mmdf.man
index fb7b9f0000a41d68b40bead69b9dffee45224f7c..e14d72b53d5550ff05080d1dba13905fedbab693 100644 (file)
--- a/doc/mmdf.man
+++ b/doc/mmdf.man
@@ -42,7 +42,6 @@ Subject: test
 .br
 >From what I learned about the MMDF-format:
 .br
-...
 .br
 ^A^A^A^A
 .br
@@ -65,7 +64,7 @@ bar
 In contrast to most other single file mailbox formats like
 MBOXO and MBOXRD (see
 .BR mbox (5))
-there is no need to quote/dequote "From "-lines in
+there is no need to quote/dequote "From "\-lines in
 .B MMDF
 mailboxes as such lines have no special meaning in this format.
 .PP

diff --git a/doc/mutt.man b/doc/mutt.man
index e3b2bbec0b1fe0d4b474d604c267852f5bd6bd05..18ad76a0d184974227c4b9e0ff0614b03b68311f 100644 (file)
--- a/doc/mutt.man
+++ b/doc/mutt.man
@@ -24,39 +24,39 @@ mutt \- The Mutt Mail User Agent
 .PP
 .B mutt
 [-nRyzZ] 
-[-e \fIcmd\fP] [-F \fIfile\fP] [-m \fItype\fP] [-f \fIfile\fP]
+[\-e \fIcmd\fP] [\-F \fIfile\fP] [\-m \fItype\fP] [\-f \fIfile\fP]
 .PP
 .B mutt 
-[-nx] 
-[-e \fIcmd\fP] 
-[-F \fIfile\fP]
-[-H \fIfile\fP]
-[-i \fIfile\fP]
-[-s \fIsubj\fP]
-[-b \fIaddr\fP]
-[-c \fIaddr\fP]
+[\-nx] 
+[\-e \fIcmd\fP] 
+[\-F \fIfile\fP]
+[\-H \fIfile\fP]
+[\-i \fIfile\fP]
+[\-s \fIsubj\fP]
+[\-b \fIaddr\fP]
+[\-c \fIaddr\fP]
 [\-a \fIfile\fP [...] \-\-]
 \fIaddr\fP [...]
 .PP
 .B mutt 
-[-nx] 
-[-e \fIcmd\fP] 
-[-F \fIfile\fP]
-[-s \fIsubj\fP]
-[-b \fIaddr\fP]
-[-c \fIaddr\fP]
+[\-nx] 
+[\-e \fIcmd\fP] 
+[\-F \fIfile\fP]
+[\-s \fIsubj\fP]
+[\-b \fIaddr\fP]
+[\-c \fIaddr\fP]
 [\-a \fIfile\fP [...] \-\-]
 \fIaddr\fP [...]
 < message
 .PP
 .B mutt
-[-n] [-e \fIcmd\fP] [-F \fIfile\fP] -p
+[\-n] [\-e \fIcmd\fP] [\-F \fIfile\fP] \-p
 .PP
 .B mutt
-[-n] [-e \fIcmd\fP] [-F \fIfile\fP] -A \fIalias\fP
+[\-n] [\-e \fIcmd\fP] [\-F \fIfile\fP] \-A \fIalias\fP
 .PP
 .B mutt
-[-n] [-e \fIcmd\fP] [-F \fIfile\fP] -Q \fIquery\fP
+[\-n] [\-e \fIcmd\fP] [\-F \fIfile\fP] \-Q \fIquery\fP
 .PP
 .B mutt 
 -v[v]
@@ -132,12 +132,12 @@ Emulate the mailx compose mode.
 Start Mutt with a listing of all mailboxes specified by the \fImailboxes\fP
 command.
 .IP "-z"
-When used with -f, causes Mutt not to start if there are no messages in the
+When used with \-f, causes Mutt not to start if there are no messages in the
 mailbox.
 .IP "-Z"
 Causes Mutt to open the first mailbox specified by the \fImailboxes\fP
 command which contains new mail.
-.IP "\-\-"
+.IP "--"
 Treat remaining arguments as \fIaddr\fP even if they start with a dash.
 See also "\-a" above.
 .SH ENVIRONMENT

diff --git a/init.h b/init.h
index b916d21f5c110fb37964eb0a6031e67d8b1e19d1..b3ed426f3fe5923860a5e696ecb6f388e9ec21a6 100644 (file)
--- a/init.h
+++ b/init.h
@@ -2786,7 +2786,7 @@ struct option_t MuttVars[] = {
   ** smtp[s]://[user[:pass]@]host[:port]/
   ** .te
   ** .pp
-  ** ... where ``[...]'' denotes an optional part.
+  ** where ``[...]'' denotes an optional part.
   ** Setting this variable overrides the value of the $$sendmail
   ** variable.
   */