Merge pull request #910 from hagberg/credits-news-release

API changes, update news
networkx · Jul 22, 2013 · 067b778 · 067b778
2 parents 3a5448c + 33a9b0a
commit 067b778
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/doc/source/reference/api_1.8.rst b/doc/source/reference/api_1.8.rst
@@ -9,6 +9,8 @@ http://groups.google.com/group/networkx-discuss .
 
 * Laplacian functions now all return matrices.  To get a numpy array from a matrix use L = nx.laplacian_matrix(G).A
 
-* Cycles
+* is_directed_acyclic_graph() now returns false on undirected graphs (instead of raising exception)
+
+* cycles returned from simple_cycles() do not include repeated last node
 
 
diff --git a/doc/source/reference/api_changes.rst b/doc/source/reference/api_changes.rst
@@ -5,6 +5,7 @@ API changes
 .. toctree::
    :maxdepth: 2
 
+   api_1.8
    api_1.7
    api_1.6
    api_1.5

diff --git a/doc/source/reference/news.rst b/doc/source/reference/news.rst
@@ -4,8 +4,6 @@
 Release Log
 ===========
 
-<<<<<<< HEAD
-
 Networkx-1.8
 ------------
 Release date:  xx July 2013