Invalid License Cleanups. Part 1.

Also updated VIM license file.

1 files changed, 120 insertions, 126 deletions

diff --git a/licenses/vim b/licenses/vim
index 07827621c30b..5dcfd6d49f48 100644
--- a/licenses/vim
+++ b/licenses/vim
@@ -1,132 +1,126 @@
-This is the Vim editor license.
+License details for VIM Editor:
 
-README.txt for version 6.1 of Vim: Vi IMproved.
+*uganda.txt*    For Vim version 6.1.  Last change: 2002 Feb 04
 
 
-WHAT IS VIM
+		  VIM REFERENCE MANUAL    by Bram Moolenaar
 
-Vim is an almost compatible version of the UNIX editor Vi.  Many new features
-have been added: multi-level undo, syntax highlighting, command line history,
-on-line help, filename completion, block operations, etc.  There is also a
-Graphical User Interface (GUI) available.  See "runtime/doc/vi_diff.txt" for
-differences with Vi.
-
-This editor is very useful for editing programs and other plain ASCII files.
-All commands are given with normal keyboard characters, so those who can type
-with ten fingers can work very fast.  Additionally, function keys can be
-defined by the user, and the mouse can be used.
-
-Vim currently runs under Amiga DOS, MS-DOS, MS-Windows 95/98/NT, Atari MiNT,
-Macintosh, BeOS, VMS, RISC OS, OS/2 and almost all flavours of UNIX.
-Porting to other systems should not be very difficult.
-
-
-DISTRIBUTION
-
-There are separate distributions for Unix, PC, Amiga and some other systems.
-This README.txt file comes with the runtime archive.  It includes the
-documentation, syntax files and other files that are used at runtime.  To run
-Vim you must get either one of the binary archives or a source archive.
-Which one you need depends on the system you want to run it on and whether you
-want or must compile it yourself.  Check "http://vim.sf.net/download.php" for
-an overview of currently available distributions.
-
-
-DOCUMENTATION
-
-The best is to use ":help" in Vim.  If you don't have an executable yet, read
-"runtime/doc/help.txt".  It contains pointers to the other documentation
-files.  The User Manual reads like a book and is recommended to learn to use
-Vim.  See ":help user-manual".
-
-The vim tutor is a one hour training course for beginners.  Mostly it can be
-started as "vimtutor".  See ":help tutor" for more information.
-
-
-COPYING
 
+			*uganda* *Uganda* *copying* *copyright* *license*
+SUMMARY
+								*iccf* *ICCF*
 Vim is Charityware.  You can use and copy it as much as you like, but you are
