on master help sign in
Small fixes
commit918ed3c3fab736bb6b3b72724bdcb07e33d87a0b authorJasper Van der Jeugt <m@jaspervdj.be> dateSun 16 Dec 2012, 10:05 (14 years ago) parent8a8dade
2 files changed+6−6
web/site.hs+2−2 web/tutorials/03-rules-routes-compilers.markdown+4−4
web/site.hs+2−2
@@ -21,14 +21,14 @@ main = hakyllWith config $ do
2121 -- Pages
2222 match "*.markdown" $ do
2323 route $ setExtension "html"
24− compile $ pageCompiler
24+ compile $ pandocCompiler
2525 >>= loadAndApplyTemplate "templates/default.html" defaultContext
2626 >>= relativizeUrls
2727
2828 -- Tutorials
2929 match "tutorials/*" $ do
3030 route $ setExtension "html"
31− compile $ pageCompilerWith defaultHakyllParserState withToc
31+ compile $ pandocCompilerWith defaultHakyllParserState withToc
3232 >>= loadAndApplyTemplate "templates/tutorial.html" defaultContext
3333 >>= loadAndApplyTemplate "templates/default.html" defaultContext
3434 >>= relativizeUrls
web/tutorials/03-rules-routes-compilers.markdown+4−4
@@ -37,7 +37,7 @@ match "css/*" $ do
3737```
3838
3939This is a declarative DSL: the order in which you write the rules make little
40−difference: Hakyll will use dependency tracking to determine the correct order.
40+difference, Hakyll will use dependency tracking to determine the correct order.
4141
4242We group the different rules using `match`. The first argument for `match` is a
4343[Pattern]. The `OverloadedStrings` extension allows us to just write `String`s
@@ -53,11 +53,11 @@ The `route` function is used for determining the output file. For example, you
5353probably want to write the processed contents of `contact.markdown` to
5454`_site/contact.html` and not `_site/contact.markdown`.
5555
56−`idRoute` is a commonly used and just keeps the filename. We use this for e.g.
57−the images and CSS files.
56+`idRoute` is a commonly used route and just keeps the filename. We use this for
57+e.g. the images and CSS files.
5858
5959`setExtension` is another common route which takes a single argument: the
60−extension of the resulting file. In order to route `contact.markdown` to
60+desired extension of the resulting file. In order to route `contact.markdown` to
6161`_site/contact.html`, use:
6262
6363```haskell