Merge branch 'sent-poll-fix'

diff --git a/bin/sup-sync-back b/bin/sup-sync-back
index 57bebbe839d0ad638dd003e35f868a8aeb1458b2..4216cf9e46f5db3c595b72edb8462f15bb0fe966 100644 (file)
--- a/bin/sup-sync-back
+++ b/bin/sup-sync-back
@@ -51,7 +51,11 @@ EOS
 end
 
 unless opts[:drop_deleted] || opts[:move_deleted] || opts[:drop_spam] || opts[:move_spam]
-  puts "Nothing to do."
+  puts <<EOS
+Nothing to do. Please specify at least one of --drop-deleted, --move-deleted,
+--drop-spam, or --move-spam.
+EOS
+
   exit
 end
 

diff --git a/doc/FAQ.txt b/doc/FAQ.txt
index 3b65330feaf44344d4c4e826cbf12859ad3b1a80..5c85d9c55346f37221dd7ad47ccecf0f483d0946 100644 (file)
--- a/doc/FAQ.txt
+++ b/doc/FAQ.txt
@@ -111,7 +111,7 @@ S: The current solution is to directly modify RubyMail. Change line 159 of
    multipart.rb to:
      chunk = chunk[0..start]
    This is because RubyMail hasn't been updated since like Ruby 1.8.2.
-   Please bug Matt Lickey.
+   Please bug Matt Armstrong.
 
 P: I see this error:
      /usr/local/lib/ruby/1.8/yaml.rb:133:in `transfer': allocator undefined for Bignum (TypeError)

diff --git a/lib/sup/crypto.rb b/lib/sup/crypto.rb
index 9e16132304ebad107b8cab43c0706de82b6e1a78..ee0695862415939120b262d4d4cec2e1ec2f214e 100644 (file)
--- a/lib/sup/crypto.rb
+++ b/lib/sup/crypto.rb
@@ -40,7 +40,7 @@ class CryptoManager
     raise Error, (output || "gpg command failed: #{cmd}") unless $?.success?
 
     envelope = RMail::Message.new
-    envelope.header["Content-Type"] = 'multipart/signed; protocol="application/pgp-signature"; micalg=pgp-sha1'
+    envelope.header["Content-Type"] = 'multipart/signed; protocol=application/pgp-signature; micalg=pgp-sha1'
 
     envelope.add_part payload
     signature = RMail::Message.make_attachment output, "application/pgp-signature", nil, "signature.asc"