Merge pull request #1243 from mdboom/issue1243

pelson · pelson · commit f38065d87647 · 2012-09-13T14:16:12.000-07:00
Fixed broken doc links
diff --git a/doc/contents.rst b/doc/contents.rst
@@ -8,7 +8,7 @@ Overview
     :Release: |version|
     :Date: |today|
 
-    Download `PDF <http://matplotlib.sf.net/Matplotlib.pdf>`_
+    Download `PDF <Matplotlib.pdf>`_
 
 
 .. toctree::
diff --git a/doc/devel/release_guide.rst b/doc/devel/release_guide.rst
@@ -88,8 +88,7 @@ Packaging
 
 * We have a Makefile for the win32 mingw builds in the mpl source dir
   :file:`release/win32` which you can use this to prepare the windows
-  releases, but this is currently broken for python2.6 as described at
-  http://www.nabble.com/binary-installers-for-python2.6--libpng-segfault%2C-MSVCR90.DLL-and-%09mingw-td23971661.html
+  releases.
 
 .. _release-candidate-testing:
 
diff --git a/doc/faq/howto_faq.rst b/doc/faq/howto_faq.rst
@@ -756,8 +756,10 @@ Cite Matplotlib
 ===============
 
 If you want to refer to matplotlib in a publication, you can use
-"Matplotlib: A 2D Graphics Environment" by J. D. Hunter In Computing in Science &
-Engineering, Vol. 9, No. 3. (2007), pp. 90-95 (see `citeulike <http://www.citeulike.org/user/jabl/article/2878517>`_)::
+"Matplotlib: A 2D Graphics Environment" by J. D. Hunter In Computing
+in Science & Engineering, Vol. 9, No. 3. (2007), pp. 90-95 (see `IEEE
+Xplore
+<http://ieeexplore.ieee.org/xpl/login.jsp?tp=&arnumber=4160265&url=http%3A%2F%2Fieeexplore.ieee.org%2Fxpls%2Fabs_all.jsp%3Farnumber%3D4160265>`_)::
 
   @article{Hunter:2007,
 	  Address = {10662 LOS VAQUEROS CIRCLE, PO BOX 3014, LOS ALAMITOS, CA 90720-1314 USA},
diff --git a/lib/matplotlib/contour.py b/lib/matplotlib/contour.py
@@ -71,7 +71,7 @@ def clabel(self, *args, **kwargs):
         Optional keyword arguments:
 
           *fontsize*:
-            See http://matplotlib.sf.net/fonts.html
+            size in points or relative size eg 'smaller', 'x-large'
 
           *colors*:
             - if *None*, the color of each label matches the color of
diff --git a/lib/matplotlib/dates.py b/lib/matplotlib/dates.py
@@ -86,7 +86,7 @@
       :class:`matplotlib.dates.rrulewrapper`.  The
       :class:`rrulewrapper` is a simple wrapper around a
       :class:`dateutils.rrule` (`dateutil
-      <https://moin.conectiva.com.br/DateUtil>`_) which allow almost
+      <http://labix.org/python-dateutil>`_) which allow almost
       arbitrary date tick specifications.  See `rrule example
       <../examples/pylab_examples/date_demo_rrule.html>`_.
 
@@ -302,13 +302,13 @@ def drange(dstart, dend, delta):
             delta.microseconds/MUSECONDS_PER_DAY)
     f1 = _to_ordinalf(dstart)
     f2 = _to_ordinalf(dend)
-    
+
     num = int(np.ceil((f2-f1)/step))        #calculate the difference between dend and dstart in times of delta
     dinterval_end = dstart + num*delta      #calculate end of the interval which will be generated
     if dinterval_end >= dend:               #ensure, that an half open interval will be generated [dstart, dend)
         dinterval_end -= delta              #if the endpoint is greated than dend, just subtract one delta
         num -= 1
-        
+
     f2 = _to_ordinalf(dinterval_end) #new float-endpoint
     return np.linspace(f1, f2, num+1)
 
