merge jiddef into docs