From de485fc3478e675a1fa327c10a8297a1ea17f46a Mon Sep 17 00:00:00 2001 From: Todd Leonhardt Date: Thu, 9 Jan 2020 21:58:06 -0500 Subject: Update copyright through 2020 and restore documentation copyright to MIT license During recent work to upgrade the format of the Sphinx documentation, the license the docs are copyright under was accidentally changed from MIT to CreativeCommons. This restores the documentation to be under an MIT license so there is a single license governing both code and documentation. --- LICENSE | 2 +- docs/conf.py | 2 +- docs/copyright.rst | 5 ++--- 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 `_ and is licensed -under a `Creative Commons Attribution 4.0 International License -`_. +under an `MIT License `_. -- cgit v1.2.1