simplify a bit by removing office slug
Merge doc changes made on github