diff options
| author | samgd <sam@samgd.com> | 2016-07-25 18:24:12 +0200 |
|---|---|---|
| committer | samgd <sam@samgd.com> | 2016-07-25 18:24:12 +0200 |
| commit | 11ef948720fab551173852e0f67da04990171433 (patch) | |
| tree | 94ecc6eaacc50eb019f03299f3abba393d55d8a7 /web/tutorials | |
| parent | 82d6402ba38b9e1ea789e83c5ea7d08bcbeff467 (diff) | |
| parent | 68e9c7704216f88b73162963c06ef80616ff318a (diff) | |
| download | hakyll-11ef948720fab551173852e0f67da04990171433.tar.gz | |
Fix merge conflicts
Diffstat (limited to 'web/tutorials')
| -rw-r--r-- | web/tutorials/01-installation.markdown | 4 | ||||
| -rw-r--r-- | web/tutorials/external-live-reload.md | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/web/tutorials/01-installation.markdown b/web/tutorials/01-installation.markdown index a8ffc00..b8dff9b 100644 --- a/web/tutorials/01-installation.markdown +++ b/web/tutorials/01-installation.markdown @@ -32,13 +32,13 @@ content and a generic configuration. If `hakyll-init` is not found, you should make sure your stack bin path (usually `$HOME/.local/bin`) is in your `$PATH`. You can check your stack local -bin path by running `stack path --local-bin-path`. +bin path by running `stack path --local-bin`. The file `site.hs` holds the configuration of your site, as an executable haskell program. We can compile and run it like this: $ cd my-site - $ stack init # Optional, if you haven't used stack before + $ stack init # creates stack.yaml file based on my-site.cabal $ stack build $ stack exec site build diff --git a/web/tutorials/external-live-reload.md b/web/tutorials/external-live-reload.md new file mode 100644 index 0000000..38f1c96 --- /dev/null +++ b/web/tutorials/external-live-reload.md @@ -0,0 +1,6 @@ +--- +title: Live Reloading with Hakyll +author: Ben Kolera +url: 'http://benkolera.com/posts/2015-09-14-hakyll_livereload.html' +external: true +--- |