Merge pull request #2104 from douglaz/docs_fixes_channel