Merge remote-tracking branch 'origin/main' into release/4.0

rjeberhard · rjeberhard · commit 5849cd7dfb54 · 2023-02-17T12:22:49.000-05:00
diff --git a/documentation/3.4/content/_index.md b/documentation/3.4/content/_index.md
@@ -61,6 +61,5 @@ See [Get help]({{< relref "userguide/introduction/get-help.md" >}}).
 * [WebLogic Deploy Tooling](https://oracle.github.io/weblogic-deploy-tooling/)
 * [WebLogic Image Tool](https://oracle.github.io/weblogic-image-tool/)
 * [WebLogic Monitoring Exporter](https://github.com/oracle/weblogic-monitoring-exporter)
-* [WebLogic Logging Exporter](https://github.com/oracle/weblogic-logging-exporter)
 * [WebLogic Remote Console](https://oracle.github.io/weblogic-remote-console/)
 * [WebLogic Kubernetes Toolkit UI](https://oracle.github.io/weblogic-toolkit-ui/)
diff --git a/documentation/3.4/content/userguide/managing-fmw-domains/_index.md b/documentation/3.4/content/userguide/managing-fmw-domains/_index.md
@@ -45,10 +45,6 @@ For more information about the deployment of Oracle Fusion Middleware products o
 Compared to running a WebLogic Server domain in Kubernetes using the operator, the
 following limitations currently exist for FMW Infrastructure domains:
 
-* The [WebLogic Logging Exporter](https://github.com/oracle/weblogic-logging-exporter)
-  currently supports WebLogic Server logs only.  Other logs will not be sent to
-  Elasticsearch.  Note, however, that you can use a sidecar with a log handling tool
-  like Logstash or Fluentd to get logs.
 * The [WebLogic Monitoring Exporter](https://github.com/oracle/weblogic-monitoring-exporter)
   currently supports the WebLogic MBean trees only.  Support for JRF MBeans has not
   been added yet.
diff --git a/documentation/3.4/content/userguide/platforms/environments.md b/documentation/3.4/content/userguide/platforms/environments.md
@@ -27,30 +27,29 @@ weight: 3
 
 ### Overview
 
-The operator supports a wide range of on-premises and cloud Kubernetes
-offerings where Kubernetes is supplied for you or you set up Kubernetes
-yourself. These include, but are not limited to:
+The operator supports running on production grade Kubernetes environments, including on-premises,
+cloud offerings where Kubernetes is supplied for you, and cloud offerings where you set up Kubernetes yourself.
+Please refer to the support statement [Doc ID 2790123.1](https://support.oracle.com/epmos/faces/DocContentDisplay?id=2790123.1).
 
-- WebLogic Server and the operator are supported on Oracle Cloud offerings, such as:
+These include, but are not limited to:
+
+- Oracle Cloud certified offerings, such as:
   - Oracle Cloud Infrastructure (OCI)
   - Oracle Container Engine for Kubernetes (OKE)
-  - Oracle Linux Cloud Native Environment (OLCNE)
+  - Oracle Cloud Native Environment (OCNE)
   - Oracle Private Cloud Appliance (PCA)
   - Oracle Private Cloud at Customer (OPCC)
 
-- WebLogic Server and the operator are certified on offerings, such as:
-  - Amazon Elastic Compute Cloud (EC2)
+- Other certified offerings, such as:
   - Microsoft Azure Platform
   - Microsoft Azure Kubernetes Service (AKS)
   - OpenShift Container Platform
   - VMWare Tanzu
   - VMware Tanzu Kubernetes Grid (TKG)
 
-WebLogic Server and the operator are also supported on service offerings which
-deploy the WebLogic Server and the operator for you. These include:
-
-- [Oracle WebLogic Server for OKE (WLS for OKE)](https://docs.oracle.com/en/cloud/paas/weblogic-container/)
-- [Oracle WebLogic Server on AKS from the Azure Marketplace (WLS on AKS Marketplace)](#oracle-weblogic-server-on-aks-from-the-azure-marketplace-wls-on-aks-marketplace)
+- Offerings which deploy the WebLogic Server and the operator for you. These include:
+  - [Oracle WebLogic Server for OKE (WLS for OKE)](https://docs.oracle.com/en/cloud/paas/weblogic-container/)
+  - [Oracle WebLogic Server on AKS from the Azure Marketplace (WLS on AKS Marketplace)](#oracle-weblogic-server-on-aks-from-the-azure-marketplace-wls-on-aks-marketplace)
 
 [Development-focused Kubernetes distributions](#development-focused-kubernetes-distributions) are also supported.
 
diff --git a/documentation/4.0/content/_index.md b/documentation/4.0/content/_index.md
@@ -61,6 +61,5 @@ See [Get help]({{< relref "/introduction/get-help.md" >}}).
 * [WebLogic Deploy Tooling](https://oracle.github.io/weblogic-deploy-tooling/)
 * [WebLogic Image Tool](https://oracle.github.io/weblogic-image-tool/)
 * [WebLogic Monitoring Exporter](https://github.com/oracle/weblogic-monitoring-exporter)
-* [WebLogic Logging Exporter](https://github.com/oracle/weblogic-logging-exporter)
 * [WebLogic Remote Console](https://oracle.github.io/weblogic-remote-console/)
 * [WebLogic Kubernetes Toolkit UI](https://oracle.github.io/weblogic-toolkit-ui/)
diff --git a/documentation/4.0/content/introduction/platforms/environments.md b/documentation/4.0/content/introduction/platforms/environments.md
@@ -9,30 +9,29 @@ weight: 6
 
 ### Overview
 
-The operator supports a wide range of on-premises and cloud Kubernetes
-offerings where Kubernetes is supplied for you or you set up Kubernetes
-yourself. These include, but are not limited to:
+The operator supports running on production-quality Kubernetes environments, including on-premises,
+cloud offerings where Kubernetes is supplied for you, and cloud offerings where you set up Kubernetes yourself.
+Please refer to the support statement [Doc ID 2790123.1](https://support.oracle.com/epmos/faces/DocContentDisplay?id=2790123.1).
 
-- WebLogic Server and the operator are supported on Oracle Cloud offerings, such as:
-  - Oracle Cloud Infrastructure
+These include, but are not limited to:
+
+- Oracle Cloud certified offerings, such as:
+  - Oracle Cloud Infrastructure (OCI)
   - Oracle Container Engine for Kubernetes (OKE)
-  - Oracle Cloud Native Environment
+  - Oracle Cloud Native Environment (OCNE)
   - Oracle Private Cloud Appliance (PCA)
   - Oracle Private Cloud at Customer (OPCC)
 
-- WebLogic Server and the operator are certified on offerings, such as:
-  - Amazon Elastic Compute Cloud (EC2)
+- Other certified offerings, such as:
   - Microsoft Azure Platform
   - Microsoft Azure Kubernetes Service (AKS)
   - OpenShift Container Platform
   - VMWare Tanzu
   - VMware Tanzu Kubernetes Grid (TKG)
 
-WebLogic Server and the operator are also supported on service offerings which
-deploy the WebLogic Server and the operator for you. These include:
-
-- [Oracle WebLogic Server for OKE (WLS for OKE)](https://docs.oracle.com/en/cloud/paas/weblogic-container/)
-- [Oracle WebLogic Server on AKS from the Azure Marketplace (WLS on AKS Marketplace)](#oracle-weblogic-server-on-aks-from-the-azure-marketplace-wls-on-aks-marketplace)
+- Offerings which deploy the WebLogic Server and the operator for you. These include:
+  - [Oracle WebLogic Server for OKE (WLS for OKE)](https://docs.oracle.com/en/cloud/paas/weblogic-container/)
+  - [Oracle WebLogic Server on AKS from the Azure Marketplace (WLS on AKS Marketplace)](#oracle-weblogic-server-on-aks-from-the-azure-marketplace-wls-on-aks-marketplace)
 
 [Development-focused Kubernetes distributions](#development-focused-kubernetes-distributions) are also supported.
 
diff --git a/documentation/4.0/content/managing-domains/managing-fmw-domains/_index.md b/documentation/4.0/content/managing-domains/managing-fmw-domains/_index.md
@@ -33,10 +33,6 @@ For more information about the deployment of Oracle Fusion Middleware products o
 Compared to running a WebLogic Server domain in Kubernetes using the operator, the
 following limitations currently exist for FMW Infrastructure domains:
 
-* The [WebLogic Logging Exporter](https://github.com/oracle/weblogic-logging-exporter)
-  currently supports WebLogic Server logs only.  Other logs will not be sent to
-  Elasticsearch.  Note, however, that you can use a sidecar with a log handling tool
-  like Logstash or Fluentd to get logs.
 * The [WebLogic Monitoring Exporter](https://github.com/oracle/weblogic-monitoring-exporter)
   currently supports the WebLogic MBean trees only.  Support for JRF MBeans has not
   been added yet.
