andpp/mopidy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

docs: Merge license page into authors page

Browse Source
This commit is contained in:
Stein Magnus Jodal 2013-10-28 11:54:49 +01:00
parent 81e4c0e839
commit 27f8597f57
3 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
docs/authors.rst
View File

@ -4,7 +4,13 @@
Authors 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
<http://www.apache.org/licenses/LICENSE-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 .. include:: ../AUTHORS

1
docs/index.rst
View File

@ -48,7 +48,6 @@ About
:maxdepth: 1 :maxdepth: 1
authors authors
license
changelog changelog
versioning versioning

10
docs/license.rst
View File

@ -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
<http://www.apache.org/licenses/LICENSE-2.0>`_.