I tried to only merge what makes sense for us, there is still quite some cleanup needed, this commit tries to preserve the 2.5 manual as much as possible while still keeping the rare new stuff from pro.