diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-17 12:19:51 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-17 12:19:51 +0000 |
commit | fdf1d34a710c256efc66fdd4bdd5633fc95f6a84 (patch) | |
tree | cbd9cc6be00cded8314fc78b8a1e41c3abd0de45 /debian/patches/d-bootstrap-cargo-doc-paths.patch | |
parent | Merging upstream version 1.69.0+dfsg1. (diff) | |
download | rustc-fdf1d34a710c256efc66fdd4bdd5633fc95f6a84.tar.xz rustc-fdf1d34a710c256efc66fdd4bdd5633fc95f6a84.zip |
Merging debian version 1.69.0+dfsg1-1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
-rw-r--r-- | debian/patches/d-bootstrap-cargo-doc-paths.patch | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/debian/patches/d-bootstrap-cargo-doc-paths.patch b/debian/patches/d-bootstrap-cargo-doc-paths.patch index baba25534..8b6b5a82a 100644 --- a/debian/patches/d-bootstrap-cargo-doc-paths.patch +++ b/debian/patches/d-bootstrap-cargo-doc-paths.patch @@ -93,15 +93,15 @@ diff --git a/src/doc/index.md b/src/doc/index.md index 2c92d5e..9be58d5 100644 --- a/src/doc/index.md +++ b/src/doc/index.md -@@ -87,7 +87,7 @@ accomplishing various tasks. +@@ -130,7 +130,7 @@ - ## The Cargo Book + ### The Cargo Book --[The Cargo Book](cargo/index.html) is a guide to Cargo, Rust's build tool and dependency manager. -+[The Cargo Book](../../cargo-doc/doc/index.html) is a guide to Cargo, Rust's build tool and dependency manager. - - ## The Rustdoc Book +-[The Cargo Book](cargo/index.html) is a guide to Cargo, Rust's build tool and ++[The Cargo Book](../../cargo-doc/doc/index.html) is a guide to Cargo, Rust's build tool and + dependency manager. + ### The Rustdoc Book diff --git a/src/doc/reference/src/conditional-compilation.md b/src/doc/reference/src/conditional-compilation.md index 6966cec..0ca3589 100644 --- a/src/doc/reference/src/conditional-compilation.md @@ -353,9 +353,9 @@ Index: rust/src/doc/rustc/src/linker-plugin-lto.md environment variables: Index: rust/src/doc/rustc/src/platform-support/fuchsia.md =================================================================== ---- rust.orig/src/doc/rustc/src/platform-support/fuchsia.md -+++ rust/src/doc/rustc/src/platform-support/fuchsia.md -@@ -870,7 +870,7 @@ ${SDK_PATH}/tools/${ARCH}/ffx debug conn +--- a/src/doc/rustc/src/platform-support/fuchsia.md ++++ b/src/doc/rustc/src/platform-support/fuchsia.md +@@ -932,7 +932,7 @@ [Fuchsia]: https://fuchsia.dev/ [source tree]: https://fuchsia.dev/fuchsia-src/get-started/learn/build [rustup]: https://rustup.rs/ |