Update git prep, several small fixes and small improvement

Author: emiliom

resources/prep/git.md

@@ -4,15 +4,15 @@
 
 [Git](https://git-scm.com/) is a popular version control system that is the foundation of most open source software development. You are not required to be a Git pro in advance of this event, but come prepared to learn a lot about it! [GitHub](https://github.com) is a hosting service for Git repositories, enabling us to share code across teams in a web environment.
 
-We will use Git and GitHub for collaborative work. Be sure to arrive at OceanHackWeek with your own [GitHub](https://github.com/) account.
+We will use Git and GitHub for collaborative work. Be sure to arrive at OceanHackWeek with your own [GitHub](https://github.com) account.
 
 ## Git Installation
 
 * Windows
     * Install Git for Windows from this [link](https://gitforwindows.org/). For more setup details follow these [instructions](https://carpentries.github.io/workshop-template/#shell)
 * Mac OS
     * Download the [git installer](https://git-scm.com/download/mac) and run it. 
-* Linux (Debian): `sudo apt install git-all`
+* Linux (Debian/Ubuntu): `sudo apt install git-all`
 
 To test, open the terminal (on Windows, Git Bash) and setup your username and email:
 
@@ -29,7 +29,7 @@ During the hackweek it will be useful to know how to navigate between files from
 
 ## Terminal (command line) text editor
 
-When working on the command line (the terminal or shell), it is often handy to modify file content directly from there. For that you can use a command line editor such as [nano](https://linuxize.com/post/how-to-use-nano-text-editor/). On Mac and Linux it is usually pre-installed, but for Windows you can follow the instructions in this [link](http://carpentries.github.io/workshop-template/#editor) to set it up. Test your installation by opening a terminal and running `nano --version`. If it works you can link your git configuration with `nano`:
+When working on the command line (the terminal or shell), it is often handy to modify file content directly from there. For that you can use a command line editor such as [nano](https://linuxize.com/post/how-to-use-nano-text-editor/). On Mac and Linux it is usually pre-installed, and on Windows it is installed when you install Git (see [here](http://carpentries.github.io/workshop-template/#editor) for more information about nano and its configuration). Test your installation by opening a terminal and running `nano --version`. If it works you can link your git configuration with `nano`:
 
 ```bash
 git config --global core.editor "nano -w"
@@ -45,7 +45,7 @@ Steps 1-5 focus on the Git "centralized workflow". We present it here as an illu
 
 ### 1. Create a project repository
 
-On your own or someone in your project group (preferably one who has never done it before), create a repository for the project under the {OceanHackWeek organization, [https://github.com/oceanhackweek](https://github.com/oceanhackweek)
+On your own or someone in your project group (preferably one who has never done it before), create a repository for the project under the `oceanhackweek` organization, `https://github.com/oceanhackweek`
 
 ![New Repo](../img/newRepo.png)
 
@@ -58,7 +58,7 @@ Click `New` and follow the steps: check yes to create a `README.md` file.
 
 ### 2. Clone the repository
 
-Each participant should clone the repository so they have their copy on their JupyterHub account space (and locally in the participant's computer, if desired). Navigate through the terminal to the folder where you want to keep {OceanHackWeek work (`cd path_to_oceanhackweek`).
+Each participant should clone the repository so they have their copy on their JupyterHub account space (and locally in the participant's computer, if desired). Navigate through the terminal to the folder where you want to keep OceanHackWeek work (`cd path_to_oceanhackweek`).
 
 ```bash
 git clone https://github.com/oceanhackweek/ohw22-proj-myprojectname.git
@@ -98,21 +98,23 @@ To continue practicing these steps, make more changes to the title and the descr
 
 ![Centralized Workflow](../img/centralized_workflow.png)
 
-*Ran into a problem?*
 
-When working with several people sometimes you
+```{admonition} *Ran into a problem?*
+:class: attention
 
-* cannot push because changes have been made that have not been incorporated: need to first pull
-* when pulling you arrive into a merge conflict: need to resolve the conflict manually
+When working with several people sometimes you
 
+* Cannot push because changes have been made that have not been incorporated: need to first pull
+* When pulling you arrive into a merge conflict: need to resolve the conflict manually
+```
 
 ### 5. Resolving the merge conflict
 
 ```bash
 git status
 ```
 
-You will see the file/s which caused the merge conflict in green.
+You will see the file(s) which caused the merge conflict in green.
 
 Open it and detect the conflict by the special format:
 
@@ -160,7 +162,7 @@ Forks are public copies of the main repo, from which you can submit changes to t
 * Fork the public repo (click on the *Fork* button)
 ![](../img/fork_button.png)
 * Note it looks the same but the web address contains your username
-  [https://github.com/myghusername/ohw22-proj-myprojectname](https://github.com/myghusername/ohw22-proj-myprojectname)
+  `https://github.com/myghusername/ohw22-proj-myprojectname`
 * Go to your local repo and rename your `origin` to point to the fork:
 
 ```bash