Merge branch 'master' of github.com:sdiehl/write-you-a-haskell

026_llvm.md

@@ -750,7 +750,7 @@ ModRM = 0xc3
 
 **Scale Index Base**
 
-<img src="/images/Scale.png"></img>
+<img src="img/Scale.png"></img>
 
 Scale is the factor by which index is multipled before being added to base to
 specify the address of the operand. Scale can have value of 1, 2, 4, or

README.md

@@ -71,7 +71,7 @@ is done by the ``write-you-a-haskell.cabal`` and  ``stack.yaml`` files.
 $ stack exec make
 ```
 
-To make the generate the pdf, the LaTeX packages must be installed on the
+To generate the pdf, the LaTeX packages must be installed on the
 system.
 
 ```bash
@@ -81,6 +81,13 @@ $ sudo tlmgr install zapfding
 $ stack exec make pdf
 ```
 
+Generation of the epub is also supported.
+
+```bash
+$ stack exec make epub
+```
+
+
 **Cabal**
 
 ```bash

stack.yaml

@@ -1,4 +1,4 @@
-resolver: lts-2.22
+resolver: lts-4.2
 packages:
 - '.'
 extra-deps: []

write-you-a-haskell.cabal

@@ -11,7 +11,7 @@ cabal-version:       >=1.10
 executable write-you-a-haskell
   main-is:             Main.hs
   build-depends:       
-    base         >= 4.7 && <4.8,
+    base         >= 4.7 && <4.9,
     pretty       >= 1.1 && <1.2,
     containers   >= 0.5 && <0.6,
     transformers >= 0.3 && <0.5,