Differences

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

--- public:cadia-clause:bsd [2009/04/02 15:11] – thorisson
+++ public:cadia-clause:bsd [2024/04/29 13:33] (current) – external edit 127.0.0.1
@@ Line 3: / Line 3: @@
 ====== BSD License Extended with CADIA Clause ======
-[[public:cadia-clause:cadia-clause-main|CADIA Clause wiki page]]
+[[public:cadia-clause:cadia-clause-main|CADIA Clause wiki page]]  |  [[http://www.humanobs.org|HUMANOBS.ORG Website]]
+\\
+\\
-<box>
   //_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/
   //_/_/
@@ Line 44: / Line 46: @@
   //_/_/
   //_/_/
-  //_/_/  Redistribution and use in source and binary forms, with or without modification, is permitted provided that the following
+  //_/_/  Redistribution and use in source and binary forms, with or without modification, is permitted provided
-  //_/_/  conditions are met:
+  //_/_/  that the following conditions are met:
   //_/_/
-  //_/_/  - Redistributions of source code must retain the above copyright and collaboration notice, this list of conditions and the
+  //_/_/  - Redistributions of source code must retain the above copyright and collaboration notice, this list of
+  //_/_/    conditions and the
   //_/_/    following disclaimer.
   //_/_/
-  //_/_/  - Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following
+  //_/_/  - Redistributions in binary form must reproduce the above copyright notice, this list of conditions and
+  //_/_/    the following
   //_/_/    disclaimer in the documentation and/or other materials provided with the distribution.
   //_/_/
-  //_/_/  - Neither the name of its copyright holders nor the names of its contributors may be used to endorse or promote products
+  //_/_/  - Neither the name of its copyright holders nor the names of its contributors may be used to endorse or
+  //_/_/    promote products
   //_/_/    derived from this software without specific prior written permission.
   //_/_/
-  //_/_/  - The license granted in and to the software under this agreement is a limited-use license.  The software may not be used
+  //_/_/  - CADIA Clause: The license granted in and to the software under this agreement is a limited-use license.
-  //_/_/     in furtherance of: (i) intentionally causing bodily injury or severe emotional distress to any person; (ii) invading the
+  //_/_/    The software may not be used in furtherance of: (i) intentionally causing bodily injury or severe emotional
-  //_/_/    personal privacy or violating the human rights of any person; or (iii) committing  or preparing for any act of war.
+  //_/_/    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.
   //_/_/
   //_/_/  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS  "AS IS" AND ANY
@@ Line 72: / Line 78: @@
   //_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/
-</box>
 \\
 \\