Skip to content

Commit 51ff175

Browse files
committed
Small language fixes as per reviews
1 parent 3fe33c1 commit 51ff175

File tree

6 files changed

+5
-12
lines changed

6 files changed

+5
-12
lines changed

_includes/v20.2/backups/backup-options.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
-----------------------------------------------------------------+-------------------------+------------------------------
33
`revision_history`<a name="with-revision-history"></a> | N/A | Create a backup with full [revision history](take-backups-with-revision-history-and-restore-from-a-point-in-time.html), which records every change made to the cluster within the garbage collection period leading up to and including the given timestamp.
44
`encryption_passphrase`<a name="with-encryption-passphrase"></a> | [`STRING`](string.html) | The passphrase used to [encrypt the files](take-and-restore-encrypted-backups.html) (`BACKUP` manifest and data files) that the `BACKUP` statement generates. This same passphrase is needed to decrypt the file when it is used to [restore](take-and-restore-encrypted-backups.html) and to list the contents of the backup when using [`SHOW BACKUP`](show-backup.html). There is no practical limit on the length of the passphrase.
5-
`DETACHED` | N/A | <span class="version-tag">New in v20.2:</span> When a backup runs in `DETACHED` mode, it will execute asynchronously and the job ID will be returned immediately without waiting for the job to finish. Note that with `DETACHED` specified further job information and the job completion status will not be returned. For more on the differences between the returned job data, see the [Example](backup.html#run-a-backup-asynchronously) below. To check on the job status, use the [`SHOW JOBS`](show-jobs.html) statement. <br><br>To run a backup within a [transaction](transactions.html), use the `DETACHED` option.
5+
`DETACHED` | N/A | <span class="version-tag">New in v20.2:</span> When a backup runs in `DETACHED` mode, it will execute asynchronously and the job ID will be returned immediately without waiting for the job to finish. Note that with `DETACHED` specified, further job information and the job completion status will not be returned. For more on the differences between the returned job data, see the [example](backup.html#run-a-backup-asynchronously) below. To check on the job status, use the [`SHOW JOBS`](show-jobs.html) statement. <br><br>To run a backup within a [transaction](transactions.html), use the `DETACHED` option.
66
`kms` | [`STRING`](string.html) | <span class="version-tag">New in v20.2:</span> The [key management service (KMS) URI](take-and-restore-encrypted-backups.html#aws-kms-uri-format) (or a [comma-separated list of URIs](take-and-restore-encrypted-backups.html#take-a-backup-with-multi-region-encryption)) used to encrypt the files (`BACKUP` manifest and data files) that the `BACKUP` statement generates. This same KMS URI is needed to decrypt the file when it is used to [restore](take-and-restore-encrypted-backups.html#restore-from-an-encrypted-backup-with-aws-kms) and to list the contents of the backup when using [`SHOW BACKUP`](show-backup.html). <br/><br/>Currently, only AWS KMS is supported.

_includes/v21.1/backups/backup-options.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
-----------------------------------------------------------------+-------------------------+------------------------------
33
`revision_history`<a name="with-revision-history"></a> | N/A | Create a backup with full [revision history](take-backups-with-revision-history-and-restore-from-a-point-in-time.html), which records every change made to the cluster within the garbage collection period leading up to and including the given timestamp.
44
`encryption_passphrase`<a name="with-encryption-passphrase"></a> | [`STRING`](string.html) | The passphrase used to [encrypt the files](take-and-restore-encrypted-backups.html) (`BACKUP` manifest and data files) that the `BACKUP` statement generates. This same passphrase is needed to decrypt the file when it is used to [restore](take-and-restore-encrypted-backups.html) and to list the contents of the backup when using [`SHOW BACKUP`](show-backup.html). There is no practical limit on the length of the passphrase.
5-
`DETACHED` | N/A | When a backup runs in `DETACHED` mode, it will execute asynchronously and the job ID will be returned immediately without waiting for the job to finish. Note that with `DETACHED` specified further job information and the job completion status will not be returned. For more on the differences between the returned job data, see the [Example](backup.html#run-a-backup-asynchronously) below. To check on the job status, use the [`SHOW JOBS`](show-jobs.html) statement. <br><br>To run a backup within a [transaction](transactions.html), use the `DETACHED` option.
5+
`DETACHED` | N/A | When a backup runs in `DETACHED` mode, it will execute asynchronously and the job ID will be returned immediately without waiting for the job to finish. Note that with `DETACHED` specified, further job information and the job completion status will not be returned. For more on the differences between the returned job data, see the [example](backup.html#run-a-backup-asynchronously) below. To check on the job status, use the [`SHOW JOBS`](show-jobs.html) statement. <br><br>To run a backup within a [transaction](transactions.html), use the `DETACHED` option.
66
`kms` | [`STRING`](string.html) | The [key management service (KMS) URI](take-and-restore-encrypted-backups.html#aws-kms-uri-format) (or a [comma-separated list of URIs](take-and-restore-encrypted-backups.html#take-a-backup-with-multi-region-encryption)) used to encrypt the files (`BACKUP` manifest and data files) that the `BACKUP` statement generates. This same KMS URI is needed to decrypt the file when it is used to [restore](take-and-restore-encrypted-backups.html#restore-from-an-encrypted-backup-with-aws-kms) and to list the contents of the backup when using [`SHOW BACKUP`](show-backup.html). <br/><br/>Currently, only AWS KMS is supported.

v20.2/import.md

-3
Original file line numberDiff line numberDiff line change
@@ -104,9 +104,6 @@ Key | <div style="width:130px">Context</div> | Value
104104
`schema` | `AVRO DATA` | The schema of the Avro records included in the binary or JSON file. This is not needed for Avro OCF.
105105
`schema_uri` | `AVRO DATA` | The URI of the file containing the schema of the Avro records include in the binary or JSON file. This is not needed for Avro OCF.
106106

107-
<!--
108-
`experimental_save_rejected` | `CSV DATA` | Skip faulty rows during import and save them in a file called `<original_csv_file>.rejected`. Once the rows are fixed, use this file with [`IMPORT INTO`](import-into.html) to finish the import. **Default:** Off -->
109-
110107
For examples showing how to use these options, see the [Examples](#examples) section below.
111108

112109
For instructions and working examples showing how to migrate data from other databases and formats, see the [Migration Overview](migration-overview.html).

v20.2/restore.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ You can include the following options as key-value pairs in the `kv_option_list`
6060
`skip_missing_sequence_owners` | N/A | <span class="version-tag">New in v20.2:</span> Must be used when restoring either a table that was previously a [sequence owner](create-sequence.html#owned-by) or a sequence that was previously owned by a table.<br><br>Example: `WITH skip_missing_sequence_owners`
6161
`skip_missing_views` | N/A | Use to skip restoring [views](views.html) that cannot be restored because their dependencies are not being restored at the same time.<br><br>Example: `WITH skip_missing_views`
6262
`encryption_passphrase` | Passphrase used to create the [encrypted backup](take-and-restore-encrypted-backups.html) | The passphrase used to decrypt the file(s) that were encrypted by the [`BACKUP`](take-and-restore-encrypted-backups.html) statement.
63-
`DETACHED` | N/A | <span class="version-tag">New in v20.2:</span> When `RESTORE` runs with `DETACHED`, the job will execute asynchronously and the job ID will be returned immediately without waiting for the job to finish. Note that with `DETACHED` specified further job information and the job completion status will not be returned. For more on the differences between the returned job data, see the [Example](restore.html#restore-a-backup-asynchronously) below. To check on the job status, use the [`SHOW JOBS`](show-jobs.html) statement. <br><br>To run a restore within a [transaction](transactions.html), use the `DETACHED` option.
63+
`DETACHED` | N/A | <span class="version-tag">New in v20.2:</span> When `RESTORE` runs with `DETACHED`, the job will execute asynchronously and the job ID will be returned immediately without waiting for the job to finish. Note that with `DETACHED` specified, further job information and the job completion status will not be returned. For more on the differences between the returned job data, see the [example](restore.html#restore-a-backup-asynchronously) below. To check on the job status, use the [`SHOW JOBS`](show-jobs.html) statement. <br><br>To run a restore within a [transaction](transactions.html), use the `DETACHED` option.
6464

6565
### Backup file URLs
6666

v21.1/import.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ Key | <div style="width:130px">Context</div> | Value
110110
`data_as_json_records` | `AVRO DATA` | Use when [importing a JSON file containing Avro records](migrate-from-avro.html#import-binary-or-json-records). The schema is not included in the file, so you need to specify the schema with either the `schema` or `schema_uri` option.
111111
`schema` | `AVRO DATA` | The schema of the Avro records included in the binary or JSON file. This is not needed for Avro OCF.
112112
`schema_uri` | `AVRO DATA` | The URI of the file containing the schema of the Avro records include in the binary or JSON file. This is not needed for Avro OCF.
113-
`DETACHED` | N/A | <span class="version-tag">New in v21.1:</span> When an import runs in `DETACHED` mode, it will execute asynchronously and the job ID will be returned immediately without waiting for the job to finish. Note that with `DETACHED` specified further job information and the job completion status will not be returned. For more on the differences between the returned job data, see the [Example](import.html#run-an-import-within-a-transaction) below. To check on the job status, use the [`SHOW JOBS`](show-jobs.html) statement. <br><br>To run an import within a [transaction](transactions.html), use the `DETACHED` option.
113+
`DETACHED` | N/A | <span class="version-tag">New in v21.1:</span> When an import runs in `DETACHED` mode, it will execute asynchronously and the job ID will be returned immediately without waiting for the job to finish. Note that with `DETACHED` specified, further job information and the job completion status will not be returned. For more on the differences between the returned job data, see the [example](import.html#run-an-import-within-a-transaction) below. To check on the job status, use the [`SHOW JOBS`](show-jobs.html) statement. <br><br>To run an import within a [transaction](transactions.html), use the `DETACHED` option.
114114

115115
For examples showing how to use these options, see the [Examples](#examples) section below.
116116

v21.1/restore.md

+1-5
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,6 @@ You can restore:
4848
`AS OF SYSTEM TIME timestamp` | Restore data as it existed as of [`timestamp`](as-of-system-time.html). You can restore point-in-time data only if you had taken full or incremental backup [with revision history](take-backups-with-revision-history-and-restore-from-a-point-in-time.html).
4949
`kv_option_list` | Control your backup's behavior with [these options](#options).
5050

51-
{{site.data.alerts.callout_info}}
52-
The `RESTORE` statement cannot be used within a [transaction](transactions.html).
53-
{{site.data.alerts.end}}
54-
5551
### Options
5652

5753
You can include the following options as key-value pairs in the `kv_option_list` to control the restore process's behavior:
@@ -64,7 +60,7 @@ You can include the following options as key-value pairs in the `kv_option_list`
6460
`skip_missing_sequence_owners` | N/A | Must be used when restoring either a table that was previously a [sequence owner](create-sequence.html#owned-by) or a sequence that was previously owned by a table.<br><br>Example: `WITH skip_missing_sequence_owners`
6561
`skip_missing_views` | N/A | Use to skip restoring [views](views.html) that cannot be restored because their dependencies are not being restored at the same time.<br><br>Example: `WITH skip_missing_views`
6662
`encryption_passphrase` | Passphrase used to create the [encrypted backup](take-and-restore-encrypted-backups.html) | The passphrase used to decrypt the file(s) that were encrypted by the [`BACKUP`](take-and-restore-encrypted-backups.html) statement.
67-
`DETACHED` | N/A | When `RESTORE` runs with `DETACHED`, the job will execute asynchronously and the job ID will be returned immediately without waiting for the job to finish. Note that with `DETACHED` specified further job information and the job completion status will not be returned. For more on the differences between the returned job data, see the [Example](restore.html#restore-a-backup-asynchronously) below. To check on the job status, use the [`SHOW JOBS`](show-jobs.html) statement. <br><br>To run a restore within a [transaction](transactions.html), use the `DETACHED` option.
63+
`DETACHED` | N/A | When `RESTORE` runs with `DETACHED`, the job will execute asynchronously and the job ID will be returned immediately without waiting for the job to finish. Note that with `DETACHED` specified, further job information and the job completion status will not be returned. For more on the differences between the returned job data, see the [example](restore.html#restore-a-backup-asynchronously) below. To check on the job status, use the [`SHOW JOBS`](show-jobs.html) statement. <br><br>To run a restore within a [transaction](transactions.html), use the `DETACHED` option.
6864

6965
### Backup file URLs
7066

0 commit comments

Comments
 (0)