Fix ROOT-6914 and modify doc.