I'm sending a version 2 to clean lint errors (badly configured emacs) + fix some random typo in the manual patch. I hope this will pass the qa test.