Skip to content

Commit fedd172

Browse files
borsbors
committed
Auto merge of #11079 - weihanglo:issue-10991, r=epage
doc: clarify config-relative paths for `--config <path>`
2 parents c187114 + 758ee5d commit fedd172

File tree

95 files changed

+491
-195
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

95 files changed

+491
-195
lines changed

‎src/doc/man/generated_txt/cargo-add.txt

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,8 +145,13 @@ OPTIONS
145145
<https://rust-lang.github.io/rustup/overrides.html> for more
146146
information about how toolchain overrides work.
147147

148-
--config KEY=VALUE
149-
Overrides a Cargo configuration value.
148+
--config KEY=VALUE or PATH
149+
Overrides a Cargo configuration value. The argument should be in
150+
TOML syntax of KEY=VALUE, or provided as a path to an extra
151+
configuration file. This flag may be specified multiple times. See
152+
the command-line overrides section
153+
<https://doc.rust-lang.org/cargo/reference/config.html#command-line-overrides>
154+
for more information.
150155

151156
-h, --help
152157
Prints help information.

‎src/doc/man/generated_txt/cargo-bench.txt

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -355,8 +355,13 @@ OPTIONS
355355
<https://rust-lang.github.io/rustup/overrides.html> for more
356356
information about how toolchain overrides work.
357357

358-
--config KEY=VALUE
359-
Overrides a Cargo configuration value.
358+
--config KEY=VALUE or PATH
359+
Overrides a Cargo configuration value. The argument should be in
360+
TOML syntax of KEY=VALUE, or provided as a path to an extra
361+
configuration file. This flag may be specified multiple times. See
362+
the command-line overrides section
363+
<https://doc.rust-lang.org/cargo/reference/config.html#command-line-overrides>
364+
for more information.
360365

361366
-h, --help
362367
Prints help information.

‎src/doc/man/generated_txt/cargo-build.txt

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -304,8 +304,13 @@ OPTIONS
304304
<https://rust-lang.github.io/rustup/overrides.html> for more
305305
information about how toolchain overrides work.
306306

307-
--config KEY=VALUE
308-
Overrides a Cargo configuration value.
307+
--config KEY=VALUE or PATH
308+
Overrides a Cargo configuration value. The argument should be in
309+
TOML syntax of KEY=VALUE, or provided as a path to an extra
310+
configuration file. This flag may be specified multiple times. See
311+
the command-line overrides section
312+
<https://doc.rust-lang.org/cargo/reference/config.html#command-line-overrides>
313+
for more information.
309314

310315
-h, --help
311316
Prints help information.

‎src/doc/man/generated_txt/cargo-check.txt

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -289,8 +289,13 @@ OPTIONS
289289
<https://rust-lang.github.io/rustup/overrides.html> for more
290290
information about how toolchain overrides work.
291291

292-
--config KEY=VALUE
293-
Overrides a Cargo configuration value.
292+
--config KEY=VALUE or PATH
293+
Overrides a Cargo configuration value. The argument should be in
294+
TOML syntax of KEY=VALUE, or provided as a path to an extra
295+
configuration file. This flag may be specified multiple times. See
296+
the command-line overrides section
297+
<https://doc.rust-lang.org/cargo/reference/config.html#command-line-overrides>
298+
for more information.
294299

295300
-h, --help
296301
Prints help information.

‎src/doc/man/generated_txt/cargo-clean.txt

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,8 +119,13 @@ OPTIONS
119119
<https://rust-lang.github.io/rustup/overrides.html> for more
120120
information about how toolchain overrides work.
121121

122-
--config KEY=VALUE
123-
Overrides a Cargo configuration value.
122+
--config KEY=VALUE or PATH
123+
Overrides a Cargo configuration value. The argument should be in
124+
TOML syntax of KEY=VALUE, or provided as a path to an extra
125+
configuration file. This flag may be specified multiple times. See
126+
the command-line overrides section
127+
<https://doc.rust-lang.org/cargo/reference/config.html#command-line-overrides>
128+
for more information.
124129

125130
-h, --help
126131
Prints help information.

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -260,8 +260,13 @@ OPTIONS
260260
<https://rust-lang.github.io/rustup/overrides.html> for more
261261
information about how toolchain overrides work.
262262

263-
--config KEY=VALUE
264-
Overrides a Cargo configuration value.
263+
--config KEY=VALUE or PATH
264+
Overrides a Cargo configuration value. The argument should be in
265+
TOML syntax of KEY=VALUE, or provided as a path to an extra
266+
configuration file. This flag may be specified multiple times. See
267+
the command-line overrides section
268+
<https://doc.rust-lang.org/cargo/reference/config.html#command-line-overrides>
269+
for more information.
265270

