Merge branch 'master' into production-deployment

.gitlab-ci.yml

@@ -57,7 +57,8 @@ build:
 deploy_prod:
   stage: deploy
   only:
-    - production-deployment
+    - master
+  when: manual
   environment:
     name: production
     url: https://www.stackage.org/

src/Stackage/Database.hs

@@ -352,7 +352,7 @@ addPackage e =
     base = takeBaseName fp
 
     renderContent txt "markdown" = preEscapedToHtml $ commonmarkToHtml
-                                    [optSmart, optSafe]
+                                    [optSmart]
                                     [extTable, extAutolink]
                                     txt
     renderContent txt "haddock" = renderHaddock txt

src/Stackage/Database/Haddock.hs

@@ -10,7 +10,7 @@ import ClassyPrelude.Conduit
 import Text.Blaze.Html (Html, toHtml)
 
 renderHaddock :: Text -> Html
-renderHaddock = hToHtml . Haddock.toRegular . _doc . Haddock.parseParas . unpack
+renderHaddock = hToHtml . Haddock.toRegular . _doc . Haddock.parseParas Nothing . unpack
 
 -- | Convert a Haddock doc to HTML.
 hToHtml :: DocH String String -> Html

stack.yaml

@@ -1,5 +1 @@
-resolver: nightly-2018-06-20
+resolver: lts-13.9
-extra-deps:
-- archive: https://github.com/bitemyapp/esqueleto/archive/b81e0d951e510ebffca03c5a58658ad884cc6fbd.tar.gz
-- archive: https://github.com/snoyberg/githash/archive/be83d64078e7940ce595c5c09efbd8d7d26beff0.tar.gz
-- archive: https://github.com/snoyberg/yesod-gitrev/archive/5364cf7ffa6b49b46173a99a7f1b48de4f660170.tar.gz

templates/home.hamlet

@@ -19,7 +19,20 @@
     <div .row>
         <div .span12>
             <p>
-                Stackage is a stable source of Haskell packages. We guarantee that packages build consistently and pass tests before generating nightly and Long Term Support (LTS) releases.
+                Stackage is a stable source of Haskell packages. It guarantees that packages build consistently and pass tests before generating nightly and Long Term Support (LTS) releases.
+            <p>
+                A Stackage snapshot includes pinned package versions from <a href="https://hackage.haskell.org">Hackage</a> (the index of all Haskell packages in all versions).
+                It is a curated set of packages that work well together, similar to how a <a href="https://www.debian.org">Debian</a> release is a curated snapshot of most of the open-source software in the world.
+            <p>
+                <a href="https://haskellstack.org">Stack</a> is a tool made specifically to make using Stackage snapshots easy and convenient.
+                We recommend you to use it.
+                But you can also use Stackage in other ways: as a source for packages that work well together, or to ensure that Haskell packages you author or care about work well with others.
+            <p>
+                Stackage is a community project: Haskell users around the world work together to create the stable snapshots.
+                <br />
+                Stackage itself and all tools surrounding it are open-source.
+            <p>
+                Stackage's infrastructure, build machines, initial creation and ongoing maintenance, are proudly sponsored by <a href="https://www.fpcomplete.com">FP Complete</a>.
 
     <div .row>
         <div .span6>
@@ -41,17 +54,19 @@
 
             <p>
                 Have more questions? We have a #
-                <a href="https://github.com/fpco/stackage#frequently-asked-questions">FAQ section on Github
+                <a href="https://github.com/fpco/stackage#frequently-asked-questions">FAQ section on Github#
-                .
+                \.
             <h3>
                 Related initiatives
             <p>
-                Get started with using Stackage with our tool called Stack at our
+                Stack is the recommended way to use Stackage.
-                <a href="https://haskell-lang.org/get-started">
+            <p>
-                    Getting Started
+                <a href="https://haskell.fpcomplete.com/get-started">
+                    Get started with Stack
                 on
-                <a href="https://haskell-lang.org/">
+                <a href="https://haskell.fpcomplete.com/">#
-                  haskell-lang.org
+                    haskell.fpcomplete.com#
+                \.
 
             <h3>
                 Latest LTS per GHC version