doc (publish): remove deprecated --token option from man, add info about env variables

Author: omskscream

src/doc/man/cargo-publish.md

@@ -28,8 +28,8 @@ following steps:
    and may timeout. In that case, you will need to check for completion
    manually. This timeout does not affect the upload.
 
-This command requires you to be authenticated with either the `--token` option
-or using {{man "cargo-login" 1}}.
+This command requires you to be authenticated using {{man "cargo-login" 1}} 
+or [environment variables](../reference/environment-variables.html).
 
 See [the reference](../reference/publishing.html) for more details about
 packaging and publishing.
@@ -44,8 +44,6 @@ packaging and publishing.
 Perform all checks without uploading.
 {{/option}}
 
-{{> options-token }}
-
 {{#option "`--no-verify`" }}
 Don't verify the contents by building them.
 {{/option}}

src/doc/man/generated_txt/cargo-publish.txt

@@ -25,8 +25,9 @@ DESCRIPTION
           and may timeout. In that case, you will need to check for completion
           manually. This timeout does not affect the upload.
 
-       This command requires you to be authenticated with either the --token
-       option or using cargo-login(1).
+       This command requires you to be authenticated using cargo-login(1) or
+       environment variables
+       <https://doc.rust-lang.org/cargo/reference/environment-variables.html>.
 
        See the reference
        <https://doc.rust-lang.org/cargo/reference/publishing.html> for more
@@ -37,18 +38,6 @@ OPTIONS
        --dry-run
            Perform all checks without uploading.
 
-       --token token
-           API token to use when authenticating. This overrides the token
-           stored in the credentials file (which is created by cargo-login(1)).
-
-           Cargo config <https://doc.rust-lang.org/cargo/reference/config.html>
-           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.
-
        --no-verify
            Don’t verify the contents by building them.
 

src/doc/src/commands/cargo-publish.md

@@ -24,8 +24,8 @@ following steps:
    and may timeout. In that case, you will need to check for completion
    manually. This timeout does not affect the upload.
 
-This command requires you to be authenticated with either the `--token` option
-or using [cargo-login(1)](cargo-login.html).
+This command requires you to be authenticated using [cargo-login(1)](cargo-login.html) 
+or [environment variables](../reference/environment-variables.html).
 
 See [the reference](../reference/publishing.html) for more details about
 packaging and publishing.
@@ -40,17 +40,6 @@ packaging and publishing.
 <dd class="option-desc">Perform all checks without uploading.</dd>
 
 
-<dt class="option-term" id="option-cargo-publish---token"><a class="option-anchor" href="#option-cargo-publish---token"></a><code>--token</code> <em>token</em></dt>
-<dd class="option-desc">API token to use when authenticating. This overrides the token stored in
-the credentials file (which is created by <a href="cargo-login.html">cargo-login(1)</a>).</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.</dd>
-
-
 <dt class="option-term" id="option-cargo-publish---no-verify"><a class="option-anchor" href="#option-cargo-publish---no-verify"></a><code>--no-verify</code></dt>
 <dd class="option-desc">Don’t verify the contents by building them.</dd>
 

src/etc/man/cargo-publish.1

@@ -37,8 +37,8 @@ and may timeout. In that case, you will need to check for completion
 manually. This timeout does not affect the upload.
 .RE
 .sp
-This command requires you to be authenticated with either the \fB\-\-token\fR option
-or using \fBcargo\-login\fR(1).
+This command requires you to be authenticated using \fBcargo\-login\fR(1)
+or \fIenvironment variables\fR <https://doc.rust\-lang.org/cargo/reference/environment\-variables.html>\&.
 .sp
 See \fIthe reference\fR <https://doc.rust\-lang.org/cargo/reference/publishing.html> for more details about
 packaging and publishing.
@@ -50,19 +50,6 @@ packaging and publishing.
 Perform all checks without uploading.
 .RE
 .sp
-\fB\-\-token\fR \fItoken\fR
-.RS 4
-API token to use when authenticating. This overrides the token stored in
-the credentials file (which is created by \fBcargo\-login\fR(1)).
-.sp
-\fICargo config\fR <https://doc.rust\-lang.org/cargo/reference/config.html> 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\fR environment
-variable. Tokens for other registries may be specified with environment
-variables of the form \fBCARGO_REGISTRIES_NAME_TOKEN\fR where \fBNAME\fR is the name
-of the registry in all capital letters.
-.RE
-.sp
 \fB\-\-no\-verify\fR
 .RS 4
 Don\[cq]t verify the contents by building them.