updated contrib/man from master