Merge our changes; the directory structure got changed.
Changes are too large for here, see changelog.

add the texinfo manual