Comment and Tags documentation change