Skip to content

Commit 1bac834

Browse files
authored
Merge pull request #901 from othree/master
Add softwareName replacement of Vim license
2 parents 4557ddc + 459107c commit 1bac834

File tree

1 file changed

+20
-20
lines changed

1 file changed

+20
-20
lines changed

src/Vim.xml

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@
1212
<list>
1313
<item>
1414
<bullet>I)</bullet>
15-
There are no restrictions on distributing unmodified copies of Vim except that they must include
16-
this license text. You can also distribute unmodified parts of Vim, likewise unrestricted
15+
There are no restrictions on distributing unmodified copies of <alt match=".+" name="softwareName">Vim</alt> except that they must include
16+
this license text. You can also distribute unmodified parts of <alt match=".+" name="softwareName">Vim</alt>, likewise unrestricted
1717
except that they must include this license text. You are also allowed to include executables
18-
that you made from the unmodified Vim sources, plus your own usage examples and Vim
18+
that you made from the unmodified <alt match=".+" name="softwareName">Vim</alt> sources, plus your own usage examples and Vim
1919
scripts.
2020
</item>
2121
<item>
2222
<bullet>II)</bullet>
23-
It is allowed to distribute a modified (or extended) version of Vim, including executables and/or
23+
It is allowed to distribute a modified (or extended) version of <alt match=".+" name="softwareName">Vim</alt>, including executables and/or
2424
source code, when the following four conditions are met:
2525
<list>
2626
<item>
@@ -29,14 +29,14 @@
2929
</item>
3030
<item>
3131
<bullet>2)</bullet>
32-
The modified Vim must be distributed in one of the following five ways:
32+
The modified <alt match=".+" name="softwareName">Vim</alt> must be distributed in one of the following five ways:
3333
<list>
3434
<item>
3535
<bullet>a)</bullet>
36-
If you make changes to Vim yourself, you must clearly describe in the distribution how to contact
37-
you. When the maintainer asks you (in any way) for a copy of the modified Vim you distributed,
36+
If you make changes to <alt match=".+" name="softwareName">Vim</alt> yourself, you must clearly describe in the distribution how to contact
37+
you. When the maintainer asks you (in any way) for a copy of the modified <alt match=".+" name="softwareName">Vim</alt> you distributed,
3838
you must make your changes, including source code, available to the maintainer without fee.
39-
The maintainer reserves the right to include your changes in the official version of Vim. What
39+
The maintainer reserves the right to include your changes in the official version of <alt match=".+" name="softwareName">Vim</alt>. What
4040
the maintainer will do with your changes and under what license they will be distributed is
4141
negotiable. If there has been no negotiation then this license, or a later version, also
4242
applies to your changes. The current maintainer is Bram Moolenaar &lt;[email protected]&gt;. If
@@ -47,53 +47,53 @@
4747
</item>
4848
<item>
4949
<bullet>b)</bullet>
50-
If you have received a modified Vim that was distributed as mentioned under a) you are allowed to
50+
If you have received a modified <alt match=".+" name="softwareName">Vim</alt> that was distributed as mentioned under a) you are allowed to
5151
further distribute it unmodified, as mentioned at I). If you make additional changes the text
5252
under a) applies to those changes.
5353
</item>
5454
<item>
5555
<bullet>c)</bullet>
56-
Provide all the changes, including source code, with every copy of the modified Vim you
56+
Provide all the changes, including source code, with every copy of the modified <alt match=".+" name="softwareName">Vim</alt> you
5757
distribute. This may be done in the form of a context diff. You can choose what license to use
5858
for new code you add. The changes and their license must not restrict others from making their
59-
own changes to the official version of Vim.
59+
own changes to the official version of <alt match=".+" name="softwareName">Vim</alt>.
6060
</item>
6161
<item>
6262
<bullet>d)</bullet>
63-
When you have a modified Vim which includes changes as mentioned under c), you can distribute it
63+
When you have a modified <alt match=".+" name="softwareName">Vim</alt> which includes changes as mentioned under c), you can distribute it
6464
without the source code for the changes if the following three conditions are met:
6565
<list>
6666
<item>
6767
<bullet>-</bullet>
6868
The license that applies to the changes permits you to distribute the changes to the Vim
6969
maintainer without fee or restriction, and permits the Vim maintainer to include the changes
70-
in the official version of Vim without fee or restriction.
70+
in the official version of <alt match=".+" name="softwareName">Vim</alt> without fee or restriction.
7171
</item>
7272
<item>
7373
<bullet>-</bullet>
7474
You keep the changes for at least three years after last distributing the corresponding modified
75-
Vim. When the maintainer or someone who you distributed the modified Vim to asks you (in any
75+
<alt match=".+" name="softwareName">Vim</alt>. When the maintainer or someone who you distributed the modified <alt match=".+" name="softwareName">Vim</alt> to asks you (in any
7676
way) for the changes within this period, you must make them available to him.
7777
</item>
7878
<item>
7979
<bullet>-</bullet>
8080
You clearly describe in the distribution how to contact you. This contact information must remain
81-
valid for at least three years after last distributing the corresponding modified Vim, or as
81+
valid for at least three years after last distributing the corresponding modified <alt match=".+" name="softwareName">Vim</alt>, or as
8282
long as possible.
8383
</item>
8484
</list>
8585
</item>
8686
<item>
8787
<bullet>e)</bullet>
8888
When the GNU General Public License (GPL) applies to the changes, you can distribute the modified
89-
Vim under the GNU GPL version 2 or any later version.
89+
<alt match=".+" name="softwareName">Vim</alt> under the GNU GPL version 2 or any later version.
9090
</item>
9191
</list>
9292
</item>
9393
<item>
9494
<bullet>3)</bullet>
9595
A message must be added, at least in the output of the ":version" command and in the intro
96-
screen, such that the user of the modified Vim is able to see that it was modified. When
96+
screen, such that the user of the modified <alt match=".+" name="softwareName">Vim</alt> is able to see that it was modified. When
9797
distributing as mentioned under 2)e) adding the message is only required for as far as this
9898
does not conflict with the license used for the changes.
9999
</item>
@@ -106,16 +106,16 @@
106106
</item>
107107
<item>
108108
<bullet>III)</bullet>
109-
If you distribute a modified version of Vim, you are encouraged to use the Vim license for your
109+
If you distribute a modified version of <alt match=".+" name="softwareName">Vim</alt>, you are encouraged to use the Vim license for your
110110
changes and make them available to the maintainer, including the source code. The preferred
111111
way to do this is by e-mail or by uploading the files to a server and e-mailing the URL. If
112112
the number of changes is small (e.g., a modified Makefile) e-mailing a context diff will do.
113113
The e-mail address to be used is &lt;[email protected]&gt;
114114
</item>
115115
<item>
116116
<bullet>IV)</bullet>
117-
It is not allowed to remove this license from the distribution of the Vim sources, parts of it or
118-
from a modified version. You may use this license for previous Vim releases instead of the
117+
It is not allowed to remove this license from the distribution of the <alt match=".+" name="softwareName">Vim</alt> sources, parts of it or
118+
from a modified version. You may use this license for previous <alt match=".+" name="softwareName">Vim</alt> releases instead of the
119119
license that they came with, at your option.
120120
</item>
121121
</list>

0 commit comments

Comments
 (0)