diff --git a/source/faq/sharding.txt b/source/faq/sharding.txt
index 70f8625ff4e..1441ae1fb0d 100644
--- a/source/faq/sharding.txt
+++ b/source/faq/sharding.txt
@@ -179,6 +179,10 @@ Yes. :program:`mongod` creates these files as backups during normal
 
 Once these migrations are complete, you may delete these files.
 
+You can determine if all migrations are complete by running the
+:method:`sh.isBalancerRunning()` command while connected to a
+:program:`mongos` instance.
+
 How does ``mongos`` use connections?
 ------------------------------------
 
diff --git a/source/includes/options-conf.yaml b/source/includes/options-conf.yaml
index 43c1ec89f8c..c8ca47989b1 100644
--- a/source/includes/options-conf.yaml
+++ b/source/includes/options-conf.yaml
@@ -600,7 +600,7 @@ description: |
   A fully qualified server domain name for the purpose of configuring SASL
   and Kerberos authentication. The SASL hostname overrides the hostname
   only for the configuration of SASL and Kerberos.
-  
+
   For :program:`mongo` shell and other MongoDB tools to connect to
   the new :setting:`~security.sasl.hostName`, see the
   ``gssapiHostName`` option in the :program:`mongo` shell and other
@@ -923,12 +923,17 @@ post: |
 ---
 program: conf
 name: sharding.archiveMovedChunks
-type: integer
+type: boolean
 directive: setting
-inherit:
-  name: moveParanoia
-  program: mongod
-  file: options-mongod.yaml
+description: |
+  .. versionadded:: 2.4
+
+  .. versionchanged:: 2.6 {{role}} is now the default behavior of MongoDB.
+
+  When true, the {{role}} option forces the :program:`mongod` instances to save
+  all documents migrated from this shard during chunk migrations to the
+  ``moveChunk`` directory of the :setting:`storage.dbPath`. MongoDB does not
+  delete data stored in ``moveChunk``.
 ---
 program: conf
 name: auditLog.destination
diff --git a/source/includes/options-mongod.yaml b/source/includes/options-mongod.yaml
index e3d85517572..2126e9d7eea 100644
--- a/source/includes/options-mongod.yaml
+++ b/source/includes/options-mongod.yaml
@@ -311,7 +311,7 @@ default: |
   ``/data/db`` on Linux and OS X, ``\data\db`` on Windows
 directive: option
 description: |
-  The directory where the {{program}} instance stores its data. 
+  The directory where the {{program}} instance stores its data.
 
   If you
   installed MongoDB using a package management system, check the
@@ -1082,21 +1082,6 @@ description: |
 optional: true
 ---
 program: mongod
-name: moveParanoia
-args: null
-directive: option
-description: |
-  .. versionadded:: 2.4
-
-  During chunk migrations, the {{role}} option forces the
-  :program:`mongod` instances to save to the ``moveChunk`` directory of
-  the :setting:`storage.dbPath` all the documents migrated from this
-  shard. MongoDB does not delete data stored in ``moveChunk``.
-
-  Prior to 2.4, {{role}} was the default behavior of MongoDB.
-optional: true
----
-program: mongod
 name: sslOnNormalPorts
 args: null
 directive: option
diff --git a/source/reference/program/mongod.txt b/source/reference/program/mongod.txt
index ed3db4f668c..e4174431039 100644
--- a/source/reference/program/mongod.txt
+++ b/source/reference/program/mongod.txt
@@ -180,8 +180,6 @@ Sharded Cluster Options
 
 .. include:: /includes/option/option-mongod-shardsvr.rst
 
-.. include:: /includes/option/option-mongod-moveParanoia.rst
-
 SSL Options
 ~~~~~~~~~~~