From 77a884fb29ac1466e8126301535cb11317a5828f Mon Sep 17 00:00:00 2001
From: Gareth Coles <gdude2002@gmail.com>
Date: Tue, 3 Jul 2018 13:28:31 +0100
Subject: Update channel listing

---
 templates/main/about/channels.html | 57 ++++++++++++++++++++++++++------------
 1 file changed, 39 insertions(+), 18 deletions(-)

(limited to 'templates')

diff --git a/templates/main/about/channels.html b/templates/main/about/channels.html
index e970a26d..4b4aab9c 100644
--- a/templates/main/about/channels.html
+++ b/templates/main/about/channels.html
@@ -23,11 +23,11 @@
                     messages to, and what they should be used for.
                 </p>
 
-                <h2>Conversation</h2>
+                <h2>Discussion</h2>
 
                 <p>
                     Channels in this section are designated for discussion and chat, and shouldn't be used for help
-                    requests in most cases.
+                    requests in most cases. All channels in this category are on-topic.
                 </p>
 
                 <table uk-table class="uk-table-striped uk-table uk-table-divider table-bordered">
@@ -39,22 +39,16 @@
                     </thead>
                     <tbody>
                         <tr>
-                            <td class="fira-code">#python</td>
+                            <td class="fira-code">#python-discussion</td>
                             <td>
                                 Discussion about the Python programming language and ecosystem
                             </td>
                         </tr>
                         <tr>
-                            <td class="fira-code">#off-topic</td>
+                            <td class="fira-code">#tools</td>
                             <td>
-                                Off-topic discussion that doesn't fit in any other channel
-                            </td>
-                        </tr>
-                        <tr>
-                            <td class="fira-code">#other-languages</td>
-                            <td>
-                                Discussion about non-Python programming - this is not a channel for non-English
-                                discussion
+                                Discussion relating to Python tooling - IDEs, editors, package managers, documentation
+                                generators, and so on
                             </td>
                         </tr>
                         <tr>
@@ -67,6 +61,19 @@
                     </tbody>
                 </table>
 
+                <h2>Off-Topic</h2>
+
+                <p>
+                    Channels in this section are designated for off-topic <strong>discussion</strong>, and any topic
+                    may be talked about here once it follows our rules. Note that these channels are for discussion,
+                    and are not places for you to dump images or memes.
+                </p>
+
+                <p>
+                    These channels are renamed daily by the server bot. Suggest funny channel names
+                    <a href="https://gitlab.com/python-discord/meta/issues/8">on the dedicated GitLab meta issue</a>.
+                </p>
+
                 <h2>Python Help</h2>
 
                 <p>
@@ -141,17 +148,24 @@
                             </td>
                         </tr>
                         <tr>
-                            <td class="fira-code">#guis</td>
+                            <td class="fira-code">#security</td>
                             <td>
-                                Discussion and questions relating to designing and building graphical user interfaces
-                                in Python, and related libraries and tools
+                                Discussion and questions relating to cybersecurity, especially in relation to Python
+                                and best practises
                             </td>
                         </tr>
                         <tr>
-                            <td class="fira-code">#security</td>
+                            <td class="fira-code">#software-testing</td>
                             <td>
-                                Discussion and questions relating to cybersecurity, especially in relation to Python
-                                and best practises
+                                Discussion and questions relating to testing your Python applications
+                            </td>
+                        </tr>
+                        <tr>
+                            <td class="fira-code">#user-interface</td>
+                            <td>
+                                Discussion and questions relating to designing and building user interfaces
+                                in Python, and related libraries and tools - this includes graphical interfaces and
+                                console interfaces
                             </td>
                         </tr>
                         <tr>
@@ -213,6 +227,13 @@
                                 with something better later, so stay tuned!
                             </td>
                         </tr>
+                        <tr>
+                            <td class="fira-code">#reddit</td>
+                            <td>
+                                A listing channel with a live feed of posts from
+                                <a href="https://reddit.com/r/Python">r/Python</a>, our official subreddit.
+                            </td>
+                        </tr>
                         <tr>
                             <td class="fira-code">#show-your-projects</td>
                             <td>
-- 
cgit v1.2.3