aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Scherer <misc@mageia.org>2011-06-17 12:21:06 +0000
committerMichael Scherer <misc@mageia.org>2011-06-17 12:21:06 +0000
commit48e7f4b3d6ff2db841deb9ce1083dadf92756347 (patch)
tree3fde54a25875d06e7665171f44f98acda5916a53
parente628960d64f4907e823f8a55522514891d2c3ef4 (diff)
downloadpuppet-48e7f4b3d6ff2db841deb9ce1083dadf92756347.tar
puppet-48e7f4b3d6ff2db841deb9ce1083dadf92756347.tar.gz
puppet-48e7f4b3d6ff2db841deb9ce1083dadf92756347.tar.bz2
puppet-48e7f4b3d6ff2db841deb9ce1083dadf92756347.tar.xz
puppet-48e7f4b3d6ff2db841deb9ce1083dadf92756347.zip
fix licensing of the wiki, following romain comment on ml
-rw-r--r--modules/mediawiki/templates/LocalSettings.php8
1 files changed, 5 insertions, 3 deletions
diff --git a/modules/mediawiki/templates/LocalSettings.php b/modules/mediawiki/templates/LocalSettings.php
index 024fc09b..3e0fe5d2 100644
--- a/modules/mediawiki/templates/LocalSettings.php
+++ b/modules/mediawiki/templates/LocalSettings.php
@@ -109,10 +109,12 @@ $wgDefaultSkin = 'monobook';
## appropriate copyright notice / icon. GNU Free Documentation
## License and Creative Commons licenses are supported so far.
$wgEnableCreativeCommonsRdf = true;
+# TODO add a proper page
$wgRightsPage = ""; # Set to the title of a wiki page that describes your license/copyright
-$wgRightsUrl = "http://www.gnu.org/copyleft/fdl.html";
-$wgRightsText = "GNU Free Documentation License 1.3";
-$wgRightsIcon = "${wgScriptPath}/skins/common/images/gnu-fdl.png";
+$wgRightsUrl = "http://creativecommons.org/licenses/by-sa/3.0/";
+$wgRightsText = "Creative Common - Attibution - ShareAlike 3.0";
+# TODO get the icon to host it on our server
+$wgRightsIcon = "http://i.creativecommons.org/l/by-sa/3.0/88x31.png";
# $wgRightsCode = "gfdl1_3"; # Not yet used
$wgDiff3 = "/usr/bin/diff3";