openstack-attic/melange
Code Issues Proposed changes

Merge "Allows docs to be built on RTFD.org"

Browse Source
This commit is contained in:
Jenkins 2012-03-15 23:15:37 +00:00 committed by Gerrit Code Review
commit e2c979b76b
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
doc/source/conf.py
View File

@ -32,10 +32,10 @@ import sys
# If extensions (or modules to document with autodoc) are in another directory, # If extensions (or modules to document with autodoc) are in another directory,
# add these directories to sys.path here. If the directory is relative to the # add these directories to sys.path here. If the directory is relative to the
# documentation root, use os.path.abspath to make it absolute, like shown here. # documentation root, use os.path.abspath to make it absolute, like shown here.
sys.path.append([os.path.abspath('../melange'),
os.path.abspath('..'), BASE_DIR = os.path.dirname(os.path.abspath(__file__))
os.path.abspath('../bin') MELANGE_DIR = os.path.abspath(os.path.join(BASE_DIR, "..", ".."))
]) sys.path.insert(0, MELANGE_DIR)
# -- General configuration --------------------------------------------------- # -- General configuration ---------------------------------------------------
@ -242,7 +242,7 @@ latex_documents = [
# Example configuration for intersphinx: refer to the Python standard library. # Example configuration for intersphinx: refer to the Python standard library.
intersphinx_mapping = {'python': ('http://docs.python.org/', None), intersphinx_mapping = {'python': ('http://docs.python.org/', None),
'dashboard': ('http://dashboard.openstack.org', None), 'horizon': ('http://horizon.openstack.org', None),
'glance': ('http://glance.openstack.org', None), 'glance': ('http://glance.openstack.org', None),
'keystone': ('http://keystone.openstack.org', None), 'keystone': ('http://keystone.openstack.org', None),
'nova': ('http://nova.openstack.org', None), 'nova': ('http://nova.openstack.org', None),

4
doc/source/index.rst
View File

@ -14,11 +14,9 @@
License for the specific language governing permissions and limitations License for the specific language governing permissions and limitations
under the License. under the License.
Welcome to Skeleton's documentation! Welcome to Melange's documentation!
==================================== ====================================
Description of Skeleton project
API Docs API Docs
======== ========