Merge branch 'master' into fmb-read-only

Conflicts:
	.gitignore
	bin/make_css
	perllib/FixMyStreet/Cobrand/FixMyStreet.pm

1 files changed, 4 insertions, 4 deletions

diff --git a/templates/web/default/faq/faq-en-gb.html b/templates/web/default/faq/faq-en-gb.html
index 2c1c43799..1e52cc3b0 100755
--- a/templates/web/default/faq/faq-en-gb.html
+++ b/templates/web/default/faq/faq-en-gb.html
@@ -25,11 +25,11 @@ or clearing</strong>, such as:
     </dd>
 
     <dt>What isn&rsquo;t FixMyStreet for?</dt>
-    <dd>FixMyStreet is not a way of getting in touch with [% c.cobrand.moniker == 'southampton' ? 'the' : 'your' %] council for all
+    <dd>FixMyStreet is not a way of getting in touch with [% c.cobrand.is_council ? 'the' : 'your' %] council for all
     issues &ndash; please use FixMyStreet only for problems such as the above. We
     often route problem reports via cleansing services or highways and so using
     FixMyStreet for other matters may result in a delay in your report getting
-    to the right department. <strong>You will need to contact [% c.cobrand.moniker == 'southampton' ? 'the' : 'your' %] council
+    to the right department. <strong>You will need to contact [% c.cobrand.is_council ? 'the' : 'your' %] council
     directly for problems such as</strong>: 
 
     <ul><li>Anti-social behaviour
@@ -51,7 +51,7 @@ with a map of that area. You can view problems already reported in that area,
 or report ones of your own simply by clicking on the map at the location of
 the problem.</dd>
         <dt>How are the problems solved?</dt>
-        <dd>They are reported to the [% IF c.cobrand.moniker != 'southampton' %]relevant[% END %] council by email. The
+        <dd>They are reported to the [% IF !c.cobrand.is_council %]relevant[% END %] council by email. The
 council can then resolve the problem the way they normally would.
 Alternatively, you can discuss the problem on the website with others[% IF c.cobrand.moniker != 'southampton' %], and
 then together lobby the council to fix it, or fix it directly yourselves[% END %].</dd>
@@ -92,7 +92,7 @@ to find out where reports go at the moment. Also <a href="/contact">contact us</
 to update the address or addresses we use.</dd>
         <dt>I&rsquo;m from a council, can we have FixMyStreet on our website?</dt>
         <dd>Yes you can! We offer branded, hosted versions of FixMyStreet for local council websites.
-        <a href="http://www.fixmystreet.com/for-councils">Full details</a>.</dd>
+        <a href="http://www.mysociety.org/for-councils/fixmystreet/">Full details</a>.</dd>
         <dt>Do you remove silly or illegal content?</dt>
         <dd>FixMyStreet is not responsible for the content and accuracy
 of material submitted by its users. We reserve the right to edit or remove any