Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

ticket: 7067

subject: documentation license to CC-BY-SA 3.0 Unported
target_version: 1.10
tags: pullup

Update documentation license to Creative Commons
Attribution-ShareAlike 3.0 Unported.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@25633 dc483132-0cff-0310-8789-dd5450dbe970
  • Loading branch information...
commit 0531fdfc1a8cb9ac43bf0e18929c28d4e4dd3843 1 parent 9837661
tlyu authored
Showing with 31 additions and 47 deletions.
  1. +14 −10 NOTICE
  2. +17 −36 doc/copyright.texinfo
  3. +0 −1  doc/notice.texinfo
24 NOTICE
View
@@ -1,4 +1,4 @@
-Copyright (C) 1985-2011 by the Massachusetts Institute of Technology.
+Copyright (C) 1985-2012 by the Massachusetts Institute of Technology.
All rights reserved.
@@ -8,18 +8,22 @@ All rights reserved.
contemplating export to obtain such a license before exporting.
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
+this software 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.
+Documentation components of this software distribution are licensed
+under a Creative Commons Attribution-ShareAlike 3.0 Unported License.
+(`http://creativecommons.org/licenses/by-sa/3.0/')
+
Individual source code files are copyright MIT, Cygnus Support, Novell,
OpenVision Technologies, Oracle, Red Hat, Sun Microsystems,
FundsXpress, and others.
53 doc/copyright.texinfo
View
@@ -2,7 +2,7 @@
@begingroup
@smallfonts @rm
@end iftex
-Copyright @copyright{} 1985-2010 by the Massachusetts Institute of Technology.
+Copyright @copyright{} 1985-2012 by the Massachusetts Institute of Technology.
All rights reserved.
@@ -13,18 +13,22 @@ Government. It is the responsibility of any person or organization
contemplating export to obtain such a license before exporting.
@end quotation
-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.
+WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
+distribute this software 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.
+
+Documentation components of this software distribution are licensed
+under a Creative Commons Attribution-ShareAlike 3.0 Unported License.
+(@uref{http://creativecommons.org/licenses/by-sa/3.0/})
Individual source code files are copyright MIT, Cygnus Support,
Novell, OpenVision Technologies, Oracle, Red Hat, Sun Microsystems,
@@ -1252,29 +1256,6 @@ required by the GPL in this and the other files of this package. If you do
not delete the provisions above, a recipient may use your version of this
file under either the BSD or the GPL.
@end quotation
-@ifclear noticefile
-
-@cdivider
-
-Permission is granted to make and distribute verbatim copies of this
-manual provided the copyright notices and this permission notice are
-preserved on all copies.
-
-@ignore
-Permission is granted to process this file through TeX and print the
-results, provided the printed document carries a copying permission
-notice identical to this one except for the removal of this paragraph
-(this paragraph not being relevant to the printed manual).
-@end ignore
-
-Permission is granted to copy and distribute modified versions of this
-manual under the conditions for verbatim copying, provided also that the
-entire resulting derived work is distributed under the terms of a
-permission notice identical to this one.
-
-Permission is granted to copy and distribute translations of this manual
-into another language, under the above conditions for modified versions.
-@end ifclear
@iftex
@pagealignmacro
@endgroup
1  doc/notice.texinfo
View
@@ -3,7 +3,6 @@
@paragraphindent 0
@exampleindent 2
@documentencoding UTF-8
-@set noticefile
@node Top, , (dir), (dir)
@comment node-name, next, previous, up
@include definitions.texinfo
Please sign in to comment.
Something went wrong with that request. Please try again.