Merge string formatting doc fixes from 3.5