merge Ilinca's changes to mine in the doc config