Site updates

1 files changed, 10 insertions, 32 deletions

diff --git a/web/tutorials/faq.markdown b/web/tutorials/faq.markdown
index 41d6848..c0bbd3f 100644
--- a/web/tutorials/faq.markdown
+++ b/web/tutorials/faq.markdown
@@ -10,38 +10,19 @@ author: Jasper Van der Jeugt
         Saw: `Main'
         Expected: `Hakyll'
 
-Is an error encountered on Mac OS when `hakyll.hs` is located on a
-case-insensitive filesystem. A workaround is to rename it to something that
-isn't the name of the module, for example, `site.hs`.
+Is an error encountered on Mac OS when your configuration is named `hakyll.hs`
+and located on a case-insensitive filesystem. A workaround is to rename it to
+something that isn't the name of the module, for example, `site.hs`.
 
-## `pageCompiler`/Hakyll/Pandoc eats my HTML!
+## pandocCompiler/Hakyll/Pandoc eats my HTML!
 
 Sometimes, it can seem that HTML pages are stripped of some arbitrary tags, e.g.
-`<div>`'s. The issue here is that, when using the default `pageCompiler`, your
+`<div>`'s. The issue here is that, when using the default `pandocCompiler`, your
 page passes through Pandoc. Pandoc unfortunately strips away this information,
 giving you the "wrong" HTML.
 
-The solution is not to use `pageCompiler` -- it is very common to write custom
-page processing compiler. The definition of `pageCompiler` is, put simply:
-
-~~~~~{.haskell}
-pageCompiler =
-   readPageCompiler >>>
-   addDefaultFields >>>  -- Sets some things like $path$
-   arr applySelf    >>>  -- Used to fill in $var$s in the page
-   pageRenderPandoc      -- Pass through pandoc
-~~~~~
-
-You can add your own version in your `hakyll.hs` file:
-
-~~~~~{.haskell}
-myPageCompiler =
-   readPageCompiler >>>
-   addDefaultFields >>>  -- Sets some things like $path$
-   arr applySelf          -- Used to fill in $var$s in the page
-~~~~~
-
-And using this instead of `pageCompiler` should solve the issue.
+The solution is not to use `pandocCompiler`, but something simpler like
+`getResourceBody`. This way, your HTML is not touched.
 
 ## Does Hakyll support syntax highlighting?
 
@@ -54,12 +35,9 @@ Pandoc syntax CSS file][syntax-css].
 
 ## When should I rebuild and when should I build?
 
-If you execute a `./hakyll build`, Hakyll will build your site incrementally.
-This means it will be very fast, but it will not pick up _all_ changes.
-
-- In case you edited `hakyll.hs`, you first want to compile it again.
-- It is generally recommended to do a `./hakyll rebuild` before you deploy your
-  site.
+If you execute a `./site build`, Hakyll will build your site incrementally.
+However, we can not detect if you edited `site.hs`. In this case, you first want
+to compile it again `site.hs` again, and then do a `./site rebuild`.
 
 After rebuilding your site, all files will look as "modified" to the filesystem.
 This means that when you upload your site, it will usually transfer all files --