Merge branch 'alvin-master-patch-ab93' into 'master'

Rearrange content so it is more intuitive

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/143460



Merged-by: Jon Glassman <jglassman@gitlab.com>
Approved-by: Jon Glassman <jglassman@gitlab.com>
Co-authored-by: Alvin Gounder <agounder@gitlab.com>