Fixing typos

[mb720]

Hi and thanks a lot for your work on Scala.js!

Reading through the chapter "ClientServer" of your great book, I found a couple of small typos which I tried to fix.

Best, Matthias

[mb720]

Added some more corrections.

[adamvoss]

Merged by 3e85992a32bc12ba94beffb23aa58e2b2ad29486 in #43

@mb720 I think you may not have the e-mail address you used on the commits from your PR registered with GitHub because it is not associating the rebased commit of these changes with your GitHub user. Sorry about that.

[mb720]

Is there something I can do to get these fixes merged? The website still contains the addressed typos.

[qayshp]

I'm not a committer but my first suggestion would be addressing the merge conflicts so it can be merged easily.

[mb720]

Sure, I can do that. But when I committed those changes last year there weren't any merge conflicts.

I'm just worried that I'll do the same work twice and having some other problem (that I don't know of) keeping the changes from being merged.

[sjrd]

I think this PR initially came at a time I took over the reviewing/merging of PRs in this repo, and I probably didn't go over old PRs at the time.

If you could rebase and squash all your commits together with a nice commit message, I'll merge.

[sjrd]

Hum @mb720 You merged instead of rebasing. You can easily fix it as follows:

$ git fetch upstream  % or whatever you called the 'remote' for the upstream repo
$ git checkout master  % make sure you are on your master branch
$ git reset upstream/master  % forget everything about the *history*, but keep the local files
$ git diff  % should show exactly your changes wrt. master (IF THAT'S NOT RIGHT, STOP RIGHT THERE AND ASK FOR HELP)
$ git add -u
$ git commit
[...] Write a nice commit message
$ git push -f origin master  % force-push your branch

[mb720]

Thanks @sjrd, I made the requested changes and squashed the commits as instructed.

[sjrd]

Thanks.