From 144194d00dde8fb69607315fd50a571c9a5fe50f Mon Sep 17 00:00:00 2001
From: Kyle Suarez <kyle.suarez@mongodb.com>
Date: Wed, 6 Jan 2016 17:29:19 -0500
Subject: [PATCH] DOCS-6898 findAndModify takes a write concern

Documents the optional writeConcern parameter for findAndModify and its
corresponding shell helper.
---
 .../apiargs-dbcommand-findAndModify-field.yaml      |  9 ++++++++-
 ...gs-method-db.collection.findAndModify-param.yaml | 13 +++++++++++++
 source/reference/command/findAndModify.txt          |  3 ++-
 .../method/db.collection.findAndModify.txt          |  3 ++-
 4 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/source/includes/apiargs-dbcommand-findAndModify-field.yaml b/source/includes/apiargs-dbcommand-findAndModify-field.yaml
index 41939640bb3..4fb4ceceb5a 100644
--- a/source/includes/apiargs-dbcommand-findAndModify-field.yaml
+++ b/source/includes/apiargs-dbcommand-findAndModify-field.yaml
@@ -5,7 +5,7 @@ interface: command
 name: findAndModify
 operation: findAndModify
 optional: false
-position: 1
+position: 0
 type: string
 ---
 arg_name: field
@@ -63,4 +63,11 @@ operation: findAndModify
 source:
   file: apiargs-method-db.collection.findAndModify-param.yaml
   ref: bypassDocumentValidation
+---
+arg_name: field
+interface: dbcommand
+operation: findAndModify
+source:
+  file: apiargs-method-db.collection.findAndModify-param.yaml
+  ref: writeConcern
 ...
diff --git a/source/includes/apiargs-method-db.collection.findAndModify-param.yaml b/source/includes/apiargs-method-db.collection.findAndModify-param.yaml
index 7a5ab408e35..4e2b071329b 100644
--- a/source/includes/apiargs-method-db.collection.findAndModify-param.yaml
+++ b/source/includes/apiargs-method-db.collection.findAndModify-param.yaml
@@ -101,4 +101,17 @@ replacement:
 position: 8
 operation: db.collection.findAndModify
 interface: method
+---
+arg_name: param
+description: |
+  A document expressing the :doc:`write concern </reference/write-concern>`.
+  Omit to use the default write concern.
+
+  .. versionadded:: 3.2
+interface: method
+name: writeConcern
+operation: db.collection.findAndModify
+optional: true
+position: 9
+type: document
 ...
diff --git a/source/reference/command/findAndModify.txt b/source/reference/command/findAndModify.txt
index cc892c45291..fcf74f6db74 100644
--- a/source/reference/command/findAndModify.txt
+++ b/source/reference/command/findAndModify.txt
@@ -31,7 +31,8 @@ Definition
         new: <boolean>,
         fields: <document>,
         upsert: <boolean>,
-        bypassDocumentValidation: <boolean>
+        bypassDocumentValidation: <boolean>,
+        writeConcern: <document>
       }
 
    The :dbcommand:`findAndModify` command takes the following
diff --git a/source/reference/method/db.collection.findAndModify.txt b/source/reference/method/db.collection.findAndModify.txt
index b6a85ebc674..449c686958c 100644
--- a/source/reference/method/db.collection.findAndModify.txt
+++ b/source/reference/method/db.collection.findAndModify.txt
@@ -33,7 +33,8 @@ Definition
           new: <boolean>,
           fields: <document>,
           upsert: <boolean>,
-          bypassDocumentValidation: <boolean>
+          bypassDocumentValidation: <boolean>,
+          writeConcern: <document>
       });
 
    The :method:`db.collection.findAndModify()` method takes a document