diff --git a/CHANGES.rst b/CHANGES.rst index bcb7bf7..e25c696 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -15,15 +15,14 @@ Other changes: does the nsupdate.local_settings hack work any more). in your local_settings.py, please do your imports like this:: - from nsupdate.settings.dev import * # for development - # alternatively: - from nsupdate.settings.prod import * # for production - # after that, override whatever you need to override. - + from nsupdate.settings.dev import * # for development + # alternatively: + from nsupdate.settings.prod import * # for production + # after that, override whatever you need to override. * improved docs about a sane settings setup * document postgreSQL setup * also support Python 2.6.x -* for debugging, add django-debug-toolbar +* for debugging, added django-debug-toolbar Release 0.5.0 diff --git a/docs/intro.rst b/docs/intro.rst index b58ac85..188ff43 100644 --- a/docs/intro.rst +++ b/docs/intro.rst @@ -3,3 +3,4 @@ Introduction ============ .. include:: ../README.rst +.. include:: ../CHANGES.rst diff --git a/nsupdate/settings/prod.py b/nsupdate/settings/prod.py index 954447b..fe91f15 100644 --- a/nsupdate/settings/prod.py +++ b/nsupdate/settings/prod.py @@ -21,4 +21,3 @@ WWW_IPV6_HOST = 'ipv6.' + BASEDOMAIN # a host with ONLY a ipv6 address # Hosts/domain names that are valid for this site; required if DEBUG is False # See https://docs.djangoproject.com/en/1.5/ref/settings/#allowed-hosts ALLOWED_HOSTS = [WWW_HOST, WWW_IPV4_HOST, WWW_IPV6_HOST] -