sawsim/discussion.tex: No time to flesh out my interpolating tree

[thesis.git] / COPYING

diff --git a/COPYING b/COPYING
index 9370c0ec8b2199169f2bc675df5184c01de19c1b..ac48b85e15615013fdf14ab8d2803e7e3003ea92 100644 (file)
--- a/COPYING
+++ b/COPYING
@@ -44,14 +44,14 @@ TERMS AND CONDITIONS.
  b. "Collection" means a collection of literary or artistic works,
     such as encyclopedias and anthologies, or performances, phonograms
     or broadcasts, or other works or subject matter other than works
-    listed in Section 1(f) below, which, by reason of the selection
+    listed in Section 1(h) below, which, by reason of the selection
     and arrangement of their contents, constitute intellectual
     creations, in which the Work is included in its entirety in
     unmodified form along with one or more other contributions, each
     constituting separate and independent works in themselves, which
     together are assembled into a collective whole. A work that
     constitutes a Collection will not be considered an Adaptation (as
-    defined below) for the purposes of this License.
+    defined above) for the purposes of this License.
 
  c. "Creative Commons Compatible License" means a license that is
     listed at http:// creativecommons.org/compatiblelicenses that has
@@ -60,9 +60,9 @@ TERMS AND CONDITIONS.
     (i) contains terms that have the same purpose, meaning and effect
     as the License Elements of this License; and, (ii) explicitly
     permits the relicensing of adaptations of works made available
-    under that license under this License or a Creative Commons
-    jurisdiction license with the same License Elements as this
-    License.
+    under that license under this License or either a Creative Commons
+    unported license or a Creative Commons jurisdiction license with
+    the same License Elements as this License.
 
  d. "Distribute" means to make available to the public the original
     and copies of the Work or Adaptation, as appropriate, through sale
@@ -299,7 +299,7 @@ UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING,
 LICENSOR OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR
 WARRANTIES OF ANY KIND CONCERNING THE WORK, EXPRESS, IMPLIED,
 STATUTORY OR OTHERWISE, INCLUDING, WITHOUT LIMITATION, WARRANTIES OF
-TITLE, MERCHANTIBILITY, FITNESS FOR A PARTICULAR PURPOSE,
+TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE,
 NONINFRINGEMENT, OR THE ABSENCE OF LATENT OR OTHER DEFECTS, ACCURACY,
 OR THE PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT
 DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED
@@ -400,6 +400,6 @@ EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
     then-current trademark usage guidelines, as may be published on
     its website or otherwise made available upon request from time to
     time. For the avoidance of doubt, this trademark restriction does
-    not form part of the License.
+    not form part of this License.
 
     Creative Commons may be contacted at http://creativecommons.org/.