doc updates
Merge branch 'discovery'