q is much more logical here
Rearrange doc sections
Sync with upstream