Merge "docs: Update configuration docs"