Changeset 2106 in main for trunk/docs


Ignore:
Timestamp:
02/27/13 12:34:16 (6 years ago)
Author:
pcosquer
Message:

add the ALLOWED_HOSTS setting (default to example.com), refs #187
This commit also hipdjangodocs sphinx extension to
easily refer to a django setting

Location:
trunk/docs
Files:
4 added
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/docs/en/admin/ht_2_install_server.rst

    r2105 r2106  
    245245 
    246246 
     247Configure allowed hosts 
     248========================== 
     249 
     250Django 1.5 checks the host before serving a request. 
     251You must edit the :django:setting:`ALLOWED_HOSTS` setting so that 
     252django accepts to serve your requests. 
     253 
    247254Check required modules 
    248255====================== 
  • trunk/docs/en/conf.py

    r2016 r2106  
    2020sys.path.append(os.path.abspath('../../')) 
    2121sys.path.append(os.path.abspath('../../openPLM')) 
     22 
     23sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), "_ext"))) 
    2224 
    2325from django.conf import global_settings, settings 
     
    5052              'sphinx.ext.autosummary', 'sphinx.ext.inheritance_diagram', 
    5153              'sphinx.ext.viewcode', 'sphinx.ext.extlinks', 
    52               'sphinx.ext.graphviz',] 
     54              'sphinx.ext.graphviz', 'djangodocs'] 
    5355 
    5456# Add any paths that contain templates here, relative to this directory. 
     
    227229 
    228230# Example configuration for intersphinx: refer to the Python standard library. 
    229 intersphinx_mapping = {'http://docs.python.org/': None, 
    230                        'http://docs.djangoproject.com/en/dev': 'http://docs.djangoproject.com/en/dev/_objects',} 
     231intersphinx_mapping = { 
     232    'python': ('http://docs.python.org/2.6/', None), 
     233    'django': ('http://docs.djangoproject.com/en/dev', 'http://docs.djangoproject.com/en/dev/_objects'), 
     234} 
    231235 
    232236autodoc_member_order = 'bysource' 
  • trunk/docs/fr/conf.py

    r2016 r2106  
    2020sys.path.append(os.path.abspath('../../')) 
    2121sys.path.append(os.path.abspath('../../openPLM')) 
     22 
     23sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), "_ext"))) 
    2224 
    2325from django.conf import global_settings, settings 
     
    6668# General information about the project. 
    6769project = u'openPLM' 
    68 copyright = u'2010-2014, LinObject' 
     70copyright = u'2010-2013, LinObject' 
    6971 
    7072# The version info for the project you're documenting, acts as replacement for 
     
    227229 
    228230# Example configuration for intersphinx: refer to the Python standard library. 
    229 intersphinx_mapping = {'http://docs.python.org/': None, 
    230                        'http://docs.djangoproject.com/en/dev': 'http://docs.djangoproject.com/en/dev/_objects',} 
     231intersphinx_mapping = { 
     232    'python': ('http://docs.python.org/2.6/', None), 
     233    'django': ('http://docs.djangoproject.com/en/dev', 'http://docs.djangoproject.com/en/dev/_objects'), 
     234} 
    231235 
    232236autodoc_member_order = 'bysource' 
  • trunk/docs/skel/conf.py

    r2016 r2106  
    2020sys.path.append(os.path.abspath('../../')) 
    2121sys.path.append(os.path.abspath('../../openPLM')) 
     22 
     23sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), "_ext"))) 
    2224 
    2325from django.conf import global_settings, settings 
     
    6668# General information about the project. 
    6769project = u'openPLM' 
    68 copyright = u'2010-2014, LinObject' 
     70copyright = u'2010-2013, LinObject' 
    6971 
    7072# The version info for the project you're documenting, acts as replacement for 
     
    191193html_secnumber_suffix = ". " 
    192194 
    193 html_context = { "language" : language } 
     195html_context = {"language" : language } 
    194196 
    195197# -- Options for LaTeX output -------------------------------------------------- 
Note: See TracChangeset for help on using the changeset viewer.