Skip to content

Commit 902885c

Browse files
committed
Update for review comments.
1 parent 737382d commit 902885c

File tree

8 files changed

+49
-28
lines changed

8 files changed

+49
-28
lines changed

src/doc/man/generated/cargo-owner.html

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,12 @@ <h3 id="cargo_owner_owner_options">Owner Options</h3>
6161
<p>API token to use when authenticating. This overrides the token stored in
6262
the credentials file (which is created by <a href="commands/cargo-login.html">cargo-login(1)</a>).</p>
6363
<div class="paragraph">
64-
<p>The token for crates.io may be specified with the <code>CARGO_REGISTRY_TOKEN</code>
65-
environment variable. Tokens for other registries may be specified with
66-
environment variables of the form <code>CARGO_REGISTRIES_NAME_TOKEN</code> where <code>NAME</code>
67-
is the name of the registry in all capital letters.</p>
64+
<p><a href="reference/config.html">Cargo config</a> environment variables can be
65+
used to override the tokens stored in the credentials file. The token for
66+
crates.io may be specified with the <code>CARGO_REGISTRY_TOKEN</code> environment
67+
variable. Tokens for other registries may be specified with environment
68+
variables of the form <code>CARGO_REGISTRIES_NAME_TOKEN</code> where <code>NAME</code> is the name
69+
of the registry in all capital letters.</p>
6870
</div>
6971
</dd>
7072
<dt class="hdlist1"><strong>--index</strong> <em>INDEX</em></dt>

src/doc/man/generated/cargo-publish.html

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,12 @@ <h3 id="cargo_publish_publish_options">Publish Options</h3>
7070
<p>API token to use when authenticating. This overrides the token stored in
7171
the credentials file (which is created by <a href="commands/cargo-login.html">cargo-login(1)</a>).</p>
7272
<div class="paragraph">
73-
<p>The token for crates.io may be specified with the <code>CARGO_REGISTRY_TOKEN</code>
74-
environment variable. Tokens for other registries may be specified with
75-
environment variables of the form <code>CARGO_REGISTRIES_NAME_TOKEN</code> where <code>NAME</code>
76-
is the name of the registry in all capital letters.</p>
73+
<p><a href="reference/config.html">Cargo config</a> environment variables can be
74+
used to override the tokens stored in the credentials file. The token for
75+
crates.io may be specified with the <code>CARGO_REGISTRY_TOKEN</code> environment
76+
variable. Tokens for other registries may be specified with environment
77+
variables of the form <code>CARGO_REGISTRIES_NAME_TOKEN</code> where <code>NAME</code> is the name
78+
of the registry in all capital letters.</p>
7779
</div>
7880
</dd>
7981
<dt class="hdlist1"><strong>--no-verify</strong></dt>

src/doc/man/generated/cargo-yank.html

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,12 @@ <h3 id="cargo_yank_owner_options">Owner Options</h3>
5353
<p>API token to use when authenticating. This overrides the token stored in
5454
the credentials file (which is created by <a href="commands/cargo-login.html">cargo-login(1)</a>).</p>
5555
<div class="paragraph">
56-
<p>The token for crates.io may be specified with the <code>CARGO_REGISTRY_TOKEN</code>
57-
environment variable. Tokens for other registries may be specified with
58-
environment variables of the form <code>CARGO_REGISTRIES_NAME_TOKEN</code> where <code>NAME</code>
59-
is the name of the registry in all capital letters.</p>
56+
<p><a href="reference/config.html">Cargo config</a> environment variables can be
57+
used to override the tokens stored in the credentials file. The token for
58+
crates.io may be specified with the <code>CARGO_REGISTRY_TOKEN</code> environment
59+
variable. Tokens for other registries may be specified with environment
60+
variables of the form <code>CARGO_REGISTRIES_NAME_TOKEN</code> where <code>NAME</code> is the name
61+
of the registry in all capital letters.</p>
6062
</div>
6163
</dd>
6264
<dt class="hdlist1"><strong>--index</strong> <em>INDEX</em></dt>

