Move the user guide from doc to doc/user-guide

Author: rbtcollins

.github/workflows/deploy-docs.yaml

@@ -6,6 +6,9 @@ on:
       - stable
       - master
 
+# Builds docs for both stable and master branches.
+# stable is placed in the root of the gh-pages branch, while master is placed at /devel
+
 jobs:
   doc:
     name: Documentation
@@ -21,11 +24,16 @@ jobs:
           echo "`pwd`/mdbook" >> $GITHUB_PATH
       - name: Build book
         run: |
+          # Build for stable
           git checkout stable
-          cd doc
+          # Support both old and new directory structure during the transition
+          cd doc/user-guide || cd doc
           mdbook build
           mv book ${{ runner.temp }}
+          # Build for master
+          cd $(git rev-parse --show-toplevel)
           git checkout master
+          cd doc/user-guide
           mdbook build
           mv book ${{ runner.temp }}/book/devel
       - name: Deploy to GitHub

doc/.gitignore renamed to doc/user-guide/.gitignore

@@ -1,8 +1,8 @@
 [book]
-title = "The rustup book"
 authors = ["The Rust Project Developers"]
+title = "The rustup book"
 
 [output.html]
-git-repository-url = "https://github.com/rust-lang/rustup/tree/master/doc"
+edit-url-template = "https://github.com/rust-lang/rustup/edit/master/doc/user-guide/{path}"
+git-repository-url = "https://github.com/rust-lang/rustup/tree/master/doc/user-guide"
 site-url = "https://rust-lang.github.io/rustup/"
-edit-url-template = "https://github.com/rust-lang/rustup/edit/master/doc/{path}"