summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Dashjr <luke-jr+git@utopios.org>2016-02-01 23:29:07 +0000
committerLuke Dashjr <luke-jr+git@utopios.org>2016-02-01 23:29:07 +0000
commitcfbde44a3c7020ee26be39205ab685c383a3b4d1 (patch)
tree83a3a540a36e55e9ff02961ea2925f1189c8bd3f
parentc61f4d83009fa11bc72203e0ecdface08f4626f2 (diff)
downloadbips-cfbde44a3c7020ee26be39205ab685c383a3b4d1.tar.xz
bip-biprevised: Link licenses, and remove obsolete Apple licence and non-existent OSI-approved 1-clause BSD license
-rw-r--r--bip-biprevised.mediawiki28
1 files changed, 14 insertions, 14 deletions
diff --git a/bip-biprevised.mediawiki b/bip-biprevised.mediawiki
index efbfa78..0774962 100644
--- a/bip-biprevised.mediawiki
+++ b/bip-biprevised.mediawiki
@@ -72,23 +72,23 @@ New BIPs may be accepted with the following licenses:
====Recommended licenses====
-* OSI-approved BSD 1, 2, or 3 clause licenses
-* Creative Commons CC0 1.0 Universal
-* GNU All-Permissive License
+* [https://opensource.org/licenses/BSD-2-Clause OSI-approved BSD 2-clause license]
+* [https://opensource.org/licenses/BSD-3-Clause OSI-approved BSD 3-clause license]
+* [https://creativecommons.org/publicdomain/zero/1.0/ Creative Commons CC0 1.0 Universal]
+* [http://www.gnu.org/prep/maintain/html_node/License-Notices-for-Other-Files.html GNU All-Permissive License]
====Not recommented, but acceptable licenses====
-* Apache License, version 2.0
-* Apple's Common Documentation License, version 1.0
-* Boost Software License, version 1.0
-* Creative Commons Attribution 4.0 International
-* Creative Commons Attribution-ShareAlike 4.0 International
-* Expat/MIT/X11 license
-* GNU Affero General Public License (AGPL), version 3
-* GNU Free Documentation License
-* GNU General Public License (GPL), version 2 or 3
-* GNU Lesser General Public License (LGPL), version 2.1 or 3
-* Open Publication License, version 1.0
+* [http://www.apache.org/licenses/LICENSE-2.0 Apache License, version 2.0]
+* [http://www.boost.org/LICENSE_1_0.txt Boost Software License, version 1.0]
+* [https://creativecommons.org/licenses/by/4.0/ Creative Commons Attribution 4.0 International]
+* [https://creativecommons.org/licenses/by-sa/4.0/ Creative Commons Attribution-ShareAlike 4.0 International]
+* [https://opensource.org/licenses/MIT Expat/MIT/X11 license]
+* [http://www.gnu.org/licenses/agpl-3.0.en.html GNU Affero General Public License (AGPL), version 3 or newer]
+* [http://www.gnu.org/licenses/fdl-1.3.en.html GNU Free Documentation License]
+* [http://www.gnu.org/licenses/old-licenses/gpl-2.0.en.html GNU General Public License (GPL), version 2 or newer]
+* [http://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html GNU Lesser General Public License (LGPL), version 2.1 or newer]
+* [http://opencontent.org/openpub/ Open Publication License, version 1.0]
==See Also==