As far as I can tell (by quickly looking over the changes; I'll probably look over it more closely at a later time) it seems to be fine. I did notice some places where spaces have gone missing (e.g. "in<tt>makefile.inc</tt>"), so you might want to check those.
Feel free to just update the original and thanks for taking the time to make things better.
Also, I guess I'm responsible for your confusion, so sorry for that.
