Merge socket doc changes from 3.3