Switch to more appropriate GPLv3

2 files changed, 575 insertions, 562 deletions

diff --git a/COPYING b/COPYING
index 0e67f67..a64db03 100644
--- a/COPYING
+++ b/COPYING
@@ -1,16 +1,506 @@
-The code used to build this website, including all files in the includes
-directory, is Copyright 2009-2010 Nick White.
-It is licensed under the GNU Affero General Public License version 3,
-or any later version.
-
 The text on this website is Copyright 2009-2010 Nick White.
 It is licensed under the Creative Commons Attribution-Share Alike 3.0
 Unported license.
 
+The code used to build this website, including all files in the includes
+directory, is Copyright 2009-2010 Nick White.
+It is licensed under the GNU General Public License version 3, or any
+later version.
+
 ------------------------------------------------------------------------------
 
-                    GNU AFFERO GENERAL PUBLIC LICENSE
-                       Version 3, 19 November 2007
+Creative Commons Legal Code
+
+Attribution-ShareAlike 3.0 Unported
+
+
+  CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES
+  NOT PROVIDE LEGAL SERVICES. DISTRIBUTION OF THIS LICENSE
+  DOES NOT CREATE AN ATTORNEY-CLIENT RELATIONSHIP. CREATIVE
+  COMMONS PROVIDES THIS INFORMATION ON AN "AS-IS" BASIS.
+  CREATIVE COMMONS MAKES NO WARRANTIES REGARDING THE
+  INFORMATION PROVIDED, AND DISCLAIMS LIABILITY FOR DAMAGES
+  RESULTING FROM ITS USE.
+
+
+License
+
+THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS
+OF THIS CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR
+"LICENSE"). THE WORK IS PROTECTED BY COPYRIGHT AND/OR OTHER
+APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS
+AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS
+PROHIBITED.
+
+BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU
+ACCEPT AND AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE.
+TO THE EXTENT THIS LICENSE MAY BE CONSIDERED TO BE A
+CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE
+IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND
+CONDITIONS.
+
+1. Definitions
+
+
+  "Adaptation" means a work based upon
+  the Work, or upon the Work and other pre-existing works,
+  such as a translation, adaptation, derivative work,
+  arrangement of music or other alterations of a literary
+  or artistic work, or phonogram or performance and
+  includes cinematographic adaptations or any other form in
+  which the Work may be recast, transformed, or adapted
+  including in any form recognizably derived from the
+  original, except that a work that constitutes a
+  Collection will not be considered an Adaptation for the
+  purpose of this License. For the avoidance of doubt,
+  where the Work is a musical work, performance or
+  phonogram, the synchronization of the Work in
+  timed-relation with a moving image ("synching") will be
+  considered an Adaptation for the purpose of this
+  License.
+
+  "Collection" means a collection of
+  literary or artistic works, such as encyclopedias and
+  anthologies, or performances, phonograms or broadcasts,
+  or other works or subject matter other than works listed
+  in Section 1(f) below, which, by reason of the selection
+  and arrangement of their contents, constitute
+  intellectual creations, in which the Work is included in
+  its entirety in unmodified form along with one or more
+  other contributions, each constituting separate and
+  independent works in themselves, which together are
+  assembled into a collective whole. A work that
+  constitutes a Collection will not be considered an
+  Adaptation (as defined below) for the purposes of this
+  License.
+
+  "Creative Commons Compatible
+  License" means a license that is listed at
+  http://creativecommons.org/compatiblelicenses that has
+  been approved by Creative Commons as being essentially
+  equivalent to this License, including, at a minimum,
+  because that license: (i) contains terms that have the
+  same purpose, meaning and effect as the License Elements
+  of this License; and, (ii) explicitly permits the
+  relicensing of adaptations of works made available under
+  that license under this License or a Creative Commons
+  jurisdiction license with the same License Elements as
+  this License.
+
+  "Distribute" means to make available
+  to the public the original and copies of the Work or
+  Adaptation, as appropriate, through sale or other
+  transfer of ownership.
+
+  "License Elements" means the
+  following high-level license attributes as selected by
+  Licensor and indicated in the title of this License:
+  Attribution, ShareAlike.
+
+  "Licensor" means the individual,
+  individuals, entity or entities that offer(s) the Work
+  under the terms of this License.
+
+  "Original Author" means, in the case
+  of a literary or artistic work, the individual,
+  individuals, entity or entities who created the Work or
+  if no individual or entity can be identified, the
+  publisher; and in addition (i) in the case of a
+  performance the actors, singers, musicians, dancers, and
+  other persons who act, sing, deliver, declaim, play in,
+  interpret or otherwise perform literary or artistic works
+  or expressions of folklore; (ii) in the case of a
+  phonogram the producer being the person or legal entity
+  who first fixes the sounds of a performance or other
+  sounds; and, (iii) in the case of broadcasts, the
+  organization that transmits the broadcast.
+
+  "Work" means the literary and/or
+  artistic work offered under the terms of this License
+  including without limitation any production in the
+  literary, scientific and artistic domain, whatever may be
+  the mode or form of its expression including digital
+  form, such as a book, pamphlet and other writing; a
+  lecture, address, sermon or other work of the same
+  nature; a dramatic or dramatico-musical work; a
+  choreographic work or entertainment in dumb show; a
+  musical composition with or without words; a
+  cinematographic work to which are assimilated works
+  expressed by a process analogous to cinematography; a
+  work of drawing, painting, architecture, sculpture,
+  engraving or lithography; a photographic work to which
+  are assimilated works expressed by a process analogous to
+  photography; a work of applied art; an illustration, map,
+  plan, sketch or three-dimensional work relative to
+  geography, topography, architecture or science; a
+  performance; a broadcast; a phonogram; a compilation of
+  data to the extent it is protected as a copyrightable
+  work; or a work performed by a variety or circus
+  performer to the extent it is not otherwise considered a
+  literary or artistic work.
+
+  "You" means an individual or entity
+  exercising rights under this License who has not
+  previously violated the terms of this License with
+  respect to the Work, or who has received express
+  permission from the Licensor to exercise rights under
+  this License despite a previous violation.
+
+  "Publicly Perform" means to perform
+  public recitations of the Work and to communicate to the
+  public those public recitations, by any means or process,
+  including by wire or wireless means or public digital
+  performances; to make available to the public Works in
+  such a way that members of the public may access these
+  Works from a place and at a place individually chosen by
+  them; to perform the Work to the public by any means or
+  process and the communication to the public of the
+  performances of the Work, including by public digital
+  performance; to broadcast and rebroadcast the Work by any
+  means including signs, sounds or images.
+
+  "Reproduce" means to make copies of
+  the Work by any means including without limitation by
+  sound or visual recordings and the right of fixation and
+  reproducing fixations of the Work, including storage of a
+  protected performance or phonogram in digital form or
+  other electronic medium.
+
+
+2. Fair Dealing Rights. Nothing in this
+License is intended to reduce, limit, or restrict any uses
+free from copyright or rights arising from limitations or
+exceptions that are provided for in connection with the
+copyright protection under copyright law or other
+applicable laws.
+
+3. License Grant. Subject to the terms
+and conditions of this License, Licensor hereby grants You
+a worldwide, royalty-free, non-exclusive, perpetual (for
+the duration of the applicable copyright) license to
+exercise the rights in the Work as stated below:
+
+
+  to Reproduce the Work, to incorporate the Work into
+  one or more Collections, and to Reproduce the Work as
+  incorporated in the Collections;
+
+  to create and Reproduce Adaptations provided that any
+  such Adaptation, including any translation in any medium,
+  takes reasonable steps to clearly label, demarcate or
+  otherwise identify that changes were made to the original
+  Work. For example, a translation could be marked "The
+  original work was translated from English to Spanish," or
+  a modification could indicate "The original work has been
+  modified.";
+
+  to Distribute and Publicly Perform the Work including
+  as incorporated in Collections; and,
+
+  to Distribute and Publicly Perform Adaptations.
+
+  
+    For the avoidance of doubt:
+
+    
+      Non-waivable Compulsory License
+      Schemes. In those jurisdictions in which the
+      right to collect royalties through any statutory or
+      compulsory licensing scheme cannot be waived, the
+      Licensor reserves the exclusive right to collect such
+      royalties for any exercise by You of the rights
+      granted under this License;
+
+      Waivable Compulsory License
+      Schemes. In those jurisdictions in which the
+      right to collect royalties through any statutory or
+      compulsory licensing scheme can be waived, the
+      Licensor waives the exclusive right to collect such
+      royalties for any exercise by You of the rights
+      granted under this License; and,
+
+      Voluntary License Schemes. The
+      Licensor waives the right to collect royalties,
+      whether individually or, in the event that the
+      Licensor is a member of a collecting society that
+      administers voluntary licensing schemes, via that
+      society, from any exercise by You of the rights
+      granted under this License.
+    
+  
+
+
+The above rights may be exercised in all media and
+formats whether now known or hereafter devised. The above
+rights include the right to make such modifications as are
+technically necessary to exercise the rights in other media
+and formats. Subject to Section 8(f), all rights not
+expressly granted by Licensor are hereby reserved.
+
+4. Restrictions. The license granted in
+Section 3 above is expressly made subject to and limited by
+the following restrictions:
+
+
+  You may Distribute or Publicly Perform the Work only
+  under the terms of this License. You must include a copy
+  of, or the Uniform Resource Identifier (URI) for, this
+  License with every copy of the Work You Distribute or
+  Publicly Perform. You may not offer or impose any terms
+  on the Work that restrict the terms of this License or
+  the ability of the recipient of the Work to exercise the
+  rights granted to that recipient under the terms of the
+  License. You may not sublicense the Work. You must keep
+  intact all notices that refer to this License and to the
+  disclaimer of warranties with every copy of the Work You
+  Distribute or Publicly Perform. When You Distribute or
+  Publicly Perform the Work, You may not impose any
+  effective technological measures on the Work that
+  restrict the ability of a recipient of the Work from You
+  to exercise the rights granted to that recipient under
+  the terms of the License. This Section 4(a) applies to
+  the Work as incorporated in a Collection, but this does
+  not require the Collection apart from the Work itself to
+  be made subject to the terms of this License. If You
+  create a Collection, upon notice from any Licensor You
+  must, to the extent practicable, remove from the
+  Collection any credit as required by Section 4(c), as
+  requested. If You create an Adaptation, upon notice from
+  any Licensor You must, to the extent practicable, remove
+  from the Adaptation any credit as required by Section
+  4(c), as requested.
+
+  You may Distribute or Publicly Perform an Adaptation
+  only under the terms of: (i) this License; (ii) a later
+  version of this License with the same License Elements as
+  this License; (iii) a Creative Commons jurisdiction
+  license (either this or a later license version) that
+  contains the same License Elements as this License (e.g.,
+  Attribution-ShareAlike 3.0 US)); (iv) a Creative Commons
+  Compatible License. If you license the Adaptation under
+  one of the licenses mentioned in (iv), you must comply
+  with the terms of that license. If you license the
+  Adaptation under the terms of any of the licenses
+  mentioned in (i), (ii) or (iii) (the "Applicable
+  License"), you must comply with the terms of the
+  Applicable License generally and the following
+  provisions: (I) You must include a copy of, or the URI
+  for, the Applicable License with every copy of each
+  Adaptation You Distribute or Publicly Perform; (II) You
+  may not offer or impose any terms on the Adaptation that
+  restrict the terms of the Applicable License or the
+  ability of the recipient of the Adaptation to exercise
+  the rights granted to that recipient under the terms of
+  the Applicable License; (III) You must keep intact all
+  notices that refer to the Applicable License and to the
+  disclaimer of warranties with every copy of the Work as
+  included in the Adaptation You Distribute or Publicly
+  Perform; (IV) when You Distribute or Publicly Perform the
+  Adaptation, You may not impose any effective
+  technological measures on the Adaptation that restrict
+  the ability of a recipient of the Adaptation from You to
+  exercise the rights granted to that recipient under the
+  terms of the Applicable License. This Section 4(b)
+  applies to the Adaptation as incorporated in a
+  Collection, but this does not require the Collection
+  apart from the Adaptation itself to be made subject to
+  the terms of the Applicable License.
+
+  If You Distribute, or Publicly Perform the Work or
+  any Adaptations or Collections, You must, unless a
+  request has been made pursuant to Section 4(a), keep
+  intact all copyright notices for the Work and provide,
+  reasonable to the medium or means You are utilizing: (i)
+  the name of the Original Author (or pseudonym, if
+  applicable) if supplied, and/or if the Original Author
+  and/or Licensor designate another party or parties (e.g.,
+  a sponsor institute, publishing entity, journal) for
+  attribution ("Attribution Parties") in Licensor's
+  copyright notice, terms of service or by other reasonable
+  means, the name of such party or parties; (ii) the title
+  of the Work if supplied; (iii) to the extent reasonably
+  practicable, the URI, if any, that Licensor specifies to
+  be associated with the Work, unless such URI does not
+  refer to the copyright notice or licensing information
+  for the Work; and (iv) , consistent with Ssection 3(b),
+  in the case of an Adaptation, a credit identifying the
+  use of the Work in the Adaptation (e.g., "French
+  translation of the Work by Original Author," or
+  "Screenplay based on original Work by Original Author").
+  The credit required by this Section 4(c) may be
+  implemented in any reasonable manner; provided, however,
+  that in the case of a Adaptation or Collection, at a
+  minimum such credit will appear, if a credit for all
+  contributing authors of the Adaptation or Collection
+  appears, then as part of these credits and in a manner at
+  least as prominent as the credits for the other
+  contributing authors. For the avoidance of doubt, You may
+  only use the credit required by this Section for the
+  purpose of attribution in the manner set out above and,
+  by exercising Your rights under this License, You may not
+  implicitly or explicitly assert or imply any connection
+  with, sponsorship or endorsement by the Original Author,
+  Licensor and/or Attribution Parties, as appropriate, of
+  You or Your use of the Work, without the separate,
+  express prior written permission of the Original Author,
+  Licensor and/or Attribution Parties.
+
+  Except as otherwise agreed in writing by the Licensor
+  or as may be otherwise permitted by applicable law, if
+  You Reproduce, Distribute or Publicly Perform the Work
+  either by itself or as part of any Adaptations or
+  Collections, You must not distort, mutilate, modify or
+  take other derogatory action in relation to the Work
+  which would be prejudicial to the Original Author's honor
+  or reputation. Licensor agrees that in those
+  jurisdictions (e.g. Japan), in which any exercise of the
+  right granted in Section 3(b) of this License (the right
+  to make Adaptations) would be deemed to be a distortion,
+  mutilation, modification or other derogatory action
+  prejudicial to the Original Author's honor and
+  reputation, the Licensor will waive or not assert, as
+  appropriate, this Section, to the fullest extent
+  permitted by the applicable national law, to enable You
+  to reasonably exercise Your right under Section 3(b) of
+  this License (right to make Adaptations) but not
+  otherwise.
+
+
+5. Representations, Warranties and
+Disclaimer
+
+UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN
+WRITING, LICENSOR OFFERS THE WORK AS-IS AND MAKES NO
+REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE
+WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING,
+WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY,
+FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE
+ABSENCE OF LATENT OR OTHER DEFECTS, ACCURACY, OR THE
+PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT DISCOVERABLE.
+SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED
+WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU.
+
+6. Limitation on Liability. EXCEPT TO
+THE EXTENT REQUIRED BY APPLICABLE LAW, IN NO EVENT WILL
+LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY
+SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY
+DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK,
+EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+7. Termination
+
+
+  This License and the rights granted hereunder will
+  terminate automatically upon any breach by You of the
+  terms of this License. Individuals or entities who have
+  received Adaptations or Collections from You under this
+  License, however, will not have their licenses terminated
+  provided such individuals or entities remain in full
+  compliance with those licenses. Sections 1, 2, 5, 6, 7,
+  and 8 will survive any termination of this License.
+
+  Subject to the above terms and conditions, the
+  license granted here is perpetual (for the duration of
+  the applicable copyright in the Work). Notwithstanding
+  the above, Licensor reserves the right to release the
+  Work under different license terms or to stop
+  distributing the Work at any time; provided, however that
+  any such election will not serve to withdraw this License
+  (or any other license that has been, or is required to
+  be, granted under the terms of this License), and this
+  License will continue in full force and effect unless
+  terminated as stated above.
+
+
+8. Miscellaneous
+
+
+  Each time You Distribute or Publicly Perform the Work
+  or a Collection, the Licensor offers to the recipient a
+  license to the Work on the same terms and conditions as
+  the license granted to You under this License.
+
+  Each time You Distribute or Publicly Perform an
+  Adaptation, Licensor offers to the recipient a license to
+  the original Work on the same terms and conditions as the
+  license granted to You under this License.
+
+  If any provision of this License is invalid or
+  unenforceable under applicable law, it shall not affect
+  the validity or enforceability of the remainder of the
+  terms of this License, and without further action by the
+  parties to this agreement, such provision shall be
+  reformed to the minimum extent necessary to make such
+  provision valid and enforceable.
+
+  No term or provision of this License shall be deemed
+  waived and no breach consented to unless such waiver or
+  consent shall be in writing and signed by the party to be
+  charged with such waiver or consent.
+
+  This License constitutes the entire agreement between
+  the parties with respect to the Work licensed here. There
+  are no understandings, agreements or representations with
+  respect to the Work not specified here. Licensor shall
+  not be bound by any additional provisions that may appear
+  in any communication from You. This License may not be
+  modified without the mutual written agreement of the
+  Licensor and You.
+
+  The rights granted under, and the subject matter
+  referenced, in this License were drafted utilizing the
+  terminology of the Berne Convention for the Protection of
+  Literary and Artistic Works (as amended on September 28,
+  1979), the Rome Convention of 1961, the WIPO Copyright
+  Treaty of 1996, the WIPO Performances and Phonograms
+  Treaty of 1996 and the Universal Copyright Convention (as
+  revised on July 24, 1971). These rights and subject
+  matter take effect in the relevant jurisdiction in which
+  the License terms are sought to be enforced according to
+  the corresponding provisions of the implementation of
+  those treaty provisions in the applicable national law.
+  If the standard suite of rights granted under applicable
+  copyright law includes additional rights not granted
+  under this License, such additional rights are deemed to
+  be included in the License; this License is not intended
+  to restrict the license of any rights under applicable
+  law.
+
+
+
+
+  Creative Commons Notice
+
+  Creative Commons is not a party to this License, and
+  makes no warranty whatsoever in connection with the Work.
+  Creative Commons will not be liable to You or any party
+  on any legal theory for any damages whatsoever, including
+  without limitation any general, special, incidental or
+  consequential damages arising in connection to this
+  license. Notwithstanding the foregoing two (2) sentences,
+  if Creative Commons has expressly identified itself as
+  the Licensor hereunder, it shall have all rights and
+  obligations of Licensor.
+
+  Except for the limited purpose of indicating to the
+  public that the Work is licensed under the CCPL, Creative
+  Commons does not authorize the use by either party of the
+  trademark "Creative Commons" or any related trademark or
+  logo of Creative Commons without the prior written
+  consent of Creative Commons. Any permitted use will be in
+  compliance with Creative Commons' then-current trademark
+  usage guidelines, as may be published on its website or
+  otherwise made available upon request from time to time.
+  For the avoidance of doubt, this trademark restriction
+  does not form part of the License.
+
+  Creative Commons may be contacted at http://creativecommons.org/.
+
+------------------------------------------------------------------------------
+
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
 
  Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
@@ -18,15 +508,17 @@ Unported license.
 
                             Preamble
 
-  The GNU Affero General Public License is a free, copyleft license for
-software and other kinds of works, specifically designed to ensure
-cooperation with the community in the case of network server software.
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
 
   The licenses for most software and other practical works are designed
 to take away your freedom to share and change the works.  By contrast,
-our General Public Licenses are intended to guarantee your freedom to
+the GNU General Public License is intended to guarantee your freedom to
 share and change all versions of a program--to make sure it remains free
-software for all its users.
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
 
   When we speak of free software, we are referring to freedom, not
 price.  Our General Public Licenses are designed to make sure that you
@@ -35,34 +527,44 @@ them if you wish), that you receive source code or can get it if you
 want it, that you can change the software or use pieces of it in new
 free programs, and that you know you can do these things.
 
