diff options
| author | David Prévot <taffit> | 2012-01-24 22:43:34 +0000 |
|---|---|---|
| committer | David Prévot <taffit> | 2012-01-24 22:43:34 +0000 |
| commit | e563be06dc161dfd86df577bd4abb9eac2a33194 (patch) | |
| tree | 32be7d92a056fcb0b58765b5579027c28adc3317 /english/license.wml | |
| parent | 5425c35dc1781f6f22e3c8d056fbde54079fca34 (diff) | |
Website DFSG-free, starting right now (closes: #238245)
CVS version numbers
english/license.wml: 1.27 -> 1.28
Diffstat (limited to 'english/license.wml')
| -rw-r--r-- | english/license.wml | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/english/license.wml b/english/license.wml index 638f6ccbc1c..5dcb4ac38a8 100644 --- a/english/license.wml +++ b/english/license.wml @@ -10,6 +10,22 @@ United States </p> </div> +<p> +Since 25 January 2012, the new material can be redistributed and/or +modified under the terms of the <a href="legal/licenses/mit">\ +MIT (Expat) License</a> (which is usually available at +<url http://www.jclark.com/xml/copying.txt>) or, at your option, of the <a +href="legal/licenses/gpl2">GNU General Public License</a>; either version 2 +of the License, or (at your option) any later version (the latest version +is usually available at <url http://www.gnu.org/licenses/gpl.html>). +</p> + +<p> +Work is in progress to make the older material compliant +with the above licenses. Until then, please refer to the +following terms of the Open Publication License. +</p> + <p>This material may be distributed only subject to the terms and conditions set forth in the Open Publication License, Draft v1.0 or later (you can read our <a href="opl">local copy</a>, the latest version |