Skip to content

Commit 976bc48

Browse files
authored
Merge pull request #78 from wind-python/change_licence
Adapt licence in the documentation
2 parents 598b3b1 + 4914763 commit 976bc48

File tree

2 files changed

+40
-30
lines changed

2 files changed

+40
-30
lines changed

README.rst

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -135,17 +135,22 @@ We use the zenodo project to get a DOI for each version. `Search zenodo for the
135135
License
136136
============
137137

138-
Copyright (C) 2017 oemof developer group
139-
140-
This program is free software: you can redistribute it and/or modify
141-
it under the terms of the GNU General Public License as published by
142-
the Free Software Foundation, either version 3 of the License, or
143-
(at your option) any later version.
144-
145-
This program is distributed in the hope that it will be useful,
146-
but WITHOUT ANY WARRANTY; without even the implied warranty of
147-
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
148-
GNU General Public License for more details.
149-
150-
You should have received a copy of the GNU General Public License
151-
along with this program. If not, see http://www.gnu.org/licenses/.
138+
Copyright (c) 2019 oemof developer group
139+
140+
Permission is hereby granted, free of charge, to any person obtaining a copy
141+
of this software and associated documentation files (the "Software"), to deal
142+
in the Software without restriction, including without limitation the rights
143+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
144+
copies of the Software, and to permit persons to whom the Software is
145+
furnished to do so, subject to the following conditions:
146+
147+
The above copyright notice and this permission notice shall be included in all
148+
copies or substantial portions of the Software.
149+
150+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
151+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
152+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
153+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
154+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
155+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
156+
SOFTWARE.

doc/getting_started.rst

Lines changed: 21 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -129,20 +129,25 @@ Citing the windpowerlib
129129

130130
We use the zenodo project to get a DOI for each version. `Search zenodo for the right citation of your windpowerlib version <https://zenodo.org/search?page=1&size=20&q=windpowerlib>`_.
131131

132-
License
133-
============
134-
135-
Copyright (C) 2017 oemof developer group
136-
137-
This program is free software: you can redistribute it and/or modify
138-
it under the terms of the GNU General Public License as published by
139-
the Free Software Foundation, either version 3 of the License, or
140-
(at your option) any later version.
141-
142-
This program is distributed in the hope that it will be useful,
143-
but WITHOUT ANY WARRANTY; without even the implied warranty of
144-
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
145-
GNU General Public License for more details.
132+
License (MIT)
133+
=============
146134

147-
You should have received a copy of the GNU General Public License
148-
along with this program. If not, see http://www.gnu.org/licenses/.
135+
Copyright (c) 2019 oemof developer group
136+
137+
Permission is hereby granted, free of charge, to any person obtaining a copy
138+
of this software and associated documentation files (the "Software"), to deal
139+
in the Software without restriction, including without limitation the rights
140+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
141+
copies of the Software, and to permit persons to whom the Software is
142+
furnished to do so, subject to the following conditions:
143+
144+
The above copyright notice and this permission notice shall be included in all
145+
copies or substantial portions of the Software.
146+
147+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
148+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
149+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
150+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
151+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
152+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
153+
SOFTWARE.

0 commit comments

Comments
 (0)