summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJasper Van der Jeugt <jaspervdj@gmail.com>2013-04-29 06:48:38 -0700
committerJasper Van der Jeugt <jaspervdj@gmail.com>2013-04-29 06:48:38 -0700
commit553350a5c8f902b79f9e717d5eddc28767e4e0fb (patch)
treec1c604e4309a979095ed1b4b23e04eaf37d22b21
parent64d3802921b32a5df2eb49c00c32dde37e6adf62 (diff)
parentfe88175e40daf7e7ce530fb78a2919a93e540c7d (diff)
downloadhakyll-553350a5c8f902b79f9e717d5eddc28767e4e0fb.tar.gz
Merge pull request #138 from christopheryoung/master
Documentation tweaks: two small typos and $PATH variable documentation for OS X
-rw-r--r--src/Hakyll/Web/Tags.hs2
-rw-r--r--web/tutorials/01-installation.markdown15
2 files changed, 13 insertions, 4 deletions
diff --git a/src/Hakyll/Web/Tags.hs b/src/Hakyll/Web/Tags.hs
index bfa83e6..0fa182c 100644
--- a/src/Hakyll/Web/Tags.hs
+++ b/src/Hakyll/Web/Tags.hs
@@ -16,7 +16,7 @@
-- > its populations have been damaged greatly by Nuclear...
--
-- To use categories, use the 'buildCategories' function. Categories are
--- determined by the direcetory a page is in, for example, the post
+-- determined by the directory a page is in, for example, the post
--
-- > posts/coding/2010-01-28-hakyll-categories.markdown
--
diff --git a/web/tutorials/01-installation.markdown b/web/tutorials/01-installation.markdown
index 2066886..fcf9055 100644
--- a/web/tutorials/01-installation.markdown
+++ b/web/tutorials/01-installation.markdown
@@ -26,15 +26,24 @@ Linux distro packages:
Building the example site
-------------------------
-Apart from the main Hakyll library, the cabal package also provided you with an
+Apart from the main Hakyll library, the cabal package also provides you with an
executable `hakyll-init` to create an example site. This is an easy way to get
started:
$ hakyll-init my-site
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`.
+content and a generic configuration.
+
+If `hakyll-init` is not found, you should make sure `$HOME/.cabal/bin` is in
+your `$PATH`.
+
+(If you're on OS X you may not have a bin directory in `$HOME/.cabal`. In this
+case, check `$HOME/Library/Haskell/bin` and put it on your path if you find
+`hakyll-init` there. See [here] for more information on installation paths on
+OS X.)
+
+[here]: http://www.haskell.org/haskellwiki/Mac_OS_X_Common_Installation_Paths
The file `site.hs` holds the configuration of your site, as an executable
haskell program. We can compile and run it like this: