Update Channels

[xonotic/xonotic.wiki.git] / Channels.md

diff --git a/Channels.md b/Channels.md
index 7a76f22a602bb3b4735c3fdb49be00858c56dcb6..95d3cfcb89d4b19101496ebd5165d0398323ce57 100644 (file)
--- a/Channels.md
+++ b/Channels.md
@@ -1,24 +1,27 @@
 Internet Relay Chat and Instant Messaging channels
 ==================================================
 
-IRC
+Matrix
 ---
 
-For a short introduction to IRC, [skip to the bottom of this page](Channels#general-irc-info-and-rules).
+General chat and help is in [#main:xonotic.org](https://matrix.to/#/#main:xonotic.org)  
+Developer chat is in [#dev:xonotic.org](https://matrix.to/#/#dev:xonotic.org)
 
-### FreeNode (chat.freenode.net:6667) - https://webchat.freenode.net/
+IRC
+---
 
-    #xonotic - Game developer channel. Non-development subjects should be directed to the main Xonotic channel on QuakeNet
+For a short introduction to IRC, [skip to the bottom of this page](Channels#general-irc-info-and-rules).
 
 ### QuakeNet (irc.quakenet.org:6667) - https://webchat.quakenet.org/
 
     #xonotic           - General purpose channel, bridged  to discord: https://discordapp.com/invite/0uxcsw1XMkaOB936
     #xonotic.cup       - Cup channel
-    #xonotic.duel      - Duel servers (psyx, FPS, WTWRP, pacman)
+    #xonotic.duel      - Former channel for duel servers (PsyX, PAC)
     #xonotic.editing   - Channel for mapmakers, modelers, texturers, etc.
     #xonotic.maps      - Channel for xonotic.co
     #xonotic.pickup    - Pickup channel
     #xonotic.translate - Channel to discuss translation issues
+    #xonotic.bar       - Off-topic conversations
 
 Country/Region specific IRC channels:
 
@@ -27,6 +30,7 @@ Country/Region specific IRC channels:
     #xonotic.fr - Xonotic France
     #xonotic.na - Xonotic North America
     #xonotic.ru - Xonotic Russia
+    #xonotic.sp - Xonotic Spanish
 
 Clan channels:
 
@@ -62,7 +66,8 @@ Server channels:
     #pac.xon           - WTWRP, FPS, pacman non-Duel servers
     #Prophets.DM       - Prophets DM server
     #Prophets.Duel     - Prophets Insta 1v1 server
-    #Prophets.XDF      - Propehts DeFrag server
+    #Prophets.XDF      - Prophets DeFrag server
+    #psyx.servers      - PsyX servers
     #regulars.servers  - More The Regulars servers
     #smb.1v1           - HUB Duel servers
     #theregulars       - The Regulars InstaGib server
@@ -92,7 +97,19 @@ Discord
 
 [invite link](https://discordapp.com/invite/0uxcsw1XMkaOB936)
 
-Some channels are bridged to IRC.
+Some channels are bridged to QuakeNet IRC:
+
+| Discord | QuakeNet IRC |
+| ------ | ------ |
+| #general | #xonotic |
+| #mapping | #xonotic.editing |
+| #tournaments | #xonotic.cup |
+| #xonotic_pickup | #xonotic.pickup |
+| #stream_announcements | #xonotic.streams |
+| #french | #xonotic.fr |
+| #german | #xonotic.de |
+| #russian | #xonotic.ru |
+| #spanish | #xonotic.sp |
 
 General IRC info and rules
 --------------------------
@@ -143,5 +160,4 @@ It is also considered rude to highlight (typing other peoples names) someone rep
 This goes mostly for help channels, but repeating a question multiple times within minutes doesn’t get you an answer any faster.
 This is also considered rude and more likely will get you ignored.
 People who have been away tend to read their chat history or backlog and will get back to you on their own.
-But on a very busy channel, your text might get overlooked and you can repeat it after waiting an appropriate time.
-
+But on a very busy channel, your text might get overlooked and you can repeat it after waiting an appropriate time.
\ No newline at end of file