diff --git a/doc/_templates/sidebarintro.html b/doc/_templates/sidebarintro.html
index d61f3417226..95b047733e3 100644
--- a/doc/_templates/sidebarintro.html
+++ b/doc/_templates/sidebarintro.html
@@ -4,9 +4,9 @@
Other Docs
Useful Links
diff --git a/doc/conf.py b/doc/conf.py
index d7452992944..54deb11eb2d 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -16,9 +16,9 @@ import sys, os
# 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
# documentation root, use os.path.abspath to make it absolute, like shown here.
+#sys.path.insert(0, os.path.abspath('.'))
sys.path.append(os.path.abspath('_themes'))
-sys.path.insert(0, os.path.abspath('../addons'))
-sys.path.insert(0, os.path.abspath('..'))
+sys.path.append(os.path.abspath('..'))
# -- General configuration -----------------------------------------------------
@@ -42,7 +42,7 @@ source_suffix = '.rst'
master_doc = 'index'
# General information about the project.
-project = u'OpenERP Web Developers Documentation'
+project = u'OpenERP Server Developers Documentation'
copyright = u'2012, OpenERP s.a.'
# The version info for the project you're documenting, acts as replacement for
@@ -170,7 +170,7 @@ html_sidebars = {
#html_file_suffix = None
# Output file base name for HTML help builder.
-htmlhelp_basename = 'openerp-web-doc'
+htmlhelp_basename = 'openerp-server-doc'
# -- Options for LaTeX output --------------------------------------------------
@@ -189,7 +189,7 @@ latex_elements = {
# Grouping the document tree into LaTeX files. List of tuples
# (source start file, target name, title, author, documentclass [howto/manual]).
latex_documents = [
- ('index', 'openerp-web-doc.tex', u'OpenERP Web Developers Documentation',
+ ('index', 'openerp-server-doc.tex', u'OpenERP Server Developers Documentation',
u'OpenERP s.a.', 'manual'),
]
@@ -219,7 +219,7 @@ latex_documents = [
# One entry per manual page. List of tuples
# (source start file, name, description, authors, manual section).
man_pages = [
- ('index', 'openerp-web-doc', u'OpenERP Web Developers Documentation',
+ ('index', 'openerp-server-doc', u'OpenERP Server Developers Documentation',
[u'OpenERP s.a.'], 1)
]
@@ -233,8 +233,8 @@ man_pages = [
# (source start file, target name, title, author,
# dir menu entry, description, category)
texinfo_documents = [
- ('index', 'OpenERPWebDocumentation', u'OpenERP Web Developers Documentation',
- u'OpenERP s.a.', 'OpenERPWebDocumentation', 'Developers documentation for the openerp-web project.',
+ ('index', 'OpenERPServerDocumentation', u'OpenERP Server Developers Documentation',
+ u'OpenERP s.a.', 'OpenERPServerDocumentation', 'Developers documentation for the openobject-server project.',
'Miscellaneous'),
]
@@ -251,6 +251,6 @@ texinfo_documents = [
# Example configuration for intersphinx: refer to the Python standard library.
intersphinx_mapping = {
'python': ('http://docs.python.org/', None),
- 'openerpserver': ('http://doc.openerp.com/v6.1/developers/server', None),
- 'openerpdev': ('http://doc.openerp.com/v6.1/developers', None),
+ 'openerpweb': ('http://doc.openerp.com/trunk/developers/web', None),
+ 'openerpdev': ('http://doc.openerp.com/trunk/developers', None),
}