Skip to content

Commit d0735fc

Browse files
committed
Auto merge of #6964 - ehuss:missing-offline-man, r=alexcrichton
Update some man pages that missed --offline. A couple files somehow slipped through the cracks in #6934.
2 parents d1b55ad + 7f2fad8 commit d0735fc

File tree

2 files changed

+38
-4
lines changed

2 files changed

+38
-4
lines changed

src/etc/man/cargo-package.1

+19-2
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
.\" Title: cargo-package
33
.\" Author: [see the "AUTHOR(S)" section]
44
.\" Generator: Asciidoctor 1.5.8
5-
.\" Date: 2019-02-13
5+
.\" Date: 2019-05-20
66
.\" Manual: \ \&
77
.\" Source: \ \&
88
.\" Language: English
99
.\"
10-
.TH "CARGO\-PACKAGE" "1" "2019-02-13" "\ \&" "\ \&"
10+
.TH "CARGO\-PACKAGE" "1" "2019-05-20" "\ \&" "\ \&"
1111
.ie \n(.g .ds Aq \(aq
1212
.el .ds Aq '
1313
.ss \n[.ss] 0
@@ -224,6 +224,23 @@ These may be used in environments where you want to assert that the
224224
\fBCargo.lock\fP file is up\-to\-date (such as a CI build) or want to avoid network
225225
access.
226226
.RE
227+
.sp
228+
\fB\-\-offline\fP
229+
.RS 4
230+
Prevents Cargo from accessing the network for any reason. Without this
231+
flag, Cargo will stop with an error if it needs to access the network and
232+
the network is not available. With this flag, Cargo will attempt to
233+
proceed without the network if possible.
234+
.sp
235+
Beware that this may result in different dependency resolution than online
236+
mode. Cargo will restrict itself to crates that are downloaded locally, even
237+
if there might be a newer version as indicated in the local copy of the index.
238+
See the \fBcargo\-fetch\fP(1) command to download dependencies before going
239+
offline.
240+
.sp
241+
May also be specified with the \fBnet.offline\fP \c
242+
.URL "https://doc.rust\-lang.org/cargo/reference/config.html" "config value" "."
243+
.RE
227244
.SS "Miscellaneous Options"
228245
.sp
229246
\fB\-j\fP \fIN\fP, \fB\-\-jobs\fP \fIN\fP

src/etc/man/cargo.1

+19-2
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
.\" Title: cargo
33
.\" Author: [see the "AUTHOR(S)" section]
44
.\" Generator: Asciidoctor 1.5.8
5-
.\" Date: 2019-02-05
5+
.\" Date: 2019-05-20
66
.\" Manual: \ \&
77
.\" Source: \ \&
88
.\" Language: English
99
.\"
10-
.TH "CARGO" "1" "2019-02-05" "\ \&" "\ \&"
10+
.TH "CARGO" "1" "2019-05-20" "\ \&" "\ \&"
1111
.ie \n(.g .ds Aq \(aq
1212
.el .ds Aq '
1313
.ss \n[.ss] 0
@@ -286,6 +286,23 @@ These may be used in environments where you want to assert that the
286286
\fBCargo.lock\fP file is up\-to\-date (such as a CI build) or want to avoid network
287287
access.
288288
.RE
289+
.sp
290+
\fB\-\-offline\fP
291+
.RS 4
292+
Prevents Cargo from accessing the network for any reason. Without this
293+
flag, Cargo will stop with an error if it needs to access the network and
294+
the network is not available. With this flag, Cargo will attempt to
295+
proceed without the network if possible.
296+
.sp
297+
Beware that this may result in different dependency resolution than online
298+
mode. Cargo will restrict itself to crates that are downloaded locally, even
299+
if there might be a newer version as indicated in the local copy of the index.
300+
See the \fBcargo\-fetch\fP(1) command to download dependencies before going
301+
offline.
302+
.sp
303+
May also be specified with the \fBnet.offline\fP \c
304+
.URL "https://doc.rust\-lang.org/cargo/reference/config.html" "config value" "."
305+
.RE
289306
.SS "Common Options"
290307
.sp
291308
\fB\-h\fP, \fB\-\-help\fP

0 commit comments

Comments
 (0)