Merge branch 'develop' into 'master'

[release] Regular merge of develop

See merge request !102

.ci/generateIndex.py

@@ -19,7 +19,7 @@ localroot = os.getcwd()
 
 
 # generate the index properly speaking
-cardDirs = ["2020", "2019"]
+cardDirs = ["2021", "2020", "2019"]
 index=''
 
 # determine first the directories

2021/2021-03-18_basicGitTraining/slides/best_practices.md

 # Best practices
 
-* `pull` before `push`
+* `pull` before `push` and, generally, before starting to work
 * Work on your <font color="red">own</font> branch (in your own fork), and **not** on `master` and **not** on `develop`
 * Do **not push** to `master`, but **submit a Pull Request (PR)**
 * Get your code **reviewed** by your peers (submit a PR!)

2021/2021-03-18_basicGitTraining/slides/configuration.md

@@ -38,7 +38,7 @@ If there are 2 files named `id_rsa`, you have an SSH key.
 
 If you don’t have yet an SSH key, you have to generate one:
 ```bash
-$ ssh-keygen -t rsa # -b 4096
+$ ssh-keygen -t rsa -b 4096
 ```
 
 If you set a password to your key (recommended), add it to the `ssh-agent`:

2021/2021-03-18_basicGitTraining/slides/essential_commands.md

@@ -45,6 +45,9 @@ $ cp firstnameLastname.md myName.md
 
 Then, make your changes with your favorite editor!
 
+<br><br>
+Reference for markdown: https://howto.lcsb.uni.lu/?contribute:markdown
+
 
 
 # Add your file to the stage
@@ -71,7 +74,11 @@ $ git status
 ```bash
 $ git diff
 ```
-exit with `q`
+exit with `q`.
+
+<br>
+
+![bulb](slides/img/bulb.png)  If it is a long diff, you can display additional lines with space.
 
 
 

2021/2021-03-18_basicGitTraining/slides/the_terminal.md

@@ -28,7 +28,12 @@ $ git --version
 
 List the contents of a directory
 ```bash
-$ ls #-lash
+$ ls
+```
+
+You can list more details with:
+```bash
+$ ls -lah
 ```
 
 Create a directory
@@ -36,6 +41,8 @@ Create a directory
 $ mkdir myNewDirectory
 ```
 
+
+
 Change the directory to a specific folder
 ```bash
 $ cd myNewDirectory
@@ -50,8 +57,6 @@ $ cd ../..
 # 2 levels up
 ```
 
-
-
 Move a file or a directory
 ```bash
 $ mv myFile.m myNewDirectory/.