haddock21.diff docarch.diff