-  Developers that use our General Public Licenses protect your rights
-with two steps: (1) assert copyright on the software, and (2) offer
-you this License which gives you legal permission to copy, distribute
-and/or modify the software.
-
-  A secondary benefit of defending all users' freedom is that
-improvements made in alternate versions of the program, if they
-receive widespread use, become available for other developers to
-incorporate.  Many developers of free software are heartened and
-encouraged by the resulting cooperation.  However, in the case of
-software used on network servers, this result may fail to come about.
-The GNU General Public License permits making a modified version and
-letting the public access it on a server without ever releasing its
-source code to the public.
-
-  The GNU Affero General Public License is designed specifically to
-ensure that, in such cases, the modified source code becomes available
-to the community.  It requires the operator of a network server to
-provide the source code of the modified version running there to the
-users of that server.  Therefore, public use of a modified version, on
-a publicly accessible server, gives the public access to the source
-code of the modified version.
-
-  An older license, called the Affero General Public License and
-published by Affero, was designed to accomplish similar goals.  This is
-a different license, not a version of the Affero GPL, but Affero has
-released a new version of the Affero GPL which permits relicensing under
-this license.
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
 
   The precise terms and conditions for copying, distribution and
 modification follow.
@@ -71,7 +573,7 @@ modification follow.
 
   0. Definitions.
 
