Merge "Typos and consistency in configuration.rst"