Skip to content

Commit f54d117

Browse files
committed
DOCSP-15360, DOCSP-15407 foreport address build errors part2
1 parent f61696a commit f54d117

17 files changed

+44
-53
lines changed

source/core/gridfs.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -281,10 +281,10 @@ chunks, as demonstrated in the following example:
281281

282282
db.fs.chunks.find( { files_id: myFileID } ).sort( { n: 1 } )
283283

284-
:driver:`Drivers </>` that conform to the `GridFS
285-
specification`_ will automatically ensure that this index exists before
286-
read and write operations. See the relevant driver documentation for the
287-
specific behavior of your GridFS application.
284+
:driver:`Drivers </>` that conform to the :spec:`GridFS specification
285+
</gridfs/gridfs-spec.rst>` will automatically ensure that this index
286+
exists before read and write operations. See the relevant driver
287+
documentation for the specific behavior of your GridFS application.
288288

289289
If this index does not exist, you can issue the following operation to
290290
create it using the :binary:`~bin.mongo` shell:

source/includes/extracts-server-status-projection-base.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ content: |
145145
:serverstatus:`opcountersRepl` metrics as 64-bit integers (i.e.
146146
NumberLong) instead of 32-bit integers (i.e. NumberInt).
147147
148-
- Includes :serverstatus:`trafficRecording` metrics in its output.
148+
- Includes ``trafficRecording`` metrics in its output.
149149
150150
- Added new document count (``countDocs``) metrics in
151151
:serverstatus:`shardingStatistics`.

