leifj/macedir-entity-category — pull request #2 by iay (2012-03-27 18:44:01+00:00)
Title: Semantics

This is my promised revision. It has turned out to be pretty much a complete rewrite, so I have demoted you to editor ;-)

I admit to being somewhat confused as to the correct use of git and github at this point. I merged the changes you took from me, plus your latest ones, back into my repository using the "fork queue" mechanism, but now my new branch seems to include some of those commits *again*. This may be because I only sent you the .xml file and not the other two. I've included all three this time to see if that puts us back on an even keel.

Anyway, if you look at the diffs on the .xml file you'll see that it is basically "everything". I have left some unresolved issues enclosed in double-brackets (`[[`...`]]`), so it's actually almost easiest to just look at the HTML output. To that end, I have uploaded a copy of the HTML to a temporary location here:

http://dl.dropbox.com/u/236274/2012-03-27.html

I think this bunch of changes might well be a little more controversial than the first lot, so I'm not really expecting you to just take this as-is. Of course I am looking forward to figuring out how to make github handle the case where I edit and resubmit ;-)