diff --git a/source/includes/extracts-4.4-changes.yaml b/source/includes/extracts-4.4-changes.yaml index 042bacccb30..2bf8c86e676 100644 --- a/source/includes/extracts-4.4-changes.yaml +++ b/source/includes/extracts-4.4-changes.yaml @@ -3,11 +3,11 @@ content: | .. versionchanged:: 4.4 - :binary:`~bin.mongod` / :binary:`~bin.mongos` logs a warning on - connection if the presented x.509 certificate expires within ``30`` - days of the ``mongod/mongos`` host system time. See - :ref:`4.4-rel-notes-certificate-expiration-warning` for more - information. + :binary:`~bin.mongod` / :binary:`~bin.mongos` logs a warning on + connection if the presented x.509 certificate expires within ``30`` + days of the ``mongod/mongos`` host system time. See + :ref:`4.4-rel-notes-certificate-expiration-warning` for more + information. --- ref: 4.4-changes-passwordPrompt content: | diff --git a/source/includes/fact-zone-sharding-alias.rst b/source/includes/fact-zone-sharding-alias.rst index 7f5bda12534..59e01181e34 100644 --- a/source/includes/fact-zone-sharding-alias.rst +++ b/source/includes/fact-zone-sharding-alias.rst @@ -1,5 +1,5 @@ .. versionchanged:: 3.4 - This method aliases to |method| in MongoDB 3.4. The functionality specified - below still applies to MongoDB 3.2. MongoDB 3.4 provides :ref:`Zone sharding - ` as the successor to tag-aware sharding. + This method aliases to |method| in MongoDB 3.4. The functionality specified + below still applies to MongoDB 3.2. MongoDB 3.4 provides :ref:`Zone sharding + ` as the successor to tag-aware sharding. diff --git a/source/reference/command/addShardToZone.txt b/source/reference/command/addShardToZone.txt index 7d78b013a30..5b2c424e350 100644 --- a/source/reference/command/addShardToZone.txt +++ b/source/reference/command/addShardToZone.txt @@ -17,11 +17,11 @@ Definition .. versionadded:: 3.4 - Associates a shard with a :term:`zone`. MongoDB associates this shard with - the given zone. Chunks that are covered by the zone are assigned to shards - associated with the zone. + Associates a shard with a :term:`zone`. MongoDB associates this shard with + the given zone. Chunks that are covered by the zone are assigned to shards + associated with the zone. - .. |command| replace:: ``addShardToZone`` + .. |command| replace:: ``addShardToZone`` Syntax ------ diff --git a/source/reference/configuration-options.txt b/source/reference/configuration-options.txt index 5dea364c905..b38241042d3 100644 --- a/source/reference/configuration-options.txt +++ b/source/reference/configuration-options.txt @@ -2926,9 +2926,9 @@ Key Management Configuration Options .. versionadded:: 3.4 Available in MongoDB Enterprise only. - The password used to bind to an LDAP server when using - :setting:`~security.ldap.bind.queryUser`. You must use :setting:`~security.ldap.bind.queryPassword` with - :setting:`~security.ldap.bind.queryUser`. + The password used to bind to an LDAP server when using + :setting:`~security.ldap.bind.queryUser`. You must use :setting:`~security.ldap.bind.queryPassword` with + :setting:`~security.ldap.bind.queryUser`. If unset, :binary:`~bin.mongod` or :binary:`~bin.mongos` will not attempt to bind to the LDAP server. diff --git a/source/reference/method/db.createUser.txt b/source/reference/method/db.createUser.txt index 8abc71e8b09..1a7a94b1d34 100644 --- a/source/reference/method/db.createUser.txt +++ b/source/reference/method/db.createUser.txt @@ -209,8 +209,8 @@ Definition .. versionchanged:: 4.0 - The default value is ``"server"``. In earlier versions, the - default value is ``"client"``. + The default value is ``"server"``. In earlier versions, the + default value is ``"client"``. diff --git a/source/reference/method/db.updateUser.txt b/source/reference/method/db.updateUser.txt index bca24fd1bc8..e02e71b8f2c 100644 --- a/source/reference/method/db.updateUser.txt +++ b/source/reference/method/db.updateUser.txt @@ -214,8 +214,8 @@ Definition .. versionchanged:: 4.0 - The default value is ``"server"``. In earlier versions, the - default value is ``"client"``. + The default value is ``"server"``. In earlier versions, the + default value is ``"client"``. diff --git a/source/reference/program/mongo.txt b/source/reference/program/mongo.txt index 97c86392999..06cf4d933fa 100644 --- a/source/reference/program/mongo.txt +++ b/source/reference/program/mongo.txt @@ -93,7 +93,7 @@ Options .. versionchanged:: 4.2 - - .. include:: /includes/extracts/4.2-changes-options-tls-ssl.rst + - .. include:: /includes/extracts/4.2-changes-options-tls-ssl.rst Core Options ~~~~~~~~~~~~ diff --git a/source/reference/program/mongod.txt b/source/reference/program/mongod.txt index c34cdafde3f..82ec0414d3d 100644 --- a/source/reference/program/mongod.txt +++ b/source/reference/program/mongod.txt @@ -961,9 +961,9 @@ LDAP Authentication or Authorization Options .. versionadded:: 3.4 Available in MongoDB Enterprise only. - The password used to bind to an LDAP server when using - :option:`--ldapQueryUser`. You must use :option:`--ldapQueryPassword` with - :option:`--ldapQueryUser`. + The password used to bind to an LDAP server when using + :option:`--ldapQueryUser`. You must use :option:`--ldapQueryPassword` with + :option:`--ldapQueryUser`. If unset, :program:`mongod` will not attempt to bind to the LDAP server. diff --git a/source/reference/program/mongoldap.txt b/source/reference/program/mongoldap.txt index 56dd4c23ba7..100c1530a1f 100644 --- a/source/reference/program/mongoldap.txt +++ b/source/reference/program/mongoldap.txt @@ -245,9 +245,9 @@ Options .. versionadded:: 3.4 Available in MongoDB Enterprise only. - The password used to bind to an LDAP server when using - :option:`--ldapQueryUser`. You must use :option:`--ldapQueryPassword` with - :option:`--ldapQueryUser`. + The password used to bind to an LDAP server when using + :option:`--ldapQueryUser`. You must use :option:`--ldapQueryPassword` with + :option:`--ldapQueryUser`. If unset, :program:`mongoldap` will not attempt to bind to the LDAP server. diff --git a/source/reference/program/mongos.txt b/source/reference/program/mongos.txt index 7be2ee2475b..9e0f36af56f 100644 --- a/source/reference/program/mongos.txt +++ b/source/reference/program/mongos.txt @@ -1737,9 +1737,9 @@ LDAP Authentication and Authorization Options .. versionadded:: 3.4 Available in MongoDB Enterprise only. - The password used to bind to an LDAP server when using - :option:`--ldapQueryUser`. You must use :option:`--ldapQueryPassword` with - :option:`--ldapQueryUser`. + The password used to bind to an LDAP server when using + :option:`--ldapQueryUser`. You must use :option:`--ldapQueryPassword` with + :option:`--ldapQueryUser`. If unset, :program:`mongos` will not attempt to bind to the LDAP server.