Update documentation

Author: Kobzol

src/doc/rustc/src/codegen-options/index.md

@@ -218,15 +218,22 @@ coverage measurement. Its use is not recommended.
 
 ## link-self-contained
 
-On `windows-gnu`, `linux-musl`, and `wasi` targets, this flag controls whether the
-linker will use libraries and objects shipped with Rust instead of those in the system.
-It takes one of the following values:
+This flag controls whether the linker will use libraries and objects shipped with Rust instead
+of those in the system. This allows overriding cases when detection fails or user wants to use shipped
+libraries.
+
+You can enable or disable the usage of any self-contained objects using one of the following values:
 
 * no value: rustc will use heuristic to disable self-contained mode if system has necessary tools.
 * `y`, `yes`, `on`, `true`: use only libraries/objects shipped with Rust.
 * `n`, `no`, `off` or `false`: rely on the user or the linker to provide non-Rust libraries/objects.
 
-This allows overriding cases when detection fails or user wants to use shipped libraries.
+It is also possible to enable or disable specific self-contained objects in a more granular way.
+You can pass a comma-separated list of self-contained objects, individually enabled (`+object`) or
+disabled (`-object`).
+
+Currently, only the `linker` granular option is stabilized:
+- `linker`: toggle the usage of self-contained linker objects (linker, dlltool, and their necessary libraries)
 
 ## linker
 
@@ -235,6 +242,20 @@ path to the linker executable. If this flag is not specified, the linker will
 be inferred based on the target. See also the [linker-flavor](#linker-flavor)
 flag for another way to specify the linker.
 
+## linker-features
+
+This flag allows enabling or disabling specific features used during linking.
+
+The flag accepts a comma-separated list of features, individually enabled (`+feature`) or disabled
+(`-feature`).
+
+Currently, only one such feature is stable:
+- `lld`: toggles the usage of the lld linker, either the system-installed binary, or the self-contained
+  `rust-lld` linker.
+
+If you want to opt out of the usage of the `lld` linker (for targets where it is configured as the default linker),
+use `-Clinker-features=-lld`.
+
 ## linker-flavor
 
 This flag controls the linker flavor used by `rustc`. If a linker is given with

src/doc/unstable-book/src/compiler-flags/codegen-options.md

@@ -51,10 +51,10 @@ instead of those in the system. The stable boolean values for this flag are coar
 - `mingw`: other MinGW libs and Windows import libs
 
 Out of the above self-contained linking components, `linker` is the only one currently implemented
-(beyond parsing the CLI options).
+(beyond parsing the CLI options) and stabilized.
 
 It refers to the LLD linker, built from the same LLVM revision used by rustc (named `rust-lld` to
 avoid naming conflicts), that is distributed via `rustup` with the compiler (and is used by default
-for the wasm targets). One can also opt-in to use it by combining this flag with an appropriate
+for the wasm targets). One can also opt in to use it by combining this flag with an appropriate
 linker flavor: for example, `-Clinker-flavor=gnu-lld-cc -Clink-self-contained=+linker` will use the
 toolchain's `rust-lld` as the linker.

src/doc/unstable-book/src/compiler-flags/linker-features.md

@@ -2,8 +2,8 @@
 
 --------------------
 
-The `-Zlinker-features` compiler flag allows enabling or disabling specific features used during
-linking, and is intended to be stabilized under the codegen options as `-Clinker-features`.
+The `-Clinker-features` compiler flag allows enabling or disabling specific features used during
+linking.
 
 These feature flags are a flexible extension mechanism that is complementary to linker flavors,
 designed to avoid the combinatorial explosion of having to create a new set of flavors for each