Skip to content

Commit

Permalink
[BACKPORT] Docsp 36255 -- Build error cleanup (#6246) (#6275)
Browse files Browse the repository at this point in the history
* Docsp 36255 -- Build error cleanup (#6246)

* DOCSP-36255: Remove link to 2.6 release notes

* DOCSP-36255: missing link build error fix

* DOCSP-36255: Build error fix

* DOCSP-36255: Build error fix

* DOCSP-36255: Build error fix

* DOCSP-36255-v7.0: Build error fix
  • Loading branch information
sarah-olson-mongodb authored Feb 6, 2024
1 parent 2b997ff commit 026d094
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 14 deletions.
4 changes: 0 additions & 4 deletions source/core/replica-set-write-concern.txt
Original file line number Diff line number Diff line change
Expand Up @@ -110,10 +110,6 @@ operation. Refer to the documentation for the write operation for
instructions on write concern support and syntax. For complete
documentation on write concern, see :ref:`write-concern`.

.. seealso::

:ref:`write-methods-incompatibility`

.. _repl-set-modify-default-write-concern:

Modify Default Write Concern
Expand Down
2 changes: 1 addition & 1 deletion source/includes/fact-ssl-tlsCAFile-tlsUseSystemCA.rst
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
When starting a :binary:`~bin.mongod` instance with
:ref:`TLS/SSL enabled <configure-mongod-mongos-for-tls-ssl>`, you must
specify a value for the :option:`--tlsCAFile <mongod --tlsCAFile>` flag, the
:setting:`tls.CAFile` configuration option, or the :parameter:`tlsUseSystemCA`
:setting:`net.tls.CAFile` configuration option, or the :parameter:`tlsUseSystemCA`
parameter.

``--tlsCAFile``, ``tls.CAFile``, and ``tlsUseSystemCA`` are all mutually
Expand Down
2 changes: 1 addition & 1 deletion source/release-notes/3.0-compatibility.txt
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@ If you do not currently have any users *or* you are using
``authSchema`` version 1, the query will not return any result.

If your ``authSchema`` version is less
than ``3`` or the query does not return any results, see :doc:`/release-notes/2.6-upgrade-authorization` to
than ``3`` or the query does not return any results, see the 2.6 Upgrade Authorization to
upgrade the ``authSchema`` version before upgrading to MongoDB 3.0.

After upgrading MongoDB to 3.0 from 2.6, to use the new ``SCRAM-SHA-1``
Expand Down
4 changes: 1 addition & 3 deletions source/release-notes/3.0-upgrade.txt
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,7 @@ version earlier than MongoDB 2.4.
If your existing MongoDB deployment is already running with
authentication and authorization, your user data model ``authSchema``
must be at least version 3. To verify the version of your existing
``authSchema``, see :ref:`legacy-auth-model-removed`. To upgrade your
``authSchema`` version, see
:ref:`Upgrade Authorization Data <2.6-upgrade-authorization-model>` for details.
``authSchema``, see :ref:`legacy-auth-model-removed`.

Preparedness
~~~~~~~~~~~~
Expand Down
4 changes: 2 additions & 2 deletions source/release-notes/4.0.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1537,11 +1537,11 @@ Network Layer Improvements

- :parameter:`connPoolMaxInUseConnsPerHost`

- :parameter:`connPoolMaxShardedInUseConnsPerHost`
- ``connPoolMaxShardedInUseConnsPerHost``

- :parameter:`globalConnPoolIdleTimeoutMinutes`

- :parameter:`shardedConnPoolIdleTimeoutMinutes`
- ``shardedConnPoolIdleTimeoutMinutes``

Configuration Options
~~~~~~~~~~~~~~~~~~~~~
Expand Down
6 changes: 3 additions & 3 deletions source/release-notes/4.2.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1808,11 +1808,11 @@ the following output changes:
<metrics.repl.network.notPrimaryUnacknowledgedWrites>`

* - :serverstatus:`metrics.repl`
- Added new :serverstatus:`metrics.repl.stateTransition` metrics:
- Added new ``metrics.repl.stepDown`` metrics:

- :serverstatus:`metrics.repl.stateTransition.userOperationsKilled`
- ``metrics.repl.stepDown.userOperationsKilled``

- :serverstatus:`metrics.repl.stateTransition.userOperationsRunning`
- ``metrics.repl.stepDown.userOperationsRunning``

* - :serverstatus:`transactions`

Expand Down

0 comments on commit 026d094

Please sign in to comment.