[phpwiki-checkins] CVS: phpwiki LICENSE,1.1.1.1,1.2

[Carsten K. <car...@us...>]

Update of /cvsroot/phpwiki/phpwiki
In directory usw-pr-cvs1:/tmp/cvs-serv24541/phpwiki

Modified Files:
	LICENSE 
Log Message:
Minor reformatting to fix line-ending problems.
Pasted in the updated version for y2k-savviness.

Index: LICENSE
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/LICENSE,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** LICENSE	2000/06/02 15:46:24	1.1.1.1
--- LICENSE	2001/12/27 18:06:49	1.2
***************
*** 1,12 ****
!                     GNU GENERAL PUBLIC LICENSE
!                        Version 2, June 1991
  
   Copyright (C) 1989, 1991 Free Software Foundation, Inc.
!                        59 Temple Place, Suite 330, Boston, MA
! 02111-1307  USA
   Everyone is permitted to copy and distribute verbatim copies
   of this license document, but changing it is not allowed.
  
!                             Preamble
  
    The licenses for most software are designed to take away your
--- 1,11 ----
! 		    GNU GENERAL PUBLIC LICENSE
! 		       Version 2, June 1991
  
   Copyright (C) 1989, 1991 Free Software Foundation, Inc.
!                        59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
   Everyone is permitted to copy and distribute verbatim copies
   of this license document, but changing it is not allowed.
  
! 			    Preamble
  
    The licenses for most software are designed to take away your
***************
*** 58,62 ****
  modification follow.
  
!                     GNU GENERAL PUBLIC LICENSE
     TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
  
--- 57,61 ----
  modification follow.
  
! 		    GNU GENERAL PUBLIC LICENSE
     TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
  
***************
*** 121,126 ****
  on the Program, the distribution of the whole must be on the terms of
  this License, whose permissions for other licensees extend to the
! entire whole, and thus to each and every part regardless of who wrote
! it.
  
  Thus, it is not the intent of this section to claim rights or contest
--- 120,124 ----
  on the Program, the distribution of the whole must be on the terms of
  this License, whose permissions for other licensees extend to the
! entire whole, and thus to each and every part regardless of who wrote it.
  
  Thus, it is not the intent of this section to claim rights or contest
***************
*** 140,145 ****
      a) Accompany it with the complete corresponding machine-readable
      source code, which must be distributed under the terms of Sections
!     1 and 2 above on a medium customarily used for software interchange;
! or,
  
      b) Accompany it with a written offer, valid for at least three
--- 138,142 ----
      a) Accompany it with the complete corresponding machine-readable
      source code, which must be distributed under the terms of Sections
!     1 and 2 above on a medium customarily used for software interchange; or,
  
      b) Accompany it with a written offer, valid for at least three
***************
*** 238,243 ****
  the limitation as if written in the body of this License.
  
!   9. The Free Software Foundation may publish revised and/or new
! versions
  of the General Public License from time to time.  Such new versions will
  be similar in spirit to the present version, but may differ in detail to
--- 235,239 ----
  the limitation as if written in the body of this License.
  
!   9. The Free Software Foundation may publish revised and/or new versions
  of the General Public License from time to time.  Such new versions will
  be similar in spirit to the present version, but may differ in detail to
***************
*** 246,306 ****
  Each version is given a distinguishing version number.  If the Program
  specifies a version number of this License which applies to it and "any
! later version", you have the option of following the terms and
! conditions
  either of that version or of any later version published by the Free
! Software Foundation.  If the Program does not specify a version number
! of
! this License, you may choose any version ever published by the Free
! Software
  Foundation.
  
    10. If you wish to incorporate parts of the Program into other free
! programs whose distribution conditions are different, write to the
! author
  to ask for permission.  For software which is copyrighted by the Free
  Software Foundation, write to the Free Software Foundation; we sometimes
  make exceptions for this.  Our decision will be guided by the two goals
! of preserving the free status of all derivatives of our free software
! and
  of promoting the sharing and reuse of software generally.
  
!                             NO WARRANTY
  
!   11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO
! WARRANTY
  FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
  OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
! PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER
! EXPRESSED
  OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
! MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK
! AS
  TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
  PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
  REPAIR OR CORRECTION.
  
!   12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
! WRITING
  WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
! REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR
! DAMAGES,
! INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES
! ARISING
! OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT
! LIMITED
  TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
! YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY
! OTHER
  PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
  POSSIBILITY OF SUCH DAMAGES.
  
!                      END OF TERMS AND CONDITIONS
  
