PYTHONY2K is long gone. Remove traces from the docs and manpage.
merge with 3.4