merge with 3.4

This commit is contained in:
Georg Brandl 2014-10-29 10:27:06 +01:00
commit 794e9bf1fe
41 changed files with 145 additions and 164 deletions

View file

@ -327,9 +327,9 @@ diffs. For comparing directories and files, see also, the :mod:`filecmp` module.
.. seealso::
`Pattern Matching: The Gestalt Approach <http://www.ddj.com/184407970?pgno=5>`_
`Pattern Matching: The Gestalt Approach <http://www.drdobbs.com/database/pattern-matching-the-gestalt-approach/184407970>`_
Discussion of a similar algorithm by John W. Ratcliff and D. E. Metzener. This
was published in `Dr. Dobb's Journal <http://www.ddj.com/>`_ in July, 1988.
was published in `Dr. Dobb's Journal <http://www.drdobbs.com/>`_ in July, 1988.
.. _sequence-matcher: