Hi,
I agree to write the user manual in a gender-neutral way. Let's also remember that "he/she" and "his/her" are not valid solutions, because they leave out non-binary people. It seems to me that both proposed patches are fine and solve the problem. Andrea Monaco