docs; fix incorrect example
Merge branch '3.6.x' into gh-pages
website; regen