-encouraged to make a donation to orphans in Uganda.  Please read the file
-"runtime/doc/uganda.txt" for details.
-
-There are no restrictions on distributing an unmodified copy of Vim.  Parts of
-Vim may also be distributed, but this text must always be included.  You are
-allowed to include executables that you made from the unmodified Vim sources,
-your own usage examples and Vim scripts.
-
-If you distribute a modified version of Vim, you are encouraged to send the
-maintainer a copy, including the source code.  Or make it available to the
-maintainer through ftp; let him know where it can be found.  If the number of
-changes is small (e.g., a modified Makefile) e-mailing the diffs will do.
-When the maintainer asks for it (in any way) you must make your changes,
-including source code, available to him.
-
-The maintainer reserves the right to include any changes in the official
-version of Vim.  This is negotiable.  You are not allowed to distribute a
-modified version of Vim when you are not willing to make the source code
-available to the maintainer.
-
-The current maintainer is Bram Moolenaar <Bram@vim.org>.  If this changes, it
-will be announced in appropriate places (most likely www.vim.org and
-comp.editors).  When it is completely impossible to contact the maintainer,
-the obligation to send him modified source code ceases.
-
-It is not allowed to remove these restrictions from the distribution of the
-Vim sources or parts of it.  These restrictions may also be used for previous
-Vim releases instead of the text that was included with it.
-
-
-INFORMATION
-
-The latest news about Vim can be found on the Vim home page:
-	http://vim.sf.org/
-
-If you have problems, have a look at the Vim FAQ:
-	http://www.vim.org/faq/
-
-Send bug reports to:
-	Bram Moolenaar <Bram@vim.org>
-
-There are four mailing lists for Vim:
-<vim@vim.org>
-	For discussions about using existing versions of Vim: Useful mappings,
-	questions, answers, where to get a specific version, etc.
-	Archive: http://groups.yahoo.com/group/vim
-<vim-dev@vim.org>
-	For discussions about changing Vim: New features, porting, beta-test
-	versions, etc.
-	Archive: http://groups.yahoo.com/group/vimdev
-<vim-announce@vim.org>
-	Announcements about new versions of Vim; also beta-test versions and
-	ports to different systems.
-	Archive: http://groups.yahoo.com/group/vimannounce
-<vim-multibyte@vim.org>
-	For discussions about using and improving the multi-byte aspects of
-	Vim: XIM, Hangul, fontset, etc.
-	Archive: http://groups.yahoo.com/group/vim-multibyte
-<vim-mac@vim.org>
-	For discussions about using and improving Vim on the Macintosh.
-	Archive: http://groups.yahoo.com/group/vim-mac
-
-See "http://www.vim.org/mail.html"
-
-NOTE:
-- You can only send messages to these lists if you have subscribed!
-- You need to send the messages from the same location as where you subscribed
-  from (to avoid spam mail).
-- Maximum message size is 40000 characters.
-
-If you want to join a maillist, send a message to
-	<vim-help@vim.org>
-Make sure that your "From:" address is correct.  Then the list server will
-send you a help message.
-
-
-MAIN AUTHOR
-
-Send any other comments, patches, pizza and suggestions to:
-
-	Bram Moolenaar		E-mail:	Bram@vim.org
-	Clematisstraat 30
-	5925 BE  Venlo		Tel: +31 77 3872340
-	The Netherlands		Fax/voice-mail: +31 84 8508509
+encouraged to make a donation for needy children in Uganda.  Please see |kcc|
+below or visit the ICCF web site, available at these mirrors:
+
+	http://iccf-holland.org/
+	http://www.vim.org/iccf/
+	http://www.iccf.nl/
+
+The Open Publication License applies to the Vim documentation, see
+|manual-copyright|.
+
+=== begin of license ===
+
+VIM LICENSE
+
+I)  There are no restrictions on distributing unmodified copies of Vim except
+    that they must include this license text.  You can also distribute
+    unmodified parts of Vim, likewise unrestricted except that they must
+    include this license text.  You are also allowed to include executables
+    that you made from the unmodified Vim sources, plus your own usage
+    examples and Vim scripts.
+
+II) It is allowed to distribute a modified (or extended) version of Vim,
+    including executables and/or source code, when the following four
+    conditions are met:
+    1) This license text must be included unmodified.
+    2) The modified Vim must be distributed in one of the following five ways:
+       a) If you make changes to Vim yourself, you must clearly describe in
+	  the distribution how to contact you.  When the maintainer asks you
+	  (in any way) for a copy of the modified Vim you distributed, you
+	  must make your changes, including source code, available to the
+	  maintainer without fee.  The maintainer reserves the right to
+	  include your changes in the official version of Vim.  What the
+	  maintainer will do with your changes and under what license they
+	  will be distributed is negotiable.  If there has been no negotiation
+	  then this license, or a later version, also applies to your changes.
+	  The current maintainer is Bram Moolenaar <Bram@vim.org>.  If this
+	  changes it will be announced in appropriate places (most likely
+	  vim.sf.net, www.vim.org and/or comp.editors).  When it is completely
+	  impossible to contact the maintainer, the obligation to send him
+	  your changes ceases.  Once the maintainer has confirmed that he has
+	  received your changes they will not have to be sent again.
+       b) If you have received a modified Vim that was distributed as
+	  mentioned under a) you are allowed to further distribute it
+	  unmodified, as mentioned at I).  If you make additional changes the
+	  text under a) applies to those changes.
+       c) Provide all the changes, including source code, with every copy of
+	  the modified Vim you distribute.  This may be done in the form of a
+	  context diff.  You can choose what license to use for new code you
+	  add.  The changes and their license must not restrict others from
+	  making their own changes to the official version of Vim.
+       d) When you have a modified Vim which includes changes as mentioned
+	  under c), you can distribute it without the source code for the
+	  changes if the following three conditions are met:
+	  - The license that applies to the changes permits you to distribute
+	    the changes to the Vim maintainer without fee or restriction, and
+	    permits the Vim maintainer to include the changes in the official
+	    version of Vim without fee or restriction.
+	  - You keep the changes for at least three years after last
+	    distributing the corresponding modified Vim.  When the maintainer
+	    or someone who you distributed the modified Vim to asks you (in
+	    any way) for the changes within this period, you must make them
+	    available to him.
+	  - You clearly describe in the distribution how to contact you.  This
+	    contact information must remain valid for at least three years
+	    after last distributing the corresponding modified Vim, or as long
+	    as possible.
+       e) When the GNU General Public License (GPL) applies to the changes,
+	  you can distribute the modified Vim under the GNU GPL version 2 or
+	  any later version.
+    3) A message must be added, at least in the output of the ":version"
+       command and in the intro screen, such that the user of the modified Vim
+       is able to see that it was modified.  When distributing as mentioned
+       under 2)e) adding the message is only required for as far as this does
+       not conflict with the license used for the changes.
+    4) The contact information as required under 2)a) and 2)d) must not be
+       removed or changed, except that the person himself can make
+       corrections.
+
+III) If you distribute a modified version of Vim, you are encouraged to use
+     the Vim license for your changes and make them available to the
+     maintainer, including the source code.  The preferred way to do this is
+     by e-mail or by uploading the files to a server and e-mailing the URL.
+     If the number of changes is small (e.g., a modified Makefile) e-mailing a
+     context diff will do.  The e-mail address to be used is
+     <maintainer@vim.org>
+
+IV)  It is not allowed to remove this license from the distribution of the Vim
+     sources, parts of it or from a modified version.  You may use this
+     license for previous Vim releases instead of the license that they came
+     with, at your option.
+
+=== end of license ===
+
+Note:
+
+- If you are happy with Vim, please express that by reading the rest of this
+  file and consider helping needy children in Uganda.
+
+- According to Richard Stallman the Vim license is GNU GPL compatible.
+  A few minor changes have been made since he checked it, but that should not
+  make a difference.
+
+- If you link Vim with a library that goes under the GNU GPL, this limits
+  further distribution to the GNU GPL.  Also when you didn't actually change
+  anything in Vim.
+
+- Once a change is included that goes under the GNU GPL, this forces all
+  further changes to also be made under the GNU GPL or a compatible license.
+
+- If you distribute a modified version of Vim, you can include your name and
+  contact information with the "--with-modified-by" configure argument or the
+  MODIFIED_BY define.
+
+==============================================================================