[merge][#249908] avoid bad text wrapping when generating documentation

[Ian Clatworthy]

Ian Clatworthy has voted tweak.
Status is now: Conditionally approved
Comment:
'make docs' is broken by the moved script. Otherwise, this looks good 
(but I can't check the overall result easily till 'make docs' works).

For details, see: 
http://bundlebuggy.aaronbentley.com/project/bzr/request/%3Ce01316480903232138n34d2e189w71e7e8ee1f7e255a%40mail.gmail.com%3E
Project: Bazaar