sup 1.2 → 1.3

data/lib/sup/modes/edit_message_mode.rb

@@ -563,7 +563,7 @@ protected
     ## there are attachments, so wrap body in an attachment of its own
     unless @attachments.empty?
       body_m = m
-      body_m.header["Content-Disposition"] = "inline"
+      body_m.header["Content-Disposition"] = +"inline"
       m = RMail::Message.new
 
       m.add_part body_m
@@ -601,8 +601,8 @@ protected
     m.header["Date"] = date.rfc2822
     m.header["Message-Id"] = @message_id
     m.header["User-Agent"] = "Sup/#{Redwood::VERSION}"
-    m.header["Content-Transfer-Encoding"] ||= '8bit'
-    m.header["MIME-Version"] = "1.0" if m.multipart?
+    m.header["Content-Transfer-Encoding"] ||= +"8bit"
+    m.header["MIME-Version"] = +"1.0" if m.multipart?
     m
   end
 
@@ -716,10 +716,10 @@ private
     ## encode to quoted-printable for all text/* MIME types,
     ## use base64 otherwise
     if msg_part.header["Content-Type"] =~ /text\/.*/
-      msg_part.header["Content-Transfer-Encoding"] = 'quoted-printable'
+      msg_part.header.set "Content-Transfer-Encoding", +"quoted-printable"
       msg_part.body = [msg_part.body].pack('M')
     else
-      msg_part.header["Content-Transfer-Encoding"] = 'base64'
+      msg_part.header.set "Content-Transfer-Encoding", +"base64"
       msg_part.body = [msg_part.body].pack('m')
     end
     msg_part

data/lib/sup/util.rb

@@ -80,7 +80,14 @@ module RMail
     def self.make_file_attachment fn
       bfn = File.basename fn
       t = MIME::Types.type_for(bfn).first || MIME::Types.type_for("exe").first
-      make_attachment IO.read(fn), t.content_type, t.encoding, bfn.to_s
+      payload = IO.read fn
+      ## Need to encode as base64 or quoted-printable if any lines are longer than 998 chars.
+      encoding = if t.encoding != t.default_encoding and payload.each_line.any? { |l| l.length > 998 }
+        t.default_encoding
+      else
+        t.encoding
+      end
+      make_attachment payload, t.content_type, encoding, bfn.to_s
     end
 
     def charset
@@ -206,7 +213,7 @@ class String
   end
 
   def slice_by_display_length len
-    each_char.each_with_object "" do |c, buffer|
+    each_char.each_with_object (+"") do |c, buffer|
       len -= Unicode::DisplayWidth.of(c)
       return buffer if len < 0
       buffer << c

data/lib/sup/version.rb

@@ -8,5 +8,5 @@ def git_suffix
 end
 
 module Redwood
-  VERSION = "1.2"
+  VERSION = "1.3"
 end

data/man/sup-add.1

@@ -1,10 +1,10 @@
-.\" Automatically generated by Pandoc 3.1.9
+.\" Automatically generated by Pandoc 3.1.11.1
 .\"
-.TH "SUP-ADD" "1" "April 9, 2012" "Sup User Manual" ""
+.TH "SUP\-ADD" "1" "April 9, 2012" "Sup User Manual" ""
 .SH NAME
-sup-add - add a source to the Sup source list
+sup\-add \- add a source to the Sup source list
 .SH SYNOPSIS
-sup-add [\f[I]options\f[R]] [\f[I]source uri\&...\f[R]]
+sup\-add [\f[I]options\f[R]] [\f[I]source uri\&...\f[R]]
 .SH DESCRIPTION
 Add one ore more sources to the Sup source list
 .PP
@@ -25,33 +25,33 @@ maildir://<path to Maildir directory>
 .EE
 .SH OPTIONS
 .TP
--a, --archive
+\-a, \-\-archive
 Automatically archive all new messages from thesesources.
 .TP
