Merge remote-tracking branch 'origin/develop' into develop

Tapeti.Cmd/Program.cs

@@ -74,7 +74,7 @@ namespace Tapeti.Cmd
             [Option('m', "message", Group = "Input", HelpText = "Single message to be sent, in the same format as used for SingleFileJSON. Serialization argument has no effect when using this input.")]
             public string InputMessage { get; set; }
 
-            [Option('c', "pipe", Group = "Input", HelpText = "Messages are read from STDIN, in the same format as used for SingleFileJSON. Serialization argument has no effect when using this input.")]
+            [Option('c', "pipe", Group = "Input", HelpText = "Messages are read from the standard input pipe, in the same format as used for SingleFileJSON. Serialization argument has no effect when using this input.")]
             public bool InputPipe { get; set; }
 
             [Option('e', "exchange", HelpText = "If specified publishes to the originating exchange using the original routing key. By default these are ignored and the message is published directly to the originating queue.")]

docs/tapeticmd.rst

@@ -138,7 +138,7 @@ SingleFileJSON
 ''''''''''''''
 The default serialization method. All messages are contained in a single file, where each line is a JSON document describing the message properties and it's content.
 
-An example message (formatted as multi-line to be more readable, but keep in mind that it must be a single line in the export file to be imported properly):
+An example message (formatted as multi-line to be more readable, but keep in mind that it **must be a single line** in the export file to be imported properly):
 
 ::
 
@@ -176,6 +176,29 @@ The properties correspond to the RabbitMQ client's IBasicProperties and can be o
 
 Either Body or RawBody is present. Body is used if the ContentType is set to application/json, and will contain the original message as an inline JSON object for easy manipulation. For other content types, the RawBody contains the original encoded body.
 
+Below is a bare minimum example, assuming Tapeti style messages and the default direct-to-queue import (no --exchange parameter). Again, keep in mind that it **must be a single line** in the export file to be imported properly.
+
+::
+
+  {
+    "Queue": "tapeti.example.01",
+    "Properties": {
+      "ContentType": "application/json",
+      "Headers": {
+        "classType": "Messaging.TapetiExample.QuoteRequestMessage:Messaging.TapetiExample"
+      }
+    },
+    "Body": {
+      "Amount": 2
+    }
+  }
+
+Actual file contents will thus look like:
+
+::
+
+  { "Queue": "tapeti.example.01", "Properties": { "ContentType": "application/json", "Headers": { "classType": "Messaging.TapetiExample.QuoteRequestMessage:Messaging.TapetiExample" } }, "Body": { "Amount": 2 } }
+
 
 EasyNetQHosepipe
 ''''''''''''''''