Skip to content

Commit 7f4dd4f

Browse files
[BACKPORT] DOCSP-36255: Build error fix (#6267)
* DOCSP-36255: Build error fix * 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-7.2 build fixes
1 parent 9fac721 commit 7f4dd4f

File tree

6 files changed

+8
-14
lines changed

6 files changed

+8
-14
lines changed

source/core/replica-set-write-concern.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -110,10 +110,6 @@ operation. Refer to the documentation for the write operation for
110110
instructions on write concern support and syntax. For complete
111111
documentation on write concern, see :ref:`write-concern`.
112112

113-
.. seealso::
114-
115-
:ref:`write-methods-incompatibility`
116-
117113
.. _repl-set-modify-default-write-concern:
118114

119115
Modify Default Write Concern

source/includes/fact-ssl-tlsCAFile-tlsUseSystemCA.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
When starting a :binary:`~bin.mongod` instance with
22
:ref:`TLS/SSL enabled <configure-mongod-mongos-for-tls-ssl>`, you must
33
specify a value for the :option:`--tlsCAFile <mongod --tlsCAFile>` flag, the
4-
:setting:`tls.CAFile` configuration option, or the :parameter:`tlsUseSystemCA`
4+
:setting:`net.tls.CAFile` configuration option, or the :parameter:`tlsUseSystemCA`
55
parameter.
66

77
``--tlsCAFile``, ``tls.CAFile``, and ``tlsUseSystemCA`` are all mutually

source/release-notes/3.0-compatibility.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,7 @@ If you do not currently have any users *or* you are using
327327
``authSchema`` version 1, the query will not return any result.
328328

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

333333
After upgrading MongoDB to 3.0 from 2.6, to use the new ``SCRAM-SHA-1``

source/release-notes/3.0-upgrade.txt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,7 @@ version earlier than MongoDB 2.4.
4949
If your existing MongoDB deployment is already running with
5050
authentication and authorization, your user data model ``authSchema``
5151
must be at least version 3. To verify the version of your existing
52-
``authSchema``, see :ref:`legacy-auth-model-removed`. To upgrade your
53-
``authSchema`` version, see
54-
:ref:`Upgrade Authorization Data <2.6-upgrade-authorization-model>` for details.
52+
``authSchema``, see :ref:`legacy-auth-model-removed`.
5553

5654
Preparedness
5755
~~~~~~~~~~~~

source/release-notes/4.0.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1537,11 +1537,11 @@ Network Layer Improvements
15371537

15381538
- :parameter:`connPoolMaxInUseConnsPerHost`
15391539

1540-
- :parameter:`connPoolMaxShardedInUseConnsPerHost`
1540+
- ``connPoolMaxShardedInUseConnsPerHost``
15411541

15421542
- :parameter:`globalConnPoolIdleTimeoutMinutes`
15431543

1544-
- :parameter:`shardedConnPoolIdleTimeoutMinutes`
1544+
- ``shardedConnPoolIdleTimeoutMinutes``
15451545

15461546
Configuration Options
15471547
~~~~~~~~~~~~~~~~~~~~~

source/release-notes/4.2.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1786,11 +1786,11 @@ the following output changes:
17861786
<metrics.repl.network.notPrimaryUnacknowledgedWrites>`
17871787

17881788
* - :serverstatus:`metrics.repl`
1789-
- Added new :serverstatus:`metrics.repl.stateTransition` metrics:
1789+
- Added new ``metrics.repl.stepDown`` metrics:
17901790

1791-
- :serverstatus:`metrics.repl.stateTransition.userOperationsKilled`
1791+
- ``metrics.repl.stepDown.userOperationsKilled``
17921792

1793-
- :serverstatus:`metrics.repl.stateTransition.userOperationsRunning`
1793+
- ``metrics.repl.stepDown.userOperationsRunning``
17941794

17951795
* - :serverstatus:`transactions`
17961796

0 commit comments

Comments
 (0)