Doc patch: provide a pointer to where the list of --with-PROG values is.  Fixes #1512.
Merge remote-tracking branch 'upstream/master'