edit commands (#892)

* edit commands

* fix command formatting

Author: rosemarymarano

documentation/1.9/content/_index.md

@@ -52,7 +52,9 @@ This documentation includes sections targeted to different audiences:
 * [Concepts]({{< relref "/concepts/" >}}) explains the underlying metadata models and archive files.
 * The [User Guide]({{< relref "/userguide/" >}}) contains detailed usage information, including how to install and configure WebLogic Deploy Tooling, and how to use each tool.
 * The [Samples]({{< relref "/samples/" >}}) provide informative use case scenarios.
-* The [Developer Guide]({{< relref "/developer/" >}}) provides details for people who want to understand how WDT is built, its features mapped and implemented.
+* The [Developer Guide]({{< relref "/developer/" >}}) provides details for people who
+want to understand how WDT is built, its features mapped and implemented. Those who
+wish to contribute to the WebLogic Deploy Tooling code will find useful information [here]({{< relref "/developer/contribute.md" >}}).
 
 ### Related projects
 
@@ -61,6 +63,3 @@ This documentation includes sections targeted to different audiences:
 * [WebLogic Monitoring Exporter](https://github.com/oracle/weblogic-monitoring-exporter)
 * [WebLogic Logging Exporter](https://github.com/oracle/weblogic-logging-exporter)
 * [WebLogic Remote Console](https://github.com/oracle/weblogic-remote-console)
-
-### Contributing
-Those who wish to contribute to the WebLogic Deploy Tooling code will find useful information [here](https://github.com/oracle/weblogic-deploy-tooling/blob/master/CONTRIBUTING.md).

documentation/1.9/content/concepts/archive.md

@@ -47,7 +47,13 @@ The directory where the model is optionally located. Only one model file, either
 The directory where a wallet can be stored for use with Oracle Platform Security Services. The file resource name is not specified in the model, and is assumed to be a single ZIP file in the archive at this location.  
 
 #### `wlsdeploy/applications`
-The root directory under which applications are stored. Applications can be stored in the archive as EAR or WAR files, or expanded* under this folder. A sample expanded WAR application might have these entries:
+The root directory under which applications are stored. Applications can be stored in the archive as EAR or WAR files, or expanded under this folder.
+
+{{% notice note %}} Expanded application directories are supported after WebLogic Deploy Tooling release 1.6.2.
+{{% /notice %}}
+
+A sample expanded WAR application might have these entries:
+
 ```
 wlsdeploy/applications/myApp/index.jsp
 wlsdeploy/applications/myApp/META-INF/MANIFEST.MF
@@ -56,28 +62,26 @@ wlsdeploy/applications/myApp/WEB-INF/web.xml
 wlsdeploy/applications/myApp/WEB-INF/weblogic.xml
 ```
 
-\* Expanded application directories are supported after WebLogic Deploy Tooling release 1.6.2
-
 #### `wlsdeploy/classpathLibraries`
 The root directory under which JARs/directories used for server classpaths are stored. Every file resource under this directory is extracted, even those not referenced in the model.
 
 #### `wlsdeploy/coherence`
 The root directory under which empty directories must exist for Coherence persistent stores.
 
 #### `wlsdeploy/domainBin`
-The root directory under which $DOMAIN_HOME/bin scripts are stored. Only scripts referenced in the `domainInfo/domainBin` section of the model are extracted.
+The root directory under which `$DOMAIN_HOME/bin` scripts are stored. Only scripts referenced in the `domainInfo/domainBin` section of the model are extracted.
 
 #### `wlsdeploy/domainLibraries`
 The root directory under which `$DOMAIN_HOME/lib` libraries are stored. Only libraries referenced in the `domainInfo/domainLibraries` section of the model are extracted.
 
 #### `wlsdeploy/nodeManager`
-The root directory under which node manager file resources, such as keystore files, are stored.
+The root directory under which Node Manager file resources, such as keystore files, are stored.
 
 #### `wlsdeploy/scripts`
 The root directory under which scripts are stored. These can include JDBC create scripts, and WLDF action scripts.
 
 #### `wlsdeploy/servers`
-The root directory under which server files, such as keystore files, are stored. These are organized by server name, such as `wlsdeploy/server/my-server/mykey.jks`
+The root directory under which server files, such as keystore files, are stored. These are organized by server name, such as `wlsdeploy/server/my-server/mykey.jks`.
 
 #### `wlsdeploy/sharedLibraries`
 The root directory under which shared libraries are stored. These are stored as JAR files within the archive.
@@ -89,7 +93,7 @@ The root directory under which empty directories must exist for `FileStore` elem
 
 The Create Domain, Update Domain, Deploy Applications, and Validate Model Tools allow the specification of multiple archive files on the command line. For example:
 
-    weblogic-deploy\bin\createDomain.cmd -archive_file one.zip,two.zip,three.zip ...
+    $ weblogic-deploy\bin\createDomain.cmd -archive_file one.zip,two.zip,three.zip ...
 
 File resources can be present in any of these archives. Resources in each archive will supersede resources found in previous archives.
 

documentation/1.9/content/concepts/model.md

@@ -172,7 +172,8 @@ The second method for locating the Kubernetes secret file is to use the environm
 ```
 If the `<name>` value has a corresponding mapped directory in `WDT_MODEL_SECRETS_NAME_DIR_PAIRS`, then that directory will take precedence over any roots specified in `WDT_MODEL_SECRETS_DIRS`.
 
-NOTE: It is important that the secrets directories contain only secrets files, because those files are examined to create a list of available name/key pairs.
+{{% notice note %}} It is important that the secrets directories contain only secrets files, because those files are examined to create a list of available name/key pairs.
+{{% /notice %}}
 
 **Path tokens** are tokens that reference known values, and can be used to make the model more portable. For example, a model may reference a WebLogic library source path as:
 ```yaml
@@ -259,13 +260,13 @@ This feature can also remove items that were created by WebLogic Server template
 
 This feature does not apply to named security providers within a realm. These items follow a special set of rules that are required to maintain their ordering. See [Modeling security providers]({{< relref "/samples/securityproviders-model.md" >}}) for detailed information.
 
-This feature cannot be use to un-deploy applications or remove libraries.
+This feature cannot be use to undeploy applications or remove libraries.
 
 ### Using multiple models
 
 The Create Domain, Update Domain, Deploy Applications, and Validate Model Tools allow the specification of multiple models on the command line. For example:
 
-    weblogic-deploy\bin\createDomain.cmd -model_file modelOne,modelTwo,modelThree ...
+    $ weblogic-deploy\bin\createDomain.cmd -model_file modelOne,modelTwo,modelThree ...
 
 In this case, the models are merged into a single model before being applied. Each successive model is added to the previous model. In cases where entities exist in both models, the attributes are combined and attribute values from successive models prevail.  The resulting model is then verified before being applied.
 For example, if Model 1 looks like:

documentation/1.9/content/developer/buildWDT.md

@@ -31,7 +31,7 @@ If you are using an IDE for development and building, creating a `maven-config`
 
 If you are making changes to the project, you can build the project using this command line:
 
-  `mvn -Dunit-test-wlst-dir=<wlst-directory> clean install`
+  `$ mvn -Dunit-test-wlst-dir=<wlst-directory> clean install`
 
 This will build the entire project and run the unit tests. Omit the `-Dunit-test-wlst-dir=` argument if you have created a `maven.config` file, as described above.
 
@@ -40,6 +40,6 @@ the -D setting will take precedence.
 
 If you are not making changes and are only interested in building the latest version, then you can skip the unit tests, using this command line:
 
-  `mvn -DskipTests clean install`
+  `$ mvn -DskipTests clean install`
 
 The resulting installer ZIP file built is under the `WLSDEPLOY_HOME/installer/target` directory.

documentation/1.9/content/developer/contribute.md

@@ -0,0 +1,43 @@
+---
+title: "Contribute to WDT"
+date: 2019-02-23T17:19:24-05:00
+draft: false
+weight: 6
+---
+
+Oracle welcomes contributions to this repository from anyone.
+
+If you want to submit a pull request to fix a bug or enhance an existing feature,
+first open an issue and link to that issue when you submit your pull request.
+
+If you have any questions about a possible submission, feel free to open an issue too.
+
+### Contributing to the WebLogic Deploy repository
+Pull requests can be made under [The Oracle Contributor Agreement](https://www.oracle.com/technetwork/community/oca-486395.html) (OCA).
+
+For pull requests to be accepted, the bottom of your commit message must have the following line using your name and e-mail address as it appears in the OCA Signatories list.
+
+    Signed-off-by: Your Name <[email protected]>
+
+This can be automatically added to pull requests by committing with:
+
+    $ git commit --signoff
+
+Only pull requests from committers that can be verified as having signed the OCA can be accepted.
+
+### Pull request process
+
+1. Fork this repository.
+2. Create a branch in your fork to implement the changes. We recommend using the issue number as part of your branch name, for example, 1234-fixes.
+3. Ensure that any documentation is updated with the changes that are required by your fix.
+4. Ensure that any samples are updated if the base image has been changed.
+5. Squash your branch changes into a single commit.
+6. Submit the pull request.
+
+    a. Do not leave the pull request blank.
+
+    b. Explain exactly what your changes are meant to do and provide simple steps on how to validate your changes.
+
+    c. Ensure that you reference the issue you created as well.
+
+7. We will assign someone to review the pull request before it is merged.

documentation/1.9/content/samples/cluster-model.md

@@ -47,8 +47,8 @@ topology:
                 ClassPath: '/foo/bar,wlsdeploy/classpathLibraries/mylib.jar'
 ```
 There are additional sub-folders and attributes available for more configuration options. These can be determined using the [Model Help Tool]({{< relref "/userguide/tools/model_help.md" >}}). For example, this command will list the attributes and sub-folders for the `Server` folder:
-```yaml
-${WDT_HOME}/bin/modelHelp.sh -oracle_home /tmp/oracle topology:/Server
+```bash
+$ ${WDT_HOME}/bin/modelHelp.sh -oracle_home /tmp/oracle topology:/Server
 ```
 
 For this sample, the machine named `machine-1` and the data source named `jdbc-1` should be defined elsewhere within this model, or should already exist in a domain that is being updated.

documentation/1.9/content/samples/jdbc-model.md

@@ -31,8 +31,8 @@ resources:
                             Value: scott
 ```
 There are additional sub-folders and attributes available for more configuration options. These can be determined using the [Model Help Tool]({{< relref "/userguide/tools/model_help.md" >}}). For example, this command will list the attributes and sub-folders for the `JDBCSystemResource/JdbcResource` folder:
-```yaml
-${WDT_HOME}/bin/modelHelp.sh -oracle_home /tmp/oracle resources:/JDBCSystemResource/JdbcResource
+```bash
+$ ${WDT_HOME}/bin/modelHelp.sh -oracle_home /tmp/oracle resources:/JDBCSystemResource/JdbcResource
 ```
 
 For this sample, the target cluster `cluster-1` should be defined elsewhere within this model, or should already exist in a domain that is being updated.

documentation/1.9/content/samples/odl-model.md

@@ -7,7 +7,7 @@ description: "A model for configuring Oracle Diagnostic Logging (ODL)."
 ---
 
 
-Oracle Diagnostic Logging (ODL) can be configured and updated with Create Domain, Update Domain, and Deploy Applications Tool, starting with WDT release 1.5.2.
+Oracle Diagnostic Logging (ODL) can be configured and updated with Create Domain, Update Domain, and Deploy Applications Tools, starting with WDT release 1.5.2.
 ODL configuration is supported only for offline mode in WDT. ODL configuration is not added when a model is created using the Discover Domain Tool.
 This example shows how some common configuration elements can be represented in the model.
 

documentation/1.9/content/samples/ohs-model.md

@@ -6,7 +6,7 @@ weight: 9
 description: "A model for configuring Oracle HTTP Server (OHS)."
 ---
 
-Starting with WDT 1.8.0, you can configure and update Oracle HTTP Server (OHS) using the Create Domain, Update Domain, and Deploy Applications Tool, in offline mode only. To discover the OHS configuration, use the Discover Domain Tool, in offline mode only.
+Starting with WDT 1.8.0, you can configure and update Oracle HTTP Server (OHS) using the Create Domain, Update Domain, and Deploy Applications Tools, in offline mode only. To discover the OHS configuration, use the Discover Domain Tool, in offline mode only.
 
 #### Prerequisites
 
@@ -24,7 +24,7 @@ The revised value would be:
 ```
 The file name of this new domain type (without the `.json` extension) is used with the `-domain_type` argument on the WDT command line. For example, the command line to create a domain using the `HttpServer.json` file from the previous steps would look like:
 ```
-WLSDEPLOY_HOME/bin/createDomain -oracle_home /etc/oracle ... -domain_type HttpServer
+$ WLSDEPLOY_HOME/bin/createDomain -oracle_home /etc/oracle ... -domain_type HttpServer
 ```
 
 #### Configuring the model
@@ -50,6 +50,6 @@ Each name under the `OHS` folder must match a name under the `SystemComponent` f
 The `ComponentType` field of the `SystemComponent` element must be set to `OHS` in order to allow configuration of the corresponding `OHS` folders.
 
 You can use the [Model Help Tool]({{< relref "/userguide/tools/model_help.md" >}}) to determine the complete list of folders and attributes that can be used in these sections of the model. For example, this command will list the attributes in the `OHS` folder:
-```yaml
-${WDT_HOME}/bin/modelHelp.sh -oracle_home /tmp/oracle resources:/OHS
+```bash
+$ ${WDT_HOME}/bin/modelHelp.sh -oracle_home /tmp/oracle resources:/OHS
 ```

documentation/1.9/content/samples/securityproviders-model.md

@@ -109,9 +109,9 @@ description: "Special handling and model semantics for WebLogic Server security
  Here is an example of how to prepare and install a schema file from its MBean Jar File (MJF):
 
  ```bash
- export CONFIG_JVM_ARGS=-DSchemaTypeSystemName=TrustServiceIdentityAsserter
+ $ export CONFIG_JVM_ARGS=-DSchemaTypeSystemName=TrustServiceIdentityAsserter
 
- ORACLE_HOME/oracle_common/common/bin/prepareCustomProvider.sh -mjf=ORACLE_HOME/oracle_common/modules/oracle.jps/jps-wls-trustprovider.jar -out ORACLE_HOME/oracle_common/lib/schematypes/jps-wls-trustprovider.schema.jar
+ $ ORACLE_HOME/oracle_common/common/bin/prepareCustomProvider.sh -mjf=ORACLE_HOME/oracle_common/modules/oracle.jps/jps-wls-trustprovider.jar -out ORACLE_HOME/oracle_common/lib/schematypes/jps-wls-trustprovider.schema.jar
 
  ```
  For FMW versions 12.1.2 and 12.1.3, replace `oracle.jps` in the example path above with: