upstream merge of rsyncable support words man page differently