summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTodd Leonhardt <todd.leonhardt@gmail.com>2020-01-09 22:10:13 -0500
committerGitHub <noreply@github.com>2020-01-09 22:10:13 -0500
commitf266cacc169140890e624c8c221c9695ee2bbcc4 (patch)
treef53512997fe82fffa317d88b38e66cffc7b866b3
parentdb093b630ed487838337a04a28af79475d37d1e0 (diff)
parentde485fc3478e675a1fa327c10a8297a1ea17f46a (diff)
downloadcmd2-git-f266cacc169140890e624c8c221c9695ee2bbcc4.tar.gz
Merge pull request #844 from python-cmd2/copyright_update
Update copyright through 2020 and restore original documentation copyright
-rw-r--r--LICENSE2
-rw-r--r--docs/conf.py2
-rw-r--r--docs/copyright.rst5
3 files changed, 4 insertions, 5 deletions
diff --git a/LICENSE b/LICENSE
index 7f916117..8c187203 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
The MIT License (MIT)
-Copyright (c) 2008-2019 Catherine Devlin and others
+Copyright (c) 2008-2020 Catherine Devlin and others
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
diff --git a/docs/conf.py b/docs/conf.py
index 5463d0bb..7a8da9d1 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -56,7 +56,7 @@ master_doc = 'index'
# General information about the project.
project = 'cmd2'
-copyright = '2010-2019, cmd2 contributors'
+copyright = '2010-2020, cmd2 contributors'
author = 'cmd2 contributors'
# The version info for the project you're documenting, acts as replacement for
diff --git a/docs/copyright.rst b/docs/copyright.rst
index b7183e62..30cf255c 100644
--- a/docs/copyright.rst
+++ b/docs/copyright.rst
@@ -1,7 +1,6 @@
Copyright
=========
-The ``cmd2`` documentation is Copyright 2010-2019 by the `cmd2 contributors
+The ``cmd2`` documentation is Copyright 2010-2020 by the `cmd2 contributors
<https://github.com/python-cmd2/cmd2/graphs/contributors>`_ and is licensed
-under a `Creative Commons Attribution 4.0 International License
-<http://creativecommons.org/licenses/by/4.0/>`_.
+under an `MIT License <https://github.com/python-cmd2/cmd2/blob/master/LICENSE>`_.