Merge "Fix documentation for channel types" into nyc-dev