jenkins-bot has submitted this change and it was merged.
Change subject: Clarify license of documentation ......................................................................
Clarify license of documentation
Change-Id: Id5043b838351df08deed00818fb8b52fedae7713 --- M docs/index.rst M docs/licenses.rst 2 files changed, 6 insertions(+), 8 deletions(-)
Approvals: John Vandenberg: Looks good to me, approved jenkins-bot: Verified
diff --git a/docs/index.rst b/docs/index.rst index bcf202d..9ef9559 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -14,7 +14,8 @@
Pywikibot supports Python 2.6.5, 2.7 and 3.2+.
-Pywikibot is licensed under the :ref:`MIT license <licenses-MIT>`; the documentation is licensed under the :ref:`CC-BY-SA-3.0 <licenses-CCBYSA>` license. +Pywikibot and this documentation are licensed under the :ref:`MIT license <licenses-MIT>`; +manual pages on mediawiki.org are licensed under the `CC-BY-SA 3.0 <licenses-CCBYSA>` license.
The documentation consists of four major parts:
diff --git a/docs/licenses.rst b/docs/licenses.rst index f35d34b..c73274d 100644 --- a/docs/licenses.rst +++ b/docs/licenses.rst @@ -1,8 +1,9 @@ Licenses ========
-The framework itself is available under the :ref:`MIT license <licenses-MIT>`; the -documentation is available under the :ref:`CC-BY-SA 3.0 <licenses-CCBYSA>` license. +The framework itself and this documentation are available under the +:ref:`MIT license <licenses-MIT>`; manual pages on mediawiki.org are +available under the `CC-BY-SA 3.0 <licenses-CCBYSA>` license.
.. _licenses-MIT:
@@ -34,8 +35,4 @@ OTHER DEALINGS IN THE SOFTWARE.
-.. _licenses-CCBYSA: - -CC-BY-SA 3.0 ------------- -This work is licensed under the Creative Commons Attribution-ShareAlike 3.0 Unported License. To view a copy of this license, visit http://creativecommons.org/licenses/by-sa/3.0/ or send a letter to Creative Commons, 444 Castro Street, Suite 900, Mountain View, California, 94041, USA. +.. _licenses-CCBYSA: http://creativecommons.org/licenses/by-sa/3.0/