docs/6.1.2: cherry-pick docs reorg #412

Closed peterjunpark closed 4 months ago