Merge documentation updates from 2.2 into c-implementation