Merge remote-tracking branch 'upstream/master' into v6.1

Author: jeff-allen-mongo

source/includes/quick-start/client.rst

@@ -121,7 +121,7 @@
       .. tip:: Add Your {+dek-long+} Base64 ID
 
          Make sure to update the following code to include your Base64
-         {+dek-abbr+} ID. You recieved this value in the
+         {+dek-abbr+} ID. You received this value in the
          :ref:`Generate your {+dek-long+} <csfle-local-create-dek>` step of this
          guide.
 

source/includes/tutorials/automatic/aws/client.rst

@@ -122,7 +122,7 @@
       .. tip:: Add Your {+dek-long+} Base64 ID
 
          Make sure to update the following code to include your Base64
-         {+dek-abbr+} ID. You recieved this value in the
+         {+dek-abbr+} ID. You received this value in the
          :ref:`Generate your {+dek-long+} <csfle-aws-create-dek>` step of this
          guide.
 

source/includes/tutorials/automatic/azure/client.rst

@@ -120,7 +120,7 @@
       .. tip:: Add Your {+dek-long+} Base64 ID
 
          Make sure to update the following code to include your Base64
-         {+dek-abbr+} ID. You recieved this value in the
+         {+dek-abbr+} ID. You received this value in the
          :ref:`Generate your {+dek-long+} <csfle-azure-create-dek>` step of this
          guide.
 

source/includes/tutorials/automatic/gcp/client.rst

@@ -119,7 +119,7 @@
       .. tip:: Add Your {+dek-long+} Base64 ID
 
          Make sure to update the following code to include your Base64
-         {+dek-abbr+} ID. You recieved this value in the
+         {+dek-abbr+} ID. You received this value in the
          :ref:`Generate your {+dek-long+} <csfle-gcp-create-dek>` step of this
          guide.
 

source/includes/tutorials/automatic/kmip/client.rst

@@ -41,7 +41,7 @@
       .. tip:: Add Your {+dek-long+} Base64 ID
 
          Make sure to update the following code to include your Base64
-         {+dek-abbr+} ID. You recieved this value in the
+         {+dek-abbr+} ID. You received this value in the
          :ref:`Generate your {+dek-long+} <csfle-kmip-create-dek>` step of this
          guide.
 

source/reference/command/replSetGetStatus.txt

@@ -17,7 +17,7 @@ Definition
 
    The ``replSetGetStatus`` command returns the status of the replica
    set from the point of view of the server that processed the command.
-   ``replSetGetStatus`` must be run against the :term:`admin database`.
+   ``replSetGetStatus`` must be run on the :term:`admin database`.
 
    The :binary:`~bin.mongod` instance must be a replica set member for
    :dbcommand:`replSetGetStatus` to return successfully.
@@ -47,9 +47,10 @@ The command has the following syntax:
       (i.e. :replstate:`STARTUP2` state), the command returns
       :data:`replSetGetStatus.initialSyncStatus` metrics.
 
-      Once the member finishes its initial sync and transitions to
-      another state, the :data:`replSetGetStatus.initialSyncStatus`
-      metrics are no longer available.
+      After the member completes the initial synchronization and
+      transitions to another state, the
+      :data:`replSetGetStatus.initialSyncStatus` metrics are no longer
+      available.
 
 - In earlier versions (3.6.x-4.2.0)
       To return :ref:`initial sync <replica-set-initial-sync>` status
@@ -60,7 +61,7 @@ The command has the following syntax:
 
          db.adminCommand( { replSetGetStatus: 1, initialSync: 1 } )
 
-      The :data:`replSetGetStatus.initialSyncStatus` metrics remains
+      The :data:`replSetGetStatus.initialSyncStatus` metrics remain
       available after the member completes its initial sync. That is,
       you can run the :dbcommand:`replSetGetStatus` command with the
       ``initialSync: 1`` on the secondary member to return its initial
@@ -265,7 +266,7 @@ Example
 
           The following example runs the :dbcommand:`replSetGetStatus`
           command on the :term:`admin database` of the replica set
