[commit: packages/Cabal] ghc-head: Merge pull request #1427 from 23Skidoo/extra-haddock-files (069e190)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/Cabal

On branch  : ghc-head
Link       : http://git.haskell.org/?p=packages/Cabal.git;a=commit;h=069e190015cf6adeccbea125078c5a90fe4120d6

>---------------------------------------------------------------

commit 069e190015cf6adeccbea125078c5a90fe4120d6
Merge: 2475a17 4502e90
Author: Mikhail Glushenkov <mikhail.glushenkov at gmail.com>
Date:   Wed Aug 21 02:03:59 2013 -0700

    Merge pull request #1427 from 23Skidoo/extra-haddock-files
    
    Rename 'extra-html-files' to 'extra-doc-files'.



>---------------------------------------------------------------

069e190015cf6adeccbea125078c5a90fe4120d6
 Cabal/Distribution/PackageDescription.hs       |    4 ++--
 Cabal/Distribution/PackageDescription/Check.hs |   10 +++++-----
 Cabal/Distribution/PackageDescription/Parse.hs |    4 ++--
 Cabal/Distribution/Simple/Haddock.hs           |    2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)