--u, --unusual
+\-u, \-\-unusual
 Do not automatically poll these sources for new messages.
 .TP
--l \f[I]STRING\f[R], --labels \f[I]STRING\f[R]
-A comma-separated set of labels to apply to all messages from this
+\-l \f[I]STRING\f[R], \-\-labels \f[I]STRING\f[R]
+A comma\-separated set of labels to apply to all messages from this
 source
 .TP
--f, --force-new
+\-f, \-\-force\-new
 Create a new account for this source, even if one already exists
 .TP
--o \f[I]STRING\f[R], --force-account \f[I]STRING\f[R]
+\-o \f[I]STRING\f[R], \-\-force\-account \f[I]STRING\f[R]
 Reuse previously defined account user\[at]hostname
 .TP
--v, --version
+\-v, \-\-version
 Print version and exit
 .TP
--h, --help
+\-h, \-\-help
 Show help message
 .SH FILES
 .TP
 $HOME/.sup/sources.yaml
 Configuration file for Sup mail sources
 .SH SEE ALSO
-sup(1), sup-config(1)
+sup(1), sup\-config(1)
 .SH REPORTING BUGS
 You are welcome to submit bug reports to the Sup issue tracker, located
 at
@@ -87,11 +87,11 @@ Archives: \c
 .UE \c
 .RE
 .SH COPYRIGHT
-Copyright © 2006-2009 William Morgan \c
+Copyright © 2006\-2009 William Morgan \c
 .MT mworgan-sup@masanjin.net
 .ME \c
 .PP
-Copyright \[at] 2013-2014 Sup developers
+Copyright \[at] 2013\-2014 Sup developers
 .PP
 Permission is granted to copy and distribute this manual under the terms
 of the GNU General Public License; either version 2 or (at your option)

data/man/sup-config.1

@@ -1,19 +1,19 @@
-.\" Automatically generated by Pandoc 3.1.9
+.\" Automatically generated by Pandoc 3.1.11.1
 .\"
-.TH "SUP-CONFIG" "1" "April 9, 2012" "Sup User Manual" ""
+.TH "SUP\-CONFIG" "1" "April 9, 2012" "Sup User Manual" ""
 .SH NAME
-sup-config - interactive configuration tool for Sup
+sup\-config \- interactive configuration tool for Sup
 .SH SYNOPSIS
-sup-config [\f[I]options\f[R]]
+sup\-config [\f[I]options\f[R]]
 .SH DESCRIPTION
 Interactive configuration tool for Sup.
 Won\[cq]t destroy existing configuration.
 .SH OPTIONS
 .TP
--v, --version
+\-v, \-\-version
 Print versian and exit
 .TP
--h, --help
+\-h, \-\-help
 Show help message
 .SH FILES
 .TP
@@ -23,7 +23,7 @@ Configuration file for Sup
 $HOME/.sup/sources.yaml
 Configuration file for Sup mail sources
 .SH SEE ALSO
-sup(1), sup-add(1)
+sup(1), sup\-add(1)
 .SH REPORTING BUGS
 You are welcome to submit bug reports to the Sup issue tracker, located
 at
@@ -59,11 +59,11 @@ Archives: \c
 .UE \c
 .RE
 .SH COPYRIGHT
-Copyright © 2006-2009 William Morgan \c
+Copyright © 2006\-2009 William Morgan \c
 .MT mworgan-sup@masanjin.net
 .ME \c
 .PP
-Copyright \[at] 2013-2014 Sup developers
+Copyright \[at] 2013\-2014 Sup developers
 .PP
 Permission is granted to copy and distribute this manual under the terms
 of the GNU General Public License; either version 2 or (at your option)

data/man/sup-dump.1

@@ -1,37 +1,38 @@
-.\" Automatically generated by Pandoc 3.1.9
+.\" Automatically generated by Pandoc 3.1.11.1
 .\"