-          secondary.
+          secondary:
 
           .. code-block:: javascript
 
@@ -452,9 +453,9 @@ Example
 
                 db.adminCommand( { replSetGetStatus: 1 } )
 
-             Once the member finishes its initial sync and transitions 
-             to another state, the 
-             :data:`replSetGetStatus.initialSyncStatus` document is no 
+             After the member completes the initial synchronization and
+             transitions to another state, the
+             :data:`replSetGetStatus.initialSyncStatus` metrics are no
              longer available.
 
           In earlier versions (3.6.x-4.2.0)
@@ -684,7 +685,7 @@ following fields:
 
 .. data:: replSetGetStatus.date
 
-   An :term:`ISODate` formatted date and time that reflects the current
+   An :term:`ISODate` formatted date and time that contains the current
    time according to the server that processed the
    :command:`replSetGetStatus` command. Compare this to the values of
    :data:`replSetGetStatus.members[n].lastHeartbeat` to find the
@@ -721,7 +722,7 @@ following fields:
 
    The :data:`~replSetGetStatus.syncSourceId` field holds the
    :data:`replSetGetStatus.members[n]._id` of the member from which
-   this instance syncs.
+   this instance synchronizes.
 
    If this instance is a primary,
    :data:`~replSetGetStatus.syncSourceHost` is an empty string and
@@ -735,7 +736,7 @@ following fields:
 
    .. versionadded:: 4.2.1
 
-   The number that corresponds to the majority votes needed to elect a
+   The number of majority votes needed to elect a
    new primary in an election.
 
 .. data:: replSetGetStatus.writeMajorityCount
