Merge a3a440a into c566642

doc/Makefile

@@ -124,5 +124,5 @@ gh-pages: clean html
 
 gitwash-update:
 	python gitwash_dumper.py source/developer networkx \
-       --project-url=http://networkx.github.com \
-       --project-ml-url=http://groups.google.com/group/networkx-devel/
+       --project-url=http://networkx.github.io \
+       --project-ml-url=http://groups.google.com/group/networkx-discuss/

doc/source/bibliography.rst

@@ -49,7 +49,7 @@ Bibliography
 
 .. [Newman03] M.E.J. Newman, "The Structure and Function of Complex
    Networks", SIAM Review, 45, pp. 167-256, 2003. 
-   :url:`http://epubs.siam.org/sam-bin/dbq/article/42480`
+   :url:`http://epubs.siam.org/doi/abs/10.1137/S003614450342480`
 
 .. [Sedgewick02] R. Sedgewick, "Algorithms in C: Parts 1-4: 
    Fundamentals, Data Structure, Sorting, Searching", Addison Wesley

doc/source/developer/gitwash/this_project.inc

@@ -1,5 +1,5 @@
 .. networkx
-.. _`networkx`: http://networkx.github.com
+.. _`networkx`: http://networkx.github.io
 .. _`networkx github`: http://github.com/networkx/networkx
 
-.. _`networkx mailing list`: http://groups.google.com/group/networkx-devel/
+.. _`networkx mailing list`: http://groups.google.com/group/networkx-discuss/

doc/source/reference/credits.rst

@@ -84,3 +84,9 @@ Thanks especially to the following contributors:
  - Nick Mancuso wrote the approximation algorithms for dominating set,
    edge dominating set, independent set, max clique, and min-weighted
    vertex cover.
+ - Brian Cloteaux contributed the linear-time graphicality tests and Havel-Hakimi graph generators
+ - Alejandro Weinstein contributed the directed Laplacian code
+ - Dustin Smith wrote the dictionary to numpy array function
+ - Mathieu Larose sped up the topological sort code
+ - Vincent Gauthier contributed the Katz centrality algorithm
+ - Sérgio Nery Simões developed the code for finding all simple paths

doc/source/reference/news.rst

@@ -4,6 +4,28 @@
 Release Log
 ===========
 
+
+Networkx-1.8
+------------
+Release date:  xx July 2013
+
+Highlights
+~~~~~~~~~~
+- Faster (linear-time) graphicality tests and Havel-Hakimi graph generators
+- Directed Laplacian matrix generator
+- Katz centrality algorithm
+- Generator for all simple paths
+- Many bug fixes and other improvements.
+
+For full details of the issues closed for this release (added features and bug fixes) see:
+https://github.com/networkx/networkx/issues?milestone=1&state=closed
+
+
+API Changes
+~~~~~~~~~~~
+See :doc:`api_1.8`
+
+
 Networkx-1.7
 ------------
 Release date:  4 July 2012
@@ -276,7 +298,7 @@ add_nodes_from now accepts (node,attrdict) two-tuples
 
 Examples
 ~~~~~~~~
- - `Mayvi2 drawing <http://networkx.lanl.gov/examples/drawing/mayavi2_spring.html>`_
+ - `Mayvi2 drawing <http://networkx.github.io/documentation/latest/examples/3d_drawing/mayavi2_spring.html>`_
  - `Blockmodel <http://networkx.lanl.gov/examples/algorithms/blockmodel.html>`_
  - `Sampson's monastery <http://networkx.lanl.gov/examples/drawing/sampson.html>`_
  - `Ego graph <http://networkx.lanl.gov/examples/drawing/ego_graph.html>`_

doc/source/tutorial/tutorial.rst

@@ -451,7 +451,7 @@ Note that you may need to issue a Matplotlib
 >>> plt.show() 
 
 command if you are not using matplotlib in interactive mode: (See 
-`Matplotlib FAQ <http://matplotlib.sourceforge.net/faq/installing_faq.html#matplotlib-compiled-fine-but-nothing-shows-up-with-plot>`_
+`Matplotlib FAQ <http://matplotlib.org/faq/installing_faq.html#matplotlib-compiled-fine-but-nothing-shows-up-when-i-use-it>`_
 )
 
 To save drawings to a file, use, for example

networkx/release.py

@@ -206,7 +206,7 @@ def get_info(dynamic=True):
 
 ## Declare current release as a development release.
 ## Change to False before tagging a release; then change back.
-dev = True
+dev = False
 
 
 description = "Python package for creating and manipulating graphs and networks"

networkx/utils/random_sequence.py

@@ -118,7 +118,6 @@ def zipf_rv(alpha, xmin=1, seed=None):
     ----------
     ..[1] Luc Devroye, Non-Uniform Random Variate Generation, 
        Springer-Verlag, New York, 1986.
-       http://cg.scs.carleton.ca/~luc/rnbookindex.html
     """
     if xmin < 1:
         raise ValueError("xmin < 1")