266271
-h, --help
267272
Prints help information.

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,13 @@ OPTIONS
104104
<https://rust-lang.github.io/rustup/overrides.html> for more
105105
information about how toolchain overrides work.
106106

107-
--config KEY=VALUE
108-
Overrides a Cargo configuration value.
107+
--config KEY=VALUE or PATH
108+
Overrides a Cargo configuration value. The argument should be in
109+
TOML syntax of KEY=VALUE, or provided as a path to an extra
110+
configuration file. This flag may be specified multiple times. See
111+
the command-line overrides section
112+
<https://doc.rust-lang.org/cargo/reference/config.html#command-line-overrides>
113+
for more information.
109114

110115
-h, --help
111116
Prints help information.

‎src/doc/man/generated_txt/cargo-fix.txt

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -362,8 +362,13 @@ OPTIONS
362362
<https://rust-lang.github.io/rustup/overrides.html> for more
363363
information about how toolchain overrides work.
364364

365-
--config KEY=VALUE
366-
Overrides a Cargo configuration value.
365+
--config KEY=VALUE or PATH
366+
Overrides a Cargo configuration value. The argument should be in
367+
TOML syntax of KEY=VALUE, or provided as a path to an extra
368+
configuration file. This flag may be specified multiple times. See
369+
the command-line overrides section
370+
<https://doc.rust-lang.org/cargo/reference/config.html#command-line-overrides>
371+
for more information.
367372

368373
-h, --help
369374
Prints help information.

‎src/doc/man/generated_txt/cargo-generate-lockfile.txt

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,13 @@ OPTIONS
7979
<https://rust-lang.github.io/rustup/overrides.html> for more
8080
information about how toolchain overrides work.
8181

82-
--config KEY=VALUE
83-
Overrides a Cargo configuration value.
82+
--config KEY=VALUE or PATH
83+
Overrides a Cargo configuration value. The argument should be in
84+
TOML syntax of KEY=VALUE, or provided as a path to an extra
85+
configuration file. This flag may be specified multiple times. See
86+
the command-line overrides section
87+
<https://doc.rust-lang.org/cargo/reference/config.html#command-line-overrides>
88+
for more information.
8489

8590
-h, --help
8691
Prints help information.

‎src/doc/man/generated_txt/cargo-init.txt

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,13 @@ OPTIONS
8787
<https://rust-lang.github.io/rustup/overrides.html> for more
8888
information about how toolchain overrides work.
8989

90-
--config KEY=VALUE
91-
Overrides a Cargo configuration value.
90+
--config KEY=VALUE or PATH
91+
Overrides a Cargo configuration value. The argument should be in
92+
TOML syntax of KEY=VALUE, or provided as a path to an extra
93+
configuration file. This flag may be specified multiple times. See
94+
the command-line overrides section
95+
<https://doc.rust-lang.org/cargo/reference/config.html#command-line-overrides>
96+
for more information.
9297

9398
-h, --help
9499
Prints help information.

‎src/doc/man/generated_txt/cargo-install.txt

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -326,8 +326,13 @@ OPTIONS
326326
<https://rust-lang.github.io/rustup/overrides.html> for more
327327
information about how toolchain overrides work.
328328

329-
--config KEY=VALUE
330-
Overrides a Cargo configuration value.
329+
--config KEY=VALUE or PATH
330+
Overrides a Cargo configuration value. The argument should be in
331+
TOML syntax of KEY=VALUE, or provided as a path to an extra
332+
configuration file. This flag may be specified multiple times. See
333+
the command-line overrides section
334+
<https://doc.rust-lang.org/cargo/reference/config.html#command-line-overrides>
335+
for more information.
331336

332337
-h, --help
333338
Prints help information.

‎src/doc/man/generated_txt/cargo-locate-project.txt

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,13 @@ OPTIONS
6262
<https://rust-lang.github.io/rustup/overrides.html> for more
6363
information about how toolchain overrides work.
6464

65-
--config KEY=VALUE
66-
Overrides a Cargo configuration value.
65+
--config KEY=VALUE or PATH
66+
Overrides a Cargo configuration value. The argument should be in
67+
TOML syntax of KEY=VALUE, or provided as a path to an extra
68+
configuration file. This flag may be specified multiple times. See
69+
the command-line overrides section
70+
<https://doc.rust-lang.org/cargo/reference/config.html#command-line-overrides>
71+
for more information.
6772

6873
-h, --help
6974
Prints help information.

‎src/doc/man/generated_txt/cargo-login.txt

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,13 @@ OPTIONS
6262
<https://rust-lang.github.io/rustup/overrides.html> for more
6363
information about how toolchain overrides work.
6464

