Merge branch 'master' into RC_revision_FIX

pages/02.tutorials/03.Email/03.Webmail/01.Roundcube/02.settings/docs.en.md

@@ -33,7 +33,4 @@ page-toc:
 
 ## [04. Responses](04.responses)
 ## [05. Filters](05.filters)
-## [06. Account details](06.account_details)
-## [07. Two Factor Authentication](07.2fa)
-  - Activate Two Factor Authentication
-  - Log in when Two Factor Authentication is activated
+## [06. Account details](06.account_details)

pages/02.tutorials/03.Email/03.Webmail/01.Roundcube/02.settings/docs.fr.md

@@ -39,7 +39,4 @@ page-toc:
 
 ## [04. réponses](04.responses)
 ## [05. Filtres](05.filters)
-## [06. Détails du compte](06.account_details)
-## [07. Authentification à deux facteurs](07.2fa)
-  - Activer l'authentification à deux facteurs
-  - Connectez-vous lorsque l'authentification à deux facteurs est activée.
+## [06. Détails du compte](06.account_details)

pages/02.tutorials/03.Email/03.Webmail/01.Roundcube/docs.en.md

@@ -43,9 +43,6 @@ page-toc:
   - [04. Responses](settings/responses)
   - [05. Filters](settings/filters)
   - [06. Account details](settings/account_details)
-  - [07. Two Factor Authentication](settings/2fa)
-    - Activate Two Factor Authentication
-    - Log in when Two Factor Authentication is activated
 
 ## [03. Email](email)
   - Composing an email

pages/02.tutorials/03.Email/03.Webmail/docs.de.md

@@ -1,17 +1,71 @@
 ---
-title: Webmail
+title: Disroot Webmail
+published: true
 visible: true
 indexed: true
-updated:
 taxonomy:
     category:
         - docs
     tags:
         - email
-        - webmail
-        - online
 page-toc:
-    active: false
+    active: true
 ---
 
