Merge pull request #350 from tocic/fix/typos_and_fences

Recommend using fences over indentation

templates/quiz/create.html

@@ -9,7 +9,7 @@ <h3>Please remember:</h3>
 <li>Your question should <strong>not be a trick question</strong>, and <strong>be free from distractions</strong></li>
 <li>Your explanation should <strong>be clear and to the point</strong></li>
 <li>Your explanation should <strong>use correct terminology</strong>, and <strong>refer to the standard</strong> where possible</li>
-<li>Prefer <strong>well defined</strong> programs over programs with compilation errors, undefined or unspecified behaviour</li>
+<li>Prefer <strong>well defined</strong> programs over programs with compilation errors, undefined or unspecified behavior</li>
 <li><em>&mdash;<a href="https://blog.knatten.org/2016/07/22/how-to-contribute-questions-for-cppquiz-org/">What does all of that mean?</a></em></li>
 </ul>
 <hr>
@@ -23,7 +23,7 @@ <h3>Please remember:</h3>
 
         <p><label for="id_answer">The output of this program is:</label> {{ form.answer }} {{ form.answer.errors }}<span class="help_text">Leave blank for questions with errors / undefined behavior</span></p>
 
-        <p><label for="id_explanation">Explanation: <span class="help_text">Please be clear and to the point. Please try to use correct terminology. Refer to the standard like this: "§[section.optional_subsections]¶optional_paragraph" (e.g. "§[over]" or "§[over.ics.list]¶6.2").  Use <a href="https://daringfireball.net/projects/markdown/syntax">markdown</a> for formatting, in particular wrap code in backticks like this: `int i`, or indent whole blocks with four spaces. Don't worry if you don't get the formatting perfect, a moderator will go over it before publishing. </span></label></p>
+        <p><label for="id_explanation">Explanation: <span class="help_text">Please be clear and to the point. Please try to use correct terminology. Refer to the standard like this: "§[section.optional_subsections]¶optional_paragraph" (e.g. "§[over]" or "§[over.ics.list]¶6.2").  Use <a href="https://daringfireball.net/projects/markdown/syntax">markdown</a> for formatting, in particular wrap code in backticks like this: `int i`, or surround whole blocks with fences (```). Don't worry if you don't get the formatting perfect, a moderator will go over it before publishing. </span></label></p>
         <div id="explanation_errors">{{ form.explanation.errors }}</div>
         <p>{{ form.explanation }}</p>
 

templates/quiz/help.html

@@ -4,7 +4,7 @@
 <a href="/">Continue quiz</a>
 <h2>About</h2>
 <p>
-C++ Quiz is written by <a href="http://knatten.org">Anders Schau Knatten</a> with valuable input from <a href="http://www.pvv.org/~oma/cv.html">Olve Maudal</a>, <a href="http://fcacciola.50webs.com/">Fernando Cacciola</a>, other members of the <a href="http://accu.org/">ACCU</a>, and several other contributers. If you discover any errors, or would like to contribute, please contact me at anders AT knatten.org, on <a href="https://twitter.com/CppQuiz">Twitter</a>, or on <a href="https://github.com/knatten/cppquiz/issues">GitHub</a>.
+C++ Quiz is written by <a href="http://knatten.org">Anders Schau Knatten</a> with valuable input from <a href="http://www.pvv.org/~oma/cv.html">Olve Maudal</a>, <a href="http://fcacciola.50webs.com/">Fernando Cacciola</a>, other members of the <a href="http://accu.org/">ACCU</a>, and several other contributors. If you discover any errors, or would like to contribute, please contact me at anders AT knatten.org, on <a href="https://twitter.com/CppQuiz">Twitter</a>, or on <a href="https://github.com/knatten/cppquiz/issues">GitHub</a>.
 </p>
 <h2>Help/FAQ</h2>
 <h3>What is this?</h3>
@@ -18,14 +18,14 @@ <h3>I don't agree with an answer!</h3>
 <h3>How does scoring work?</h3>
 <p>If you are taking a fixed quiz (not just answering random questions in training mode), you get one point per correct answer. If you used a hint for that question, 0.5 is subtracted from your point. For each incorrect attempt you made at that question, the point is further divided by two. For instance, if you used one hint and three incorrect attempts, you get (1 - <abbr title="You used a hint and loose 0.5 points">0.5</abbr>) / (<abbr title="You used three incorrect attempts, so divide by two thrice">2 * 2 * 2</abbr>) = 0.0625 points. As you can see, it pays to think things through rather than guessing, and using a hint is often also better than guessing.</p>
 <h3>What features are planned?</h3>
-<p>See <a href="https://github.com/knatten/cppquiz/issues?state=open">open issues at GitHub</a>.</p>
+<p>See <a href="https://github.com/knatten/cppquiz/issues?state=open">open issues on GitHub</a>.</p>
 </ol>
 <h3>How can I help?</h3>
 <p>If you know C++, by adding more questions, or joining our mailing-list <a href="mailto:[email protected]">[email protected]</a>. If you know Python/Django/JavaScript, by extending functionality. If you know web-design, by improving the design. Please contact me at anders AT knatten.org or <a href="https://twitter.com/knatten">Twitter</a>.</p>
 
 <h3 id="cookies">Cookies</h3>
 <p>
-We use cookies to able to show you your progress in the quiz. These cookies are only used for the site to function properly, we don't use any cookies for marketing or similar. In particular, we do not use any third party cookies. We also don't collect any personal information about you. If you do not want us to do so, please refrain from using the site.</p>
+We use cookies to be able to show you your progress in the quiz. These cookies are only used for the site to function properly, we don't use any cookies for marketing or similar. In particular, we do not use any third party cookies. We also don't collect any personal information about you. If you do not want us to do so, please refrain from using the site.</p>
 </div>
 
 {%endblock%}