Merge branch 'maint'

* maint:
  Force listingblocks to be monospaced in manpages
  Do not expect unlink(2) to fail on a directory.

diff --cc Documentation/asciidoc.conf
Simple merge

diff --cc entry.c
Simple merge