Merge remote-tracking branch 'origin/master' into phonegap

1 files changed, 17 insertions, 22 deletions

diff --git a/templates/web/default/faq/faq-en-gb.html b/templates/web/default/faq/faq-en-gb.html
index ed9d53c24..290be5564 100755
--- a/templates/web/default/faq/faq-en-gb.html
+++ b/templates/web/default/faq/faq-en-gb.html
@@ -61,29 +61,27 @@ by a registered charity, though, so if you want to make a contribution, <a
 href="https://secure.mysociety.org/donate/">please do</a>.</dd>
 
     <dt>Can I use FixMyStreet on my mobile?</dt>
-    <dd><ul>
-    <li><em>iPhone:</em> There are two apps for FixMyStreet, one written by us
-    in 2008 and another much more recently by a volunteer, Martin Stephenson.
-    Both are available for download on the App Store:
+    <dd>
+    <p>The FixMyStreet website should work on your mobile phone, adapting to
+    the size of your screen automatically. We plan to release updated native
+    apps in the near future.
+    <ul>
+    <li><em>iPhone:</em> Our basic app from 2008 is available for download
+    on the App Store:
     <a href="http://itunes.apple.com/gb/app/fixmystreet/id297456545">FixMyStreet</a>,
-    <a href="http://itunes.apple.com/gb/app/streetreport/id371891859">StreetReport</a>.
     <li><em>Android:</em> A volunteer, Anna Powell-Smith, has written an app
     available from the 
     <a href="https://market.android.com/details?id=com.android.fixmystreet">Android Market</a>.
     <li><em>Nokia:</em> A volunteer, Thomas Forth, has written an app available from the
     <a href="http://store.ovi.com/content/107557">Ovi Store</a>.
     </ul>
-    <p>We also hope to make the website itself much more mobile friendly in the future.</p>
     </dd>
 
     <dt>Why do you only cover the countries of Great Britain?</dt>
-    <dd>We would love to cover Northern Ireland, but as we were funded for
-    FixMyStreet by the Department for Constitutional Affairs (now the Ministry
-    of Justice), we were covered for Ordnance Survey data (but not OSNI data)
-    by the Pan-Governmental Agreement. The cost for these maps would be
-    prohibitively expensive for the small charity that we are &ndash; if you know of
-    any way we could get access to the Ordnance Survey for Northern Ireland's
-    maps so that we can add them to the site, that'd be great.</dd>
+    <dd>We would love to cover Northern Ireland, but we have only been able
+    to locate boundaries for Great Britain (from Ordnance Survey). If you
+    know of a source for Northern Ireland council boundaries
+    so that we can add them to the site, that'd be great.</dd>
     </dl>
 
     <h2>Practical Questions</h2>
@@ -141,7 +139,8 @@ send you emails in relation to your problem.</dd>
     <h2>Organisation Questions</h2>
     <dl>
         <dt>Who built FixMyStreet?</dt>
-        <dd>This site was built by <a href="http://www.mysociety.org/">mySociety</a>, in conjunction with the <a href="http://www.youngfoundation.org.uk/">Young Foundation</a>. 
+        <dd>This site was built by <a href="http://www.mysociety.org/">mySociety</a>,
+        in conjunction with the <a href="http://www.youngfoundation.org.uk/">Young Foundation</a>.
 mySociety is the project of a registered charity which has grown out of the community of
 volunteers who built sites like <a href="http://www.theyworkforyou.com/">TheyWorkForYou.com</a>. 
 mySociety&rsquo;s primary mission is to build Internet projects which give people simple, tangible
@@ -149,15 +148,11 @@ benefits in the civic and community aspects of their lives. Our first project
 was <a href="http://www.writetothem.com/">WriteToThem</a>, where you can write to any of your
 elected representatives, for free. The charity is called UK Citizens Online Democracy and is charity number 1076346. mySociety 
 can be contacted by email at <a href="mailto:hello&#64;mysociety.org">hello&#64;mysociety.org</a>,
-or by post at:<br>
-mySociety<br>
-483 Green Lanes<br>
-London<br>
-N13 4BS<br>
-UK</dd>
+or by post at mySociety, 483 Green Lanes, London, N13 4BS, UK.</dd>
         <dt><img src="/i/moj.png" align="right" alt="Ministry of Justice" hspace="10">Who pays for it?</dt>
-        <dd>FixMyStreet was paid for via the Department for
-Constitutional Affairs Innovations Fund.</dd>
+        <dd>FixMyStreet was originally paid for via the Department for
+        Constitutional Affairs Innovations Fund. It is now funded by a variety of means, from commercial
+        work to <a href="http://www.mysociety.org/donate/">donations</a>.</dd>
         <dt><a name="nfi"></a>Wasn&rsquo;t this site called Neighbourhood Fix-It?</dt>
         <dd>Yes, we changed the name mid June 2007. We decided
 Neighbourhood Fix-It was a bit of a mouthful, hard to spell, and hard to publicise (does the URL have a dash in it or not?). The domain FixMyStreet became available, and everyone liked the name.</dd>