-  "This License" refers to version 3 of the GNU Affero General Public License.
+  "This License" refers to version 3 of the GNU General Public License.
 
   "Copyright" also means copyright-like laws that apply to other kinds of
 works, such as semiconductor masks.
@@ -548,45 +1050,35 @@ to collect a royalty for further conveying from those to whom you convey
 the Program, the only way you could satisfy both those terms and this
 License would be to refrain entirely from conveying the Program.
 
-  13. Remote Network Interaction; Use with the GNU General Public License.
-
-  Notwithstanding any other provision of this License, if you modify the
-Program, your modified version must prominently offer all users
-interacting with it remotely through a computer network (if your version
-supports such interaction) an opportunity to receive the Corresponding
-Source of your version by providing access to the Corresponding Source
-from a network server at no charge, through some standard or customary
-means of facilitating copying of software.  This Corresponding Source
-shall include the Corresponding Source for any work covered by version 3
-of the GNU General Public License that is incorporated pursuant to the
-following paragraph.
+  13. Use with the GNU Affero General Public License.
 
   Notwithstanding any other provision of this License, you have
 permission to link or combine any covered work with a work licensed
-under version 3 of the GNU General Public License into a single
+under version 3 of the GNU Affero General Public License into a single
 combined work, and to convey the resulting work.  The terms of this
 License will continue to apply to the part which is the covered work,
