From 223a86e2f7bcf83e0e1e45cea82300a9ed7b9219 Mon Sep 17 00:00:00 2001 From: Alec Theriault Date: Fri, 26 Oct 2018 09:02:35 -0700 Subject: User manual + stuff for building GHC docs --- doc/invoking.rst | 6 +++--- ghc.mk | 15 ++++++++++----- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/doc/invoking.rst b/doc/invoking.rst index acdba9bd..3e6e667a 100644 --- a/doc/invoking.rst +++ b/doc/invoking.rst @@ -295,7 +295,7 @@ The following options are available: reader can switch between themes with browsers that support alternate style sheets, or with the "Style" menu that gets added when the page is loaded. If no themes are specified, then just the - default built-in theme ("Ocean") is used. + default built-in theme ("NewOcean") is used. The path parameter can be one of: @@ -307,11 +307,11 @@ The following options are available: - A *CSS file*: The base name of the file becomes the name of the theme. - - The *name* of a built-in theme ("Ocean" or "Classic"). + - The *name* of a built-in theme ("NewOcean", "Ocean", or "Classic"). .. option:: --built-in-themes - Includes the built-in themes ("Ocean" and "Classic"). Can be + Includes the built-in themes ("NewOcean", "Ocean", and "Classic"). Can be combined with :option:`--theme`. Note that order matters: The first specified theme will be the default. diff --git a/ghc.mk b/ghc.mk index 4bcc4b18..a10fd61a 100644 --- a/ghc.mk +++ b/ghc.mk @@ -40,11 +40,16 @@ utils/haddock_dist_DATA_FILES += html/Classic.theme/haskell_icon.gif utils/haddock_dist_DATA_FILES += html/Classic.theme/minus.gif utils/haddock_dist_DATA_FILES += html/Classic.theme/plus.gif utils/haddock_dist_DATA_FILES += html/Classic.theme/xhaddock.css -utils/haddock_dist_DATA_FILES += html/Ocean.std-theme/hslogo-16.png -utils/haddock_dist_DATA_FILES += html/Ocean.std-theme/minus.gif -utils/haddock_dist_DATA_FILES += html/Ocean.std-theme/ocean.css -utils/haddock_dist_DATA_FILES += html/Ocean.std-theme/plus.gif -utils/haddock_dist_DATA_FILES += html/Ocean.std-theme/synopsis.png +utils/haddock_dist_DATA_FILES += html/Ocean.theme/hslogo-16.png +utils/haddock_dist_DATA_FILES += html/Ocean.theme/minus.gif +utils/haddock_dist_DATA_FILES += html/Ocean.theme/ocean.css +utils/haddock_dist_DATA_FILES += html/Ocean.theme/plus.gif +utils/haddock_dist_DATA_FILES += html/Ocean.theme/synopsis.png +utils/haddock_dist_DATA_FILES += html/NewOcean.std-theme/hslogo-16.png +utils/haddock_dist_DATA_FILES += html/NewOcean.std-theme/minus.gif +utils/haddock_dist_DATA_FILES += html/NewOcean.std-theme/new-ocean.css +utils/haddock_dist_DATA_FILES += html/NewOcean.std-theme/plus.gif +utils/haddock_dist_DATA_FILES += html/NewOcean.std-theme/synopsis.png utils/haddock_dist_DATA_FILES += html/solarized.css utils/haddock_dist_DATA_FILES += html/highlight.js utils/haddock_dist_DATA_FILES += latex/haddock.sty -- cgit v1.2.3