Skip to content

Commit

Permalink
Auto merge of #13364 - linyihai:fetch-remove-offline, r=weihanglo
Browse files Browse the repository at this point in the history
doc: Hide `cargo-fetch` description in offline man page

### What does this PR try to resolve?
Fixes #13232

### How should we test and review this PR?
Suggest review commit by commit.

### Additional information
r? `@weihanglo`
  • Loading branch information
bors committed Jan 31, 2024
2 parents f8c152d + c028c72 commit e1ebce1
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 8 deletions.
3 changes: 1 addition & 2 deletions src/doc/man/generated_txt/cargo-fetch.txt
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,7 @@ OPTIONS
Beware that this may result in different dependency resolution than
online mode. Cargo will restrict itself to crates that are
downloaded locally, even if there might be a newer version as
indicated in the local copy of the index. See the cargo-fetch(1)
command to download dependencies before going offline.
indicated in the local copy of the index.

May also be specified with the net.offline config value
<https://doc.rust-lang.org/cargo/reference/config.html>.
Expand Down
4 changes: 3 additions & 1 deletion src/doc/man/includes/options-locked.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,10 @@ proceed without the network if possible.
Beware that this may result in different dependency resolution than online
mode. Cargo will restrict itself to crates that are downloaded locally, even
if there might be a newer version as indicated in the local copy of the index.
{{#if (ne command "fetch")}}
See the {{man "cargo-fetch" 1}} command to download dependencies before going
offline.
{{/if}}

May also be specified with the `net.offline` [config value](../reference/config.html).
{{/option}}
{{/option}}
4 changes: 1 addition & 3 deletions src/doc/src/commands/cargo-fetch.md
Original file line number Diff line number Diff line change
Expand Up @@ -97,9 +97,7 @@ the network is not available. With this flag, Cargo will attempt to
proceed without the network if possible.</p>
<p>Beware that this may result in different dependency resolution than online
mode. Cargo will restrict itself to crates that are downloaded locally, even
if there might be a newer version as indicated in the local copy of the index.
See the <a href="cargo-fetch.html">cargo-fetch(1)</a> command to download dependencies before going
offline.</p>
if there might be a newer version as indicated in the local copy of the index.</p>
<p>May also be specified with the <code>net.offline</code> <a href="../reference/config.html">config value</a>.</dd>

</dl>
Expand Down
2 changes: 0 additions & 2 deletions src/etc/man/cargo-fetch.1
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,6 @@ proceed without the network if possible.
Beware that this may result in different dependency resolution than online
mode. Cargo will restrict itself to crates that are downloaded locally, even
if there might be a newer version as indicated in the local copy of the index.
See the \fBcargo\-fetch\fR(1) command to download dependencies before going
offline.
.sp
May also be specified with the \fBnet.offline\fR \fIconfig value\fR <https://doc.rust\-lang.org/cargo/reference/config.html>\&.
.RE
Expand Down

0 comments on commit e1ebce1

Please sign in to comment.