From 4f310f51fc7262317886921402a969de517293a2 Mon Sep 17 00:00:00 2001
From: Stein Magnus Jodal <stein.magnus@jodal.no>
Date: Tue, 30 Jul 2013 23:21:08 +0200
Subject: [PATCH] Change docs license to Apache License, Version 2.0

I've looked through all contributions to the docs. Any contributions not by
Thomas Adamcik or myself are trivial (e.g. typo fixes) or have mostly been
replaced by later changes. Thus I'm comfortable with changing the license with
the agreement of Thomas Adamcik.

By changing the documentation license to be the same as the source code
license, we avoid ambiguities around the license of e.g. docstrings which are
written as part of the source code but are included in the generated docs.
---
 docs/conf.py      |  2 +-
 docs/index.rst    |  2 +-
 docs/license.rst  | 10 ++++++++++
 docs/licenses.rst | 34 ----------------------------------
 4 files changed, 12 insertions(+), 36 deletions(-)
 create mode 100644 docs/license.rst
 delete mode 100644 docs/licenses.rst

diff --git a/docs/conf.py b/docs/conf.py
index c0dba916..f3e4166c 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -101,7 +101,7 @@ master_doc = 'index'
 
 # General information about the project.
 project = 'Mopidy'
-copyright = '2010-2013, Stein Magnus Jodal and contributors'
+copyright = '2009-2013, Stein Magnus Jodal and contributors'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
diff --git a/docs/index.rst b/docs/index.rst
index fb91244d..ca40c96c 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -48,7 +48,7 @@ About
     :maxdepth: 1
 
     authors
-    licenses
+    license
     changelog
     versioning
 
diff --git a/docs/license.rst b/docs/license.rst
new file mode 100644
index 00000000..98928f63
--- /dev/null
+++ b/docs/license.rst
@@ -0,0 +1,10 @@
+*******
+License
+*******
+
+Mopidy is copyright 2009-2013 Stein Magnus Jodal and contributors. For a list
+of contributors, see :doc:`authors`. For details on who have contributed what,
+please refer to our git repository.
+
+Mopidy is licensed under the `Apache License, Version 2.0
+<http://www.apache.org/licenses/LICENSE-2.0>`_.
diff --git a/docs/licenses.rst b/docs/licenses.rst
deleted file mode 100644
index fc2530e5..00000000
--- a/docs/licenses.rst
+++ /dev/null
@@ -1,34 +0,0 @@
-********
-Licenses
-********
-
-For a list of contributors, see :doc:`authors`. For details on who have
-contributed what, please refer to our git repository.
-
-Source code license
-===================
-
-Copyright 2009-2013 Stein Magnus Jodal and contributors
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-
-Documentation license
-=====================
-
-Copyright 2010-2013 Stein Magnus Jodal and contributors
-
-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, 171 Second Street, Suite 300, San Francisco, California, 94105, USA.