Update House Rules and Readme.

Fixes #1344.

README.md

@@ -1,44 +1,32 @@
 Hello everyone,
 
-If you're looking to set up a new Parliamentary monitoring site then you
-should look at our Pombola probject at
-https://www.mysociety.org/international/pombola/ which takes the lessons
-we've learned from writing and running TheyWorkForYou and uses them to
-create a modern, flexible and more easily adaptable platform for
-creating your own Parliamentary monitoring site. We strongly encourage
-people to use this rather than trying to adapt TheyWorkForYou to their
-own requirements.
-
-If you want to dig in to the source of TheyWorkForYou then carry right
-on below.
-
-We're pleased to release the TheyWorkForYou.com source code. This is the code
-for the website itself. It's mainly written in PHP, although there are also some
-Perl scripts for database loading and indexing. The backend parser code is
-separate and available [on GitHub](https://github.com/mysociety/parlparse). You
-can read more about this on
-[TheyWorkForYou's parser info page](http://parser.theyworkforyou.com/parser.html)
-
-The TheyWorkForYou.com source code in this distribution is released under a BSD
+This is the source code that powers the TheyWorkForYou.com website. It's
+mainly written in PHP, although there are also some Perl scripts for database
+loading and indexing. The backend parser code is separate and available
+[on GitHub](https://github.com/mysociety/parlparse). You can read more about this
+on [TheyWorkForYou's parser info page](http://parser.theyworkforyou.com/parser.html)
+
+The TheyWorkForYou source code in this distribution is released under a BSD
 style license. Roughly, this means you are free to copy, use, modify and
 redistribute the code or binaries made from the code. Commercial or non-
 commercial use is allowed. However, we disclaim warranty, and expect you not to
-use our name without our permission.
-
-See the file LICENSE.md for exact legal information.
+use our name without our permission. See the file LICENSE.md for exact legal
+information.
 
-## What is TheyWorkForYou.com anyway?
+## What is TheyWorkForYou anyway?
 
-Everything MPs say in the UK's House of Commons is recorded in a document called
-Hansard. TheyWorkForYou.com helps make sense of this vital democratic resource
-and, crucially, allows you to add your own annotations and links to the official
-transcripts of Parliament.
+Everything MPs say in the UK's House of Commons is recorded in a document
+called Hansard; TheyWorkForYou helps make sense of this vital democratic
+resource. It also includes things from the House of Lords, the Scottish
+Parliament, and the Northern Ireland Assembly.
 
 ## How on earth do I use this code?
 
 See INSTALL.md for installation questions.
 
-If you have questions, the best place to ask is the mySociety TheyWorkForYou email list at https://groups.google.com/a/mysociety.org/forum/#!forum/theyworkforyou
+If you have questions, the best place to ask is the mySociety TheyWorkForYou
+email list at
+https://groups.google.com/a/mysociety.org/forum/#!forum/theyworkforyou
 
 ### Developing with Vagrant
 

www/includes/easyparliament/templates/html/static/houserules.php

@@ -2,32 +2,25 @@
     <div class="full-page__row">
         <div class="panel">
             <h1>House Rules</h1>
-<p>As a registered user, you may add annotations to debate pages on TheyWorkForYou &mdash; now that&rsquo;s power.</p>
-
-<p>But as we all know, with great power comes great responsibility. In order to keep TheyWorkForYou useful and relevant to everyone, there are a few rules. They are important.</p>
-
-<p>Stick to these and you can&rsquo;t go wrong. Transgress once, and we&rsquo;ll send you a warning. Do it again and you&rsquo;re banned, and that&rsquo;s as fair as we can make it.</p>
 
             <h2>Annotations should be</h2>
 
-            <ul><li><b>Relevant to the debate you are commenting on</b>: that&rsquo;s <em>completely</em> relevant.</li>
-                <li><b>Factual</b>: Check your sources. Citing them is good.</li>
-                <li><b>Non-partisan</b>, ie not showing a political bias</li>
-                <li><b>Under your own name</b> where possible</li>
-                <li><b>Genuinely useful for other readers</b>: and if you can&rsquo;t say &lsquo;yes&rsquo; to this one, that&rsquo;s a pretty good sign that your comment shouldn&rsquo;t be added.</li></ul>
-
-            <h2>You might like to</h2>
-
-            <ul><li><b>Provide a link to a webpage</b> &mdash; but that page must also be relevant, factual, useful, and non-partisan.   </li></ul>
-
-            <h2>Things to avoid</h2>
-
-            <ul><li><b>Don't go off-topic</b>. You&rsquo;re commenting on the debate, nothing else.</li>
-                <li><b>We don't want your opinions or anecdotes</b>. There are plenty of other forums for those: try your local newspaper, for example.</li>
-                <li><b>Avoid bad or upsetting language</b>. All types of people use TheyWorkForYou. Don&rsquo;t write anything you wouldn&rsquo;t want your own grandmother or child to read &mdash; because they (or someone just like them) might.</li>
-                <li><b>We don't tolerate attacks on other users</b>. We are kind to one another here.</li>
-                <li><b>Same goes for attacks or disparagement of any section of society</b>. See above.</li>
-                <li><b>Don't spam our readers</b>: and we count anything that could be described as an advertisement as spam. Because it is.</li></ul>
+            <ul><li>Completely relevant to the debate you are commenting on</li>
+                <li>Factual</li>
+                <li>Non-partisan, ie not showing a political bias</li>
+                <li>Under the user’s own name where possible</li>
+                <li>Genuinely useful for other readers</li>
+            </ul>
+
+            <h2>Annotations should not be </h2>
+
+            <ul><li>Off-topic</li>
+                <li>Opinions or anecdotes</li>
+                <li>Bad or upsetting language</li>
+                <li>attacks on other users</li>
+                <li>attacks or disparagement of any section of society</li>
+                <li>spam or anything that could be described as an advertisement</li>
+            </ul>
 
             <h2>If you see an annotation which does not adhere to these rules</h2>