Merge remote-tracking branch 'upstream/master' into branch1

Author: pcoop

docs/404.md

@@ -1,6 +1,7 @@
 ---
 title: "Page Not Found"
 search: exclude
+sidebar: cdp_sidebar
 ---  
 
 Sorry, but the page you were trying to view does not exist. Try searching for it or looking at the URL to see if it looks correct.

docs/images/CICSbundlecontents.png

@@ -90,7 +90,8 @@ the target group of CICS regions\.
 *   `--timeout`  | `--to` *(number)*
 
 	* An optional numerical value that specifies the maximum amount of time in seconds
-      (1 \- 1800 inclusive) for the DFHDPLOY command to complete\.
+      (1 \- 1800 inclusive) for the DFHDPLOY command to complete\. If not specified
+      DFHDPLOY will use its default of 300 seconds\.
 
 *   `--target-state`  | `--ts` | `--targetstate` *(string)*
 
@@ -287,7 +288,8 @@ Push a CICS bundle from the working directory to a target CICSplex\.
 *   `--timeout`  | `--to` *(number)*
 
 	* An optional numerical value that specifies the maximum amount of time in seconds
-      (1 \- 1800 inclusive) for the DFHDPLOY command to complete\.
+      (1 \- 1800 inclusive) for the DFHDPLOY command to complete\. If not specified
+      DFHDPLOY will use its default of 300 seconds\.
 
 *   `--target-state`  | `--ts` | `--targetstate` *(string)*
 
@@ -408,7 +410,8 @@ target group of CICS regions\.
 *   `--timeout`  | `--to` *(number)*
 
 	* An optional numerical value that specifies the maximum amount of time in seconds
-      (1 \- 1800 inclusive) for the DFHDPLOY command to complete\.
+      (1 \- 1800 inclusive) for the DFHDPLOY command to complete\. If not specified
+      DFHDPLOY will use its default of 300 seconds\.
 
 *   `--target-state`  | `--ts` | `--targetstate` *(string)*
 

docs/pages/cdp/CLIReadme.md

@@ -23,6 +23,6 @@ export const TimeoutOption: ICommandOptionDefinition = {
     type: "number",
     numericValueRange: [1, MAX_VALUE],
     description: "An optional numerical value that specifies the maximum amount of time in seconds " +
-                 "(1 - 1800 inclusive) for the DFHDPLOY command to complete."
+                 "(1 - " + MAX_VALUE + " inclusive) for the DFHDPLOY command to complete. If not specified " +
+                 "DFHDPLOY will use its default of 300 seconds."
 };
-