Merge branch 'rm/re-arrange-DoPV-docs' into 'main'

rjeberhard · rjeberhard · commit 36b6272e468c · 2023-06-29T22:00:18.000Z
Rearrange DoPV docs and fix links

See merge request weblogic-cloud/weblogic-kubernetes-operator!4318
diff --git a/documentation/site/content/managing-domains/aks/_index.md b/documentation/site/content/managing-domains/aks/_index.md
@@ -309,7 +309,7 @@ After clicking **Create** to create this offer, you will go to the **Deployment
 | `clusterT3ExternalEndpoint` | This output is not always present:{{< line_break >}}1. You must [create/update the WLS cluster with advanced configuration](https://oracle.github.io/weblogic-azure/aks/).{{< line_break >}}2. You must enable custom T3 channel by setting `enableClusterT3Tunneling=true`.{{< line_break >}}3. You must configure [Networking](#networking) to enable the Azure Load Balancer service for the WLS cluster.{{< line_break >}}{{< line_break >}}This is a fully qualified, public link to custom T3 channel of the WLS cluster.{{< line_break >}}Sample value:`http://20.4.56.3:8005/` |
 | `shellCmdtoConnectAks` | AZ CLI command to connect to the AKS cluster.{{< line_break >}}Sample value: {{< line_break >}}`az account set --subscription xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxx; az aks get-credentials --resource-group contoso-rg --name contosoakscluster`|
 | `shellCmdtoOutputWlsDomainYaml` | Shell command to display the base64 encoded string of the WLS domain resource definition.{{< line_break >}}Sample value: {{< line_break >}}`echo -e YXBpV...mVCg== \| base64 -d > domain.yaml` |
-| `shellCmdtoOutputWlsImageModelYaml` | Shell command to display the base64 encoded string of the WLS [image model]({{< relref "/managing-domains/working-with-wdt-models/model-files.md" >}}).{{< line_break >}}Sample value:{{< line_break >}}`echo -e IyBDb...3EnC \| base64 -d > model.yaml`|
+| `shellCmdtoOutputWlsImageModelYaml` | Shell command to display the base64 encoded string of the WLS [image model]({{< relref "/managing-domains/model-in-image/model-files.md" >}}).{{< line_break >}}Sample value:{{< line_break >}}`echo -e IyBDb...3EnC \| base64 -d > model.yaml`|
 | `shellCmdtoOutputWlsImageProperties`|Shell command to display the base64 encoded string of the model properties.{{< line_break >}}Sample value:{{< line_break >}}`echo -e IyBDF...PTUK \| base64 -d > model.properties` |
 | `shellCmdtoOutputWlsVersionsandPatches` | Shell command to display the base64 encoded string of the WLS version and patches.{{< line_break >}}Sample value:{{< line_break >}}`echo -e CldlY...gMS4= \| base64 -d > version.info`|
 
diff --git a/documentation/site/content/managing-domains/domain-on-pv/domain-creation-images.md b/documentation/site/content/managing-domains/domain-on-pv/domain-creation-images.md
@@ -1,7 +1,7 @@
 +++
 title = "Domain creation images"
 date = 2019-02-23T16:45:16-05:00
-weight = 25
+weight = 3
 pre = "<b> </b>"
 description = "Domain creation images supply the WDT model for Domain on PV."
 +++
diff --git a/documentation/site/content/managing-domains/domain-on-pv/jrf-domain.md b/documentation/site/content/managing-domains/domain-on-pv/jrf-domain.md
@@ -1,7 +1,7 @@
 +++
 title = "JRF domains"
 date = 2023-04-26T16:45:16-05:00
-weight = 25
+weight = 5
 pre = "<b> </b>"
 description = "Important information about using JRF domains."
 +++
@@ -72,7 +72,7 @@ $ opss-wallet.sh -n sample-ns -d sample-domain1 -s -r -wf /tmp/ewallet.p12 -ws j
 
 When a JRF domain is created, an OPSS wallet is stored in the file system where the domain home resides.
 This specific wallet key can be exported and used to create a new domain. There is no way to reuse the original RCU schema without this specific wallet key.
-Therefore, for disaster recovery, **you should back up this encryption key**.
+Therefore, for disaster recovery, **you should back up this OPSS wallet**.
 
 After the operator creates the JRF domain, it stores the OPSS wallet in a ConfigMap. See [Download and save the OPSS wallet](#download-opss-wallet-and-store-in-a-kubernetes-secret).
 
@@ -149,11 +149,11 @@ In the rare scenario where the domain home directory is corrupted, and you do **
 
 #### Disaster recovery for Model in Image domains
 
-**NOTE**: JRF support in Model in Image domains is deprecated in operator version 4.1.0; use the [Domain on PV]({{< relref "/managing-domains/choosing-a-model/_index.md" >}}) domain home source type instead.
+**NOTE**: JRF support in Model in Image domains has been deprecated since operator version 4.1.0; use the Domain on PV [domain home source type]({{< relref "/managing-domains/choosing-a-model/_index.md" >}}) instead.
 
 When a JRF domain is created, an OPSS wallet is stored in the file system where the domain home resides.
 This specific wallet key can be exported and used to create a new domain. There is no way to reuse the original RCU schema without this specific wallet key.
-Therefore, for disaster recovery, **you should back up this encryption key**.
+Therefore, for disaster recovery, **you should back up this OPSS wallet**.
 
 After the operator creates the JRF domain, it stores the OPSS wallet in a ConfigMap. See [Download and save the OPSS wallet](#download-opss-wallet-and-store-in-a-kubernetes-secret).
 
diff --git a/documentation/site/content/managing-domains/domain-on-pv/model-files.md b/documentation/site/content/managing-domains/domain-on-pv/model-files.md
@@ -1,7 +1,7 @@
 +++
 title = "Working with WDT model files"
 date = 2020-03-11T16:45:16-05:00
-weight = 30
+weight = 4
 pre = "<b> </b>"
 description = "Learn about model file requirements, macros, and loading order."
 +++
diff --git a/documentation/site/content/managing-domains/domain-on-pv/overview.md b/documentation/site/content/managing-domains/domain-on-pv/overview.md
@@ -44,7 +44,7 @@ They compactly define a WebLogic domain using model files, variable properties f
 For more information about the model format
 and its integration,
 see [Usage]({{< relref "/managing-domains/domain-on-pv/usage.md" >}})
-and [Working with WDT Model files]({{< relref "/managing-domains/working-with-wdt-models/model-files.md" >}}).
+and [Working with WDT Model files]({{< relref "/managing-domains/domain-on-pv/model-files.md" >}}).
 The WDT model format is fully described in the open source,
 [WebLogic Deploy Tooling](https://oracle.github.io/weblogic-deploy-tooling/) GitHub project.
 
diff --git a/documentation/site/content/managing-domains/domain-on-pv/usage.md b/documentation/site/content/managing-domains/domain-on-pv/usage.md
@@ -208,7 +208,7 @@ to specify any `persistentVolume` or `persistentVolumeClaim`  under the `intiali
 
 #### Domain information
 
-**For JRF-based domains, before proceeding, please be sure to read this document**, [JRF domains]({{< relref "/managing-domains/working-with-wdt-models/jrf-domain.md">}}).
+**For JRF-based domains, before proceeding, please be sure to read this document**, [JRF domains]({{< relref "/managing-domains/domain-on-pv/jrf-domain.md">}}).
 
 This is the section describing the WebLogic domain. For example:
 
@@ -238,7 +238,7 @@ spec:
 | `createIfNotExists`         | Specifies whether the operator should create the RCU schema first, before creating the domain. | `domain` or `domainAndRCU` (drop existing RCU schema and create new RCU schema) | N (default `domain`) |
 | `domainCreationImages`      | WDT domain images.                                                                    | An array of images.                                                          | Y                                |
 | `domainCreationConfigMap`   | Optional ConfigMap containing extra WDT models.                                       | Kubernetes ConfigMap name.                                               | N                                                  |
-| `osss.walletPasswordSecret` | Password for extracting OPSS wallet encryption key for JRF domain.               | Kubernetes Secret name with the key `walletPassword`.                       | Y                                                                   |
+| `osss.walletPasswordSecret` | Password for extracting OPSS wallet for JRF domain.               | Kubernetes Secret name with the key `walletPassword`.                       | Y                                                                   |
 | `osss.walletFileSecret`     | Extracted OPSS wallet file.                                                        | Kubernetes Secret name with the key `walletFile`.                            | N (Only needed when recreating the domain during disaster recovery) |
 
 **After a JRF domain is successfully deployed**: follow the next section, [Best practices](#best-practices), to download and back up the OPSS wallet.
@@ -247,7 +247,7 @@ spec:
 
 Oracle recommends that you save the OPSS wallet file in a safe, backed-up location __immediately__ after the initial JRF domain is created.
 In addition, you should make sure to store the wallet in a Kubernetes Secret in the same namespace. This will allow the secret to be available when the domain needs to be recovered in a disaster scenario or if the domain directory gets corrupted. There is no way to reuse the original RCU schema without this specific wallet key.
-Therefore, for disaster recovery, **you should back up this encryption key**.
+Therefore, for disaster recovery, **you should back up this OPSS wallet**.
 
 
 #### Back up the JRF domain home directory and database
@@ -343,7 +343,7 @@ In the rare scenario where the domain home directory is corrupted, and you do **
    $ kubectl -n sample-ns patch domain sample-domain1 --type='JSON' -p='[ { "op" : "replace", "path" : "/spec/restartVersion", "value" : "15" }]'
    ```
 
-For more information, see [Disaster Recovery]({{< relref "/managing-domains/working-with-wdt-models/jrf-domain#disaster-recovery-for-domain-on-pv-deployment">}}).  
+For more information, see [Disaster Recovery]({{< relref "/managing-domains/domain-on-pv/jrf-domain#disaster-recovery-for-domain-on-pv-deployment">}}).  
 
 ### Troubleshooting
 
diff --git a/documentation/site/content/managing-domains/model-in-image/overview.md b/documentation/site/content/managing-domains/model-in-image/overview.md
@@ -34,7 +34,7 @@ They compactly define a WebLogic domain using YAML files and support including
 application archives in a ZIP file. For a description of the model format
 and its integration with Model in Image,
 see [Usage]({{< relref "/managing-domains/model-in-image/usage.md" >}})
-and [Model files]({{< relref "/managing-domains/working-with-wdt-models/model-files.md" >}}).
+and [Model files]({{< relref "/managing-domains/model-in-image/model-files.md" >}}).
 The WDT model format is fully described in the open source,
 [WebLogic Deploy Tooling](https://oracle.github.io/weblogic-deploy-tooling/) GitHub project.
 
diff --git a/documentation/site/content/managing-domains/model-in-image/runtime-updates.md b/documentation/site/content/managing-domains/model-in-image/runtime-updates.md
@@ -106,7 +106,7 @@ Model updates can include additions, changes, and deletions. For help generating
 
  - For a description of model file syntax, see the
    [WebLogic Deploy Tooling](https://oracle.github.io/weblogic-deploy-tooling/) documentation
-   and Model in Image [Model files]({{< relref "/managing-domains/working-with-wdt-models/model-files.md" >}}) documentation.
+   and Model in Image [Model files]({{< relref "/managing-domains/model-in-image/model-files.md" >}}) documentation.
 
  - For a description of helper tooling that you can use to generate model change YAML,
    see [Using the WDT Discover and Compare Model Tools](#using-the-wdt-discover-domain-and-compare-model-tools).
diff --git a/documentation/site/content/managing-domains/model-in-image/usage.md b/documentation/site/content/managing-domains/model-in-image/usage.md
@@ -108,7 +108,7 @@ There are multiple methods for supplying Model in Image WDT models files, WDT va
     updates to models supplied by one of these methods.
 
 For more information about model file syntax,
-see [Working with WDT model files]({{< relref "/managing-domains/working-with-wdt-models/model-files.md" >}}).
+see [Working with WDT model files]({{< relref "/managing-domains/model-in-image/model-files.md" >}}).
 
 ### Optional WDT model ConfigMap
 
@@ -129,7 +129,7 @@ For example, place additional `.yaml` and `.properties` files in a directory cal
     weblogic.domainUID=MY-DOMAINUID
   ```
 
-See [Working with WDT model files]({{< relref "/managing-domains/working-with-wdt-models/model-files.md" >}}) for a description of model file syntax and loading order, and see [Runtime updates]({{< relref "/managing-domains/model-in-image/runtime-updates.md" >}}) for a description of using WDT model ConfigMaps to update the model configuration of a running domain.
+See [Working with WDT model files]({{< relref "/managing-domains/model-in-image/model-files.md" >}}) for a description of model file syntax and loading order, and see [Runtime updates]({{< relref "/managing-domains/model-in-image/runtime-updates.md" >}}) for a description of using WDT model ConfigMaps to update the model configuration of a running domain.
 
 
 ### Required runtime encryption secret
@@ -161,7 +161,7 @@ Corresponding Domain YAML file snippet:
 
 ### Secrets for model macros
 
-Create additional secrets as needed by macros in your model files. For example, these can store database URLs and credentials that are accessed using `@@SECRET` macros in your model that reference the secrets.  For a description of model macros, see [Model files]({{< relref "/managing-domains/working-with-wdt-models/model-files.md" >}}).
+Create additional secrets as needed by macros in your model files. For example, these can store database URLs and credentials that are accessed using `@@SECRET` macros in your model that reference the secrets.  For a description of model macros, see [Model files]({{< relref "/managing-domains/model-in-image/model-files.md" >}}).
 
 ### Domain fields
 
diff --git a/documentation/site/content/managing-domains/working-with-wdt-models/_index.md b/documentation/site/content/managing-domains/working-with-wdt-models/_index.md
diff --git a/documentation/site/content/samples/azure-kubernetes-service/model-in-image.md b/documentation/site/content/samples/azure-kubernetes-service/model-in-image.md
@@ -298,7 +298,7 @@ The model file:
         - This secret is in turn referenced using the `webLogicCredentialsSecret` field in the Domain.
         - The `weblogic-credentials` is a reserved name that always dereferences to the owning Domain actual WebLogic credentials secret name.
 
-A Model in Image image can contain multiple properties files, archive ZIP files, and YAML files but in this sample you use just one of each. For a complete description of Model in Images model file naming conventions, file loading order, and macro syntax, see [Model files]({{< relref "/managing-domains/working-with-wdt-models/model-files.md" >}}) files in the Model in Image user documentation.
+A Model in Image image can contain multiple properties files, archive ZIP files, and YAML files but in this sample you use just one of each. For a complete description of Model in Images model file naming conventions, file loading order, and macro syntax, see [Model files]({{< relref "/managing-domains/model-in-image/model-files.md" >}}) files in the Model in Image user documentation.
 
 ##### Creating the image with WIT
 
diff --git a/documentation/site/content/samples/domains/domain-home-on-pv/build-domain-creation-image.md b/documentation/site/content/samples/domains/domain-home-on-pv/build-domain-creation-image.md
@@ -287,7 +287,7 @@ The model files:
     - This secret is in turn referenced using the `webLogicCredentialsSecret` field in the Domain.
     - The `weblogic-credentials` is a reserved name that always dereferences to the owning Domain actual WebLogic credentials secret name.
 
-An image can contain multiple properties files, archive ZIP files, and model YAML files but in this sample you use just one of each. For a complete description of WDT model file naming conventions, file loading order, and macro syntax, see [Model files]({{< relref "/managing-domains/working-with-wdt-models/model-files.md" >}}) in the user documentation.
+An image can contain multiple properties files, archive ZIP files, and model YAML files but in this sample you use just one of each. For a complete description of WDT model file naming conventions, file loading order, and macro syntax, see [Model files]({{< relref "/managing-domains/domain-on-pv/model-files.md" >}}) in the user documentation.
 
 #### Create the image with WIT
 
diff --git a/documentation/site/content/samples/domains/domain-home-on-pv/prerequisites.md b/documentation/site/content/samples/domains/domain-home-on-pv/prerequisites.md
@@ -159,7 +159,7 @@ for the Domain on PV sample.
 
 **NOTE**: The requirements in this section are in addition to [Prerequisites for WLS and JRF domain types](#prerequisites-for-wls-and-jrf-domain-types).
 
-A JRF domain requires an infrastructure database, and configuring your domain to access this database. For more details, see [JRF domain]({{< relref "/managing-domains/working-with-wdt-models/jrf-domain.md" >}}) in the user documentation. You must perform all these steps _before_ you create your domain.
+A JRF domain requires an infrastructure database, and configuring your domain to access this database. For more details, see [JRF domain]({{< relref "/managing-domains/domain-on-pv/jrf-domain.md" >}}) in the user documentation. You must perform all these steps _before_ you create your domain.
 
 ##### Set up and initialize an infrastructure database
 
@@ -233,4 +233,4 @@ For example, in this sample:
         rcu_db_conn_string: '@@SECRET:@@ENV:DOMAIN_UID@@-rcu-access:rcu_db_conn_string@@'
 ```
 
-For important JRF domain information, refer to [JRF domains]({{< relref "/managing-domains/working-with-wdt-models/jrf-domain.md" >}}).
+For important JRF domain information, refer to [JRF domains]({{< relref "/managing-domains/domain-on-pv/jrf-domain.md" >}}).
diff --git a/documentation/site/content/samples/domains/domain-home-on-pv/sample.md b/documentation/site/content/samples/domains/domain-home-on-pv/sample.md
@@ -53,7 +53,7 @@ In this section, you will define the PV and PVC configuration and reference the
 
 #### Secrets
 
-First, create the secrets needed by both WLS and JRF type model domains. You have to create the "WebLogic credentials secret" and any other secrets that are referenced from the macros in the WDT model file. For more details about using macros in the WDT model files, see [Working with the WDT model files]({{< relref "managing-domains/working-with-wdt-models/model-files/_index.md" >}}).
+First, create the secrets needed by both WLS and JRF type model domains. You have to create the "WebLogic credentials secret" and any other secrets that are referenced from the macros in the WDT model file. For more details about using macros in the WDT model files, see [Working with the WDT model files]({{< relref "managing-domains/domain-on-pv/model-files.md" >}}).
 
 Run the following `kubectl` commands to deploy the required secrets:
 
diff --git a/documentation/site/content/samples/domains/model-in-image/auxiliary-image-creation.md b/documentation/site/content/samples/domains/model-in-image/auxiliary-image-creation.md
@@ -228,7 +228,7 @@ The model files:
     - This secret is in turn referenced using the `webLogicCredentialsSecret` field in the Domain.
     - The `weblogic-credentials` is a reserved name that always dereferences to the owning Domain actual WebLogic credentials secret name.
 
-An image can contain multiple properties files, archive ZIP files, and YAML files but in this sample you use just one of each. For a complete description of WDT model file naming conventions, file loading order, and macro syntax, see [Model files]({{< relref "/managing-domains/working-with-wdt-models/model-files.md" >}}) in the user documentation.
+An image can contain multiple properties files, archive ZIP files, and YAML files but in this sample you use just one of each. For a complete description of WDT model file naming conventions, file loading order, and macro syntax, see [Model files]({{< relref "/managing-domains/model-in-image/model-files.md" >}}) in the user documentation.
 
 #### Create the image with WIT
 
diff --git a/documentation/site/content/samples/domains/model-in-image/initial.md b/documentation/site/content/samples/domains/model-in-image/initial.md
@@ -40,7 +40,7 @@ In this section, you will deploy the domain resource with the new auxliliary ima
 
 #### Secrets
 
-First, create the secrets needed by the domain. You have to create the WebLogic credentials secret and any other secrets that are referenced from the macros in the WDT model file. For more details about using macros in the WDT model files, see [Working with the WDT model files]({{< relref "managing-domains/working-with-wdt-models/model-files/_index.md" >}}).
+First, create the secrets needed by the domain. You have to create the WebLogic credentials secret and any other secrets that are referenced from the macros in the WDT model file. For more details about using macros in the WDT model files, see [Working with the WDT model files]({{< relref "managing-domains/domain-on-pv/model-files.md" >}}).
 
 Run the following `kubectl` commands to deploy the required secrets:
 
diff --git a/documentation/site/content/samples/tanzu-kubernetes-service/_index.md b/documentation/site/content/samples/tanzu-kubernetes-service/_index.md
@@ -294,7 +294,7 @@ The model files:
         - This secret is in turn referenced using the `webLogicCredentialsSecret` field in the Domain.
         - The `weblogic-credentials` is a reserved name that always dereferences to the owning Domain actual WebLogic credentials secret name.
 
-A Model in Image image can contain multiple properties files, archive ZIP files, and YAML files but in this sample you use just one of each. For a complete description of Model in Images model file naming conventions, file loading order, and macro syntax, see [Model files]({{< relref "/managing-domains/working-with-wdt-models/model-files.md" >}}) files in the Model in Image user documentation.
+A Model in Image image can contain multiple properties files, archive ZIP files, and YAML files but in this sample you use just one of each. For a complete description of Model in Images model file naming conventions, file loading order, and macro syntax, see [Model files]({{< relref "/managing-domains/model-in-image/model-files.md" >}}) files in the Model in Image user documentation.
 
 ### Creating the image with WIT
 
