diff --git a/pages/02.tutorials/04.Chat/01.Webchat/docs.en.md b/pages/02.tutorials/04.Chat/01.Webchat/docs.en.md
index bd429b0e..23eb9abf 100644
--- a/pages/02.tutorials/04.Chat/01.Webchat/docs.en.md
+++ b/pages/02.tutorials/04.Chat/01.Webchat/docs.en.md
@@ -1,66 +1,71 @@
---
-title: 'Chat: Web client'
-updated:
- last_modified: "April 2019"
- app: Converse.js
- app_version: 4.2
+title: 'Chat: Webchat'
published: true
-visible: false
+visible: true
+indexed: true
+updated:
+ last_modified: "11 April 2019"
+ app: Converse.js
+ app_version: 4.2.0
taxonomy:
category:
- docs
tags:
- - Chat
- - XMPP
- - converse
+ - chat
page-toc:
active: true
---
-**NOTE:**```If the howto reffers to an older software version than the provided by``` **Disroot**,```or the one you're using in your device, there could be missing features or small parts of the information that may have changed.```
**Disroot's** ```how-to documentation is a community driven procces. We try to keep it as updated as we can.```
-
----
-||
-|:--:|
-|Converse is a free and open-source XMPP chat client that runs in a web browser and
**[webchat.disroot.org](https:webchat.disroot.org)** provides a way to connect to your XMPP account through it.|
+
+Converse is a free and open-source XMPP chat client that runs in a web browser and
**[webchat.disroot.org](https:webchat.disroot.org)** provides a way to connect to your XMPP account through it.
# Connecting
Open your favorite web browser and go to **[webchat.disroot.org](https://webchat.disroot.org)**
-||
-|--|
-|1. **XMPP Address**: *Your_Disroot_email*
2. **Password:** *Your_super_secret_Disroot_password*
3. **This is a trusted device**: Uncheck this box if you're not on your own computer.|
+
+1. **XMPP Address**: *Your_Disroot_email*
+2. **Password:** *Your_super_secret_Disroot_password*
+3. **This is a trusted device**: Uncheck this box if you're not on your own computer.
# User Interface
Once you've logged in, you may see something like this:
-||
-|--|
-|1. Your personnal details
2. The list of chat rooms you're logged in and your bookmarked rooms
3. The current room information
4. The current room participants
5. The current room features/configuration
6. The current room on-going discussion
7. The message editor|
+
+1. Your personnal details
+2. The list of chat rooms you're logged in and your bookmarked rooms
+3. The current room information
+4. The current room participants
+5. The current room features/configuration
+6. The current room on-going discussion
+7. The message editor
# Rooms
You can participate in group discussions, also called groupschats or rooms.
## Entering a room
-||
-|--|
-|1. Click on this button to join or create a room.
2. **Groupchat address**: Enter the address of the room you want to join. It can be a room from any XMPP server that federates. For example, if you want to join a room on **Disroot** server, add ```chat.disroot.org``` after the room name. In this image, the user is trying to join the room called ```mytestroom``` on *chat.disroot.org* XMPP server.
3. **Nickname**: you are free to enter whatever username you wish, it doesn't have to be your real **Disroot** username. You can then have a different username on each room you're in if you want.
4. **Join** the room by clicking here.|
+
+1. Click on this button to join or create a room.
+2. **Groupchat address**: Enter the address of the room you want to join. It can be a room from any XMPP server that federates. For example, if you want to join a room on **Disroot** server, add ```chat.disroot.org``` after the room name. In this image, the user is trying to join the room called ```mytestroom``` on *chat.disroot.org* XMPP server.
+3. **Nickname**: you are free to enter whatever username you wish, it doesn't have to be your real **Disroot** username. You can then have a different username on each room you're in if you want.
+4. **Join** the room by clicking here.
## Sending messages
-||
-|--|
-|1. Type your message here.
2. With two buttons, you can add an emoji or share a file (it can be any type of file, maximum size being 10MB)
3. Click on **Send** when you're done writing your message.
+
+1. Type your message here.
+2. With two buttons, you can add an emoji or share a file (it can be any type of file, maximum size being 10MB)
+3. Click on **Send** when you're done writing your message.
-**Note:** Shift + Enter will allow you to add a line break.
+!! 
+!! NOTE: Shift + Enter will allow you to add a line break.
You can mention people in your message so they get a notification. Just click on their nickname in the participants list, or add it manually if you know it. You can also start to write its first letters and tap on the tab key of your keyboard to have a suggestion list of nicknames.
-|Here, we can see the user is actually reading stuff from the Prosody room (blue background) and get a message with its username in the Disroot Howto room.||
-|--|--|
+Here, we can see the user is actually reading stuff from the Prosody room (blue background) and get a message with its username in the Disroot Howto room.
+
## Editing messages
@@ -98,17 +103,21 @@ If you want to get more information about the room, just click on the "i" icon o
## Finding a public room
You can search for public rooms (and only for public ones):
-||
-|--|
-|1. Click on this button to open the *Search* window.
2. Enter the address of the server you want to search public rooms on. For example, could be *chat.disroot.org*
3. Click on "Show groupchats"
4. You'll then get a list of public rooms. Just click on the one you want to join.|
+
+1. Click on this button to open the *Search* window.
+2. Enter the address of the server you want to search public rooms on. For example, could be *chat.disroot.org*
+3. Click on "Show groupchats"
+4. You'll then get a list of public rooms. Just click on the one you want to join.
## Creating a room
The process is quite similar to enter an existing room.
-||
-|--|
-|1. Click on this button to join or create a room.
2. **Groupchat address**: Enter the address of the room you want to create. It only can be a room on **Disroot** XMPP server. For example, something like *mytestroom@chat.disroot.org*.
3. **Nickname**: you're free to enter whatever username you wish, it doesn't have to be your real **Disroot** username. You can then have differents usernames on each room you're in if you want.
4. **Join** the room by clicking here. If the room already exists, then you'll join in if it is public. Otherwise, you'll need to find another room name.|
+
+1. Click on this button to join or create a room.
+2. **Groupchat address**: Enter the address of the room you want to create. It only can be a room on **Disroot** XMPP server. For example, something like *mytestroom@chat.disroot.org*.
+3. **Nickname**: you're free to enter whatever username you wish, it doesn't have to be your real **Disroot** username. You can then have differents usernames on each room you're in if you want.
+4. **Join** the room by clicking here. If the room already exists, then you'll join in if it is public. Otherwise, you'll need to find another room name.
You'll get a message at the top of the room saying that you just succeeded in creating your room:
@@ -116,7 +125,8 @@ You'll get a message at the top of the room saying that you just succeeded in cr
Here are the default features of your room when you first create it:
-As you've created the room, you're the owner and it's admin. So you can change those features as you want. Click on the tool icon on the top-right corner of the room page. 
+As you've created the room, you're the owner and it's admin. So you can change those features as you want. Click on the tool icon on the top-right corner of the room page.
+
You'll then get this page:
@@ -128,9 +138,11 @@ You can also chat with someone in private, in a 1:1 discussion with only the two
## Adding a contact
First you'll need to add a contact before you can talk to the user.
-||
-|--|
-|1. Click on this button to add a contact.
2. **XMPP Address**: *Your_Contact_XMPP_address*. It can be any XMPP server address, as long as it federates.
3. **Optional nickname**: it can be anything you want.
4. **Add**: click on the button once you're done.|
+
+1. Click on this button to add a contact.
+2. **XMPP Address**: *Your_Contact_XMPP_address*. It can be any XMPP server address, as long as it federates.
+3. **Optional nickname**: it can be anything you want.
+4. **Add**: click on the button once you're done.
The contact will be informed that you have added him/her to your Contacts list. Until the user approves it, this contact can be found in your pending list:
@@ -150,8 +162,8 @@ To have more information about your contact, click on the ID card icon on the to
## Encrypting a conversation
-If you want your conversation to be really secure, make sure that **OMEMO** is activated. To do so, check the lock icon. If the lock looks open, then the conversation is not enrypted. 
-If the chat is encrypted then it should look like this: 
+If you want your conversation to be really secure, make sure that **OMEMO** is activated. To do so, check the lock icon. If the lock looks open, then the conversation is not enrypted.  {.inline}
+If the chat is encrypted then it should look like this:  {.inline}
# Personnal details
@@ -176,9 +188,3 @@ To log out from [webchat.disroot.org](https://webchat.disroot.org), just click o
# Converse.js
To know more about the software used, check [converse.js](https://conversejs.org/) website
-
----
-
- 
This work is licensed under a
Creative Commons Attribution-ShareAlike 4.0 International License.
-
----
diff --git a/pages/02.tutorials/04.Chat/01.Webchat/thumb.png b/pages/02.tutorials/04.Chat/01.Webchat/thumb.png
new file mode 100644
index 00000000..10771acf
Binary files /dev/null and b/pages/02.tutorials/04.Chat/01.Webchat/thumb.png differ
diff --git a/pages/02.tutorials/04.Chat/02.Desktop/01.pidgin/docs.en.md b/pages/02.tutorials/04.Chat/02.Desktop/01.pidgin/docs.en.md
index 9a9514de..eb2d8a2d 100755
--- a/pages/02.tutorials/04.Chat/02.Desktop/01.pidgin/docs.en.md
+++ b/pages/02.tutorials/04.Chat/02.Desktop/01.pidgin/docs.en.md
@@ -4,20 +4,20 @@ updated:
app: Pidgin
published: true
visible: false
+indexed: true
+updated:
taxonomy:
category:
- docs
tags:
- - Chat
- - XMPP
- - Pidgin
+ - chat
+ - pidgin
page-toc:
active: true
---
-||
-|:--:|
-|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.|
+
+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.
# Installing Pidgin
@@ -42,9 +42,9 @@ Next, fill in the information needed:
-| Note!|
-|:--:|
-|If you want to use an avatar (optional) you can select it by checking the "Use this buddy icon for this account" option and browsing your local filesystem (computer) for the picture you want to use.|
+
+!! 
+!! NOTE: If you want to use an avatar (optional) you can select it by checking the "Use this buddy icon for this account" option and browsing your local filesystem (computer) for the picture you want to use.
Click the "**Add**" button and you're done!
diff --git a/pages/02.tutorials/04.Chat/02.Desktop/02.gajim/docs.en.md b/pages/02.tutorials/04.Chat/02.Desktop/02.gajim/docs.en.md
index 715c885e..94e2e085 100644
--- a/pages/02.tutorials/04.Chat/02.Desktop/02.gajim/docs.en.md
+++ b/pages/02.tutorials/04.Chat/02.Desktop/02.gajim/docs.en.md
@@ -6,23 +6,23 @@ updated:
app_version: 1.1
published: true
visible: false
+indexed: true
+updated:
+ last_modified: "17 April 2019"
+ app: Gajim
+ app_version: 1.1
taxonomy:
category:
- docs
tags:
- - Chat
- - XMPP
- - Gajim
+ - chat
+ - gajim
page-toc:
active: true
---
-**NOTE:**```If the howto reffers to an older software version than the provided by``` **Disroot**,```or the one you're using in your device, there could be missing features or small parts of the information that may have changed.```
**Disroot's** ```how-to documentation is a community driven procces. We try to keep it as updated as we can.```
-
----
-||
-|:--:|
-|Gajim is multi-platform (runs on most operating systems) messaging application.|
+
+Gajim is multi-platform (runs on most operating systems) messaging application.
To setup **Disroot** chat on **Gajim**, follow these easy steps:
@@ -231,9 +231,3 @@ Click on **OK** when you're done.
We have just presented what we think to be the most important features to start using your XMPP account on **Gajim**. But **Gajim** is full of features, so explore them!
If you have any question regarding the use of **Gajim**, join the gajim XMPP room: gajim@conference.gajim.org or check the [gitlab repo](https://dev.gajim.org/gajim/gajim)
-
----
-
-
This work is licensed under a
Creative Commons Attribution-ShareAlike 4.0 International License.
-
----
diff --git a/pages/02.tutorials/04.Chat/02.Desktop/03.dino/docs.en.md b/pages/02.tutorials/04.Chat/02.Desktop/03.dino/docs.en.md
index 6e8a20e1..7c02179d 100644
--- a/pages/02.tutorials/04.Chat/02.Desktop/03.dino/docs.en.md
+++ b/pages/02.tutorials/04.Chat/02.Desktop/03.dino/docs.en.md
@@ -4,19 +4,20 @@ updated:
app: Dino
published: true
visible: false
+indexed: true
+updated:
taxonomy:
category:
- docs
tags:
- - Chat
- - XMPP
- - Dino
+ - chat
+ - gajim
page-toc:
- active: true
+ active: false
---
-||
-|:--:|
-|Dino is an open source chat client for the desktop. It has support for [OMEMO](https://en.wikipedia.org/wiki/OMEMO) and [OpenPGP](https://en.wikipedia.org/wiki/Pretty_Good_Privacy#OpenPGP), which means that once you enable encryption, only you and the other person can read your messages and no one else.|
+
+
+Dino is an open source chat client for the desktop. It has support for [OMEMO](https://en.wikipedia.org/wiki/OMEMO) and [OpenPGP](https://en.wikipedia.org/wiki/Pretty_Good_Privacy#OpenPGP), which means that once you enable encryption, only you and the other person can read your messages and no one else.
1. **Installing Dino**
diff --git a/pages/02.tutorials/04.Chat/02.Desktop/13.png b/pages/02.tutorials/04.Chat/02.Desktop/13.png
new file mode 100644
index 00000000..c91079d6
Binary files /dev/null and b/pages/02.tutorials/04.Chat/02.Desktop/13.png differ
diff --git a/pages/02.tutorials/04.Chat/02.Desktop/docs.en.md b/pages/02.tutorials/04.Chat/02.Desktop/docs.en.md
index 9af0886c..491ac640 100755
--- a/pages/02.tutorials/04.Chat/02.Desktop/docs.en.md
+++ b/pages/02.tutorials/04.Chat/02.Desktop/docs.en.md
@@ -2,20 +2,23 @@
title: Chat: Desktop Clients
updated:
published: true
-visible: false
+visible: true
+indexed: true
+updated:
taxonomy:
category:
- docs
tags:
- - Chat
- - XMPP
+ - chat
page-toc:
- active: false
+ active: false
---
+# Chat Clients for Desktop
+
### Multiplatform clients
-#### [Pidgin](pidgin)
-#### [Gajim](gajim)
+- [Pidgin](pidgin)
+- [Gajim](gajim)
### GNU/Linux clients
-#### [Dino](dino)
+- [Dino](dino)
diff --git a/pages/02.tutorials/04.Chat/03.Mobile/01.android/01.Conversations/docs.en.md b/pages/02.tutorials/04.Chat/03.Mobile/01.android/01.Conversations/docs.en.md
index 5b9ca387..4f89200e 100755
--- a/pages/02.tutorials/04.Chat/03.Mobile/01.android/01.Conversations/docs.en.md
+++ b/pages/02.tutorials/04.Chat/03.Mobile/01.android/01.Conversations/docs.en.md
@@ -2,19 +2,20 @@
title: Conversations - Android
published: true
visible: false
+indexed: true
updated:
- app: Conversations
taxonomy:
category:
- docs
tags:
- - Chat
- - XMPP
- - Conversations
- - Android
+ - chat
+ - conversations
page-toc:
active: false
---
+
+# Conversations - XMPP client for android
+
Conversations is powerful xmpp client for android that supports OTR and GPG encryption and conferences (multi-user chats). It is available on F-Droid and other commercial app stores.
Here is what you need to do to get things rolling.
diff --git a/pages/02.tutorials/04.Chat/03.Mobile/01.android/02.Pix-art/docs.en.md b/pages/02.tutorials/04.Chat/03.Mobile/01.android/02.Pix-art/docs.en.md
index a00bd183..56e595ce 100644
--- a/pages/02.tutorials/04.Chat/03.Mobile/01.android/02.Pix-art/docs.en.md
+++ b/pages/02.tutorials/04.Chat/03.Mobile/01.android/02.Pix-art/docs.en.md
@@ -2,30 +2,24 @@
title: 'Pix-Art messenger - Android'
published: true
visible: false
+indexed: true
updated:
- last_modified: "April 2019"
- app: Pix-Art messenger
+ last_modified: "28 April 2019"
+ app: Pix-Art Messenger
app_version: 2.2
taxonomy:
category:
- docs
tags:
- - Chat
- - XMPP
- - Pix-Art messenger
- - Android
+ - chat
+ - pix-art
page-toc:
active: true
---
-**NOTE:**```If the howto reffers to an older software version than the provided by``` **Disroot**,```or the one you're using in your device, there could be missing features or small parts of the information that may have changed.```
**Disroot's** ```how-to documentation is a community driven procces. We try to keep it as updated as we can.```
+
+Pix-Art Messenger is a powerful XMPP client for Android that supports encryption and group chats. It is a fork of Conversations and it's available on F-Droid and other commercial app stores.
----
-||
-|:--:|
-|Pix-Art Messenger is a powerful XMPP client for Android that supports encryption and group chats. It is a fork of Conversations and it's available on F-Droid and other commercial app stores.|
-
----
# Get Pix-Art messenger
Download it from [**F-Droid**](https://f-droid.org/) and install it on your device.
@@ -288,10 +282,3 @@ Long press your account and choose **Delete account**.
We have just presented what we think to be the most important features to start using your XMPP account on **Pix-Art**.
If you have any question regarding the use of **Pix-Art**, join the Pix-Art XMPP room: support@room.pix-art.de or check the [github repo](https://github.com/kriztan/Pix-Art-Messenger)
-
-
-
-
-
This work is licensed under a
Creative Commons Attribution-ShareAlike 4.0 International License.
-
----
diff --git a/pages/02.tutorials/04.Chat/03.Mobile/01.android/docs.en.md b/pages/02.tutorials/04.Chat/03.Mobile/01.android/docs.en.md
index e3844589..4515c8c9 100644
--- a/pages/02.tutorials/04.Chat/03.Mobile/01.android/docs.en.md
+++ b/pages/02.tutorials/04.Chat/03.Mobile/01.android/docs.en.md
@@ -1,7 +1,6 @@
---
title: 'Chat Clients: Android'
-updated:
-published: true
+published: false
visible: false
taxonomy:
category:
diff --git a/pages/02.tutorials/04.Chat/03.Mobile/02.sailfishos/docs.en.md b/pages/02.tutorials/04.Chat/03.Mobile/02.sailfishos/docs.en.md
index 647690de..a94a2180 100755
--- a/pages/02.tutorials/04.Chat/03.Mobile/02.sailfishos/docs.en.md
+++ b/pages/02.tutorials/04.Chat/03.Mobile/02.sailfishos/docs.en.md
@@ -3,17 +3,20 @@ title: SailfishOS
updated:
published: true
visible: false
+indexed: true
+updated:
taxonomy:
category:
- docs
tags:
- - Chat
- - XMPP
- - SailfishOS
+ - chat
+ - sailfishos
page-toc:
active: false
---
+# XMPP on SailfishOS
+
1. **Open Settings** app and scroll all the way down to "**Accounts**"
2. Add new **XMPP** account.
diff --git a/pages/02.tutorials/04.Chat/03.Mobile/03.iOS/docs.en.md b/pages/02.tutorials/04.Chat/03.Mobile/03.iOS/docs.en.md
index 67cacd49..54bcf4ab 100644
--- a/pages/02.tutorials/04.Chat/03.Mobile/03.iOS/docs.en.md
+++ b/pages/02.tutorials/04.Chat/03.Mobile/03.iOS/docs.en.md
@@ -4,17 +4,20 @@ updated:
app: ChatSecure
published: true
visible: false
+indexed: true
+updated:
taxonomy:
category:
- docs
tags:
- - Chat
- - XMPP
- - iOS
- - ChatSecure
+ - chat
+ - chatsecure
page-toc:
active: false
---
+
+# XMPP on iOS with ChatSecure
+
From the ChatSecure website:
> ChatSecure is a free and open source messaging app that features OMEMO encryption and OTR encryption over XMPP. You can connect to your existing Google accounts or create new accounts on public XMPP servers (including via Tor), or even connect to your own server for extra security.
@@ -46,4 +49,4 @@ Here is what you need to do to get things rolling.
7. You can now add contacts and join rooms!
-> Consider joining disroot@chat.disroot.org to interact with the Disroot community and howto@chat.disroot.org to discuss this documentation and start contributing.
+!! Consider joining disroot@chat.disroot.org to interact with the Disroot community and howto@chat.disroot.org to discuss this documentation and start contributing.
diff --git a/pages/02.tutorials/04.Chat/03.Mobile/conversations2.png b/pages/02.tutorials/04.Chat/03.Mobile/conversations2.png
new file mode 100644
index 00000000..04e12972
Binary files /dev/null and b/pages/02.tutorials/04.Chat/03.Mobile/conversations2.png differ
diff --git a/pages/02.tutorials/04.Chat/03.Mobile/docs.en.md b/pages/02.tutorials/04.Chat/03.Mobile/docs.en.md
index f24b4965..8e74d0a5 100755
--- a/pages/02.tutorials/04.Chat/03.Mobile/docs.en.md
+++ b/pages/02.tutorials/04.Chat/03.Mobile/docs.en.md
@@ -2,24 +2,26 @@
title: Chat: Mobile clients
updated:
published: true
-visible: false
-published: true
+visible: true
+indexed: true
+updated:
taxonomy:
category:
- docs
tags:
- - Chat
- - XMPP
+ - chat
page-toc:
- active: false
+ active: false
---
+# Chat Clients for Mobile
+
### Android
-#### [Conversations](android/conversations)
-#### [Pix-Art Messenger](android/pix-art)
+- [Conversations](android/conversations)
+- [Pix-Art Messenger](android/pix-art)
### SailfishOS
-#### [Chat app](sailfishos)
+- [Chat app](sailfishos)
### iOS
-#### [Chat Secure](ios)
+- [Chat Secure](ios)
diff --git a/pages/02.tutorials/04.Chat/docs.en.md b/pages/02.tutorials/04.Chat/docsparent.en.md
similarity index 66%
rename from pages/02.tutorials/04.Chat/docs.en.md
rename to pages/02.tutorials/04.Chat/docsparent.en.md
index 1d48954a..53f314b3 100755
--- a/pages/02.tutorials/04.Chat/docs.en.md
+++ b/pages/02.tutorials/04.Chat/docsparent.en.md
@@ -15,9 +15,9 @@ page-toc:
## What is XMPP?
-||
-|:--:|
-|XMPP (Extensible Messaging and Presence Protocol) is: "*a set of open technologies for instant messaging, presence, multi-party chat, voice and video calls, collaboration, lightweight middleware, content syndication, and generalized routing of XML data.*"|
+
+
+XMPP (Extensible Messaging and Presence Protocol) is: "*a set of open technologies for instant messaging, presence, multi-party chat, voice and video calls, collaboration, lightweight middleware, content syndication, and generalized routing of XML data.*"
XMPP provides an open and decentralized alternative to closed instant messaging services. XMPP protocol offers a lot of advantages:
@@ -28,13 +28,3 @@ XMPP provides an open and decentralized alternative to closed instant messaging
* It's **Extensible** (anyone can build custom functionality on top of the core protocols (common extensions are published in the XEP series)
... among other features.
-
-----
-## Content
-### [Webchat](webchat)
-
-### [Desktop clients](desktop)
-- Multiplatform and GNU/Linux clients
-
-### [Mobile clients](mobile)
-- Android, SeilfishOS and iOS clients