updating some old ajax docs and adding new docs for url scoping
merge remote
resolve hanging merge conflict