DOCS-739: finalizing text for noIndexBuildRetry

source/reference/configuration-options.txt

@@ -685,6 +685,13 @@ Settings
 
    .. include:: /includes/list-set-parameters-mongos.rst
 
+.. setting:: noIndexBuildRetry
+
+   By default, :program:`mongod` will attempt to rebuild indexes upon
+   start-up *if* :program:`mongod` shuts down or stops in the middle
+   of an index build. When you specify :option:`--noIndexBuildRetry`,
+   :program:`mongod` will not attempt to rebuild the index.
+
 Replication Options
 ~~~~~~~~~~~~~~~~~~~
 

source/reference/program/mongod.txt

@@ -526,6 +526,13 @@ Core Options
 
 .. _cli-mongod-replica-set:
 
+.. option:: --noIndexBuildRetry
+
+   By default, :program:`mongod` will attempt to rebuild indexes upon
+   start-up *if* :program:`mongod` shuts down or stops in the middle
+   of an index build. When you specify :option:`--noIndexBuildRetry`,
+   :program:`mongod` will not attempt to rebuild the index.
+
 Replication Options
 ~~~~~~~~~~~~~~~~~~~
 

source/release-notes/2.6.txt

@@ -890,7 +890,7 @@ to have only the privileges granted by the roles.
 
 User data includes the user's authentication credentials as well as any
 roles assigned to the user. MongoDB stores the user data in the
-:ref:`system.users <admin-system-users-collection>` collection of the 
+:ref:`system.users <admin-system-users-collection>` collection of the
 ``admin`` database.
 
 .. _resource-document:
@@ -2111,12 +2111,12 @@ To upgrade from a MongoDB cluster using no SSL encryption to one using
 
 2. Switch all clients to use SSL.
 
-3. Switch all outgoing server connections to use SSL by restarting each server 
+3. Switch all outgoing server connections to use SSL by restarting each server
    with the ``--sslMode`` option set to ``sendAcceptSSL``.
 
    At this point, all connections should be using SSL.
 
-4. Switch all servers to accept only SSL connections by restarting each server 
+4. Switch all servers to accept only SSL connections by restarting each server
    with the ``--sslMode`` option set to ``sslOnly`` parameter on each server.
 
 .. _rn26-x509-authentication:
@@ -2175,13 +2175,6 @@ command line,) for :program:`mongod`. :setting:`noIndexBuildRetry`
 prevents :program:`mongod` from continuing rebuilding indexes that did
 not finished building when the :program:`mongod` last shut down.
 
-.. setting:: noIndexBuildRetry
-
-   By default, :program:`mongod` will attempt to rebuild indexes upon
-   start-up *if* :program:`mongod` shuts down or stops in the middle
-   of an index build. When enabled, this option prevents this
-   behavior.
-
 Tool Improvements
 ~~~~~~~~~~~~~~~~~