summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMinas Gjoka <minas.gjoka@gmail.com>2016-03-01 22:35:37 -0800
committerMinas Gjoka <minas.gjoka@gmail.com>2016-03-01 22:35:37 -0800
commit57f6458a692178a7d0b10ebbbf9f3c0f80505834 (patch)
tree7b0ee3b6a127ab14b39d77f01f126b0e04c66853
parent3696a660ef5a18148a1aa6b8842eb22a0e7d1cf9 (diff)
downloadnetworkx-57f6458a692178a7d0b10ebbbf9f3c0f80505834.tar.gz
Addressed comments about dashes and alphabetical order
-rw-r--r--doc/source/reference/generators.rst3
-rw-r--r--networkx/generators/__init__.py2
2 files changed, 3 insertions, 2 deletions
diff --git a/doc/source/reference/generators.rst b/doc/source/reference/generators.rst
index 7ad8f57e..d25b1934 100644
--- a/doc/source/reference/generators.rst
+++ b/doc/source/reference/generators.rst
@@ -243,10 +243,11 @@ Triads
Joint Degree Sequence
---------------------
+---------------------
.. automodule:: networkx.generators.joint_degree_seq
.. autosummary::
:toctree: generated/
is_valid_joint_degree
joint_degree_model
+
diff --git a/networkx/generators/__init__.py b/networkx/generators/__init__.py
index d206fca4..b3b6dab5 100644
--- a/networkx/generators/__init__.py
+++ b/networkx/generators/__init__.py
@@ -11,6 +11,7 @@ from networkx.generators.ego import *
from networkx.generators.expanders import *
from networkx.generators.geometric import *
from networkx.generators.intersection import *
+from networkx.generators.joint_degree_seq import *
from networkx.generators.line import *
from networkx.generators.nonisomorphic_trees import *
from networkx.generators.random_clustered import *
@@ -19,4 +20,3 @@ from networkx.generators.small import *
from networkx.generators.social import *
from networkx.generators.stochastic import *
from networkx.generators.triads import *
-from networkx.generators.joint_degree_seq import *