DOC: Use official MATLAB spelling in numpy-for-matlab-users.rst

[cooperrc]

There is a current PR #17159, where we (@eric-wieser @melissawm @bjnath @seberg) are updating the numpy-for-matlab-users.rst guide.

Comment suggested updating the copytright (R) symbols as per MATLAB's suggested use:

@bjnath:

MathWorks says

use the relevant trademark symbol to mark the first occurrences

and

The word MATLAB®should appear in all capital letters.

[cooperrc]

@melissawm and @eric-wieser that was a good idea to catch the case as well as the (R) symbols.

Current commit 233d281 updates all Matlab and matlab to MATLAB

[melissawm]

Thanks, @cooperrc ! I'm just not sure what's going on with the CI...

[cooperrc]

Thanks, @cooperrc ! I'm just not sure what's going on with the CI...

I'm not sure either. Its odd that the checks were having trouble.

[seberg]

Thanks Ryan, circleci is happy, so all good!

[bjnath]

Will there now be merge conflicts with #17159, where many changed lines include the 'matlab' string in its various forms?

[seberg]

Oh, yeah :(, that is probably an annoying merge conflict there

[eric-wieser]

It should be an easy conflict to solve, since @cooperrc authored both PRs. Keeping the version of the file as it is in #17159 should work just fine.

[eric-wieser]

git rebase -Xtheirs origin/master should do the trick there

[cooperrc]

git rebase -Xtheirs origin/master should do the trick there

@eric-wieser, should I run this, then push the changes?

[eric-wieser]

Yes, I think so.You'll I'd recommend running git tag just-in-case-i-break-it before hand, for eponymous reasons. So overally

git pull origin  # get any changes from the other PR made in the web version
git fetch upstream  # or whatever you called this repo
git tag just-in-case-i-break-it
git rebase -Xtheirs upstream/master
git push origin -f

[cooperrc]

OK, its been done. First glance looks ok. I was nervous with the -f option in a push.

Thanks @eric-wieser!