Merge default into bug23116

Author: Michael Bridgen

docs/wikipages/data.ApiGen.txt

@@ -337,10 +337,9 @@ parameter concerned:
     void _Private_BasicConsume(...,
                                bool exclusive,
                                bool nowait,
-                                 [AmqpFieldMapping(
-                                   "RabbitMQ.Client.Framing.v0_8qpid",
-                                                   "arguments")]
-                               IDictionary filter);
+                               [AmqpFieldMapping("RabbitMQ.Client.Framing.v0_9",
+                                                 "filter")]
+                               IDictionary arguments);
 
 The parameter to the attribute specifies the specification version to
 which the attribute should apply, or null if it should apply to any
@@ -533,10 +532,10 @@ asynchronous event handler.
 
 *** Overriding behaviour for particular specification versions
 
-In some versions of the specification, a particular field or method
-may not be supported. Methods and parameters can be marked to cause
-particular implementations to complain if these features are used by
-applications:
+In some versions of the specification, a particular field, method or
+content header may not be supported. Methods and parameters can be
+marked to cause particular implementations to complain if these
+features are used by applications:
 
 @code java
     [AmqpUnsupported("RabbitMQ.Client.Framing.v0_8qpid")]
@@ -562,14 +561,14 @@ QueueUnbind.
                                bool exclusive,
                                bool nowait,
                                [AmqpUnsupported("RabbitMQ.Client.Framing.v0_8")]
-                               [AmqpFieldMapping("RabbitMQ.Client.Framing.v0_8qpid",
-                                                 "arguments")]
-                               IDictionary filter);
-
-In the example above, the "filter" parameter is unsupported in
-standard 0-8, and in QPid-specific 0-8 it is named "arguments" instead
-of "filter". In all other implementations (currently only 0-9), it is
-assumed to be supported and named "filter".
+                               [AmqpFieldMapping("RabbitMQ.Client.Framing.v0_9",
+                                                 "filter")]
+                               IDictionary arguments);
+
+In the example above, the "arguments" parameter is unsupported in
+standard 0-8, and in 0-9 t is named "filter" instead of
+"arguments". In all other implementations, it is assumed to be
+supported and named "arguments".
 
 The parameter to the attribute specifies the specification version to
 which the attribute should apply, or null if it should apply to any

docs/wikipages/data.BuildingTheClient.txt

@@ -29,7 +29,7 @@ To compile the RabbitMQ .NET client library, you will need
 
 To run the unit tests, you will need
 
- - NUnit 2.4.3; included in the [code lib] directory
+ - NUnit 2.5 or later; included in the [code lib] directory
 
 ** Configuring Your Tree