-.TH "SUP-DUMP" "1" "April 9, 2012" "Sup User Manual" ""
+.TH "SUP\-DUMP" "1" "April 9, 2012" "Sup User Manual" ""
 .SH NAME
-sup-dump - dumps message state from Sup index
+sup\-dump \- dumps message state from Sup index
 .SH SYNOPSIS
-sup-dump [\f[I]options\f[R]]
+sup\-dump [\f[I]options\f[R]]
 .SH DESCRIPTION
 Dumps all message state from the Sup index to standard out.
-You can later use sup-sync --restored --restore  to recover the index.
+You can later use sup\-sync \-\-restored \-\-restore  to recover the
+index.
 .PP
 This tool is primarily useful in the event that a Sup upgrade breaks
 index format compatibility.
 .SH OPTIONS
 .TP
--v, --version
+\-v, \-\-version
 Print version and exit
 .TP
--h, --help
+\-h, \-\-help
 Show help message
 .SH EXAMPLES
 Dump message state and store in file
 .IP
 .EX
-sup-dump > filename
+sup\-dump > filename
 .EE
 .PP
 Dump message state and compress output to store in file
 .IP
 .EX
-sup-dump | bzip2 > filename.bz2
+sup\-dump | bzip2 > filename.bz2
 .EE
 .SH SEE ALSO
-sup(1), sup-sync(1), sup-import-dump(1)
+sup(1), sup\-sync(1), sup\-import\-dump(1)
 .SH REPORTING BUGS
 You are welcome to submit bug reports to the Sup issue tracker, located
 at
@@ -67,11 +68,11 @@ Archives: \c
 .UE \c
 .RE
 .SH COPYRIGHT
-Copyright © 2006-2009 William Morgan \c
+Copyright © 2006\-2009 William Morgan \c
 .MT mworgan-sup@masanjin.net
 .ME \c
 .PP
-Copyright \[at] 2013-2014 Sup developers
+Copyright \[at] 2013\-2014 Sup developers
 .PP
 Permission is granted to copy and distribute this manual under the terms
 of the GNU General Public License; either version 2 or (at your option)

data/man/sup-import-dump.1

@@ -1,45 +1,45 @@
-.\" Automatically generated by Pandoc 3.1.9
+.\" Automatically generated by Pandoc 3.1.11.1
 .\"
-.TH "SUP-IMPORT-DUMP" "1" "April 9, 2012" "Sup User Manual" ""
+.TH "SUP\-IMPORT\-DUMP" "1" "April 9, 2012" "Sup User Manual" ""
 .SH NAME
-sup-import-dump - import message state dump to Sup index
+sup\-import\-dump \- import message state dump to Sup index
 .SH SYNOPSIS
-sup-import-dump [\f[I]options\f[R]] dumpfile
+sup\-import\-dump [\f[I]options\f[R]] dumpfile
 .SH DESCRIPTION
-Imports message state previously exported by sup-dump into the index.
-sup-import-dump operates on the index only, so the messages must have
-already been added using sup-sync.
-If you need to recreate the index, see sup-sync --restore  instead.
+Imports message state previously exported by sup\-dump into the index.
+sup\-import\-dump operates on the index only, so the messages must have
+already been added using sup\-sync.
+If you need to recreate the index, see sup\-sync \-\-restore  instead.
 .PP
 Messages not mentioned in the dump file will not be modified.
 .SH OPTIONS
 .TP
--v, --verbose
+\-v, \-\-verbose
 Print message ids as they\[cq]re processed
 .TP
--i, --ignore-missing
+\-i, \-\-ignore\-missing
 Silently skip over messages that are not in the index
 .TP
--w, --warn-missing
+\-w, \-\-warn\-missing
 Warn about messages that are not in the index, but continue
 .TP
--a, --abort-missing
+\-a, \-\-abort\-missing
 Abort on encountering messages that are not in the index (default)
 .TP
