diff --git a/.github/workflows/dev-guide.yml b/.github/workflows/dev-guide.yml index 9a7858d004..9a22f4fc1e 100644 --- a/.github/workflows/dev-guide.yml +++ b/.github/workflows/dev-guide.yml @@ -2,7 +2,7 @@ name: Deploy dev-guide on: push: branches: - - master + - main env: MDBOOK_VERSION: 0.5.2 diff --git a/book.toml b/book.toml index 98697bf6c2..bc2089d344 100644 --- a/book.toml +++ b/book.toml @@ -7,7 +7,7 @@ authors = ["The Rust Project Developers"] additional-css = ["theme/reference.css"] additional-js = ["theme/reference.js"] git-repository-url = "https://github.com/rust-lang/reference/" -edit-url-template = "https://github.com/rust-lang/reference/edit/master/{path}" +edit-url-template = "https://github.com/rust-lang/reference/edit/main/{path}" smart-punctuation = true [output.html.fold] diff --git a/dev-guide/book.toml b/dev-guide/book.toml index 5c82055875..d03ff52ae4 100644 --- a/dev-guide/book.toml +++ b/dev-guide/book.toml @@ -3,8 +3,8 @@ title = "The Rust Reference Developer Guide" language = "en" [output.html] -git-repository-url = "https://github.com/rust-lang/reference/tree/master/dev-guide" -edit-url-template = "https://github.com/rust-lang/reference/edit/master/dev-guide/{path}" +git-repository-url = "https://github.com/rust-lang/reference/tree/main/dev-guide" +edit-url-template = "https://github.com/rust-lang/reference/edit/main/dev-guide/{path}" smart-punctuation = true [output.html.search] diff --git a/dev-guide/src/introduction.md b/dev-guide/src/introduction.md index 364b0f9745..758e6b94af 100644 --- a/dev-guide/src/introduction.md +++ b/dev-guide/src/introduction.md @@ -28,7 +28,7 @@ While writing, you may find it handy to have a [playground] open to test out wha Feel free to take information from the standard library and Rustonomicon as appropriate. -Note that we don't write documentation for purely library features, such as threads and IO, and we don't write about Rust in the future. Documentation is written as if the current stable release of Rust is the last release. The `master` branch of the Reference corresponds to what is **stable** on the `main` branch ("nightly") of [rust-lang/rust]. If you want to write about Rust in the future, you want **[The Unstable Book][unstable]**. +Note that we don't write documentation for purely library features, such as threads and IO, and we don't write about Rust in the future. Documentation is written as if the current stable release of Rust is the last release. The `main` branch of the Reference corresponds to what is **stable** on the `main` branch ("nightly") of [rust-lang/rust]. If you want to write about Rust in the future, you want **[The Unstable Book][unstable]**. [introduction]: https://doc.rust-lang.org/nightly/reference/introduction.html [issue tracker]: https://github.com/rust-lang/reference/issues