Also remove an extra docstring.

Adding Sandro Tosi to Doc/ACKS for this patch and all his work on the
docs mailing list and on the bug tracker.

R. David Murray and I think that it’s more useful to have these files
show up in the output of “hg status”, to let the user know that some
merged file have to be checked before commit.  If you want to ignore
these files in your clones, it’s possible to do so from another ignore
file; see the bug report for directions.

I’m leaving the .gitignore file alone, as I don’t know how git users
work with merges and conflicts.

given as a low fd, it gets overwritten.

when opening a long file.  With Tk 8.5, the first line was hidden.

Fix closes Issue12576 - fix urlopen behavior on sites which do not send (or obsfuscates) Connection: Close header.

link file name.

I moved the NEWS entry for the reindent fix to the right release section.

I would have put io and ctypes fixes into Extension Modules, but I
respected the choice of Antoine or Victor and left them in Library.

reindent.py now will use the newline detected in the original file and will report an error if mixed newlines are encountered.

with mmap. Patch by Steffen Daode Nurpmeso.

(not a problem under 3.x)

running in verbose mode (`-v` or `-W`), by using the `--failfast`
(or `-G`) option to regrtest.  This is useful with long test suites
such as test_io or test_subprocess.

module: the piped streams can now be properly read from or written to.

(this was broken due to the 2.x to 3.x transition; communicate() support
is still sketchy)

a read1() method), and add an undocumented *write_through* parameter to
mandate unbuffered writes.

* ftpwrapper now uses reference counting to ensure that the underlying socket
  is closed when the ftpwrapper object is no longer in use
* ftplib.FTP.ntransfercmd() now closes the socket if an error occurs

Initial patch by Victor Stinner.