Merge pull request #1245 from apache/DATALAB-2526-update-user-guide-v2.5

[DATALAB-2526] updated user guide v2.5