Skip to content

Commit efd1007

Browse files
committed
Moving license from README.md into LICENSE
1 parent f53a728 commit efd1007

File tree

2 files changed

+86
-91
lines changed

2 files changed

+86
-91
lines changed

LICENSE

Lines changed: 86 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
1+
vim-hy License
2+
==========================
3+
4+
Copyright 2013 (c) Morten Linderud.
5+
6+
Relicensed under the Vim License (below) for distribution with Vim.
7+
8+
VIM LICENSE
9+
10+
I) There are no restrictions on distributing unmodified copies of Vim except
11+
that they must include this license text. You can also distribute
12+
unmodified parts of Vim, likewise unrestricted except that they must
13+
include this license text. You are also allowed to include executables
14+
that you made from the unmodified Vim sources, plus your own usage
15+
examples and Vim scripts.
16+
17+
II) It is allowed to distribute a modified (or extended) version of Vim,
18+
including executables and/or source code, when the following four
19+
conditions are met:
20+
1) This license text must be included unmodified.
21+
2) The modified Vim must be distributed in one of the following five ways:
22+
a) If you make changes to Vim yourself, you must clearly describe in
23+
the distribution how to contact you. When the maintainer asks you
24+
(in any way) for a copy of the modified Vim you distributed, you
25+
must make your changes, including source code, available to the
26+
maintainer without fee. The maintainer reserves the right to
27+
include your changes in the official version of Vim. What the
28+
maintainer will do with your changes and under what license they
29+
will be distributed is negotiable. If there has been no negotiation
30+
then this license, or a later version, also applies to your changes.
31+
The current maintainer is Bram Moolenaar <[email protected]>. If this
32+
changes it will be announced in appropriate places (most likely
33+
vim.sf.net, www.vim.org and/or comp.editors). When it is completely
34+
impossible to contact the maintainer, the obligation to send him
35+
your changes ceases. Once the maintainer has confirmed that he has
36+
received your changes they will not have to be sent again.
37+
b) If you have received a modified Vim that was distributed as
38+
mentioned under a) you are allowed to further distribute it
39+
unmodified, as mentioned at I). If you make additional changes the
40+
text under a) applies to those changes.
41+
c) Provide all the changes, including source code, with every copy of
42+
the modified Vim you distribute. This may be done in the form of a
43+
context diff. You can choose what license to use for new code you
44+
add. The changes and their license must not restrict others from
45+
making their own changes to the official version of Vim.
46+
d) When you have a modified Vim which includes changes as mentioned
47+
under c), you can distribute it without the source code for the
48+
changes if the following three conditions are met:
49+
- The license that applies to the changes permits you to distribute
50+
the changes to the Vim maintainer without fee or restriction, and
51+
permits the Vim maintainer to include the changes in the official
52+
version of Vim without fee or restriction.
53+
- You keep the changes for at least three years after last
54+
distributing the corresponding modified Vim. When the maintainer
55+
or someone who you distributed the modified Vim to asks you (in
56+
any way) for the changes within this period, you must make them
57+
available to him.
58+
- You clearly describe in the distribution how to contact you. This
59+
contact information must remain valid for at least three years
60+
after last distributing the corresponding modified Vim, or as long
61+
as possible.
62+
e) When the GNU General Public License (GPL) applies to the changes,
63+
you can distribute the modified Vim under the GNU GPL version 2 or
64+
any later version.
65+
3) A message must be added, at least in the output of the ":version"
66+
command and in the intro screen, such that the user of the modified Vim
67+
is able to see that it was modified. When distributing as mentioned
68+
under 2)e) adding the message is only required for as far as this does
69+
not conflict with the license used for the changes.
70+
4) The contact information as required under 2)a) and 2)d) must not be
71+
removed or changed, except that the person himself can make
72+
corrections.
73+
74+
III) If you distribute a modified version of Vim, you are encouraged to use
75+
the Vim license for your changes and make them available to the
76+
maintainer, including the source code. The preferred way to do this is
77+
by e-mail or by uploading the files to a server and e-mailing the URL.
78+
If the number of changes is small (e.g., a modified Makefile) e-mailing a
79+
context diff will do. The e-mail address to be used is
80+
81+
82+
IV) It is not allowed to remove this license from the distribution of the Vim
83+
sources, parts of it or from a modified version. You may use this
84+
license for previous Vim releases instead of the license that they came
85+
with, at your option.
86+

README.md

