From 4872af63b603606d2b6e0dcc83771ad323d0b3e9 Mon Sep 17 00:00:00 2001 From: Corey Shields Date: Thu, 22 Nov 2018 14:43:34 -0500 Subject: [PATCH] minor cosmetic fixes update the contrib guidelines to MR against dev, fix copyright pull opbeat from .env-dist since we don't use it anymore --- docs/conf.py | 2 +- docs/contribute.rst | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/conf.py b/docs/conf.py index d54e6c1..7a11523 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -44,7 +44,7 @@ master_doc = 'index' # General information about the project. project = u'satnogs-network' -copyright = u'2014-2017, Libre Space Foundation' +copyright = u'2014-%s, Libre Space Foundation' % time.strftime('%Y') author = 'SatNOGS' # The version info for the project you're documenting, acts as replacement for diff --git a/docs/contribute.rst b/docs/contribute.rst index cbe783c..e8f6632 100644 --- a/docs/contribute.rst +++ b/docs/contribute.rst @@ -51,9 +51,9 @@ When you want to start contributing, you should :doc:`follow the installation in $ git push origin my_branch -#. Issue a pull request on Gitlab +#. Issue a pull request on Gitlab to the dev branch (not master) -#. Wait to hear from one of the core developers +#. Wait to hear from one of the core developers. You can find us on irc or matrix in channel satnogs if you wish to discuss your MR in real time. If you're asked to change your commit message, you can amend the message and force commit::