moved all the texts and images

pages/01.basics/docs.md

@@ -6,4 +6,10 @@ taxonomy:
         - docs
 ---
 
-Learn the basics about **Disroot**.
+## Learn the basics about **Disroot**.
+
+This site is dedicated to Howtos and tutorials to help you find your way around the various Disroot services.
+
+If you feel you are missing a tutorial, or that the information is not accurate- please feel free to
+contact us or write a revision yourself.
+We are using git so if you are familiar with it, you could just submit a pull request. Otherwise contact us in any other way. Soon we will produce a simple git howto (or at least link to one) to get all interested people onboard.

pages/02.nextcloud/02.Apps/Spreed/docs.md

@@ -1,39 +0,0 @@
----
-tyitle: 'Calling with Spreed'
-visible: true
-page-toc:
-  active: true
----
-
-Since January 2017 we've introduced spreed calls to our cloud. It's very simple audio/video conference app you can use to communicate not only with other disroot users but with anyone who has a computer connected to the internet and up to date web browser supporting WebRTC technology.
-![](spreed_main.png)
-
-
-The interface of the application is very simple. The left side bar shows you the list of rooms you have created.
-
-
-On the bottom right of the window you will see your avatar and few options where you can:
-
-![](spreed_bottom.png)
-
- - mute/un-mute your microphone
- - switch on/off your camera
- - switch on/off fullscreen mode
-
-That's pretty much it. You should be ready to start your new call
-
-# Creating Calls
-To start calling, you need to create a room. Click on **"Choose person"** to do so. In the popup window you have an option to invite existing disroot account, or create public room.
-You will see there is a new room listed on the left sidebar.
-When clicking on the options button of the room, you can either:
-  - invite more people
-  - create/delete public link
-  - leave the call/room
-
-![](spreed_create_calls1.png)
-
-There is no real difference between disroot user rooms and public rooms as in both cases you can either invite disroot users or create/remove public link rooms.
-
-Once you initiate the call by pressing on the room's name, a notification will be sent to invited disroot user or (in case of public room instance) you will have to wait for at least one other participant to join in.
-
-Once they join, you can start having your video call.

pages/02.nextcloud/03.sync-with-your-cloud/01.Multiplatform/thunderbird-calendar-contacts/docs.md

@@ -5,165 +5,110 @@ page-toc:
   active: true
 ---
 
-The contact and calendar features in Disroot/Nexcloud are pretty cool but if you have your Disroot email connected in a email client like Thunderbird it's nice to have the contacts and calendar in Disroot integrated with Thunderbird and access them from one place in your desktop.
+The contact and calendar features in Disroot/Nexcloud are pretty cool but if you have your Disroot email connected in a email client like Thunderbird it's nice to have the contacts and calendars from Disroot integrated with Thunderbird and access them from one place on your desktop.
+
+---------
 
 
+# 1 - Installing Needed Add-ons
 
