Add TODO and remove broken patch
Apply the desired patch against the man-pages' root directory
Remove superfluous lines
Merge branch 'py-terminator'