Change completion text for consistency
Add explanation for some diff options

These were previously marked as 'undocumented'
Move me to remove TODOs
Remove deprecated option