Merge branch 'master' into mutt_howto

pages/02.tutorials/01.User/01.Account/01.Administration/01.ussc/docs.en.md

@@ -22,75 +22,78 @@ The **User Self Service Center** is the place where you can manage your **Disroo
 ## Signing in
 Go to [https://user.disroot.org](https://user.disroot.org) and log in with your **Disroot** username and password.
 
-![](../en/login.png)
+![](en/login.png)
 
 Once you have logged in you will see the **dashboard**.
 
-![](../en/dashboard.png)
+![](en/dashboard.png)
 
 It is a quick access menu to the account settings and options which we will see in detail later on.
 
 ##  Reseting your Password
 If for any reason, you have forgotten/lost your password, you can reset it through any of the methods described below.
 
-![](../en/reset.gif)
+Go to [https://user.disroot.org](https://user.disroot.org) and select **Forgotten Password**.
+
+![](en/reset.gif)
 
 1. Go to [https://user.disroot.org](https://user.disroot.org)
 2. Click on the "**Forgotten Password**" button
 3. Type your username and then **Search**
 4. Choose one of the methods
-  - **Secret Questions and Answers**: This method requires that you have previously configured the questions and that, of course, you  remember the answers. If you choose this option, you will be prompted with the questions. *Please, note that the answers are case sensitive*
+  - **Secret Questions and Answers**: This method requires that you have previously configured the questions and that, of course, you remember the answers. If you choose this option, you will be prompted with the questions.<br> *Please, note that the answers are case sensitive*
 
   - **SMS/Email Verification**: This option allows you to request the password reset via a secondary email. This email should have been entered during the registration or prior to this process, otherwise the code will be sent to the address of the same account you are trying to reset.
 
-!! ![](../en/note.png)<br>
-!! We cannot reset your password.<br>
-!! Remember that the account and its security is your responsibility so please, take all the necessary measures to keep it safe and secure.
+!! #### NOTICE<br>
+!! **We cannot reset your password. Remember that the account and its security is your responsibility so please, take all the necessary measures to keep it safe and secure.**
 
+----
 
 ## New User Registration
 Although the process is pretty simple, we will see it step by step.
 
-When registering an account, please keep the following in mind:
-
-- Use the same device you fill out the form to open the verification link (otherwise, registration could fail).
-- After 15 minutes the session expires and you will need to restart the process.
-- If you are using TOR or a VPN and your IP has changed during the process, it will be considered as a security attack and therefore your session could get blocked.
-
-!! It is important to note that account requests are reviwed manually on a daily basis and therefore approval may take up to 48 hours.
-
-### Step by step registration
-####  01: The User Name
-This will be the name of your account and email and cannot be modified after created it. Your account name will look like _username@disroot.org_
-
-![](../en/reg_01.png)
+!! **When registering an account, please keep the following in mind:**
+!! - Use the same device you fill out the form to open the verification link (otherwise, registration could fail).
+!! - After 15 minutes the session expires and you will need to restart the process.
+!! - If you are using TOR or a VPN and your IP has changed during the process, it will be considered as a security attack and therefore your session could get blocked.
 
 
-#### 02: The Screen Name
+## Step by step registration
+###  01: The User Name
+This will be the name of your account and email and cannot be modified after created it. Your account name will look like _**username@disroot.org**_
+
+![](en/reg_01.png)
+
+
+### 02: The Screen Name
 The screen name is the name that will be displayed in services that requires login, like **Cloud** or **Email**. Usually it is the same as your username, but you can choose anything you want.<br>
 For example, your username could be _username_ and your screen name _User Name_.
 
-![](../en/reg_02.png)
+![](en/reg_02.png)
 
 
-#### 03: The question
-The verification question is intended to check that you are human, not a spam bot, and to keep spammers as far away as possible.<br>**Please, remember that the answer should meet the following requirements**:
+### 03: The question
+The verification question is intended to check that you are human, not a spam bot, and to keep spammers as far away as possible.
 
-- It should be at least 150 characters long.
-- It must be the answer to the question, nothing more.
-- It cannot be a quote or a copy/paste from an external source.
-- It can be in any language, though we suggest you to use English.
-- It cannot contain specific or special characters from another language than English. This means you should avoid using accents or, for example, the letter ñ.
+!! **The answer should meet the following requirements**:
+!! - It should be at least 150 characters long.
+!! - It must be the answer to the question, nothing more.
+!! - It cannot be a quote or a copy/paste from an external source.
+!! - It can be in any language, though we suggest you to use English.
+!! - It cannot contain specific or special characters from another language than English. This means you should avoid using accents or, for example, the letter ñ.
 
-![](../en/reg_03.png)
+![](en/reg_03.png)
 
 
-#### 04: The verification email
+### 04: The verification email
 In order to complete the registration process, it is necessary to send you a verification code to a valid email. Also in this step, you can choose to use this same address for future password reset in case you need it. If you prefer not to do so, **remember to keep your password safe** as **this email address is removed from our database once the request is appoved/denied and we cannot reset it**.
 
-
-  ![](../en/reg_04.png)
+![](en/reg_04.png)
 
 Then enter your password twice, checking that it meets the password rules, and click the **Continue** button to finish.
 
-And that's it! \0/
+And that's it! **\0/**
+
+!! #### NOTICE<br>
+!! **Account requests are reviewed manually on a daily basis and therefore approval may take up to 48 hours.**

pages/02.tutorials/01.User/01.Account/01.Administration/02.password/docs.en.md

@@ -17,15 +17,41 @@ page-toc:
 
 # Change your password
 
-![](dashboard_pass.png)
+![](en/dashboard_pass.png)
 
-Click on this option to change your current password.
+#### Click on this option to change your current password.
 
 
-!! ![](../en/note.png)<br>
-!! Please read carefully the instructions and rules for changing the password and the additional steps needed to update your **Cloud** encryption key.
+!! #### NOTICE<br>
+!! **Please read carefully the instructions and rules for changing the password and the additional steps needed to update your Cloud encryption key.**
 
-![](../en/pass_change_01.png)
+![](en/pass_change.png)
 
-!! ![](../en/note.png)<br>
-!! 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.
+!! **Once you've changed your password you will also need to make sure to change your encryption key in the Nextcloud, since all your files in the Cloud are encrypted with a key that is generated from your password.**
+
+----
+
+# Updating your encryption keys in the Cloud
+
+1. Go to [https://cloud.disroot.org](https://cloud.disroot.org) and log in with your username and new password.
+
+  You will see this message at the top of the page:
+
+  ![](en/invalid_encrypt.png)
+
+2. Go to the menu at the top right and select **Settings**
+
+![](en/settings_menu.png)
+
+3. From the left panel select **Security** and then on the right panel scroll down to **Basic encryption module**
+
+  ![](en/invalid_encrypt_bem_pass.png)
+
+4. Enter your old password then the new one and finally click on the **Update Private Key Password** button
+
+  ![](en/invalid_encrypt_bem_pass_2.png)
+
+5. Log out of the **Cloud**, log back in and that's it. Now your all your data in the **Cloud** is encrypted with your new encryption keys.
+
+!! #### NOTICE<br>
+!! **Remember that if you lose your password, you will not be able to access your files in the cloud as they are encrypted, so even the server administrators cannot see their content.**

pages/02.tutorials/01.User/01.Account/01.Administration/03.questions/docs.en.md

@@ -17,7 +17,7 @@ page-toc:
 
 # Setup your Security Questions
 
-![](dashboard_questions.png)
+![](en/dashboard_questions.png)
 
 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.
 
@@ -25,12 +25,12 @@ The proccess is pretty simple.
 
 - Click on ***Setup Security Questions***.
 
- ![](../en/sec_qs_01.png)
+ ![](en/sec_qs_01.png)
 
 - 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/sec_qs_02.png)
+  ![](en/sec_qs_02.png)
 
-- Once the answers meet the requirements, just click ***Save Answers***.
+- Once the answers meet the requirements, just click **Save Answers** and finally **Continue**
 
-  ![](../en/sec_qs_03.png)
+  ![](en/sec_qs_03.png)

pages/02.tutorials/01.User/01.Account/01.Administration/04.profile/docs.en.md

@@ -10,19 +10,19 @@ taxonomy:
     tags:
         - user
         - account
-        - management
+        - profile
 page-toc:
-    active: false
+    active: true
 ---
 
 # Update your Profile
 Whether it's to receive notifications or reset your password, you can add a secondary email address to your profile. You can also modify your screen name (the name that will appear on the services screens).
 
-![](dashboard_profile.png)
+![](en/dashboard_profile.png)
 
 Complete/update the information.
 
-![](../en/profile_update.png)
+![](en/profile_update.png)
 
 - **Screen Name**: this is the name you choose to identify yourself through different services that requires **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 information about us, such as services or improvements announcements or the **Disroot** annual report.

pages/02.tutorials/01.User/01.Account/01.Administration/05.forms/docs.en.md

@@ -1,5 +1,5 @@
 ---
-title: 'Request Forms'
+title: 'Requests Forms'
 published: true
 indexed: true
 visible: true
@@ -10,16 +10,21 @@ taxonomy:
     tags:
         - user
         - account
-        - management
+        - forms
 page-toc:
-    active: flase
+    active: true
 ---
 
 # 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.
 
-![](dashboard_forms.png)
+![](en/dashboard_forms.png)
 
-Just click on the option you need.
+From here you can access the forms to request:
+- Additional email alias
+- Link your personal domain
+- Request extra storage for your mailbox, or...
+- Request extra storage for your **Cloud**.
 
-![](../en/forms.png)
+Just click on the option you need and the form will open for you to complete.
+
+![](en/forms.png)

pages/02.tutorials/01.User/01.Account/01.Administration/06.info/docs.en.md

@@ -10,14 +10,17 @@ taxonomy:
     tags:
         - user
         - account
-        - management
+        - information
 page-toc:
-    active: false
+    active: true
 ---
 
 # Your Account information
+
+![](en/dashboard_info.png)
+
 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.
 
-![](dashboard_info.png)
+![](en/account.png)
 
-![](../en/account_01.png)
+This section is merely informative.

pages/02.tutorials/01.User/01.Account/01.Administration/07.delete/docs.en.md

@@ -10,7 +10,7 @@ taxonomy:
     tags:
         - user
         - account
-        - management
+        - deletion
 page-toc:
     active: true
 ---
@@ -18,12 +18,12 @@ page-toc:
 # Delete your account
 If for any reason you want to delete your account, just click this option.
 
-![](dashboard_delete.png)
+![](en/dashboard_delete.png)
 
 Once you're sure about deleting the account, check the **I Agree** box and finally **Delete**.
 
-![](../en/delete.png)
+![](en/delete.png)
 
-!! ![](../en/note.png)<br>
-!! **This process is irreversible.** Once confirmed, **you won't be able to log in** to your account or ask **to restore it** later.<br>
-!! **All your remaining data will be deleted** within 48 hours, and **your current user name will not be available** when creating a new account.
+!! #### NOTICE<br>
+!! **This process is irreversible. Once confirmed, you won't be able to log in to your account or ask to restore it later.**<br>
+!! **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/01.Administration/docs.en.md

@@ -20,7 +20,9 @@ page-toc:
 - [User Self-service Center](ussc)
   - Signing in
   - Reseting your password
+  - New user registration
 - [Change your password](password)
+  - Update your **Cloud** encryption key
 - [Setup your Security Questions](questions)
 - [Update your Profile](profile)
 - [Request forms](forms)

pages/02.tutorials/01.User/01.Account/docsparent.de.md

@@ -1,21 +0,0 @@
----
-title: Account-Verwaltung
-published: true
-indexed: true
-visible: true
-updated:
-    last_modified: "July 2019"		
-taxonomy:
-    category:
-        - docs
-    tags:
-        - user
-page-toc:
-    active: false
----
-
-# Account-Verwaltung
-
-#### [Den eigenen Account verwalten](ussc/)
-
-#### [Email-Alias beantragen](alias-request)

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

@@ -1,20 +0,0 @@
----
-title: Account Administration
-published: true
-indexed: true
-visible: true
-updated:
-    last_modified: "June 2020"
-    app: User Self-Service Center
-published: true
-taxonomy:
-    category:
-        - docs
-    tags:
-        - user
-        - administration
-page-toc:
-    active: false
----
-
-# Account Administration

pages/02.tutorials/01.User/01.Account/docsparent.es.md

@@ -1,22 +0,0 @@
----
-title: Administración de la Cuenta
-published: true
-indexed: true
-visible: true
-updated:
-    last_modified: "Julio 2019"		
-taxonomy:
-    category:
-        - docs
-    tags:
-        - usuarix
-        - administración
-page-toc:
-    active: false
----
-
-# Administración de la Cuenta
-
-#### [Administrar tu cuenta de Disroot](ussc/)
-
-#### [Solicitar Alias de correo](alias-request/)

pages/02.tutorials/01.User/01.Account/docsparent.fr.md

@@ -1,22 +0,0 @@
----
-title: Gestion du Compte
-published: true
-indexed: true
-visible: true
-updated:
-    last_modified: "July 2019"		
-taxonomy:
-    category:
-        - docs
-    tags:
-        - user
-        - administration
-page-toc:
-    active: false
----
-
-# Gestion du Compte
-
-#### [Gérer votre compte Disroot](ussc/)
-
-#### [Demander un alias email](alias-request)

pages/02.tutorials/01.User/01.Account/docsparent.it.md

@@ -1,22 +0,0 @@
----
-title: Amministrazione dell'account
-published: true
-indexed: true
-visible: true
-updated:
-    last_modified: "July 2019"		
-taxonomy:
-    category:
-        - docs
-    tags:
-        - utente
-        - amministrazione
-page-toc:
-    active: false
----
-
-# Account Administration
-
-#### [Gestisci il tuo account Disroot](ussc/)
-
-#### [Richiedi un Alias email](alias-request)

pages/02.tutorials/01.User/02.GDPR/01.rainloop/docs.en.md

@@ -0,0 +1,74 @@
+---
+title: 'Email: Export'
+published: true
+indexed: true
+updated:
+    last_modified: "November 2020"		
+    app: RainLoop
+    app_version:
+taxonomy:
+    category:
+        - docs
+    tags:
+        - user
+        - email
+        - gdpr
+visible: true
+page-toc:
+    active: false
+---
+
+# Export your emails
+
+To export all your emails from **Disroot Webmail** our suggestion is to use an email client, like **Thunderbird**.
+
+## RainLoop
+**RainLoop** the software we currently use, does not allow this task to be done in a practical way: emails must be exported one by one.
+
+* Log in at **Disroot Webmail**.
+* Select the mail you want to export.
+* On the right, click on the reply icon.
+* A list of options will open, select the last one: **Download as .eml file**.
+* Finally, you will be asked what you would like to do with file, save it on your device.
+
+![](en/rl_export.gif)
+
+!! ##### **NOTICE**: You should repeat this proccess with every single email you want to export.
+
+----
+
+## Exporting emails from Thunderbird
+
+**Thunderbird** does not come with tools for exporting and importing mail natively. For this it is necessary to install an add-on.
+
+Both the add-on installation and the process of exporting the emails is quite simple.
+
+### Installing the ImportExportTools add-on
+
+* Run Thunderbird
+* Go to **Tools** at the Menu bar and select **Add-ons**
+* In the add-ons search field type _export tools_ and then press enter
+* Find **ImportExportTools NG**, a small **GPL** software that add import/export tools.
+* Click on **Add to Thunderbird**
+* After installing and giving the necessary permissions for the add-on, you are now ready to back up all your emails.
+
+![](en/export.mp4?resize=1024,576&loop)
+
+This add-on adds a new menu item in the **Tools** and the context menues.
+
+### Exporting your emails
+In **Thunderbird**, select a folder o directory you want to back up and right click.
+The import/export tool submenu displays a number of actions which you can peform to import or export various types of information into and out of **Thunderbird**.
+
+You can export:
+  * Individual folders and/or all folder messages (EML, HTML, PDF, CSV or plaintext)
+  * Export as individual files or a single file
+  * Export indexes as plain text or CSV
+  * Export messages from search dialog
+  * Export complete profiles or just the emails files
+
+And import:
+  * Mailbox files (Mbox files including the structures)
+  * Profiles
+  * EML and EMLX files
+  * Individual or all directory files

pages/02.tutorials/01.User/02.GDPR/01.roundcube/docs.en.md

@@ -1,34 +0,0 @@
----
-title: 'Email: Export'
-published: true
-indexed: true
-updated:
-    last_modified: "June 2020"		
-    app: Roundcube
-    app_version:
-taxonomy:
-    category:
-        - docs
-    tags:
-        - user
-        - email
-        - gdpr
-visible: true
-page-toc:
-    active: false
----
-
-# Export your emails
-
-Exporting your emails from **Disroot Webmail** is pretty easy.
-
-**Roundcube** saves the messages as singles **eml** files. **EML** is an email file format which is supported by most modern email clients.
-
-First, go to the folder where the emails you want to export/save are. You can download one, several messages or the whole folder.
-
-- Select the messages through the **Select** action
-- In the preview pane at the top bar, select **More** and then **Download**
-- Choose the format in which you prefer to download the data (individual messages can be downloaded in .eml format and folders or sets of messages can be downloaded in .zip format)
-- Choose where to save the file.
-
-![Export](en/export.gif)

pages/02.tutorials/01.User/02.GDPR/03.converse/docs.en.md

@@ -1,19 +0,0 @@
----
-title: "XMPP Chat"
-published: true
-indexed: true
-updated:
-    last_modified: "June 2020"		
-    app: Converse
-    app_version:
-taxonomy:
-    category:
-        - docs
-    tags:
-        - user
-        - chat
-        - gdpr
-visible: true
-page-toc:
-    active: false
----

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

@@ -1,39 +0,0 @@
----
-title: "Diaspora*: Requesting your data"
-published: true
-indexed: true
-updated:
-    last_modified: "July 2019"		
-    app: Diaspora*
-    app_version: 0.7
-taxonomy:
-    category:
-        - docs
-    tags:
-        - user
-        - diaspora
-        - gdpr
-visible: true
-page-toc:
-    active: false
----
-
-Obtaining data you provided to **Diaspora*** is fully automated and can be done at any time. All you need to do is:
-
-1. Login to Diaspora* at [https://pod.disroot.org](https://pod.disroot.org)
-
-2. Go to account settings:
-
-![](en/settings.gif)
-
-3. Once on settings page, scroll all the way down and choose what data you want to request. you can either obtain all your posts or images you've uploaded.
-
-![](en/request.gif)
-
-Once you hit any of the request buttons, you'll need to wait few moments (depending on the size of your account) until the request is processed and you are ready to download your data
-
-![](en/wait-request.png)
-
-4. Once the data is ready to be downloaded you can do so by clicking "Download" button back at the bottom of settings.
-
-![](en/data-download.png)

pages/02.tutorials/01.User/02.GDPR/04.diaspora/docs.es.md

@@ -1,39 +0,0 @@
----
-title: "Diaspora*: Solicitar tus datos"
-published: true
-indexed: true
-updated:
-    last_modified: "Julio 2019"		
-    app: Diaspora*
-    app_version: 0.7
-taxonomy:
-    category:
-        - docs
-    tags:
-        - usuario
-        - diaspora
-        - rgpd
-visible: true
-page-toc:
-    active: false
----
-
-Obtener la información que proporcionaste a **Diaspora*** es completamente automatizado y puede hacerse en cualquier momento. Todo lo que necesitas hacer es:
-
-1. Iniciar sesión en Diaspora* en [https://pod.disroot.org](https://pod.disroot.org)
-
-2. Ve a las configuraciones de la cuenta:
-
-![](es/settings.gif)
-
-3. Una vez que estés en la página de las configuraciones, desplázate hacia el final y selecciona qué información quieres solicitar. Puedes obtener todas tus publicaciones o imágenes que hayas subido.
-
-![](es/request.png)
-
-Luego de haber clickeado cualquiera de las botones de solicitud, necesitarás esperar unos momentos (dependiendo del tamaño de tu cuenta) hasta que el requerimiento haya sido procesado y estarás listo para descargar tus datos.
-
-![](es/wait-request.png)
-
-4. Una vez que la información esté lista para descargar, puedes hacerlo clickeando el botón "Descargar" en el final de la página de configuraciones.
-
-![](es/data-download.png)

pages/02.tutorials/01.User/02.GDPR/04.diaspora/docs.fr.md

@@ -1,39 +0,0 @@
----
-title: "Diaspora*: Faire la demande pour vos données de Profil / Photos"
-published: true
-indexed: true
-updated:
-    last_modified: "July 2019"		
-    app: Diaspora*
-    app_version: 0.7
-taxonomy:
-    category:
-        - docs
-    tags:
-        - user
-        - diaspora
-        - gdpr
-visible: true
-page-toc:
-    active: false
----
-
-Obtenir vos données de profil fournies à **Diaspora** est entièrement automatisé et peut être fait n'importe quand. Tout ce que vous ayez à faire est :
-
-1. Connectez-vous à diaspora [https://pod.disroot.org](https://pod.disroot.org)
-
-2. Aller dans vos paramètres de compte:
-
-![](fr/settings.gif)
-
-3. Une fois dans les paramètres, allez tout en bas et choisissez quelles données vous voulez récupérer, les données de profil, ou les photos que vous avez uploadées.
-
-![](fr/request.gif)
-
-Une fois que l'un de ces boutons a été cliqué, vous devez attendre quelques instants pour que la requête soit traitée (le temps dépend de la taille de votre compte.
-
-![](fr/wait-request.png)
-
-4. Une fois les données prêtes au téléchargement, vous pouvez les obtenir en cliquant sur le lien.
-
-![](fr/data-download.png)