aboutsummaryrefslogtreecommitdiffstats
path: root/templates/web/default/faq
diff options
context:
space:
mode:
authorStruan Donald <struan@exo.org.uk>2011-06-23 14:38:07 +0100
committerStruan Donald <struan@exo.org.uk>2011-06-23 14:38:07 +0100
commit11c91b87abe2e89e8dc63a4d541fba7ed1d096b3 (patch)
tree5a315646cda9691ca63fd52f4cb3f9d3aafb1b4b /templates/web/default/faq
parent41c7d068f954e062b4da0675b5782211b8ad10c3 (diff)
parent09ce7aeb489e5a43054c3b2b7bfa47fd6aba7c43 (diff)
Merge branch 'master' of ssh://git.mysociety.org/data/git/public/fixmystreet into new_statuses
Conflicts: templates/web/default/report/display.html
Diffstat (limited to 'templates/web/default/faq')
-rwxr-xr-xtemplates/web/default/faq/faq-en-gb.html19
1 files changed, 12 insertions, 7 deletions
diff --git a/templates/web/default/faq/faq-en-gb.html b/templates/web/default/faq/faq-en-gb.html
index 2da32fc19..0907d6275 100755
--- a/templates/web/default/faq/faq-en-gb.html
+++ b/templates/web/default/faq/faq-en-gb.html
@@ -169,18 +169,23 @@ non-technical. Please see our <a
href="http://www.mysociety.org/helpus/">Get Involved page</a>.</dd>
<dt>I&rsquo;d like a site like this for my own location/ where&rsquo;s the "source code" to this site?</dt>
<dd>
-<p>The software behind this site is open source, and available
+The software behind this site is open source, and available
to you mainly under the GNU Affero GPL software license. You can <a
href="http://github.com/mysociety/fixmystreet">download the
source code</a> and help us develop it.
You&rsquo;re welcome to use it in your own projects, although you must also
-make available the source code to any such projects.</p>
-<p>Some Canadians at VisibleGovernment.ca wrote their own code for <a
-href="http://www.fixmystreet.ca/">http://www.fixmystreet.ca/</a> which is
+make available the source code to any such projects.
+<a href="http://www.fiksgatami.no/">Fiksgatami</a> is an example of our code
+being used in a Norwegian version of this site.
+</dd>
+<dt>I&rsquo;d prefer code in a different language?</dt>
+<dd>
+VisibleGovernment.ca wrote their own code for
+<a href="http://www.fixmystreet.ca/">http://www.fixmystreet.ca/</a>, which is
written in GeoDjango and available under an MIT licence at <a
-href="http://github.com/visiblegovernment/django-fixmystreet/tree/master">github</a>
-&ndash; it might well be more suitable for adapting than our code, and
-definitely has better installation instructions at present.
+href="http://github.com/visiblegovernment/django-fixmystreet/tree/master">github</a>.
+Or <a href="http://www.fixmystreet.org.nz/">FixMyStreet.org.nz</a> is written in
+Drupal.
</p>
</dd>
<dt>People build things, not organisations. Who <em>actually</em> built it?</dt>