aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--templates/main/about/channels.html8
-rw-r--r--templates/main/about/rules.html15
2 files changed, 15 insertions, 8 deletions
diff --git a/templates/main/about/channels.html b/templates/main/about/channels.html
index 7bcd2cd9..0ee8df2f 100644
--- a/templates/main/about/channels.html
+++ b/templates/main/about/channels.html
@@ -54,7 +54,7 @@
<td class="fira-code">#other-languages</td>
<td>
Discussion about non-Python programming - this is not a channel for non-English
- speaking languages
+ discussion
</td>
</tr>
<tr>
@@ -76,7 +76,9 @@
</p>
<p>
- Please try to pick a channel that isn't busy when asking your question.
+ Please try to pick a channel that isn't busy when asking your question. If you're not sure
+ how best to ask a question, take a look at
+ <a href="{{ url_for("main.info.help") }}">our guide on that subject</a>.
</p>
<h2>Topical Chat/Help</h2>
@@ -156,7 +158,7 @@
<td class="fira-code">#web-development</td>
<td>
Discussion and questions relating to web development - including Python frameworks
- such as Flask and Django, as well as HTML and JavaScript where it related to the Web
+ such as Flask and Django, as well as HTML and JavaScript where it relates to the Web
</td>
</tr>
</tbody>
diff --git a/templates/main/about/rules.html b/templates/main/about/rules.html
index d4d7bf1f..b11f91d9 100644
--- a/templates/main/about/rules.html
+++ b/templates/main/about/rules.html
@@ -28,12 +28,16 @@
Follow the <a href="https://discordapp.com/guidelines">Discord community guidelines</a>
</li>
<li>
+ Don't intentionally make other people uncomfortable - if someone asks you to stop discussing
+ something, you should stop
+ </li>
+ <li>
Be patient both with users asking questions, and the users answering them
</li>
<li>
- We cannot help you with anything that might break a law or the terms of service of any other
- community, site, service, or otherwise - No piracy, no brute-forcing, no captcha circumvention,
- no sneaker bots, and so on
+ We will not help you with anything that might break a law or the terms of service of any other
+ community, site, service, or otherwise - No piracy, brute-forcing, captcha circumvention,
+ sneaker bots, or anything else of that nature
</li>
<li>
Listen to and respect the staff members - we're here to help, but we're all human beings
@@ -43,11 +47,12 @@
<a href="{{ url_for("main.about.channels") }}">channels page</a> for more information
</li>
<li>
- This is an English-speaking server - Please speak English to the best of your ability -
+ This is an English-speaking server, so please speak English to the best of your ability -
<a href="https://translate.google.com">Google Translate</a> should be fine if you're not sure
</li>
<li>
- Keep all discussions safe for work - No gore, nudity, sexual soliciting or references to suicide
+ Keep all discussions safe for work - No gore, nudity, sexual soliciting, references to suicide,
+ or anything else of that nature
</li>
<li>
We do not allow advertisements for communities or commercial projects - Contact us directly if