diff options
| author | Jasper Van der Jeugt <m@jaspervdj.be> | 2013-02-10 21:51:50 +0100 |
|---|---|---|
| committer | Jasper Van der Jeugt <m@jaspervdj.be> | 2013-02-10 21:51:50 +0100 |
| commit | 46168382f170b4559ce266b8257b7b7988589ed1 (patch) | |
| tree | 96a7e8b601e8ec1c4ad38e7e6c6cc05d955a654b | |
| parent | 86d0b68aed6e82fd4a6c935ce6113937023f6e6b (diff) | |
| parent | e93753d425520447bcbd6bae1f9067049e4b0260 (diff) | |
| download | hakyll-46168382f170b4559ce266b8257b7b7988589ed1.tar.gz | |
Merge branch 'master' into dev-provider-rewrite
| -rw-r--r-- | hakyll.cabal | 4 | ||||
| -rw-r--r-- | web/tutorials/01-installation.markdown | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/hakyll.cabal b/hakyll.cabal index c143929..5dce405 100644 --- a/hakyll.cabal +++ b/hakyll.cabal @@ -95,7 +95,7 @@ Library directory >= 1.0 && < 1.3, filepath >= 1.0 && < 1.4, http-conduit >= 1.8 && < 1.9, - http-types >= 0.7 && < 0.8, + http-types >= 0.7 && < 0.9, lrucache >= 1.1.1 && < 1.2, mtl >= 1 && < 2.2, old-locale >= 1.0 && < 1.1, @@ -193,7 +193,7 @@ Test-suite hakyll-tests directory >= 1.0 && < 1.3, filepath >= 1.0 && < 1.4, http-conduit >= 1.8 && < 1.9, - http-types >= 0.7 && < 0.8, + http-types >= 0.7 && < 0.9, lrucache >= 1.1.1 && < 1.2, mtl >= 1 && < 2.2, old-locale >= 1.0 && < 1.1, diff --git a/web/tutorials/01-installation.markdown b/web/tutorials/01-installation.markdown index 1a48013..2066886 100644 --- a/web/tutorials/01-installation.markdown +++ b/web/tutorials/01-installation.markdown @@ -32,8 +32,9 @@ started: $ hakyll-init my-site -If `hakyll-init` is not found, you should make sure `$HOME/.cabal/bin` is in -your `$PATH`. +This creates a folder `my-site` in the current directory, with some example +content and a generic configuration. If `hakyll-init` is not found, you should +make sure `$HOME/.cabal/bin` is in your `$PATH`. The file `site.hs` holds the configuration of your site, as an executable haskell program. We can compile and run it like this: |