Merge pull request 'USER H2's Fixes and Update' (#78) from USER_H2_FIX into master

Reviewed-on: Disroot/Howto#78
Reviewed-by: meaz <meaz@no-reply@disroot.org>
Reviewed-by: muppeth <muppeth@no-reply@disroot.org>

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

@@ -0,0 +1,37 @@
+---
+title: 'Password reset'
+published: true
+indexed: true
+visible: true
+updated:
+taxonomy:
+    category:
+        - docs
+    tags:
+        - user
+        - account
+        - password
+page-toc:
+    active: false
+---
+
+#  Reseting your Password
+In order to reset your password, you must have previously
+
+- a. configured the [**security questions**](../../questions) and that, of course, you remember the answers;
+- b. entered a [**secondary email**](../../profile) (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.
+
+!! ##### If none of the above conditions apply to your case then it will not be possible to recover the password and the account may be considered lost.
+
+![](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**: 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.
+
+!! ##### Remember:
+!! ##### the account and its security is your responsibility, **we cannot reset your password** so please, take all the necessary measures to keep it safe and secure.

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

@@ -0,0 +1,64 @@
+---
+title: 'New account registration'
+published: true
+indexed: true
+visible: true
+updated:
+taxonomy:
+    category:
+        - docs
+    tags:
+        - user
+        - account
+        - registration
+page-toc:
+    active: false
+---
+
+# New Account 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.
+
+
+## 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)
+
+
+### 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.
+
+!! **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)
+
+
+### 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)
+
+Then enter your password twice, checking that it meets the password rules, and click the **Continue** button to finish.
+
+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/01.ussc/docs.en.md

@@ -24,76 +24,21 @@ Go to [https://user.disroot.org](https://user.disroot.org) and log in with your
 
 ![](en/login.png)
 
+## The dashboard
 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 which we will see in detail later on.
+It is a quick access menu to the account settings and options.
 
-##  Reseting your Password
-If for any reason, you have forgotten/lost your password, you can reset it through any of the methods described below.
+- [Change your password](../password)
+- [Setup your security questions](../questions)
+- [Update your profile](../profile)
+- [Request forms](../forms)
+- [Account information](../info)
+- [Delete your account](../delete)
 
-Go to [https://user.disroot.org](https://user.disroot.org) and select **Forgotten Password**.
+From the **User Self Service Center** page you can also:
 
-![](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.<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.
-
-!! #### 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.
-
-
-## 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)
-
-
-### 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.
-
-!! **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)
-
-
-### 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)
-
-Then enter your password twice, checking that it meets the password rules, and click the **Continue** button to finish.
-
-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.**
+- [Reset your password](pwd_reset)
+- [Register a new account](new_reg)

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

@@ -12,7 +12,7 @@ taxonomy:
         - account
         - management
 page-toc:
-    active: false
+    active: 
 ---
 
 # Change your password

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

@@ -12,7 +12,7 @@ taxonomy:
         - account
         - management
 page-toc:
-    active: true
+    active: 
 ---
 
 # Setup your Security Questions

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

@@ -12,7 +12,7 @@ taxonomy:
         - account
         - profile
 page-toc:
-    active: true
+    active: 
 ---
 
 # Update your Profile

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

@@ -12,7 +12,7 @@ taxonomy:
         - account
         - forms
 page-toc:
-    active: true
+    active: 
 ---
 
 # Custom Requests forms

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

@@ -12,7 +12,7 @@ taxonomy:
         - account
         - information
 page-toc:
-    active: true
+    active: 
 ---
 
 # Your Account information

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

@@ -12,7 +12,7 @@ taxonomy:
         - account
         - deletion
 page-toc:
-    active: true
+    active: 
 ---
 
 # Delete your account

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

@@ -15,16 +15,20 @@ page-toc:
     active: true
 ---
 
-# Manage your Disroot Account
+# [User Self-service Center](ussc)
+- Overview
+- [Password reset](ussc/pwd_reset)
+- [New account registration](ussc/new_reg)
 
-- [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)
-- [Account information](info)
-- [Delete your Account](delete)
+## [Change your password](password)
+Update your **Cloud** encryption key
+
+## [Setup your Security Questions](questions)
+
+## [Update your Profile](profile)
+
+## [Request forms](forms)
+
+## [Account information](info)
+
+## [Delete your Account](delete)

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

@@ -0,0 +1,24 @@
+---
+title: 'Account'
+updated:
+published: true
+visible: true
+indexed: 
+taxonomy:
+    category:
+        - docs
+    tags:
+        - user
+        - account
+        - administration
+page-toc:
+  active: false
+---
+
+# Account management
+
+## [Administration](administration)
+Change or reset passwords, modify notifications o reset emails, security questions, access forms, delete the account.
+
+## [Alias Request](alias-request)
+How to request email aliases, forms.