Merge "Corrections to the user guides page"