Skip to content

Commit 4bf610b

Browse files
jason-price-mongodbjeff-allen-mongo
authored andcommitted
DOCSP-15486 fix build errors
1 parent d3e33de commit 4bf610b

14 files changed

+1756
-1606
lines changed
Lines changed: 7 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,17 @@
1-
title: Enter a query in the query bar
1+
title: Enter a document filter
22
level: 4
33
ref: enter-query
44
action:
55
pre: |
6-
Queries entered in the query bar must be valid MongoDB syntax. Only
7-
:dbcommand:`finds <find>` will be executed.
8-
9-
This example manually selects documents whose ``departureAirportFsCode`` is
10-
"JFK".
11-
12-
.. figure:: /images/compass/manual-query.png
13-
:alt: Compass query bar with query entered
14-
15-
When a valid query is entered, the bar is colored green and can be
16-
executed. Invalid queries are colored red. The UI will automatically update
17-
to indicate which fields and values are selected in the query.
6+
A document filter must use valid MongoDB syntax. Only
7+
:dbcommand:`finds <find>` can be executed. Invalid filters are
8+
colored red.
189
---
19-
title: Apply the query
10+
title: Apply a document filter
2011
level: 4
2112
ref: apply
2213
action:
2314
pre: |
24-
After entering a query, run it by clicking the Apply button. To clear the
25-
query, use the Reset button.
26-
27-
Continuing with the example, executing the query displays information on the
28-
matching documents.
29-
30-
.. figure:: /images/compass/manual-query-results.png
31-
:alt: Compass Apply button executes query
32-
33-
To clear a query, use the Reset button.
15+
To run a filter, click the :guilabel:`FIND` button. To clear a
16+
filter, click the :guilabel:`RESET` button.
3417
...

source/reference/audit-message.txt

Lines changed: 21 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,10 @@ associated ``param`` details and the ``result`` values, if any.
141141

142142
- ``result``
143143

144-
* - :authaction:`authenticate`
144+
145+
* - .. _audit-message-authenticate:
146+
147+
``authenticate``
145148

146149
- .. code-block:: none
147150
:copyable: false
@@ -157,7 +160,9 @@ associated ``param`` details and the ``result`` values, if any.
157160
| ``18`` - Authentication Failed
158161
| ``334`` - Mechanism Unavailable
159162

160-
* - :authaction:`authCheck`
163+
* - .. _audit-message-authCheck:
164+
165+
``authCheck``
161166

162167
- .. code-block:: none
163168
:copyable: false
@@ -189,7 +194,8 @@ associated ``param`` details and the ``result`` values, if any.
189194

190195
- ``0`` - Success
191196

192-
* - :authaction:`createDatabase`
197+
198+
* - ``createDatabase``
193199

194200
- .. code-block:: none
195201
:copyable: false
@@ -213,7 +219,7 @@ associated ``param`` details and the ``result`` values, if any.
213219

214220
- ``0`` - Success
215221

216-
* - :authaction:`renameCollection`
222+
* - ``renameCollection``
217223

218224
- .. code-block:: none
219225
:copyable: false
@@ -295,7 +301,7 @@ associated ``param`` details and the ``result`` values, if any.
295301

296302
- ``0`` - Success
297303

298-
* - :authaction:`dropAllUsersFromDatabase`
304+
* - ``dropAllUsersFromDatabase``
299305

300306
- .. code-block:: none
301307
:copyable: false
@@ -305,7 +311,7 @@ associated ``param`` details and the ``result`` values, if any.
305311

306312
- ``0`` - Success
307313

308-
* - :authaction:`updateUser`
314+
* - ``updateUser``
309315

310316
- .. code-block:: none
311317
:copyable: false
@@ -329,7 +335,7 @@ associated ``param`` details and the ``result`` values, if any.
329335

330336
- ``0`` - Success
331337

332-
* - :authaction:`grantRolesToUser`
338+
* - ``grantRolesToUser``
333339

334340
- .. code-block:: none
335341
:copyable: false
@@ -349,7 +355,7 @@ associated ``param`` details and the ``result`` values, if any.
349355

350356
- ``0`` - Success
351357

352-
* - :authaction:`revokeRolesFromUser`
358+
* - ``revokeRolesFromUser``
353359

354360
- .. code-block:: none
355361
:copyable: false
@@ -401,7 +407,7 @@ associated ``param`` details and the ``result`` values, if any.
401407

402408
- ``0`` - Success
403409

404-
* - :authaction:`updateRole`
410+
* - ``updateRole``
405411

