Skip to content

Commit 922a2d4

Browse files
author
Mizunashi Mana
committed
Add new licenses
1 parent a3f68c3 commit 922a2d4

7 files changed

+366
-11
lines changed

.plugin_includes

+4-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@ conf
22
lang
33
src
44
vendor
5-
LICENSE
5+
README.md
6+
LICENSE.txt
7+
LICENSE.Apache-2.0
8+
LICENSE.GPL-2.0-or-later
69
plugin.info.txt
710
syntax.php

LICENSE

-7
This file was deleted.

LICENSE.Apache-2.0

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
Copyright 2018- Mizunashi Mana
2+
3+
Licensed under the Apache License, Version 2.0 (the "License");
4+
you may not use this file except in compliance with the License.
5+
You may obtain a copy of the License at
6+
7+
http://www.apache.org/licenses/LICENSE-2.0
8+
9+
Unless required by applicable law or agreed to in writing, software
10+
distributed under the License is distributed on an "AS IS" BASIS,
11+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
See the License for the specific language governing permissions and
13+
limitations under the License.

LICENSE.GPL-2.0-or-later

+339
Large diffs are not rendered by default.

LICENSE.txt

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Apache-2.0 OR GPL-2.0-or-later

README.md

+5-2
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,13 @@ See <https://www.dokuwiki.org/plugin:mdpage>.
1010

1111
## Report a bug / Contribute a fix
1212

13-
See [Contributing Guide](CONTRIBUTING.md).
13+
See [Contributing Guide](https://github.com/mizunashi-mana/dokuwiki-plugin-mdpage/blob/master/CONTRIBUTING.md).
1414

1515
## License
1616

17-
This plugin is licensed under [the MIT License](LICENSE).
17+
This work is dual-licensed under [the Apache 2.0 License](https://github.com/mizunashi-mana/dokuwiki-plugin-mdpage/blob/master/LICENSE.Apache-2.0) and [the GPL 2.0 (or any later version)](https://github.com/mizunashi-mana/dokuwiki-plugin-mdpage/blob/master/LICENSE.GPL-2.0-or-later).
18+
You are free to pick which one suits your needs.
1819

1920
* Using [cebe/markdown](https://github.com/cebe/markdown) to parse Markdown texts under [the MIT License](https://github.com/cebe/markdown/blob/master/LICENSE).
21+
22+
Notice: DokuWiki is licensed under [the GPL 2.0](https://github.com/splitbrain/dokuwiki/blob/master/COPYING). This license cannot be compatible with the Apache 2.0 License and the GPL 3.0. See also: https://www.gnu.org/licenses/license-list.html .

composer.json

+4-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,10 @@
77
"plugin",
88
"markdown"
99
],
10-
"license": "MIT",
10+
"license": [
11+
"Apache-2.0",
12+
"GPL-2.0-or-later"
13+
],
1114
"authors": [
1215
{
1316
"name": "Mizunashi Mana",

0 commit comments

Comments
 (0)