--t, --atomic
+\-t, \-\-atomic
 Use transaction to apply all changes atomically
 .TP
--n, --dry-run
+\-n, \-\-dry\-run
 Don\[cq]t actually modify the index.
-Probably only useful with --verbose
+Probably only useful with \-\-verbose
 .TP
---version
+\-\-version
 Show version information
 .TP
--h, --help
+\-h, \-\-help
 Show help message
 .SH SEE ALSO
-sup(1), sup-sync(1), sup-dump(1)
+sup(1), sup\-sync(1), sup\-dump(1)
 .SH REPORTING BUGS
 You are welcome to submit bug reports to the Sup issue tracker, located
 at
@@ -75,11 +75,11 @@ Archives: \c
 .UE \c
 .RE
 .SH COPYRIGHT
-Copyright © 2006-2009 William Morgan \c
+Copyright © 2006\-2009 William Morgan \c
 .MT mworgan-sup@masanjin.net
 .ME \c
 .PP
-Copyright \[at] 2013-2014 Sup developers
+Copyright \[at] 2013\-2014 Sup developers
 .PP
 Permission is granted to copy and distribute this manual under the terms
 of the GNU General Public License; either version 2 or (at your option)

data/man/sup-psych-ify-config-files.1

@@ -1,21 +1,21 @@
-.\" Automatically generated by Pandoc 3.1.9
+.\" Automatically generated by Pandoc 3.1.11.1
 .\"
-.TH "SUP-SYNC" "1" "September 3, 2014" "Sup User Manual" ""
+.TH "SUP\-SYNC" "1" "September 3, 2014" "Sup User Manual" ""
 .SH NAME
-sup-psych-ify-config-files - migrate Sup configuration
+sup\-psych\-ify\-config\-files \- migrate Sup configuration
 .SH SYNOPSIS
-sup-psych-ify-config-files
+sup\-psych\-ify\-config\-files
 .SH DESCRIPTION
 \f[B]YAML migration is deprecated by Ruby 2.1 and newer.\f[R]
 .PP
-If sup-psych-ify-config-files is executed by Ruby <= 2.0 it migrates the
-\f[I]$HOME/.sup/sources.yaml\f[R] configuration file by reading it with
-the SYCK YAML parser and emitting the results with the Psych YAML
+If sup\-psych\-ify\-config\-files is executed by Ruby <= 2.0 it migrates
+the \f[I]$HOME/.sup/sources.yaml\f[R] configuration file by reading it
+with the SYCK YAML parser and emitting the results with the Psych YAML
 emitter.
 .PP
 Read more on the Sup wiki
 .PP
-https://github.com/sup-heliotrope/sup/wiki/Migration-0.13-to-0.14
+https://github.com/sup\-heliotrope/sup/wiki/Migration\-0.13\-to\-0.14
 .SH FILES
 .TP
 $HOME/.sup/config.yaml
@@ -24,7 +24,7 @@ Sup configuration file
 $HOME/.sup/sources.yaml
 Configuration file for Sup mail sources
 .SH SEE ALSO
-sup(1), sup-add(1), sup-config(1), sup-dump(1)
+sup(1), sup\-add(1), sup\-config(1), sup\-dump(1)
 .SH REPORTING BUGS
 You are welcome to submit bug reports to the Sup issue tracker, located
 at
@@ -60,11 +60,11 @@ Archives: \c
 .UE \c
 .RE
 .SH COPYRIGHT
-Copyright © 2006-2009 William Morgan \c
+Copyright © 2006\-2009 William Morgan \c
 .MT mworgan-sup@masanjin.net
 .ME \c
 .PP
-Copyright \[at] 2013-2014 Sup developers
+Copyright \[at] 2013\-2014 Sup developers
 .PP
 Permission is granted to copy and distribute this manual under the terms
 of the GNU General Public License; either version 2 or (at your option)