406412
- .. code-block:: none
407413
:copyable: false
@@ -446,7 +452,7 @@ associated ``param`` details and the ``result`` values, if any.
446452

447453
- ``0`` - Success
448454

449-
* - :authaction:`dropAllRolesFromDatabase`
455+
* - ``dropAllRolesFromDatabase``
450456

451457
- .. code-block:: none
452458
:copyable: false
@@ -456,7 +462,7 @@ associated ``param`` details and the ``result`` values, if any.
456462

457463
- ``0`` - Success
458464

459-
* - :authaction:`grantRolesToRole`
465+
* - ``grantRolesToRole``
460466

461467
- .. code-block:: none
462468
:copyable: false
@@ -476,7 +482,7 @@ associated ``param`` details and the ``result`` values, if any.
476482

477483
- ``0`` - Success
478484

479-
* - :authaction:`revokeRolesFromRole`
485+
* - ``revokeRolesFromRole``
480486

481487
- .. code-block:: none
482488
:copyable: false
@@ -496,7 +502,7 @@ associated ``param`` details and the ``result`` values, if any.
496502

497503
- ``0`` - Success
498504

499-
* - :authaction:`grantPrivilegesToRole`
505+
* - ``grantPrivilegesToRole``
500506

501507
- .. code-block:: none
502508
:copyable: false
@@ -519,7 +525,7 @@ associated ``param`` details and the ``result`` values, if any.
519525

520526
- ``0`` - Success
521527

522-
* - :authaction:`revokePrivilegesFromRole`
528+
* - ``revokePrivilegesFromRole``
523529

524530
- .. code-block:: none
525531
:copyable: false
@@ -579,7 +585,7 @@ associated ``param`` details and the ``result`` values, if any.
579585

580586
- ``0`` - Success
581587

582-
* - :authaction:`shardCollection`
588+
* - ``shardCollection``
583589

584590
- .. code-block:: none
585591
:copyable: false

source/reference/built-in-roles.txt

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -246,19 +246,15 @@ Cluster Administration Roles
246246
- :authaction:`cleanupOrphaned`
247247
- :authaction:`flushRouterConfig`
248248
- :authaction:`getDefaultRWConcern` (New in version 4.4)
249-
250249
- :authaction:`listSessions` (New in version 3.6)
251-
252250
- :authaction:`listShards`
253251
- :authaction:`removeShard`
254252
- :authaction:`replSetConfigure`
255253
- :authaction:`replSetGetConfig`
256254
- :authaction:`replSetGetStatus`
257255
- :authaction:`replSetStateChange`
258256
- :authaction:`resync`
259-
260257
- :authaction:`setDefaultRWConcern` (New in version 4.4)
261-
262258
- :authaction:`setFeatureCompatibilityVersion`
263259
- :authaction:`setFreeMonitoring`
264260

@@ -398,16 +394,13 @@ Cluster Administration Roles
398394
- :authaction:`hostInfo`
399395
- :authaction:`inprog`
400396
- :authaction:`listDatabases`
401-
402397
- :authaction:`listSessions` (New in version 3.6)
403-
404398
- :authaction:`listShards`
405399
- :authaction:`netstat`
406400
- :authaction:`replSetGetConfig`
407401
- :authaction:`replSetGetStatus`
408402
- :authaction:`serverStatus`
409403
- :authaction:`setFreeMonitoring` (New in version 4.0)
410-
411404
- :authaction:`shardingState`
412405
- :authaction:`top`
413406