source/reference/built-in-roles.txt

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -524,7 +524,7 @@ Cluster Administration Roles
524524
<<database>.system.namespaces>` collections.
525525

526526

527-
* - | :data:`system.replset <<database>.system.replset>`,
527+
* - | :data:`system.replset <local.system.replset>`,
528528
| :data:`system.profile <<database>.system.profile>`,
529529

530530
- :authaction:`find`
@@ -764,9 +764,10 @@ All-Database Roles
764764
- :authaction:`listDatabases`
765765

766766
The role also provides the following privilege actions on the
767-
:data:`system.users` and :data:`system.roles`
768-
collections on the ``admin`` database, and on legacy
769-
``system.users`` collections from versions of MongoDB prior to 2.6:
767+
:data:`system.users <admin.system.users>` and
768+
:data:`system.roles <admin.system.roles>` collections on the
769+
``admin`` database, and on legacy ``system.users`` collections from
770+
versions of MongoDB prior to 2.6:
770771

771772
- :authaction:`collStats`
772773
- :authaction:`dbHash`

source/reference/command/buildInfo.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ buildInfo
4848
"bits" : <num>,
4949
"debug" : <boolean>,
5050
"maxBsonObjectSize" : <num>,
51+
"storageEngines" : [ "<string>", "<string>", "<...>" ],
5152
"ok" : <num>
5253
}
5354

@@ -74,7 +75,7 @@ These fields are stable and should provide consistent behavior.
7475
:binary:`~bin.mongod` instance. See :data:`~buildInfo.version` for a
7576
more readable version of this string.
7677

77-
.. data:: document buildInfo.version
78+
.. data:: buildInfo.version
7879

7980
A string that conveys version information about the
8081
:binary:`~bin.mongod` instance. If you need to present version information to
@@ -83,7 +84,7 @@ These fields are stable and should provide consistent behavior.
8384
This string will take the format ``<major>.<minor>.<patch>`` in the case of
8485
a release, but development builds may contain additional information.
8586

86-
.. data:: document buildInfo.storageEngines
87+
.. data:: buildInfo.storageEngines
8788

8889
.. versionadded:: 3.2
8990

source/reference/command/collMod.txt

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -43,16 +43,6 @@ Definition
4343
For the ``<collection or view>``, specify the name of a collection
4444
or view in the current database.
4545

46-
Use the :data:`~collStats.userFlags` field in the
47-
:method:`db.collection.stats()` output to check the options enabled
48-
for a collection.
49-
50-
.. Commenting out the following after DOCS-717, it does take
51-
a lock but its to cover a very small metadata change.
52-
53-
This command obtains a write lock on the affected database
54-
and will block other operations until it has completed.
55-
5646
Options
5747
-------
5848

source/reference/command/planCacheListFilters.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ the following form:
140140

141141
The array of indexes for this :term:`query shape`. To choose the
142142
optimal query plan, the query optimizer evaluates only the listed
143-
:data:`~planCacheListFilters.hints.indexes` *and* the collection
143+
:data:`~planCacheListFilters.filters.indexes` *and* the collection
144144
scan.
145145

146146
.. data:: planCacheListFilters.ok

source/reference/command/replSetResizeOplog.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -281,11 +281,11 @@ Change the Minimum Oplog Retention Period
281281

282282
#. *Optional*. Use the :method:`db.serverStatus()` command to verify
283283
the current minimum oplog retention value as
284-
:serverstatus:`oplogTruncation.oplogMinRetentionHours`:
284+
:serverstatus:`oplogTruncation.minRetentionHours`:
285285

286286
.. code-block:: javascript
287287

288-
db.getSiblingDB("admin").serverStatus().oplogTruncation.oplogMinRetentionHours
288+
db.getSiblingDB("admin").serverStatus().oplogTruncation.minRetentionHours
289289

290290
The command returns the currently configured minimum oplog retention
291291
period for the :binary:`~bin.mongod`. For example:

source/reference/configuration-options.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2915,9 +2915,9 @@ Key Management Configuration Options
29152915

29162916
.. note::
29172917

2918-
Windows MongoDB deployments can use :setting:`~security.ldap.bindWithOSDefaults`
2918+
Windows MongoDB deployments can use :setting:`~security.ldap.bind.useOSDefaults`
29192919
instead of :setting:`~security.ldap.bind.queryUser` and :setting:`~security.ldap.bind.queryPassword`. You cannot specify
2920-
both :setting:`~security.ldap.bind.queryUser` and :setting:`~security.ldap.bindWithOSDefaults` at the same time.
2920+
both :setting:`~security.ldap.bind.queryUser` and :setting:`~security.ldap.bind.useOSDefaults` at the same time.
29212921

29222922

29232923
.. setting:: security.ldap.bind.queryPassword
@@ -2937,9 +2937,9 @@ Key Management Configuration Options
29372937

29382938
.. note::
29392939

2940-
Windows MongoDB deployments can use :setting:`~security.ldap.bindWithOSDefaults`
2940+
Windows MongoDB deployments can use :setting:`~security.ldap.bind.useOSDefaults`
29412941
instead of :setting:`~security.ldap.bind.queryPassword` and :setting:`~security.ldap.bind.queryPassword`. You cannot specify
2942-
both :setting:`~security.ldap.bind.queryPassword` and :setting:`~security.ldap.bindWithOSDefaults` at the same time.
2942+
both :setting:`~security.ldap.bind.queryPassword` and :setting:`~security.ldap.bind.useOSDefaults` at the same time.
29432943

29442944

29452945
.. setting:: security.ldap.bind.useOSDefaults

source/reference/exit-codes.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ issues with :binary:`~bin.mongod` and :binary:`~bin.mongos` instances.
3636
* - .. error:: 3
3737
- Returned by :binary:`~bin.mongod` if there is a mismatch
3838
between hostnames specified on the command line and in the
39-
:data:`local.sources` collection, in master/slave mode.
39+
``local.sources`` collection, in master/slave mode.
4040

4141
.. symbol: EXIT_REPLICATION_ERROR = 3
4242

source/reference/method/db.collection.findAndModify.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -462,14 +462,14 @@ This method performs the following actions:
462462
#. The ``query`` finds a document in the ``people`` collection
463463
where the ``name`` field has the value ``Tom``, the ``state``
464464
field has the value ``active`` and the ``rating`` field has a
465-
value :operator:`greater than <$gt>` 10.
465+
value :query:`greater than <$gt>` 10.
466466

467467
#. The ``sort`` orders the results of the query in ascending order.
468468
If multiple documents meet the ``query`` condition, the method
469469
will select for modification the first document as ordered by
470470
this ``sort``.
471471

472-
#. The update :operator:`increments <$inc>` the value of the
472+
#. The update :update:`increments <$inc>` the value of the
473473
``score`` field by 1.
474474

475475
#. The method returns the original (i.e. pre-modification) document

0 commit comments

Comments
 (0)