updating timeline, manpages, release notes
merge commit