I think the problem is that the removal of the & is done regardless of whether the docs have been rebuilt or not. So if docs-site is re-run, too many & sequences may be removed.
The simple way round this is to recreate the html files each time, as it's not trivial to detect which files have been recreated. Note that this only affects the removal of &; the EOL and </br> fixes can be safely re-applied. The current (trunk) docs don't have this issue as the & does not need to be removed.