!             How to Apply These Terms to Your New Programs
  
    If you develop a new program, and you want it to be of the greatest
  possible use to the public, the best way to achieve this is to make it
! free software which everyone can redistribute and change under these
! terms.
  
    To do so, attach the following notices to the program.  It is safest
--- 242,288 ----
  Each version is given a distinguishing version number.  If the Program
  specifies a version number of this License which applies to it and "any
! later version", you have the option of following the terms and conditions
  either of that version or of any later version published by the Free
! Software Foundation.  If the Program does not specify a version number of
! this License, you may choose any version ever published by the Free Software
  Foundation.
  
    10. If you wish to incorporate parts of the Program into other free
! programs whose distribution conditions are different, write to the author
  to ask for permission.  For software which is copyrighted by the Free
  Software Foundation, write to the Free Software Foundation; we sometimes
  make exceptions for this.  Our decision will be guided by the two goals
! of preserving the free status of all derivatives of our free software and
  of promoting the sharing and reuse of software generally.
  
! 			    NO WARRANTY
  
!   11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
  FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
  OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
! PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
  OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
! MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
  TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
  PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
  REPAIR OR CORRECTION.
  
!   12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
  WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
! REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
! INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
! OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
  TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
! YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
  PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
  POSSIBILITY OF SUCH DAMAGES.
  
! 		     END OF TERMS AND CONDITIONS
  
! 	    How to Apply These Terms to Your New Programs
  
    If you develop a new program, and you want it to be of the greatest
  possible use to the public, the best way to achieve this is to make it
! free software which everyone can redistribute and change under these terms.
  
    To do so, attach the following notices to the program.  It is safest
***************
*** 309,315 ****
  the "copyright" line and a pointer to where the full notice is found.
  
!     <one line to give the program's name and a brief idea of what it
! does.>
!     Copyright (C) 19yy  <name of author>
  
      This program is free software; you can redistribute it and/or modify
--- 291,296 ----
  the "copyright" line and a pointer to where the full notice is found.
  
!     <one line to give the program's name and a brief idea of what it does.>
!     Copyright (C) <year>  <name of author>
  
      This program is free software; you can redistribute it and/or modify
***************
*** 325,330 ****
      You should have received a copy of the GNU General Public License
      along with this program; if not, write to the Free Software
!     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
! USA
  
  
--- 306,310 ----
      You should have received a copy of the GNU General Public License
      along with this program; if not, write to the Free Software
!     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  
  
***************
*** 334,347 ****
  when it starts in an interactive mode:
  
!     Gnomovision version 69, Copyright (C) 19yy name of author
!     Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type
! `show w'.
      This is free software, and you are welcome to redistribute it
      under certain conditions; type `show c' for details.
  
! The hypothetical commands `show w' and `show c' should show the
! appropriate
! parts of the General Public License.  Of course, the commands you use
! may
  be called something other than `show w' and `show c'; they could even be
  mouse-clicks or menu items--whatever suits your program.
--- 314,324 ----
  when it starts in an interactive mode:
  
!     Gnomovision version 69, Copyright (C) year name of author
!     Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
      This is free software, and you are welcome to redistribute it
      under certain conditions; type `show c' for details.
  
! The hypothetical commands `show w' and `show c' should show the appropriate
! parts of the General Public License.  Of course, the commands you use may
  be called something other than `show w' and `show c'; they could even be
  mouse-clicks or menu items--whatever suits your program.
***************
*** 352,367 ****
  
    Yoyodyne, Inc., hereby disclaims all copyright interest in the program
!   `Gnomovision' (which makes passes at compilers) written by James
! Hacker.
  
    <signature of Ty Coon>, 1 April 1989
    Ty Coon, President of Vice
  
! This General Public License does not permit incorporating your program
! into
  proprietary programs.  If your program is a subroutine library, you may
! consider it more useful to permit linking proprietary applications with
! the
  library.  If this is what you want to do, use the GNU Library General
  Public License instead of this License.
- 
--- 329,340 ----
  
    Yoyodyne, Inc., hereby disclaims all copyright interest in the program
!   `Gnomovision' (which makes passes at compilers) written by James Hacker.
  
    <signature of Ty Coon>, 1 April 1989
    Ty Coon, President of Vice
  
! This General Public License does not permit incorporating your program into
  proprietary programs.  If your program is a subroutine library, you may
! consider it more useful to permit linking proprietary applications with the
  library.  If this is what you want to do, use the GNU Library General
  Public License instead of this License.