@@ -761,7 +762,7 @@ following fields:
    .. versionadded:: 4.4
 
    The number of *data-bearing* members configured with :rsconf:`votes:
-   1 <members[n].votes>`; that is, the count does not include arbiters.
+   1 <members[n].votes>` (this does not include arbiters).
 
 .. data:: replSetGetStatus.optimes
 
@@ -786,9 +787,9 @@ following fields:
       :data:`~replSetGetStatus.optimes.lastCommittedOpTime`.
 
       The :data:`~replSetGetStatus.optimes.lastCommittedWallTime` may
-      not accurately reflect
+      not accurately represent the
       :data:`~replSetGetStatus.optimes.lastCommittedOpTime` if all
-      members are not on MongoDB 4.2 or greater since the
+      members are not on MongoDB 4.2 or greater because the
       :data:`~replSetGetStatus.optimes.lastCommittedWallTime`
       requires communication with other members of the deployment.
 
@@ -811,9 +812,9 @@ following fields:
       :data:`~replSetGetStatus.optimes.readConcernMajorityOpTime`.
 
       The :data:`~replSetGetStatus.optimes.readConcernMajorityWallTime`
-      may not accurately reflect
+      may not accurately represent the
       :data:`~replSetGetStatus.optimes.readConcernMajorityOpTime` if
-      all members are not on MongoDB 4.2 or greater since the
+      all members are not on MongoDB 4.2 or greater because the
       :data:`~replSetGetStatus.optimes.readConcernMajorityWallTime`
       requires communication with other members of the deployment.
 
@@ -872,7 +873,7 @@ following fields:
    Metrics related to the election of the current primary.
    :data:`~replSetGetStatus.electionCandidateMetrics` is only available
    on the primary or a candidate for election. For a candidate, the
-   metrics becomes unavailable once the candidate loses the election.
+   metrics are unavailable after the candidate loses the election.
 
    .. data:: replSetGetStatus.electionCandidateMetrics.lastElectionReason
 
@@ -893,23 +894,23 @@ following fields:
          In v4.2.1, ``electionTerm`` was named ``electionTerm``.
 
       The member's election count (i.e. :data:`~replSetGetStatus.term`)
-      at the time it called for the new election.
+      at the time it called the new election.
 
    .. data:: replSetGetStatus.electionCandidateMetrics.lastCommittedOpTimeAtElection
 
       .. versionadded:: 4.2.1
 
       The most recent :data:`majority-committed optime
       <replSetGetStatus.optimes.lastCommittedOpTime>`, as seen by this
-      member, at the time it called for the new election.
+      member, at the time it called the new election.
 
    .. data:: replSetGetStatus.electionCandidateMetrics.lastSeenOpTimeAtElection
 
       .. versionadded:: 4.2.1
 
       The member's most recent :data:`applied optime
       <replSetGetStatus.optimes.appliedOpTime>` at the time it called
-      for the new election.
+      the new election.
 
    .. data:: replSetGetStatus.electionCandidateMetrics.numVotesNeeded
 
@@ -969,7 +970,7 @@ following fields:
 
       The date and time at which the write concern
       :writeconcern:`"majority"` became available after the election
-      for the replica set(i.e. the date and time at which the ``new
+      for the replica set (the date and time when the ``new
       term`` oplog entry was majority committed).
 
 .. data:: replSetGetStatus.electionParticipantMetrics
@@ -996,14 +997,15 @@ following fields:
 
    .. data:: replSetGetStatus.electionParticipantMetrics.lastVoteDate
 
-      An :term:`ISODate` formatted date string that reflects when the
+      An :term:`ISODate` formatted date string that records when the
       participant voted.
 
       .. versionadded:: 4.2.2
 
    .. data:: replSetGetStatus.electionParticipantMetrics.electionCandidateMemberId
 
-      The :rsconf:`members[n]._id` of the candidate calling the election.
+      The :rsconf:`members[n]._id` of the candidate calling the
+      election.
 
       .. versionadded:: 4.2.2
 
@@ -1062,38 +1064,30 @@ following fields:
 
 .. data:: replSetGetStatus.initialSyncStatus
 
-
    A document that provides information on the progress and status of
    :ref:`initial sync <replica-set-initial-sync>` on this member.
 
    .. include:: /includes/fact-rs-status-init-sync-availability.rst
 
    .. data:: replSetGetStatus.initialSyncStatus.failedInitialSyncAttempts
 
-
       The number of times the :ref:`initial sync
       <replica-set-initial-sync>` failed and had to restart on this
       member.
 
-
    .. data:: replSetGetStatus.initialSyncStatus.maxFailedInitialSyncAttempts
 
-
       The maximum number of times the :ref:`initial sync
       <replica-set-initial-sync>` can restart on this member before
       the member shuts down.
 
-
    .. data:: replSetGetStatus.initialSyncStatus.initialSyncStart
 
-
       The start timestamp of the :ref:`initial sync
       <replica-set-initial-sync>` for this member.
 
-
    .. data:: replSetGetStatus.initialSyncStatus.initialSyncEnd
 
-
       The end timestamp of the :ref:`initial sync
       <replica-set-initial-sync>` for this member.
 
@@ -1103,10 +1097,8 @@ following fields:
       :data:`~replSetGetStatus.initialSyncStatus.initialSyncStart` and
       :data:`~replSetGetStatus.initialSyncStatus.initialSyncEnd`.
 
-
    .. data:: replSetGetStatus.initialSyncStatus.initialSyncAttempts
 
-
       Array of documents where each document corresponds to a single
       :ref:`initial sync <replica-set-initial-sync>` attempt. For example:
 
@@ -1168,10 +1160,8 @@ following fields:
       See also
       :data:`~replSetGetStatus.initialSyncStatus.failedInitialSyncAttempts`.
 
-
    .. data:: replSetGetStatus.initialSyncStatus.appliedOps
 
-
       The number of ops that occurred after the :ref:`initial sync
       <replica-set-initial-sync>` started and were applied after cloning
       the databases.
@@ -1180,10 +1170,8 @@ following fields:
       to update its data set to reflect the current state of the
       replica set.
 
-
    .. data:: replSetGetStatus.initialSyncStatus.initialSyncOplogStart
 
-
       The start timestamp of the oplog application stage of the
       :ref:`initial sync <replica-set-initial-sync>` where the
       member applies changes that occurred after the initial sync
@@ -1193,10 +1181,8 @@ following fields:
       to update its data set to reflect the current state of the
       replica set.
 
-   
    .. data:: replSetGetStatus.initialSyncStatus.initialSyncOplogEnd 
 
-
       The end timestamp of the oplog application stage of the
       :ref:`initial sync <replica-set-initial-sync>` where the
       member applies changes that occurred after the initial sync
@@ -1206,7 +1192,6 @@ following fields:
       to update its data set to reflect the current state of the
       replica set.
 
-
    .. data:: replSetGetStatus.initialSyncStatus.syncSourceUnreachableSince
 
       The date and time at which the sync source became unreachable. 
@@ -1239,7 +1224,6 @@ following fields:
 
    .. data:: replSetGetStatus.initialSyncStatus.databases.databasesCloned
 
-
       Number of databases cloned during :ref:`initial sync
       <replica-set-initial-sync>`.
 
@@ -1434,8 +1418,8 @@ following fields:
 
    .. data:: replSetGetStatus.members[n].health
 
-      A number that indicates if the member is up (i.e. ``1``) or down
-      (i.e. ``0``).
+      A number that indicates if the member is up (``1``) or down
+      (``0``).
 
    .. data:: replSetGetStatus.members[n].state
 
@@ -1448,12 +1432,14 @@ following fields:
 
    .. data:: replSetGetStatus.members[n].uptime
 
-      The :data:`~replSetGetStatus.members[n].uptime` field holds a value
-      that reflects the number of seconds that this member has been
-      online.
-
-      This value does not appear for the member that returns the
-      :method:`rs.status()` data.
+      For the member on which the :dbcommand:`replSetGetStatus` command
+      is run, :data:`~replSetGetStatus.members[n].uptime` is the 
+      the number of seconds the member has been online.
+      
+      For the other members, :data:`~replSetGetStatus.members[n].uptime`
+      is the number of seconds the member has been in continuous
+      communication with the member on which the
+      :dbcommand:`replSetGetStatus` command was run.
 
    .. data:: replSetGetStatus.members[n].optime
 
@@ -1484,17 +1470,17 @@ following fields:
 
    .. data:: replSetGetStatus.members[n].optimeDate
 
-      An :term:`ISODate` formatted date string that reflects the last
+      An :term:`ISODate` formatted date string that contains the last
       entry from the :term:`oplog` that this member applied. If this
       differs significantly from
       :data:`~replSetGetStatus.members[n].lastHeartbeat` this member is
       either experiencing "replication lag" *or* there have not been any
-      new operations since the last update. Compare
+      new operations after the last update. Compare
       ``members.optimeDate`` between all of the members of the set.
 
    .. data:: replSetGetStatus.members[n].optimeDurableDate
 
-      An :term:`ISODate` formatted date string that reflects the last
+      An :term:`ISODate` formatted date string that contains the last
       entry from the :term:`oplog` that this member applied to its
       journal.
 
@@ -1520,13 +1506,13 @@ following fields:
    .. data:: replSetGetStatus.members[n].electionDate
 
       For the current primary, an :term:`ISODate` formatted date string
-      that reflects the election date. See
+      that contains the election date. See
       :doc:`/core/replica-set-high-availability` for more information about
       elections.
 
    .. data:: replSetGetStatus.members[n].lastHeartbeat
 
-      An :term:`ISODate` formatted date and time that reflects the last
+      An :term:`ISODate` formatted date and time that contains the last
       time the server that processed the :command:`replSetGetStatus`
       command received a response from a heartbeat that it sent to this
       member (``members[n]``).
@@ -1538,7 +1524,7 @@ following fields:
 
    .. data:: replSetGetStatus.members[n].lastHeartbeatRecv
 
-      An :term:`ISODate` formatted date and time that reflects the last
+      An :term:`ISODate` formatted date and time that contains the last
       time the server that processed the :command:`replSetGetStatus`
       command received a heartbeat request from this member
       (``members[n]``).