From 50bb88c4f6ab903c6fa54a306442944b6838dbd7 Mon Sep 17 00:00:00 2001 From: Naomi Pentrel <5212232+npentrel@users.noreply.github.com> Date: Mon, 3 May 2021 21:03:54 +0200 Subject: [PATCH 1/2] DOCSP-8628: Remove isMaster refs in release notes --- source/release-notes/2.0.txt | 2 +- source/release-notes/2.6-changelog.txt | 2 +- source/release-notes/2.6.txt | 2 +- source/release-notes/4.0.txt | 6 +++--- source/release-notes/4.2.txt | 8 ++++---- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/source/release-notes/2.0.txt b/source/release-notes/2.0.txt index 4f0ff250b05..4d278ad7e65 100644 --- a/source/release-notes/2.0.txt +++ b/source/release-notes/2.0.txt @@ -410,7 +410,7 @@ In 2.0, when running with authentication (e.g. :setting:`~security.authorization database commands require authentication, *except* the following commands. -- :dbcommand:`isMaster` +- ``isMaster`` - :dbcommand:`authenticate` diff --git a/source/release-notes/2.6-changelog.txt b/source/release-notes/2.6-changelog.txt index d1df57520c0..b23bac3d6f6 100644 --- a/source/release-notes/2.6-changelog.txt +++ b/source/release-notes/2.6-changelog.txt @@ -112,7 +112,7 @@ Write Ops ~~~~~~~~~ - :issue:`SERVER-18111` :binary:`~bin.mongod` allows user inserts into ``system.profile`` collection -- :issue:`SERVER-13542` Expose ``electionId`` on primary in :dbcommand:`isMaster` +- :issue:`SERVER-13542` Expose ``electionId`` on primary in ``isMaster`` Networking ~~~~~~~~~~ diff --git a/source/release-notes/2.6.txt b/source/release-notes/2.6.txt index 778d77485bc..0bd4f3572e3 100644 --- a/source/release-notes/2.6.txt +++ b/source/release-notes/2.6.txt @@ -555,7 +555,7 @@ Networking sharded clusters. - The C++ driver now monitors :term:`replica set` health with the - :dbcommand:`isMaster` command instead of + ``isMaster`` command instead of :dbcommand:`replSetGetStatus`. This allows the C++ driver to support systems that require authentication. diff --git a/source/release-notes/4.0.txt b/source/release-notes/4.0.txt index aec3cc764d1..0094f9f21b5 100644 --- a/source/release-notes/4.0.txt +++ b/source/release-notes/4.0.txt @@ -853,11 +853,11 @@ respectively. New Option for ``isMaster`` Command ``````````````````````````````````` -Starting in MongoDB 4.0, the :dbcommand:`isMaster` command accepts an +Starting in MongoDB 4.0, the ``isMaster`` command accepts an optional field ``saslSupportedMechs: `` to return an -additional field :data:`isMaster.saslSupportedMechs` in its result. +additional field ``isMaster.saslSupportedMechs`` in its result. -:data:`isMaster.saslSupportedMechs` is an array of SASL mechanisms used +``isMaster.saslSupportedMechs`` is an array of SASL mechanisms used to create the specified user's credentials. .. _4.0-mongodb-cr: diff --git a/source/release-notes/4.2.txt b/source/release-notes/4.2.txt index 256e29b4585..3fcf45ac48a 100644 --- a/source/release-notes/4.2.txt +++ b/source/release-notes/4.2.txt @@ -1921,7 +1921,7 @@ the operation completes, MongoDB marks the |operation| for termination - - - * - :dbcommand:`isMaster` + * - ``isMaster`` - - @@ -1986,9 +1986,9 @@ refer to :data:`~explain.queryPlanner.optimizedPipeline`. Change to ``isMaster`` Output ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Starting in MongoDB 4.2, the output for :dbcommand:`isMaster`, and the -:method:`db.isMaster()` helper method, returns the -:data:`~isMaster.connectionId` for the +Starting in MongoDB 4.2, the output for ``isMaster``, and the +``db.isMaster()`` helper method, returns the +``isMaster.connectionId`` for the :binary:`~bin.mongod`/:binary:`~bin.mongos` instance's connection to the client. From 661fe4882464e0b6666f5035acaf08f5de2bb501 Mon Sep 17 00:00:00 2001 From: Naomi Pentrel <5212232+npentrel@users.noreply.github.com> Date: Mon, 3 May 2021 21:30:03 +0200 Subject: [PATCH 2/2] Remove stray sentence in hello.txt --- source/reference/command/hello.txt | 3 --- 1 file changed, 3 deletions(-) diff --git a/source/reference/command/hello.txt b/source/reference/command/hello.txt index 8b3c3567a42..b04104a4192 100644 --- a/source/reference/command/hello.txt +++ b/source/reference/command/hello.txt @@ -116,9 +116,6 @@ roles: The value of this limit is ``100,000`` writes. - The limit raises from ``1,000`` to ``100,000`` writes. This limit - also applies to legacy ``OP_INSERT`` messages. - .. data:: hello.localTime Returns the local server time in UTC. This value is an