diff --git a/hamlet.cabal b/hamlet.cabal
--- a/hamlet.cabal
+++ b/hamlet.cabal
@@ -1,33 +1,33 @@
 name:            hamlet
-version:         0.7.0
+version:         0.7.0.1
 license:         BSD3
 license-file:    LICENSE
 author:          Michael Snoyman <michael@snoyman.com>
 maintainer:      Michael Snoyman <michael@snoyman.com>
 synopsis:        Haml-like template files that are compile-time checked
 description:
-    Hamlet gives you a type-safe tool for generating HTML code. It works via Quasi-Quoting, and generating extremely efficient output code. The syntax is white-space sensitive, and it helps you avoid cross-site scripting issues and 404 errors. Please see the documentation at <http://docs.yesodweb.com/hamlet/> for more details.
+    Hamlet gives you a type-safe tool for generating HTML code. It works via Quasi-Quoting, and generating extremely efficient output code. The syntax is white-space sensitive, and it helps you avoid cross-site scripting issues and 404 errors. Please see the documentation at <http://docs.yesodweb.com/book/hamlet/> for more details.
     .
-    As a quick overview, here is a sample Hamlet template:
+    As a quick overview, here is a sample Hamlet template (note that, due to some issues with Haddock, I have replaced braces (&#123; and &#125;) with double-square-brackets ([[ and ]])):
     .
     > !!!
-    > %html
-    >     %head
-    >         %title Hamlet Demo
-    >     %body
-    >         %h1 Information on $name.person$
-    >         %p $*name.person$ is $age.person$ years old.
-    >         %h2
-    >             $if isMarried.person
+    > <html
+    >     <head
+    >         <title>Hamlet Demo
+    >     <body
+    >         <h1>Information on #[[name person]]
+    >         <p>#[[name person]] is #[[age person]] years old.
+    >         <h2
+    >             $if isMarried person
     >                 Married
     >             $else
     >                 Not married
-    >         %ul
-    >             $forall children.person child
-    >                 %li $child$
-    >         %p
-    >             %a!href=@page.person@ See the page.
-    >         ^footer^
+    >         <ul
+    >             $forall child <- children person
+    >                 <li>#[[child]]
+    >         <p
+    >             <a href=@[[page person]]>See the page.
+    >         ^[[footer]]
 category:        Web, Yesod
 stability:       Stable
 cabal-version:   >= 1.6
