docs; fix examples

fixes #1583
Merge branch '3.6.x' into gh-pages
website; regen