data/man/sup-recover-sources.1

@@ -1,49 +1,49 @@
-.\" Automatically generated by Pandoc 3.1.9
+.\" Automatically generated by Pandoc 3.1.11.1
 .\"
-.TH "SUP-RECOVER-SOURCES" "1" "April 9, 2012" "Sup User Manual" ""
+.TH "SUP\-RECOVER\-SOURCES" "1" "April 9, 2012" "Sup User Manual" ""
 .SH NAME
-sup-recover-sources - rebuild a lost Sup source configuration file
+sup\-recover\-sources \- rebuild a lost Sup source configuration file
 .SH SYNOPSIS
-sup-recover-sources [\f[I]options\f[R]] [\f[I]source uri\&...\f[R]]
+sup\-recover\-sources [\f[I]options\f[R]] [\f[I]source uri\&...\f[R]]
 .SH DESCRIPTION
 Rebuilds a lost sources.yaml file by reading messages from a list of
 sources and determining, for each source, the most prevalent `source_id'
 field of messages from that source in the index.
 .PP
-The only non-deterministic component to this is that if the same message
-appears in multiple sources, those sources may be mis-diagnosed by this
-program.
+The only non\-deterministic component to this is that if the same
+message appears in multiple sources, those sources may be mis\-diagnosed
+by this program.
 .PP
-If the first N messages (--scan-num below) all have the same source_id
-in the index, the source will be added to sources.yaml.
+If the first N messages (\-\-scan\-num below) all have the same
+source_id in the index, the source will be added to sources.yaml.
 Otherwise, the distribution will be printed, and you will have to add it
 by hand.
 .PP
 The offset pointer into the sources will be set to the end of the
-source, so you will have to run sup-import --rebuild for each new source
-after doing this.
+source, so you will have to run sup\-import \-\-rebuild for each new
+source after doing this.
 .SH OPTIONS
 .TP
---unusual
+\-\-unusual
 Mark sources as `unusual'.
 Only usual sources will be polled by hand (default: false)
 .TP
