From 27f8597f575962a7ff0be26d876d168aab966552 Mon Sep 17 00:00:00 2001 From: Stein Magnus Jodal Date: Mon, 28 Oct 2013 11:54:49 +0100 Subject: [PATCH] docs: Merge license page into authors page --- docs/authors.rst | 8 +++++++- docs/index.rst | 1 - docs/license.rst | 10 ---------- 3 files changed, 7 insertions(+), 12 deletions(-) delete mode 100644 docs/license.rst diff --git a/docs/authors.rst b/docs/authors.rst index 33a25bc1..54ba95af 100644 --- a/docs/authors.rst +++ b/docs/authors.rst @@ -4,7 +4,13 @@ Authors ******* -Contributors to Mopidy in the order of appearance: +Mopidy is copyright 2009-2013 Stein Magnus Jodal and contributors. Mopidy is +licensed under the `Apache License, Version 2.0 +`_. + +The following persons have contributed to Mopidy. The list is in the order of +first contribution. For details on who have contributed what, please refer to +our Git repository. .. include:: ../AUTHORS diff --git a/docs/index.rst b/docs/index.rst index 732c9f32..28d0c8ad 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -48,7 +48,6 @@ About :maxdepth: 1 authors - license changelog versioning diff --git a/docs/license.rst b/docs/license.rst deleted file mode 100644 index 98928f63..00000000 --- a/docs/license.rst +++ /dev/null @@ -1,10 +0,0 @@ -******* -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 -`_.