Fixes on User + Cloud + Projects + Contribute pages

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

@@ -10,7 +10,7 @@ taxonomy:
 
 Aliases are available for regular supporters. By regular supporters we mean those who "buy" us at least one cup of coffee a month.
 
-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.
+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.
 

pages/03.Cloud/01.Introduction/docs.en.md

@@ -1,5 +1,5 @@
 ---
-title: 'Cloud: Nextcloud How-to'
+title: 'Cloud: Nextcloud Introduction'
 published: true
 visible: true
 taxonomy:

pages/03.Cloud/03.Apps/01.Tasks/03.Mobile/docs.en.md

@@ -11,4 +11,6 @@ page-toc:
 
 To set up and sync your **Tasks** throught a mobile client see the tutorial below:
 
-- [Android: Nextcloud app](/cloud/clients/mobile/android/calendars-contacts-and-tasks)
+### Android
+- [DAVx⁵ / OpenTasks](/cloud/clients/mobile/android/calendars-contacts-and-tasks)
+- [Nextcloud mobile app](/cloud/clients/mobile/android/nextcloud-app)

pages/03.Cloud/03.Apps/02.Calendar/02.Desktop/01.thunderbird-calendar-contacts/docs.en.md

@@ -9,74 +9,76 @@ taxonomy:
         - docs
 ---
 
-The contact and calendar features in Disroot/Nexcloud are pretty cool but if you have your Disroot email connected to an email client like Thunderbird it's nice to have the contacts and calendars from Disroot integrated with Thunderbird as well and access them from one place on your desktop.
+The main goal of having your contacts and calendars from **Disroot** integrated with **Thunderbird** through your email account is the chance to access them from one place on your desktop.
 
 ---------
 
+# First step: Installing needed add-ons
 
-# Installing Needed Add-ons
+In order to sync all your calendars and contacts on **Thunderbird**, you will need to install the following add-on:
 
