vmware · stuclem · Jan 17, 2018 · Nov 29, 2017 · Dec 4, 2017 · Dec 4, 2017
diff --git a/docs/user_doc/README.md b/docs/user_doc/README.md
@@ -20,7 +20,7 @@ This information is intended for the following audiences:
 
 ----------
 
-Copyright &copy; 2016, 2017 VMware, Inc. All rights reserved. [Copyright and trademark information](http://pubs.vmware.com/copyright-trademark.html). Any feedback you provide to VMware is subject to the terms at [www.vmware.com/community_terms.html](http://www.vmware.com/community_terms.html).
+Copyright &copy; 2016-2018 VMware, Inc. All rights reserved. [Copyright and trademark information](http://pubs.vmware.com/copyright-trademark.html). Any feedback you provide to VMware is subject to the terms at [www.vmware.com/community_terms.html](http://www.vmware.com/community_terms.html).
 
 **VMware, Inc.**<br>
 3401 Hillview Ave.<br>

diff --git a/docs/user_doc/SUMMARY.md b/docs/user_doc/SUMMARY.md
@@ -23,35 +23,35 @@
          * [vCenter Server for Windows](vic_vsphere_admin/plugins_vc_windows.md)
          * [vCenter Server Appliance](vic_vsphere_admin/plugins_vcsa.md)
   * [Deploy VCHs](vic_vsphere_admin/deploy_vch.md)
-     * [Open the Required Ports on ESXi Hosts](vic_vsphere_admin/open_ports_on_hosts.md)
-     * [Obtain Certificate Thumbprints](vic_vsphere_admin/obtain_thumbprint.md)
-     * [Deploy a Basic VCH](vic_vsphere_admin/deploy_basic_vch.md)
+     * [Using vic-machine](vic_vsphere_admin/using_vicmachine.md)
+         * [Running Commands](vic_vsphere_admin/running_vicmachine_cmds.md)
+         * [Obtain Certificate Thumbprints](vic_vsphere_admin/obtain_thumbprint.md)
+         * [Set Environment Variables](vic_vsphere_admin/vic_env_variables.md)
+         * [Open the Required Ports on ESXi Hosts](vic_vsphere_admin/open_ports_on_hosts.md)
          * [Deploy a VCH to an ESXi Host with No vCenter Server](vic_vsphere_admin/deploy_vch_esxi.md)
          * [Deploy a VCH to a Basic vCenter Server Cluster](vic_vsphere_admin/deploy_vch_vcenter.md)
          * [Verify the Deployment of a VCH](vic_vsphere_admin/verify_vch_deployment.md)
-     * [VCH Deployment Options](vic_vsphere_admin/vch_installer_options.md)
-         * [VCH Placement](vic_vsphere_admin/vch_placement.md)
-             * [Set Environment Variables](vic_vsphere_admin/vic_env_variables.md)
-         * [VCH Security](vic_vsphere_admin/vch_security.md)
-             * [Auto-Generated Certificates](vic_vsphere_admin/tls_auto_certs.md)
-             * [Custom Certificates](vic_vsphere_admin/tls_custom_certs.md)
-             * [Unrestricted Access](vic_vsphere_admin/tls_unrestricted.md)
-             * [Different User Accounts](vic_vsphere_admin/set_up_ops_user.md)
-         * [VCH Networking](vic_vsphere_admin/vch_networking.md)
-             * [Public Network](vic_vsphere_admin/public_network.md)
-             * [Bridge Networks](vic_vsphere_admin/bridge_network.md)
-             * [Client Network](vic_vsphere_admin/client_network.md)
-             * [Management Network](vic_vsphere_admin/mgmt_network.md)
-             * [Container Networks](vic_vsphere_admin/container_networks.md)
-             * [Static IP Address](vic_vsphere_admin/vch_static_ip.md)
-             * [Proxy Servers](vic_vsphere_admin/vch_proxy.md)
-         * [VCH Storage](vic_vsphere_admin/vch_storage.md)
-             * [Image Store](vic_vsphere_admin/image_store.md)
-             * [Volume Stores](vic_vsphere_admin/volume_stores.md)
-         * [Connect VCHs to Registries](vic_vsphere_admin/vch_registry.md) 
-         * [VCH Appliance Configuration](vic_vsphere_admin/vch_config.md)
-         * [Container VM Configuration](vic_vsphere_admin/containervm_config.md)
-         * [Debugging VCH Deployment](vic_vsphere_admin/vch_debug_deployment.md)
+         * [VCH Boot Options](vic_vsphere_admin/vch_boot_options.md)
+     * [Deploy VCHs in vSphere Client](vic_vsphere_admin/deploy_vch_client.md)
+     * [General Settings](vic_vsphere_admin/vch_general_settings.md)
+     * [Compute Capacity](vic_vsphere_admin/vch_compute.md)
+     * [Storage Capacity](vic_vsphere_admin/vch_storage.md)
+         * [Image Datastore](vic_vsphere_admin/image_store.md)
+         * [Volume Datastores](vic_vsphere_admin/volume_stores.md)
+     * [Networks](vic_vsphere_admin/vch_networking.md)
+         * [Bridge Networks](vic_vsphere_admin/bridge_network.md)
+         * [Public Network](vic_vsphere_admin/public_network.md)
+         * [Client Network](vic_vsphere_admin/client_network.md)
+         * [Management Network](vic_vsphere_admin/mgmt_network.md)
+         * [Proxy Servers](vic_vsphere_admin/vch_proxy.md)
+         * [Container Networks](vic_vsphere_admin/container_networks.md)
+     * [Security](vic_vsphere_admin/vch_security.md)
+         * [VCH Certificate Options](vic_vsphere_admin/vch_cert_options.md)
+         * [Disable Client Verification](vic_vsphere_admin/tls_unrestricted.md)
+         * [Registry Access](vic_vsphere_admin/vch_registry.md) 
+     * [Operations User](vic_vsphere_admin/set_up_ops_user.md)
+         * [Manually Create a User Account for the Operations User](vic_vsphere_admin/ops_user_manual.md)
+     * [Finish VCH Deployment](vic_vsphere_admin/complete_vch_deployment_client.md)
      * [Deploy VCH for dch-photon](vic_vsphere_admin/deploy_vch_dchphoton.md)
   * [VCH Administration](vic_vsphere_admin/vch_admin.md)
      * [Interoperability](vic_vsphere_admin/interop.md)
@@ -65,10 +65,10 @@
          * [Obtain General VCH Information and Connection Details](vic_vsphere_admin/inspect_vch.md)
          * [Obtain VCH Configuration Information](vic_vsphere_admin/inspect_vch_config.md)
          * [Configure Running VCHs](vic_vsphere_admin/configure_vch.md)
-         * [Delete VCHs](vic_vsphere_admin/remove_vch.md)
          * [Debug Running VCHs](vic_vsphere_admin/debug_vch.md)
              * [Enable Shell Access](vic_vsphere_admin/vch_shell_access.md)
              * [Authorize SSH Access](vic_vsphere_admin/vch_ssh_access.md) 
+     * [Delete VCHs](vic_vsphere_admin/remove_vch.md)
      * [VCH Admin Portal](vic_vsphere_admin/access_vicadmin.md)
          * [Browser-Based Certificate Login](vic_vsphere_admin/browser_login.md)
          * [Command Line Certificate Login](vic_vsphere_admin/cmdline_login.md)

diff --git a/docs/user_doc/vic_app_dev/README.md b/docs/user_doc/vic_app_dev/README.md
@@ -12,7 +12,7 @@ This information is intended for DevOps administrators and container application
 
 ----------
 
-Copyright &copy; 2016, 2017 VMware, Inc. All rights reserved. [Copyright and trademark information](http://pubs.vmware.com/copyright-trademark.html). Any feedback you provide to VMware is subject to the terms at [www.vmware.com/community_terms.html](http://www.vmware.com/community_terms.html).
+Copyright &copy; 2016-2018 VMware, Inc. All rights reserved. [Copyright and trademark information](http://pubs.vmware.com/copyright-trademark.html). Any feedback you provide to VMware is subject to the terms at [www.vmware.com/community_terms.html](http://www.vmware.com/community_terms.html).
 
 **VMware, Inc.**
 3401 Hillview Ave.

diff --git a/docs/user_doc/vic_app_dev/network_use_cases.md b/docs/user_doc/vic_app_dev/network_use_cases.md
@@ -12,7 +12,7 @@ The following sections present examples of how to perform container networking o
 To perform certain networking operations on containers, your Docker environment and your virtual container hosts (VCHs) must be configured in a specific way.
 
 - For information about the default Docker networks, see https://docs.docker.com/engine/userguide/networking/.
-- For information about the networking options with which vSphere administrators can deploy VCHs and examples, see [Virtual Container Host Networking](../vic_vsphere_admin/vch_networking.md) in *Install, Deploy, and Maintain the vSphere Integrated Containers Infrastructure*.
+- For information about the networking options with which vSphere administrators can deploy VCHs and examples, see [Virtual Container Host Networks](../vic_vsphere_admin/vch_networking.md) in *Install, Deploy, and Maintain the vSphere Integrated Containers Infrastructure*.
 
 **NOTE**: The default level of trust on VCH container networks is `published`. As a consequence, if the vSphere administrator did not configure `--container-network-firewall` on the VCH, you must specify `-p 80` in `docker run` and `docker create` commands to publish port 80 on a container. Alternatively, the vSphere administrator can configure the VCH to set [`--container-network-firewall`](../vic_vsphere_admin/container_networks.md#container-network-firewall) to a different level. 
 

diff --git a/docs/user_doc/vic_cloud_admin/README.md b/docs/user_doc/vic_cloud_admin/README.md
@@ -12,7 +12,7 @@ This information is intended for Cloud administrators who want to use vSphere In
 
 ----------
 
-Copyright &copy; 2016, 2017 VMware, Inc. All rights reserved. [Copyright and trademark information](http://pubs.vmware.com/copyright-trademark.html). Any feedback you provide to VMware is subject to the terms at [www.vmware.com/community_terms.html](http://www.vmware.com/community_terms.html).
+Copyright &copy; 2016-2018 VMware, Inc. All rights reserved. [Copyright and trademark information](http://pubs.vmware.com/copyright-trademark.html). Any feedback you provide to VMware is subject to the terms at [www.vmware.com/community_terms.html](http://www.vmware.com/community_terms.html).
 
 **VMware, Inc.**<br>
 3401 Hillview Ave.<br>

diff --git a/docs/user_doc/vic_cloud_admin/SUMMARY.md b/docs/user_doc/vic_cloud_admin/SUMMARY.md
@@ -13,7 +13,7 @@
      * [Manage Repositories](manage_repository_registry.md)
    * [Add Viewers, Developers, or DevOps Administrators to Projects](add_users.md)
    * [Add VCHs](vchs_and_mgmt_portal.md)
-      * [Full Authentication](add_vch_fullTLS_in_portal.md)
+      * [Full TLS Authentication](add_vch_fullTLS_in_portal.md)
       * [Server-Side Authentication](add_vch_serversideTLS_in_portal.md)
       * [No Authentication](add_vch_noTLS_in_portal.md)
    * [Add Registries](add_repos_in_portal.md)

diff --git a/docs/user_doc/vic_overview/README.md b/docs/user_doc/vic_overview/README.md
@@ -8,7 +8,7 @@ This documentation applies to all 1.3.x releases.
 
 ----------
 
-Copyright &copy; 2016, 2017 VMware, Inc. All rights reserved. [Copyright and trademark information](http://pubs.vmware.com/copyright-trademark.html). Any feedback you provide to VMware is subject to the terms at [www.vmware.com/community_terms.html](http://www.vmware.com/community_terms.html).
+Copyright &copy; 2016-2018 VMware, Inc. All rights reserved. [Copyright and trademark information](http://pubs.vmware.com/copyright-trademark.html). Any feedback you provide to VMware is subject to the terms at [www.vmware.com/community_terms.html](http://www.vmware.com/community_terms.html).
 
 **VMware, Inc.**<br>
 3401 Hillview Ave.<br>

diff --git a/docs/user_doc/vic_overview/SUMMARY.md b/docs/user_doc/vic_overview/SUMMARY.md
@@ -3,4 +3,5 @@
 <!-- USE THIS SUMMARY FILE FOR PDF GENERATION ONLY -->
 
 * [Introduction](README.md)
-* [Overview of vSphere Integrated Containers](introduction.md)
+  * [Quick Start Links](vic_quickstart.md)
+  * [Overview](introduction.md)
diff --git a/docs/user_doc/vic_overview/introduction.md b/docs/user_doc/vic_overview/introduction.md
@@ -186,12 +186,12 @@ A VCH is functionally distinct from a traditional container host in the followin
 - There is no local image cache. This is kept on a datastore in the cluster that you specify when you deploy a VCH. 
 - There is no read-write shared storage
 
-A VCH is a multi-functional appliance that you deploy as a vApp in a vCenter Server cluster or as a resource pool on an ESXi host. The vApp or resource pool provides a useful visual parent-child relationship in the vSphere Client so that you can easily identify the container VMs that are provisioned into a VCH. You can also specify resource limits on the vApp. You can provision multiple VCHs onto a single ESXi host, into a vSphere resource pool, or into a vCenter Server cluster.
+A VCH is a multi-functional appliance that you deploy as a resource pool in a vCenter Server cluster or on an ESXi host. The resource pool provides a useful visual parent-child relationship in the vSphere Client so that you can easily identify the container VMs that are provisioned into a VCH. You can also specify resource limits on the resource pool. You can provision multiple VCHs onto a single ESXi host, into a vSphere resource pool, or into a vCenter Server cluster.
 
 
 #### The VCH Endpoint VM <a id="endpoint"></a>
 
-The VCH endoint VM is the VM that runs inside the VCH vApp or resource pool. There is a 1:1 relationship between a VCH and a VCH endpoint VM. The VCH endpoint VM provides the following functions:
+The VCH endoint VM is the VM that runs inside the VCH resource pool. There is a 1:1 relationship between a VCH and a VCH endpoint VM. The VCH endpoint VM provides the following functions:
 
 - Runs the services that a VCH requires.
 - Provides a secure remote API to a client.

diff --git a/docs/user_doc/vic_vsphere_admin/README.md b/docs/user_doc/vic_vsphere_admin/README.md
@@ -13,7 +13,7 @@ This information is intended for VMware vSphere&reg; administrators who want to
 
 ----------
 
-Copyright &copy; 2016, 2017 VMware, Inc. All rights reserved. [Copyright and trademark information](http://pubs.vmware.com/copyright-trademark.html). Any feedback you provide to VMware is subject to the terms at [www.vmware.com/community_terms.html](http://www.vmware.com/community_terms.html).
+Copyright &copy; 2016-2018 VMware, Inc. All rights reserved. [Copyright and trademark information](http://pubs.vmware.com/copyright-trademark.html). Any feedback you provide to VMware is subject to the terms at [www.vmware.com/community_terms.html](http://www.vmware.com/community_terms.html).
 
 **VMware, Inc.**<br>
 3401 Hillview Ave.<br>

diff --git a/docs/user_doc/vic_vsphere_admin/SUMMARY.md b/docs/user_doc/vic_vsphere_admin/SUMMARY.md
@@ -12,35 +12,35 @@
          * [vCenter Server for Windows](plugins_vc_windows.md)
          * [vCenter Server Appliance](plugins_vcsa.md)
   * [Deploy VCHs](deploy_vch.md)
-     * [Open the Required Ports on ESXi Hosts](open_ports_on_hosts.md)
-     * [Obtain Certificate Thumbprints](obtain_thumbprint.md)
-     * [Deploy a Basic VCH](deploy_basic_vch.md)
+     * [Using vic-machine](using_vicmachine.md)
+         * [Running Commands](running_vicmachine_cmds.md)
+         * [Obtain Certificate Thumbprints](obtain_thumbprint.md)
+         * [Set Environment Variables](vic_env_variables.md)
+         * [Open the Required Ports on ESXi Hosts](open_ports_on_hosts.md)
          * [Deploy a VCH to an ESXi Host with No vCenter Server](deploy_vch_esxi.md)
          * [Deploy a VCH to a Basic vCenter Server Cluster](deploy_vch_vcenter.md)
          * [Verify the Deployment of a VCH](verify_vch_deployment.md)
-     * [VCH Deployment Options](vch_installer_options.md)
-         * [VCH Placement](vch_placement.md)
-             * [Set Environment Variables](vic_env_variables.md)
-         * [VCH Security](vch_security.md)
-             * [Auto-Generated Certificates](tls_auto_certs.md)
-             * [Custom Certificates](tls_custom_certs.md)
-             * [Unrestricted Access](tls_unrestricted.md)
-             * [Different User Accounts](set_up_ops_user.md)
-         * [VCH Networking](vch_networking.md)
-             * [Public Network](public_network.md)
-             * [Bridge Networks](bridge_network.md)
-             * [Client Network](client_network.md)
-             * [Management Network](mgmt_network.md)
-             * [Container Networks](container_networks.md)
-             * [Static IP Address](vch_static_ip.md)
-             * [Proxy Servers](vch_proxy.md)
-         * [VCH Storage](vch_storage.md)
-             * [Image Store](image_store.md)
-             * [Volume Stores](volume_stores.md)
-         * [Connect VCHs to Registries](vch_registry.md) 
-         * [VCH Appliance Configuration](vch_config.md)
-         * [Container VM Configuration](containervm_config.md)
-         * [Debugging VCH Deployment](vch_debug_deployment.md)
+         * [VCH Boot Options](vch_boot_options.md)
+     * [Deploy VCHs in vSphere Client](deploy_vch_client.md)
+     * [General Settings](vch_general_settings.md)
+     * [Compute Capacity](vch_compute.md)
+     * [Storage Capacity](vch_storage.md)
+         * [Image Datastore](image_store.md)
+         * [Volume Datastores](volume_stores.md)
+     * [Networks](vch_networking.md)
+         * [Bridge Networks](bridge_network.md)
+         * [Public Network](public_network.md)
+         * [Client Network](client_network.md)
+         * [Management Network](mgmt_network.md)
+         * [Proxy Servers](vch_proxy.md)
+         * [Container Networks](container_networks.md)
+     * [Security](vch_security.md)
+         * [VCH Certificate Options](vch_cert_options.md)
+         * [Disable Client Verification](tls_unrestricted.md)
+         * [Registry Access](vch_registry.md) 
+     * [Operations User](set_up_ops_user.md)
+         * [Manually Create a User Account for the Operations User](ops_user_manual.md) 
+     * [Finish VCH Deployment](complete_vch_deployment_client.md)
      * [Deploy VCH for dch-photon](deploy_vch_dchphoton.md)
   * [VCH Administration](vch_admin.md)
      * [Interoperability](interop.md)
@@ -54,10 +54,10 @@
          * [Obtain General VCH Information and Connection Details](inspect_vch.md)
          * [Obtain VCH Configuration Information](inspect_vch_config.md)
          * [Configure Running VCHs](configure_vch.md)
-         * [Delete VCHs](remove_vch.md)
          * [Debug Running VCHs](debug_vch.md)
              * [Enable Shell Access](vch_shell_access.md)
              * [Authorize SSH Access](vch_ssh_access.md) 
+     * [Delete VCHs](remove_vch.md)
      * [VCH Admin Portal](access_vicadmin.md)
          * [Browser-Based Certificate Login](browser_login.md)
          * [Command Line Certificate Login](cmdline_login.md)
@@ -78,6 +78,12 @@
          * [Re-Tag the Appliance](retag_appliance.md)
      * [Check Service Status](service_status.md)
      * [Restart Services](restart_services.md)  
+  * [Backup and Restore](backup_vic.md)
+     * [Appliance](backup_vic_appliance.md)
+     * [VCHs](backup_vch.md)
+     * [Container Volumes](backup_volumes.md)
+         * [Backing Up VMDK Volumes](backup_vmdk.md)
+         * [Restoring VMDK Volumes](restore_vmdk.md)
   * [Troubleshooting](troubleshoot_vic.md) 
      * [Access Appliance Logs](appliance_logs.md)
      * [Access VCH Logs](log_bundles.md)

diff --git a/docs/user_doc/vic_vsphere_admin/access_h5_ui.md b/docs/user_doc/vic_vsphere_admin/access_h5_ui.md
@@ -2,7 +2,7 @@
 
 If you have installed the HTML5 plug-in for vSphere Integrated Containers, you can find information about your vSphere Integrated Containers deployment in the HTML5 vSphere Client.
 
-**IMPORTANT**: Do not use the vSphere Client to perform operations on virtual container hosts or container VMs. Specifically, using the vSphere Client to power off, power on, or delete the VCH vApp or VCH endpoint VM can cause vSphere Integrated Containers Engine to not function correctly. Always use `vic-machine` to perform operations on VCHs. The vSphere Client does not allow you to delete container VMs, but do not use the vSphere Client to power container VMs on or off. Always use Docker commands to perform operations on containers. 
+**IMPORTANT**: Do not perform operations on VCHs or container VMs directly in the vCenter Server inventory. Specifically, powering off, powering on, or deleting the VCH can cause vSphere Integrated Containers Engine to not function correctly. Always use the vSphere Integrated Containers plug-in for the vSphere Client or `vic-machine` to perform operations on VCHs. The vSphere Client does not allow you to delete container VMs, but do not use the vSphere Client to power container VMs on or off. Always use Docker commands or vSphere Integrated Containers Management Portal to perform operations on containers. 
 
 **NOTE**: More functionality will be added to the vSphere Integrated Containers view in future releases.
 
@@ -16,7 +16,7 @@ If you have installed the HTML5 plug-in for vSphere Integrated Containers, you c
 1. Log in to the HTML5 vSphere Client and click the **vSphere Client** logo in the top left corner.
 2. Under Inventories, click **vSphere Integrated Containers**.
 
-    The vSphere Integrated Containers view presents the number of VCHs and container VMs that you have deployed.
+    The vSphere Integrated Containers view presents the number of VCHs and container VMs that you have deployed to this vCenter Server instance.
 
 3. Click **vSphere Integrated Containers** in the main panel and select the **Summary** tab.