Merge pull request #341 from pdebuyl/update_makefile_conf

Update Makefile and conf.py

Author: GaelVaroquaux

Makefile

@@ -31,7 +31,7 @@ help:
 
 clean:
 	-rm -rf build/*
-	-rm -rf intro/scipy/auto_examples/ intro/matplotlib/auto_examples/ intro/summary-exercises/auto_examples advanced/mathematical_optimization/auto_examples/ advanced/advanced_numpy/auto_examples/ advanced/image_processing/auto_examples advanced/scipy_sparse/auto_examples packages/3d_plotting/auto_examples packages/statistics/auto_examples/ packages/scikit-image/auto_examples/ packages/scikit-learn/auto_examples
+	-rm -rf intro/scipy/auto_examples/ intro/matplotlib/auto_examples/ intro/summary-exercises/auto_examples advanced/mathematical_optimization/auto_examples/ advanced/advanced_numpy/auto_examples/ advanced/image_processing/auto_examples advanced/scipy_sparse/auto_examples packages/3d_plotting/auto_examples packages/statistics/auto_examples/ packages/scikit-image/auto_examples/ packages/scikit-learn/auto_examples intro/numpy/auto_examples guide/auto_examples
 
 test:
 	MATPLOTLIBRC=build_tools $(PYTHON) -m pytest --doctest-glob '*.rst' --ignore advanced/advanced_numpy/examples/myobject_test.py --ignore advanced/interfacing_with_c/numpy_c_api/test_cos_module_np.py --ignore advanced/interfacing_with_c/ctypes/cos_module.py --ignore advanced/interfacing_with_c/swig_numpy/test_cos_doubles.py --ignore advanced/interfacing_with_c/cython_numpy/test_cos_doubles.py --ignore advanced/interfacing_with_c/ctypes_numpy/cos_doubles.py --ignore advanced/interfacing_with_c/ctypes_numpy/test_cos_doubles.py --ignore advanced/interfacing_with_c/numpy_shared/test_cos_doubles.py

conf.py

@@ -278,12 +278,6 @@ def __init__(self, **options):
 # Options for LaTeX output
 # ------------------------
 
-# The paper size ('letter' or 'a4').
-#latex_paper_size = 'letter'
-
-# The font size ('10pt', '11pt' or '12pt').
-#latex_font_size = '10pt'
-
 # Latex references with page numbers (only Sphinx 1.0)
 latex_show_pagerefs = False
 
@@ -299,19 +293,12 @@ def __init__(self, **options):
 # the title page.
 latex_logo = 'images/cover.pdf'
 
-# For "manual" documents, if this is true, then toplevel headings are parts,
-# not chapters.
-latex_use_parts = True
-
-# Documents to append as an appendix to all manuals.
-#latex_appendices = []
-
-# If false, no module index is generated.
-latex_use_modindex = False
-
+# Latex settings
+latex_toplevel_sectioning = 'part'
+latex_domain_indices = False
 
 # Additional stuff for the LaTeX preamble.
-latex_preamble = r"""
+preamble = r"""
 \definecolor{VerbatimColor}{rgb}{0.961, .98, 1.}
 \definecolor{VerbatimBorderColor}{rgb}{0.6,0.6,0.6}
 \usepackage{graphics}
@@ -359,7 +346,7 @@ def __init__(self, **options):
 """
 
 latex_elements = {
-    'preamble': latex_preamble,
+    'preamble': preamble,
     'fontpkg': '\\usepackage{lmodern}',
     'fncychap': r'''%
     \usepackage[Sonny]{fncychap}%