65-
--config KEY=VALUE
66-
Overrides a Cargo configuration value.
65+
--config KEY=VALUE or PATH
66+
Overrides a Cargo configuration value. The argument should be in
67+
TOML syntax of KEY=VALUE, or provided as a path to an extra
68+
configuration file. This flag may be specified multiple times. See
69+
the command-line overrides section
70+
<https://doc.rust-lang.org/cargo/reference/config.html#command-line-overrides>
71+
for more information.
6772

6873
-h, --help
6974
Prints help information.

‎src/doc/man/generated_txt/cargo-metadata.txt

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -391,8 +391,13 @@ OPTIONS
391391
<https://rust-lang.github.io/rustup/overrides.html> for more
392392
information about how toolchain overrides work.
393393

394-
--config KEY=VALUE
395-
Overrides a Cargo configuration value.
394+
--config KEY=VALUE or PATH
395+
Overrides a Cargo configuration value. The argument should be in
396+
TOML syntax of KEY=VALUE, or provided as a path to an extra
397+
configuration file. This flag may be specified multiple times. See
398+
the command-line overrides section
399+
<https://doc.rust-lang.org/cargo/reference/config.html#command-line-overrides>
400+
for more information.
396401

397402
-h, --help
398403
Prints help information.

‎src/doc/man/generated_txt/cargo-new.txt

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,13 @@ OPTIONS
8282
<https://rust-lang.github.io/rustup/overrides.html> for more
8383
information about how toolchain overrides work.
8484

85-
--config KEY=VALUE
86-
Overrides a Cargo configuration value.
85+
--config KEY=VALUE or PATH
86+
Overrides a Cargo configuration value. The argument should be in
87+
TOML syntax of KEY=VALUE, or provided as a path to an extra
88+
configuration file. This flag may be specified multiple times. See
89+
the command-line overrides section
90+
<https://doc.rust-lang.org/cargo/reference/config.html#command-line-overrides>
91+
for more information.
8792

8893
-h, --help
8994
Prints help information.

‎src/doc/man/generated_txt/cargo-owner.txt

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,13 @@ OPTIONS
8989
<https://rust-lang.github.io/rustup/overrides.html> for more
9090
information about how toolchain overrides work.
9191

92-
--config KEY=VALUE
93-
Overrides a Cargo configuration value.
92+
--config KEY=VALUE or PATH
93+
Overrides a Cargo configuration value. The argument should be in
94+
TOML syntax of KEY=VALUE, or provided as a path to an extra
95+
configuration file. This flag may be specified multiple times. See
96+
the command-line overrides section
97+
<https://doc.rust-lang.org/cargo/reference/config.html#command-line-overrides>
98+
for more information.
9499

95100
-h, --help
96101
Prints help information.

‎src/doc/man/generated_txt/cargo-package.txt

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -230,8 +230,13 @@ OPTIONS
230230
<https://rust-lang.github.io/rustup/overrides.html> for more
231231
information about how toolchain overrides work.
232232

233-
--config KEY=VALUE
234-
Overrides a Cargo configuration value.
233+
--config KEY=VALUE or PATH
234+
Overrides a Cargo configuration value. The argument should be in
235+
TOML syntax of KEY=VALUE, or provided as a path to an extra
236+
configuration file. This flag may be specified multiple times. See
237+
the command-line overrides section
238+
<https://doc.rust-lang.org/cargo/reference/config.html#command-line-overrides>
239+
for more information.
235240

236241
-h, --help
237242
Prints help information.

‎src/doc/man/generated_txt/cargo-pkgid.txt

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,13 @@ OPTIONS
109109
<https://rust-lang.github.io/rustup/overrides.html> for more
110110
information about how toolchain overrides work.
111111

112-
--config KEY=VALUE
113-
Overrides a Cargo configuration value.
112+
--config KEY=VALUE or PATH
113+
Overrides a Cargo configuration value. The argument should be in
114+
TOML syntax of KEY=VALUE, or provided as a path to an extra
115+
configuration file. This flag may be specified multiple times. See
116+
the command-line overrides section
117+
<https://doc.rust-lang.org/cargo/reference/config.html#command-line-overrides>
118+
for more information.
114119

115120
-h, --help
116121
Prints help information.

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -197,8 +197,13 @@ OPTIONS
197197
<https://rust-lang.github.io/rustup/overrides.html> for more
198198
information about how toolchain overrides work.
199199

200-
--config KEY=VALUE
201-
Overrides a Cargo configuration value.
200+
--config KEY=VALUE or PATH
201+
Overrides a Cargo configuration value. The argument should be in
202+
TOML syntax of KEY=VALUE, or provided as a path to an extra
203+
configuration file. This flag may be specified multiple times. See
204+
the command-line overrides section
205+
<https://doc.rust-lang.org/cargo/reference/config.html#command-line-overrides>
206+
for more information.
202207