-In order to sync all your calendars, you will need to install those Add-ons:
-
-* **Lightning** - a calendar for Thunderbird
-
-**Note!** Even if you just want to sync your contacts you will still need the lightning add-on. So says the Nextcloud manual [here](https://docs.nextcloud.com/server/9.0/user_manual/pim/sync_thunderbird.html)
+* **Lightning:** a calendar for **Thunderbird**
 
 ## Installing Lightning
 
-In Thunderbird go to > tools > Add-ons
+In **Thunderbird** go to > tools > Add-ons
+
 ![](en/thunderbird_1.png)
-In the Add-ons page on the upper right corner you will find a search bar. Just search for "Lightning". Once thunderbird finds it for you, press install.
+
+In the Add-ons page on the upper right corner you will find a search bar. Just search for "Lightning". Once **Thunderbird** finds it for you, press install.
 
 ![](en/thunderbird_2.png)
 
-You will need to restart Thunderbird in order to finish the installation of both Add-ons
+You will need to restart **Thunderbird** in order to finish the installation.
 
 # Integrating calendar with Thunderbird
 
-First login to your [Disroot cloud](https://cloud.disroot.org) and go to calendar app. Select options of the calendar you want to sync to thunderbird.
-Now, copy the link URL of your calendar. You will need it to sync with thunderbird.
+First login to your [Disroot cloud](https://cloud.disroot.org) and go to Calendar app. Select options of the calendar you want to sync to **Thunderbird**.
+Now, copy the link URL of your calendar. You will need it to sync with **Thunderbird**.
 
  ![](en/thunderbird_6.png)
 
-Now in Thunderbird. Either go to: File > New > Calendar or go directly to Calendar window and select *"New calendar"* by right clicking on the calendar list.
+In **Thunderbird** you can either go to: *File > New > Calendar* or go directly to Calendar window and select *"New calendar"* by right clicking on the calendar list.
 
 ![](en/thunderbird_7.png)
 
 Now configure your calendar to sync:
-1- select the option **CalDAV**
-2 - In the location field, paste the link of your Disroot Calendar that you copied earlier
-3 - Select offline support, if you want to keep a local copy of you calendar, in case you need to work offline
-4 - Press next
+1. Select the option **CalDAV**
+2. In the location field, paste the link of your **Disroot** Calendar that you copied earlier
+3. Select *Offline support*, if you want to keep a local copy of you calendar, in case you need to work offline
+4. Press *Next*
+
 ![](en/thunderbird_8.png)
 
-Give your calendar a name and assign a color.
-Then press next.
+Give your calendar a name and assign it a color if you want.<br>
+Then press *Next*.
 
 ![](en/thunderbird_9.png)
 
-Then press finish.
-Your calendar is now synced with Thunderbird. Any event created in thunderbird will apear on disroot cloud and vice versa.
+And then, finlly press *Finish*.
+
+Your calendar is now synced with **Thunderbird**. Any event created in **Thunderbird** will apear on **Disroot** cloud and vice versa.
 
 ![](en/thunderbird_10.png)
 
-**Note!**
-If you have multiple calendars in your Disroot account, just repeat this process for each calendar. You can use a different color to each calendar to set them apart. This method works for any nextcloud/owncloud provider out there.
-Additionally you can sync any calendars form any provider as long as they support caldav protocol (check with your provider for more details)
+|![](en/note.png) **Note**|
+|:--:|
+|If you have multiple calendars in your **Disroot** account, just repeat this process for each calendar.<br> You can use a different color to each calendar to set them apart. This method works for any **Nextcloud**/**ownCloud** provider out there.<br>Additionally you can sync any calendars form any provider as long as they support caldav protocol (check with your provider for more details)|
+
 
 ![](en/thunderbird_11.png)
 
 ## Adding events with multiple calendars
-If you have multiple calendars in Thunderbird, when creating an event you need to to select to which calendar it goes to, otherwise you maybe end up looking for it online in the wrong place
+If you have multiple calendars in **Thunderbird**, when creating an event you need to select to which calendar it goes to, otherwise you maybe end up looking for it online in the wrong place.
 
 ![](en/thunderbird_12.png)
 
-If you right click the calendars in Thunderbird you will have a set of options, from:
+If you right click the calendars in **Thunderbird** you will have a set of options, from:
 
 * Show or hide a Calendar
 * Export Calendar
-* Unsubscribe Calendar (remove it from Thunderbird)
-* Making it read only (in Thunderbird)
+* Unsubscribe Calendar (remove it from **Thunderbird**)
+* Making it read only (in **Thunderbird**)
 * Synchronize Calendar  
 
 ![](en/thunderbird_13.png)

pages/03.Cloud/03.Apps/02.Calendar/02.Desktop/02.calcurse-caldav/docs.en.md

@@ -12,17 +12,20 @@ taxonomy:
 |:--:|
 |calcurse is "a calendar and scheduling application for the command line", quoting [its website](http://calcurse.org/).|
 
-This tutorial shows you how to set up synchronization between your Nextcloud calendar and calcurse.
+In this tutorial we'll see how to set up synchronization between **Nextcloud** calendar and **calcurse**.
+
+|![](en/note.png) **Note**|
+|:--:|
+|The following procedure has been tested on **GNU/Linux** with the **Nextcloud** instance hosted on **Disroot**, although it should work on other **Unix**-like OS's with other **Nextcloud** instances, too.|
 
-Note: the following has been tested on GNU/Linux with the Nextcloud instance hosted on Disroot, although it should work on other Unix-like OS's with other Nextcloud instances, too.
 
 ## Before we start
 
-According to the website of the project, CalDAV support is currently experimental. For this reason, making backups, especially *before* the initial setup, is highly recommended.
+According to the project's website, **CalDAV** support is currently experimental. For this reason, making backups, especially *before* the initial setup, is highly recommended.
 
-For more information on how to back up (i.e. download a local copy of) your calendar, look at [this section](https://howto.disroot.org/en/nextcloud/apps/calendar#delete-edit-download-calendar) in the howto on the Nextcloud Calendar app.
+For more information on how to back up *(i.e. download a local copy of)* your calendar, look at [this section](/cloud/apps/calendar/web#delete-edit-download-calendar) of the **Nextcloud** Calendar app how-to.
 
-Also, if you've already used calcurse locally, you may want to back up the content of the configuration files and database(s) of calcurse as well, typically located at `~/.calcurse/caldav/` (where `~` is your home directory).
+Also, if you've already used **calcurse** locally, you may want to back up the content of the configuration files and database(s) of **calcurse** as well, typically located at `~/.calcurse/caldav/` (where `~` is your home directory).
 
 ## Create a configuration file
 
@@ -49,7 +52,7 @@ Hostname = some.hostname.com
 Path = /path/to/calendar/on/the/server/
 ```
 
-Replace the host name with `cloud.disroot.org` and the path with `remote.php/dav/calendars/username/calendar-id/`. You can find out what the exact path is by logging into your Nextcloud account, opening the calendar app, and, on the left sidebar, clicking on the three dots next to the calendar name and then "Link". Now, you should be able to see and copy a hyperlink that looks like `https://cloud.disroot.org/remote.php/dav/calendars/username/calendar-id/`.
+Replace the host name with `cloud.disroot.org` and the path with `remote.php/dav/calendars/username/calendar-id/`. You can find out what the exact path is by logging into your **Nextcloud** account, opening the calendar app, and, on the left sidebar, clicking on the three dots next to the calendar name and then "Link". Now, you should be able to see and copy a hyperlink that looks like `https://cloud.disroot.org/remote.php/dav/calendars/username/calendar-id/`.
 
 ![Screenshot of the popup menu that appears after clicking on the three dots](en/nextcloud-cal-link.png)
 
@@ -97,8 +100,8 @@ For syncing for the first time, you need to issue the command `calcurse-caldav`
 --init=two-way     # Copy local objects to the CalDAV server and vice versa
 ```
 
-In other words, if, for instance, you want to import your calendar from Nextcloud to calcurse *without* making any changes on Nextcloud for the first time, use `calcurse-caldav --init=keep-remote`.
+In other words, if, for instance, you want to import your calendar from **Nextcloud** to calcurse *without* making any changes on **Nextcloud** for the first time, use `calcurse-caldav --init=keep-remote`.
 
 If there are no error messages, go back to your `config` file and change the value of `DryRun` to `No`, and run the above command again. For any subsequent sync requests, `calcurse-caldav` (optionally with the `CALCURSE_CALDAV_PASSWORD` variable, as mentioned earlier) will be enough.
 
-And that's it! If everything went well, you should have synchronization set up between your Nextcloud calendar and calcurse through CalDAV.
+And that's it! If everything went well, you should have synchronization set up between your **Nextcloud** calendar and **calcurse** through **CalDAV**.

pages/03.Cloud/03.Apps/02.Calendar/03.Mobile/docs.en.md

@@ -11,63 +11,6 @@ page-toc:
 
 **Disroot** has the Calendar app enabled.
 
-To setup and use your **Disroot** calendar on your **Android** device you'll need to install the **DAVx⁵** and **OpenTasks** apps first.
+To setup and use **Disroot** calendars on your device, check the following tutorial:
 
-**OpenTasks** needs **DAVx⁵** installed to work, but if you just want to sync your Calendar or Contacts then you don't need to have **Tasks** installed.
-
-
-----------
-# Install DAVx⁵
-## From appstore
-**DAVx⁵** is available on most app stores. We encourage you to use [F-Droid](https://f-droid.org/).
-
-
-## From Nextcloud App
-If you have the **Nextcloud** mobile app installed and linked to your **Disroot** cloud, you can install it from there:
- - Open **Nextcloud** Android App
- - Got to settings > **"Sync calendar and contacts"**
-
- **Nextcloud** App will now fetch, install and configure your account *automagically*.
-
- ---------------
-
-## Add your Disroot account to DAVx⁵
-
-If you haven't install **DAVx⁵** via **Nextcloud** App you will have to manually setup an account.
-To do it, open the "**DAVx⁵ app**" and press the *"plus"* (**+**) button.
-
-![](en/nextcloud_davdroid1.jpeg)
-
-
-Select "Login with url and username", and put server address and credentials.
-
-> **Server address:** https://cloud.disroot.org<br>
-> **Username:** your **Disroot** username<br>
-> **Password:** your **Disroot** password
-
-
-![](en/nextcloud_davdroid2.jpeg)
-
-After setup your account, you'll need to select which calendars and addressbooks you want to sync from **Disroot** to your **Android** device.
-
-Press the big orange button with the account name.
-
-![](en/nextcloud_davdroid3.jpeg)
-
-![](en/nextcloud_davdroid4.jpeg)
--------------------
-
-# Calendar
-If you already have **DAVx⁵** installed on your device then your Calendars from **Disroot** will be synced and will appear in the Calendar app of choice. Any event added on the phone will be automatically synced to **Disroot** and vice versa.
-
-Make sure your **Disroot** calendar is the only one selected (at least if you exclusively want to use **Disroot** calendar) or you will probably syncing with **Google** calendar.
-
-![](en/select-calendar1.gif)
-
-If you want to use multiple calendars, don't forget to select the calendar you want to use every time you want to add an item.
-
-![](en/select-calendar2.gif)
-
-After that, the calendars in your **Disroot** account that you selected will be synced and visible in your **Android** device calendar.
-
----------------------
+### [Nexctcloud: Mobile Clients](/cloud/clients/mobile)

pages/03.Cloud/03.Apps/03.Contacts/01.Web/docs.en.md

@@ -10,7 +10,7 @@ page-toc:
 ---
 
 # Contacts
-You can access the contacts app by pressing the contacts icon ![](en/contacts_top_icon.png?resize=20,20) on the top bar, in **Nextcloud**.
+You can access the app by pressing the contacts icon ![](en/contacts_top_icon.png?resize=20,20) on the top bar, in **Nextcloud**.
 
 ----------------------
 ## Create a contact

pages/03.Cloud/03.Apps/03.Contacts/02.Desktop/docs.en.md

@@ -8,7 +8,7 @@ taxonomy:
 page-toc:
     active: false
 ---
-You can read the tutorials below in order to get your **Contacts** syncronized throught a multiplatform desktop client.
+You can read the tutorials below in order to get your **Contacts** syncronized through a multiplatform desktop client.
 
 - [Thunderbird: Calendar / Contacts / Tasks sync](/cloud/clients/desktop/multiplatform/thunderbird-calendar-contacts)
 

pages/03.Cloud/03.Apps/03.Contacts/03.Mobile/docs.en.md

@@ -9,65 +9,8 @@ page-toc:
     active: false
 ---
 
-**Disroot** has Contacts app enabled.
+**Disroot** has the Contacts app enabled.
 
-In this tutorial we'll see how to setup and use your **Disroot** Contacts on your **Android** device.
+To setup and use **Disroot** contacts on your device, check the following tutorial:
 
-To setup it up and sync your contacts on an **Android** device you'll need to install the **DAVx⁵** and **Tasks** apps first.
-
-**Tasks** needs **DAVx⁵** installed to work, but if you just want to sync your Calendar or Contacts then you don't need to have **Tasks** installed.
-
-
-----------
-# Install DAVx⁵
-## From appstore
-**DAVx⁵** is available on most app stores. We encourage you to use [F-Droid](https://f-droid.org/).
-
-
-## From Nextcloud App
-If you have the **Nextcloud** mobile app installed and linked to your **Disroot** cloud, you can install it from there:
- - Open **Nextcloud** Android App
- - Got to settings > **"Sync calendar and contacts"**
-
- **Nextcloud** App will now fetch, install and configure your account *automagically*.
- ---------------
-
- ## Add your Disroot account to DAVx⁵
-
- If you haven't install **DAVx⁵** via **Nextcloud** App you will have to manually setup an account.
- To do it, open the "**DAVx⁵ app**" and press the *"plus"* (**+**) button.
-
- ![](en/nextcloud_davdroid1.jpeg)
-
-
- Select "Login with url and username", and put server address and credentials.
-
- > **Server address:** https://cloud.disroot.org<br>
- > **Username:** your **Disroot** username<br>
- > **Password:** your **Disroot** password
-
-
- ![](en/nextcloud_davdroid2.jpeg)
-
- After setup your account, you'll need to select which calendars and addressbooks you want to sync from **Disroot** to your **Android** device.
-
- Press the big orange button with the account name.
-
- ![](en/nextcloud_davdroid3.jpeg)
-
- ![](en/nextcloud_davdroid4.jpeg)
--------------------
-# Contacts
-Your Contacts should be available and synced with **Disroot** once you'd set your account up.
-
-If you use multiple accounts, make sure selecting the account you want to save your contacts to when adding one.
-
-If you want to use **Disroot** only, make sure disabling the other accounts. If you don't want to disable the other accounts but just to display **Disroot** contacts only, you can select your **Disroot** account on the "Contacts to display" option.
-
-![](en/contacts_to_display.gif)  
-
-|![](en/note.png) **Note**|
-|:--:|
-|If you want to migrate your **Android** contacts to your **Disroot** contacts and stop syncing with **Google**, then follow [this tutorial](/cloud/clients/mobile/android/migrating-contacts-from-google).
-
----------------------
+### [Nexctcloud: Mobile Clients](/cloud/clients/mobile)

pages/03.Cloud/03.Apps/05.News/01.Web/docs.en.md

@@ -9,14 +9,12 @@ page-toc:
   active: true
 ---
 
-**News** app is a pretty handy tool to keep track of the articles and posts of all the websites you like following in one place. **Disroot** cloud provides an app that does the job for you and syncs it to all your devices. In this tutorial we'll try to cover the basic usage.
+**News** app is a tool to keep track of the articles and posts of all the websites you like following in one place. **Disroot** cloud provides an app that does the job for you and syncs it to all your devices. In this tutorial we'll try to cover the basic usage.
 
 ----------
 # News App on Disroot
 
-To get into the app from web browser, just click news app icon ![](en/news_top_icon.png?resize=20,20) in the top bar. General idea behind the app is very simple. You add RSS-feed of your favorite sites, get notification on new articles, and read then without the need to go to all those websites, by opening lots of tabs and get distracted half way.
-
-So let's get things rolling:
+To get into the app from web browser, just click news app icon ![](en/news_top_icon.png?resize=20,20) in the top bar. General idea behind the app is very simple: you add the RSS-feed of your favorite sites, get notifications on new articles and read them without the need to go to all those websites, by opening lots of tabs and get distracted half way.
 
 ## Add new feeds
 Most of the websites provide [RSS](https://en.wikipedia.org/wiki/RSS) or Atom feeds. Once you have the RSS link ready, you can copy it and add it to your news app.

pages/03.Cloud/03.Apps/05.News/02.Desktop/docs.en.md

@@ -9,4 +9,13 @@ page-toc:
     active: false
 ---
 
-## News
+## Desktop clients and applications
+
+#### Multiplatform News clients
+
+#### GNU/Linux News clients
+----
+
+### Related How-to's
+#### [GNOME: Desktop Integration](/cloud/clients/desktop/gnu-linux/gnome-desktop-integration)
+#### [KDE: Desktop Integration](/cloud/clients/desktop/gnu-linux/kde-desktop-integration)

pages/03.Cloud/03.Apps/08.Keep_sweep/docs.en.md

@@ -10,3 +10,4 @@ page-toc:
 ---
 
 ## Keep or Sweep
+The purpose of this app is to help you clean wasted or unused files from your data. It ramdomly displays elements of your data at a time and you decide whether to ✅ keep or ❌ sweep it.

pages/03.Cloud/04.Clients/02.Mobile/01.Android/02.calendars-contacts-and-tasks/docs.en.md

@@ -1,5 +1,5 @@
 ---
-title: Mobile clients: Calendars, Contacts and Tasks
+title: Mobile clients: DAVx⁵ / OpenTasks
 visible: true
 page-toc:
   active: true
@@ -9,10 +9,12 @@ taxonomy:
         - docs
 ---
 
-**Disroot** has calendar, contacts and tasks apps enabled.
+**Disroot** has Calendar, Contacts and Tasks apps enabled.
+
+In this tutorial we'll see how to setup and use them on your **Android** device.
 
-In this tutorial we'll see how to setup and use **Disroot** Calendar, Contacts and Tasks on your **Android** device.
 To do this you will need to install the **DAVx⁵** and **Open Tasks** apps.
+
 For **Open Tasks** to work it will need **DAVx⁵** to also be installed, but if you just want to sync your calendar or contacts you don't need to install **Open Tasks**.
 
 

pages/06.Projects_Office/docs.en.md

@@ -24,4 +24,4 @@ Here's a bunch of collaborative web tools you may want to give them a try.
 ### File Sharing: [Upload](lufi)
 
 ### [**DisApp**](disapp)
-- The Disroot app that gather all this tools and other Disroot services
+- The **Disroot** app that gather all this tools and other **Disroot** services

pages/08.Contribute/00.ways2contribute/docs.en.md

@@ -7,11 +7,24 @@ taxonomy:
 page-toc:
     active: false
 ---
+Here are some ways you can chose:
 
-|[GIT](/contribute/git/how-to-use-git)|[PAD](/contribute/pad)|[EMAIL](/contribute/email)|[FORUM](/contribute/forum)|[XMPP](/contribute/xmpp)|
-|:--:|:--:|:--:|:--:|:--:|
-|You can work offline, writing a how-to or improving an existing one, and then "push" the changes through Git.<br><br>**Technical level required**: very basic.|You can work on an online collaborative text file, writing or modifying a how-to, then communicating with Disroot HowTo team.<br><br>**Technical level required**: none.|You can write or modify a how-to the way you want, and send us an email with the finished work. If you have suggestions or feedback on the H2s you could also communicate with us by this mean. <br><br>**Technical level required**: basic.|Through the forum you can upload, write or share a how-to and also make suggestions, give us feedback, etc. <br><br>**Technical level required**: very basic.|You can communicate with us at our Disroot HowTo's XMPP Room.<br><br>**Technical level required**: very basic.|
+#### [GIT](/contribute/git/how-to-use-git)
+You can work offline, writing a how-to or improving an existing one, and then "push" the changes through Git.<br><br>**Technical level required**: Basic.
 
-|[Disroot's How-To style guide](/contribute/styleguide)|
-|:--:|
-|Some basic guidelines about the content and style criteria for the how-to's|
+#### [PAD](/contribute/pad)
+You can work on an online collaborative text file, writing or modifying a how-to, then communicating with Disroot HowTo team.<br><br>**Technical level required**: None.
+
+#### [EMAIL](/contribute/email)
+You can write or modify a how-to the way you want, and send us an email with the finished work. If you have suggestions or feedback on the H2s you could also communicate with us by this mean. <br><br>**Technical level required**: Basic.
+
+#### [FORUM](/contribute/forum)
+Through the forum you can upload, write or share a how-to and also make suggestions, give us feedback, etc. <br><br>**Technical level required**: Basic.
+
+#### [XMPP](/contribute/xmpp)
+You can communicate with us at our **Disroot** How-To's XMPP Room.<br><br>**Technical level required**: very basic.
+
+----
+
+### [Disroot's How-To style guide](/contribute/styleguide)
+Some basic guidelines about the content and style criteria for the how-to's.

pages/08.Contribute/01.git/docs.en.md

@@ -12,11 +12,13 @@ page-toc:
 |:--:|
 |![](en/git.png)|
 
-Git is a distributed version control system, a tool for tracking files, code and content. It allows many people to work on the codes and follow all the changes at the same time with a copy of the project in all the developer's computers. It's very popular among developers and system administrators but it's features can be easily applicable everywhere history of changes and ability to submit content and collaborate in a group is required.
+**Git** is a distributed version control system, a tool for tracking files, code and content. It allows many people to work on the codes and follow all the changes at the same time with a copy of the project in all the developer's computers. It's very popular among developers and system administrators but it's features can be easily applicable everywhere history of changes and ability to submit content and collaborate in a group is required.
 
 We use it as the main tool for the development of our howtos and website. And it's the one we prefer, mainly because its usage is quite simple, fast and it's very powerful. In addition, we also use **Atom**, a rich text and code editor, although you can use the text editor of your choice.
 
-In the next pages we'll see how to use them for Disroot's documentation.
+In the next pages we'll see how to use them for **Disroot**'s documentation.
+
+### [Git: Basics How-to](how-to-use-git)
 
 ----
 You can find more information about git [here](https://en.wikipedia.org/wiki/Git) and in [this article](https://medium.freecodecamp.org/what-is-git-and-how-to-use-it-c341b049ae61?gi=805863b5a598).