-# Webmail (folgt demnächst)
+# Disroot Webmail
+
+A webmail, or web-based email, is an email service that can be accessed using the web browser. This means you don't need to install an email client software on your device. The main advantage of webmail over the use of a desktop email client is the ability to send and receive email anywhere from a web browser.
+
+**Disroot** webmail solution is powered by **Roundcube**.
+
+
+![](roundcube/rc_logo.png)
+
+# What is Roundcube?
+Roundcube is a free and open source webmail software that provides all the functionalities you would expect from an email client: full support for MIME and HTML messages, multiple sender identities, address book with groups and LDAP connectors, threaded message listing, spell checking, support for access control lists (ACL), import/export functions and support for PGP encryption among many other features.
+
+**[[Roundcube Site](https://roundcube.net/)] | [[Source code](https://github.com/roundcube/roundcubemail/)]**
+
+Through the following tutorial, we will learn how to use **Roundcube** and get to know its features.
+
+----
+
+# Table of Contents
+
+# [Migration Guide](migration)
+  - [Migration FAQ](migration/faq)
+  - [Backup/export and import your contacts](migration/backup)
+
+# [Roundcube](roundcube)
+## [01. Getting started](roundcube/getting_started)
+  - Overview
+  - Tasks and basic operations
+
+## [02. Settings](roundcube/settings)
+  - [01. Preferences](roundcube/settings/preferences)
+    - User interface
+    - Mailbox view
+    - Displaying messages
+    - Composing messages
+    - Contacts
+    - Special folders
+    - Server settings
+    - Deleting old messages
+    - Message highlights
+  - [02. Folders](roundcube/settings/folders)
+  - [03. Identities](roundcube/settings/identities)
+    - Default identity
+    - Add other identities / aliases
+    - Sending an email with another identity
+  - [04. Responses](roundcube/settings/responses)
+  - [05. Filters](roundcube/settings/filters)
+  - [06. Account details](roundcube/settings/account_details)
+
+## [03. Email](roundcube/email)
+  - Composing an email
+
+## [04. Contacts](roundcube/contacts)
+  - Contacts lists
+  - Importing contacts
+  - Address book
+  - Groups

pages/02.tutorials/03.Email/03.Webmail/docs.en.md

@@ -60,9 +60,6 @@ Through the following tutorial, we will learn how to use **Roundcube** and get t
   - [04. Responses](roundcube/settings/responses)
   - [05. Filters](roundcube/settings/filters)
   - [06. Account details](roundcube/settings/account_details)
-  - [07. Two Factor Authentication](roundcube/settings/2fa)
-    - Activate Two Factor Authentication
-    - Log in when Two Factor Authentication is activated
 
 ## [03. Email](roundcube/email)
   - Composing an email

pages/02.tutorials/03.Email/03.Webmail/docs.es.md

@@ -1,15 +1,71 @@
 ---
-title: Webmail
+title: Disroot Webmail
+published: true
 visible: true
 indexed: true
-updated:
 taxonomy:
     category:
         - docs
     tags:
         - email
 page-toc:
-    active: false
+    active: true
 ---
 
-# Webmail (Pronto)
+# Disroot Webmail
+
+A webmail, or web-based email, is an email service that can be accessed using the web browser. This means you don't need to install an email client software on your device. The main advantage of webmail over the use of a desktop email client is the ability to send and receive email anywhere from a web browser.
+
+**Disroot** webmail solution is powered by **Roundcube**.
+
+
+![](roundcube/rc_logo.png)
+
+# What is Roundcube?
+Roundcube is a free and open source webmail software that provides all the functionalities you would expect from an email client: full support for MIME and HTML messages, multiple sender identities, address book with groups and LDAP connectors, threaded message listing, spell checking, support for access control lists (ACL), import/export functions and support for PGP encryption among many other features.
+
+**[[Roundcube Site](https://roundcube.net/)] | [[Source code](https://github.com/roundcube/roundcubemail/)]**
+
+Through the following tutorial, we will learn how to use **Roundcube** and get to know its features.
+
+----
+
+# Table of Contents
+
+# [Migration Guide](migration)
+  - [Migration FAQ](migration/faq)
+  - [Backup/export and import your contacts](migration/backup)
+
+# [Roundcube](roundcube)
+## [01. Getting started](roundcube/getting_started)
+  - Overview
+  - Tasks and basic operations
+
+## [02. Settings](roundcube/settings)
+  - [01. Preferences](roundcube/settings/preferences)
+    - User interface
+    - Mailbox view
+    - Displaying messages
+    - Composing messages
+    - Contacts
+    - Special folders
+    - Server settings
+    - Deleting old messages
+    - Message highlights
+  - [02. Folders](roundcube/settings/folders)
+  - [03. Identities](roundcube/settings/identities)
+    - Default identity
+    - Add other identities / aliases
+    - Sending an email with another identity
+  - [04. Responses](roundcube/settings/responses)
+  - [05. Filters](roundcube/settings/filters)
+  - [06. Account details](roundcube/settings/account_details)
+
+## [03. Email](roundcube/email)
+  - Composing an email
+
+## [04. Contacts](roundcube/contacts)
+  - Contacts lists
+  - Importing contacts
+  - Address book
+  - Groups

pages/02.tutorials/03.Email/03.Webmail/docs.fr.md

@@ -57,9 +57,6 @@ Grâce au tutoriel suivant, nous allons apprendre à utiliser **Roundcube** et
   - 04. réponses](Roundcube/02.settings/04.responses)
   - 05. filtres](Roundcube/02.settings/05.filters)
   - 06. Détails du compte](Roundcube/02.settings/06.account_details)
-  - 07. authentification à deux facteurs](Roundcube/02.settings/07.2fa)
-    - Activer l'authentification à deux facteurs
-    - Se connecter lorsque l'authentification à deux facteurs est activée.
 
 ## [03. Courriel](Roundcube/03.email)
   - Composer un e-mail