Final changes to the comp guide for v4
Merge pull request #5615 from nhr/final_comp_guide_changes

Merged by openshift-bot