Merge in ruby bindings.

[notmuch] / notmuch.1

diff --git a/notmuch.1 b/notmuch.1
index 2c33749767392ccae25be03be645bc01c4561035..3878a040cbcf1e10f1bdf3b568b0cb8affeb2a2e 100644 (file)
--- a/notmuch.1
+++ b/notmuch.1
@@ -169,31 +169,31 @@ the authors of the thread and the subject.
 .B threads
 
 Output the thread IDs of all threads with any message matching the
 .B threads
 
 Output the thread IDs of all threads with any message matching the

-search terms, either one per line (--format=text) or as a JSON array
-(--format=json).
+search terms, either one per line (\-\-format=text) or as a JSON array
+(\-\-format=json).

 .RE
 .RS 4
 .TP 4
 .B messages
 
 Output the message IDs of all messages matching the search terms,
 .RE
 .RS 4
 .TP 4
 .B messages
 
 Output the message IDs of all messages matching the search terms,

-either one per line (--format=text) or as a JSON array
-(--format=json).
+either one per line (\-\-format=text) or as a JSON array
+(\-\-format=json).

 .RE
 .RS 4
 .TP 4
 .B files
 
 Output the filenames of all messages matching the search terms, either
 .RE
 .RS 4
 .TP 4
 .B files
 
 Output the filenames of all messages matching the search terms, either

-one per line (--format=text) or as a JSON array (--format=json).
+one per line (\-\-format=text) or as a JSON array (\-\-format=json).

 .RE
 .RS 4
 .TP 4
 .B tags
 
 Output all tags that appear on any message matching the search terms,
 .RE
 .RS 4
 .TP 4
 .B tags
 
 Output all tags that appear on any message matching the search terms,

-either one per line (--format=text) or as a JSON array
-(--format=json).
+either one per line (\-\-format=text) or as a JSON array
+(\-\-format=json).

 .RE
 .RE
 
 .RE
 .RE
 


@@ -248,7 +248,7 @@ matched message will be displayed.
 
 .RS 4
 .TP 4
 
 .RS 4
 .TP 4

-.B \-\-format=(text|json|mbox)
+.B \-\-format=(text|json|mbox|raw)

 
 .RS 4
 .TP 4
 
 .RS 4
 .TP 4


@@ -286,6 +286,16 @@ beginning with "From " (preceded by zero or more '>' characters) have
 an additional '>' character added. This reversible escaping
 is termed "mboxrd" format and described in detail here:
 http://homepage.ntlworld.com/jonathan.deboynepollard/FGA/mail-mbox-formats.html
 an additional '>' character added. This reversible escaping
 is termed "mboxrd" format and described in detail here:
 http://homepage.ntlworld.com/jonathan.deboynepollard/FGA/mail-mbox-formats.html

+.RE
+.RS 4
+.TP 4
+.B raw
+
+The original, raw content of the email message is displayed.
+Consumers of this format should expect to implement MIME decoding and
+similar functions. This format must only be used with search terms
+matching a single message.
+

 .RE
 A common use of
 .B notmuch show
 .RE
 A common use of
 .B notmuch show