From 50c435dced2ae1c01627d525c245c40a38c7f09e Mon Sep 17 00:00:00 2001
From: "Kristina D.C. Hoeppner" <kristina@catalyst.net.nz>
Date: Mon, 25 Mar 2013 16:48:20 +1300
Subject: [PATCH] Bug 9595: Change GPL license to 3.0

Change the general Koha license from 2
to 3 in the About page and also link to
the new YUI BSD license page

Signed-off-by: Melia Meggs <melia@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All links seem to be correct now.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
---
 koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
index 2cf9edd7f0..3434ead933 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
@@ -394,7 +394,7 @@
         <div id="licenses">
             <h2>Koha</h2>
             <p>
-            <a href="http://www.gnu.org/licenses/old-licenses/gpl-2.0.html">Koha is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.</a>
+            <a href="http://www.gnu.org/licenses/gpl-3.0.html">Koha is free software; you can redistribute it and/or modify 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.</a>
             </p>
             <h2>jQuery and jQueryUI</h2>
             <p><a href="http://jquery.com/">jQuery</a> and <a href="http://jqueryui.com/">jQueryUI</a> are licensed under the <a href="http://github.com/jquery/jquery/blob/master/MIT-LICENSE.txt">MIT license</a></p>
@@ -402,7 +402,7 @@
             <p><a href="http://twitter.github.com/bootstrap/">Bootstrap</a> code and <a href="http://glyphicons.com">Glyphicons Free</a> licensed under <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License v2.0</a>.</p>
             <h2>YUI</h2>
             <p>
-            <a href="http://developer.yahoo.com/auth/license.txt">BSD License</a>
+            <a href="http://yuilibrary.com/license/">BSD License</a>
             </p>
             <h2>Famfamfam iconset</h2>
               <ul>
-- 
2.20.1