Update of the git howto page

pages/08.Contribute/01.git/how-to-use-git/docs.en.md

@@ -7,6 +7,13 @@ taxonomy:
         - docs
 ---
 
+|```Meta information```|
+|:--:|
+|```This howto was last updated on``` **2019-04-17** ```and it reffers to:```<br>**Git and Atom v.1.33**<br>
+
+**NOTE:**```If the howto reffers to an older software version than the provided by``` **Disroot**,```or the one you're using in your device, there could be missing features or small parts of the information that may have changed.```<br> **Disroot's** ```how-to documentation is a community driven procces. We try to keep it as updated as we can.```
+
+---
 # Git Basics
 
 We'll not cover all the aspects of using git in this tutorial. There are lots of in-depth tutorials and books written about this tool and what we're aiming at is providing a short and easy way to contribute to tutorials and translations.
@@ -20,8 +27,9 @@ Since all the modifications will happen on your local machine, you need to [inst
 If you haven't yet, it's time to install [Atom](https://atom.io). **Atom** is a feature rich text editor with special git integration. If your Operating system is not automatically detected or listed when going to [Atom](https://atom.io) website, check [Other platforms](https://github.com/atom/atom/releases/latest). For all Arch users, you can simply install it using `pacman -S atom` or other package manager of your choice.
 
 ## Create an account on git instance
-After installing **git** and **Atom**, you'll need an account on the git instance used by **Disroot**. This is because, unfortunately, git is not yet a federated service so you need to have one.<br>
-We host all our work at the Gitlab instance from our friends at **FOSS Community India**.<br>
+After installing **git** and **Atom**, you'll need an account on the git instance used by **Disroot**. This is because, unfortunately, git is not yet a federated service so you need to have one.
+
+We host all our work at the Gitlab instance from our friends at **FOSS Community India**.
 
 To create an account just go to https://git.fosscommunity.in and register. Additionally to registering new account you can choose to use one of the ID providers such as gitlab.com, Github, Twitter, Gitbucket, Google, given you have already an account on one of those platforms.
 
@@ -38,18 +46,21 @@ Once the repository is copied to your hard drive you will see a `howto` director
 You can later move that directory to any place you want on your computer.
 
 ### Access to the repository
-In order to be able to commit changes to **Disroot**'s git repository, you need to request access. This is done via our git project page.
+In order to be able to commit changes to **Disroot**'s git repository, you need to request access. This is done via [our git project page](https://git.fosscommunity.in/disroot/howto)
 
 ![](en/git-request_access.png)
 
-Once admins grant you the access, you can "push" your changes to the server.
+Once admins grant you the access, you can "*push*" your changes to the server.
 
 |![](en/note.png) **NOTE**|
 |:--:|
 |You can start working without access granted as all the changes happen on your local computer.|
 
 # Starting to work
-Now you can start **Atom**. Go to the File tab, select `Open Folder` and choose the directory you've just cloned (*howto*).<br>
+Now you can start **Atom**.
+
+Go to the File tab, select `Open Folder` and choose the directory you've just cloned (*howto*).
+
 The interface of **Atom** is clean and easy to understand. The left sidebar is your project's navigation tree, the middle window is where you edit files and bottom bar indicates number of changed files, current branch, quick pull/push to git.
 
 ![](en/atom1.png)
@@ -61,32 +72,48 @@ To save the file changes use the *File* menu or the *Ctrl+s* keyboard shortcut.
 **Before** you start working on the files, you'll need to create your own **branch**.
 
 ## Creating branches
-Branches are basically your own private workspaces. Each git project has it's own **master** branch. Master branch is the main, *production* copy of the project. This branch is automatically synced with the website, so any change made to that branch are instantly visible on the website. That is also why adding any changes to the **master** branch is restricted only to the owners of the project.<br>
+Branches are basically your own private workspaces.
+
+Each git project has it's own **master** branch. Master branch is the main, *production* copy of the project. This branch is automatically synced with the website, so any change made to that branch are instantly visible on the website. That is also why adding any changes to the **master** branch is restricted only to the owners of the project.
+
 In order to start working, create your own branch. This will basically make a clone of the **master** branch.
 
+On the bottom-right corner of **Atom**, click on **master** (or any other branch name) and choose **New Branch**. Choose a name for your branch, something easy for other to know what you're working on, what your branch is about. For example if your planning to work on a nextcloud howto, call it "nextcloud_howto" or something similar.
+
+Press **Enter** on your keybord when you're done.
+
 ![](en/atom-branch1.gif)
 
-Switching between branches can also be done from that menu. Current working branch is visible on the bottom bar.
+Now, you need to **publish** your new branch so that it is created on the server. **Atom** will ask your credential. Use the one created for our git instance.
+
+![](en/publish.png)
+
+Switching between branches can also be done from that menu. Current working branch is visible on the bottom bar. Click on it: other local branches will appear.
 
 ![](en/atom-branch2.gif)
 
-Once the branch is created and changed, you can create new files, modify existing ones, etc.
+Once the branch is created and published, and you have change the current work on this new branch, you can create new files, modify existing ones, etc.
 
 ## Commiting changes
-Now you're working on your computer creating new tutorials or translating existing ones. Apart from saving changes to your laptop, you can/should also commit your changes.<br>
-Commiting changes syncs the work you've done on your branch to the git server. If the branch doesn't exist on repository, it will be created and all your modifications and new files will be uploaded to the server. In that case you can work on your files on multiple machines, or other people can take over, help working on your branch.
+Now you're working on your computer creating new tutorials or translating existing ones. Apart from saving changes to your laptop, you can/should also **commit** your changes.
+
+Commiting changes syncs the work you've done on your branch to the git server. So a commit is a set of files created of modified. If the branch doesn't exist on repository, it will be created and all your modifications and new files will be uploaded to the server. In that case you can work on your files on multiple machines, or other people can take over, help working on your branch.
 
 To commit your changes need to:
  - Make sure all files are saved
- - Stage all the files you've modified and want to commit to the server
- - Write a commit message (a short and very specific summary of what has been changed),
- - Hit commit button
+ - **Stage all** the files you've modified and want to commit to the server
+ - Write a **commit message** (a short and very specific summary of what has been changed)
+ - Hit **commit** button
 
+ ![](en/atom-commit.gif)
 
- Once the files are commited, it's time to "push" them to the server:
+ Once the files are commited, it's time to **push** (send) them to the server:
  - Open Push/Pull popup window
  - Press Push
 
+ ![](en/atom-push.gif)
+
+
 ## Merge request
 Once you think your work is finished and ready to be published on the website, it's time to merge it to the **master branch**.
 
@@ -100,17 +127,27 @@ Once you think your work is finished and ready to be published on the website, i
 
 ![](en/git-merge_request.gif)
 
-Once you've created a merge request, it will be reviewed by **Disroot** admins and, if it's all right, they can aprove your commit then. This means your changes will be merged with the master branch and therefor visible on the website. If there's any issue, admins could request you to correct something. Once all the corrections are made and the documentation meets the **Disroot** guidelines, your merge request will be pulled to the master.
+Once you've created a merge request, it will be reviewed by **Disroot** admins and, if it's all right, they can aprove your commit then. This means your changes will be merged with the master branch and therefore visible on the website.
+
+If there's any issue, admins could request you to correct something. Once all the corrections are made and the documentation meets the **Disroot** guidelines, your merge request will be pulled to the master.
 
 ## Pulling changes from the server
-If you want to keep the local **master** branch and your local branch up to date, you'll need to pull changes from the server.<br>
-Each time someones gets his merge request pulled in to the master, everyone should also pull the changes to their local branches. Then you can easily see what's new and what has changed recently. On the master branch we keep a file called "CHANGELOG" where we note all significant changes to Howtos.
+If you want to keep the local **master** branch and your local branch up to date, you'll need to pull changes from the server.
+
+Each time someones gets his merge request pulled in to the master, everyone should also pull the changes to their local branches. Then you can easily see what's new and what has changed recently. On the master branch we keep a file called **CHANGELOG** where we note all significant changes to Howtos.
 
 Pulling should be done on regular basis (specially before you start working on new branch).
 
  - Open Push/Pull popup window
  - Press **Pull**
 
+![](en/atom-pull.gif)
 
 ## Template to use for how-to's
 You can copy the content [here](en/template.txt) and create your how-to file.
+
+---
+
+ <center><a rel="license" href="http://creativecommons.org/licenses/by- sa/4.0/"><img alt="Creative Commons License" style="border-width:0" src="https://i.creativecommons.org/l/by-sa/4.0/88x31.png" /></a><br />This work is licensed under a <br><a rel="license" href="http://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International License</a>.</center>
+
+---