Synchronize documentation

rjeberhard · rjeberhard · commit 0cb3b46ea20b · 2022-06-09T12:09:51.000-04:00
diff --git a/documentation/3.4/content/faq/resource-settings.md b/documentation/3.4/content/faq/resource-settings.md
@@ -53,9 +53,7 @@ by configuring Kubernetes resource requests and limits,
 and you can tune a WebLogic JVM heap usage
 using the `USER_MEM_ARGS` environment variable in your Domain YAML file.
 The introspector job pod uses the same CPU and memory settings as the
-domain's WebLogic Administration Server pod. Similarly, the operator created init containers in the 
-introspector job pod for the [Auxiliary Images]({{< relref "/userguide/managing-domains/model-in-image/auxiliary-images" >}})
-based domains use the same CPU and memory settings as the domain's WebLogic Administration Server pod.
+domain's WebLogic Administration Server pod.
 A resource request sets the minimum amount of a resource that a container requires.
 A resource limit is the maximum amount of a resource a container is given
 and prevents a container from using more than its share of a resource.
diff --git a/documentation/3.4/content/reference/domain-resource.md b/documentation/3.4/content/reference/domain-resource.md
@@ -6,4 +6,4 @@ weight: 3
 description: "Use this document to set up and configure your own Domain YAML file."
 ---
 
-View the Domain reference document [here](https://github.com/oracle/weblogic-kubernetes-operator/blob/main/documentation/domains/Domain.md).
+View the Domain reference document [here](https://github.com/oracle/weblogic-kubernetes-operator/blob/release/3.4/documentation/domains/Domain.md).
diff --git a/documentation/3.4/content/samples/domains/model-in-image/prerequisites.md b/documentation/3.4/content/samples/domains/model-in-image/prerequisites.md
@@ -284,7 +284,7 @@ When you follow the instructions in the samples, avoid instructions that are `WL
 
 For example, in this sample:
 
-  - JRF Domain YAML files have an `configuration.opss.walletPasswordSecret` field that references a secret named `sample-domain1-opss-wallet-password-secret`, with `password=welcome1`.
+  - JRF Domain YAML files have an `configuration.opss.walletPasswordSecret` field that references a secret named `sample-domain1-opss-wallet-password-secret`, with `walletPassword=welcome1`.
 
   - JRF image models have a `domainInfo -> RCUDbInfo` stanza that reference a `sample-domain1-rcu-access` secret with appropriate values for attributes `rcu_prefix`, `rcu_schema_password`, and `rcu_db_conn_string` for accessing the Oracle database that you deployed to the default namespace as one of the prerequisite steps.
 
diff --git a/documentation/3.4/content/userguide/aks/_index.md b/documentation/3.4/content/userguide/aks/_index.md
@@ -50,7 +50,7 @@ Use the **Basics** blade to provide the basic configuration details for deployin
 | Username for WebLogic Administrator | Enter a user name to access the WebLogic Server Administration Console which is started automatically after the provisioning. For more information about the WebLogic Server Administration Console, see [Overview of Administration Consoles](https://docs.oracle.com/pls/topic/lookup?ctx=en/middleware/standalone/weblogic-server/wlazu&id=INTRO-GUID-CC01963A-6073-4ABD-BC5F-5C509CA1EA90) in _Understanding Oracle WebLogic Server_. |
 | Password for WebLogic Administrator | Enter a password to access the WebLogic Server Administration Console. |
 | Confirm password | Re-enter the value of the preceding field. |
-| Password for WebLogic Deploy Tooling runtime encryption | The deployment uses the WebLogic Kubernetes Operator encryption feature, including the capability to encrypt the domain. This password is used for that encryption. For more information, see [Encryption]({{< relref "/security/encryption.md" >}}).|
+| Password for WebLogic Model encryption | Model in Image requires a runtime encryption secret with a secure password key. This secret is used by the operator to encrypt model and domain home artifacts before it adds them to a runtime ConfigMap or log. For more information, see [Required runtime encryption secret]({{< relref "/userguide/managing-domains/model-in-image/usage#required-runtime-encryption-secret" >}}).|
 | Confirm password | Re-enter the value of the preceding field. |
 | User assigned managed identity | The deployment requires a user-assigned managed identity with the **Contributor** or **Owner** role in the subscription referenced previously.  For more information, please see [Create, list, delete, or assign a role to a user-assigned managed identity using the Azure portal](https://docs.microsoft.com/azure/active-directory/managed-identities-azure-resources/how-to-manage-ua-identity-portal). |
 
@@ -77,6 +77,7 @@ In this section, you can configure some options about the AKS which will run Web
 | Field | Description |
 |-------|-------------|
 |Create a new AKS cluster| If set to **Yes**, the deployment will create a new AKS cluster resource in the specified resource group. If set to **No**, you have the opportunity to select an existing AKS cluster, into which the deployment is configured. Note: the offer assumes the existing AKS cluster has no WebLogic related deployments. |
+|Use latest supported AKS Kubernetes version| The currently supported version is **1.21.9**.  Oracle tracks the AKS release versions in [Supported Kubernetes versions in Azure Kubernetes Service (AKS)](https://docs.microsoft.com/en-us/azure/aks/supported-kubernetes-versions). After a new version emerges, Oracle qualifies WLS on AKS against that version and will update the offer to that version.|
 | Node count | The initial number of nodes in the AKS cluster. This value can be changed after deployment. For information, see [Scaling]({{< relref "/userguide/managing-domains/domain-lifecycle/scaling.md" >}}). |
 | Node size | The default VM size is 2x Standard DSv2, 2 vcpus, 7 GB memory. If you want to select a different VM size, select **Change Size**, select the size from the list (for example, A3) on the Select a VM size page, and select **Select**. For more information about sizing the virtual machine, see the [Azure documentation on Sizes](https://docs.microsoft.com/azure/cloud-services/cloud-services-sizes-specs).|
 |Enable Container insights| If selected, configure the necessary settings to integrate with Container insights. Container insights gives you performance visibility by collecting memory and processor metrics from controllers, nodes, and containers that are available in Kubernetes through the Metrics API. Container logs are also collected. Metrics are written to the metrics store and log data is written to the logs store associated with your Log Analytics workspace. For more information, see [Container insights overview](https://aka.ms/wls-aks-container-insights).|
@@ -269,4 +270,4 @@ In the **Review + create blade**, review the details you provided for deploying
 
 If you want to use this template to automate the deployment, download it by selecting **Download a template for automation**.
 
-Click **Create** to create this offer. This process may take 30 to 60 minutes.
+Click **Create** to create this offer. This process may take 30 to 60 minutes.
diff --git a/documentation/3.4/content/userguide/platforms/environments.md b/documentation/3.4/content/userguide/platforms/environments.md
@@ -179,9 +179,7 @@ See also the [Tanzu Kubernetes Grid sample]({{<relref "/samples/tanzu-kubernetes
 
 OpenShift can be a cloud platform or can be deployed on premises.
 
-Operator 2.0.1+ is certified for use on OpenShift Container Platform 3.11.43+, with Kubernetes 1.11.5+.
-
-Operator 2.5.0+ is certified for use on OpenShift Container Platform 4.3.0+ with Kubernetes 1.16.2+.
+Operator 3.4.0+ is certified for use on OpenShift Container Platform 4.10.4+, with Kubernetes 1.23+.
 
 To accommodate OpenShift security requirements:
 - For security requirements to run WebLogic Server in OpenShift, see the [OpenShift]({{<relref "/security/openshift.md">}}) documentation.
