Skip to content

Commit 8389b91

Browse files
authored
Merge pull request cockroachdb#3225 from a-robinson/export
Fix documentation of GCS AUTH for import/export docs
2 parents 7cd65cb + 8db4dab commit 8389b91

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

_includes/external-urls-v2.0.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
#### Considerations
1515

16-
- <sup>1</sup> If the `AUTH` parameter is empty or `default`, all GCS connections use Google's [default authentication strategy](https://cloud.google.com/docs/authentication/production#providing_credentials_to_your_application). The `cloudstorage.gs.default.key` [cluster setting](cluster-settings.html) can be set to the contents of a service account file which will be used during authentication. The `AUTH` parameter can be set to `implicit` to ignore `cloudstorage.gs.default.key` and always use the default strategy.
16+
- <sup>1</sup> If the `AUTH` parameter is `implicit`, all GCS connections use Google's [default authentication strategy](https://cloud.google.com/docs/authentication/production#providing_credentials_to_your_application). If the `AUTH` parameter is `default`, the `cloudstorage.gs.default.key` [cluster setting](cluster-settings.html) must be set to the contents of a [service account file](https://cloud.google.com/docs/authentication/production#obtaining_and_providing_service_account_credentials_manually) which will be used during authentication. If the `AUTH` parameter is not specified, the `cloudstorage.gs.default.key` setting will be used if it is non-empty, otherwise the `implicit` behavior is used.
1717

1818
- <sup>2</sup> You can easily create your own HTTP server with [Caddy or nginx](create-a-file-server.html). A custom root CA can be appended to the system's default CAs by setting the `cloudstorage.http.custom_ca` [cluster setting](cluster-settings.html), which will be used when verifying certificates from HTTPS URLs.
1919

v2.1/export.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ If not using comma as your column delimiter, you can specify another Unicode cha
8080

8181
#### `nullas`
8282

83-
Convert SQL *NULL* values to they match the specified string.
83+
Convert SQL *NULL* values so they match the specified string.
8484

8585
<table>
8686
<tbody>
@@ -94,7 +94,7 @@ Convert SQL *NULL* values to they match the specified string.
9494
</tr>
9595
<tr>
9696
<td><strong>Value</strong></td>
97-
<td>The string that should be converted to <em>NULL</em></td>
97+
<td>The string that should be used to represent <em>NULL</em> values</td>
9898
</tr>
9999
<tr>
100100
<td><strong>Example</strong></td>

0 commit comments

Comments
 (0)