diff --git a/.gitignore b/.gitignore
index f3cafdcf39..6bcdedc053 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,4 +19,4 @@ tags
/*.iml
/src/highlight.js
/src/style.css
-/doc/_build
+/_site/
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 1d0e0f8c51..aaa3ef504f 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -2,7 +2,7 @@
## Bug Reports
-Before reporting a bug, please ensure that you are using the latest release (currently stack-1.0.2). See the [upgrade instructions](http://docs.haskellstack.org/en/stable/install_and_upgrade.html#upgrade) to upgrade.
+Before reporting a bug, please ensure that you are using the latest release (currently stack-1.0.2). See the [upgrade instructions](http://docs.haskellstack.org/en/stable/install_and_upgrade/#upgrade) to upgrade.
When reporting a bug, please write in the following format:
diff --git a/ChangeLog.md b/ChangeLog.md
index 702ac61d3b..be729f0f29 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -45,7 +45,7 @@ Release notes:
- Arch Linux: Stack has been adopted into the
[official community repository](https://www.archlinux.org/packages/community/x86_64/stack/),
so we will no longer be updating the AUR with new versions. See the
- [install/upgrade guide](http://docs.haskellstack.org/en/stable/install_and_upgrade.html#arch-linux)
+ [install/upgrade guide](http://docs.haskellstack.org/en/stable/install_and_upgrade/#arch-linux)
for current download instructions.
Major changes:
@@ -180,16 +180,16 @@ Release notes:
source code, so please check the links on the website before submitting a PR
to fix them.
* The locations of the
- [Ubuntu](http://docs.haskellstack.org/en/stable/install_and_upgrade.html#ubuntu)
+ [Ubuntu](http://docs.haskellstack.org/en/stable/install_and_upgrade/#ubuntu)
and
- [Debian](http://docs.haskellstack.org/en/stable/install_and_upgrade.html#debian)
+ [Debian](http://docs.haskellstack.org/en/stable/install_and_upgrade/#debian)
package repositories have changed to have correct URL semantics according to
Debian's guidelines
[#1378](https://github.com/commercialhaskell/stack/issues/1378). The old
locations will continue to work for some months, but we suggest that you
adjust your `/etc/apt/sources.list.d/fpco.list` to the new location to avoid
future disruption.
-* [openSUSE and SUSE Linux Enterprise](http://docs.haskellstack.org/en/stable/install_and_upgrade.html#opensuse-suse-linux-enterprise)
+* [openSUSE and SUSE Linux Enterprise](http://docs.haskellstack.org/en/stable/install_and_upgrade/#opensuse-suse-linux-enterprise)
packages are now available, thanks to [@mimi1vx](https://github.com/mimi1vx).
Note: there will be some lag before these pick up new versions, as they are
based on Stackage LTS.
@@ -244,7 +244,7 @@ Major changes:
* GHCJS can now be used with stackage snapshots via the new `compiler` field.
* Windows installers are now available:
- [download them here](http://docs.haskellstack.org/en/stable/install_and_upgrade.html#windows)
+ [download them here](http://docs.haskellstack.org/en/stable/install_and_upgrade/#windows)
[#613](https://github.com/commercialhaskell/stack/issues/613)
* Docker integration works with non-FPComplete generated images
[#531](https://github.com/commercialhaskell/stack/issues/531)
@@ -458,7 +458,7 @@ Major changes:
* Respect TemplateHaskell addDependentFile dependency changes ([#105](https://github.com/commercialhaskell/stack/issues/105))
* TH dependent files are taken into account when determining whether a package needs to be built.
* Overhauled target parsing, added `--test` and `--bench` options [#651](https://github.com/commercialhaskell/stack/issues/651)
- * For details, see [Build commands documentation](http://docs.haskellstack.org/en/stable/build_command.html)
+ * For details, see [Build commands documentation](http://docs.haskellstack.org/en/stable/build_command/)
Other enhancements:
diff --git a/GUIDE.md b/GUIDE.md
deleted file mode 100644
index 819f58b94d..0000000000
--- a/GUIDE.md
+++ /dev/null
@@ -1,8 +0,0 @@
-##### Please Note:
-The __GUIDE__ document has [moved to a new location](http://docs.haskellstack.org/en/stable/GUIDE.html).
-The file you're viewing now remains as a pointer to the new file for a limited time.
-Please update your personal links as needed.
-
-
-*Maintainer note:*
-*This file location was deprecated 2015 September; its planned removal date is 2016 January.*
diff --git a/doc/CONTRIBUTING.html b/doc/CONTRIBUTING.html
new file mode 100644
index 0000000000..0e9ecd428a
--- /dev/null
+++ b/doc/CONTRIBUTING.html
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
+ Page Redirection
+
+
+ If you are not redirected automatically, follow the
+
+
+
+
+ Page Redirection
+
+
+ If you are not redirected automatically, follow the
+
+
+
+
+ Page Redirection
+
+
+ If you are not redirected automatically, follow the
+
+
+
+
+ Page Redirection
+
+
+ If you are not redirected automatically, follow the
+
+
+
+
+
+
+ Page Redirection
+
+
+ If you are not redirected automatically, follow the
+
+
+
+
+ Page Redirection
+
+
+ If you are not redirected automatically, follow the
+
+
+
+
+ Page Redirection
+
+
+ If you are not redirected automatically, follow the
+
+
+
+
+ Page Redirection
+
+
+ If you are not redirected automatically, follow the v documentation".
-#html_title = None
-
-# A shorter title for the navigation bar. Default is the same as html_title.
-#html_short_title = None
-
-# The name of an image file (relative to this directory) to place at the top
-# of the sidebar.
-#html_logo = None
-
-# The name of an image file (within the static path) to use as favicon of the
-# docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32
-# pixels large.
-#html_favicon = None
-
-# Add any paths that contain custom static files (such as style sheets) here,
-# relative to this directory. They are copied after the builtin static files,
-# so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ['_static']
-
-# Add any extra paths that contain custom files (such as robots.txt or
-# .htaccess) here, relative to this directory. These files are copied
-# directly to the root of the documentation.
-#html_extra_path = []
-
-# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
-# using the given strftime format.
-#html_last_updated_fmt = '%b %d, %Y'
-
-# If true, SmartyPants will be used to convert quotes and dashes to
-# typographically correct entities.
-#html_use_smartypants = True
-
-# Custom sidebar templates, maps document names to template names.
-#html_sidebars = {}
-
-# Additional templates that should be rendered to pages, maps page names to
-# template names.
-#html_additional_pages = {}
-
-# If false, no module index is generated.
-#html_domain_indices = True
-
-# If false, no index is generated.
-#html_use_index = True
-
-# If true, the index is split into individual pages for each letter.
-#html_split_index = False
-
-# If true, links to the reST sources are added to the pages.
-#html_show_sourcelink = True
-
-# If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
-#html_show_sphinx = True
-
-# If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
-#html_show_copyright = True
-
-# If true, an OpenSearch description file will be output, and all pages will
-# contain a tag referring to it. The value of this option must be the
-# base URL from which the finished HTML is served.
-#html_use_opensearch = ''
-
-# This is the file name suffix for HTML files (e.g. ".xhtml").
-#html_file_suffix = None
-
-# Language to be used for generating the HTML full-text search index.
-# Sphinx supports the following languages:
-# 'da', 'de', 'en', 'es', 'fi', 'fr', 'hu', 'it', 'ja'
-# 'nl', 'no', 'pt', 'ro', 'ru', 'sv', 'tr'
-#html_search_language = 'en'
-
-# A dictionary with options for the search language support, empty by default.
-# Now only 'ja' uses this config value
-#html_search_options = {'type': 'default'}
-
-# The name of a javascript file (relative to the configuration directory) that
-# implements a search results scorer. If empty, the default will be used.
-#html_search_scorer = 'scorer.js'
-
-# Output file base name for HTML help builder.
-htmlhelp_basename = 'stackdoc'
-
-# -- Options for LaTeX output ---------------------------------------------
-
-latex_elements = {
-# The paper size ('letterpaper' or 'a4paper').
-#'papersize': 'letterpaper',
-
-# The font size ('10pt', '11pt' or '12pt').
-#'pointsize': '10pt',
-
-# Additional stuff for the LaTeX preamble.
-#'preamble': '',
-
-# Latex figure (float) alignment
-#'figure_align': 'htbp',
-}
-
-# Grouping the document tree into LaTeX files. List of tuples
-# (source start file, target name, title,
-# author, documentclass [howto, manual, or own class]).
-latex_documents = [
- (master_doc, 'stack.tex', u'stack Documentation',
- u'Stack contributors', 'manual'),
-]
-
-# The name of an image file (relative to this directory) to place at the top of
-# the title page.
-#latex_logo = None
-
-# For "manual" documents, if this is true, then toplevel headings are parts,
-# not chapters.
-#latex_use_parts = False
-
-# If true, show page references after internal links.
-#latex_show_pagerefs = False
-
-# If true, show URL addresses after external links.
-#latex_show_urls = False
-
-# Documents to append as an appendix to all manuals.
-#latex_appendices = []
-
-# If false, no module index is generated.
-#latex_domain_indices = True
-
-
-# -- Options for manual page output ---------------------------------------
-
-# One entry per manual page. List of tuples
-# (source start file, name, description, authors, manual section).
-man_pages = [
- (master_doc, 'stack', u'stack Documentation',
- [author], 1)
-]
-
-# If true, show URL addresses after external links.
-#man_show_urls = False
-
-
-# -- Options for Texinfo output -------------------------------------------
-
-# Grouping the document tree into Texinfo files. List of tuples
-# (source start file, target name, title, author,
-# dir menu entry, description, category)
-texinfo_documents = [
- (master_doc, 'stack', u'stack Documentation',
- author, 'stack', 'One line description of project.',
- 'Miscellaneous'),
-]
-
-# Documents to append as an appendix to all manuals.
-#texinfo_appendices = []
-
-# If false, no module index is generated.
-#texinfo_domain_indices = True
-
-# How to display URL addresses: 'footnote', 'no', or 'inline'.
-#texinfo_show_urls = 'footnote'
-
-# If true, do not generate a @detailmenu in the "Top" node's menu.
-#texinfo_no_detailmenu = False
-
-source_parsers = {
- '.md': CommonMarkParser,
-}
diff --git a/doc/dependency_visualization.html b/doc/dependency_visualization.html
new file mode 100644
index 0000000000..bb2e61ab07
--- /dev/null
+++ b/doc/dependency_visualization.html
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
+ Page Redirection
+
+
+ If you are not redirected automatically, follow the
+
+
+
+
+ Page Redirection
+
+
+ If you are not redirected automatically, follow the
+
+
+
+
+ Page Redirection
+
+
+ If you are not redirected automatically, follow the If you
-are on Mac OS X 10.11 ("El Capitan") or later, System Integrity Protection
-(a.k.a. "rootless")
-[prevents the `DYLD_LIBRARY_PATH` environment variable from being passed to sub-processes](https://github.com/commercialhaskell/stack/issues/1161).
-The only workaround we are aware of is
-[disabling System Integrity Protection](http://osxdaily.com/2015/10/05/disable-rootless-system-integrity-protection-mac-os-x/):
+If you
+are on Mac OS X 10.11 ("El Capitan") or later, there are upstream issues which
+[prevent the `DYLD_LIBRARY_PATH` environment variable from being passed to GHC](https://github.com/commercialhaskell/stack/issues/1161)
+when System Integrity Protection (a.k.a. "rootless") is enabled. The only
+workaround we are aware of is
+[disabling System Integrity Protection](http://osxdaily.com/2015/10/05/disable-rootless-system-integrity-protection-mac-os-x/).
- 1. Reboot into recovery mode (hold down Cmd-R at boot)
- 2. Open a terminal (select __Terminal__ from the __Utilities__ menu)
- 3. Run `csrutil disable; reboot`
-
-Note that this reduces the security of your system.
+**WARNING: Disabling SIP will severely reduce the security of your system, so only do this if absolutely necessary!**
#### Why do I get a `/usr/bin/ar: permission denied` error?
-On OS X 10.11 ("El Capitan") and
-later, this is
-[caused by System Integrity Protection (a.k.a. "rootless")](https://github.com/commercialhaskell/stack/issues/563).
-GHC 7.10.2 includes a fix, so this only affects users of GHC 7.8.4. If you
+If you are on OS X 10.11 ("El Capitan") or
+later, GHC 7.8.4 is
+[incompatible with System Integrity Protection (a.k.a. "rootless")](https://github.com/commercialhaskell/stack/issues/563).
+GHC 7.10.2 includes a fix, so this only effects users of GHC 7.8.4. If you
cannot upgrade to GHC 7.10.2, you can work around it by
-[disabling System Integrity Protection](#disable-rootless)
+[disabling System Integrity Protection](http://osxdaily.com/2015/10/05/disable-rootless-system-integrity-protection-mac-os-x/).
+
+**WARNING: Disabling SIP will severely reduce the security of your system, so only do this if absolutely necessary!**
#### Why is the `--` argument separator ignored in Windows PowerShell
diff --git a/doc/ghcjs.html b/doc/ghcjs.html
new file mode 100644
index 0000000000..f9fea784f9
--- /dev/null
+++ b/doc/ghcjs.html
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
+ Page Redirection
+
+
+ If you are not redirected automatically, follow the
+
+
+
+
+ Page Redirection
+
+
+ If you are not redirected automatically, follow the
+
+
+
+
+
+
+ Page Redirection
+
+
+ If you are not redirected automatically, follow the
+
+
+
+
+ Page Redirection
+
+
+ If you are not redirected automatically, follow the
+
+
+
+
+ Page Redirection
+
+
+ If you are not redirected automatically, follow the
+
+
+
+
+ Page Redirection
+
+
+ If you are not redirected automatically, follow the
+
+
+
+
+ Page Redirection
+
+
+ If you are not redirected automatically, follow the $(mkRelFile "README.txt")) $ S.concat
@@ -541,7 +541,7 @@ resolvePackageEntry menv projRoot pe = do
subs -> mapM (resolveDir entryRoot) subs
case peValidWanted pe of
Nothing -> return ()
- Just _ -> $logWarn "Warning: you are using the deprecated valid-wanted field. You should instead use extra-dep. See: http://docs.haskellstack.org/en/stable/yaml_configuration.html#packages"
+ Just _ -> $logWarn "Warning: you are using the deprecated valid-wanted field. You should instead use extra-dep. See: http://docs.haskellstack.org/en/stable/yaml_configuration/#packages"
return $ map (, not $ peExtraDep pe) paths
-- | Resolve a PackageLocation into a path, downloading and cloning as
@@ -822,7 +822,7 @@ getDefaultUserConfigPath stackRoot = do
liftIO $ S.writeFile (toFilePath path) $ S.concat
[ "# This file contains default non-project-specific settings for 'stack', used\n"
, "# in all projects. For more information about stack's configuration, see\n"
- , "# http://docs.haskellstack.org/en/stable/yaml_configuration.html\n"
+ , "# http://docs.haskellstack.org/en/stable/yaml_configuration/\n"
, "#\n"
, Yaml.encode (mempty :: Object) ]
return path
diff --git a/src/Stack/Init.hs b/src/Stack/Init.hs
index e3e7f5b2e9..2388552921 100644
--- a/src/Stack/Init.hs
+++ b/src/Stack/Init.hs
@@ -178,7 +178,7 @@ renderStackYaml p ignoredPackages dupPackages =
where
renderObject o =
B.byteString "# This file was automatically generated by stack init\n" <>
- B.byteString "# For more information, see: http://docs.haskellstack.org/en/stable/yaml_configuration.html\n\n" <>
+ B.byteString "# For more information, see: http://docs.haskellstack.org/en/stable/yaml_configuration/\n\n" <>
F.foldMap (goComment o) comments <>
goOthers (o `HM.difference` HM.fromList comments) <>
B.byteString
@@ -251,7 +251,7 @@ getSnapshots' =
$logError ""
$logError "You can try again, or create your stack.yaml file by hand. See:"
$logError ""
- $logError " http://docs.haskellstack.org/en/stable/yaml_configuration.html"
+ $logError " http://docs.haskellstack.org/en/stable/yaml_configuration/"
$logError ""
$logError $ "Exception was: " <> T.pack (show e)
error ""
diff --git a/src/Stack/Setup.hs b/src/Stack/Setup.hs
index 0d5407b6e7..130ec7eaeb 100644
--- a/src/Stack/Setup.hs
+++ b/src/Stack/Setup.hs
@@ -158,7 +158,7 @@ instance Show SetupException where
[ "The GHC located at "
, toFilePath ghc
, " failed to compile a sanity check. Please see:\n\n"
- , " http://docs.haskellstack.org/en/stable/install_and_upgrade.html\n\n"
+ , " http://docs.haskellstack.org/en/stable/install_and_upgrade/\n\n"
, "for more information. Exception was:\n"
, show e
]
diff --git a/src/Stack/Types/Config.hs b/src/Stack/Types/Config.hs
index d9b70125ef..31a347ff85 100644
--- a/src/Stack/Types/Config.hs
+++ b/src/Stack/Types/Config.hs
@@ -1109,7 +1109,7 @@ instance Show ConfigException where
, toFilePath configFile
, "':\n"
, show exception
- , "\nSee http://docs.haskellstack.org/en/stable/yaml_configuration.html."
+ , "\nSee http://docs.haskellstack.org/en/stable/yaml_configuration/."
]
show (ParseResolverException t) = concat
[ "Invalid resolver value: "