jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/370223 )
Change subject: [DOC] Include license from parent folder ...................................................................... [DOC] Include license from parent folder Change-Id: I821b9ca6124acfad2d18a0b75bef9f8d7ac9abcd --- M docs/licenses.rst 1 file changed, 1 insertion(+), 22 deletions(-) Approvals: Mpaa: Looks good to me, approved jenkins-bot: Verified diff --git a/docs/licenses.rst b/docs/licenses.rst index c973eb1..02a921a 100644 --- a/docs/licenses.rst +++ b/docs/licenses.rst @@ -11,28 +11,7 @@ ----------- The framework is available under the MIT license: -Copyright (c) 2004-2013 Pywikibot team - -Permission is hereby granted, free of charge, to any person -obtaining a copy of this software and associated documentation -files (the "Software"), to deal in the Software without -restriction, including without limitation the rights to use, -copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the -Software is furnished to do so, subject to the following -conditions: - -The above copyright notice and this permission notice shall be -included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES -OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT -HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -OTHER DEALINGS IN THE SOFTWARE. +.. include:: ../LICENSE .. _CC-BY-SA 3.0: http://creativecommons.org/licenses/by-sa/3.0/ -- To view, visit https://gerrit.wikimedia.org/r/370223 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I821b9ca6124acfad2d18a0b75bef9f8d7ac9abcd Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Xqt <i...@gno.de> Gerrit-Reviewer: John Vandenberg <jay...@gmail.com> Gerrit-Reviewer: Mpaa <mpaa.w...@gmail.com> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ Pywikibot-commits mailing list Pywikibot-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/pywikibot-commits