Basics of diff. manifolds: solve merge conflict with Sage 7.1.beta1

Author: egourgoulhon

src/doc/en/reference/manifolds/diff_manifold.rst

@@ -0,0 +1,13 @@
+Differentiable Manifolds
+========================
+
+.. toctree::
+   :maxdepth: 2
+
+   sage/manifolds/differentiable/manifold
+
+   sage/manifolds/differentiable/chart
+
+   diff_scalarfield
+
+   diff_map

src/doc/en/reference/manifolds/diff_map.rst

@@ -0,0 +1,9 @@
+Differentiable Maps
+===================
+
+.. toctree::
+   :maxdepth: 2
+
+   sage/manifolds/differentiable/manifold_homset
+
+   sage/manifolds/differentiable/diff_map

src/doc/en/reference/manifolds/diff_scalarfield.rst

@@ -0,0 +1,9 @@
+Scalar Fields
+=============
+
+.. toctree::
+   :maxdepth: 2
+
+   sage/manifolds/differentiable/scalarfield_algebra
+
+   sage/manifolds/differentiable/scalarfield

src/doc/en/reference/manifolds/index.rst

@@ -15,6 +15,8 @@ More documentation (in particular example worksheets) can be found
 
    manifold
 
+   diff_manifold
+
    sage/manifolds/utilities
 
 .. include:: ../footer.txt

src/sage/manifolds/all.py

@@ -2,3 +2,4 @@
 lazy_import('sage.manifolds.manifold', 'Manifold')
 lazy_import('sage.manifolds.utilities', 'nice_derivatives')
 lazy_import('sage.manifolds.utilities', 'omit_function_args')
+lazy_import('sage.manifolds.utilities', 'set_axes_labels')

src/sage/manifolds/differentiable/__init__.py

@@ -0,0 +1 @@
+# Empty file