svn rev #25637: branches/krb5-1-10/ doc/

[tlyu@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=25637
Commit By: tlyu
Log Message:
ticket: 7067
version_fixed: 1.10
status: resolved

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.


Changed Files:
U   branches/krb5-1-10/NOTICE
U   branches/krb5-1-10/doc/copyright.texinfo
U   branches/krb5-1-10/doc/notice.texinfo
Modified: branches/krb5-1-10/NOTICE
===================================================================
--- branches/krb5-1-10/NOTICE	2012-01-10 17:43:23 UTC (rev 25636)
+++ branches/krb5-1-10/NOTICE	2012-01-10 17:52:37 UTC (rev 25637)
@@ -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 @@
      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.

Modified: branches/krb5-1-10/doc/copyright.texinfo
===================================================================
--- branches/krb5-1-10/doc/copyright.texinfo	2012-01-10 17:43:23 UTC (rev 25636)
+++ branches/krb5-1-10/doc/copyright.texinfo	2012-01-10 17:52:37 UTC (rev 25637)
@@ -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,19 +13,23 @@
 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,
 FundsXpress, and others.
@@ -1252,29 +1256,6 @@
 not delete the provisions above, a recipient may use your version of this
 file under either the BSD or the GPL.
 @end quotation
- at ifclear noticefile
-
- at 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.
-
- at 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).
- at 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.
- at end ifclear
 @iftex
 @pagealignmacro
 @endgroup

Modified: branches/krb5-1-10/doc/notice.texinfo
===================================================================
--- branches/krb5-1-10/doc/notice.texinfo	2012-01-10 17:43:23 UTC (rev 25636)
+++ branches/krb5-1-10/doc/notice.texinfo	2012-01-10 17:52:37 UTC (rev 25637)
@@ -3,7 +3,6 @@
 @paragraphindent 0
 @exampleindent 2
 @documentencoding UTF-8
- at set noticefile
 @node Top,  , (dir), (dir)
 @comment  node-name,  next,  previous,  up
 @include definitions.texinfo