summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorKen Raeburn <raeburn@mit.edu>1999-09-24 21:20:59 +0000
committerKen Raeburn <raeburn@mit.edu>1999-09-24 21:20:59 +0000
commit9584864938e1584e5b02ee732234616bffaa43e7 (patch)
tree0d987073432aeab5f5d49c1e836af1006095f680 /doc
parent27d50659bd97f25b2cac637dfbf2b50aabb6d4ac (diff)
downloadkrb5-9584864938e1584e5b02ee732234616bffaa43e7.tar.gz
krb5-9584864938e1584e5b02ee732234616bffaa43e7.tar.xz
krb5-9584864938e1584e5b02ee732234616bffaa43e7.zip
copyright notice updates from 1.1 branch
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@11853 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'doc')
-rw-r--r--doc/ChangeLog4
-rw-r--r--doc/copyright.texinfo26
2 files changed, 16 insertions, 14 deletions
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 8b4c0c5092..38af2b8887 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,7 @@
+1999-09-22 Tom Yu <tlyu@mit.edu>
+
+ * copyright.texinfo: Update copyright again.
+
1999-09-17 Tom Yu <tlyu@mit.edu>
* copyright.texinfo: Update copyright notice somewhat.
diff --git a/doc/copyright.texinfo b/doc/copyright.texinfo
index 084cdbba0b..7ea4758e26 100644
--- a/doc/copyright.texinfo
+++ b/doc/copyright.texinfo
@@ -7,20 +7,18 @@ Government. It is the responsibility of any person or organization
contemplating export to obtain such a license before exporting.
@end quotation
-If you make modifications to this software and distribute the modified
-software you MUST LABEL IT AS BEING A MODIFIED VERSION AND NOT ORIGINAL
-MIT KERBEROS CODE.
-
-WITHIN THESE CONSTRAINTS, permission to use, copy, modify, and
-distribute this software and its documentation for any purpose and
-without fee is hereby granted, provided that the above copyright notice
-appear in all copies and that both that copyright notice and this
-permission notice appear in supporting documentation, and that the name
-of M.I.T. not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior permission.
-M.I.T. makes no representations about the suitability of this software
-for any purpose. It is provided ``as is'' without express or implied
-warranty.
+WITHIN THAT CONSTRAINT, permission to use, copy, modify, and distribute
+this software and its documentation for any purpose and without fee is
+hereby granted, provided that the above copyright notice appear in all
+copies and that both that copyright notice and this permission notice
+appear in supporting documentation, and that the name of M.I.T. not be
+used in advertising or publicity pertaining to distribution of the
+software without specific, written prior permission. Furthermore if you
+modify this software you must label your software as modified software
+and not distribute it in such a fashion that it might be confused with
+the original MIT software. M.I.T. makes no representations about the
+suitability of this software for any purpose. It is provided ``as is''
+without express or implied warranty.
@iftex
@vskip 12pt