diff --git a/book/exercises/002.md b/book/exercises/002.md index 46ee523..bdc71f1 100644 --- a/book/exercises/002.md +++ b/book/exercises/002.md @@ -4,8 +4,8 @@ Let's continue by adding one additional step. Let's add a file to the table of c > Can you add the file named `file_to_be_added_to_toc.md` to the book website? -1. Go to the (`https://github.com//`) - {octicon}`code;1em` `Code` - `Book` directory of your GitHub repository and find the location of `file_to_be_added_to_toc.md` -2. Go to the the file `book/_toc.yml` on your GitHub repository (`https://github.com//`) - {octicon}`code;1em` `Code` - `Book` - `_toc.yml` - {octicon}`pencil;1em` `Edit this file` +1. Go to the {octicon}`code;1em` `Code` - `Book` directory of your GitHub repository and find the location of `file_to_be_added_to_toc.md` +2. Go to the the file `book/_toc.yml` on your GitHub repository - {octicon}`code;1em` `Code` - `Book` - `_toc.yml` - {octicon}`pencil;1em` `Edit this file` 3. Add `file_to_be_added_to_toc.md` as a second item in the `Some content` chapter ````{admonition} Need some help? diff --git a/book/exercises/003.md b/book/exercises/003.md index dd39b96..e1ef4b4 100644 --- a/book/exercises/003.md +++ b/book/exercises/003.md @@ -4,7 +4,7 @@ As we've added some content by now, let's make this book a bit more personal! We > Can you edit the repository url defined in the `_config.yml`, change the title shown below the logo and change the author as shown in the footer? -1. Go to the the file `book/_config.yml` on your GitHub repository (`https://github.com//`) - {octicon}`code;1em` `Code` - `Book` - `_config.yml` - {octicon}`pencil;1em` `Edit this file` +1. Go to the the file `book/_config.yml` on your GitHub repository - {octicon}`code;1em` `Code` - `Book` - `_config.yml` - {octicon}`pencil;1em` `Edit this file` 2. In the `Edit` field, change the author which will be shown in the footer of the book website. ````{admonition} Need some help? :class: tip, dropdown diff --git a/book/exercises/004.md b/book/exercises/004.md index 05d8ec3..dccea19 100644 --- a/book/exercises/004.md +++ b/book/exercises/004.md @@ -4,7 +4,7 @@ By now, we've covered the essentials: content files, `_toc.yml` and `_config.yml > Can you make a new branch of your book with an additional file `file_on_new_version.md` and view it online? -1. Add a new Issue to let people know you're working on something by going to your repository (`https://github.com//`) - {octicon}`issue-opened;1em` `Issues` - `New issue` (note that is not required for making your own version, but it's good practice so that people know where you're working on) +1. Add a new Issue to let people know you're working on something by going to your repository - {octicon}`issue-opened;1em` `Issues` - `New issue` (note that is not required for making your own version, but it's good practice so that people know where you're working on) 2. Add a title and description, eg. `Added some content` 3. On `Assignees`, click `Assign yourself` to make clear that you feel responsible for this issue. 4. Click `Submit new issue` diff --git a/book/exercises/005.md b/book/exercises/005.md index 31f5d0c..9b078b1 100644 --- a/book/exercises/005.md +++ b/book/exercises/005.md @@ -4,8 +4,8 @@ In [](./004.md) you created your own version of a book. But it would be a pity i > Can you merge your branch into `main` with a pull request? -1. Go to your repository homepage (`https://github.com//`). Probably, it will have big yellow announcement saying {octicon}`git-branch;1em` `1- had recent pushes minutes ago - Compare & Pull request`. We'll ignore that for now and do it manually. -2. Go to the pull request page on your repository homepage (`https://github.com//`) - {octicon}`git-pull-request;1em` and click `New pull request` +1. Go to your repository homepage. Probably, it will have big yellow announcement saying {octicon}`git-branch;1em` `1- had recent pushes minutes ago - Compare & Pull request`. We'll ignore that for now and do it manually. +2. Go to the pull request page on your repository homepage - {octicon}`git-pull-request;1em` and click `New pull request` 3. On {octicon}`git-compare;1em` make sure you point from your branch `1-` into `main`. So, `main` on the left, {octicon}`arrow-left;1em`, and `1-` on the right. Main is the default name for the branch which has the most recent/stable version. The page should now show all the changes you made on the `1-`-branch. If there would be changes on the `main` branch in the meantime, they should show up here too. 4. Click `Create pull request` to start the process of moving your changes into the `main` branch. If there were changes on both branches which are conflicting, it will tell you there's a merge conflict. If you followed the steps until now, that shouldn't be the case. Solving those merge conflicts is topic for another exercise. 5. Add a title and description described the changes you made. This is done to give other people a summary of what has been changed.