DOCSP-26955 BACKPORT (#2267)

Author: Dave Cuthbert

source/administration/configuration.txt

@@ -357,7 +357,7 @@ The :setting:`~storage.dbPath` value controls the location of the
 :binary:`~bin.mongod` instance's data directory. Ensure that each database
 has a distinct and well labeled data directory. The
 :setting:`~processManagement.pidFilePath` controls where :binary:`~bin.mongod` process
-places it's :term:`process id (PID) <PID>` file. As this tracks the specific
+places it's :term:`process ID (PID) <PID>` file. As this tracks the specific
 :binary:`~bin.mongod` file, it is crucial that file be unique and well
 labeled to make it easy to start and stop these processes.
 

source/administration/monitoring.txt

@@ -527,7 +527,7 @@ use the following command to view the "balancer" lock.
 .. versionchanged:: 3.4
 
    Starting in 3.4, the primary of the CSRS config server holds the
-   "balancer" lock, using a process id named "ConfigServer". This lock
+   "balancer" lock, using a process ID named "ConfigServer". This lock
    is never released. To determine if the balancer is running, see
    :ref:`sharding-balancing-is-running`.
 

source/core/replica-set-sync.txt

@@ -246,7 +246,7 @@ Multithreaded Replication
 ~~~~~~~~~~~~~~~~~~~~~~~~~
 
 MongoDB applies write operations in batches using multiple threads to
-improve concurrency. MongoDB groups batches by document id (:ref:`WiredTiger
+improve concurrency. MongoDB groups batches by document ID (:ref:`WiredTiger
 <storage-wiredtiger>`) and simultaneously applies each group of
 operations using a different thread. MongoDB always applies write
 operations to a given document in their original write order.

source/core/tailable-cursors.txt

@@ -48,7 +48,7 @@ Consider the following behaviors related to tailable cursors:
   - the cursor returns the document at the "end" of the collection and
     then the application deletes that document.
 
-  A *dead* cursor has an id of ``0``.
+  A *dead* cursor has an ID of ``0``.
 
 See your :driver:`driver documentation </>` for the
 driver-specific method to specify the tailable cursor.

source/includes/changelogs/releases/3.2.10.rst

@@ -52,7 +52,7 @@ WiredTiger
 - :issue:`WT-2221` Document which statistics are available via a "fast" configuration vs. an "all" configuration
 - :issue:`WT-2233` Investigate changing when the eviction server switches to aggressive mode.
 - :issue:`WT-2239` Make sure LSM cursors read up to date dsk_gen, it was racing with compact
-- :issue:`WT-2323` Allocate a transaction id at the beginning of join cursor iteration
+- :issue:`WT-2323` Allocate a transaction ID at the beginning of join cursor iteration
 - :issue:`WT-2843` Fix a bug in recovery if there is no filesystem truncate support
 - :issue:`WT-2846` Several bugs related to reconfiguring eviction server at runtime
 - :issue:`WT-2353` Failure to create async threads as part of a wiredtiger_open call will cause a hang

source/includes/changelogs/releases/3.4.19.rst

@@ -65,7 +65,7 @@ Internals
 ~~~~~~~~~
 
 - :issue:`SERVER-18985` setParameter should log at level 0
-- :issue:`SERVER-23818` Include Evergreen task id in metadata sent to logkeeper
+- :issue:`SERVER-23818` Include Evergreen task ID in metadata sent to logkeeper
 - :issue:`SERVER-36250` Add support for optionally logging specific negotiated TLS versions 
 - :issue:`SERVER-37120` Turn off linux-replSet-initialsync-logkeeper Build Variant for 3.4 and 3.6 branches
 - :issue:`SERVER-37647` Validation hook sets FCV to 3.4 no matter what version it currently is

source/includes/changelogs/releases/3.6.18.rst

@@ -67,7 +67,7 @@ Internals
 - :issue:`SERVER-43349` Incorrect serialization for $elemMatch $not $ne
 - :issue:`SERVER-44325` Add polyfill for certificate chain verification
 - :issue:`SERVER-44435` Allow x509 authorization to be selectively enabled based on the CA
-- :issue:`SERVER-44868` Initialsync logkeeper and logkeeper-short tests should pass snapshot id and dataset link respectively to dsi(sys-perf)
+- :issue:`SERVER-44868` Initialsync logkeeper and logkeeper-short tests should pass snapshot ID and dataset link respectively to dsi(sys-perf)
 - :issue:`SERVER-45156` SockAddr constructor should take sockaddr, not sockaddr_storage
 - :issue:`SERVER-45472` Ensure RoleGraph can serialize authentication restrictions to BSON
 - :issue:`SERVER-45766` Remove "requires" from the server yaml

source/includes/changelogs/releases/3.6.4.rst

@@ -27,7 +27,7 @@ Replication
 - :issue:`SERVER-31399` repl.apply.batches.totalMillis does not record the time spent applying batches
 - :issue:`SERVER-31666` catchup_takeover_one_high_priority should use initiateWithAnyNodeAsPrimary
 - :issue:`SERVER-31669` Increase the election timeout in case 3 of catchup.js
-- :issue:`SERVER-32776` Refresh rollback id cache on increment
+- :issue:`SERVER-32776` Refresh rollback ID cache on increment
 - :issue:`SERVER-33448` Relax time diff requirements in apply_batches_totalMillis.js
 - :issue:`SERVER-33618` Initial sync should consider applyOps a CrudOpType
 

source/includes/changelogs/releases/3.6.9.rst

@@ -25,7 +25,7 @@ Sharding
 - :issue:`SERVER-37496` The balancer shouldn't register a shutdown task after the process is multithreaded
 - :issue:`SERVER-37631` Disable logical sessions if FCV is 3.4
 - :issue:`SERVER-37657` Report the offending oplog entries if a batch contains non-increasing transaction numbers
-- :issue:`SERVER-37735` [3.6] Ensure the full logical session id is included in commands sent by the ShardingTaskExecutor
+- :issue:`SERVER-37735` [3.6] Ensure the full logical session ID is included in commands sent by the ShardingTaskExecutor
 
 Replication
 ~~~~~~~~~~~
@@ -84,7 +84,7 @@ Storage
 Operations
 ~~~~~~~~~~
 
-- :issue:`SERVER-32064` A logical session id should be included in all command requests from the mongo shell
+- :issue:`SERVER-32064` A logical session ID should be included in all command requests from the mongo shell
 - :issue:`SERVER-33606` mongo shell startSession() should fail if the server doesn't support logical sessions
 - :issue:`SERVER-34864` String-valued fields should not participate in schema change detection in ftdc
 

source/includes/changelogs/releases/4.0.1.rst

@@ -98,7 +98,7 @@ Operations
 ~~~~~~~~~~
 
 - :issue:`SERVER-27264` With net.ssl.allowConnectionsWithoutCertificates: true, allow disabling no client certificate log warnings
-- :issue:`SERVER-32064` A logical session id should be included in all command requests from the mongo shell
+- :issue:`SERVER-32064` A logical session ID should be included in all command requests from the mongo shell
 - :issue:`SERVER-34160` Mongo client run buffered command when terminated.
 - :issue:`SERVER-35758` Mongo shell prompt errors when running transactions after overriding "db"
 - :issue:`SERVER-35903` Free monitoring doesn't allow disabling from the shell without enabling it first

source/includes/changelogs/releases/4.0.14.rst

@@ -118,7 +118,7 @@ Internals
 - :issue:`SERVER-44568` Update the embedded version of the server's timezone data file to tzdb-2019c
 - :issue:`SERVER-44651` Update signal processing version
 - :issue:`SERVER-44727` detect-changes should not be called via run-dsi
-- :issue:`SERVER-44868` Initialsync logkeeper and logkeeper-short tests should pass snapshot id and dataset link respectively to dsi(sys-perf)
+- :issue:`SERVER-44868` Initialsync logkeeper and logkeeper-short tests should pass snapshot ID and dataset link respectively to dsi(sys-perf)
 - :issue:`SERVER-44946` Reenable tests disabled in BACKPORT-4512
 - :issue:`WT-4499` Fix prepared transactions for cursor key order check failure 
 - :issue:`WT-4520` Fix prepare transactions fallout during cursor navigation

source/includes/changelogs/releases/4.0.20.rst

@@ -75,7 +75,7 @@ Internals
 - :issue:`SERVER-48514` Separate testing 'called' and 'successful' fields for serverStatus election metrics
 - :issue:`SERVER-48569` Add ConflictingOperationInProgress as acceptable error code to stepDown in validateCollectionsCallback
 - :issue:`SERVER-48657` Use evergreen module to control signal processing in perf projects
-- :issue:`SERVER-49007` Roundtrip registration id in metrics response in mock_http_server.py
+- :issue:`SERVER-49007` Roundtrip registration ID in metrics response in mock_http_server.py
 - :issue:`SERVER-49071` Make ldap_fastest_host_selection.js tolerate missing LDAP servers in statistics
 - :issue:`SERVER-49142` Validate correct field name in RoleName::parseFromBSON()
 - :issue:`SERVER-49335` publish_packages should use barque API key

source/includes/changelogs/releases/4.0.21.rst

@@ -91,6 +91,6 @@ Internals
 - :issue:`SERVER-51802` Add requires_majority_read_concern tag to decrypt_tool.js on v4.0
 - :issue:`TOOLS-2589` [v4.0] sslAllowInvalidHostnames bypass ssl/tls server certification validation entirely
 - :issue:`WT-6421` Avoid parsing metadata checkpoint for clean files
-- :issue:`WT-6559` Use the session id from the new session to determine statistics bucket
+- :issue:`WT-6559` Use the session ID from the new session to determine statistics bucket
 - :issue:`WT-6598` Add new API allowing changing dhandle hash bucket size
 

source/includes/changelogs/releases/4.0.3.rst

@@ -53,7 +53,7 @@ Query
 ~~~~~
 
 - :issue:`SERVER-13946` Consider putting skip stages below fetch stages
-- :issue:`SERVER-36212` getMore should not enforce that session id matches until FCV is 4.0
+- :issue:`SERVER-36212` getMore should not enforce that session ID matches until FCV is 4.0
 - :issue:`SERVER-36299` Implement support for exhaust cursors with OP_MSG in DBClientCursor
 - :issue:`SERVER-36435` Increase maxTimeMS timeout in awaitdata_getmore_cmd.js
 - :issue:`SERVER-36453` Fix race condition in aggregation_cursor_invalidations.js

source/includes/changelogs/releases/4.2.1.rst

@@ -19,7 +19,7 @@ Sharding
 - :issue:`SERVER-33973` Commands to force cleanup of partial data that might have remained after failed collection/database drop
 - :issue:`SERVER-36222` call to ReplSetTest.restart in shard_identity_rollback.js is racy
 - :issue:`SERVER-36315` After stepdown the CSRS dist lock manager keeps trying to unlock locks
-- :issue:`SERVER-39573` Add unique id to log label "TransactionCoordinator"
+- :issue:`SERVER-39573` Add unique ID to log label "TransactionCoordinator"
 - :issue:`SERVER-39763` transactions_target_at_point_in_time.js should disable expiring old chunk history
 - :issue:`SERVER-40258` Relax locking requirements for sharding metadata refresh on shards
 - :issue:`SERVER-40496` transactions_snapshot_errors_subsequent_statements.js and transactions_writes_not_retryable.js should not use mode {times: 1} for failpoint

source/includes/changelogs/releases/4.2.10.rst

@@ -85,7 +85,7 @@ Internals
 - :issue:`WT-6215` Clear backup block information on rename: Reverted
 - :issue:`WT-6421` Avoid parsing metadata checkpoint for clean files
 - :issue:`WT-6539` Fix backup and rename memory leak
-- :issue:`WT-6559` Use the session id from the new session to determine statistics bucket
+- :issue:`WT-6559` Use the session ID from the new session to determine statistics bucket
 - :issue:`WT-6598` Add new API allowing changing dhandle hash bucket size
 - :issue:`WT-6610` Fix incremental backup checkpoint parsing to handle upgrades
 - :issue:`WT-6611` Revert enhancement allowing rename and incremental backup

source/includes/changelogs/releases/4.2.12.rst

@@ -57,7 +57,7 @@ Build and Packaging
 Internals
 ~~~~~~~~~
 
-- :issue:`SERVER-41836` Log thread Id as part of error in FSM tests
+- :issue:`SERVER-41836` Log thread ID as part of error in FSM tests
 - :issue:`SERVER-43739` SNI name is not set on OSX if allowInvalidHostnames is enabled
 - :issue:`SERVER-44375` fix merge_with_drop_shard.js when the curop command fails due to ShardNotFound
 - :issue:`SERVER-47863` Initial Sync Progress Metrics

source/includes/changelogs/releases/4.2.2.rst

@@ -144,7 +144,7 @@ Internals
 - :issue:`SERVER-44651` Update signal processing version
 - :issue:`SERVER-44721` Shell KMS AWS support cannot decrypt responses
 - :issue:`SERVER-44727` detect-changes should not be called via run-dsi
-- :issue:`SERVER-44868` Initialsync logkeeper and logkeeper-short tests should pass snapshot id and dataset link respectively to dsi(sys-perf)
+- :issue:`SERVER-44868` Initialsync logkeeper and logkeeper-short tests should pass snapshot ID and dataset link respectively to dsi(sys-perf)
 - :issue:`WT-4486` Number of syncs did not increase in dirty max test 
 - :issue:`WT-4565` Fix tree walk code with read-no-wait flag set
 - :issue:`WT-4702` Switch to ubuntu1804-test Evergreen distro

source/includes/changelogs/releases/4.2.9.rst

@@ -99,7 +99,7 @@ Internals
 - :issue:`SERVER-48657` Use evergreen module to control signal processing in perf projects
 - :issue:`SERVER-48891` nullptr dereference on ViewCatalog in reIndex when Database does not exist 
 - :issue:`SERVER-48907` Allow users to patch test changes to linkbench/linkbench2 using evergreen set-module
-- :issue:`SERVER-49007` Roundtrip registration id in metrics response in mock_http_server.py
+- :issue:`SERVER-49007` Roundtrip registration ID in metrics response in mock_http_server.py
 - :issue:`SERVER-49071` Make ldap_fastest_host_selection.js tolerate missing LDAP servers in statistics
 - :issue:`SERVER-49097` sys-perf builds differ from release builds
 - :issue:`SERVER-49142` Validate correct field name in RoleName::parseFromBSON()

source/includes/changelogs/releases/4.4.1.rst

@@ -144,7 +144,7 @@ Internals
 - :issue:`SERVER-48952` logv2 cleanup for src/mongo/util/stacktrace_posix.cpp
 - :issue:`SERVER-48965` Make update_and_bulk_insert.js less heavy
 - :issue:`SERVER-48982` Respond to heartbeats until reconfig thread finishes in StepdownShouldInterruptConfigWrite
-- :issue:`SERVER-49007` Roundtrip registration id in metrics response in mock_http_server.py
+- :issue:`SERVER-49007` Roundtrip registration ID in metrics response in mock_http_server.py
 - :issue:`SERVER-49016` Ninja build reporting "no such file: /proc/cpuinfo"
 - :issue:`SERVER-49026` pseudo_commands.js can kill operation with opId '1234' mistakenly
 - :issue:`SERVER-49054` Server MSI should install Compass instead of Compass Community
@@ -207,5 +207,5 @@ Internals
 - :issue:`WT-6552` Fix configure flags in evergreen.yml for failing PPC tests
 - :issue:`WT-6578` Prevent reconciliation from looking past the on-disk value
 - :issue:`WT-6611` Revert enhancement allowing rename and incremental backup
-- :issue:`WT-6623` Set the connection level file id in recovery file scan
+- :issue:`WT-6623` Set the connection level file ID in recovery file scan
 

source/includes/changelogs/releases/4.4.2.rst

@@ -255,7 +255,7 @@ Internals
 - :issue:`WT-6544` Onpage value not appended to the tombstone restored from the data or history store
 - :issue:`WT-6546` Update fast truncate to use newest start durable ts
 - :issue:`WT-6556` Fix internal sessions to use internal session close function than public API to avoid memory leak
-- :issue:`WT-6559` Use the session id from the new session to determine statistics bucket
+- :issue:`WT-6559` Use the session ID from the new session to determine statistics bucket
 - :issue:`WT-6560` Fix usage of global salvage in WT utility
 - :issue:`WT-6561` Provide MongoDB configuration in the wt utility usage output
 - :issue:`WT-6569` Squash the prepared updates into a single update before writing it to data store

source/includes/changelogs/releases/4.4.5.rst

@@ -183,7 +183,7 @@ Internals
 - :issue:`WT-7183` Sort test filenames in test coverage document
 - :issue:`WT-7184` Prevent non-ASCII input in doc files
 - :issue:`WT-7192` Fix failing assert when in-use dhandle can't be reopened
-- :issue:`WT-7200` Incorrect stop transaction id when fixing out of order timestamps in history store
+- :issue:`WT-7200` Incorrect stop transaction ID when fixing out of order timestamps in history store
 - :issue:`WT-7202` Check for no count in assertion
 - :issue:`WT-7206` Update test framework to align with C++ style
 - :issue:`WT-7208` Leave table cursor in a valid state when subordinate index fails to open

source/includes/changelogs/releases/4.4.7.rst

@@ -322,7 +322,7 @@ Internals
 - :issue:`WT-7545` Limit upgrade/downgrade testing to timestamp transactions at snapshot isolation
 - :issue:`WT-7546` Coverity: Minor issues in CppSuite test harness
 - :issue:`WT-7548` Create macro to identify dhandles directly associated with a Btree
-- :issue:`WT-7549` clean up block manager identifiers to use object id naming
+- :issue:`WT-7549` clean up block manager identifiers to use object ID naming
 - :issue:`WT-7550` Properly check pinned page and fix not resetting cursor if error
 - :issue:`WT-7565` Update invalid backup configurations
 - :issue:`WT-7566` Resolve write after free for dead dhandle
@@ -333,7 +333,7 @@ Internals
 - :issue:`WT-7577` Add sync configuration to flush_tier
 - :issue:`WT-7579` Disable prefix testing in compatibility test due to snapshot isolation search mismatch
 - :issue:`WT-7581` Make wt_cache_config args consistent with other config functions
-- :issue:`WT-7588` Make tiered object id numbers 32 bits
+- :issue:`WT-7588` Make tiered object ID numbers 32 bits
 - :issue:`WT-7594` Use key_consistent mode on format TS runs
 - :issue:`WT-7595` Add flag to history store cursor to track whether underlying table insertion was successful
 - :issue:`WT-7602` Fix MacOS CMake Compilation Issues

source/includes/extracts-command-field.yaml

@@ -23,7 +23,7 @@ content: |
   
   The following example output contains the command object for a
   :dbcommand:`getMore` operation generated by
-  a command with cursor id ``19234103609`` on a collection named
+  a command with cursor ID ``19234103609`` on a collection named
   ``items`` in a database named ``test``:
   
   .. code-block:: javascript

source/includes/extracts-sessions.yaml

@@ -22,7 +22,7 @@ content: |
       * - ``lsid``
         - Document
 
-        - The document that specifies the unique id of the session
+        - The document that specifies the unique ID of the session
           associated with the command. If the ``txnNumber`` is
           specified, the ``lsid`` is required.
 

source/reference/command/currentOp.txt

@@ -790,7 +790,7 @@ Output Fields
 
       .. versionadded:: 4.2
 
-      The id of the cursor.
+      The ID of the cursor.
 
    .. data:: currentOp.cursor.createdDate
 

source/reference/command/find.txt

@@ -400,7 +400,7 @@ Output
 ~~~~~~
 
 The command returns a document that contains the cursor information,
-including the cursor id and the first batch of documents. For example,
+including the cursor ID and the first batch of documents. For example,
 the following document is returned when run against a sharded
 collection:
 

source/reference/command/getMore.txt

@@ -151,7 +151,7 @@ For example, a document similar to the one below may be returned when
    * - ``cursor``
 
      - Contains the cursor information, including the
-       cursor id as well as the ``nextBatch`` of documents.
+       cursor ID as well as the ``nextBatch`` of documents.
 
        Starting in 4.4, if the cursor from a :dbcommand:`find` command
        returns partial results due to the unavailability of the queried

source/reference/command/killAllSessionsByPattern.txt

@@ -39,8 +39,7 @@ match:
      - Description
 
    * - ``{ lsid: { id : <UUID> } }``
-
-     - Specify the UUID portion of the session id to kill.
+     - Specify the UUID portion of the session ID to kill.
 
    * - ``{ uid: <BinData> }``
 

source/reference/method/Mongo.startSession.txt

@@ -15,11 +15,9 @@ Definition
 
 .. method:: Mongo.startSession(<options>)
 
-   .. versionadded:: 3.6
-
-   Starts a :ref:`session <sessions>` for the connection. The
-   :binary:`~bin.mongo` shell assigns the session id to
-   commands associated with the session.
+   Starts a :ref:`session <sessions>` for the connection.
+   :binary:`~bin.mongo` assigns the session ID to commands associated
+   with the session.
 
    The :method:`~Mongo.startSession()` method can take a document with
    session options. The options available are: