Skip to content

Commit ac16fbc

Browse files
authored
Ports changes from CM that didn't work with last port (#347) (#348)
Changes from this epic that didn't port correctly from CM: https://jira.mongodb.org/browse/DOCSP-40381
1 parent 5dd8771 commit ac16fbc

File tree

3 files changed

+26
-42
lines changed

3 files changed

+26
-42
lines changed
Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1-
.. note:: Available Versions
1+
|mms| lists only the MongoDB versions that are available for your
2+
deployment.
23

3-
|mms| lists only the MongoDB versions that are available for your
4-
deployment.
5-
6-
To disable this filtering, see
7-
:setting:`automation.versions.download.baseUrl.allowOnlyAvailableBuilds`.
4+
To disable this filtering, see
5+
:setting:`automation.versions.download.baseUrl.allowOnlyAvailableBuilds`.

source/includes/extracts-api-third-party-integrations.yaml

Lines changed: 12 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -96,11 +96,9 @@ content: |
9696
- Indicates which |api| |url| to use, either ``US`` or
9797
``EU``. Opsgenie defaults to ``US``.
9898
99-
.. note::
100-
101-
To set ``region`` to ``EU``, you must :ref:`set a
102-
customer setting <opsmgr-config-add-custom>` of
103-
:setting:`opsgenie.api.url`.
99+
To set ``region`` to ``EU``, you must :ref:`set a
100+
customer setting <opsmgr-config-add-custom>` of
101+
:setting:`opsgenie.api.url`.
104102
105103
* - VictorOps
106104
- You must provide the following fields when you configure a
@@ -378,11 +376,9 @@ content: |
378376
- Indicates which API URL is used, either ``US`` or
379377
``EU``. Opsgenie will use ``US`` by default.
380378
381-
.. note::
382-
383-
To set ``region`` to ``EU``, you must :ref:`set a
384-
customer setting <opsmgr-config-add-custom>` of
385-
:setting:`opsgenie.api.url`.
379+
To set ``region`` to ``EU``, you must :ref:`set a
380+
customer setting <opsmgr-config-add-custom>` of
381+
:setting:`opsgenie.api.url`.
386382
387383
* - VictorOps
388384
- You must provide the following fields when you configure a
@@ -596,11 +592,9 @@ content: |
596592
- Indicates which |api| |url| to use, either ``US`` or
597593
``EU``. Opsgenie defaults to ``US``.
598594
599-
.. note::
600-
601-
To set ``region`` to ``EU``, you must :ref:`set a
602-
customer setting <opsmgr-config-add-custom>` of
603-
:setting:`opsgenie.api.url`.
595+
To set ``region`` to ``EU``, you must :ref:`set a
596+
customer setting <opsmgr-config-add-custom>` of
597+
:setting:`opsgenie.api.url`.
604598
605599
* - VictorOps
606600
- A returned VictorOps integration configuration object
@@ -859,11 +853,9 @@ content: |
859853
- Indicates which |api| |url| to use, either ``US`` or
860854
``EU``. Opsgenie defaults to ``US``.
861855
862-
.. note::
863-
864-
To set ``region`` to ``EU``, you must :ref:`set a
865-
customer setting <opsmgr-config-add-custom>` of
866-
:setting:`opsgenie.api.url`.
856+
To set ``region`` to ``EU``, you must :ref:`set a
857+
customer setting <opsmgr-config-add-custom>` of
858+
:setting:`opsgenie.api.url`.
867859
868860
* - VictorOps
869861
- A returned VictorOps integration configuration object

source/includes/steps-sync-mongodb-user.yaml

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -43,30 +43,24 @@ content: |
4343
4444
- |mms| now manages the user.
4545
46-
.. note::
47-
48-
If there are any potential conflicts with other discovered
49-
users, you will be presented with the option to resolve
50-
conflicts.
46+
If there are any potential conflicts with other discovered
47+
users, |mms| presents you with the option to resolve
48+
conflicts.
5149
5250
* - ``YES``
5351
5452
- ``NO``
5553
5654
- |mms| no longer manages the user.
5755
58-
.. warning::
59-
60-
If :guilabel:`Ensure Consistent Set` is ``YES``, the user
61-
is deleted from all MongoDB databases |mms| currently
62-
manages for this project.
56+
:red:`WARNING:` If :guilabel:`Ensure Consistent Set` is
57+
``YES``, |mms| deletes the user from all MongoDB databases
58+
that |mms| currently manages for this project.
6359
64-
.. note::
65-
66-
If :guilabel:`Ensure Consistent Set` is ``NO``, |mms| no
67-
longer manages the users in that MongoDB database, but
68-
these users can be managed through a direct connection to
69-
that database.
60+
If :guilabel:`Ensure Consistent Set` is ``NO``, |mms| no
61+
longer manages the users in that MongoDB database, but
62+
you can manage these users through a direct connection to
63+
that database.
7064
---
7165
level: 4
7266
stepnum: 4

0 commit comments

Comments
 (0)