Merge branch 'public/ticket/10194' of trac.sagemath.org:sage into 6.4.b6

Conflicts: src/doc/en/reference/structure/index.rst
sagemath · Oct 17, 2014 · 20f17b3 · 20f17b3
2 parents 36c150e + ed7f340
commit 20f17b3
Show file tree

Hide file tree

Showing 4 changed files with 1,511 additions and 0 deletions.
diff --git a/src/doc/en/reference/structure/index.rst b/src/doc/en/reference/structure/index.rst
@@ -24,6 +24,8 @@ Basic Structures
    sage/structure/indexed_generators
    sage/structure/global_options
    sage/structure/graphics_file
+   sage/structure/set_factories
+   sage/structure/set_factories_example
 
    sage/sets/cartesian_product
    sage/sets/family

diff --git a/src/sage/misc/sagedoc.py b/src/sage/misc/sagedoc.py
@@ -56,6 +56,9 @@
     ('\\cdot', ' *'),
     (' \\times', ' x'),
     ('\\times', ' x'),
+    ('\\quad', '  '),
+    ('\\qquad', '    '),
+    ('\\mid', '|'),
     ('\\backslash','\\'),
     ('\\mapsto', ' |--> '),
 ]