Merge "Fix doc config files and dead links"