Merge "Correct wrong message in configuration doc"