source/reference/command/mapReduce.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -370,7 +370,7 @@ collection <mapreduce-out-mtd>`:
370370

371371
- :authaction:`find`,
372372
- :authaction:`insert`,
373-
- :authaction:`replace`
373+
- :authaction:`remove`
374374

375375
Map-reduce with the ``merge`` or ``reduce`` actions when
376376
:ref:`outputting to a collection <mapreduce-out-mtd>`:

source/reference/privilege-actions.txt

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -265,6 +265,13 @@ Database Management Actions
265265
User can kill **any** cursor, even cursors created by other users.
266266
Apply this action to collection resources.
267267

268+
.. authaction:: planCacheIndexFilter
269+
270+
User can run the :dbcommand:`planCacheClearFilters`,
271+
:dbcommand:`planCacheListFilters`, and
272+
:dbcommand:`planCacheSetFilter` commands. Apply the
273+
:authaction:`planCacheIndexFilter` action to collection resources.
274+
268275
.. authaction:: revokeRole
269276

270277
User can remove any role from any user from any database in the system.
@@ -302,6 +309,11 @@ Database Management Actions
302309

303310
Apply this action to database resources.
304311

312+
.. authaction:: setFeatureCompatibilityVersion
313+
314+
User can run the :dbcommand:`setFeatureCompatibilityVersion` command.
315+
Apply this action to the ``cluster`` resource.
316+
305317
.. authaction:: unlock
306318

307319
User can perform the :method:`db.fsyncUnlock()` method. Apply this

source/reference/program/mongo.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -385,7 +385,9 @@ Core Options
385385
Specifies a JavaScript file to run and then exit. Generally this should
386386
be the last option specified.
387387

388-
.. optional:: To specify a JavaScript file to execute *and* allow
388+
.. note:: Optional
389+
390+
To specify a JavaScript file to execute *and* allow
389391
:program:`mongo` to prompt you for a password using
390392
:option:`--password`, pass the filename as the first parameter with
391393
:option:`--username` and :option:`--password` as the last options, as

source/release-notes/2.4-upgrade.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ operations.
210210
:term:`sharded cluster`, as described in
211211
:ref:`sharding-balancing-disable-temporarily`.
212212

213-
.. optional::
213+
.. note:: Optional
214214

215215
For additional security during the upgrade, you can make a
216216
backup of the config database using :binary:`~bin.mongodump` or
@@ -265,7 +265,7 @@ operations.
265265
require manual intervention. To continue the upgrade process, you
266266
must follow the :ref:`upgrade-cluster-resync` procedure.
267267

268-
.. optional::
268+
.. note:: Optional
269269

270270
If the :binary:`~bin.mongos` logs show the upgrade waiting for the
271271
upgrade lock, a previous upgrade process may still be active or

source/tutorial/add-shards-to-shard-cluster.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,9 @@ instance.
5555
name of the replica set and specify a member of the set. In
5656
production deployments, all shards should be replica sets.
5757

58-
.. optional:: You can instead use the :dbcommand:`addShard` database
58+
.. note:: Optional
59+
60+
You can instead use the :dbcommand:`addShard` database
5961
command, which lets you specify a name and maximum size for the
6062
shard. If you do not specify these, MongoDB automatically assigns
6163
a name and maximum size. To use the database command, see

source/tutorial/configure-audit-filters.txt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -130,8 +130,8 @@ that occur against the ``test`` database by using the filter:
130130
path: data/db/auditLog.bson
131131
filter: '{ atype: "authenticate", "param.db": "test" }'
132132

133-
To filter on all :authaction:`authenticate` operations across
134-
databases, use the filter ``{ atype: "authenticate" }``.
133+
To filter on all ``authenticate`` operations across databases, omit
134+
``"param.db": "test"`` and use the filter ``{ atype: "authenticate" }``.
135135

136136
Filter on Collection Creation and Drop Operations for a Single Database
137137
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -212,9 +212,9 @@ with roles that inherit from :authrole:`readWrite`, by using the filter:
212212
Filter on Read and Write Operations
213213
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
214214

215-
To capture :authaction:`read` and :authaction:`write` operations in the
216-
audit, you must also enable the audit system to log authorization
217-
successes using the :parameter:`auditAuthorizationSuccess` parameter.
215+
To capture read and write operations in the audit, you must also
216+
enable the audit system to log authorization successes using the
217+
:parameter:`auditAuthorizationSuccess` parameter.
218218
[#authorization-agnostic]_
219219

220220
.. note::
@@ -257,9 +257,9 @@ The following example audits the :method:`~db.collection.find()`,
257257
Filter on Read and Write Operations for a Collection
258258
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
259259

260-
To capture :authaction:`read` and :authaction:`write` operations in the
261-
audit, you must also enable the audit system to log authorization
262-
successes using the :parameter:`auditAuthorizationSuccess` parameter.
260+
To capture read and write operations in the audit, you must also
261+
enable the audit system to log authorization successes using the
262+
:parameter:`auditAuthorizationSuccess` parameter.
263263
[#authorization-agnostic]_
264264

265265
.. note::

source/tutorial/configure-linux-iptables-firewall.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ port ``27017``, which allows the application server to connect to the
8282
:binary:`~bin.mongod` instance. The second rule, allows outgoing traffic
8383
from the :binary:`~bin.mongod` to reach the application server.
8484

85-
.. optional::
85+
.. note:: Optional
8686

8787
If you have only one application server, you can replace
8888
``<ip-address>`` with either the IP address itself, such as:

0 commit comments

Comments
 (0)