Merge branch 'master' of github.com:haskell/haskell-platform

Author: gbaz

hptool/hptool.cabal

@@ -55,7 +55,7 @@ Executable hptool
     containers,
     directory,
     hastache >=0.6.0,
-    shake >= 0.14,
+    shake >= 0.14 && < 0.16,
     split,
     text,
     transformers,

website/templates/new-site/download-os-sections.html.mu

@@ -207,8 +207,7 @@ extra-lib-dirs: C:\Program Files\Haskell Platform\{{hpVersion}}\mingw\lib
 extra-include-dirs: C:\Program Files\Haskell Platform\{{hpVersion}}\mingw\include
 </pre>
 Note: cabal config files can contain more than one of each of those lines
-&mdash; no need to replace any existing entries. Additionally, you may
-want to
+&mdash; no need to replace any existing entries. Additionally, you
 should double-check that the version component of the path corresponds to
 your installed platform.
                                     </div></li>