Merge pull request 'devel' (#19) from devel into master

Reviewed-on: https://git.com.de/LibertaCasa/website/pulls/19

1 files changed, 9 insertions, 34 deletions

diff --git a/irc.html b/irc.html
index cbfed4d..5babe9c 100644
--- a/irc.html
+++ b/irc.html
@@ -17,6 +17,7 @@
 │   │─┤ └─┐ │─┤
 └─┘ ┘ │ ──┘ ┘ │
 </pre>
+
 <h3>IRC</h3>
 <pre>
 
@@ -61,9 +62,9 @@ Account registration FAQ
 
 1. How do I register my nickname / account?
 
-Use this command, substituting your desired password and e-mail address:
+Use this command, substituting your desired password:
 
-/msg NickServ register mySecretPassword
+  /msg NickServ register mySecretPassword
 
 You can also register on this page <a href="/register">here</a>
 
@@ -72,14 +73,11 @@ Once you register your nick it becomes your account name. It is the name with wh
 
 2. How do I authenticate to my nickname?
 
-You should enable SASL in your client. For clients like Hexchat the Username field needs to be populated with the name that you registered.
-
+You should enable SASL in your client. 
 
-If your client doesn't support SASL, there are potential workarounds;
-you may be able to script your client to authenticate to NickServ
-automatically, with `/msg NickServ identify nickname password`.
 
-Ask in #help for support with this.
+ - If your client doesn't support SASL, then update to a good client!
+ - Alternatively, you can use the "PASS" method
 
 3. What are the benefits of registering my nickname?
 
@@ -92,34 +90,11 @@ as an "IRC bouncer" on your behalf. Specifically:
   c. Optionally, the server can keep you present on the server even if
      you have no connected clients. To enable this, use the following command:
      `/msg NickServ set always-on true`
-  d. You will be able to receive history playback (see below).
-
-You can also request a vhost in the channel #help (i.e., a fake hostname that will be displayed
-in place of your cloaked IP-based hostname).
-
-
-4. History Playback.
-
-1 If you set your client to `always-on` (see the previous section for details), you can set a "device ID" for each device you use. Oragono will then remember the last time your device was present on the server, and each time you sign on, it will attempt to replay exactly those messages you missed.
-2 You can set the SASL Username as `nick@phone` or `nick@laptop` while connecting. This allows you to fetch history based on your "DeviceID" which is `phone` or `laptop` in these cases.
-3 If you only have one device, you can set your client to be always-on and furthermore `/NS SET autoreplay-missed true`. This will replay missed messages, with the caveat that you must be connecting with at most one client at a time.
-4 You can autoreplay a fixed number of lines (e.g., 25) each time you join a channel using `/NS SET autoreplay-lines 25`.
-5 You can manually request history using `/history #channel 1h` (the parameter is either a message count or a time duration). (Depending on your client, you may need to use `/QUOTE history` instead.)
-6 You can also enable history for private messages called `DMs`  by passing the following command: `/NS SET dm-history true`.
-
-#### Sessions and Clients
-
-- You can check how many of your sessions are online with `/NS SESSIONS `and the idle times for those.
-- You can list your clients in further detail with `/NS CLIENTS list`
-- You can use `/NS CLIENTS logout client-id/all` to either logout a single session or all sessions.
-
-
-
-
-
-
+  d. You will be able to receive <a href="https://github.com/ergochat/ergo/blob/master/docs/USERGUIDE.md#history">history</a> playback.
 
 
+For more information checkout the <a href="https://github.com/ergochat/ergo/blob/master/docs/USERGUIDE.md">UserGuide</a> and
+the <a href="https://github.com/ergochat/ergo/blob/master/docs/MANUAL.md">Manual</a>.