diff --git a/docs/en_US/conf.py b/docs/en_US/conf.py index e911c85b0..b2dc82e17 100644 --- a/docs/en_US/conf.py +++ b/docs/en_US/conf.py @@ -41,7 +41,7 @@ master_doc = 'index' # General information about the project. project = u'pgAdmin 4' -copyright = u'2013 - 2015, The pgAdmin Development Team' +copyright = u'2013 - 2016, The pgAdmin Development Team' # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the @@ -50,7 +50,7 @@ copyright = u'2013 - 2015, The pgAdmin Development Team' # The short X.Y version. version = '1.0' # The full version, including alpha/beta/rc tags. -release = '1.0.0-dev' +release = '1.0-dev' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/web/config.py b/web/config.py index a2da99238..0a4177d12 100644 --- a/web/config.py +++ b/web/config.py @@ -23,8 +23,7 @@ APP_NAME = 'pgAdmin 4' APP_ICON = 'icon-postgres-alt' # Application version number components -APP_MAJOR = 1 -APP_MINOR = 0 +APP_RELEASE = 1 APP_REVISION = 0 # Application version suffix, e.g. 'beta1', 'dev'. Usually an empty string @@ -45,7 +44,7 @@ LANGUAGES = { # DO NOT CHANGE! # The application version string, constructed from the components -APP_VERSION = '%s.%s.%s-%s' % (APP_MAJOR, APP_MINOR, APP_REVISION, APP_SUFFIX) +APP_VERSION = '%s.%s-%s' % (APP_RELEASE, APP_REVISION, APP_SUFFIX) # DO NOT CHANGE UNLESS YOU KNOW WHAT YOU ARE DOING! # List of modules to skip when dynamically loading