Skip to content

Commit 37dd3d9

Browse files
committed
Auto merge of #12714 - arlosi:cred-typos, r=weihanglo
fix: typos in registry authentication documentation r? `@weihanglo`
2 parents 2607058 + 3401b89 commit 37dd3d9

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

src/doc/src/reference/credential-provider-protocol.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ Not a message by itself. Included in all messages sent by Cargo as the `registry
6060
}
6161
```
6262

63-
If the `token` field is set, than the credential provider should use the token provided. If
63+
If the `token` field is set, then the credential provider should use the token provided. If
6464
the `token` is not set, then the credential provider should prompt the user for a token.
6565

6666
In addition to the arguments that may be passed to the credential provider in
@@ -134,7 +134,7 @@ in the `args` field after any args from Cargo configuration.
134134
The `token` will be sent to the registry as the value of the `Authorization` HTTP header.
135135

136136
`operation_independent` indicates whether the token can be cached across different
137-
operations (such as publishing or fetching). In general this should be `true` unless
137+
operations (such as publishing or fetching). In general, this should be `true` unless
138138
the provider wants to generate tokens that are scoped to specific operations.
139139

140140
### Login success response
@@ -166,7 +166,7 @@ the provider wants to generate tokens that are scoped to specific operations.
166166
}}
167167
```
168168
Sent if the credential provider is designed
169-
to only handle specific registry URLs, and the given URL
169+
to only handle specific registry URLs and the given URL
170170
is not supported. Cargo will attempt another provider if
171171
available.
172172

src/doc/src/reference/registry-authentication.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
# Registry Authentication
2-
Cargo authenticates to registries with through credential providers. These
2+
Cargo authenticates to registries with credential providers. These
33
credential providers are external executables or built-in providers that Cargo
44
uses to store and retrieve credentials.
55

66
Using alternative registries with authentication *requires* a credential provider to be configured
7-
to avoid unknowningly storing unecrypted credentials on disk. For historical reasons, public
8-
(non-authenticated) registres do not require credential provider configuration and the `cargo:token`
7+
to avoid unknowingly storing unencrypted credentials on disk. For historical reasons, public
8+
(non-authenticated) registries do not require credential provider configuration, and the `cargo:token`
99
provider is used if no providers are configured.
1010

1111
Cargo also includes platform-specific providers that use the operating system to securely store
@@ -106,6 +106,6 @@ In the config, add to (or create) `registry.global-credential-providers`:
106106
global-credential-providers = ["cargo:token", "cargo-credential-1password --email you@example.com"]
107107
```
108108

109-
The values in `global-credential-providers` are split on spaces to into path and command-line arguments. To
109+
The values in `global-credential-providers` are split on spaces into path and command-line arguments. To
110110
define a global credential provider where the path or arguments contain spaces, use
111111
the [`[credential-alias]` table](config.md#credential-alias).

0 commit comments

Comments
 (0)