203208
-h, --help
204209
Prints help information.

‎src/doc/man/generated_txt/cargo-run.txt

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -204,8 +204,13 @@ OPTIONS
204204
<https://rust-lang.github.io/rustup/overrides.html> for more
205205
information about how toolchain overrides work.
206206

207-
--config KEY=VALUE
208-
Overrides a Cargo configuration value.
207+
--config KEY=VALUE or PATH
208+
Overrides a Cargo configuration value. The argument should be in
209+
TOML syntax of KEY=VALUE, or provided as a path to an extra
210+
configuration file. This flag may be specified multiple times. See
211+
the command-line overrides section
212+
<https://doc.rust-lang.org/cargo/reference/config.html#command-line-overrides>
213+
for more information.
209214

210215
-h, --help
211216
Prints help information.

‎src/doc/man/generated_txt/cargo-rustc.txt

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -306,8 +306,13 @@ OPTIONS
306306
<https://rust-lang.github.io/rustup/overrides.html> for more
307307
information about how toolchain overrides work.
308308

309-
--config KEY=VALUE
310-
Overrides a Cargo configuration value.
309+
--config KEY=VALUE or PATH
310+
Overrides a Cargo configuration value. The argument should be in
311+
TOML syntax of KEY=VALUE, or provided as a path to an extra
312+
configuration file. This flag may be specified multiple times. See
313+
the command-line overrides section
314+
<https://doc.rust-lang.org/cargo/reference/config.html#command-line-overrides>
315+
for more information.
311316

312317
-h, --help
313318
Prints help information.

‎src/doc/man/generated_txt/cargo-rustdoc.txt

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -276,8 +276,13 @@ OPTIONS
276276
<https://rust-lang.github.io/rustup/overrides.html> for more
277277
information about how toolchain overrides work.
278278

279-
--config KEY=VALUE
280-
Overrides a Cargo configuration value.
279+
--config KEY=VALUE or PATH
280+
Overrides a Cargo configuration value. The argument should be in
281+
TOML syntax of KEY=VALUE, or provided as a path to an extra
282+
configuration file. This flag may be specified multiple times. See
283+
the command-line overrides section
284+
<https://doc.rust-lang.org/cargo/reference/config.html#command-line-overrides>
285+
for more information.
281286

282287
-h, --help
283288
Prints help information.

‎src/doc/man/generated_txt/cargo-search.txt

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,13 @@ OPTIONS
5959
<https://rust-lang.github.io/rustup/overrides.html> for more
6060
information about how toolchain overrides work.
6161

62-
--config KEY=VALUE
63-
Overrides a Cargo configuration value.
62+
--config KEY=VALUE or PATH
63+
Overrides a Cargo configuration value. The argument should be in
64+
TOML syntax of KEY=VALUE, or provided as a path to an extra
65+
configuration file. This flag may be specified multiple times. See
66+
the command-line overrides section
67+
<https://doc.rust-lang.org/cargo/reference/config.html#command-line-overrides>
68+
for more information.
6469

6570
-h, --help
6671
Prints help information.

‎src/doc/man/generated_txt/cargo-test.txt

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -373,8 +373,13 @@ OPTIONS
373373
<https://rust-lang.github.io/rustup/overrides.html> for more
374374
information about how toolchain overrides work.
375375

376-
--config KEY=VALUE
377-
Overrides a Cargo configuration value.
376+
--config KEY=VALUE or PATH
377+
Overrides a Cargo configuration value. The argument should be in
378+
TOML syntax of KEY=VALUE, or provided as a path to an extra
379+
configuration file. This flag may be specified multiple times. See
380+
the command-line overrides section
381+
<https://doc.rust-lang.org/cargo/reference/config.html#command-line-overrides>
382+
for more information.
378383

379384
-h, --help
380385
Prints help information.

‎src/doc/man/generated_txt/cargo-tree.txt

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -269,8 +269,13 @@ OPTIONS
269269
<https://rust-lang.github.io/rustup/overrides.html> for more
270270
information about how toolchain overrides work.
271271

272-
--config KEY=VALUE
273-
Overrides a Cargo configuration value.
272+
--config KEY=VALUE or PATH
273+
Overrides a Cargo configuration value. The argument should be in
274+
TOML syntax of KEY=VALUE, or provided as a path to an extra
275+
configuration file. This flag may be specified multiple times. See
276+
the command-line overrides section
277+
<https://doc.rust-lang.org/cargo/reference/config.html#command-line-overrides>
278+
for more information.
274279

275280
-h, --help
276281
Prints help information.

0 commit comments

Comments
 (0)