Comment 6 for bug 249908

I was going to use break_on_hyphens=False, but that doesn't work in python2.5 which is still supported by bzr. With that removed, this patch passes on 2.5 and 2.4 so I'm going to send it in.

The state now is that there are no syntax errors, and the output in the user reference looks OK, except for some arguments to check. I'll see if they can be tweaked.