Suggestions by mkoeppe

Author: gmou3

src/sage/matroids/constructor.py

@@ -179,7 +179,7 @@ def Matroid(groundset=None, data=None, **kwds):
       matroid.
     - ``independent_sets`` -- The list of independent sets of the matroid.
     - ``circuits`` -- The list of circuits of the matroid.
-    - ``nonspanning_circuits`` -- The list of nonspanning_circuits of the
+    - ``nonspanning_circuits`` -- The list of nonspanning circuits of the
       matroid.
     - ``flats`` -- The dictionary of flats indexed by their rank.
     - ``graph`` -- A graph, whose edges form the elements of the matroid.
@@ -226,6 +226,8 @@ def Matroid(groundset=None, data=None, **kwds):
 
         The ``Matroid()`` method will return instances of type
         :class:`BasisMatroid <sage.matroids.basis_matroid.BasisMatroid>`,
+        :class:`CircuitsMatroid <sage.matroids.circuits_matroid.CircuitsMatroid>`,
+        :class:`FlatsMatroid <sage.matroids.flats_matroid.FlatsMatroid>`,
         :class:`CircuitClosuresMatroid <sage.matroids.circuit_closures_matroid.CircuitClosuresMatroid>`,
         :class:`LinearMatroid <sage.matroids.linear_matroid.LinearMatroid>`,
         :class:`BinaryMatroid <sage.matroids.linear_matroid.LinearMatroid>`,
@@ -307,7 +309,7 @@ def Matroid(groundset=None, data=None, **kwds):
             sage: M1 = Matroid(groundset='abc', circuits=['bc'])
 
         A matroid specified by a list of circuits gets converted to a
-        :class:`CircuitsMatroid <sage.matroids.basis_matroid.CircuitsMatroid>`
+        :class:`CircuitsMatroid <sage.matroids.circuits_matroid.CircuitsMatroid>`
         internally::
 
             sage: from sage.matroids.circuits_matroid import CircuitsMatroid
@@ -331,6 +333,16 @@ def Matroid(groundset=None, data=None, **kwds):
             sage: M.is_valid()
             False
 
+    #.  Dictionary of flats:
+
+        ::
+
+            sage: M = Matroid(flats={0: [''], 1: ['a', 'b'], 2: ['ab']})
+            sage: M.is_valid()
+            True
+            sage: type(M)
+            <class 'sage.matroids.flats_matroid.FlatsMatroid'>
+
     #.  Graph:
 
         Sage has great support for graphs, see :mod:`sage.graphs.graph`.

src/sage/matroids/flats_matroid.pyx

@@ -111,7 +111,7 @@ cdef class FlatsMatroid(Matroid):
 
         INPUT:
 
-        - ``X`` -- an object with Python's ``frozenset`` interface
+        - ``X`` -- an object with Python's :class:`frozenset` interface
 
         OUTPUT: an integer; the rank of ``X`` in the matroid
 
@@ -357,7 +357,7 @@ cdef class FlatsMatroid(Matroid):
 
         - ``k`` -- an integer
 
-        OUTPUT: a SetSystem
+        OUTPUT: a :class:`SetSystem`
 
         EXAMPLES::
 

src/sage/matroids/unpickling.pyx

@@ -181,7 +181,7 @@ def unpickle_circuit_closures_matroid(version, data):
 
 def unpickle_flats_matroid(version, data):
     """
-    Unpickle a FlatsMatroid.
+    Unpickle a :class:`FlatsMatroid`.
 
     *Pickling* is Python's term for the loading and saving of objects.
     Functions like these serve to reconstruct a saved object. This all happens