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.

0 commit comments

Comments
 (0)