---archive
+\-\-archive
 Mark sources as `archive'.
 New messages from these sources will not appear in the inbox (default:
 false)
 .TP
---scan-num N
+\-\-scan\-num N
 Number of messages to scan per source (default: 10)
 .TP
--h, --help
+\-h, \-\-help
 Show help message
 .SH FILES
 .TP
 $HOME/.sup/sources.yaml
 Configuration file for Sup mail sources
 .SH SEE ALSO
-sup(1), sup-config(1), sup-add(1), sup-import(1)
+sup(1), sup\-config(1), sup\-add(1), sup\-import(1)
 .SH REPORTING BUGS
 You are welcome to submit bug reports to the Sup issue tracker, located
 at
@@ -79,11 +79,11 @@ Archives: \c
 .UE \c
 .RE
 .SH COPYRIGHT
-Copyright © 2006-2009 William Morgan \c
+Copyright © 2006\-2009 William Morgan \c
 .MT mworgan-sup@masanjin.net
 .ME \c
 .PP
-Copyright \[at] 2013-2014 Sup developers
+Copyright \[at] 2013\-2014 Sup developers
 .PP
 Permission is granted to copy and distribute this manual under the terms
 of the GNU General Public License; either version 2 or (at your option)

data/man/sup-sync-back-maildir.1

@@ -1,24 +1,25 @@
-.\" Automatically generated by Pandoc 3.1.9
+.\" Automatically generated by Pandoc 3.1.11.1
 .\"
-.TH "SUP-SYNC-BACK-MAILDIR" "1" "August 25, 2014" "Sup User Manual" ""
+.TH "SUP\-SYNC\-BACK\-MAILDIR" "1" "August 25, 2014" "Sup User Manual" ""
 .SH NAME
-sup-sync-back-maildir - Export Xapian entries to Maildir sources on disk
+sup\-sync\-back\-maildir \- Export Xapian entries to Maildir sources on
+disk
 .SH SYNOPSIS
-sup-sync-back-maildir [\f[I]options\f[R]] [\f[I]source uri\&...\f[R]]
+sup\-sync\-back\-maildir [\f[I]options\f[R]] [\f[I]source uri\&...\f[R]]
 .SH DESCRIPTION
 This script parses the Xapian entries for a given Maildir source and
-renames (changes maildir flags) e-mail files on disk according to the
+renames (changes maildir flags) e\-mail files on disk according to the
 labels stored in the index.
 It will export all the changes you made in Sup to your Maildirs so that
 they can be propagated to your IMAP server with e.g.\ offlineimap.
 .PP
 The script also merges some Maildir flags into Sup such as R (replied)
-and P (passed, forwarded), for instance suppose you have an e-mail file
+and P (passed, forwarded), for instance suppose you have an e\-mail file
 like this: foo_bar:2,FRS (flags are favorite, replied, seen) and its
 Xapian entry has labels `starred', the merge operation will add the
 `replied' label to the Xapian entry.
 .PP
-If you choose not to merge (-m) you will lose information (`replied'),
+If you choose not to merge (\-m) you will lose information (`replied'),
 and in the previous example the file will be renamed to foo_bar:2,FS.
 .PP
 Running this script is \f[I]strongly\f[R] recommended when setting the
@@ -31,30 +32,30 @@ sources marked as usual and that have not disabled sync back using the
 configuration parameter sync_back = false in sources.yaml.
 .SH OPTIONS
 .TP
--n, --no-confirm
+\-n, \-\-no\-confirm
 Don\[cq]t ask for confirmation before synchronizing
 .TP
--m, --no-merge
+\-m, \-\-no\-merge
 Don\[cq]t merge new supported Maildir flags (R and P)
 .TP
--l, --list-sources
+\-l, \-\-list\-sources
 List your Maildir sources and exit
 .TP
--u, --unusual-sources-too
+\-u, \-\-unusual\-sources\-too
 Sync unusual sources too if no specific source information is given
 .TP
---version
+\-\-version
 Print version and exit
 .TP
--h, --help
+\-h, \-\-help
 Show brief help message
 .SH FILES
 .TP
 $HOME/.sup/sources.yaml
 Configuration file for Sup mail sources
 .SH SEE ALSO
-sup(1), sup-add(1), sup-config(1), sup-dump(1), sup-sync(1),
-sup-tweak-labels(1)
+sup(1), sup\-add(1), sup\-config(1), sup\-dump(1), sup\-sync(1),
+sup\-tweak\-labels(1)
 .SH REPORTING BUGS
 You are welcome to submit bug reports to the Sup issue tracker, located
 at
@@ -90,11 +91,11 @@ Archives: \c
 .UE \c
 .RE
 .SH COPYRIGHT
-Copyright © 2006-2009 William Morgan \c
+Copyright © 2006\-2009 William Morgan \c
 .MT mworgan-sup@masanjin.net
 .ME \c
 .PP
-Copyright \[at] 2013-2014 Sup developers
+Copyright \[at] 2013\-2014 Sup developers
 .PP
 Permission is granted to copy and distribute this manual under the terms
 of the GNU General Public License; either version 2 or (at your option)

data/man/sup-sync.1

@@ -1,79 +1,79 @@
-.\" Automatically generated by Pandoc 3.1.9
+.\" Automatically generated by Pandoc 3.1.11.1
 .\"
-.TH "SUP-SYNC" "1" "April 9, 2012" "Sup User Manual" ""
+.TH "SUP\-SYNC" "1" "April 9, 2012" "Sup User Manual" ""
 .SH NAME
-sup-sync - sychronize the Sup index with message sources
+sup\-sync \- sychronize the Sup index with message sources
 .SH SYNOPSIS
-sup-sync [\f[I]options\f[R]] source \&...
+sup\-sync [\f[I]options\f[R]] source \&...
 .SH DESCRIPTION
 Synchronizes the Sup index with one or more message sources by adding
 messages, deleting messages, or changing message state in the index as
 appropriate.
 .PP
 \[lq]Message state\[rq] means read/unread, archived/inbox,
-starred/unstarred, and all user-defined labels on each message.
+starred/unstarred, and all user\-defined labels on each message.
 .PP
 \[lq]Default source state\[rq] refers to any state that a source itself
 has keeps about a message.
-Sup-sync uses this information when adding a new message to the index.
+Sup\-sync uses this information when adding a new message to the index.
 The source state is typically limited to read/unread, archived/inbox
 status and a single label based on the source name.
 Messages using the default source state are placed in the inbox
 (i.e.\ not archived) and unstarred.
 .PP
 If no sources are given, sync from all usual sources.
-Supported source URI schemes can be seen by running \[lq]sup-add
---help\[rq].
+Supported source URI schemes can be seen by running \[lq]sup\-add
+\-\-help\[rq].
 .SH MESSAGE STATE OPTIONS
 .TP
---asis
+\-\-asis
 If the message is already in the index, preserve its state.
 Otherwise, use default source state (default)
 .TP
---restore dumpfile
-Restore message state from a dump file created with sup-dump.
-If a message is not in this dumpfile, act as --asis
+\-\-restore dumpfile
+Restore message state from a dump file created with sup\-dump.
+If a message is not in this dumpfile, act as \-\-asis
 .TP
---discard
+\-\-discard
 Discard any message state in the index and use the default source state.
 \f[B]Dangerous!\f[R]
 .TP
--x, -
+\-x, \-
 When using the default source state, mark messages as archived.
 .TP
--r, --read
+\-r, \-\-read
 When using the default source state, mark messages as read.
 .TP
---extra-labels \f[I]STRING\f[R]
-When using the default source state, also apply these user-defined
-labels (a comma-separated list) (default)
+\-\-extra\-labels \f[I]STRING\f[R]
+When using the default source state, also apply these user\-defined
+labels (a comma\-separated list) (default)
 .SH OTHER OPTIONS
 .TP
--v, --verbose
+\-v, \-\-verbose
 Print message ids as they\[cq]re processed.
 .TP
--o, --optimize
+\-o, \-\-optimize
 As the final operation, optimize the index.
 .TP
---all-sources
+\-\-all\-sources
 Scan over all sources.
 .TP
--n, --dry-run
+\-n, \-\-dry\-run
 Don\[cq]t actually modify the index.
-Probably only useful with --verbose.
+Probably only useful with \-\-verbose.
 .TP
---version
+\-\-version
 Show version information
 .TP
--h, --help
+\-h, \-\-help
 Show help message
 .SH FILES
 .TP
 $HOME/.sup/sources.yaml
 Configuration file for Sup mail sources
 .SH SEE ALSO
-sup(1), sup-add(1), sup-config(1), sup-dump(1),
-sup-sync-back-maildir(1), sup-tweak-labels(1)
+sup(1), sup\-add(1), sup\-config(1), sup\-dump(1),
+sup\-sync\-back\-maildir(1), sup\-tweak\-labels(1)
 .SH REPORTING BUGS
 You are welcome to submit bug reports to the Sup issue tracker, located
 at
@@ -109,11 +109,11 @@ Archives: \c
 .UE \c
 .RE
 .SH COPYRIGHT
-Copyright © 2006-2009 William Morgan \c
+Copyright © 2006\-2009 William Morgan \c
 .MT mworgan-sup@masanjin.net
 .ME \c
 .PP
-Copyright \[at] 2013-2014 Sup developers
+Copyright \[at] 2013\-2014 Sup developers
 .PP
 Permission is granted to copy and distribute this manual under the terms
 of the GNU General Public License; either version 2 or (at your option)