[commit: haddock] 2.17.3.1-spanfix, alexbiehl-patch-1, ghc-8.0, ghc-8.0-facebook, ghc-head, ghc-head1, haddock-quick, headdock-library-1.4.5, ie_avails, master, pr-filter-maps, pr/cabal-desc, travis, v2.17, v2.17.3, v2.18, wip-located-module-as, wip/D2418, wip/T12105, wip/T12105-2, wip/T12942, wip/T13163, wip/T14529, wip/T3384, wip/embelleshed-rdr, wip/new-tree-one-param, wip/rae, wip/remove-frames, wip/remove-frames1, wip/revert-ttg-2017-11-20, wip/ttg-2017-10-13, wip/ttg-2017-10-31, wip/ttg-2017-11-06, wip/ttg2-2017-11-10, wip/ttg3-2017-11-12, wip/ttg4-constraints-2017-11-13, wip/ttg6-unrevert-2017-11-22: Revert "doc: Vendorize alabaster Sphinx theme" (2c603c3)

git at git.haskell.org git at git.haskell.org
Tue Nov 28 11:46:27 UTC 2017


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

On branches: 2.17.3.1-spanfix,alexbiehl-patch-1,ghc-8.0,ghc-8.0-facebook,ghc-head,ghc-head1,haddock-quick,headdock-library-1.4.5,ie_avails,master,pr-filter-maps,pr/cabal-desc,travis,v2.17,v2.17.3,v2.18,wip-located-module-as,wip/D2418,wip/T12105,wip/T12105-2,wip/T12942,wip/T13163,wip/T14529,wip/T3384,wip/embelleshed-rdr,wip/new-tree-one-param,wip/rae,wip/remove-frames,wip/remove-frames1,wip/revert-ttg-2017-11-20,wip/ttg-2017-10-13,wip/ttg-2017-10-31,wip/ttg-2017-11-06,wip/ttg2-2017-11-10,wip/ttg3-2017-11-12,wip/ttg4-constraints-2017-11-13,wip/ttg6-unrevert-2017-11-22
Link       : http://git.haskell.org/haddock.git/commitdiff/2c603c39a2b1c40431f8f6d9b7b12976311913db

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

commit 2c603c39a2b1c40431f8f6d9b7b12976311913db
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Mon May 16 18:59:08 2016 +0200

    Revert "doc: Vendorize alabaster Sphinx theme"
    
    This ended up causes far too many issues to be worthwhile. We'll just
    have to live with inconsistent haddock documentation.
    
    This reverts commit cec21957001143794e71bcd9420283df18e7de40.


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

2c603c39a2b1c40431f8f6d9b7b12976311913db
 .gitmodules   | 3 ---
 doc/alabaster | 1 -
 doc/conf.py   | 1 -
 3 files changed, 5 deletions(-)

diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index ac3559d..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule "doc/alabaster"]
-	path = doc/alabaster
-	url = git://github.com/bitprophet/alabaster.git
diff --git a/doc/alabaster b/doc/alabaster
deleted file mode 160000
index aabda11..0000000
--- a/doc/alabaster
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit aabda1182083d21b6d9bafb53ea8a99eb4be4cf0
diff --git a/doc/conf.py b/doc/conf.py
index 6e73eb5..d6b8bda 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -29,7 +29,6 @@ pygments_style = 'tango'
 
 # -- Options for HTML output ----------------------------------------------
 
-html_theme_path = ['./alabaster']
 html_theme = 'alabaster'
 htmlhelp_basename = 'Haddockdoc'
 



More information about the ghc-commits mailing list