From 902885c392c419e823099b1eb7a4c5f5f4385dc1 Mon Sep 17 00:00:00 2001
From: Eric Huss <eric@huss.org>
Date: Tue, 12 Feb 2019 08:40:42 -0800
Subject: [PATCH] Update for review comments.

---
 src/doc/man/generated/cargo-owner.html   | 10 ++++++----
 src/doc/man/generated/cargo-publish.html | 10 ++++++----
 src/doc/man/generated/cargo-yank.html    | 10 ++++++----
 src/doc/man/options-token.adoc           | 10 ++++++----
 src/doc/src/reference/registries.md      |  4 ++++
 src/etc/man/cargo-owner.1                | 11 +++++++----
 src/etc/man/cargo-publish.1              | 11 +++++++----
 src/etc/man/cargo-yank.1                 | 11 +++++++----
 8 files changed, 49 insertions(+), 28 deletions(-)

diff --git a/src/doc/man/generated/cargo-owner.html b/src/doc/man/generated/cargo-owner.html
index 04a3628d891..21eab2e8d5a 100644
--- a/src/doc/man/generated/cargo-owner.html
+++ b/src/doc/man/generated/cargo-owner.html
@@ -61,10 +61,12 @@ <h3 id="cargo_owner_owner_options">Owner Options</h3>
 <p>API token to use when authenticating. This overrides the token stored in
 the credentials file (which is created by <a href="commands/cargo-login.html">cargo-login(1)</a>).</p>
 <div class="paragraph">
-<p>The token for crates.io may be specified with the <code>CARGO_REGISTRY_TOKEN</code>
-environment variable. Tokens for other registries may be specified with
-environment variables of the form <code>CARGO_REGISTRIES_NAME_TOKEN</code> where <code>NAME</code>
-is the name of the registry in all capital letters.</p>
+<p><a href="reference/config.html">Cargo config</a> environment variables can be
+used to override the tokens stored in the credentials file. The token for
+crates.io may be specified with the <code>CARGO_REGISTRY_TOKEN</code> environment
+variable. Tokens for other registries may be specified with environment
+variables of the form <code>CARGO_REGISTRIES_NAME_TOKEN</code> where <code>NAME</code> is the name
+of the registry in all capital letters.</p>
 </div>
 </dd>
 <dt class="hdlist1"><strong>--index</strong> <em>INDEX</em></dt>
diff --git a/src/doc/man/generated/cargo-publish.html b/src/doc/man/generated/cargo-publish.html
index 7c20c06d527..8e631b2489e 100644
--- a/src/doc/man/generated/cargo-publish.html
+++ b/src/doc/man/generated/cargo-publish.html
@@ -70,10 +70,12 @@ <h3 id="cargo_publish_publish_options">Publish Options</h3>
 <p>API token to use when authenticating. This overrides the token stored in
 the credentials file (which is created by <a href="commands/cargo-login.html">cargo-login(1)</a>).</p>
 <div class="paragraph">
-<p>The token for crates.io may be specified with the <code>CARGO_REGISTRY_TOKEN</code>
-environment variable. Tokens for other registries may be specified with
-environment variables of the form <code>CARGO_REGISTRIES_NAME_TOKEN</code> where <code>NAME</code>
-is the name of the registry in all capital letters.</p>
+<p><a href="reference/config.html">Cargo config</a> environment variables can be
+used to override the tokens stored in the credentials file. The token for
+crates.io may be specified with the <code>CARGO_REGISTRY_TOKEN</code> environment
+variable. Tokens for other registries may be specified with environment
+variables of the form <code>CARGO_REGISTRIES_NAME_TOKEN</code> where <code>NAME</code> is the name
+of the registry in all capital letters.</p>
 </div>
 </dd>
 <dt class="hdlist1"><strong>--no-verify</strong></dt>
diff --git a/src/doc/man/generated/cargo-yank.html b/src/doc/man/generated/cargo-yank.html
index f27024bbe7b..4e1d00965e8 100644
--- a/src/doc/man/generated/cargo-yank.html
+++ b/src/doc/man/generated/cargo-yank.html
@@ -53,10 +53,12 @@ <h3 id="cargo_yank_owner_options">Owner Options</h3>
 <p>API token to use when authenticating. This overrides the token stored in
 the credentials file (which is created by <a href="commands/cargo-login.html">cargo-login(1)</a>).</p>
 <div class="paragraph">
-<p>The token for crates.io may be specified with the <code>CARGO_REGISTRY_TOKEN</code>
-environment variable. Tokens for other registries may be specified with
-environment variables of the form <code>CARGO_REGISTRIES_NAME_TOKEN</code> where <code>NAME</code>
-is the name of the registry in all capital letters.</p>
+<p><a href="reference/config.html">Cargo config</a> environment variables can be
+used to override the tokens stored in the credentials file. The token for
+crates.io may be specified with the <code>CARGO_REGISTRY_TOKEN</code> environment
+variable. Tokens for other registries may be specified with environment
+variables of the form <code>CARGO_REGISTRIES_NAME_TOKEN</code> where <code>NAME</code> is the name
+of the registry in all capital letters.</p>
 </div>
 </dd>
 <dt class="hdlist1"><strong>--index</strong> <em>INDEX</em></dt>
diff --git a/src/doc/man/options-token.adoc b/src/doc/man/options-token.adoc
index c047fcbc984..5f25ffbf243 100644
--- a/src/doc/man/options-token.adoc
+++ b/src/doc/man/options-token.adoc
@@ -2,7 +2,9 @@
     API token to use when authenticating. This overrides the token stored in
     the credentials file (which is created by man:cargo-login[1]).
 +
