Merge branch 'master' into issue-69276

7 files changed, 9 insertions, 1 deletions

diff --git a/src/doc/book b/src/doc/book
-Subproject e37c0e84e2ef73d3a4ebffda8011db6814a3b02
+Subproject 6247be15a7f7509559f7981ee2209b9e0cc121d
diff --git a/src/doc/edition-guide b/src/doc/edition-guide
-Subproject 8204c1d123472cd17f0c1c5c77300ae802eb027
+Subproject 49270740c7a4bff2763e6bc730b191d45b7d516
diff --git a/src/doc/embedded-book b/src/doc/embedded-book
-Subproject 40beccdf1bb8eb9184a2e3b42db8b8c6e394247
+Subproject 366c50a03bed928589771eba8a6f18e0c0c01d2
diff --git a/src/doc/nomicon b/src/doc/nomicon
-Subproject 4d2d275997746d35eabfc4d992dfbdcce2f626e
+Subproject d1517d4e3f29264c5c67bce2658516bb5202c80
diff --git a/src/doc/reference b/src/doc/reference
-Subproject ed22e6fbfcb6ce436e9ea3b4bb4a55b2fb50a57
+Subproject 892b928b565e35d25b6f9c47faee03b94bc4148
diff --git a/src/doc/rust-by-example b/src/doc/rust-by-example
-Subproject ffc99581689fe2455908aaef5f5cf50dd03bb8f
+Subproject ab072b14393cbd9e8a1d1d75879bf51e27217bb
diff --git a/src/doc/rustc/src/codegen-options/index.md b/src/doc/rustc/src/codegen-options/index.md
index dbe281be7df..c638f88057a 100644
--- a/src/doc/rustc/src/codegen-options/index.md
+++ b/src/doc/rustc/src/codegen-options/index.md
@@ -464,7 +464,15 @@ machine. Each target has a default base CPU.
 
 Individual targets will support different features; this flag lets you control
 enabling or disabling a feature. Each feature should be prefixed with a `+` to
-enable it or `-` to disable it. Separate multiple features with commas.
+enable it or `-` to disable it.
+
+Features from multiple `-C target-feature` options are combined. \
+Multiple features can be specified in a single option by separating them
+with commas - `-C target-feature=+x,-y`. \
+If some feature is specified more than once with both `+` and `-`,
+then values passed later override values passed earlier. \
+For example, `-C target-feature=+x,-y,+z -Ctarget-feature=-x,+y`
+is equivalent to `-C target-feature=-x,+y,+z`.
 
 To see the valid options and an example of use, run `rustc --print
 target-features`.