merge apidoc changes into master

I've missed it while 2.2.1 release was made. But we need to incorporate all current documentation changes into master before we move to the 2.3 version.
I propose the 2.2.2 version for such changes to be released before 2.3