Documentation copyright now links to contributors

Signed-off-by: Jim Easterbrook <jim@jim-easterbrook.me.uk>
jim-easterbrook · May 21, 2015 · c950af3 · c950af3
1 parent 21f2191
commit c950af3
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/src/doc/conf.py b/src/doc/conf.py
@@ -2,7 +2,7 @@
 #
 # pywws - Python software for USB Wireless Weather Stations
 # http://github.com/jim-easterbrook/pywws
-# Copyright (C) 2008-15  Jim Easterbrook  jim@jim-easterbrook.me.uk
+# Copyright (C) 2008-15  pywws contributors
 
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -86,7 +86,7 @@ def __getattr__(self, name):
 
 # General information about the project.
 project = u'pywws'
-copyright = u'2008-15, Jim Easterbrook'
+copyright = u'2008-15, pywws 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/src/doc/essentials/contributors.rst → src/doc/copyright.rst b/src/doc/essentials/contributors.rst → src/doc/copyright.rst
@@ -19,4 +19,6 @@
 pywws Contributors
 ==================
 
-.. literalinclude:: ../../contributors/contributors.txt
+The copywright to pywws and its documentation is jointly held by the following contributors.
+
+.. literalinclude:: ../contributors/contributors.txt
diff --git a/src/doc/index.rst b/src/doc/index.rst
@@ -63,7 +63,7 @@ Contents
    :maxdepth: 2
 
    Licence <essentials/LICENCE>
-   pywws Contributors <essentials/contributors>
+   pywws Contributors <copyright>
    Dependencies <essentials/dependencies>
    Change log <essentials/CHANGELOG>
    User guides <guides/index>
@@ -90,7 +90,7 @@ Legalese
 
 | pywws - Python software for USB Wireless WeatherStations.
 | http://github.com/jim-easterbrook/pywws
-| Copyright (C) 2008-15  :doc:`pywws contributors <essentials/contributors>`
+| Copyright (C) 2008-15  :doc:`pywws contributors <copyright>`
 
 This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
 

diff --git a/src/pywws/__init__.py b/src/pywws/__init__.py
@@ -1,3 +1,3 @@
-__version__ = '15.05.0.dev1295'
-_release = '1295'
-_commit = '43f4889'
+__version__ = '15.05.0.dev1296'
+_release = '1296'
+_commit = '21f2191'