doc: re-added all changes wiped away by merge

All changes in the previous commits, consolidated location,
adding periods, putting notes together were wiped away by my
clumsy merge. Redid them all!

Author: indranil