From d3185690c0a7ca70f5282fc6007dc1ab19b1ddd6 Mon Sep 17 00:00:00 2001 From: Tom Yu Date: Tue, 10 Jan 2012 17:52:37 +0000 Subject: [PATCH] Pull up r25633 from trunk ------------------------------------------------------------------------ r25633 | tlyu | 2012-01-09 23:23:56 -0500 (Mon, 09 Jan 2012) | 8 lines 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. ticket: 7067 version_fixed: 1.10 status: resolved git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-10@25637 dc483132-0cff-0310-8789-dd5450dbe970 --- NOTICE | 24 ++++++++++++-------- doc/copyright.texinfo | 53 ++++++++++++++----------------------------- doc/notice.texinfo | 1 - 3 files changed, 31 insertions(+), 47 deletions(-) diff --git a/NOTICE b/NOTICE index ab7c6a59f..910b7628f 100644 --- a/NOTICE +++ b/NOTICE @@ -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. diff --git a/doc/copyright.texinfo b/doc/copyright.texinfo index fb86f5182..b1b01b068 100644 --- a/doc/copyright.texinfo +++ b/doc/copyright.texinfo @@ -2,7 +2,7 @@ @begingroup @smallfonts @rm @end iftex -Copyright @copyright{} 1985-2011 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 diff --git a/doc/notice.texinfo b/doc/notice.texinfo index f26e1888b..9377f0b96 100644 --- a/doc/notice.texinfo +++ b/doc/notice.texinfo @@ -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 -- 2.26.2