Merge branch 'v1.4' into v1.5

Author: jmikola

docs/includes/apiargs-MongoDBCollection-method-mapReduce-option.yaml

@@ -22,7 +22,7 @@ name: jsMode
 type: boolean
 description: |
   Specifies whether to convert intermediate data into BSON format between the
-  execution of the map and reduce functions. The default is ``false``.
+  execution of the map and reduce functions.
 interface: phpmethod
 operation: ~
 optional: true
@@ -42,7 +42,7 @@ source:
 ---
 arg_name: option
 name: query
-type: document
+type: array|object
 description: |
   Specifies the selection criteria using query operators for determining the
   documents input to the map function.
@@ -62,7 +62,7 @@ post: |
 ---
 arg_name: option
 name: scope
-type: document
+type: array|object
 description: |
   Specifies global variables that are accessible in the map, reduce, and finalize
   functions.
@@ -89,7 +89,6 @@ name: verbose
 type: boolean
 description: |
   Specifies whether to include the timing information in the result information.
-  The default is ``true``.
 interface: phpmethod
 operation: ~
 optional: true

docs/includes/apiargs-MongoDBCollection-method-mapReduce-param.yaml

@@ -20,7 +20,7 @@ optional: false
 ---
 arg_name: param
 name: $out
-type: string|document
+type: string|array|object
 description: |
   Specifies where to output the result of the map-reduce operation. You can
   either output to a collection or return the result inline. On a primary member

docs/reference/method/MongoDBDatabase-listCollections.txt

@@ -114,7 +114,7 @@ The output would then resemble::
 See Also
 --------
 
-- :manual:`listCollections </reference/command/listCollections` command
+- :manual:`listCollections </reference/command/listCollections>` command
   reference in the MongoDB manual
 - `Enumerating Collections
   <https://github.com/mongodb/specifications/blob/master/source/enumerate-collections.rst>`_