Merge testdata changes and Parameter nodes into zipper.

2 files changed, 4 insertions, 4 deletions

diff --git a/doc/source/conf.py b/doc/source/conf.py
index 980fd31e..f4ceb2a8 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -48,9 +48,9 @@ copyright = u'2013, Logilab S.A.'
 # built documents.
 #
 # The short X.Y version.
-version = '1.3.4'
+from astroid.__pkginfo__ import version
 # The full version, including alpha/beta/rc tags.
-release = '1.3.4'
+release = version
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -125,7 +125,7 @@ html_theme = 'default'
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ['_static']
+html_static_path = []
 
 # If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
 # using the given strftime format.
diff --git a/doc/source/inference.rst b/doc/source/inference.rst
index bf67993f..7fed194f 100644
--- a/doc/source/inference.rst
+++ b/doc/source/inference.rst
@@ -81,7 +81,7 @@ of the :mod:`inference`.
 
 .. todo:: actually annotate the doc to structure its approach
 
-.. automodule:: inference
+.. automodule:: astroid.inference
    :members:
    :undoc-members:
 .. :special-members: in autodoc/sphinx 1.1