[Python-checkins] r81406 - in python/branches/py3k: Doc/library/hashlib.rst

[georg.brandl]

Author: georg.brandl
Date: Fri May 21 22:28:13 2010
New Revision: 81406

Log:
Merged revisions 81404 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81404 | georg.brandl | 2010-05-21 22:24:45 +0200 (Fr, 21 Mai 2010) | 1 line
  
  #8783: replace link to now dead hash collision FAQ.
........


Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/Doc/library/hashlib.rst

Modified: python/branches/py3k/Doc/library/hashlib.rst
==============================================================================
--- python/branches/py3k/Doc/library/hashlib.rst	(original)
+++ python/branches/py3k/Doc/library/hashlib.rst	Fri May 21 22:28:13 2010
@@ -151,7 +151,7 @@
    http://csrc.nist.gov/publications/fips/fips180-2/fips180-2.pdf
       The FIPS 180-2 publication on Secure Hash Algorithms.
 
-   http://www.cryptography.com/cnews/hash.html
-      Hash Collision FAQ with information on which algorithms have known issues and
+   http://en.wikipedia.org/wiki/Cryptographic_hash_function#Cryptographic_hash_algorithms
+      Wikipedia article with information on which algorithms have known issues and
       what that means regarding their use.