-but the work with which it is combined will remain governed by version
-3 of the GNU General Public License.
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
 
   14. Revised Versions of this License.
 
   The Free Software Foundation may publish revised and/or new versions of
-the GNU Affero General Public License from time to time.  Such new versions
-will be similar in spirit to the present version, but may differ in detail to
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
 address new problems or concerns.
 
   Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU Affero General
+Program specifies that a certain numbered version of the GNU General
 Public License "or any later version" applies to it, you have the
 option of following the terms and conditions either of that numbered
 version or of any later version published by the Free Software
 Foundation.  If the Program does not specify a version number of the
-GNU Affero General Public License, you may choose any version ever published
+GNU General Public License, you may choose any version ever published
 by the Free Software Foundation.
 
   If the Program specifies that a proxy can decide which future
-versions of the GNU Affero General Public License can be used, that proxy's
+versions of the GNU General Public License can be used, that proxy's
 public statement of acceptance of a version permanently authorizes you
 to choose that version for the Program.
 
@@ -644,519 +1136,40 @@ the "copyright" line and a pointer to where the full notice is found.
     Copyright (C) <year>  <name of author>
 
     This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published by
+    it under the terms of the GNU General Public License as published by
     the Free Software Foundation, either version 3 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
+    GNU General Public License for more details.
 
