From 2960b34a508489c2ac2eba47b79aefa888969efd Mon Sep 17 00:00:00 2001 From: Brett Andrews Date: Thu, 2 Feb 2017 10:39:06 -0500 Subject: [PATCH] updates copyright year, removes items from TODO, and adds links to new Tools sphinx pages --- LICENSE.md | 2 +- TODO.md | 3 --- docs/sphinx/conf.py | 2 +- docs/sphinx/index.rst | 2 ++ 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/LICENSE.md b/LICENSE.md index f517be2f4..e031e8822 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,4 +1,4 @@ -Copyright (c) 2016, The Marvin development team. +Copyright (c) 2016-2017, The Marvin development team. All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/TODO.md b/TODO.md index 3e1c8a89e..bb74b4ab0 100644 --- a/TODO.md +++ b/TODO.md @@ -5,11 +5,8 @@ - Assign ownership to files / areas of code. - Use pull requests - Fix circular imports (either refactor or use import XXX vs from XXX import YYY) -- Add README and CHANGELOG. - Use TODO in code. -- Add link to issue tracking in Marvin-web/documentation. - Check valid kwargs for all MarvinToolsClass classes. -- xyorig standards. - Document attributes - Maybe geturlmap should not run when loading marvin, but only when the first Interaction is called. diff --git a/docs/sphinx/conf.py b/docs/sphinx/conf.py index f4d61990e..3fd94daf5 100644 --- a/docs/sphinx/conf.py +++ b/docs/sphinx/conf.py @@ -64,7 +64,7 @@ # General information about the project. project = u'Marvin' -copyright = u'2016, Brian Cherinka, Brett Andrews, and José Sánchez-Gallego' +copyright = u'2016-2017, Brian Cherinka, Brett Andrews, and José Sánchez-Gallego' author = u'Brian Cherinka, Brett Andrews, and José Sánchez-Gallego' # The version info for the project you're documenting, acts as replacement for diff --git a/docs/sphinx/index.rst b/docs/sphinx/index.rst index b5d5b7a3c..a4673d7a2 100644 --- a/docs/sphinx/index.rst +++ b/docs/sphinx/index.rst @@ -68,6 +68,8 @@ Marvin Primer query results tools/cube + tools/modelcube + tools/maps :doc:`api` ==========