Merge remote-tracking branch 'upstream/master'

Author: davidism

sopy/templates/pages/chatroom.html

@@ -40,7 +40,7 @@ <h2>Rules</h2>
     <h3>Posting Question/Answer Links</h3>
 
     <ol>
-        <li>Do not link your recently posted questions in the room. The main site is the dedicated space for posting questions,
+        <li>Do not link your recent (< 1-2 days) questions in the room. The main site is the dedicated space for posting questions,
             and having them answered.</li>
         <li>If you have posted a question on the main site and a significant amount of time has passed without receiving a
             satisfying answer, then you can discuss your question in the room.</li>

sopy/templates/salad/index.html

@@ -4,7 +4,10 @@
     <div class="row"><div class="col-md-12">
         <h2 class="page-header">{% block title %}Salad Language{% endblock %}</h2>
 
-        <p>Salad is a miniature language used in place of English in the Python room. It consists of words which happen to be English names for vegetables, fruit, fungi or seeds.</p>
+        <p>Salad is a miniature language used in the Python room.
+        It consists of words which happen to be names for vegetables, fruit, fungi, or seeds.
+        Many of the words have fallen out of general use.
+        Speaking salad is optional, but if you want to have a little fun, toss some salad in to your next message.</p>
 
         <h3>Lexicon</h3>