Merge pull request 'H2_USER_USSC' (#44) from H2_USER_USSC into master

pages/02.tutorials/01.User/01.Account/01.USSC/docs.en.md

@@ -17,75 +17,86 @@ page-toc:
 
 # User Self Service Center
 
-The **User Self Service Center** is the place where you can manage your **Disroot** account settings.
+The **User Self Service Center** is the place where you can manage your **Disroot** account settings, from changing the password to deleting it.
 
-Log in with your **Disroot** username and password.
+Go to [https://user.disroot.org](https://user.disroot.org) and log in with your **Disroot** username and password.
 
 ![](en/login.png)
 
-## Change your password
-![](en/change_pass.png)<br>
+Once you have logged in you will see the **dashboard**.
+
+![](en/dashboard.png)
+
+It is a quick access menu to the account settings and options.
+
+## 1. Change your password
 Click on this option to change your current password.
 
-Follow the password creation rules and enter the new one twice.
+![](en/change_pass.png)
 
-![](en/change_pass_02.png)<br>
+!! Please read carefully the instructions and rules for changing the password and the additional steps needed to update your **Cloud** encryption key.
 
-Once you've changed your password you will need to make sure to change your encryption key in the **Cloud**, since all your files in **Nextcloud** are encrypted with a key that is generated from your password.
+![](en/pass_change_01.png)
 
-1. Go to **[https://cloud.disroot.org](https://cloud.disroot.org)** and log in with your new password.
-You will see a message on top of the page:<br>
-
-![](en/invalid_pk.png)<br>
-    `Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files.`
-
-2. Click on your name in the top right corner and select **Personal** from the menu.
-
-3. Scroll down to **Basic Encryption Module** and type in your old password and your new password and click **Update Private Key Password**.
-
-![](en/bemodule.png)
-
-4. Log out of **Nextcloud** and log back in and that's it, you're all set and can view your file again.
-
-!! ![](en/note.png)**NOTE:**<br>
-!! **If you lose your password, you won't be able to retrieve your files on the cloud as they're encrypted, so even the server administrators can't see their content.**
+!! Please also note that once you've changed your password you will need to make sure to change your encryption key in the **Cloud**, since all your files in **Nextcloud** are encrypted with a key that is generated from your password.
 
 
-## Setup Security Questions
-![](en/security_qs.png)<br>
-In case you forget/lose your password, you can reset it without Admins intervention by seting up the security questions first.
+## 02. Setup your Security Questions
+In case you forget/lose your password, you can reset it without Admins intervention by setting the security questions first. To do it, click on this option.
 
-The proccess is pretty simple: click on ***Setup Security Questions***.
+![](en/security_qs.png)
 
-![](en/security_qs_02.png)<br>
-Write the first question and its answer, then select the next two questions from the drop-down list and write the answers as well.<br>
+The proccess is pretty simple.
 
-![](en/security_qs_03.png)<br>
-Once the answers meet the requirements, just click ***Save Answers***.
+- Click on ***Setup Security Questions***.
 
-![](en/security_qs_04.png)
+ ![](en/sec_qs_01.png)
 
-## Updating the Profile
-![](en/profile.png)<br>
-Whether it's to receive notifications or reset your password, you can add a secondary address to your profile. You can also modify your screen name (the name that will appear on the services screen)
+- Write the first question and its answer, then select the next two questions from the drop-down list and write the answers as well.
 
-![](en/profile_02.png)
+  ![](en/sec_qs_02.png)
 
-## Account information
-![](en/account.png)<br>
+- Once the answers meet the requirements, just click ***Save Answers***.
+
+  ![](en/sec_qs_03.png)
+
+## 03. Update your Profile
+Whether it's to receive notifications or reset your password, you can add a secondary address to your profile. You can also modify your screen name (the name that will appear on the services screens).
+
+![](en/profile.png)
+
+Complete/update the information.
+
+- **Screen Name**: this is the name you choose to identify yourself through different services that requieres **Disroot** credentials.
+- **Notification Email**: the email address where you will receive important information related to your account. From time to time, you may also receive informatio about us, such as services or improvements announcements or the **Disroot** annual report.
+- **Password Reset Email**: you can add/modify a secondary email address so that you can use it to reset your password in case you lose/forget it.
+
+ ![](en/profile_update.png)
+
+## 04. Custom Requests forms
+From here you can access the forms to request additional email alias, link your personal domain or extra storage for your mailbox or cloud.
+
+![](en/req_forms.png)
+
+Just click on the option you need.
+
+![](en/forms.png)
+
+## 05. Your Account information
 Here you can find a summary of the **account and password information**, **the password policy** (the rules that a password must comply with) and the **history** of the password management.
 
-![](en/account_02.png)
+![](en/account.png)
 
-![](en/account_03.png)
+![](en/account_01.png)
 
-![](en/account_04.png)
+## 06. Delete your account
+If for any reason you want to delete your account, just click this option.
 
-## Account Deletion
-![](en/deletion.png)<br>
-If for any reason you want to delete your account, just click this option. Once you're sure about deleting the account, check the **I Agree** box and finally **Delete**.
+![](en/deletion.png)
 
-![](en/deletion_02.png)
+Once you're sure about deleting the account, check the **I Agree** box and finally **Delete**.
 
-!! ![](en/note.png)**NOTE:**<br>
+![](en/delete.png)
+
+!! **NOTE:**<br>
 !! **This process is irreversible.**<br>Once confirmed, **you won't be able to log in** to your account or ask **to restore it** later. **All your remaining data will be deleted** within 48 hours, and **your current user name will not be available** when creating a new account.

pages/02.tutorials/01.User/01.Account/02.Alias-Request/docs.en.md

@@ -1,5 +1,5 @@
 ---
-title: 'How-to request an email alias'
+title: 'Email alias request'
 published: true
 indexed: true
 visible: true
@@ -15,18 +15,15 @@ page-toc:
     active: false
 ---
 
-# Requesting Email aliases
+# How to request email aliases
+The email aliases feature is offered as a "reward" for regular supporters. By regular supporters we think of those who contribute with, at least, the equivalent of one cup of coffee a month. In order for the 'reward' not becoming the only incentive to donate, we expect to see the donation made before we can enable this feature.
 
-Aliases are available for regular supporters. By regular supporters we mean those who "buy" us at least one cup of coffee a month.
+It is not that we are promoting coffee (which is, actually, a very handy symbol for [exploitation and inequality](http://www.foodispower.org/coffee/)). We thought that is a good way to let people measure themselves how much they can give.
 
-It's not that we are promoting coffee (which is, actually, a very handy symbol for [exploitation and inequality](http://www.foodispower.org/coffee/)). We thought that is a good way to let people measure themselves how much they can give.
-
-Please take time to consider your contribution.
-
-If you can 'buy' us one cup of **Rio De Janeiro** coffee a month that's OK, but If you can afford a *Double Decaf Soy Frappuccino With An Extra Shot And Cream* a month, then you can really help us keep the **Disroot** platform running and make sure it is available for free for other people with less means.
+**Please take time to consider your contribution.** If you can 'buy' us one cup of **Rio De Janeiro** coffee a month that's OK, but if you can afford a *Double Decaf Soy Frappuccino With An Extra Shot And Cream* a month, then you can really help us keep the **Disroot** platform running and make sure it is available for free for other people with less means.
 
 We found this [list](https://www.caffesociety.co.uk/blog/the-cheapest-cities-in-the-world-for-a-cup-of-coffee) of coffee cup prices around the world, it might not be very accurate, but it gives a good indication of the different fares.
 
-To request aliases you need to fill in this [form](https://disroot.org/forms/alias-request-form).
+So, **to request aliases** you need to fill in this [form](https://disroot.org/forms/alias-request-form).
 
-If you're looking for how to setup an email alias, then take a look at [here](/tutorials/email/alias)
+Now, if you're looking for **how to setup an email alias**, then take a look at [this tutorial](/tutorials/email/alias)

pages/02.tutorials/01.User/02.GDPR/01.Nextcloud/04.Files/docs.en.md

@@ -1,11 +1,11 @@
 ---
-title: Nextcloud: Files & Notes
+title: 'Export data: Nextcloud Files & Notes'
 published: true
 indexed: true
 updated:
-    last_modified: "July 2019"		
+    last_modified: "May 2020"		
     app: Nextcloud
-    app_version: 15
+    app_version: 18
 taxonomy:
     category:
         - docs
@@ -22,7 +22,7 @@ page-toc:
 
 You can download your files as easy as in case of any **Nextcloud** app.
 
-1. Login to [cloud](https://cloud.disroot.org)
+1. Login to your [cloud](https://cloud.disroot.org)
 
 2. Select **Files** app
 

pages/02.tutorials/01.User/docsparent.en.md

@@ -13,7 +13,5 @@ page-toc:
 ---
 
 # User
-
-In this section you can find  useful information about managing your account.
-
+In this section you can find useful information about managing your account.
 <br>