Added - Documention change for Cross Region ADG

Author: Andrew Jenner

website/docs/d/core_block_volume_replica.html.markdown

@@ -43,9 +43,4 @@ The following attributes are exported:
 * `state` - The current state of a block volume replica.
 * `time_created` - The date and time the block volume replica was created. Format defined by [RFC3339](https://tools.ietf.org/html/rfc3339). 
 * `time_last_synced` - The date and time the block volume replica was last synced from the source block volume. Format defined by [RFC3339](https://tools.ietf.org/html/rfc3339). 
-<<<<<<< ours
-* `total_data_transferred_in_gbs` - The total size of the data transferred from the source block volume to the block volume replica, in GBs. 
-* `volume_group_replica_id` - The OCID of the volume group replica. 
-=======
->>>>>>> theirs
 

website/docs/d/core_block_volume_replicas.html.markdown

@@ -58,9 +58,4 @@ The following attributes are exported:
 * `state` - The current state of a block volume replica.
 * `time_created` - The date and time the block volume replica was created. Format defined by [RFC3339](https://tools.ietf.org/html/rfc3339). 
 * `time_last_synced` - The date and time the block volume replica was last synced from the source block volume. Format defined by [RFC3339](https://tools.ietf.org/html/rfc3339). 
-<<<<<<< ours
-* `total_data_transferred_in_gbs` - The total size of the data transferred from the source block volume to the block volume replica, in GBs. 
-* `volume_group_replica_id` - The OCID of the volume group replica. 
-=======
->>>>>>> theirs
 

website/docs/d/core_boot_volume_replica.html.markdown

@@ -44,9 +44,4 @@ The following attributes are exported:
 * `state` - The current state of a boot volume replica.
 * `time_created` - The date and time the boot volume replica was created. Format defined by [RFC3339](https://tools.ietf.org/html/rfc3339). 
 * `time_last_synced` - The date and time the boot volume replica was last synced from the source boot volume. Format defined by [RFC3339](https://tools.ietf.org/html/rfc3339). 
-<<<<<<< ours
-* `total_data_transferred_in_gbs` - The total size of the data transferred from the source boot volume to the boot volume replica, in GBs. 
-* `volume_group_replica_id` - The OCID of the volume group replica. 
-=======
->>>>>>> theirs
 

website/docs/d/core_boot_volume_replicas.html.markdown

@@ -59,9 +59,4 @@ The following attributes are exported:
 * `state` - The current state of a boot volume replica.
 * `time_created` - The date and time the boot volume replica was created. Format defined by [RFC3339](https://tools.ietf.org/html/rfc3339). 
 * `time_last_synced` - The date and time the boot volume replica was last synced from the source boot volume. Format defined by [RFC3339](https://tools.ietf.org/html/rfc3339). 
-<<<<<<< ours
-* `total_data_transferred_in_gbs` - The total size of the data transferred from the source boot volume to the boot volume replica, in GBs. 
-* `volume_group_replica_id` - The OCID of the volume group replica. 
-=======
->>>>>>> theirs
 

website/docs/d/core_volume_groups.html.markdown

@@ -58,18 +58,10 @@ The following attributes are exported:
 * `size_in_gbs` - The aggregate size of the volume group in GBs.
 * `size_in_mbs` - The aggregate size of the volume group in MBs.
 * `source_details` - Specifies the source for a volume group.
-<<<<<<< ours
-	* `type` - The type can be one of these values: `volumeGroupBackupId`, `volumeGroupId`, `volumeGroupReplicaId`, `volumeIds`
-	* `volume_group_backup_id` - The OCID of the volume group backup to restore from.
-	* `volume_group_id` - The OCID of the volume group to clone from.
-	* `volume_group_replica_id` - The OCID of the volume group replica.
-	* `volume_ids` - OCIDs for the volumes in this volume group.
-=======
 	* `type` - The type can be one of these values: `volumeGroupBackupId`, `volumeGroupId`, `volumeIds`
 	* `volume_group_backup_id` - The OCID of the volume group backup to restore from, if the type is `volumeGroupBackup` 
 	* `volume_group_id` - The OCID of the volume group to clone from, if the type is `volumeGroup`
 	* `volume_ids` - OCIDs for the volumes in this volume group, if the type is `volumeIds`
->>>>>>> theirs
 * `state` - The current state of a volume group.
 * `time_created` - The date and time the volume group was created. Format defined by [RFC3339](https://tools.ietf.org/html/rfc3339).
 * `volume_group_replicas` - The list of volume group replicas of this volume group.

website/docs/d/data_labeling_service_dataset.html.markdown

@@ -53,10 +53,6 @@ The following attributes are exported:
 * `labeling_instructions` - The labeling instructions for human labelers in rich text format
 * `lifecycle_details` - A message describing the current state in more detail. For example, it can be used to provide actionable information for a resource in FAILED or NEEDS_ATTENTION state.
 * `state` - The state of a dataset. CREATING - The dataset is being created.  It will transition to ACTIVE when it is ready for labeling. ACTIVE   - The dataset is ready for labeling. UPDATING - The dataset is being updated.  It and its related resources may be unavailable for other updates until it returns to ACTIVE. NEEDS_ATTENTION - A dataset updation operation has failed due to validation or other errors and needs attention. DELETING - The dataset and its related resources are being deleted. DELETED  - The dataset has been deleted and is no longer available. FAILED   - The dataset has failed due to validation or other errors. 
-<<<<<<< ours
-* `system_tags` - The usage of system tag keys. These predefined keys are scoped to namespaces. For example: `{"orcl-cloud": {"free-tier-retained": "true"}}` 
-=======
->>>>>>> theirs
 * `time_created` - The date and time the resource was created, in the timestamp format defined by RFC3339.
 * `time_updated` - The date and time the resource was last updated, in the timestamp format defined by RFC3339.
 

website/docs/d/data_labeling_service_datasets.html.markdown

@@ -70,10 +70,6 @@ The following attributes are exported:
 * `labeling_instructions` - The labeling instructions for human labelers in rich text format
 * `lifecycle_details` - A message describing the current state in more detail. For example, it can be used to provide actionable information for a resource in FAILED or NEEDS_ATTENTION state.
 * `state` - The state of a dataset. CREATING - The dataset is being created.  It will transition to ACTIVE when it is ready for labeling. ACTIVE   - The dataset is ready for labeling. UPDATING - The dataset is being updated.  It and its related resources may be unavailable for other updates until it returns to ACTIVE. NEEDS_ATTENTION - A dataset updation operation has failed due to validation or other errors and needs attention. DELETING - The dataset and its related resources are being deleted. DELETED  - The dataset has been deleted and is no longer available. FAILED   - The dataset has failed due to validation or other errors. 
-<<<<<<< ours
-* `system_tags` - The usage of system tag keys. These predefined keys are scoped to namespaces. For example: `{"orcl-cloud": {"free-tier-retained": "true"}}` 
-=======
->>>>>>> theirs
 * `time_created` - The date and time the resource was created, in the timestamp format defined by RFC3339.
 * `time_updated` - The date and time the resource was last updated, in the timestamp format defined by RFC3339.
 

website/docs/d/database_autonomous_container_database.html.markdown

@@ -43,7 +43,7 @@ The following attributes are exported:
 		* `vpc_password` - For a RECOVERY_APPLIANCE backup destination, the password for the VPC user that is used to access the Recovery Appliance.
 		* `vpc_user` - For a RECOVERY_APPLIANCE backup destination, the Virtual Private Catalog (VPC) user that is used to access the Recovery Appliance.
 	* `recovery_window_in_days` - Number of days between the current and the earliest point of recoverability covered by automatic backups. This value applies to automatic backups. After a new automatic backup has been created, Oracle removes old automatic backups that are created before the window. When the value is updated, it is applied to all existing automatic backups. 
-* `cloud_autonomous_vm_cluster_id` - The OCID of the cloud Autonomous VM Cluster.
+* `cloud_autonomous_vm_cluster_id` - The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the cloud Autonomous Exadata VM Cluster.
 * `compartment_id` - The OCID of the compartment.
 * `db_unique_name` - **Deprecated.** The `DB_UNIQUE_NAME` value is set by Oracle Cloud Infrastructure.  Do not specify a value for this parameter. Specifying a value for this field will cause Terraform operations to fail. 
 * `db_version` - Oracle Database version of the Autonomous Container Database.

website/docs/d/database_autonomous_container_databases.html.markdown

@@ -68,7 +68,7 @@ The following attributes are exported:
 		* `vpc_password` - For a RECOVERY_APPLIANCE backup destination, the password for the VPC user that is used to access the Recovery Appliance.
 		* `vpc_user` - For a RECOVERY_APPLIANCE backup destination, the Virtual Private Catalog (VPC) user that is used to access the Recovery Appliance.
 	* `recovery_window_in_days` - Number of days between the current and the earliest point of recoverability covered by automatic backups. This value applies to automatic backups. After a new automatic backup has been created, Oracle removes old automatic backups that are created before the window. When the value is updated, it is applied to all existing automatic backups. 
-* `cloud_autonomous_vm_cluster_id` - The OCID of the cloud Autonomous VM Cluster.
+* `cloud_autonomous_vm_cluster_id` - The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the cloud Autonomous Exadata VM Cluster.
 * `compartment_id` - The OCID of the compartment.
 * `db_unique_name` - **Deprecated.** The `DB_UNIQUE_NAME` value is set by Oracle Cloud Infrastructure.  Do not specify a value for this parameter. Specifying a value for this field will cause Terraform operations to fail. 
 * `db_version` - Oracle Database version of the Autonomous Container Database.