-I developed the HTML/Javascript front end. It's built on Afterquery, but is very heavily forked from it now. Todd T is developing the back end.
+I developed the HTML/Javascript front end. It's built on {link: https://github.com/apenwarr/afterquery Afterquery}, but is very heavily forked from it now. Todd T is developing the back end.
 
-Tracking ticket: https://htcondor-wiki.cs.wisc.edu/index.cgi/tktview?tn=5351
+The code is on the master branch, in the "view" subdirectory.
 
-If it's not yet merged into the main tree, you can find the development tree at /afs/cs.wisc.edu/u/a/d/adesmet/public/html/view . It's a Git repository.
+While the entire history should be in the master branch, if you want access to the original Git repo it was developed in, see /afs/cs.wisc.edu/u/a/d/adesmet/public/html/view .
 
-"Upstream" at the moment is https://github.com/AlanDeSmet/afterquery ; it's where I've been trying to break things into small pieces in homes of getting them merged into the ultimate upstream at https://github.com/apenwarr/afterquery .  _It does not include everything in the local git repo_ (nor, probably, should it, as the local repo is expected to be very HTCondor specific). As of February 1, 2016, no pull requests have been accepted or acknowledged.
+Tracking ticket: https://htcondor-wiki.cs.wisc.edu/index.cgi/tktview?tn=5351
 
-TODO: Merge into main code base?
+"Upstream" at the moment is https://github.com/AlanDeSmet/afterquery ; it's where I've been trying to break things into small pieces in homes of getting them merged into the ultimate upstream at https://github.com/apenwarr/afterquery .  _It does not include everything in the local git repo_ (nor, probably, should it, as the local repo is expected to be very HTCondor specific). As of February 1, 2016, no pull requests have been accepted or acknowledged.