Differences

This shows you the differences between two versions of the page.

--- public:cadia-clause:cadia-clause-main [2009/04/02 16:23] – thorisson
+++ public:cadia-clause:cadia-clause-main [2024/04/29 13:33] (current) – external edit 127.0.0.1
@@ Line 1: / Line 1: @@
 ====== The CADIA Clause ======
-| {{:public:cadia-clause:cadiaclauselogo-small.png|Official CADIA Clause logo}} \\ <sub>[[public:cadia-clause:cadia-clause-logo|Alternative resolutions]]</sub>|  **The "CADIA Clause" is a paragraph that restricts the use of software or other copyrighted material for military purposes or human-rights violations.** \\ \\ Anyone is free to copy the Clause and add to their license (the clause itself is licensed under the [[http://creativecommons.org/licenses/by-nd/3.0/|Creative Commons (CC) license]], which means you need to give credit to its original authors and you may not modify it in any way).  |
+|  {{:public:cadia-clause:cadiaclauselogo-small.png|Official CADIA Clause logo}} \\  |**The "CADIA Clause" is a paragraph \\ that restricts the use of software or other copyrighted material \\ for military purposes and human-rights violations.** \\ \\ Anyone is free to copy the Clause and add to their license (the clause itself is licensed under \\ the [[http://creativecommons.org/licenses/by-nd/3.0/|Creative Commons (CC) license]], which means you need to give credit to its original authors \\ and you may not modify it in any way. \\ \\ If you want to contribute to a better world, consider including it in the license for your next creation.  |
+| <sub>[[public:cadia-clause:cadia-clause-logo|Alternative resolutions]]</sub> | |
 \\
@@ Line 10: / Line 10: @@
 **CADIA Clause:** The license granted in and to the software under this agreement is a limited-use license.  The software may not be used in furtherance of: (i) intentionally causing bodily injury or severe emotional distress to any person; (ii) invading the personal privacy or violating the human rights of any person; or (iii) committing or preparing for any act of war.
-<sub>To use this Clause in your own license, copy the text above and be sure to include the following somewhere in the license: **CADIA Clause (CC) CADIA, Reykjavik University, 2009**</sub>
+</box>
+<box>
+<sub>To use the above Clause in your own license, copy all of its text and be sure to include the following somewhere close by in your license: **CADIA Clause (CC) CADIA, Reykjavik University, 2009; http://creativecommons.org/licenses/by-nd/3.0/**</sub>
 </box>
 \\
@@ Line 23: / Line 26: @@
 \\
 ------------------
-The CADIA Clause was authored by Kristinn R. Thórisson, with advice from Brent C. J. Britton. \\
+The CADIA Clause was authored by [[http://xenia.media.mit.edu/~kris|Kristinn R. Thórisson]], with advice from Brent C. J. Britton. \\
 The CADIA Clause logo is (CC) Kristinn R. Thórisson, 2009 (same CC license as the Clause itself). \\
 [[http://creativecommons.org/licenses/by-nd/3.0/|Look at CC License]] for CADIA Clause and CADIA Clause logo.