src/doc/man/options-token.adoc

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22
API token to use when authenticating. This overrides the token stored in
33
the credentials file (which is created by man:cargo-login[1]).
44
+
5-
The token for crates.io may be specified with the `CARGO_REGISTRY_TOKEN`
6-
environment variable. Tokens for other registries may be specified with
7-
environment variables of the form `CARGO_REGISTRIES_NAME_TOKEN` where `NAME`
8-
is the name of the registry in all capital letters.
5+
linkcargo:reference/config.html[Cargo config] environment variables can be
6+
used to override the tokens stored in the credentials file. The token for
7+
crates.io may be specified with the `CARGO_REGISTRY_TOKEN` environment
8+
variable. Tokens for other registries may be specified with environment
9+
variables of the form `CARGO_REGISTRIES_NAME_TOKEN` where `NAME` is the name
10+
of the registry in all capital letters.

src/doc/src/reference/registries.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,10 @@ A full-featured registry that supports publishing will additionally need to
100100
have a web API service that conforms to the API used by Cargo. The web API is
101101
documented below.
102102

103+
At this time, there is no widely used software for running a custom registry.
104+
There is interest in documenting projects that implement registry support, or
105+
existing package caches that add support for Cargo.
106+
103107
### Index Format
104108

105109
The following defines the format of the index. New features are occasionally

src/etc/man/cargo-owner.1

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,13 @@ List owners of a crate.
7575
API token to use when authenticating. This overrides the token stored in
7676
the credentials file (which is created by \fBcargo\-login\fP(1)).
7777
.sp
78-
The token for crates.io may be specified with the \fBCARGO_REGISTRY_TOKEN\fP
79-
environment variable. Tokens for other registries may be specified with
80-
environment variables of the form \fBCARGO_REGISTRIES_NAME_TOKEN\fP where \fBNAME\fP
81-
is the name of the registry in all capital letters.
78+
.URL "https://doc.rust\-lang.org/cargo/reference/config.html" "Cargo config" " "
79+
environment variables can be
80+
used to override the tokens stored in the credentials file. The token for
81+
crates.io may be specified with the \fBCARGO_REGISTRY_TOKEN\fP environment
82+
variable. Tokens for other registries may be specified with environment
83+
variables of the form \fBCARGO_REGISTRIES_NAME_TOKEN\fP where \fBNAME\fP is the name
84+
of the registry in all capital letters.
8285
.RE
8386
.sp
8487
\fB\-\-index\fP \fIINDEX\fP

src/etc/man/cargo-publish.1

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -118,10 +118,13 @@ Perform all checks without uploading.
118118
API token to use when authenticating. This overrides the token stored in
119119
the credentials file (which is created by \fBcargo\-login\fP(1)).
120120
.sp
121-
The token for crates.io may be specified with the \fBCARGO_REGISTRY_TOKEN\fP
122-
environment variable. Tokens for other registries may be specified with
123-
environment variables of the form \fBCARGO_REGISTRIES_NAME_TOKEN\fP where \fBNAME\fP
124-
is the name of the registry in all capital letters.
121+
.URL "https://doc.rust\-lang.org/cargo/reference/config.html" "Cargo config" " "
122+
environment variables can be
123+
used to override the tokens stored in the credentials file. The token for
124+
crates.io may be specified with the \fBCARGO_REGISTRY_TOKEN\fP environment
125+
variable. Tokens for other registries may be specified with environment
126+
variables of the form \fBCARGO_REGISTRIES_NAME_TOKEN\fP where \fBNAME\fP is the name
127+
of the registry in all capital letters.
125128
.RE
126129
.sp
127130
\fB\-\-no\-verify\fP

src/etc/man/cargo-yank.1

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,13 @@ Undo a yank, putting a version back into the index.
6565
API token to use when authenticating. This overrides the token stored in
6666
the credentials file (which is created by \fBcargo\-login\fP(1)).
6767
.sp
68-
The token for crates.io may be specified with the \fBCARGO_REGISTRY_TOKEN\fP
69-
environment variable. Tokens for other registries may be specified with
70-
environment variables of the form \fBCARGO_REGISTRIES_NAME_TOKEN\fP where \fBNAME\fP
71-
is the name of the registry in all capital letters.
68+
.URL "https://doc.rust\-lang.org/cargo/reference/config.html" "Cargo config" " "
69+
environment variables can be
70+
used to override the tokens stored in the credentials file. The token for
71+
crates.io may be specified with the \fBCARGO_REGISTRY_TOKEN\fP environment
72+
variable. Tokens for other registries may be specified with environment
73+
variables of the form \fBCARGO_REGISTRIES_NAME_TOKEN\fP where \fBNAME\fP is the name
74+
of the registry in all capital letters.
7275
.RE
7376
.sp
7477
\fB\-\-index\fP \fIINDEX\fP

0 commit comments

Comments
 (0)