Merge branch 'stable-3.x'

[ypp-sc-tools.main.git] / yarrg / web / footer

diff --git a/yarrg/web/footer b/yarrg/web/footer
index 081b07e5bea99bfd39cb64841eb568c35e4e2c87..75fcd156268ed9d9001d90c8a37b72b50c2c4c06 100644 (file)
--- a/yarrg/web/footer
+++ b/yarrg/web/footer
@@ -1,46 +1,63 @@
-%# This is part of the YARRG website.  YARRG is a tool and website
-%# for assisting players of Yohoho Puzzle Pirates.
-%#
-%# Copyright (C) 2009 Ian Jackson <ijackson@chiark.greenend.org.uk>
-%# Copyright (C) 2009 Clare Boothby
-%#
-%#  YARRG's client code etc. is covered by the ordinary GNU GPL (v3 or later).
-%#  The YARRG website is covered by the GNU Affero GPL v3 or later, which
-%#   basically means that every installation of the website will let you
-%#   download the source.
-%#
-%# 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 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.
-%#
-%# You should have received a copy of the GNU Affero General Public License
-%# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-%#
-%# Yohoho and Puzzle Pirates are probably trademarks of Three Rings and
-%# are used without permission.  This program is not endorsed or
-%# sponsored by Three Rings.
-%#
-%#
-%# This Mason component is simply the page footer.
-%#
+<%doc>
+
+ This is part of the YARRG website.  YARRG is a tool and website
+ for assisting players of Yohoho Puzzle Pirates.
+
+ Copyright (C) 2009 Ian Jackson <ijackson@chiark.greenend.org.uk>
+ Copyright (C) 2009 Clare Boothby
+
+  YARRG's client code etc. is covered by the ordinary GNU GPL (v3 or later).
+  The YARRG website is covered by the GNU Affero GPL v3 or later, which
+   basically means that every installation of the website will let you
+   download the source.
+
+ 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 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.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+ Yohoho and Puzzle Pirates are probably trademarks of Three Rings and
+ are used without permission.  This program is not endorsed or
+ sponsored by Three Rings.
+
+
+ This Mason component is simply the page footer.
+
+
+</%doc>
+<%args>
+$isdevel => 0
+</%args>

 <hr>
 <address>
 YARRG is Yet Another Revenue Research Gatherer, a project of the
 crew Special Circumstances on the Midnight Ocean
 and of the Sinister Greenend Organisation.
 <p>
 <hr>
 <address>
 YARRG is Yet Another Revenue Research Gatherer, a project of the
 crew Special Circumstances on the Midnight Ocean
 and of the Sinister Greenend Organisation.
 <p>

+
+YARRG is Free Software.
+You may share and modify the code and the
+website, according to the terms of the GNU General Public Licence and
+the GNU Affero General Public Licence respectively (v3 or later).
+Note that there is <strong>NO WARRANTY</strong>.
+% if (!$isdevel) {
+Please see the <a href="devel">YARRG Development webpage</a> for
+details of how to obtain the client and server code and full details
+of the licences.
+% }
+
+<p>
+YARRG is <& copyrightdate &>.

 Yohoho and Puzzle Pirates are trademarks of Three Rings and are used
 without permission.  YARRG is not endorsed or sponsored by Three
 Rings.
 Yohoho and Puzzle Pirates are trademarks of Three Rings and are used
 without permission.  YARRG is not endorsed or sponsored by Three
 Rings.

-<p>
-YARRG is Free Software.  You may share and modify the code, including
-the website.  Please see the
-<a href="docs">YARRG documentation webpage</a> for details of how to
-obtain the client and server code.
+

 </address>
 </address>