#940: More doc details