Resolve merge conflicts for develop branch for Release 1.0.0

docs/index.md

@@ -4,7 +4,7 @@
 The Terraform Provider for Delphix requires the Delphix Continuous Data Platform and Data Control Tower (DCT).
 
 
-The Terraform Provider for Delphix enables customers to natively manage data-as-code along with their infrastructure. 
+The Terraform Provider for Delphix enables customers to natively manage data-as-code along with their infrastructure.
 With Terraform and Delphix, customers can now automatically provision, manage and teardown any number of ephemeral data environments to drive enterprise DevOps workflows including test data management.
 
 This provider leverages the Delphix APIs available with the Delphix Data Control Tower (DCT). The provider must be configured with the proper API key generated by DCT and registered with associated Delphix engines before use
@@ -25,7 +25,7 @@ terraform {
 
 # Configure the DXI Provider
 provider "delphix" {
-  tls_insecure_skip = true 
+  tls_insecure_skip = true
   key = "dct_api_key"
   host = "dct_hostname"
 }
@@ -39,7 +39,7 @@ resource "delphix_vdb" "vdb_name" {
 
 ## Configuration and API Key Generation
 
-Delphix Provider uses DCT APIs to communicate with the Delphix engines. Authentication to DCT APIs are handled using API Keys. 
+Delphix Provider uses DCT APIs to communicate with the Delphix engines. Authentication to DCT APIs are handled using API Keys.
 For generation of the API key, please refer to [Authentication](https://docs.delphix.com/dct/authentication-170164311.html).
 
 

docs/resources/environment.md

@@ -1,6 +1,6 @@
 # Resource: <resource name> delphix_environment
 
-In Delphix, an environment is either a single instance host or cluster of hosts that run database software. 
+In Delphix, an environment is either a single instance host or cluster of hosts that run database software.
 
 Environments can either be a source (where data comes from), staging (where data are prepared/masked) or target (where data are delivered and used by developers and testers).
 
@@ -46,7 +46,7 @@ resource "delphix_environment" "unixcluster" {
      hostname = "db.host.com"
      toolkit_path = "/home/delphix"
      name = "unixcluster"
-     description = "This is a unix target." 
+     description = "This is a unix target."
      is_cluster = true    
      cluster_home = "/u01/app/19.0.0.0/grid"
  }
@@ -209,4 +209,4 @@ resource "delphix_environment" "fc-tgt-cluster" {
 * `namespace` - The namespace of this environment for replicated and restored objects.
 * `engine_id` - A reference to the Engine that this Environment connection is associated with.
 * `enabled` - True if this environment is enabled.
-* `hosts` - The hosts that are part of this environment.
+* `hosts` - The hosts that are part of this environment.