Update credits, and prepare copyright ready for artwork due from Maxine soon

2 files changed, 137 insertions, 2 deletions

diff --git a/COPYING b/COPYING
index 909dbdd..ccaf88a 100644
--- a/COPYING
+++ b/COPYING
@@ -25,6 +25,38 @@ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 SUCH DAMAGE.
 
+---
+
+The artwork found in the Gitano Administrator's Manual is Copyright 2017
+Maxine Green and is provided here under the terms of the Creative Commons
+Attribution Share-alike Licence version 4.0, the details of which can be
+found at https://creativecommons.org/licenses/by-sa/4.0/legalcode and a
+summary of which is:
+
+You are free to:
+
+* Share — copy and redistribute the material in any medium or format
+* Adapt — remix, transform, and build upon the material
+
+for any purpose, even commercially.
+
+The licensor cannot revoke these freedoms as long as you follow the license terms.
+
+
+Under the following terms:
+
+* Attribution — You must give appropriate credit, provide a link to the
+  license, and indicate if changes were made. You may do so in any reasonable
+  manner, but not in any way that suggests the licensor endorses you or your
+  use.
+
+* ShareAlike — If you remix, transform, or build upon the material, you must
+  distribute your contributions under the same license as the original.
+
+No additional restrictions — You may not apply legal terms or technological
+measures that legally restrict others from doing anything the license permits.
+
+---
+
 Portions of this codebase may be under other licences.  Where this is the case,
 any local changes are licenced as per the original.
-
diff --git a/CREDITS b/CREDITS
index 034287d..74f2d2e 100644
--- a/CREDITS
+++ b/CREDITS
@@ -2,8 +2,111 @@ Gitano Credits
 --------------
 
 Gitano is primarily written by Daniel Silverstone with input from Rob Kendrick,
-Lars Wirzenius and Rob Taylor.
+Richard Maw, Lars Wirzenius, and Rob Taylor.
 
 Gitano was sponsored, in part, by Codethink Limited by dint of extended
 lunchbreaks, the supply of tea and biscuits and also permission to use slack
 time for development.
+
+The following people have contributed to Gitano in some capacity which is
+recorded in the repository:
+
+---
+
+name: Daniel Silverstone
+email: dsilvers@digital-scurf.org
+website: https://blog.digital-scurf.org/
+summary: |
+  Daniel is the primary author of Gitano and associated libraries.
+
+---
+
+name: Daniel Silverstone
+company: Codethink Ltd
+email: daniel.silverstone@codethink.co.uk
+website: http://www.codethink.co.uk/
+summary: |
+  Codethink sponsored the development of a number of portions of Gitano
+  via their Baserock initiative, and also for the purpose of deploying
+  Gitano within Codethink.
+
+---
+
+name: Richard Maw
+email: richard.maw@gmail.com
+summary: |
+  Richard has been a critical contributor to Gitano, in particular enhancing
+  Gitano's test suites, repository copying, and the admin documentation.
+
+---
+
+name: Richard Maw
+company: Codethink Ltd
+email: richard.maw@codethink.co.uk
+website: http://www.codethink.co.uk/
+summary: |
+  Codethink sponsored development of Gitano's test suite and shallow repository
+  support.
+
+---
+
+name: Ben Brown
+company: Codethink Ltd
+email: ben.brown@codethink.co.uk
+website: http://www.codethink.co.uk/
+summary: |
+  Codethink sponsored some bug-fixing of the HTTP interface and Ben fixed
+  a bug in the ssh key tag handling on his own time too.
+
+---
+
+name: Gavin Lee
+email: gavlee888@live.ie
+summary: |
+  Gavin contributed the git-archive plugin to support the generation of
+  archive tarballs server-side.  Gavin also worked to sponsor in a patch
+  to support accessing Gitano-managed repositories directly on the server
+  without triggering the hooks.
+
+---
+
+name: Lars Wirzenius
+email: liw@liw.fi
+website: http://www.liw.fi/
+summary: |
+  Lars has contributed significantly to design and architecture discussions
+  around Gitano and its associated libraries.  In addition Lars provided the
+  initial drafts of the administration manuals.
+
+---
+
+name: Richard Ipsum
+company: Codethink Ltd
+email: richard.ipsum@codethink.co.uk
+website: http://www.codethink.co.uk/
+summary: |
+  Codethink sponsored the syslog support for Gitano to be able to log
+  transactions to the system log for audit purposes.  In addition Codethink
+  sponsored Richard to develop the smart-HTTP interface to Gitano.
+
+---
+
+name: Richard Ipsum
+email: richardipsum@fastmail.co.uk
+website: https://bitbucket.org/richardipsum/
+summary: |
+  Richard continued the smart-HTTP support initial sponsored by Codethink and
+  contributed various cleanups and bug-fixes around Gitano's internal command
+  dispatch.
+
+---
+
+name: Maxine Green
+email: theofficialmaxine@gmail.com
+website:
+ - http://www.chaosbunny.com/
+ - http://www.maxinegreen.co.uk/
+summary: |
+  Maxine is a professional illustrator who is responsible for the artwork
+  you can find in the Gitano documentation and on the Gitano project
+  websites.