diff --git a/ChangeLog b/ChangeLog index d109fb60f7ab88fbf2c2fc31403193c70065a697..723c504771853c82424c25868de6444b6a510e46 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +=========== +1.1.1 RELEASE +Minor changes release + + - Change license to GPLv3 + - Minor documentation updates + =========== 1.1.0 RELEASE Updates and enhancements. Check documentation for updating from previous versions diff --git a/_version.py b/_version.py index 71c8d170b3e3061bbcc1015b58d1cda63f765338..20a60559dfad9b88ceebfabd85b911b05c462408 100644 --- a/_version.py +++ b/_version.py @@ -1,4 +1,4 @@ -VERSION = '1.1.0' +VERSION = '1.1.1' if __name__ == "__main__": print VERSION diff --git a/doc/source/conf.py b/doc/source/conf.py index b76c0e37a608f9c5ef75030f0dce7516bb3f7fc2..4b0e15a57eb3cd2d4b374b802c29a3836c356914 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -38,16 +38,16 @@ master_doc = 'index' # General information about the project. project = u'fod' -copyright = u'2014, Leonidas Poulopoulos (@leopoul), GRNET S.A' +copyright = u'2014, GRNET NOC, GRNET S.A' # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the # built documents. # # The short X.Y version. -version = '1.1.0' +version = '1.1.1' # The full version, including alpha/beta/rc tags. -release = '1.1.0' +release = '1.1.1' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/doc/source/index.rst b/doc/source/index.rst index 4345e6cec71f4b0f577aa90d60ff2579075bbda3..633bbf7f2665bc2925e730b71ccfac94f75b7933 100644 --- a/doc/source/index.rst +++ b/doc/source/index.rst @@ -34,9 +34,9 @@ In GRNET's case the flowspec capable device is an EX4200. Contact ======= -You can find more about FoD or raise your issues at `GRNET FoD repository <https://code.grnet.gr/projects/flowspy>`_. +You can find more about FoD or raise your issues at `GRNET FoD repository <https://code.grnet.gr/projects/flowspy>`_ or `GRNET FoD Github repo <https://github.com/grnet/flowspy>`_ . -You can contact us directly at leopoul{at}noc[dot]grnet(.)gr +You can contact us directly at grnet{at}noc[dot]grnet(.)gr Install ======= diff --git a/doc/source/install.rst b/doc/source/install.rst index 1ca4923a5285bf4a6af765418d32a3938943bd59..cd983bc54f2a38592d54f9c22452072c98d29076 100644 --- a/doc/source/install.rst +++ b/doc/source/install.rst @@ -76,7 +76,7 @@ Get the required packages and their dependencies and install them:: cd nxpy python setup.py install -- flowspy: core application. Installation is done at /srv/flowspy:: +- flowspy: core web application. Installation is done at /srv/flowspy:: cd /srv git clone https://code.grnet.gr/git/flowspy