Merge "Updating document for C++ exception support."