Shukri: attempt at doc version control issue resolution