(DOCSP-26487) Various term and versioning updates. (#1229)

* (DOCSP-26487) Various term and versioning updates.

* (DOCSP-26487)

* (DOCSP-26487)

* (DOCSP-26487)

* (DOCSP-26487)

* (DOCSP-26487)

Author: lmkerbey-mdb

conf.py

@@ -60,6 +60,8 @@
     'version': version,
     'k8s-op-short': 'Kubernetes Operator',
     'k8s-api-version': 'v1.25',
+    'k8s-crds': "`CustomResourceDefinitions <https://kubernetes.io/docs/tasks/access-kubernetes-api/extend-api-custom-resource-definitions/>`__",
+    'k8s-crd': "`CustomResourceDefinition <https://kubernetes.io/docs/tasks/access-kubernetes-api/extend-api-custom-resource-definitions/>`__",
     'aagent': 'MongoDB Agent or legacy Automation Agent',
     'aagents': 'MongoDB Agents or legacy Automation Agents',
     'mdbagent': 'MongoDB Agent',

snooty.toml

@@ -5,6 +5,8 @@ aagent = "MongoDB Agent or legacy Automation Agent"
 aagents = "MongoDB Agents or legacy Automation Agents"
 k8s-op-short = "Kubernetes Operator"
 k8s-api-version = "v1.20"
+k8s-crds = "`CustomResourceDefinitions <https://kubernetes.io/docs/tasks/access-kubernetes-api/extend-api-custom-resource-definitions/>`__"
+k8s-crd = "`CustomResourceDefinition <https://kubernetes.io/docs/tasks/access-kubernetes-api/extend-api-custom-resource-definitions/>`__"
 bndl-version = "4.2.2"
 bndl-version-val = "``4.2.11-ent``"
 appdb-init-version = "1.0.6"

source/includes/steps-upgrade-master.yaml

@@ -32,7 +32,7 @@ replacement:
        metadata:
         name: my-standalone-downgrade
        spec:
-        version: "4.0.14-ent"
+        version: "4.2.2-ent"
         type: Standalone
         project: my-project
         credentials: my-credentials
@@ -44,10 +44,8 @@ replacement:
     .. code-block:: yaml
 
       spec:
-        version: "4.2.2-ent"
-        featureCompatibilityVersion: "4.0"
-
-    .. include:: /includes/admonitions/fact-featureCompatibilityVersion.rst
+        version: "4.4.18-ent"
+        featureCompatibilityVersion: "4.2"
 
 ---
 title: Reapply the configuration to |k8s|.

source/includes/steps-upgrade-mdb.yaml

@@ -5,7 +5,7 @@ inherit:
   file: steps-upgrade-master.yaml
   ref: upgrade-master-version
 replacement:
-  method: "Change the resource's ConfigMap as shown in the following example:"
+  method: "Change the resource's |k8s-crd| as shown in the following example:"
 content: |
 
   {{mdb}}

source/tutorial/upgrade-mdb-version.txt

@@ -12,14 +12,14 @@ Upgrade MongoDB Version and FCV
    :depth: 2
    :class: singlecol
 
-You can upgrade the major, minor, and/or feature compatibility versions
+You can upgrade the major, minor, or feature compatibility versions
 of your MongoDB resource. These settings are configured in your
-resource's |k8s-configmap|.
+resource's |k8s-crd|.
 
 Overview
 -------- 
 
-To upgrade your resource's major and/or minor versions, set the
+To upgrade your resource's major or minor versions, set the
 :setting:`spec.version` setting to the desired MongoDB version.
 
 To modify your resource's
@@ -35,7 +35,8 @@ version.
    necessary.
 
    To learn more about feature compatibility, see
-   :dbcommand:`setFeatureCompatibilityVersion` in the MongoDB Manual.
+   :dbcommand:`setFeatureCompatibilityVersion` in the MongoDB Server
+   Documentation.
 
 Procedure
 ---------