-The token for crates.io may be specified with the `CARGO_REGISTRY_TOKEN`
-environment variable. Tokens for other registries may be specified with
-environment variables of the form `CARGO_REGISTRIES_NAME_TOKEN` where `NAME`
-is the name of the registry in all capital letters.
+linkcargo:reference/config.html[Cargo config] environment variables can be
+used to override the tokens stored in the credentials file. The token for
+crates.io may be specified with the `CARGO_REGISTRY_TOKEN` environment
+variable. Tokens for other registries may be specified with environment
+variables of the form `CARGO_REGISTRIES_NAME_TOKEN` where `NAME` is the name
+of the registry in all capital letters.
diff --git a/src/doc/src/reference/registries.md b/src/doc/src/reference/registries.md
index dca40c11af3..cc5b040fc4d 100644
--- a/src/doc/src/reference/registries.md
+++ b/src/doc/src/reference/registries.md
@@ -100,6 +100,10 @@ A full-featured registry that supports publishing will additionally need to
 have a web API service that conforms to the API used by Cargo. The web API is
 documented below.
 
+At this time, there is no widely used software for running a custom registry.
+There is interest in documenting projects that implement registry support, or
+existing package caches that add support for Cargo.
+
 ### Index Format
 
 The following defines the format of the index. New features are occasionally
diff --git a/src/etc/man/cargo-owner.1 b/src/etc/man/cargo-owner.1
index d287b6d1d5d..8e798a3b2bf 100644
--- a/src/etc/man/cargo-owner.1
+++ b/src/etc/man/cargo-owner.1
@@ -75,10 +75,13 @@ List owners of a crate.
 API token to use when authenticating. This overrides the token stored in
 the credentials file (which is created by \fBcargo\-login\fP(1)).
 .sp
-The token for crates.io may be specified with the \fBCARGO_REGISTRY_TOKEN\fP
-environment variable. Tokens for other registries may be specified with
-environment variables of the form \fBCARGO_REGISTRIES_NAME_TOKEN\fP where \fBNAME\fP
-is the name of the registry in all capital letters.
+.URL "https://doc.rust\-lang.org/cargo/reference/config.html" "Cargo config" " "
+environment variables can be
+used to override the tokens stored in the credentials file. The token for
+crates.io may be specified with the \fBCARGO_REGISTRY_TOKEN\fP environment
+variable. Tokens for other registries may be specified with environment
+variables of the form \fBCARGO_REGISTRIES_NAME_TOKEN\fP where \fBNAME\fP is the name
+of the registry in all capital letters.
 .RE
 .sp
 \fB\-\-index\fP \fIINDEX\fP
diff --git a/src/etc/man/cargo-publish.1 b/src/etc/man/cargo-publish.1
index 51e72a7c3ab..70e4f506f4e 100644
--- a/src/etc/man/cargo-publish.1
+++ b/src/etc/man/cargo-publish.1
@@ -118,10 +118,13 @@ Perform all checks without uploading.
 API token to use when authenticating. This overrides the token stored in
 the credentials file (which is created by \fBcargo\-login\fP(1)).
 .sp
-The token for crates.io may be specified with the \fBCARGO_REGISTRY_TOKEN\fP
-environment variable. Tokens for other registries may be specified with
-environment variables of the form \fBCARGO_REGISTRIES_NAME_TOKEN\fP where \fBNAME\fP
-is the name of the registry in all capital letters.
+.URL "https://doc.rust\-lang.org/cargo/reference/config.html" "Cargo config" " "
+environment variables can be
+used to override the tokens stored in the credentials file. The token for
+crates.io may be specified with the \fBCARGO_REGISTRY_TOKEN\fP environment
+variable. Tokens for other registries may be specified with environment
+variables of the form \fBCARGO_REGISTRIES_NAME_TOKEN\fP where \fBNAME\fP is the name
+of the registry in all capital letters.
 .RE
 .sp
 \fB\-\-no\-verify\fP
diff --git a/src/etc/man/cargo-yank.1 b/src/etc/man/cargo-yank.1
index 96ea15aea44..c3a637c7ae4 100644
--- a/src/etc/man/cargo-yank.1
+++ b/src/etc/man/cargo-yank.1
@@ -65,10 +65,13 @@ Undo a yank, putting a version back into the index.
 API token to use when authenticating. This overrides the token stored in
 the credentials file (which is created by \fBcargo\-login\fP(1)).
 .sp
-The token for crates.io may be specified with the \fBCARGO_REGISTRY_TOKEN\fP
-environment variable. Tokens for other registries may be specified with
-environment variables of the form \fBCARGO_REGISTRIES_NAME_TOKEN\fP where \fBNAME\fP
-is the name of the registry in all capital letters.
+.URL "https://doc.rust\-lang.org/cargo/reference/config.html" "Cargo config" " "
+environment variables can be
+used to override the tokens stored in the credentials file. The token for
+crates.io may be specified with the \fBCARGO_REGISTRY_TOKEN\fP environment
+variable. Tokens for other registries may be specified with environment
+variables of the form \fBCARGO_REGISTRIES_NAME_TOKEN\fP where \fBNAME\fP is the name
+of the registry in all capital letters.
 .RE
 .sp
 \fB\-\-index\fP \fIINDEX\fP