Fixes

README.md

@@ -10,12 +10,11 @@
 #### Download your Terminal if you don't have one already.
 
 
-+ **Windows** (you will need both)
-  + PuTTy (use Windows installer) [download](http://www.chiark.greenend.org.uk/~sgtatham/putty/download.html)
++ **Windows**
   + MobaXterm [download](http://mobaxterm.mobatek.net/download-home-edition.html)
 
   > Remarks: In Windows, there is a default command line, called command prompt. However, the names of many commands is different and some commands do not exist. For that reason, use another terminal, such as MobaXterm.
-  
+
 + **Mac**
   + iTerm2 [download](https://www.iterm2.com/downloads.html)
   + Terminal
@@ -36,9 +35,7 @@
 
 #### Key generation
 
-+ **Windows**
-  + PuTTyGEN [follow tutorial](https://hpc.uni.lu/users/docs/access.html#ssh-key-generation-on-windows)
-+ **Mac / Linux**
++ **Windows (MobaXterm) / Mac / Linux**
   + ssh-keygen
 
         ```bash
@@ -65,31 +62,40 @@
         +-----------------+
         ```
 
+  > Note, you must **NEVER** share the id_rsa file with anybody
+
 ### 3. Create LUMS account
 
 This task has been done already by your awesome R3 team.
 
 ### 4. Add SSH key to LUMS (**L**CSB **U**ser **M**anagement **S**ystem)
 
-1. Attach SSH key to your LUMS account
-2. Go to https://lcsb-ipa.uni.lu
-3. Login with first.lastname and password linuxwork2015
+* Attach your *public* SSH key to your LUMS account
+* To get the contents of your public key, type the following command (you will understand it all later today :) )
 
-    > (Note: Use your password for existing LUMS account)
+```bash
+cd
+cat .ssh/id_rsa.pub
+```
 
-### 5. Connecting to Virtual Machine
+Expected output (your key will be different)
 
-* **Windows**
+Question: Is it OK for me to post my public key publicly?
 
-  Enter the details into PuTTy
+```
+christophe.trefois.TrefexVMPC$ cd && cat .ssh/id_rsa.pub
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDRVvaaZejn/CHQsXdb2nMzzPP3WF14H9djaTWmOCabl/q1BJEjWX21P1D+r45mB1EUfUi5w1VrN6I3/9ytZweOa4kLsMJCYU0sEwZq2KKOEKkW7M7W6LGJ+4C2QzkXLCY4r2yToAK7HwvvDUoDF3Ioodw9omTFLaHGzTLEsw9KVrYYwcyAQ5SOQTsL3VuMgyTd+Z8414HPIQrB3abEqHGGvkcrxnKhaEF/R3NNJ523ErRmRZa9cIB6dhXjzEIcvgaDzMKtXbflciVt3u3vM+4aaKhHwO73KUv8wDiPau8ROxmvNkADZB4gpsjbKqVP876QCT5YI5Z0D8Bcj5GoKZ1D christophe.trefois@TrefexVMPC
 
-  <img src="images/screen1.png" width=400>
+```
 
-  Don't forget to add your SSH key
+* Go to https://lcsb-ipa.uni.lu
+* Login with first.lastname and password linuxwork2015
 
-  <img src="images/screen2.png" width=400>
+    > (Note: Use your password for existing LUMS account)
 
-* **Linux**
+### 5. Connecting to Virtual Machine
+
+* **Windows / Mac / Linux**
   * Open your terminal
   * Connect to the workshop virtual machine
 
@@ -97,15 +103,56 @@ This task has been done already by your awesome R3 team.
         ssh {first}.{lastname}@10.79.2.191 -p 8022
         ```
 
+## Before we start
+
+* A word that looks like `this` means that you should replace the word `this` with appropriate content.
+
 ## Discover your surroundings
 ***
 * In which folder am I? (Hint: pwd)
 * What is the contents of the current folder? (Hint: ls)
-* Creating my first file (Hint: touch)
+* Creating my first file called myFile.txt (Hint: touch `filename`)
+* Checking that my file exists (Hint: ls)
+
+
 * Creating my first folder called "myFirstFolder" (Hint: mkdir)
-* How do I enter my folder? (Hint: cd)
-* Moving my first file to the new folder (Hint: mv)
-* Copying **** (Hint: cp)
+* How do I enter my new folder? (Hint: cd `foldername`)
+* Copying my first file to the new folder (Hint: cp `source` `target`)
+
+**Exercise 1**
+
+Check if the file is in the correct folder.
+
+    Hint: ls, pwd
+
+What if I want to see a structure like in Windows Explorer?
+
+--> Try this:
+
+```bash
+cd
+tree
+```
+
+You should see something like this:
+
+```bash
+.
+├── myFile.txt
+└── myFirstFolder
+    └── myFile.txt
+
+1 directory, 2 files
+```
+
+** Exercise 2**
+
+I see `nyFile.txt` twice. Maybe I should remove the copy I don't want.
+
+* Go to where the to-be-deleted file is (Hint: cd)
+* Remove the file (Hint: rm -i `myFile.txt`)
+
+> In Linux, when asked questions you usually type `y` for Yes and `n` for no unless explicitly written.
 
 ## A couple remarks on file / folder names
 * Try not to use spaces