Auto merge of #6703 - ehuss:links-edition-guide, r=dwijnand

Fix links to the permanent home of the edition guide.

src/cargo/util/diagnostic_server.rs

@@ -174,7 +174,7 @@ your `Cargo.toml` and then rerun this command. Once all warnings have been fixed
 then you can re-enable the `edition` key in `Cargo.toml`. For some more
 information about transitioning to the {0} edition see:
 
-  https://rust-lang-nursery.github.io/edition-guide/editions/transitioning-an-existing-project-to-a-new-edition.html
+  https://doc.rust-lang.org/edition-guide/editions/transitioning-an-existing-project-to-a-new-edition.html
 ",
                     edition,
                     file,
@@ -200,7 +200,7 @@ consider migrating to the {0} edition by adding `edition = '{0}'` to
 `Cargo.toml` and then rerunning this command; a more detailed transition
 guide can be found at
 
-  https://rust-lang-nursery.github.io/edition-guide/editions/transitioning-an-existing-project-to-a-new-edition.html
+  https://doc.rust-lang.org/edition-guide/editions/transitioning-an-existing-project-to-a-new-edition.html
 ",
                     idioms,
                     file,

src/doc/src/appendix/glossary.md

@@ -172,7 +172,7 @@ manifest is located.
 [cargo-unstable]: https://doc.rust-lang.org/nightly/cargo/reference/unstable.html
 [config option]: reference/config.html
 [directory layout]: reference/manifest.html#the-project-layout
-[edition guide]: https://rust-lang-nursery.github.io/edition-guide/
+[edition guide]: https://doc.rust-lang.org/edition-guide/
 [edition-field]: reference/manifest.html#the-edition-field-optional
 [environment variable]: reference/environment-variables.html
 [feature]: reference/manifest.html#the-features-section