Merge branch 'rm/literary-edits' into 'main'

Add JRF with MII deprecation statement

See merge request weblogic-cloud/weblogic-kubernetes-operator!4317

Author: rjeberhard

documentation/site/content/base-images/custom-images.md

@@ -80,7 +80,7 @@ Finally, you can use the WIT `inspect` command to [inspect images]({{< relref "/
     - Optionally, includes a WDT installation and model files in the image
       (for Model in Image domains).
     - _Important_:
-      - **Note:** Patching an Oracle Home using the WIT `update`
+      - **NOTE**: Patching an Oracle Home using the WIT `update`
         command results in a larger WebLogic Server image
         due to the immutable layering in container images. For small updates, such as a one-off patch,
         the increase in the image size may be negligible. However, for larger updates, the increase in size will be _significant_.
@@ -144,7 +144,7 @@ sample assumes that you have installed WIT in `/tmp/imagetool`; you can choose t
 
 1. Download your desired WebLogic Server installer from the Oracle Technology Network [WebLogic Server installers](https://www.oracle.com/middleware/technologies/weblogic-server-installers-downloads.html) page or from the [Oracle Software Delivery Cloud](https://edelivery.oracle.com/osdc/faces/Home.jspx) (OSDC).
 
-   **Note:** The WebLogic Server installers will not be fully patched.
+   **NOTE**: The WebLogic Server installers will not be fully patched.
    In a subsequent step, you'll use
    the WIT `--patches` or `--recommendedPatches` options
    to apply one-off and recommended Oracle patches.
@@ -214,7 +214,7 @@ Oracle has extended support of WebLogic Server 12.2.1.3, for six months _only_,
      --passwordEnv=MYPWD
    ```
 
-   **Notes:**
+   **NOTES**:
    - To enable WIT to download patches,
         you must supply your My Oracle Support (Oracle Single Sign-On) credentials
      using the `--user` and `--passwordEnv` parameters (or one of the other password CLA options).
@@ -494,7 +494,7 @@ to create the domain home in Domain in Image.
 
   {{% /expand %}}
 
-**Notes**:
+**NOTES**:
 
 - The sample script and its `domain.properties` file include a sample WebLogic administration password.
   These files must be protected and the sample password must be changed.
@@ -507,7 +507,7 @@ to create the domain home in Domain in Image.
 
 #### Create a custom image with your model inside the image
 
-**NOTE**: Model in Image without auxiliary images (the WDT model and installation files are included in the same image with the WebLogic Server installation) will be deprecated in WebLogic Kubernetes Operator version 4.0.7. Oracle recommends that you use Model in Image _with_ auxiliary images. See [Auxiliary images]({{< relref "/managing-domains/model-in-image/auxiliary-images.md" >}}).
+**NOTE**: Model in Image without auxiliary images (the WDT model and installation files are included in the same image with the WebLogic Server installation) is deprecated in WebLogic Kubernetes Operator version 4.0.7. Oracle recommends that you use Model in Image _with_ auxiliary images. See [Auxiliary images]({{< relref "/managing-domains/model-in-image/auxiliary-images.md" >}}).
 
 {{% notice warning %}}
 The example in this section references a base image,
@@ -581,16 +581,17 @@ Example steps for creating a custom WebLogic image with a Model in Image file la
      --chown oracle:root
    ```
 
-   __Note__: If using a Fusion Middleware Infrastructure base image,
+   **NOTE**: If using a Fusion Middleware Infrastructure base image,
    then specify a `--wdtDomainType` of `JRF` or `RestrictedJRF`,
    `JRF-v1` instead of `WLS-v1` for the image tag,
    and substitute each occurrence of `model-in-image__WLS-v1` with `model-in-image__JRF-v1`.
+   **Also note** that JRF support in Model in Image domains is deprecated in operator version 4.1.0; For JRF domains, use the [Domain on PV]({{< relref "/managing-domains/choosing-a-model/_index.md" >}}) domain home source type instead.
 
 1. For an example Domain YAML file that sets up Model in Image to reference the image,
    see `/tmp/mii-sample/domain-resources/WLS/mii-initial-d1-WLS-v1.yaml`
    (or `./JRF/mii-initial-d1-JRF-v1.yaml` if using Fusion Middleware Infrastructure `JRF` mode).
 
-   __Notes__:
+   **NOTES**:
 
    - The default values for `domain.spec.configuration.model.wdtInstallHome` and `.modelHome`
      reference the location of the WDT installation and model files that WIT copied into the image.

documentation/site/content/base-images/ocr-images.md

@@ -27,7 +27,7 @@ from the Oracle Container Registry (OCR).
 
 The Oracle Container Registry (OCR) is located at [https://container-registry.oracle.com/](https://container-registry.oracle.com/) and contains images for licensed commercial Oracle software products that may be used in your enterprise for deployment using a container engine and Kubernetes.
 
-OCR contains WebLogic Server images, which have a pre-installed Oracle Home with Oracle WebLogic Server and Coherence. OCR, also, contains Fusion Middleware Infrastructure images, which have a pre-installed Oracle Home with Oracle WebLogic Server, Coherence, Fusion Middleware Control, and Java Required Files (JRF). **Note**: Oracle strongly recommends that you use _only_ images with the latest set of recommended patches applied.
+OCR contains WebLogic Server images, which have a pre-installed Oracle Home with Oracle WebLogic Server and Coherence. OCR, also, contains Fusion Middleware Infrastructure images, which have a pre-installed Oracle Home with Oracle WebLogic Server, Coherence, Fusion Middleware Control, and Java Required Files (JRF). **NOTE**: Oracle strongly recommends that you use _only_ images with the latest set of recommended patches applied.
 
 {{% notice note %}}
 As of December, 2022, Fusion Middleware 12.2.1.3 is no longer supported.  The last Critical Patch Updates (CPU) images for FMW Infrastructure 12.2.1.3 were published in October, 2022.
@@ -182,7 +182,7 @@ For example, to use Docker to pull an image from OCR:
         This database is automatically checked when
         you use `docker pull` to obtain images from OCR.
 
-   **Note**: This step is needed only once for each image name (not the tag level).
+   **NOTE**: This step is needed only once for each image name (not the tag level).
    For example, if you accept the terms for `weblogic_cpu`
    in the `middleware` repository, then
    the acceptance applies to all versions of WebLogic CPU images.
@@ -209,7 +209,7 @@ For example, to use Docker to pull an image from OCR:
 
 1. If desired, then you can [inspect](#inspect-images) the content of the image.
 
-__Notes:__
+**NOTES**:
 - If you are using a multi-node Kubernetes cluster,
   or your Kubernetes cluster is remote from your locally created or pulled domain image,
   then additional steps are usually required to ensure that your Kubernetes cluster can access the image.

documentation/site/content/base-images/patch-images.md

@@ -77,7 +77,7 @@ of the WebLogic domain to update the Oracle Home of the servers.
 
 #### Model in Image without auxiliary images
 
-**NOTE**: Model in Image without auxiliary images (the WDT model and installation files are included in the same image with the WebLogic Server installation) will be deprecated in WebLogic Kubernetes Operator version 4.0.7. Oracle recommends that you use Model in Image _with_ auxiliary images. See [Auxiliary images]({{< relref "/managing-domains/model-in-image/auxiliary-images.md" >}}).
+**NOTE**: Model in Image without auxiliary images (the WDT model and installation files are included in the same image with the WebLogic Server installation) is deprecated in WebLogic Kubernetes Operator version 4.0.7. Oracle recommends that you use Model in Image _with_ auxiliary images. See [Auxiliary images]({{< relref "/managing-domains/model-in-image/auxiliary-images.md" >}}).
 
 For Model in Image domains _without_ using auxiliary images:
 
@@ -168,7 +168,7 @@ files in a Domain in Image image so that, when they are both deployed to the sam
 your updated images and original images can interoperate without a
 [domain secret mismatch]({{< relref "/faq/domain-secret-mismatch.md" >}}).
 
-**Notes:**
+**NOTES**:
 
   - You cannot use the `rebase` command alone to update the domain home configuration.
     If you need to update the domain home configuration,

documentation/site/content/introduction/architecture.md

@@ -41,7 +41,7 @@ The operator registers two Kubernetes custom resource definitions. The first is
 
 The following diagram shows the general layout of high-level components, including optional components, in a Kubernetes cluster that is hosting WebLogic domains and the operator:
 
-{{< img "High level architecture" "images/high-level-architecture.png" >}}
+{{< img "High-level architecture" "images/high-level-architecture.png" >}}
 
 The Kubernetes cluster has several namespaces. Components may be deployed into namespaces as follows:
 

documentation/site/content/introduction/platforms/environments.md

@@ -35,9 +35,9 @@ These include, but are not limited to:
 
 [Development-focused Kubernetes distributions](#development-focused-kubernetes-distributions) are also supported.
 
-**Notes:**
+**NOTES**:
 
-- **Important:** Some supported environments have additional help or samples that are specific
+- **Important**: Some supported environments have additional help or samples that are specific
 to the operator, or are subject to limitations and restrictions; see
 [Important notes about specific environments](#important-notes-about-specific-environments).
 
@@ -60,7 +60,7 @@ Here are some important considerations for specific environments:
 - [WebLogic Server running in Kubernetes connecting to an Oracle Database also running in Kubernetes](#weblogic-server-running-in-kubernetes-connecting-to-an-oracle-database-also-running-in-kubernetes)
 - [Development-focused Kubernetes distributions](#development-focused-kubernetes-distributions)
 
-**Note:** This section does not list all supported environments.
+**NOTE**: This section does not list all supported environments.
 See the [Overview](#overview) for a list of all supported environments.
 
 #### Oracle Cloud Infrastructure

documentation/site/content/managing-domains/accessing-the-domain/external-clients.md

@@ -337,7 +337,7 @@ Although [Kubernetes `NodePorts`](#kubernetes-nodeports) are good for use in dem
 
 #### `NodePort` steps
 
-Here are the high level steps:
+Here are the high-level steps:
 
 - Review [`NodePort` warnings](#nodeport-warnings).
 
@@ -455,7 +455,7 @@ is sent from a source WebLogic Server to a target WebLogic Server in a different
 RMI forwarding may be needed when transaction server participants are not able to establish
 connection directly with one another.
 
-For example, if a cross-domain transaction communication has failed, and messages such as the 
+For example, if a cross-domain transaction communication has failed, and messages such as the
 following can be found in the WebLogic server log files:
 
 `<BEA-111015> <The commit operation for transaction BEA1-0000993203DB6CDB7DE9 timed out after 30 seconds.>`
@@ -478,8 +478,8 @@ through the proxy.
 In each source WebLogic Server domain, specify the URL for the proxy configured for each target
 WebLogic Server domain:
 
-- Set the Java system property as `weblogic.rjvm.domain.proxy.<prefix>` where `<prefix>` is the 
-  domain UID of the target WebLogic Server domain. 
+- Set the Java system property as `weblogic.rjvm.domain.proxy.<prefix>` where `<prefix>` is the
+  domain UID of the target WebLogic Server domain.
   Multiple Java system properties with different values of `<prefix>` can be specified.
 - For WebLogic Server domains running in Kubernetes managed by the operator, you can set this property by including the system property in the `JAVA_OPTIONS`
   [Domain environment variable]({{< relref "/managing-domains/domain-resource#jvm-memory-and-java-option-environment-variables" >}}) defined in the domain resource's `spec.serverPod.env` attribute.

documentation/site/content/managing-domains/accessing-the-domain/istio/istio.md

@@ -215,7 +215,7 @@ spec:
 This example creates a gateway that will accept requests with any host name
 using HTTP on port 80, and a virtual service that will route all of
 those requests to the cluster service for `cluster-1` in `domain1` in
-the namespace `domain1`.  **Note**: In a production environment, `hosts` should be limited to the proper DNS name.
+the namespace `domain1`.  **NOTE**: In a production environment, `hosts` should be limited to the proper DNS name.
 
 After the gateway and virtual service has been set up, you can access it through your ingress host and port.
 Refer to [Determining the ingress IP and ports](https://istio.io/latest/docs/setup/getting-started/#determining-the-ingress-ip-and-ports).

documentation/site/content/managing-domains/accessing-the-domain/remote-admin-console.md

@@ -24,7 +24,7 @@ The Remote Console is deployed as a standalone application, which can connect to
 You connect to the Remote Console and, when prompted, supply the WebLogic Server login credentials
 along with the URL of the WebLogic Server Administration Server's administration port to which you want to connect.
 
-**Notes:**  
+**NOTES**:  
   * An Administration Server administration port typically is the same as its default port unless either an SSL port or an administration port is configured and enabled.
   * If your domain home type is either [Domain in Image]({{< relref "/samples/domains/domain-home-in-image/_index.md" >}}) or [Model in Image]({{< relref "/samples/domains/model-in-image/_index.md" >}}), then do not use the WebLogic Remote Console to make changes to the WebLogic domain configuration because these changes are ephemeral and will be lost when servers restart. See [Choose a domain home source type]({{< relref "/managing-domains/choosing-a-model/_index.md" >}}).
 
@@ -52,7 +52,7 @@ To set up access to WebLogic Server domains running in Kubernetes using the Remo
 
    * [Use a `kubectl port-forward` connection](#use-a-kubectl-port-forward-connection).
 
-   **Note**: If you want the Remote Console to use SSL to connect to the WebLogic Server Administration Server,
+   **NOTE**: If you want the Remote Console to use SSL to connect to the WebLogic Server Administration Server,
      then see [Connect to a WebLogic domain using SSL/TLS](https://oracle.github.io/weblogic-remote-console/userguide/advanced-settings/#ssl).
 
 
@@ -119,7 +119,7 @@ see [Use a `NodePort` for WLST]({{< relref "/managing-domains/accessing-the-doma
    Administration Server Pod according to these
    [instructions]({{< relref "/managing-domains/accessing-the-domain/port-forward.md" >}}).
 
-   **NOTE:** If you plan to run the Remote Console
+   **NOTE**: If you plan to run the Remote Console
    on a different machine than the port forwarding command,
    then the port forwarding command needs to specify a `--address` parameter
    with the IP address of the machine that is hosting the command.

documentation/site/content/managing-domains/accessing-the-domain/status-conditions.md

@@ -137,7 +137,7 @@ Status:
   * Every Cluster resource referenced by the domain has `True` in its `Available` condition.
     Clusters that are configured with a `replicas` value of `0` or a `serverStartPolicy` value of `Never`
     are ignored.
-- **Note**: The `Available` `status` can be `True` even when the `status` for the `Completed` condition is `False`,
+- **NOTE**: The `Available` `status` can be `True` even when the `status` for the `Completed` condition is `False`,
   a `Failed` condition is reported, or a cluster has up to `cluster.spec.maxUnavailable` pods
   that are not ready.
 
@@ -206,12 +206,12 @@ The following is a list of condition types for a Cluster resource.
     then the cluster will have an `Available` condition that is `False`.
   - If a cluster and domain both have a `serverStartPolicy` of `IfNeeded`,
     and `cluster.spec.replicas` is `1`,
-    then the cluster will have an `Available` condition that is `True` only when its single pod is ready. 
+    then the cluster will have an `Available` condition that is `True` only when its single pod is ready.
   - If a cluster and domain both have a `serverStartPolicy` of `IfNeeded`,
     `cluster.spec.replicas` is `4`,
     and `cluster.spec.maxUnavailable` is `1` (the default),
     then the cluster will have an `Available` condition  that is `True` only when three or four of its pods are ready.
-- **Note**: The `Available` condition's `status` can be `True` even when the `status` for the `Completed`
+- **NOTE**: The `Available` condition's `status` can be `True` even when the `status` for the `Completed`
   condition is `False`, a `Failed` condition is reported on the Domain resource, or the cluster
   has up to `cluster.spec.maxUnavailable` pods that are not ready.
 

documentation/site/content/managing-domains/accessing-the-domain/weblogic-admin-console.md

@@ -17,7 +17,7 @@ You can access the WebLogic Server Administration Console external to the Kubern
 
    * [Use a `kubectl port-forward` connection](#use-a-kubectl-port-forward-connection)
 
-**Notes:**
+**NOTES**:
  * For production use cases, Oracle recommends using a load balancer with ingress path routing rules and an SSL port to access the WebLogic Server Administration Console.
 
  * To verify that your load balancer, NodePort, or `kubectl port-forward` setup is working as expected, see [Test]({{< relref "#test" >}}).
@@ -187,7 +187,7 @@ A Kubernetes port forward command is convenient for development use cases but is
    Administration Server Pod according to these
    [instructions]({{< relref "/managing-domains/accessing-the-domain/port-forward.md" >}}).
 
-   **NOTE:** If you plan to access the WebLogic Server Administration Console from a browser
+   **NOTE**: If you plan to access the WebLogic Server Administration Console from a browser
    on a different machine than the port forwarding command,
    then the port forwarding command needs to specify an `--address` parameter
    with an externally accessible IP address for the machine that is running the command.