Update information about Gitlab

docs/03-editing.md

@@ -5,27 +5,31 @@
 
 ### **Logging in the Gitlab interface**
 
+Access to GitLab is provided through the Fablabs.io platform. An account will have been generated for you
+with your registered student email. The GitLab username/password fields will not work unless you specifically had access this way previously.
 
-
-Accounts are created with the registered student emails. 
-
-You will receive a notification from Gitlab with instructions to set your password.
+Click the "fablabs" button to login with Fablabs.io. If you forgot your password, run through the "forgot my password" flow on the Fablabs.io website and not the one on GitLab.
 
 ![](images/gitlab_login.jpg)
 
 
 ### **Using the Gitlab editor**
 
-Navigate to any page clicking the folders, always starting from the docs folder.
+Navigate to any page on your project, and at the top you will see either an "Edit" or "Web IDE" buttons.
+While the "Edit" button will only work on the file you are viewing, the "Web IDE" button will open up a special
+view where you can edit multiple files and upload files and then publish the changes by **commiting**
 
-Clicking on a page file for example index.md, will allow you to see a preview of its contents.
+![](images/gitlab_edit_buttons.png)
 
-Select the Edit button and go in edit mode for changing the content.
+After making changes, **remember** to click the *commit* button to start the process of publishing.
 
-Finally, save your page using the Commit button at the bottom of the page. You can/must add a comment to identify your change in the future.
+![](images/gitlab_webide_commitbutton.png)
+
+Then write short clear message of what changed, for example "Change text on home page" or "Changed screenshot of 3d design".
 
+Make sure to commit to the **master** branch, otherwise your changes will not be visible right away.
 
-![](images/gitlab_edit.png)
+![](images/gitlab_webide_masterbranch.png)
 
 
 
@@ -139,7 +143,7 @@ See the example below:
 
 ### Creating a new page
 
-You can add as many pages as you want to your website. You will discover that adding a new page in the main docs/ folder will link it to the main menu. While if 
+You can add as many pages as you want to your website. You will discover that adding a new page in the main docs/ folder will link it to the main menu. While if
 you create a folder and a page inside it, it will create a new menu.
 
 From a project’s files page, click the ‘+’ button to the right of the branch selector. Choose New file from the dropdown.
@@ -173,15 +177,15 @@ If you uploaded your image inside the docs/images folder:
 
 * From the index.md page, you will refer to the image as images/filename.jpg
 * From an assignments page you will refer to it as ../images/filename.jpg
-The ../ simply tells to look for images in the parent folder, we can repeat it to go in the parent’s parent folder, etc. i.e. ../../images/filename.jpg 
+The ../ simply tells to look for images in the parent folder, we can repeat it to go in the parent’s parent folder, etc. i.e. ../../images/filename.jpg
 
 ### Uploading and linking a file
 
 The ability to create a file is great when the content is text. However, this doesn’t work well for binary data such as images, PDFs or other file types. In this case you need to upload a file.
 
-From a project’s files page, click the ‘+’ button to the right of the branch selector. 
+From a project’s files page, click the ‘+’ button to the right of the branch selector.
 
-The process is exactly the same as an image. You can upload files in the _docs/files_ folder. 
+The process is exactly the same as an image. You can upload files in the _docs/files_ folder.
 
 ![](images/web_editor_upload_file_dropdown.png)