From 745a0fb2389d467b614c266d1b58f75a88be975c Mon Sep 17 00:00:00 2001 From: Jeff Allen Date: Thu, 22 Jul 2021 10:33:49 -0400 Subject: [PATCH] fixups for mongod options fixups for mongod options --- source/includes/extracts-4.2-changes.yaml | 4 ++-- .../operator/aggregation/accumulator.txt | 2 +- source/reference/program/mongod.txt | 16 ++++++++-------- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/source/includes/extracts-4.2-changes.yaml b/source/includes/extracts-4.2-changes.yaml index 83b3af613f3..4e47d283058 100644 --- a/source/includes/extracts-4.2-changes.yaml +++ b/source/includes/extracts-4.2-changes.yaml @@ -200,13 +200,13 @@ content: | ref: 4.2-changes-options-tls-ssl content: | - MongoDB deprecates the SSL options and insteads adds new + MongoDB deprecates the SSL options and instead adds new corresponding TLS options. --- ref: 4.2-changes-options-tlsClusterCAFile content: | MongoDB adds - |tlsClusterCAFile|/:setting:`net.tls.clusterCAFile`. (Also availalbe + |tlsClusterCAFile|/:setting:`net.tls.clusterCAFile`. (Also available in 3.4.18+, 3.6.9+, 4.0.3+) --- ref: 4.2-changes-options-tls-ssl-upgrade diff --git a/source/reference/operator/aggregation/accumulator.txt b/source/reference/operator/aggregation/accumulator.txt index e1f41d2cfd8..c1641486fe6 100644 --- a/source/reference/operator/aggregation/accumulator.txt +++ b/source/reference/operator/aggregation/accumulator.txt @@ -62,7 +62,7 @@ The :group:`$accumulator` operator has this syntax: .. list-table:: :header-rows: 1 - :widths: 20 40 10 + :widths: 20 15 40 * - Field - Type diff --git a/source/reference/program/mongod.txt b/source/reference/program/mongod.txt index 77cab8bad4c..b4accbc003e 100644 --- a/source/reference/program/mongod.txt +++ b/source/reference/program/mongod.txt @@ -46,23 +46,23 @@ your database. Options ------- -.. note:: +.. |tlsClusterCAFile| replace:: :option:`--tlsClusterCAFile ` - - .. include:: /includes/extracts/4.2-changes-options-tls-ssl.rst +.. versionchanged:: 5.0 - - .. include:: /includes/extracts/4.2-changes-options-tlsClusterCAFile.rst - -.. |tlsClusterCAFile| replace:: :option:`--tlsClusterCAFile ` + - MongoDB removes the ``--serviceExecutor`` command-line option and the + corresponding ``net.serviceExecutor`` configuration option. .. versionchanged:: 4.4 - MongoDB removes the ``--noIndexBuildRetry`` command-line option and the corresponding ``storage.indexBuildRetry`` option. -.. note:: Starting in version 5.0 +.. versionchanged:: 4.2 - - MongoDB removes the ``--serviceExecutor`` command-line option and the - corresponding ``net.serviceExecutor`` configuration option. + - .. include:: /includes/extracts/4.2-changes-options-tls-ssl.rst + + - .. include:: /includes/extracts/4.2-changes-options-tlsClusterCAFile.rst Core Options ~~~~~~~~~~~~