-----------
-
-
-## <p>Table of contents</p>
-
-[1 - Installing Add-ons] (#Add-ons)
-[2 - Integrating calendar with Thunderbird] (#calendar)
-[3 - Integrating contacts with Thunderbird] (#contacts)
-
-
-----------
-
-
-## 1 - Installing Add-ons <a name="Add-ons"></a>
-
-To do both tasks you will need to install two Add-ons in Thunderbird:
+In order to sync all your calendars, tasks and contacts to thunderbird, you will need to install those Add-ons:
 
 * Lightning (a calendar for Thunderbird)
 * So Go Connector (to sync you contacts)
 
-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)
+**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)
 
-**Installing Lightning**
+## Installing Lightning
 
 In Thunderbird go to > tools > Add-ons
 ![](thunderbird_1.png)
-In the Add-ons page on the upper right corner you will find a search bar. On that search bar type "Lightning" and press enter after that you will see has the first option the Lightning Add-on and an install button. 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.
 
 ![](thunderbird_2.png)
 
 You will need to restart Thunderbird in order to finish the installation of both Add-ons
 
-**Installing So Go Connector**
+## Installing So Go Connector
 
-This Add-on is not in the Add-ons menu we have to download it from the developers website [here](https://sogo.nu/download.html#/frontends)
+This Add-on is not listed in the Add-ons menu so we have to download it straight from the developers website [here](https://sogo.nu/download.html#/frontends)
 
-On the website select **"SoGo Connector"**
+On the website select **"SoGo Connector"**. Then once downaloaded, go back to thunderbird's  Add-ons menu and select install from file option.
 
-<img src="/uploads/default/original/1X/fa373d6e2c2442d1110bbaf9845c25a380c1074a.png" width="690" height="347">
-
-On Thunderbird Add-ons menu select install from file
-
-<img src="/uploads/default/original/1X/7136a1a36bc4d7e775ead89f129fe43d4b7748d7.png" width="690" height="413">
-
-Select SoGo connector from wherever the download was made to in your computer.
-The file extension of the SoGo Connector is .xpi
-Select it and press open.
-
-<img src="/uploads/default/original/1X/eff98658f6e18fc02f50be7211c500a60ceab408.png" width="636" height="500">
+![](thunderbird_3.png)
 
+Now select SoGo connector file (.xpi extension) you've just downloaded from the website.
 The following image should appear next, just press install
 
-<img src="/uploads/default/original/1X/6542f3531d7952e54f4d0ec1a0617ae9795512d6.png" width="606" height="404">
-
+![](thunderbird_4.png)
 
 For both Add-ons to finish their installations you will need to restart Thunderbird
 
-<img src="/uploads/default/original/1X/f1caea6a78d1e89275d73af1b7cf74035b310e4c.png" width="690" height="413">
 
-## 2 - Integrating calendar with Thunderbird <a name="calendar"></a>
+## 2 - Integrating calendar with Thunderbird
 
-Go to your calender app in Disroot
-<img src="/uploads/default/original/1X/0c9a81295d26752f2eacfee1e0698c5b0b885166.png" width="287" height="486">
+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.
 
+ ![](thunderbird_6.png)
 
-And press the options button in front of the calender you want to synchronize and then the link option
+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.
 
-<img src="/uploads/default/original/1X/5a229cf6e9a540307873f1a7f72f43fd078705f3.png" width="212" height="500">
+![](thunderbird_7.png)
 
-It will now present a link to the calendar we want to sync with Thunderbird.
-Copy paste it to some place, you will need it in the next steps
-
- <img src="/uploads/default/original/1X/ba72e14aeec9790da4fc8c8a4dce16aa545af446.png" width="208" height="500">
-
-
-In Thunderbird go to > File > New > Calendar
-
-<img src="/uploads/default/original/1X/7c1f5ed6ed0aef69c8bd02436fa6ac2f54362c30.png" width="690" height="460">
-
-Select "On the Network" and next
-
-<img src="/uploads/default/original/1X/05ef8fdc72a03de0a37798e250c6bc7a98dc1c4e.png" width="539" height="432">
-
-In the next panel:
-1- select the option CalDAV
-2 - In the location camp paste the link of your Disroot Calendar that you copied earlier
+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
+![](thunderbird_8.png)
 
-Press next
+Give your calendar a name and assign a color.
+Then press next.
 
-<img src="/uploads/default/original/1X/b488820942c696e0ae74b790987c43a0bc5b1f4d.png" width="539" height="432">
+![](thunderbird_9.png)
 
-Type the name you want to give to the Calendar and you can select a color for it.
-Then press next
+Then press finish.
+Your calendar is now synced with Thunderbird. Any event created in thunderbird will apear on disroot cloud and vice versa.
 
-<img src="/uploads/default/original/1X/f4ea3c5feeeb6dd66e080c931814700ea869f55c.png" width="539" height="432">
+![](thunderbird_10.png)
 
-Then press finish
+**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)
 
-<img src="/uploads/default/original/1X/4f5f898def84dd4c20210127616eff29859c3e3f.png" width="539" height="432">
+![](thunderbird_11.png)
 
-Your calendar is now synced with Thunderbird and visible
+### 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
 
-<img src="/uploads/default/original/1X/e4608aa64d8762b1606b79368eb08d6999873b75.png" width="690" height="347">
+![](thunderbird_12.png)
 
-Your calendar is now synced with Thunderbird.
-Any event you create in Thunderbird Calendar will appear in your Disroot Calendar and vice versa. If the change does not appear immediately just refresh the page.
+If you right click the calendars in Thunderbird you will have a set of options, from:
 
-
-<img src="/uploads/default/original/1X/74b2f9171db34d658a92f9d19034b2f738448e06.png" width="406" height="500">
-
-<img src="/uploads/default/original/1X/6e996a6c12f1b165c0a73a17c996f5c99bd5479b.png" width="690" height="347">
-
-If you have multiple calendars in your Disroot account, or spread across different services that use Nexcloud, or even Owncloud, you can sync them all in Thunderbird
-
-Just repeat this process for each calendar. You can use a different colour to each calendar to set them appart
-
-<img src="/uploads/default/original/1X/66414e68ff8192099acd30201c431b100be741fa.png" width="690" height="347">
-
-If you have multiple calendars in Thunderbird, when you are 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
-
-<img src="/uploads/default/original/1X/bdb207d5482b58a530de73e058a0a0c200f363b9.png" width="406" height="500">
-
-If you right click the calenders in Thunderbird you will have a set of options, from:
-
-* Show or hide a Calender
+* Show or hide a Calendar
 * Export Calendar
-* Unsubscribe Calender (remove it from Thunderbird)
+* Unsubscribe Calendar (remove it from Thunderbird)
 * Making it read only (in Thunderbird)
 * Synchronize Calendar  
 
-<img src="/uploads/default/original/1X/f5012953fe414c507421a641cd670d139a4aa1d4.png" width="690" height="347">
+![](thunderbird_13.png)
 
-## 3 - Integrating contacts with Thunderbird <a name="contacts"></a>
+# Contacts - Integration with Thunderbird
 
 The process is similar to the integration of Calendars in Thunderbird. First you need to get the link from the contacts in your Disroot account.
 
-Go to the contacts app in Disroot
-
-<img src="/uploads/default/original/1X/8d04297772087252ff1c1339412543ea79b72a17.png" width="287" height="478">
-
-Then go to settings
-<img src="/uploads/default/original/1X/32028c7f8e45bec9ec6977572ed8bdf4c6c4d9df.png" width="214" height="500">
-
-Then select the share "url button" so that it presents you with a link.
+Go to the contacts app in Disroot webapp ,then go to settings ('gear' icon in the bottom left-panel).Select the share "url button" so that it presents you with a link.
 Copy that link and save it, you will need it later.
 
-<img src="/uploads/default/original/1X/a0126df92faa9c651668cd7f89352867246f4dab.png" width="215" height="500">
+![](thunderbird_contacts-1.png)
 
 In Thunderbird, select Tools > Address Book
-<img src="/uploads/default/original/1X/a71563da37d22e77693677f1143fe798d6069da3.png" width="690" height="460">
+![](thunderbird_contacts-2.png)
 
 Then select: File > New > Remote Address Book
 
-<img src="/uploads/default/original/1X/4adb9ad78bf236420be66d76cd15ae7fbcc1cc12.png" width="629" height="500">
+![](thunderbird_contacts-3.png)
 
 In the next panel you will be asked to set the name and url:
 
@@ -176,11 +121,11 @@ You can set the contacts to read only if you want to (but if you do that you won
 
 When you are done press "ok"
 
-<img src="/uploads/default/original/1X/6cbfcc5d897495bd607063693e400d8dc4c1bcb2.png" width="690" height="416">
+![](thunderbird_contacts-4.png)
 
 Right click your new remote address book and select Synchronize
 
-<img src="/uploads/default/original/1X/762916cfcec26be1aa3790b51c280cd6877a2e70.png" width="629" height="500">
+![](thunderbird_contacts-5.png)
 
 You will be prompted to insert your Disroot account credentials
 Username: your Disroot Username
@@ -189,14 +134,10 @@ Password: your Disroot password
 Select the option: **"Use password manager to remember this password"** so that Thunderbird remembers the password and doesn’t ask for it every time you use Thunderbird
 
 Then press **"ok"**
-<img src="/uploads/default/original/1X/183c96aeedd79ad3afc84e391ea86396ad03ae48.png" width="690" height="222">
 
 
 Your contacts in your Disroot account are now synced with the remote contacts address book you created in Thunderbird
 
-<img src="/uploads/default/original/1X/b818cfb9aaf29af3400928f1fe1a151878206e58.png" width="690" height="347">
-
-<img src="/uploads/default/original/1X/bf5513b18591ca1bbc42a72af8c006cacfcadece.png" width="629" height="500">
 
 Any contacts you add/remove/edit in your Disroot account will be altered accordingly in your Thunderbird remote calendar and vice versa.
 

pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Nextcloud-app/docs.md

@@ -13,92 +13,71 @@ In this tutorial we'll show you how to install and work with the Nextcloud mobil
 
 This app does not download the files to a local folder in your mobile, it simply shows the existing files in your cloud. The files are only downloaded if you select them to be downloaded. This way it wont take too much space in your mobile. For uploaded files, if you want to you can keep a local copy in your mobile or not, it's your choice.
 
-
-
 ----------
 
-##Table of Contents
+# Install Nextcloud Mobile
 
-* [Get and install Nextcloud Mobile app](#installmobileapp)
-* [Setup account](#setupaccount)
-* [General interface](#interface)
-* [General settings](#settingsg)
- * [Pictures and videos automatic uploads](#picupload)
- * [Set password](#setpass)
- * [Display hidden files](#display)
- * [Install DAVDroid](#DAV)
-* [Upload and Download Files](#updown)
-* [Share files and folders](#share)
-* [Create folder, Rename, Move, Copy or Remove file or folder](#manage)
-* [Manage and add multiple accounts](#manageaccounts)
-----------
-
-##Get and install Nextcloud Mobile app<a name="installmobileapp"></a>
-
-To install the app on android, we recommend you install the [F-droid](https://f-droid.org/) app store. F-droid provides open source applications, and it's way to reduce your dependency of google.
-
-After you installed and setup F-droid you can search and install the [Nexcloud Mobile app](https://f-droid.org/repository/browse/?fdfilter=Nextcloud&fdid=com.nextcloud.client/).
+To install the app on android, we recommend you install the [F-droid](https://f-droid.org/) app store. F-droid provides open source applications, and it's way to reduce your dependency on google, and we advise you to install it's store app. After you installed and setup F-droid you can search and install the [Nexcloud Mobile app](https://f-droid.org/repository/browse/?fdfilter=Nextcloud&fdid=com.nextcloud.client/).
 
 IOS users will probably have to pay around 0,99€ for it in the IOS app store.
 
 
 ----------
 
-##Setup account<a name="setupaccount"></a>
-Once the app is installed, start it login with you Disroot account credentials:
+# Setup account
+Once the app is installed, start it and login with you Disroot account credentials:
 
 * **Server:** [https://cloud.disroot.org](https://cloud.disroot.org)
 * **Username:** _your Disroot username_
 * **Password:** _your Disroot password_
 
-And press connect at the end.
-<br>
-<img src="/uploads/default/original/1X/de6e41454d7f9738fe5e28b6027951de77315d26.jpeg" width="313" height="500">
-<br>
-
+![](nextcloud_app_login.jpeg)
 
 ----------
-##General interface<a name="interface"></a>
+# General interface
 
 The general interface is pretty straightforward and easy to use. In the center it shows your files
 In the top bar you have:
 
-* A search tool <img src="/uploads/default/original/1X/3d93e14a43600a63c253ff0a8d265a30f5ba12d2.jpeg" width="32" height="29">
-* A hamburger type button on the left side to access your settings <img src="/uploads/default/original/1X/ad3248931c1874ee1dd6b57b5c03e797add3893a.jpeg" width="32" height="29">
-* On the right side a button to refresh your account and set the display mode <img src="/uploads/default/original/1X/50506d2b16f8589c6e67d3c7d13abf0c11a8485b.jpeg" width="32" height="29">
-* On the lower right side you have the plus button that presents you with upload options <img src="/uploads/default/original/1X/139e2e4489a51d95743d848185be22f4905244d4.jpeg" width="32" height="29">
-<br>
-<img src="/uploads/default/original/1X/3b9064094926e37751640d0063311f215b2d3256.jpeg" width="313" height="500">
+* A search tool
+* A hamburger type button on the left side to access your settings.
+* On the right side a button to refresh your account and set the display mode.
+* On the lower right side you have the plus button that presents you with upload options.
+
+![](nextcloud_app_main1.jpeg)
 
 You can navigate through the folders by pressing on them and then using the "back button" on the upper left corner.
 
-If you press the button with the three vertical dots, like we mentioned before you will be presented with three option **Refresh account**, **sort** and **Grid view**.
+If you press the button with the three vertical dots in the top bar of the app, you can there **Refresh account**, **sort** and **Grid view**.
+
+In **Refresh your account** you can order to synchronize your files (if when you start the mobile app for the first time your files don't appear use this option).
+In **sort**, you cant decide if your files will be shown alphabetically, by date and so on.
+In **Grid view**, you can change how the files are displayed, from a "list files" to Grid view and reverse:
 <br>
-<img src="/uploads/default/original/1X/b59819daee66998334d69bdd0985ea60d6a04e73.jpeg" width="331" height="254">
-<br>
-In **Refresh your account** you can order to synchronize your files (if when you start the mobile app for the first time your files don't appear use this option). In **sort**, you cant decide if your files will be shown alphabetically, by date and so on. In **Grid view**, you can change how the files are displayed, from a "list files" to Grid view and reverse:
-<br>
-<img src="/uploads/default/original/1X/ec5aa87bbf37d00f31622b18929a6a56704cd57d.jpeg" width="480" height="433">    
+![](nextcloud_app_main2.jpeg)    
+
 ----------
-##General settings<a name="settingsg"></a>
+## General settings
 
 In the general settings you can:
 
-* Chose to automatically upload any videos and pictures you take/make to your Cloud
+* Chose to automatically upload any videos and pictures you take/make on your prone to your Cloud
 * Set to which folder these uploads go to
 * Set if you want to keep a local copy of these uploaded pictures and videos
 * Set a password to access the Nexcloud Mobile app
 * Set if you want the app to display hidden files
 * Install DAVDroid so that you can sync calendars, tasks and contacts
 
-You can access these settings by pressing the hamburger button on the upper left side <img src="/uploads/default/original/1X/ad3248931c1874ee1dd6b57b5c03e797add3893a.jpeg" width="32" height="29">
-and then "settings".
+You can access these settings by pressing the hamburger button on the upper left side and then "settings".
 <br>
-<img src="/uploads/default/original/1X/4883eb73e2a686425a66458b2979ce989bfb7441.jpeg" width="251" height="500">
+![](nextcloud_app_settings1.jpeg)
 
-###Pictures and videos automatic uploads<a name="picupload"></a>
+**NEEDS TO BE UPDATED**
+## Pictures and videos automatic uploads
 
-To set your video and pictures automatic upload options is very easy, basically works with checkbox,  when you press instant picture upload or instant video upload, you are presented with all the options.
+Uploading your pictures and videos automatically to the could is basically a matter of checking a box in the options.  
+
+when you press instant picture upload or instant video upload, you are presented with all the options.
 There you can set whether pictures or videos, are uploaded immediately, or only when you are connected to wifi, if it goes to the "instant upload" folder that is created for this or to another.
 <br>
 <img src="/uploads/default/original/1X/c76c0334cb843cd0f5257fa62b9a4201866c6448.jpeg" width="372" height="500">
@@ -112,79 +91,40 @@ At the end of these options you can set what to do with the original files of th
 <br>
 The app folder is a local folder on your mobile where the Nextcloud app can store uploaded files. Original folder is, well ... the picture or videos folder.
 
-###Set password<a name="setpass"></a>
-You can create a password, if you want, to protect the access to the Nextcloud Mobile app by pressing the checkbox to the right of "Passcode Lock".
+## Set password
+To protect access to your Nextcloud mobile app, you cen checkbox "Passcode Lock". This will prevent anyone with access to your phone to open the app and browse your cloud storage.
 
 **NOTE: If you enable password protection you will be asked for this every time you start the app, and every time you upload a file using your mobile share options (share pictures from gallery, etc).**
-<br>
-<img src="/uploads/default/original/1X/bf958310dd8b5fb8270a5b17e0c9f101fcb1274e.jpeg" width="479"height="96">
-<br>
-You will be prompted and asked to place a four digit code, and to confirm it.
-<br>
-<img src="/uploads/default/original/1X/a4dc1f7e7518569eceed380fcbc04903fd3d4bf0.jpeg" width="312" height="500">
-<br>
-###Display hidden files<a name="display"></a>
-The newest versions of Nextcloud and so Disroot cloud permits hiding files. By marking this option you can see your hidden files in your mobile app.
-<br>
-<img src="/uploads/default/original/1X/ba285d913106b1494be398ccbd79f827ab6e47ab.jpeg" width="477" height="85">
-<br>
-###Install DAVDroid<a name="DAV"></a>
-<br>
-<img src="/uploads/default/original/1X/dc7dcaacad97b916b3dd774772b2e322f588260a.jpeg" width="478" height="165">
-<br>
-Pressing this option will make your Nextcloud mobile app fetch DAVDroid from whatever appstore you use ant install it.
-DAVDroid permits you to synchronize and access your Disroot calendars, tasks and contacts with your Android type device.
-If you are interested in this option you can read more about it [here](https://forum.disroot.org/t/cloud-howto-sync-calendars-contacts-and-tasks-on-android/770).
+
+## Display hidden files
+Nextcloud on Disroot cloud permits uploading *"hiding files"*. By checking *"Show hidden files"* option you'll be allowed to see those files on your mobile app.
+
+![](nextcloud_app_settings3.jpeg)
 
 
 ----------
-##Upload and Download Files<a name="updown"></a>
+# Upload and Download Files
 
-###Upload files
+## Upload files from NextcloudApp
 You can upload files to your Disroot cloud with the mobile app in two ways:
 
-* The upload option in the app
-* The share files option in your device
+### The upload option in the app
 
-To upload from the app select the plus button in the main interface <img src="/uploads/default/original/1X/139e2e4489a51d95743d848185be22f4905244d4.jpeg" width="32" height="29">
-<br>
-<img src="/uploads/default/original/1X/f590c61bfa8ae143bd21d7da4453da21533e9066.jpeg" width="431" height="432">
-<br>
-You will be presented with two options:
+To upload from within NextcloudApp select the *"plus"* button in the main interface
 
-* Upload, from which you can browse your mobiles file system to the files you want to upload
+![](nextcloud_app_upload1.jpeg)
 
+### Upload using "Share" function form other apps
+
+Most of the apps support "Sharing" functionality, which provides you an option to share content directly to another app. Using this property you can easily share the content directly to NextcloudApp which will result in uploading it. For instance, you can use *"share"* button in Gallery app to upload pictures or videos to your cloud.
+
+# Download files
+Select the files you want to download by *"long pressing"* them. The selected file will be highlighted and all files in that folder will have a checkbox to the left of them. Use the checkboxes to select more files you want to download, then press the button on the upper right corner.
 <br>
-<img src="/uploads/default/original/1X/e81cd82b7d84099db0576739a265cfd0f3513371.jpeg" width="315" height="500">
+![](nextcloud_app_download1.jpeg)
 <br>
 
-* Content from other app, from which you can select if you want to upload from: **gallery, file manager, music or sound recorder.**
-
-<br>
-<img src="/uploads/default/original/1X/161fd2b380e886894808ad7502cb4434faa26b43.jpeg" width="405" height="500">
-<br>
-To use the share file option in your mobile, select the file in question.
-<br>
-<img src="/uploads/default/original/1X/8dd07f8073492a6cc9e2689e4cd3dea0a3010bb7.jpeg" width="314" height="500">
-<br>
-After that select Nextcloud.
-<br>
-<img src="/uploads/default/original/1X/e49fefdf5a96f714a4a87699f8c658bd69cba32f.jpeg" width="480" height="365">
-<br>
-You can choose to which folder of your cloud the file will be uploaded to.
-<br>
-<img src="/uploads/default/original/1X/f61a441be0203b568bbc46b0c6232d730a2460d5.jpeg" width="314" height="500">
-
-You can select multiple files to be uploaded at the same time, with this method, just select several files to share.
-
-###Download files
-Select the files you want to download by pressing them for a few seconds. The selected file will be highlighted and all files in that folder will have a checkbox to the left of them. Use the checkboxes to select the files you want to download. And then press the button on the upper right corner.
-<br>
-<img src="/uploads/default/original/1X/af984ee1086973b80bf91dbfc55fb774f1fa9e18.jpeg" width="452" height="500">
-<br>
-Then select download
-<br>
-<img src="/uploads/default/original/1X/4ae9d117120b3fd3a75dd741c88a18f4438b71f7.jpeg" width="480" height="168">
+![](nextcloud_app_download2.jpeg)
 
 
 ----------
@@ -192,82 +132,27 @@ Then select download
 ##Share files and folders<a name="share"></a>
 You can share files or folders to anyone via a public link URL link or with other people that use a cloud based in Nextcloud/Owncloud software even if they are not Disroot users (unlike dropboxes and such).
 
-To share via URL, press the file or folder for a few seconds to select it, them press the three vertical dots button on the upper right corner.
+To share via URL, *"long press"* the file or folder you want to share, then press the three vertical dots button on the upper right corner and select the **"share"** option.
 <br>
 <img src="/uploads/default/original/1X/af984ee1086973b80bf91dbfc55fb774f1fa9e18.jpeg" width="452" height="500">
-<br>
-Select the share option, and after that you will be presented with your share options. Select "Share link", you can also set additional options such as:
+Additionally you can decide whether you allow others to edit shared files, set expiration date, or protect the share with additional password.
 
-* Allow editing, so that people that receive the link with the file or folder can edit it
-* Password protect, to place a password to open the link, so that only the right people open it.
-* Set an expiration date, so that otherthe link doesn't stay valid for ever and ever
-other
-
-Once you are done selection your options press "GET LINK"
-<br>
-<img src="/uploads/default/original/1X/97690fbcd4c540973bb73300fa0ecc97f235a07a.jpeg" width="315" height="500">
-You will be prompted to a "send link to page" where you can select the app where you want to send the link to, for example a email client so that you can email the link to someone,
-<br>
-<img src="/uploads/default/original/1X/269a28a47abb2252dadd9a0b9683cb36086a66a4.jpeg" width="215" height="500">
-<br>
-<img src="/uploads/default/original/1X/cd0568b4f2db90bd8daf7d3973cf429a484385d2.jpeg" width="312" height="500">
+![](nextcloud_app_share1.jpeg)
 
 To share a file or folder with other Disroot or Nextcloud/Owncloud users via Federation, in the share option select "Add user or group", write the persons federated cloud ID, usually:
 
 * **USERNAME@SERVER_ADRESS**
 
-<br>
-<img src="/uploads/default/original/1X/2ebd3d68c732a08cba965f2f8510f365a956f923.jpeg" width="434" height="388">
-<br>
-<img src="/uploads/default/original/1X/6df47df0b3b706ccd619358869bbf546f358cfcc.jpeg" width="478" height="382">
-
-
 ----------
-##Create folder. Rename, Move, Copy or Remove file or folder<a name="manage"></a>
-
-###Create a new Folder
-If you don't want the new folder to be in the main directory, then navigate first inside the folder where you want to create this new folder.
-You can create a new folder by pressing the "plus button" <img src="/uploads/default/original/1X/139e2e4489a51d95743d848185be22f4905244d4.jpeg" width="32" height="29">.
-
-There you can see the option "New folder", select it.
-<br>
-<img src="/uploads/default/original/1X/f590c61bfa8ae143bd21d7da4453da21533e9066.jpeg" width="431" height="432">
-<br>
-Write the folder name and press "OK"
-<br>
-<img src="/uploads/default/original/1X/3654b4bc7a1dd9136c8538707ef8d09c5276bdb8.jpeg" width="473" height="421">
-<br>
-###Rename, Move, Copy or Remove file or folder
-You can Rename, Move, Copy or Remove file or folder by again pressing the file or folder for a few seconds and then selecting the three vertical dots button on the upper right corner.
-<br>
-<img src="/uploads/default/original/1X/af984ee1086973b80bf91dbfc55fb774f1fa9e18.jpeg" width="452" height="500">
-<br>
-<img src="/uploads/default/original/1X/3f3045fd0c5dbd63f7733656f836273a6692a9a2.jpeg" width="261" height="500">
-<br>
-
-----------
-#Manage and add multiple accounts <a name="manageaccounts"></a>
-If you have multiple cloud accounts spread throughout several services that use Nextcloud or Owncloud you can add them all in your mobile app.
-Press the hamburger button on the upper left corner of the main interface <img src="/uploads/default/original/1X/ad3248931c1874ee1dd6b57b5c03e797add3893a.jpeg" width="32" height="29">
+#Manage and add multiple accounts
+If you have multiple cloud accounts spread throughout several services that use Nextcloud or Owncloud you can add them all into your mobile app.
+Press the *"hamburger button"* on the upper left corner of the main interface, or swipe to the right.
 <br>
 Select the triangle and then "Add account"
-<img src="/uploads/default/original/1X/c11dc411a23c0eeaa23a0c053a4a5ae7eaf602f7.jpeg" width="383" height="444">
-<br>
+![](nextcloud_app_add_account1.jpeg)
 You will have to repeat the setup account process for the new account.
-Then you will be able to see in the upper part of the settings menu the icons of both accounts.
-<br>
-<img src="/uploads/default/original/1X/e4b59336d51420bd8868480a741300cf71bda9be.jpeg" width="384" height="208">
-<br>
-Just press the icons to toggle between accounts. The main page of the app will display the files and folders of the account you selected.
- If you go to the "Manage accounts" options you can see both accounts. You can delete an account by pressing the garbage button, and edit credentials (username, change password, server address) in the key button.
-<br>
-<img src="/uploads/default/original/1X/e005b841b0d242894b68ad1df5f9df072c1f9c40.jpeg" width="478" height="416">
-<br>
-If you are uploading files using the share options of your mobile device, you will be asked to which account  you want the file to be uploaded to.
-<br>
-<img src="/uploads/default/original/1X/d5abe4b03a149cab75ff7ddf15ad72acc5340344.jpeg" width="475" height="299">
-<br>
-If you are uploading using the normal "upload" option in the app, make sure that first you selected the account that you want the file to go to.
 
+Now in order to see files on additional accounts, you have to switch between them by swipping to the right and selecting an account from the menu.
+If you are uploading files using the share options of your mobile device, you will be asked to which account  you want the file to be uploaded to.
 
 ----------

pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Using-notes/docs.md

@@ -5,60 +5,45 @@ page-toc:
   active: true
 ---
 
-
-Disroot has a notes app enabled.
-
-In this tutorial we'll show you how to setup and use your disroot notes in your Android device. To do this you will need to install a notes app in Android  that is compatible with Nextcloud, the software Disroot uses, and the notes app in disroot.
+In this tutorial we'll show you how to setup and use your disroot notes in your Android device.
 
 ----------
 
-##Table of contents
-[Install notes app] (#install)
-[Add your disroot account] (#setaccount)
-[Create and delete notes] (#create)
-[View your notes in Disroot] (#viewdis)
+# Install notes app
+
+First of grab **"Nextcloud Notes"** from [F-Droid](https://f-droid.org/packages/it.niedermann.owncloud.notes/) or other commercial app stores.    
 
 
-----------
+# Add your disroot account
 
-**Install notes app**<a name="install"></a><br>
-
-For this tutorial we chose use the ownCloud Notes app. It's available in F-Droid and in other commercial app stores.    
-
-In F-Droid the app is also called "Notes"
-
-
-**Add your disroot account**<a name="setaccount"></a><br>
-
-Once you start the ownCloud Notes app for the first time you will be prompt to write the server address and your account credentials.
+Once you start the *"Notes"* app for the first time you will need to add your credentials and URL of disroot cloud server.
 
 
 > Server address: [https://cloud.disroot.org/](https://cloud.disroot.org/)
 > Username: Your disroot username
 > Password: Your disroot password
 
-After that just press "connect".<br>
-<img src="/uploads/default/original/1X/8c9f5a6392f142a7059018c8816ac6112320a62e.png" width="480" height="480">
-<br>
-**Create and delete notes** <a name="create"></a><br>
+After that just press "connect". Your existing notes from your disroot cloud account should be now synced to your phone.
+![](nextcloud_notes1.png)
 
-You can create a new note by pressing the "plus" button on the lower right corner of the screen.
-<br>
+# Create and delete notes
 
-<img src="/uploads/default/original/1X/aabbe4ce45140162d1b13da4b9a76c995e80e626.png" width="314" height="500">
-<br>
+You can create a new note by pressing the *"plus"* (**+**) button on the lower right corner of the screen.
+
+![](nextcloud_notes2.png)
 
 The editor is very simple:
 
 * the first line of the note is automatically the title of the note.
 * After you have written your note press the ok symbol in the upper right corner to create the note.
 * To discard the note, press the X simbol on the upper right corner
-<br>
 
-<img src="/uploads/default/original/1X/b5c2785d529218aead51abfd7fe7308a65624495.png" width="314" height="500">
-<br>
-Once the note is created you will see for few seconds "sync" symbol to the right of the note you just created, indicating that it's syncing with the notes app in your disroot account.
-Any changes you make to the notes in your disroot account will appear in the ownCloud notes in your Android device, and vice versa.
+
+Notes app uses Markdown formatting so if you are familiar with it you can make them look pretty. If you still dont know what Markdown is, you should definatelly check [this page](http://lifehacker.com/5943320/what-is-markdown-and-why-is-it-better-for-my-to-do-lists-and-notes) which will change your life forever :)
+
+![](nextcloud_notes3.png)
+
+Any change to the notes will be automatically synced to and from disroot cloud.
 <br>
 
 <img src="/uploads/default/original/1X/5b4d8a2afd2b9fc2945689e768800584c858c223.jpeg" width="300" height="500">

pages/02.nextcloud/03.sync-with-your-cloud/03.Android/calendars-contacts-and-tasks/docs.md

@@ -8,135 +8,69 @@ page-toc:
 Disroot has calendar, contacts and tasks apps enabled.
 
 In this tutorial we'll show you how to setup and use your disroot calendar, contacts and tasks in your Android device.
-
-Contacts have already been addressed in another tutorial by @muzirian, so we won't go in to much details about it.
-
-Note: This was done using an old Android phone 4.+, there may be some differences with other versions.
-
 To do this you will need to install the DAVdroid app and Open Tasks in Android.
 For Open Tasks to work it will need DAVdroid to also be installed, but if you just want to sync your calendar or contacts you don't need to install Open Tasks.
 
 
 ----------
-
-##Table of contents
-[Install DAVdroid] (#installDAV)
-[Add your disroot account to DAVdroid] (#setaccountDAV)
-[Calendar] (#usecal)
-[Contacts] (#viewdis)
-[Tasks] (#tasksandroid)
-
-----------
-
-
-**Install DAVdroid**<a name="installDAV"></a>
-<br>
-DAVdroid It's available in F-Droid and in other commercial app stores.
-
+# Install DAVdroid
+## From appstore
+DAVdroid Is available on your favorite app store. We encourage you to use [F-Droid](https://f-droid.org/).
+## From NextcloudApp
 If you have 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"**
 
-* open your nextcloud mobile app
-* go to settings
-* press "Sync calendar and contacts"
+ NextcloudApp will now fetch, install and configure your account automagically.
 
-And it will fetch DAVdroid from whatever app store you have installed, and DAVdroid should open with your username and server address already placed.
+ ---------------
 
+## Add your disroot account to DAVdroid
+
+If you haven't install DAVDroid via NextcloudApp you will have to manually setup an account.
+To get started open-up "DavDroid app" and press the *"plus"* (**+**) button.
 <br>
- <img src="/uploads/default/original/1X/baa0da125de8f93cb7e6df7df76125dea1190a76.png" width="600" height="168">
+![](nextcloud_davdroid1.jpeg)
 <br>
 
-**Add your disroot account to DAVdroid**<a name="setaccountDAV"></a>
-<br>
-If you don't have the nextcloud app installed in your Android device then after you have installed DAVdroid via whatever app store you use fire it up.
-Press the plus button.
-<br>
-<img src="/uploads/default/original/1X/1909c376bee93b87f906256e05cc275058d3e1fa.jpeg" width="314" height="500">
-<br>
-
-Select "login with url and username", place server address and credentials
+Select "login with url and username", and put server address and credentials
 
 > Server address: https://cloud.disroot.org
 > Username: your disroot username
 > Password: your disroot password
 
-And press login.
-<br><img src="/uploads/default/original/1X/2905f98c029f12aa65dd2ced17c1d78dacbf3443.jpeg" width="316" height="500">
-<br>
-After you setup your account you need to select which calendars and address books from your disroot account you want to sync with your android device.
+
+![](nextcloud_davdroid2.jpeg)
+After you setup your account you need to select which calendars and address books you want to sync from disroot to your android device.
 Press the big orange button with the account name.
-<br>
-<img src="/uploads/default/original/1X/38bfc1cfefa68f23ba3237219b472e169dbd8e0c.jpeg" width="480" height="432">
-<br>
-Select which of your calendars and contacts list you want to sync, and press the refresh button on the top bar the address book list.
-<br>
-<img src="/uploads/default/original/1X/e72a0fe1efa9a13415b669243b664459c3310c1b.jpeg" width="344" height="500">
-<br>
-**Calendar**<a name="usecal"></a>
+![](nextcloud_davdroid3.jpeg)
+![](nextcloud_davdroid4.jpeg)
+-------------------
+# Calendar
+Now your Calendars from disroot will be synced to your device and will appear in your Calendar app of choice. Any event added on the phone will be automatically synced to disroot and vice versa.
+
 After that, the calendars in your disroot account that you selected will be synced and visible in your Android device calendar.
-<br>
-<img src="/uploads/default/original/1X/fddddc437414dc247284b5a217a12e4eea38efe2.jpeg" width="314" height="500">
-<br>
-<img src="/uploads/default/original/1X/6e6b516e03432f627c11d03dbcc5a18e8623ebe5.png" width="488" height="303">
-<br>
-Any event you create or edit in your disroot calendar will appear in your Android calendar.
+---------------------
+# Contacts
+Your Contacts should be straight away available and synced with disroot.
+**Note:**
+If you want to migrate your Android contacts to your disroot contacts and stop syncing with google, then follow [this](https://forum.disroot.org/t/syncing-android-with-owncloud/186) tutorial made by @muzirian
 
-When you are creating an event in your Android calendar app you need to specify to which calendar it goes to. If your local calendar in your device, or your disroot calendar. If it goes to the local calendar it wont be synced.
-<br>
-<img src="/uploads/default/original/1X/38b5948f32022d67837ba75db7a0f2f46ad79986.jpeg" width="392" height="500">
-<br>
+---------------------
+#Tasks
 
-**Contacts**<a name="viewdis"></a>
-<br>If when you setup DAVdroid, you selected to also sync your disroot contacts address book they should already be visible in your Android address book.
+[Open Tasks](https://f-droid.org/packages/org.dmfs.tasks/) Is available in F-Droid and in other commercial app stores.
 
-If you want to change the settings of your Android address book to only show your disroot contacts, then go to: Contacts > settings (on the lower right corner) > contacts to display.
-There you can change from "All contacts" to "DAVdroid" and your disroot contacts, you can also go to customize, and select to display contacts from specific sources you want (sim card, disroot, telegram, etc, instead of all.
-<br>
-<img src="/uploads/default/original/1X/6466d33bf2b51bde2f174a9a9f5c60402439448c.jpeg" width="314" height="500">
-<br>
-If you want to migrate your Android contacts to your disroot contacts and stop syncing with google, then follow [this](https://forum.disroot.org/t/syncing-android-with-owncloud/186) tutorial made by @muzirian <br>
-**Tasks**<a name="tasksandroid"></a>
-<br>
-Open Tasks It's available in F-Droid and in other commercial app stores.
-
-After you installed and set up your account in DAVdroid start Open Tasks. You will see that all your tasks where automatically synced with your disroot tasks app.
-You will have tasks for each calendar that you have in your disroot calendar app. To see the tasks in each calendar press the plus button to the right of the calendar name.
-<br>
-<img src="/uploads/default/original/1X/50f66aca69aa72f9cb8a4f754af6299acbde23df.jpeg" width="314" height="500">
-<br>
-<img src="/uploads/default/original/1X/bedfdc1d507b5b9dcc2858c6f8866fa3e970b599.png" width="690" height="110">
-<br>
-Open tasks is easy to use, to create a new task press the plus button on the lower right corner.
-If you have several calendars, then when you are creating a new task you need to select to which calendar that task goes to.
-<br>
-<img src="/uploads/default/original/1X/5ff467f7cdcbb9c2ac1dc2874598c17a757e2a07.jpeg" width="480" height="441">
-<br>
-Setting the informations of a new task is pretty intuitive, the you can specify:
-
-* Task titles
-* status, if it needs action, if it's completed, in process or cancelled
-* location
-* description of the task
-* check list
-* start date and when it's due
-* priority
-* Privacy
-* url
-
-In the end press save in the upper right corner.
-<br>
-<img src="/uploads/default/original/1X/6aaa8a99ff2cb7118f3a9949e558c2c7d88bc874.png" width="120" height="500">
-<br>
-Once a task is completed just press the check button on the task to mark it as concluded.
-<br>
-<img src="/uploads/default/original/1X/89529f818924e5e2c77cbd106d949451ad225b52.jpeg" width="477" height="378">
-<br>
-
-In the upper bar of the main menu you have several view options:
+If you have already followed previous steps and your DAVdroid account is setup and syncing your calendars from disroot cloud, all the tasks should be available the moment you install and open *"Open Tasks"* app.
+All Tasks are asigned to each calendar. Tapping the name of the calendar will reveal the tasks.
+![](nextcloud_tasks1.jpeg)
 
+Open tasks is easy to use. You can create additional tasks, group them together, add tags, set due dates and notifications, assign priority levels etc.
+All changes will be automatically synced back to the cloud. The main page of the app gives you an overview of all current tasks, grouped by:
 * tasks list
 * tasks due
 * tasks starting
 * task priority
 * task in progress
-<br>
-<img src="/uploads/default/original/1X/2886fab69f4c53fd7227ef4f152edcabd3fae283.jpeg" width="478" height="159">
+![](nextcloud_tasks2.jpeg)
+-----------------------

pages/02.nextcloud/03.sync-with-your-cloud/03.Android/using-news/docs.md

@@ -6,34 +6,34 @@ page-toc:
 ---
 
 
-## News App on Android<a name="android"></a>
-<br>
-### Get it
+# News App on Android
+
+## Get it
 To get news app on your android device we recommend visiting f-droid and adding it's app store. [F-droid](https://f-droid.org/) provides free (as in freedom) and trusted applications. Using that store over Google Play is a great step forward to free yourself.
 
 Once you have f-droid installed and running, you can search for [OCReader](https://f-droid.org/repository/browse/?fdfilter=news&fdid=email.schaal.ocreader) within the F-droid app or download and install it directly form the [website](https://f-droid.org/repository/browse/?fdfilter=news&fdid=email.schaal.ocreader)
 
-### Setup
+## Setup
 When that's done you can fire up the app, and login with your disroot account.
-<img src="/uploads/default/original/1X/74870047724e6faad4316e1d9f4921bb940a6756.png" width="281" height="500">
+![](nextcloud_news1.png)
 
 Once you're logged in, all your news feeds will be synced to your device, and you can start reading immediately.
 Swiping to the left show you your account information and give you the list of subscribed feeds as well as number of unread posts.
-<img src="/uploads/default/original/1X/21c309253e6e758cd360f915778dd0f9308ea6e8.png" width="181" height="300">
+![](nextcloud_news2.png)
 
-### Add/remove feeds
+## Add/remove feeds
 You can also add and remove feeds directly on your phone. Tap on the 'three dot" icon on the top right corner of the main app window and select "Manage feeds".
 
-<img src="/uploads/default/original/1X/bb579ebae223d72f1100470f748120833a16dbcb.png" width="290" height="142">
+![](nextcloud_news3.png)
 
-### Synchronize
+## Synchronize
 To synchronize your feeds, press **"Synchronize"** button on the left-side panel.
 
-<img src="/uploads/default/original/1X/8e7c5534ce643ef89fed382f8bf1b10c8c78d9fc.png" width="200" height="45">
+![](nextcloud_news4.png)
 
 Happy reading! :grinning:
 
-<img src="/uploads/default/original/1X/bbdc040f8d1e64603df51156fc30a4baad51d3a1.png" width="281" height="500">
+![](nextcloud_news5.png)
 
 
 ----------

pages/03.Email/01.Email-Clients/01.Desktop/Thunderbird/docs.md

@@ -0,0 +1,31 @@
+---
+title: Thunderbird.
+page-toc:
+  active: true
+---
+Thunderbird is a powerful open-source email client, calendar and RSS-Feed manager.
+
+1. **Install Thunderbird.**
+If you don't have thunderbird yet, got to  https://www.mozilla.org/en-US/thunderbird/all/ and choose your language and Operating System.
+**!Note** For linux users we recommend using your distribution package manager to get the latest and updatable version of thunderbird.
+
+2. **Open thunderbird**
+If it's the first time you run thunderbird you will be directly greeted with account setup. Please skip the partnership suggestion and get right to the setup.
+i![](thunderbird_setup1.png)
+If you  are using thunderbird already and have some accounts setup just select '**New Account**" icon in the root view.
+![](thunderbird_setup2.png)
+
+3. **Fill in your account information**
+![](thunderbird_setup3.png)
+
+ - **Your name** Name that will be displayed in "from" field
+ - **Email address** Your disroot email address eg. testuser@disroot.org
+ - **Password** - Your password
+ - **Remember Password?** - If you want thunderbird to remember your password for you and not prompt you for it every time you start thunderbird, select it.
+ - Click "**Continue**" button once you're done and verified everything is correct..<p>
+
+4. Thunderbird now should auto-detect the needed settings like this:
+![](thunderbird_setup4.png)
+
+**Done** \o/
+![](thunderbird_setup5.png)

pages/03.Email/01.Email-Clients/02.Mobile/Android-K9/docs.md

@@ -0,0 +1,37 @@
+---
+title: Android - K9
+---
+
+[K9](https://en.wikipedia.org/wiki/K-9_Mail) is independent, feature-rich Free/Open Source mail client for android. It beats anything out there, including desktop applications (personal opinion). We very much advise giving it a try. Some features:
+ - Works with IMAP, POP3 and Exchange 2003/2007 (with WebDAV) accounts
+ - Folder Sync
+ - Encryption with APG/OpenKeychain support
+ - Signatures
+ - SD Card Storage
+
+Here is how you setup disroot account on K9.
+
+#Get it
+First of, **get K9 on your phone**. We encourage you to use [F-Droid](https://f-droid.org/) store (it's a store hosting only free and open source applications), but you can get it also via g*** store. (additionally you can get **Matrial K9** version or **P=9** which supports GPG by default)
+# Set it up
+Once you start the application for the first time, you need to **create new account**.
+1. **Fill in your disroot's email address and password**
+![](android-k9_1.png)
+2. **Choose** which **protocol** you want to use. We recommend using **IMAP**
+![](android-k9_2.png)
+3. **Incoming email setup**
+Look at the mail settings and adjust it accordingly. (the only thing you should change is *mail.disroot.org* into **disroot.org**). Check the screenshot or follow the [general server setup information.](#Other)
+![](android-k9_3.png)
+4. **Outgoing email setup**
+Same as with incoming mail. Please make sure that:
+ - SMTP Server is **disroot.org**
+ - Security is **STARTTLS**
+ - Port is **587**
+Check the screenshot for reference or check [general server setup information](#Other)
+![](android-k9_4.png)
+5. **Account setting.**
+Adjust frequency with which K9 will check for new emails, and how will it notify you about them.
+6. Lastly give your **account** a **name**.
+7. **Done!**
+Enjoy your awesome open source disroot mail on your android device.
+![](android-k9_5.png) ![](android-k9_6.png)

pages/03.Email/01.Email-Clients/02.Mobile/SAilfishOS/docs.md

@@ -0,0 +1,30 @@
+---
+title: SailfishOS mail client
+---
+
+Setting up disroot mail on SailfishOS is very easy. Just follow those simple steps. (it took longer to make those fancy screenshots :P )
+
+
+1. Open up **Settings** app
+2. Go all the way to the bottom (Sailfish2.0) to **Accounts** tab
+3. Select **General email**
+![](sailfish_mail1.png)
+4. Fill in your disroot email address and password and swipe "Accept".
+![](sailfish_mail2.png)
+5. Server settings.
+
+ - **Incoming mail server:**
+    - Edit username and **remove the domain leaving only the username**
+    - Add server address: **disroot.org**
+    - **Enable SSL connection**
+![](sailfish_mail3.png)
+ - **Outgoing mail server**
+    - Server address: **disroot.org**
+    - Secure connection: **StartTLS**
+    - Port: **587**
+    - **Authentication required**
+![](sailfish_mail4.png)
+6. Swipe "**Accept**"<p>
+7. Edit details such as **description** and "**Your name**", and swipe "**Accept**"
+![](sailfish_mail5.png)
+**You're done!** \o/

pages/03.Email/01.Email-Clients/02.Mobile/iOS/docs.md

@@ -0,0 +1,20 @@
+---
+title: iOS mail client
+---
+
+1. Open up the setting of your iOS device and go to 'Mail, Contacts, Calendars'. Then select 'Add Account'.
+![](ios_mail1.PNG)
+
+2. Select 'Other'.
+![](ios_mail2.PNG)
+
+3. Select 'Add Mail Account'.
+![](ios_mail3.PNG)
+
+4. Insert your credentials and click 'Next'.
+![](ios_mail3.PNG)
+
+5. Change the hostname to disroot.org, both for incoming and outgoing mail server.
+![](ios_mail3.PNG)
+Click 'Next' and your account should be ready to use within you iOS email client.
+ios_mail1.PNG

pages/03.Email/01.Email-Clients/docs.md

@@ -0,0 +1,14 @@
+---
+title: Email Clients
+---
+
+This section is dedicated to get you off the stupid webmail crap and onto truly productive, native experience on your device.
+
+If your favorite mail client isn't listed, just follow the general server settings to get up and running. Setting mail clients is pretty straight forward and easy (unless using outlook but who cares about that:)
+
+```
+IMAP: disroot.org | SSL Port 993 | Authentication: Normal Password
+SMTP: disroot.org | STARTTLS Port 587 | Authentication: Normal Password
+POP: disroot.org | SSL Port 995 | Authentication: Normal Password
+```
+In case you would like to see a tutorial on setting up client of your choice that isn't listed yet, consider writing up a short howto and share it with the community.

pages/03.Email/docs.md

@@ -0,0 +1,3 @@
+---
+title: Email
+---

pages/04.Matrix/docs.md

@@ -0,0 +1,3 @@
+---
+title: matrix
+---

pages/04.Matrix/usage-basics/docs.md

@@ -0,0 +1,187 @@
+---
+title: Riot/Matrix - Basic usage
+page-toc:
+  active: true
+---
+
+
+Riot is the main and most feature rich client (app) to use with matrix. It ships as a webchat, "native" desktop client, and mobile app (android, ios). In this tutorial we would like to guide you through the basic usage and show you few tricks here and there.
+
+
+
+----------
+
+# How to access Riot?
+There are numerous ways you can interact with matrix network through Riot client.
+## Webapp
+The easiest way to access Riot on disroot is by going to https://chat.disroot.org All you need is a working web browser
+## Mobile app
+For android we of course recommend using Riot shipped via [F-droid](https://f-droid.org/repository/browse/?fdfilter=riot&fdid=im.vector.alpha), though if you want to receive push notification and your life depends on google services, you can also find riot on google's play store.
+
+For iOS of course you don't have alternative and you must use their appstore. just search for "Riot".
+## "Native" desktop app
+We intentionally use "native" in quotes because it isn't purely native solution. It is basically the webapp but severed from your own computer. It is however providing you with best security as it does not rely on third party (not even disroot or any other server providing riot). To get it up and running follow one of this link: https://riot.im/desktop.html
+
+
+----------
+
+# How to login / register account.
+To register account, go to https://user.disroot.org
+
+**TIP** Currently your email address will be shared with third party server at matrix.org in order to provide you with better contact discovery, as well as send you forgotten password emails etc. This however is totally optional and if you're concern with privacy and sharing information with matrix.org, you can skip it.
+
+For disroot users - your email address is not filled in by default for the same reason. You should decide whether or not to trust matrix.org with your email address and you can add it in the later stage.
+
+
+----------
+
+# User Interface
+The user interface is quite intuitive if you ever used chat system such as IRC, Slack, Rocket.chat.
+
+![](riot_interface1.png)
+
+For the purpose of this howto we'll name some of the key elements of the interface to help identify them later on:
+
+ - **Chat List** - Place where you will find all the chat-rooms and Direct Chats you participate in. You can sort those chat-rooms in various categories (favorite, direct chats, low priority) by dragging the rooms into them.
+ - **Chat Details** - Is where the rooms name, logo and topic is displayed. Additionally <img src="riot_interface2.png" width="23" height="26"> is for searching for keywords in the rooms history and <img src="riot_interface3.png" width="18" height="20"> is for rooms settings where you can eg.change the topic, add and manage integration, and various room admin settings.
+ - **Main window** - This is the main display of the application. You can see all the chat messages in the room or see all public rooms when going to Room directory.
+ - **Message area** - is where you type your message, upload file, start audio or video call or conference
+ - **User List** - is where you can see all the users currently participating in the room.
+ - **Actions and settings** - here you can start new direct chat, create new room, list all public rooms, enter your user settings
+
+
+----------
+
+# User Settings
+First thing after you login for the first time is to customize your user settings. To do that click on <img src="riot_interface4.png" width="28" height="23"> in **"Actions and settings"** area (bottom left). In this section you can setup various information about yourself, as well as setup behavior of notifications, enable extra interface features and check and verify list of connected devices.
+
+## Profile
+![](riot_interface5.png)
+This section lets you add or change information about your profile.
+
+ - You can change or upload your new profile picture
+ - Change your display name
+ - Add email address **(this is optional)**
+ - Sign out
+ - Change password **(users with disroot account should only change their password through https://user.disroot.org)**
+
+## Notifications
+![](riot_interface6.png)
+Here you can change behavior of notifications for your account (note that this changes will affect all devices running Riot, hopefully in the future we will be able to change notifications settings per device).
+
+## Devices
+A list of devices connected to your account. You can view the devices ID, general information about the devices origin such as it's name, the url it connected to, operating system and browser name (if connected via the browser), it's IP and the time it last made the connection to your account. You can also delete devices you no longer use. If you see a suspicious device or IP you're never used it might mean your account has been compromised. You should  immediately logout (this will logout all devices), and change your password. Not logging out will not result in the compromised device logging back in. Be careful not to rush to conclusions too quickly! Study the list to be sure before you run around all paranoid.
+
+## Deactivate account
+On the bottom of your user settings you can deactivate your account.
+![](riot_interface7.png)
+
+
+----------
+
+
+# Room Directory
+The coolest thing about matrix is the fact that its totally federated. It means you can join any channel on any server. In Room directory you can search for and discover rooms on friendly servers we have listed (list will keep growing) as well as search for rooms on servers (if you know the servers URL). All public rooms of given server are listed in the main window.
+![](riot_interface8.png)
+
+Right dropdown menu lets you filter public rooms in of specific server, or simply add url of server that isn't yet listed.
+![](riot_interface9.png)
+The left input field is used to either type in the full room address (if you know it) or search for rooms using keyword.
+![](riot_interface10.png)
+
+
+----------
+
+# Joining Channel
+You can join a room in many ways.
+The most straight forward way to join public rooms is to search for them in room directory. You can either choose a room from the list given by the predefined servers or search for the room on the server you know the address of.
+
+
+You can also just click on the room address if someone shares it with you in the chat. The room address consist of #room_name:matrix_server for example #disroot:disroot.org This type of addresses are recognizable by Riot client and once clicked, will try to join the room automatically.
+
+If you know the matrix room address or perhaps would like to join one of the IRC channels straight away without too much clicking, you can use this command: `/join #channel_name:server.url`  (for example /join #disroot:disroot.org). For syntax and list of currently IRC bridged networks, check this page: https://github.com/matrix-org/matrix-appservice-irc/issues/208
+
+
+----------
+
+# Creating rooms
+To create new room simply click on the <img src="riot_interface11.png" width="26" height="24"> and type desired name. You will automatically be logged into the new room and you can start inviting people to it by clicking on <img src="riot_interface12.png" width="110" height="28"> button on the bottom right.
+
+Clicking room's settings button <img src="riot_interface13.png" width="25" height="25"> in the **"chat detail"** block (top),  will reveal some settings you might consider:
+
+ - Who can access the room
+ - Enable Encryption
+ - Permissions to read rooms history
+ - User permissions
+ - additional aliases.
+
+## Aliases
+Remember when I said the rooms are federated? Since the room gets duplicated to other servers (whenever some user from other server joins the room), the rooms can continue living in the network even if the originating server is no longer available. This is the true power of decentralized and federated networks. They are immune to server shutdowns or censorship.
+So since rooms "live in the network" you can easily add extra aliases to them. Usually those aliases refer to different servers (so that they they can be easily search-able and if permitted, listed in rooms directories on other servers), you can also add extra names you want your room to figure under. For example we want our disroot room to be accessible if someone tries to join room #support:disroot.org. We just simply add new alias to existing room.
+**example:**
+![](riot_interface14.png)
+
+
+----------
+
+# Starting private chats
+If you want to start chatting with someone in private, you can do it in numerous ways:
+
+The easiest way is to click on the <img src="riot_interface15.png" width="21" height="23">on the bottom of **"Action and Settings block**, and type the name of the person you would like to talk to. The autocompletion will give you suggestions based on the channels you are already in.
+![](riot_interface16.png)
+
+If you decided to upload your email and share you address book with riot, it will try to search through your address-book to provide you with names of you contacts that are already using matrix.
+
+If you want to talk to someone that does not figure in one of the rooms or your address book, you need to know their matrixID. The user address is quite similar to the room address but has **@** symbol instead of **#** in the beginning (@username:server.url). And so the address of our beloved test users is: @testuser:disroot.org
+
+Once you started new private room, you will notice it's not that much different then the ordinary matrix room. In fact it's pretty much the same thing. You can invite more people to it, change it's name, add user permissions, list it in room directory of the server, etc.
+
+
+----------
+
+# Enabling encryption
+Since recently, matrix ships with end to end encryption. What does it mean? It means the messages are encrypted and decrypted on users computer without interference from the server side. This means administrators, or anyone "eavesdropping" on the conversation cannot read it. This quarantines privacy and protects your conversation from any dirty hands.
+
+Matrix uses same technology for encrypting messages as OMEMO on xmpp, SIgnal or Whatsapp. Matrix's implementation of it is called: [Olm](https://matrix.org/blog/2016/11/21/matrixs-olm-end-to-end-encryption-security-assessment-released-and-implemented-cross-platform-on-riot-at-last/)
+To enable encryption in your room go to room settings <img src="riot_interface17.png" width="25" height="25"> and select
+![](riot_interface18.png)
+
+## Few things to be aware of when using Encryption
+1. Encryption keys are created per device! This means you won't be able to read history of the conversation if you joined in at later stage with your device (eg. second laptop)
+2. If you logout, or your browser (if using browser to connect) closes the session, your keys will be lost and newly created ones upon login will not be able to read history. This makes sense as in case your account is compromised, the history of your encrypted chats won't be view-able. We recommend therefor to use Riot mobile and native desktop versions and never hit the logout button (unless you want to loose your encrypted room history).
+3. Once Encryption is enabled in the room, it cant be disabled.
+4. You can't make use of any integration (linking to irc or slack or having rss bot for example).
+
+## Trust and key verification
+Once you enter the room with encryption switched on, you will notice people having <img src="riot_interface19.png" width="17" height="21"> or <img src="riot_interface20.png" width="22" height="20"> next to their messages.
+
+<img src="riot_interface20.png" width="22" height="20"> Means the encryption key for the device the message has been sent from has not yet been verified by you.
+<img src="riot_interface19.png" width="17" height="21">  means you have verified the device.
+
+**What does it mean?**
+If you truly want to be sure person you are talking with is the one you think it is, you need to have an option to verify that. By default all the encryption keys of any user are not verified and that's why you get <img src="riot_interface20.png" width="22" height="20"> next to their messages as an indication. In order to make sure the communication channel is secure, you need to trust that device and the person. Each device used by a person you communicate with generates encryption keys. Each key has it's unique fingerprint (just like human fingerprints). When you click on the <img src="riot_interface20.png" width="22" height="20"> you will be presented with all the information about the device, it's key and the fingerprint. You can just blindly trust it by clicking on "Verify" button, but that's not ensuring you in any way the person on the other side is the one you think it is.
+
+The best way to verify the fingerprint is to use other means of communication (personally, email, other chat) to send each others fingerprints for verification. You can also ask some private questions in the chatroom in order to verify person you are talking to. It's up to you how you want to ensure you are safe and what's the level of security for your chat. Many other services (such as signal or whatsapp) seem to skip that point, or make it very easy (where your app trusts other persons encryption key by default) but that's what makes encryption less secure. In most cases when using other apps such as whatsapp by default you have no way of telling if someone's account has been tempered with (new encryption keys generated), and you need to manually enable such option.
+
+Encryption is not a joke and basic understanding how it works is what makes your communication more secure.
+
+
+----------
+
+# Integrations
+Integration is what makes matrix so strong. With integration you can easily extend the features of the room by adding bots, as well as joining chats on different networks (protocols/apps) unconnected to matrix.
+
+To enable any of the integration, go to your room's Settings and click on "Manage integration" button.
+
+
+## Bridges
+At this moment you can easily bridge any room on several IRC networks. Slack and Gitter. There is more and more bridges being written so soon we will be able to easily integrate and link more networks with eachother. At the moment we are looking into integration with: xmpp muc, telegram, hangouts, libpurple, etc. If you are interested, ask us for more details.
+
+## Other integrations
+
+ - RSS bot - Updates posts based on RSS feed of chosen website.
+ - Guggy and Giphy - Posts animated gifs based on keyword (eg. !guggy awesome)
+ - Github - you can post issued form the channel directly to your github project
+
+## Bots
+We are working on deploying various bots you can invite to your room. Bots are there to basically serve you. From useful stuff such as, give you weather information on any given place, or distance between two cities, search wikipedia, loading RSS feeds, search the net, to useless things such as telling you a joke, or insult any give person. You can already now invite mijris (@mijris:chat.weho.st) form our friends at [weho.st](https://weho.st) to your channel. For more info type **!help** once mijris joins or ask us on our disroot channel for help.

pages/05.XMPP/01. Desktop/Pidgin/docs.md

@@ -0,0 +1,29 @@
+---
+title: Pidgin
+---
+
+Pidgin is multi-platform (runs on most operating systems) and multi-protocol messaging application. It supports a lot of different messaging protocols such as: xmpp, skype, AIM, TOX, Whatsapp, facebook etc, so you can have all your messaging done with just one app.
+
+To setup disroot chat on pidgin, follow those easy steps:
+
+1. **Install Pidgin.**
+If you use windows/macos check [pidgin's website]( http://pidgin.im/download/)and download a version for you.
+If you are a linux user, check your package repository and get it. (check for some additional plugins while you're at it.
+
+2. **Fire it up.**
+You will be greeted with a welcome message like this:
+![](pidgin1.png)
+To Proceed, we need to **add an account**.
+If it's not the first time you run pidgin you should use menu:
+![](pidgin2.png)
+3. **Setup account.**
+First of, choose xmpp protocol from the drop-down list:
+![](pidgin3.png)
+Next fill in the information needed:
+![](pidgin4.png)
+!Note! If you wish to use avatar (optional) you can select "Use this buddy icon for this account" and browse your local filesystem (computer) for the picture you want to use.
+4. Hit "**Add**" and you are done!
+Now you are ready to start preaching people to ditch corporate evil apps and jump on the federation *Starship*.
+![](pidgin5.png)
+
+**All your contacts are synced between all the clients, so you can use disroot chat on all the devices at the same time.**