Merge branch 'master' into biboumi

pages/02.tutorials/04.Chat/04.Transports/01.IRC/docs.en.md

@@ -1,5 +1,5 @@
 ---
-title: 'Chat Transports: IRC'
+title: 'IRC Gateway'
 published: true
 visible: true
 indexed: true
@@ -16,62 +16,42 @@ page-toc:
     active: true
 ---
 
-# XMPP <-> IRC
+Disroot Chat provides [Biboumi](https://biboumi.louiz.org/), an IRC gateway for XMPP. It allows you to connect to any IRC room on any server as if it's a native XMPP chat. Our IRC gateway is hosted at **irc.disroot.org**.
 
-Disroot Chat provides [Biboumi](https://biboumi.louiz.org/), an IRC transport for XMPP, at irc.disroot.org.
+## Joining rooms and private chats
 
-## SYNTAX
+To connect to an IRC room using your **XMPP** application of choice, join a room following this schema:
-
-The syntax for connecting to IRC channel is:
 
 `#channel%irc.network.tld@irc.disroot.org`
 
-The syntax for connecting to IRC user is:
+Make sure to provide correct room name (**#channel**) and irc server's address (**irc.network.ltd**). **@irc.disroot.org** must remain as it is pointing to our biboumi's address. 
+As an example, to join **#archlinux** IRC channel on freenode you would use following address: **#archlinux%irc.freenode.net@irc.disroot.org**   
+
+Biboumi allows for private chat with users on IRC (1on1 chat). To start private chat with user on IRC, follow this syntax:
 
 `nick%irc.network.tld@irc.disroot.org`
 
-## SETTINGS
+Wehre **nick** is the username you want to talk to. 
 
-Settings can be configured at three different levels, by executing ad-hoc commands on respective items:
+## User settings
 
-1. IRC-Transport Level: `irc.disroot.org`
+Being an IRC gateway, biboumi allows you to setup your IRC accounts by executing ad-hoc-commands. Settings can be configured at three different levels:
+
+1. IRC-Gateway Level: `irc.disroot.org`
 2. IRC-Network Level: `irc.network.tld@irc.disroot.org`
 3. IRC-Channel Level: `#channel%irc.network.tld@irc.disroot.org`
 
 If there are common options across all the levels, priority or over-ride of those settings happens in the order of [3] > [2] > [1].
 
-## STEPS
+## Client support
 
-### For short-term/one-shot
+Any XMPP client can be used, although not all support ad-hoc commands which might be helpful in some cases. Below is a list of supported clients: 
-
-1. Join chat `#channel%irc.network.tld@irc.disroot.org`, with a chosen nick.
-2. You'll get messages from `irc.network.tld@irc.disroot.org`. If your nick is registered, send message `NickServ IDENTIFY password`.
-3. Start chatting in `#channel`.
-
-Repeat 1 and 3, for different channel on same network.
-
-Repeat 1 to 3, for different channel on different network.
-
-### For long-term/recurring
-
-1. Add `irc.disroot.org` to your roaster.
-2. Execute ad-hoc command on it, then enable history and persistence.
-3. Add `irc.network.tld@irc.disroot.org` to your roaster.
-4. Execute ad-hoc command on it, then add your username (nick) and password (nick password).
-5. Add `#channel%irc.network.tld@irc.disroot.org` to bookmarks and then join.
-6. Execute ad-hoc command on it, then enable history and persistence.
-7. Start chatting in `#channel`.
-
-Repeat 5 to 7, if joining different channel on same network.
-
-Repeat 3 to 7, if joining different channel on different network.
-
-## CLIENTS
-
-Any client can be used, although only following clients are known to support ad-hoc commands.
 
 ### Gajim
 
 1. Right-click on the roaster element.
 2. Click 'Execute Command'.
 3. Follow the options.
+
+## Ad-Hoc commands
+This part of tutorial is still missing. You want to contribute? Get in touch.

pages/02.tutorials/04.Chat/04.Transports/docs.en.md

@@ -1,5 +1,5 @@
 ---
-title: 'Chat: Transports'
+title: 'Chat: Transports and gateways'
 published: true
 visible: true
 indexed: true
@@ -14,10 +14,10 @@ page-toc:
     active: true
 ---
 
-# XMPP Transports
+# XMPP Transports and gateways
 
-In XMPP realm, transports are the means to connect to different protocols.
+In XMPP realm, transports and gateways are the means to connect to different protocols. This allows users to be able to talk with others on different platforms such as IRC, Matrix, Telegram, etc.
 
-Currently, Disroot Chat provides following transports:
+Currently, Disroot Chat provides following:
 
-1. [IRC](https://howto.disroot.org/en/tutorials/chat/transports/irc)
+1. [IRC gateway](irc)