Sylvia/docs/doc 1029

@catong Please review.