commit: Merge in pkg-docs. Fix up ChangeLog.