-    You should have received a copy of the GNU Affero General Public License
+    You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 Also add information on how to contact you by electronic and paper mail.
 
-  If your software can interact with users remotely through a computer
-network, you should also make sure that it provides a way for users to
-get its source.  For example, if your program is a web application, its
-interface could display a "Source" link that leads users to an archive
-of the code.  There are many ways you could offer source, and different
-solutions will be better for different programs; see section 13 for the
-specific requirements.
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
 
   You should also get your employer (if you work as a programmer) or school,
 if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU AGPL, see
+For more information on this, and how to apply and follow the GNU GPL, see
 <http://www.gnu.org/licenses/>.
 
-------------------------------------------------------------------------------
-
-Creative Commons Legal Code
-
-Attribution-ShareAlike 3.0 Unported
-
-
-  CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES
-  NOT PROVIDE LEGAL SERVICES. DISTRIBUTION OF THIS LICENSE
-  DOES NOT CREATE AN ATTORNEY-CLIENT RELATIONSHIP. CREATIVE
-  COMMONS PROVIDES THIS INFORMATION ON AN "AS-IS" BASIS.
-  CREATIVE COMMONS MAKES NO WARRANTIES REGARDING THE
-  INFORMATION PROVIDED, AND DISCLAIMS LIABILITY FOR DAMAGES
-  RESULTING FROM ITS USE.
-
-
-License
-
-THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS
-OF THIS CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR
-"LICENSE"). THE WORK IS PROTECTED BY COPYRIGHT AND/OR OTHER
-APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS
-AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS
-PROHIBITED.
-
-BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU
-ACCEPT AND AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE.
-TO THE EXTENT THIS LICENSE MAY BE CONSIDERED TO BE A
-CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE
-IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND
-CONDITIONS.
-
-1. Definitions
-
-
-  "Adaptation" means a work based upon
-  the Work, or upon the Work and other pre-existing works,
-  such as a translation, adaptation, derivative work,
-  arrangement of music or other alterations of a literary
-  or artistic work, or phonogram or performance and
-  includes cinematographic adaptations or any other form in
-  which the Work may be recast, transformed, or adapted
-  including in any form recognizably derived from the
-  original, except that a work that constitutes a
-  Collection will not be considered an Adaptation for the
-  purpose of this License. For the avoidance of doubt,
-  where the Work is a musical work, performance or
-  phonogram, the synchronization of the Work in
-  timed-relation with a moving image ("synching") will be
-  considered an Adaptation for the purpose of this
-  License.
-
-  "Collection" means a collection of
-  literary or artistic works, such as encyclopedias and
-  anthologies, or performances, phonograms or broadcasts,
-  or other works or subject matter other than works listed
-  in Section 1(f) below, which, by reason of the selection
-  and arrangement of their contents, constitute
-  intellectual creations, in which the Work is included in
-  its entirety in unmodified form along with one or more
-  other contributions, each constituting separate and
-  independent works in themselves, which together are
-  assembled into a collective whole. A work that
-  constitutes a Collection will not be considered an
-  Adaptation (as defined below) for the purposes of this
-  License.
-
-  "Creative Commons Compatible
-  License" means a license that is listed at
-  http://creativecommons.org/compatiblelicenses that has
-  been approved by Creative Commons as being essentially
-  equivalent to this License, including, at a minimum,
-  because that license: (i) contains terms that have the
-  same purpose, meaning and effect as the License Elements
-  of this License; and, (ii) explicitly permits the
-  relicensing of adaptations of works made available under
-  that license under this License or a Creative Commons
-  jurisdiction license with the same License Elements as
-  this License.
-
-  "Distribute" means to make available
-  to the public the original and copies of the Work or
-  Adaptation, as appropriate, through sale or other
-  transfer of ownership.
-
-  "License Elements" means the
-  following high-level license attributes as selected by
-  Licensor and indicated in the title of this License:
-  Attribution, ShareAlike.
-
-  "Licensor" means the individual,
-  individuals, entity or entities that offer(s) the Work
-  under the terms of this License.
-
-  "Original Author" means, in the case
-  of a literary or artistic work, the individual,
-  individuals, entity or entities who created the Work or
-  if no individual or entity can be identified, the
-  publisher; and in addition (i) in the case of a
-  performance the actors, singers, musicians, dancers, and
-  other persons who act, sing, deliver, declaim, play in,
-  interpret or otherwise perform literary or artistic works
-  or expressions of folklore; (ii) in the case of a
-  phonogram the producer being the person or legal entity
-  who first fixes the sounds of a performance or other
-  sounds; and, (iii) in the case of broadcasts, the
-  organization that transmits the broadcast.
-
-  "Work" means the literary and/or
-  artistic work offered under the terms of this License
-  including without limitation any production in the
-  literary, scientific and artistic domain, whatever may be
-  the mode or form of its expression including digital
-  form, such as a book, pamphlet and other writing; a
-  lecture, address, sermon or other work of the same
-  nature; a dramatic or dramatico-musical work; a
-  choreographic work or entertainment in dumb show; a
-  musical composition with or without words; a
-  cinematographic work to which are assimilated works
-  expressed by a process analogous to cinematography; a
-  work of drawing, painting, architecture, sculpture,
-  engraving or lithography; a photographic work to which
-  are assimilated works expressed by a process analogous to
-  photography; a work of applied art; an illustration, map,
-  plan, sketch or three-dimensional work relative to
-  geography, topography, architecture or science; a
-  performance; a broadcast; a phonogram; a compilation of
-  data to the extent it is protected as a copyrightable
-  work; or a work performed by a variety or circus
-  performer to the extent it is not otherwise considered a
-  literary or artistic work.
-
-  "You" means an individual or entity
-  exercising rights under this License who has not
-  previously violated the terms of this License with
-  respect to the Work, or who has received express
-  permission from the Licensor to exercise rights under
-  this License despite a previous violation.
-
-  "Publicly Perform" means to perform
-  public recitations of the Work and to communicate to the
-  public those public recitations, by any means or process,
-  including by wire or wireless means or public digital
-  performances; to make available to the public Works in
-  such a way that members of the public may access these
-  Works from a place and at a place individually chosen by
-  them; to perform the Work to the public by any means or
-  process and the communication to the public of the
-  performances of the Work, including by public digital
-  performance; to broadcast and rebroadcast the Work by any
-  means including signs, sounds or images.
-
-  "Reproduce" means to make copies of
-  the Work by any means including without limitation by
-  sound or visual recordings and the right of fixation and
-  reproducing fixations of the Work, including storage of a
-  protected performance or phonogram in digital form or
-  other electronic medium.
-
-
-2. Fair Dealing Rights. Nothing in this
-License is intended to reduce, limit, or restrict any uses
-free from copyright or rights arising from limitations or
-exceptions that are provided for in connection with the
-copyright protection under copyright law or other
-applicable laws.
-
-3. License Grant. Subject to the terms
-and conditions of this License, Licensor hereby grants You
-a worldwide, royalty-free, non-exclusive, perpetual (for
-the duration of the applicable copyright) license to
-exercise the rights in the Work as stated below:
-
-
-  to Reproduce the Work, to incorporate the Work into
-  one or more Collections, and to Reproduce the Work as
-  incorporated in the Collections;
-
-  to create and Reproduce Adaptations provided that any
-  such Adaptation, including any translation in any medium,
-  takes reasonable steps to clearly label, demarcate or
-  otherwise identify that changes were made to the original
-  Work. For example, a translation could be marked "The
-  original work was translated from English to Spanish," or
-  a modification could indicate "The original work has been
-  modified.";
-
-  to Distribute and Publicly Perform the Work including
-  as incorporated in Collections; and,
-
-  to Distribute and Publicly Perform Adaptations.
-
-  
-    For the avoidance of doubt:
-
-    
-      Non-waivable Compulsory License
-      Schemes. In those jurisdictions in which the
-      right to collect royalties through any statutory or
-      compulsory licensing scheme cannot be waived, the
-      Licensor reserves the exclusive right to collect such
-      royalties for any exercise by You of the rights
-      granted under this License;
-
-      Waivable Compulsory License
-      Schemes. In those jurisdictions in which the
-      right to collect royalties through any statutory or
-      compulsory licensing scheme can be waived, the
-      Licensor waives the exclusive right to collect such
-      royalties for any exercise by You of the rights
-      granted under this License; and,
-
-      Voluntary License Schemes. The
-      Licensor waives the right to collect royalties,
-      whether individually or, in the event that the
-      Licensor is a member of a collecting society that
-      administers voluntary licensing schemes, via that
-      society, from any exercise by You of the rights
-      granted under this License.
-    
-  
-
-
-The above rights may be exercised in all media and
-formats whether now known or hereafter devised. The above
-rights include the right to make such modifications as are
-technically necessary to exercise the rights in other media
-and formats. Subject to Section 8(f), all rights not
-expressly granted by Licensor are hereby reserved.
-
-4. Restrictions. The license granted in
-Section 3 above is expressly made subject to and limited by
-the following restrictions:
-
-
-  You may Distribute or Publicly Perform the Work only
-  under the terms of this License. You must include a copy
-  of, or the Uniform Resource Identifier (URI) for, this
-  License with every copy of the Work You Distribute or
-  Publicly Perform. You may not offer or impose any terms
-  on the Work that restrict the terms of this License or
-  the ability of the recipient of the Work to exercise the
-  rights granted to that recipient under the terms of the
-  License. You may not sublicense the Work. You must keep
-  intact all notices that refer to this License and to the
-  disclaimer of warranties with every copy of the Work You
-  Distribute or Publicly Perform. When You Distribute or
-  Publicly Perform the Work, You may not impose any
-  effective technological measures on the Work that
-  restrict the ability of a recipient of the Work from You
-  to exercise the rights granted to that recipient under
-  the terms of the License. This Section 4(a) applies to
-  the Work as incorporated in a Collection, but this does
-  not require the Collection apart from the Work itself to
-  be made subject to the terms of this License. If You
-  create a Collection, upon notice from any Licensor You
-  must, to the extent practicable, remove from the
-  Collection any credit as required by Section 4(c), as
-  requested. If You create an Adaptation, upon notice from
-  any Licensor You must, to the extent practicable, remove
-  from the Adaptation any credit as required by Section
-  4(c), as requested.
-
-  You may Distribute or Publicly Perform an Adaptation
-  only under the terms of: (i) this License; (ii) a later
-  version of this License with the same License Elements as
-  this License; (iii) a Creative Commons jurisdiction
-  license (either this or a later license version) that
-  contains the same License Elements as this License (e.g.,
-  Attribution-ShareAlike 3.0 US)); (iv) a Creative Commons
-  Compatible License. If you license the Adaptation under
-  one of the licenses mentioned in (iv), you must comply
-  with the terms of that license. If you license the
-  Adaptation under the terms of any of the licenses
-  mentioned in (i), (ii) or (iii) (the "Applicable
-  License"), you must comply with the terms of the
-  Applicable License generally and the following
-  provisions: (I) You must include a copy of, or the URI
-  for, the Applicable License with every copy of each
-  Adaptation You Distribute or Publicly Perform; (II) You
-  may not offer or impose any terms on the Adaptation that
-  restrict the terms of the Applicable License or the
-  ability of the recipient of the Adaptation to exercise
-  the rights granted to that recipient under the terms of
-  the Applicable License; (III) You must keep intact all
-  notices that refer to the Applicable License and to the
-  disclaimer of warranties with every copy of the Work as
-  included in the Adaptation You Distribute or Publicly
-  Perform; (IV) when You Distribute or Publicly Perform the
-  Adaptation, You may not impose any effective
-  technological measures on the Adaptation that restrict
-  the ability of a recipient of the Adaptation from You to
-  exercise the rights granted to that recipient under the
-  terms of the Applicable License. This Section 4(b)
-  applies to the Adaptation as incorporated in a
-  Collection, but this does not require the Collection
-  apart from the Adaptation itself to be made subject to
-  the terms of the Applicable License.
-
-  If You Distribute, or Publicly Perform the Work or
-  any Adaptations or Collections, You must, unless a
-  request has been made pursuant to Section 4(a), keep
-  intact all copyright notices for the Work and provide,
-  reasonable to the medium or means You are utilizing: (i)
-  the name of the Original Author (or pseudonym, if
-  applicable) if supplied, and/or if the Original Author
-  and/or Licensor designate another party or parties (e.g.,
-  a sponsor institute, publishing entity, journal) for
-  attribution ("Attribution Parties") in Licensor's
-  copyright notice, terms of service or by other reasonable
-  means, the name of such party or parties; (ii) the title
-  of the Work if supplied; (iii) to the extent reasonably
-  practicable, the URI, if any, that Licensor specifies to
-  be associated with the Work, unless such URI does not
-  refer to the copyright notice or licensing information
-  for the Work; and (iv) , consistent with Ssection 3(b),
-  in the case of an Adaptation, a credit identifying the
-  use of the Work in the Adaptation (e.g., "French
-  translation of the Work by Original Author," or
-  "Screenplay based on original Work by Original Author").
-  The credit required by this Section 4(c) may be
-  implemented in any reasonable manner; provided, however,
-  that in the case of a Adaptation or Collection, at a
-  minimum such credit will appear, if a credit for all
-  contributing authors of the Adaptation or Collection
-  appears, then as part of these credits and in a manner at
-  least as prominent as the credits for the other
-  contributing authors. For the avoidance of doubt, You may
-  only use the credit required by this Section for the
-  purpose of attribution in the manner set out above and,
-  by exercising Your rights under this License, You may not
-  implicitly or explicitly assert or imply any connection
-  with, sponsorship or endorsement by the Original Author,
-  Licensor and/or Attribution Parties, as appropriate, of
-  You or Your use of the Work, without the separate,
-  express prior written permission of the Original Author,
-  Licensor and/or Attribution Parties.
-
-  Except as otherwise agreed in writing by the Licensor
-  or as may be otherwise permitted by applicable law, if
-  You Reproduce, Distribute or Publicly Perform the Work
-  either by itself or as part of any Adaptations or
-  Collections, You must not distort, mutilate, modify or
-  take other derogatory action in relation to the Work
-  which would be prejudicial to the Original Author's honor
-  or reputation. Licensor agrees that in those
-  jurisdictions (e.g. Japan), in which any exercise of the
-  right granted in Section 3(b) of this License (the right
-  to make Adaptations) would be deemed to be a distortion,
-  mutilation, modification or other derogatory action
-  prejudicial to the Original Author's honor and
-  reputation, the Licensor will waive or not assert, as
-  appropriate, this Section, to the fullest extent
-  permitted by the applicable national law, to enable You
-  to reasonably exercise Your right under Section 3(b) of
-  this License (right to make Adaptations) but not
-  otherwise.
-
-
-5. Representations, Warranties and
-Disclaimer
-
-UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN
-WRITING, LICENSOR OFFERS THE WORK AS-IS AND MAKES NO
-REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE
-WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING,
-WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY,
-FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE
-ABSENCE OF LATENT OR OTHER DEFECTS, ACCURACY, OR THE
-PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT DISCOVERABLE.
-SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED
-WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU.
-
-6. Limitation on Liability. EXCEPT TO
-THE EXTENT REQUIRED BY APPLICABLE LAW, IN NO EVENT WILL
-LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY
-SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY
-DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK,
-EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-7. Termination
-
-
-  This License and the rights granted hereunder will
-  terminate automatically upon any breach by You of the
-  terms of this License. Individuals or entities who have
-  received Adaptations or Collections from You under this
-  License, however, will not have their licenses terminated
-  provided such individuals or entities remain in full
-  compliance with those licenses. Sections 1, 2, 5, 6, 7,
-  and 8 will survive any termination of this License.
-
-  Subject to the above terms and conditions, the
-  license granted here is perpetual (for the duration of
-  the applicable copyright in the Work). Notwithstanding
-  the above, Licensor reserves the right to release the
-  Work under different license terms or to stop
-  distributing the Work at any time; provided, however that
-  any such election will not serve to withdraw this License
-  (or any other license that has been, or is required to
-  be, granted under the terms of this License), and this
-  License will continue in full force and effect unless
-  terminated as stated above.
-
-
-8. Miscellaneous
-
-
-  Each time You Distribute or Publicly Perform the Work
-  or a Collection, the Licensor offers to the recipient a
-  license to the Work on the same terms and conditions as
-  the license granted to You under this License.
-
-  Each time You Distribute or Publicly Perform an
-  Adaptation, Licensor offers to the recipient a license to
-  the original Work on the same terms and conditions as the
-  license granted to You under this License.
-
-  If any provision of this License is invalid or
-  unenforceable under applicable law, it shall not affect
-  the validity or enforceability of the remainder of the
-  terms of this License, and without further action by the
-  parties to this agreement, such provision shall be
-  reformed to the minimum extent necessary to make such
-  provision valid and enforceable.
-
-  No term or provision of this License shall be deemed
-  waived and no breach consented to unless such waiver or
-  consent shall be in writing and signed by the party to be
-  charged with such waiver or consent.
-
-  This License constitutes the entire agreement between
-  the parties with respect to the Work licensed here. There
-  are no understandings, agreements or representations with
-  respect to the Work not specified here. Licensor shall
-  not be bound by any additional provisions that may appear
-  in any communication from You. This License may not be
-  modified without the mutual written agreement of the
-  Licensor and You.
-
-  The rights granted under, and the subject matter
-  referenced, in this License were drafted utilizing the
-  terminology of the Berne Convention for the Protection of
-  Literary and Artistic Works (as amended on September 28,
-  1979), the Rome Convention of 1961, the WIPO Copyright
-  Treaty of 1996, the WIPO Performances and Phonograms
-  Treaty of 1996 and the Universal Copyright Convention (as
-  revised on July 24, 1971). These rights and subject
-  matter take effect in the relevant jurisdiction in which
-  the License terms are sought to be enforced according to
-  the corresponding provisions of the implementation of
-  those treaty provisions in the applicable national law.
-  If the standard suite of rights granted under applicable
-  copyright law includes additional rights not granted
-  under this License, such additional rights are deemed to
-  be included in the License; this License is not intended
-  to restrict the license of any rights under applicable
-  law.
-
-
-
-
-  Creative Commons Notice
-
-  Creative Commons is not a party to this License, and
-  makes no warranty whatsoever in connection with the Work.
-  Creative Commons will not be liable to You or any party
-  on any legal theory for any damages whatsoever, including
-  without limitation any general, special, incidental or
-  consequential damages arising in connection to this
-  license. Notwithstanding the foregoing two (2) sentences,
-  if Creative Commons has expressly identified itself as
-  the Licensor hereunder, it shall have all rights and
-  obligations of Licensor.
-
-  Except for the limited purpose of indicating to the
-  public that the Work is licensed under the CCPL, Creative
-  Commons does not authorize the use by either party of the
-  trademark "Creative Commons" or any related trademark or
-  logo of Creative Commons without the prior written
-  consent of Creative Commons. Any permitted use will be in
-  compliance with Creative Commons' then-current trademark
-  usage guidelines, as may be published on its website or
-  otherwise made available upon request from time to time.
-  For the avoidance of doubt, this trademark restriction
-  does not form part of the License.
-
-  Creative Commons may be contacted at http://creativecommons.org/.
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/includes/footer.xml b/includes/footer.xml
index 73d05a7..f2fce7f 100644
--- a/includes/footer.xml
+++ b/includes/footer.xml
@@ -1,6 +1,6 @@
 <div id="footer">
 <p>Last updated: MODDATE</p>
-<p>The text on this website is licensed under the <a href="http://creativecommons.org/licenses/by-sa/3.0/" rel="license">Creative Commons Attribution-Share Alike 3.0 License</a>. The <a href="http://git.njw.me.uk/cgit/cgit.cgi/njw-website/">code used to build this website</a> is released under the <a href="http://www.gnu.org/licenses/agpl.html" rel="license" about="http://git.njw.me.uk/njw-website.git">GNU Affero General Public License</a>.</p>
+<p>The text on this website is licensed under the <a href="http://creativecommons.org/licenses/by-sa/3.0/" rel="license">Creative Commons Attribution-Share Alike 3.0 License</a>. The <a href="http://git.njw.me.uk/cgit/cgit.cgi/njw-website/">code used to build this website</a> is released under the <a href="http://www.gnu.org/licenses/gpl.html" rel="license" about="http://git.njw.me.uk/njw-website.git">GNU General Public License</a>.</p>
 </div>
 </body>
 </html>