How to integrate doc and tutorial coming from opencv_contrib into docs.opencv.org/trunk and questions regarding samples naming conventions (Bug #3560)

Hi,
some of the contrib modules of opencv 2.4.x have been moved to the new opencv_contrib repo for opencv 3.x but their existing doc and tutorial do not appear anymore in the online doc (docs.opencv.org/trunk). Then, how to make it come back ?
I guess it will be activated when the buildfarm will be able to check opencv_contrib. So this would only be a question of project setup that will be solve in some time, but is there a planning about it ?
Then, during this transition (and next) what are the guidelines for contrib developpers ?
=> how to setup tutorials (where to place them ? (in the opencv_contrib/doc/modulename/ folder as it has been done for the bioinspired module tutorial ?) But how to integrate it into the official doc. On individual plateforms, the addition of opencv_contrib with cmake directly targets opencv_contrib/modules folder thus ommiting opencv_contrib/doc ?
=> regarding module samples, how to prepare them ? It would be more convenient if they follow the same name conventions as in the opencv core, for example "cpp-example-mydemo" or "cpp-example-mymodule-mydemo" instead of the current "example_mymodule_mydemo". Currently, samples that are automatically compiled are placed into the opencv_contrib/modules/myModule/sample but sub directories are not considered.

If official guidelines exist, i can describe them in the general readme files to help opencv_contrib developers.
This would help/encourage people propose new methods.
Thanks.

Thanks.