Merge "Minor changes to user guide Removal of configguide directory Corrected links"