aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Somerville <matthew-github@dracos.co.uk>2014-03-19 22:47:03 +0000
committerMatthew Somerville <matthew-github@dracos.co.uk>2014-03-19 22:47:03 +0000
commitde4da66515c1a064590a3ae5192b4ed53db73930 (patch)
tree3575b589ac3090ead4dbb7910425a14f7c830824
parent36f50c1e21ef26f0021036568254e70863bdb0cc (diff)
Update code.fixmystreet.com references to fixmystreet.org.
-rw-r--r--LICENSE.txt3
-rw-r--r--README.md2
-rwxr-xr-xbin/oxfordshire/open311_service_request.cgi2
-rwxr-xr-xbin/oxfordshire/open311_service_request_update.cgi2
-rw-r--r--bin/oxfordshire/open311_services.pm2
-rw-r--r--conf/apache-vhost.conf.example2
-rw-r--r--conf/httpd.conf-example2
-rw-r--r--conf/nginx.conf.example2
-rw-r--r--templates/web/default/admin/config_page.html4
-rw-r--r--templates/web/fixmybarangay/faq/faq-en-gb.html2
10 files changed, 11 insertions, 12 deletions
diff --git a/LICENSE.txt b/LICENSE.txt
index eeae7aaef..9d55eb3a7 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,7 +1,6 @@
mySociety.org Software Licensing
-Most of the software in this directory is Copyright (c) 2004-2010 UK
-Citizens Online Democracy.
+Most of the software here is Copyright (c) UK Citizens Online Democracy.
Unless otherwise stated in particular files or directories, this
software is free software; you can redistribute it and/or modify it
diff --git a/README.md b/README.md
index 219179a81..b606192f1 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ Platform is now at version 1.3.
## Installation
We've been working hard to make the FixMyStreet Platform easy to install and
-re-use in other countries - please see our site at <http://code.fixmystreet.com/>
+re-use in other countries - please see our site at <http://fixmystreet.org/>
for help and documentation in installing the FixMyStreet Platform.
## Contribution Guidelines
diff --git a/bin/oxfordshire/open311_service_request.cgi b/bin/oxfordshire/open311_service_request.cgi
index 1e7d2716b..4496ff213 100755
--- a/bin/oxfordshire/open311_service_request.cgi
+++ b/bin/oxfordshire/open311_service_request.cgi
@@ -4,7 +4,7 @@
# passing them into Bentley EXOR backend via create_enquiry stored
# procedure.
#
-# mySociety: http://code.fixmystreet.com/
+# mySociety: http://fixmystreet.org/
#-----------------------------------------------------------------
require 'open311_services.pm';
diff --git a/bin/oxfordshire/open311_service_request_update.cgi b/bin/oxfordshire/open311_service_request_update.cgi
index cfceffcc8..87b14fb98 100755
--- a/bin/oxfordshire/open311_service_request_update.cgi
+++ b/bin/oxfordshire/open311_service_request_update.cgi
@@ -4,7 +4,7 @@
# Bentley and offering them up as XML service request updates.
# https://github.com/mysociety/fixmystreet/wiki/Open311-FMS---Proposed-differences-to-Open311
#
-# mySociety: http://code.fixmystreet.com/
+# mySociety: http://fixmystreet.org/
#-----------------------------------------------------------------
require 'open311_services.pm';
diff --git a/bin/oxfordshire/open311_services.pm b/bin/oxfordshire/open311_services.pm
index 0b73cdfe6..12d0754fa 100644
--- a/bin/oxfordshire/open311_services.pm
+++ b/bin/oxfordshire/open311_services.pm
@@ -2,7 +2,7 @@
#
# common stuff used by Oxfordshire Open311 glue scripts
#
-# mySociety: http://code.fixmystreet.com/
+# mySociety: http://fixmystreet.org/
#-----------------------------------------------------------------
use strict;
diff --git a/conf/apache-vhost.conf.example b/conf/apache-vhost.conf.example
index 97a34fe66..8f5e53dc9 100644
--- a/conf/apache-vhost.conf.example
+++ b/conf/apache-vhost.conf.example
@@ -1,6 +1,6 @@
# An example Apache virtualhost configuration file.
#
-# See our installation help at http://code.fixmystreet.com/
+# See our installation help at http://fixmystreet.org/
<VirtualHost *:80>
ServerName fixmystreet.yourservername
diff --git a/conf/httpd.conf-example b/conf/httpd.conf-example
index ab17dcec3..d86517333 100644
--- a/conf/httpd.conf-example
+++ b/conf/httpd.conf-example
@@ -4,7 +4,7 @@
# example of such a virtualhost configuration file can be found in the
# file apache-vhost.conf.example in this directory.
#
-# See our installation help at http://code.fixmystreet.com/
+# See our installation help at http://fixmystreet.org/
RewriteEngine on
# RewriteLog /var/log/apache2/rewrite.log
diff --git a/conf/nginx.conf.example b/conf/nginx.conf.example
index 7b26afdbf..dce26e8f9 100644
--- a/conf/nginx.conf.example
+++ b/conf/nginx.conf.example
@@ -3,7 +3,7 @@
# An example sysvinit script to help with this is shown given in the file
# sysvinit-catalyst-fastcgi.example in this directory.
#
-# See our installation help at http://code.fixmystreet.com/
+# See our installation help at http://fixmystreet.org/
server {
diff --git a/templates/web/default/admin/config_page.html b/templates/web/default/admin/config_page.html
index 6fb315a46..f198de2af 100644
--- a/templates/web/default/admin/config_page.html
+++ b/templates/web/default/admin/config_page.html
@@ -115,7 +115,7 @@ running version <strong>[% git_version || 'unknown' %]</strong>.
Other things can be changed on a cobrand basis by using functions in an
(optional) Cobrand .pm module, as explained in the
-<a href="http://code.fixmystreet.com/customising/" class="admin-offsite-link">customising section of our
+<a href="http://fixmystreet.org/customising/" class="admin-offsite-link">customising section of our
documentation</a>. If you wish to add new functionality just for your cobrand
that can't be done simply by changes to your cobrand's templates, you might
need to add a new Cobrand function.
@@ -123,7 +123,7 @@ need to add a new Cobrand function.
<p>Examples of cobrand functions are below; this is not exhaustive.
Many were added for one specific cobrand, so didn't need a general
configuration option. Please feel free to discuss on <a
-href="http://code.fixmystreet.com/community/" class="admin-offsite-link">our mailing list</a> if you think
+href="http://fixmystreet.org/community/" class="admin-offsite-link">our mailing list</a> if you think
something should be moved to the general.yml file, done differently,
or have any questions.</p>
diff --git a/templates/web/fixmybarangay/faq/faq-en-gb.html b/templates/web/fixmybarangay/faq/faq-en-gb.html
index 771569e23..6e8893143 100644
--- a/templates/web/fixmybarangay/faq/faq-en-gb.html
+++ b/templates/web/fixmybarangay/faq/faq-en-gb.html
@@ -160,7 +160,7 @@ UK</dd>
<dd>
The software behind this site is open source, and available
to you mainly under the GNU Affero GPL software license.
-See <a href="http://code.fixmystreet.com/">code.fixmystreet.com</a> for more information about setting up
+See <a href="http://fixmystreet.org/">fixmystreet.org</a> for more information about setting up
and running sites like these.
</dd>
</dl>