Merge "Correct return codes in documentation"