Hi Stephen, Keith already sent a patch for this, it was a rebase failure :(
The documentation one is intentional - the document is completely out of data, so doctoring around a bit won't help. I'll try to find some time to replace it with a sane new doc that use the ReST stuff to not duplicate the structure.
