openstack/horizon
Code Issues Proposed changes

Merge "Update the links of django docs to dev version"

Browse Source
This commit is contained in:
Jenkins 2016-06-01 20:28:21 +00:00 committed by Gerrit Code Review
commit c02327920c
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/source/topics/packaging.rst
View File

@ -214,4 +214,4 @@ This is the `recommended way`_ for Django applications.
Depending on configuration, it might be required to ``manage.py compress`` Depending on configuration, it might be required to ``manage.py compress``
during package build, too. during package build, too.
.. _`recommended way`: https://docs.djangoproject.com/en/1.8/howto/static-files/deployment/ .. _`recommended way`: https://docs.djangoproject.com/en/dev/howto/static-files/deployment/

6
doc/source/topics/settings.rst
View File

@ -64,7 +64,7 @@ Horizon Dashboards are automatically discovered in the following way:
directory (for more information see :ref:`pluggable-settings-label`). directory (for more information see :ref:`pluggable-settings-label`).
This is the default way in OpenStack Dashboard. This is the default way in OpenStack Dashboard.
* By traversing Django's list of * By traversing Django's list of
`INSTALLED_APPS <https://docs.djangoproject.com/en/1.4/ref/settings/#std:setting-INSTALLED_APPS>`_ `INSTALLED_APPS <https://docs.djangoproject.com/en/dev/ref/settings/#std:setting-INSTALLED_APPS>`_
and importing any files that have the name ``"dashboard.py"`` and include and importing any files that have the name ``"dashboard.py"`` and include
code to register themselves as a Horizon dashboard. code to register themselves as a Horizon dashboard.
@ -1458,7 +1458,7 @@ The absolute path to the directory where static files are collected when
collectstatic is run. collectstatic is run.
For more information see: For more information see:
https://docs.djangoproject.com/en/1.7/ref/settings/#static-root https://docs.djangoproject.com/en/dev/ref/settings/#static-root
``STATIC_URL`` ``STATIC_URL``
-------------- --------------
@ -1483,7 +1483,7 @@ $static_url. Make sure you run ``python manage.py collectstatic`` and
``python manage.py compress`` after any changes to this value in settings.py. ``python manage.py compress`` after any changes to this value in settings.py.
For more information see: For more information see:
https://docs.djangoproject.com/en/1.7/ref/settings/#static-url https://docs.djangoproject.com/en/dev/ref/settings/#static-url
``DISALLOW_IFRAME_EMBED`` ``DISALLOW_IFRAME_EMBED``
------------------------- -------------------------

4
doc/source/tutorials/dashboard.rst
View File

@ -20,7 +20,7 @@ data pulled by the Nova instances API.
with the :doc:`Horizon quickstart guide </quickstart>` or the with the :doc:`Horizon quickstart guide </quickstart>` or the
`Django tutorial`_. `Django tutorial`_.
.. _Django tutorial: https://docs.djangoproject.com/en/1.6/intro/tutorial01/ .. _Django tutorial: https://docs.djangoproject.com/en/dev/intro/tutorial01/
Creating a dashboard Creating a dashboard
@ -534,7 +534,7 @@ our OpenStack Dashboard site.
For more information about Django views, URLs and templates, please refer For more information about Django views, URLs and templates, please refer
to the `Django documentation`_. to the `Django documentation`_.
.. _Django documentation: https://docs.djangoproject.com/en/1.6/ .. _Django documentation: https://docs.djangoproject.com/en/dev/
Enable and show the dashboard Enable and show the dashboard

2
openstack_dashboard/local/local_settings.py.example
View File

@ -34,7 +34,7 @@ WEBROOT = '/'
# Pass this header from the proxy after terminating the SSL, # Pass this header from the proxy after terminating the SSL,
# and don't forget to strip it from the client's request. # and don't forget to strip it from the client's request.
# For more information see: # For more information see:
# https://docs.djangoproject.com/en/1.8/ref/settings/#secure-proxy-ssl-header # https://docs.djangoproject.com/en/dev/ref/settings/#secure-proxy-ssl-header
#SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTO', 'https') #SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTO', 'https')
# If Horizon is being served through SSL, then uncomment the following two # If Horizon is being served through SSL, then uncomment the following two