updating help messages

git-svn-id: svn://rubyforge.org/var/svn/sup/trunk@309 5c8cc53c-5e98-4d25-b20a-d8db53a31250

diff --git a/bin/sup-add b/bin/sup-add
index 4d3364113deafc23b738bafc71f94003b38299c7..5cb8f9285a5ce6ba601522e29c5fe5448878f841 100644 (file)
--- a/bin/sup-add
+++ b/bin/sup-add
@@ -16,8 +16,24 @@ Adds a source to the Sup source list.
 Usage:
   sup-add [options] <source>+
 
-where <source>+ is one or more source URIs or mbox filenames, e.g.
-"imaps://my.imapserver.com", or "/var/spool/mail/me".
+where <source>+ is one or more sources.
+
+For mbox files on local disk, use the form:
+    mbox://<path to mbox file>
+or simply
+    <path to mbox file>
+
+For mbox files on remote machines, use the form:
+    mbox+ssh://<machine name>/<path to mbox file>
+
+For IMAP folders, use the form (note no username or password!):
+    imap://<machine name>/          # unsecure, "INBOX" folder  
+    imap://<machine name>/<folder>  # unsecure, arbitrary
+    imaps://<machine name>/         # secure, "INBOX" folder
+    imaps://<machine name>/<folder> # secure, arbitrary folder 
+
+For gmail accounts, use the form (note no username or password!):
+    gmail://
 
 Options are:
 EOS

diff --git a/bin/sup-import b/bin/sup-import
index 69b5b072515c8fc970e01a583e7648b9fec0afd0..68ffd760553cb2cdc5572effd439b46d755c04af 100644 (file)
--- a/bin/sup-import
+++ b/bin/sup-import
@@ -32,9 +32,9 @@ Imports messages into the Sup index from one or more sources.
 Usage:
   sup-import [options] <source>*
 
-where <source>* is zero or more source URIs or mbox filenames, e.g.
-"imaps://my.imapserver.com", or "/var/spool/mail/me". If no sources
-are given, imports messages from all sources marked as "usual".
+where <source>* is zero or more source URIs or mbox filenames. If no
+sources are given, imports messages from all sources marked as
+"usual".
 
 Options are:
 EOS
@@ -107,7 +107,7 @@ begin
         m
       elsif opts[:full_rebuild] || # we're updating everyone; or
           (opts[:rebuild] && (entry[:source_id].to_i != source.id || entry[:source_info].to_i != offset)) # we're updating just the changed ones
-        puts "# updating message at #{offset}, source #{entry[:source_id]} => #{source.id}, offset #{entry[:source_info]} => #{offset}, labels: #{m.labels * ' '}" if opts[:verbose]
+        puts "# updating message at #{offset}, #{m.from.inspect}, #{m.subj.inspect}, source #{entry[:source_id]} => #{source.id}, offset #{entry[:source_info]} => #{offset}, labels: #{m.labels * ' '}" if opts[:verbose]
         num += 1
         m
       else