Skip to content

Commit e1ebce1

Browse files
committed
Auto merge of #13364 - linyihai:fetch-remove-offline, r=weihanglo
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`
2 parents f8c152d + c028c72 commit e1ebce1

File tree

4 files changed

+5
-8
lines changed

4 files changed

+5
-8
lines changed

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,7 @@ OPTIONS
9191
Beware that this may result in different dependency resolution than
9292
online mode. Cargo will restrict itself to crates that are
9393
downloaded locally, even if there might be a newer version as
94-
indicated in the local copy of the index. See the cargo-fetch(1)
95-
command to download dependencies before going offline.
94+
indicated in the local copy of the index.
9695

9796
May also be specified with the net.offline config value
9897
<https://doc.rust-lang.org/cargo/reference/config.html>.

src/doc/man/includes/options-locked.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,10 @@ proceed without the network if possible.
1818
Beware that this may result in different dependency resolution than online
1919
mode. Cargo will restrict itself to crates that are downloaded locally, even
2020
if there might be a newer version as indicated in the local copy of the index.
21+
{{#if (ne command "fetch")}}
2122
See the {{man "cargo-fetch" 1}} command to download dependencies before going
2223
offline.
24+
{{/if}}
2325

2426
May also be specified with the `net.offline` [config value](../reference/config.html).
25-
{{/option}}
27+
{{/option}}

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,9 +97,7 @@ the network is not available. With this flag, Cargo will attempt to
9797
proceed without the network if possible.</p>
9898
<p>Beware that this may result in different dependency resolution than online
9999
mode. Cargo will restrict itself to crates that are downloaded locally, even
100-
if there might be a newer version as indicated in the local copy of the index.
101-
See the <a href="cargo-fetch.html">cargo-fetch(1)</a> command to download dependencies before going
102-
offline.</p>
100+
if there might be a newer version as indicated in the local copy of the index.</p>
103101
<p>May also be specified with the <code>net.offline</code> <a href="../reference/config.html">config value</a>.</dd>
104102

105103
</dl>

src/etc/man/cargo-fetch.1

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

0 commit comments

Comments
 (0)