Updated documentation in SUREFIRE-1047 and SUREFIRE-1097