Back again with some fixed

book/features/python_interactivity.md

@@ -6,5 +6,5 @@ This section is useful for user type 5-6.
 ```
 
 In general, there are two option to include python-enabled interactivity embedded in your book:
- - Using our [own sphinx-thebe extension](live_code.md) which makes code cells in your `.ipynb` book pages editable and executable by the reader! Opposed to the original sphinx-thebe extensions, our extension runs python in the reader's browser and doesn't rely on an external webserver for the python kernel. We highly recommend this extension as it allows you to use the strength of combining text/figures and code of a jupyter book with interactivity!
+ - Using our [own sphinx-thebe extension](./live_code.md) which makes code cells in your `.ipynb` book pages editable and executable by the reader! Opposed to the original sphinx-thebe extensions, our extension runs python in the reader's browser and doesn't rely on an external webserver for the python kernel. We highly recommend this extension as it allows you to use the strength of combining text/figures and code of a jupyter book with interactivity!
  - Using [JupyterLite](jupyterlite/jupyterlite.md) to create 'iframe-like' Ipython consoles / jupyterbook / jupyter lab environments in your book. As these 'iframes' are separate modules added to your page, the integration with the other content in your book is less flexible as with our sphinx-thebe extension.

book/installation-and-setup/anaconda.md

@@ -49,11 +49,11 @@ Now everytime you want to work on your jupyter-book, you need to activate the en
 
 As mentioned before, python packages can be downloaded in the environments you create. Both NumPy and pandas are popular Python packages used for data manipulation and analysis. For the creation of Jupyter Books, we will use the package `jupyter-book`. More information about this package [here](jupyter-book-setup.md).
 
-### Text-based files
+### Import environments
 
 Working on larger projects (with many cool interactive features) may require you to install a lot of python packages. It can be useful to specify the required packages in a text-based file (for example `environment.yml`) and then telling `conda` to create the environment based on the contents of the file! 
 
-Moreover, if you are joining a team that is working on complex projects, it can be useful for you to create a new environment based on use such a text-based file in order to create an up-to-date environment that will give you a flying start. The team might also provide a `requirements.txt` file which specifies all the packages you need to download in order to work on the project. Now it should also become clear why its preferrable to create new environment for each project/book that you work on because they might require you to use different packages!
+Moreover, if you are joining a team that is working on complex projects, it can be useful for you to create a new environment based on use such a text-based file in order to create an up-to-date environment that will give you a flying start. The team might also provide a `requirements.txt` file which specifies all the packages you need to download in order to work on the project. Now it should also become clear why its preferable to create new environment for each project/book that you work on because they might require you to use different packages!
 
 Here's an example of what a `requirements.txt` file might look like.
 
@@ -95,7 +95,7 @@ You can do this by navigating your command line interface to the folder with `re
 
 Now you can install the required packages with: `pip install -r requirements.txt`. The TeachBooks team works with these `requirements.txt` files which makes this an essential step in the set-up of your environment!
 
-### Create an environment from text-based file
+### Export environment
 
 If you want to create a file listing the required packages yourself, you can do it by creating a file with the following file extension: the `*.yml` file (pronounced "yah-mul"). It is a text-readable file, that stands for "Yet another Markup Language." This is one of _many_ types of files that use a particular type of text formatting to give a computer specific instructions. It is very similar to the way Markdown formatting works.
 

book/workflows/branches.md

@@ -1,4 +1,4 @@
-# Create your own version
+# Create your own version (branching, cloning, pulling)
 
 Branches are a very useful feature of Git. Branches allow you to work on multiple versions of your codebase simultaneously; you create a copy of your codebase, on which you can work independently of the main codebase. The main branch is the default branch. The content on this branch will be the most up to date version of the book. Therefore, new branches, which are made to add or fix some content in the book, are usually cloned from the main branch. This has many advantages compared to making the edits immediately in the main branch.  Some advantages of working with branches are:
 

book/workflows/collaboration.md

@@ -43,7 +43,7 @@ The steps involved are as follows:
 - Add changes to Git-timeline locally (committing)
 - Add changes to GitHub/GitLab (pushing)
 ````
-````{tab-item} Brand new version (branch)
+````{tab-item} Existing version (branch)
 - Eventually solve conflicts with combining versions (merge conflicts, emerges after pulling)
 - Add or make changes to file(s)
 - Select files ready to be added to Git-timeline (staging)
@@ -61,7 +61,7 @@ The steps involved are as follows:
 - Add changes to Git-timeline locally (committing)
 - Add changes to GitHub/GitLab (pushing)
 ````
-````{tab-item} Brand new version (branch)
+````{tab-item} Existing version (branch)
 - Eventually solve conflicts with combining versions (merge conflicts, emerges after pulling)
 - Add or make changes to file(s)
 - Check changes in book locally

book/workflows/edit_book.md

@@ -1,4 +1,4 @@
-# Edit
+# Edit (merge conflicts, staging, committing, pushing)
 
 Suppose we are writing a new chapter, or are updating an existing chapter for our Jupyter Book. We've created a new branch on which we are going to make the changes.
 

book/workflows/merge_request.md

@@ -1,4 +1,4 @@
-# Reviewing and combine versions
+# Reviewing and combine versions (merge / pull request, merging)
 
 Merging a branch into the main branch is also good moment to let a team-member review the content. By assigning a colleague to review your branch you can check the quality of your new content. 
 
@@ -6,7 +6,7 @@ Merging a branch into the main branch is also good moment to let a team-member r
 There is a slight difference in terminology between GitLab and GitHub. GitLab uses the term *Merge* Request while GitHub uses the term *Pull* Request. Both actions refer to the merging of a branch into the main branch.
 ```
 
-We're finished with our chapter, and now it's time to include all of our commits in the `main` branch. However, it's good practise to first merge `main` into our branch, so that we can see if there are any merge conflicts. Assuming that those merge conflicts are solved before, we'll now continue this example with the following merge of our branch into `main`.
+We're finished with our chapter, and now it's time to include all of our commits in the `main` branch. However, it's good practice to first merge `main` into our branch, so that we can see if there are any merge conflicts. Assuming that those merge conflicts are solved before, we'll now continue this example with the following merge of our branch into `main`.
 
 `````{tab-set}
 ````{tab-item} In GitLab

book/workflows/milestones_issues.md

@@ -1,4 +1,4 @@
-# Assign task to yourself
+# Assign task to yourself (milestones, issues)
 
 In a repository, team members can define Milestones and Issues. Milestones are used to track the overall progress of the project to make sure that deadlines are met. A milestone can group many issues, which are individual tasks that need to be finished in order to reach the milestone.
 
@@ -16,7 +16,7 @@ Every team member can create issues when they think of a task that would improve
 
 The issues in GitLab can be found on this page:
 
-![issues](figures/issues.png)
+![issues](figures/issues_new.png)
 
 You can create an issue by clicking on the blue `New Issue` button in the top right corner.