Lines changed: 0 additions & 91 deletions
Original file line numberDiff line numberDiff line change
@@ -3,94 +3,3 @@ vim-hy
33

44
A syntax file for [Hy](http://hylang.org).
55

6-
License
7-
-------
8-
9-
```
10-
vim-hy License
11-
==========================
12-
13-
Copyright 2013 (c) Morten Linderud.
14-
15-
Relicensed under the Vim License (below) for distribution with Vim.
16-
17-
VIM LICENSE
18-
19-
I) There are no restrictions on distributing unmodified copies of Vim except
20-
that they must include this license text. You can also distribute
21-
unmodified parts of Vim, likewise unrestricted except that they must
22-
include this license text. You are also allowed to include executables
23-
that you made from the unmodified Vim sources, plus your own usage
24-
examples and Vim scripts.
25-
26-
II) It is allowed to distribute a modified (or extended) version of Vim,
27-
including executables and/or source code, when the following four
28-
conditions are met:
29-
1) This license text must be included unmodified.
30-
2) The modified Vim must be distributed in one of the following five ways:
31-
a) If you make changes to Vim yourself, you must clearly describe in
32-
the distribution how to contact you. When the maintainer asks you
33-
(in any way) for a copy of the modified Vim you distributed, you
34-
must make your changes, including source code, available to the
35-
maintainer without fee. The maintainer reserves the right to
36-
include your changes in the official version of Vim. What the
37-
maintainer will do with your changes and under what license they
38-
will be distributed is negotiable. If there has been no negotiation
39-
then this license, or a later version, also applies to your changes.
40-
The current maintainer is Bram Moolenaar <[email protected]>. If this
41-
changes it will be announced in appropriate places (most likely
42-
vim.sf.net, www.vim.org and/or comp.editors). When it is completely
43-
impossible to contact the maintainer, the obligation to send him
44-
your changes ceases. Once the maintainer has confirmed that he has
45-
received your changes they will not have to be sent again.
46-
b) If you have received a modified Vim that was distributed as
47-
mentioned under a) you are allowed to further distribute it
48-
unmodified, as mentioned at I). If you make additional changes the
49-
text under a) applies to those changes.
50-
c) Provide all the changes, including source code, with every copy of
51-
the modified Vim you distribute. This may be done in the form of a
52-
context diff. You can choose what license to use for new code you
53-
add. The changes and their license must not restrict others from
54-
making their own changes to the official version of Vim.
55-
d) When you have a modified Vim which includes changes as mentioned
56-
under c), you can distribute it without the source code for the
57-
changes if the following three conditions are met:
58-
- The license that applies to the changes permits you to distribute
59-
the changes to the Vim maintainer without fee or restriction, and
60-
permits the Vim maintainer to include the changes in the official
61-
version of Vim without fee or restriction.
62-
- You keep the changes for at least three years after last
63-
distributing the corresponding modified Vim. When the maintainer
64-
or someone who you distributed the modified Vim to asks you (in
65-
any way) for the changes within this period, you must make them
66-
available to him.
67-
- You clearly describe in the distribution how to contact you. This
68-
contact information must remain valid for at least three years
69-
after last distributing the corresponding modified Vim, or as long
70-
as possible.
71-
e) When the GNU General Public License (GPL) applies to the changes,
72-
you can distribute the modified Vim under the GNU GPL version 2 or
73-
any later version.
74-
3) A message must be added, at least in the output of the ":version"
75-
command and in the intro screen, such that the user of the modified Vim
76-
is able to see that it was modified. When distributing as mentioned
77-
under 2)e) adding the message is only required for as far as this does
78-
not conflict with the license used for the changes.
79-
4) The contact information as required under 2)a) and 2)d) must not be
80-
removed or changed, except that the person himself can make
81-
corrections.
82-
83-
III) If you distribute a modified version of Vim, you are encouraged to use
84-
the Vim license for your changes and make them available to the
85-
maintainer, including the source code. The preferred way to do this is
86-
by e-mail or by uploading the files to a server and e-mailing the URL.
87-
If the number of changes is small (e.g., a modified Makefile) e-mailing a
88-
context diff will do. The e-mail address to be used is
89-
90-
91-
IV) It is not allowed to remove this license from the distribution of the Vim
92-
sources, parts of it or from a modified version. You may use this
93-
license for previous Vim releases instead of the license that they came
94-
with, at your option.
95-
96-
```

0 commit comments

Comments
 (0)