Recent changes to this wiki:

Fix typo
diff --git a/doing.mdwn b/doing.mdwn
index 34c2ad2..c86e34d 100644
--- a/doing.mdwn
+++ b/doing.mdwn
@@ -32,7 +32,7 @@ every next action, so I don't believe my own lies.
 Update: One thing that seems to work for me is to find the tiniest
 little part of the unpleasant thing that needs doing, and do that.
 Repeating that a few times is usually enough to break the blockage.
-For example, if the unpleasant thing is "was the toilet bowl", the
+For example, if the unpleasant thing is "wash the toilet bowl", the
 tiniest few things might be "locate the toilet brush", "locate the
 disinfectant", and "find rubber gloves".
 

Add morning tasks
diff --git a/projects-next-actions.mdwn b/projects-next-actions.mdwn
index 2172060..39cd6e3 100644
--- a/projects-next-actions.mdwn
+++ b/projects-next-actions.mdwn
@@ -57,6 +57,11 @@ It's probably a good idea to prioritise finishing existing projects,
 and to scope and plan projects so they're easy and quick to finish, to
 gain from the motivational boost.
 
+Update: Getting started in the morning can be difficult. Sometimes it
+helps to have really simple, tiny next actions to choose from that you
+can do and get started. I tag such actions with a "zombie" label, to
+find them easily.
+
 Keeping track of projects and next actions: the art of lists
 ------------------------------------------------------------
 

Add a note about motivational boost from finishing
diff --git a/projects-next-actions.mdwn b/projects-next-actions.mdwn
index 3cdcaea..2172060 100644
--- a/projects-next-actions.mdwn
+++ b/projects-next-actions.mdwn
@@ -52,6 +52,11 @@ a paragraph. This concentrates your thinking to be directed at achieving
 that goal and makes it easier to avoid spending time on things that are
 related to the goal, but don't help you achieve it.
 
+Update: Finishing things is an important motivator, at least for me.
+It's probably a good idea to prioritise finishing existing projects,
+and to scope and plan projects so they're easy and quick to finish, to
+gain from the motivational boost.
+
 Keeping track of projects and next actions: the art of lists
 ------------------------------------------------------------
 

Add note about Monday morning reviews
diff --git a/review.mdwn b/review.mdwn
index 1baccf6..60a2160 100644
--- a/review.mdwn
+++ b/review.mdwn
@@ -60,6 +60,11 @@ the universe may throw at me next, I know where I am now and what I need
 to do next. (And then I often go read the Internet instead, but that's
 another problem.)
 
+In fact, doing a review gives quite an energy spike for me. I feel
+motivated to work on things right after a review. Because of this, I
+try to schedule my reviews for Monday mornings rather than, say,
+Friday evenings.
+
 
 Other reviews
 -------------

Add note about breaking down unpleasant tasks
diff --git a/doing.mdwn b/doing.mdwn
index 77668b8..34c2ad2 100644
--- a/doing.mdwn
+++ b/doing.mdwn
@@ -29,6 +29,13 @@ so when I tell myself that they've not been there for very long, I
 believe myself. That's why I put a date (at least year and month) on
 every next action, so I don't believe my own lies.
 
+Update: One thing that seems to work for me is to find the tiniest
+little part of the unpleasant thing that needs doing, and do that.
+Repeating that a few times is usually enough to break the blockage.
+For example, if the unpleasant thing is "was the toilet bowl", the
+tiniest few things might be "locate the toilet brush", "locate the
+disinfectant", and "find rubber gloves".
+
 After you've done something
 ---------------------------
 

Remove references to buying book from Amazon
diff --git a/index.mdwn b/index.mdwn
index c153d7e..4b559e9 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -27,6 +27,4 @@ This site gets occasional updates. See the [[news]] page and
 the [[RecentChanges]] page.
 
 You're free to read the book on the site, or download a PDF or
-ebook version from the sidebar. If you find the book helpful,
-send me e-mail or buying a copy via Amazon are excellent ways of
-expressing it. Happy hacking.
+ebook version from the sidebar. Happy hacking.
diff --git a/introduction.mdwn b/introduction.mdwn
index 1219875..5a080c8 100644
--- a/introduction.mdwn
+++ b/introduction.mdwn
@@ -115,15 +115,5 @@ what I do, I am not sure I want everyone to be able to edit it. If you want
 to make your own version of the book, feel free to branch the site on
 Branchable and make any changes you like to the content.
 
-If you find the book helpful, and didn't already do so, buying a copy
-on the Amazon Kindle store
-([.com](http://www.amazon.com/dp/B008C9LUUA/),
-[.co.uk](http://www.amazon.co.uk/dp/B008C9LUUA/),
-[.de](http://www.amazon.de/dp/B008C9LUUA/),
-[.es](http://www.amazon.es/dp/B008C9LUUA/),
-[.fr](http://www.amazon.fr/dp/B008C9LUUA/),
-[.it](http://www.amazon.it/dp/B008C9LUUA/))
-would be a nice way to say thank you. It is not, however, required.
-
 "Getting Things Done" and "GTD" are registered trademarks of the
 David Allen Company.

creating tag page person
diff --git a/person.mdwn b/person.mdwn
new file mode 100644
index 0000000..d3b7dfa
--- /dev/null
+++ b/person.mdwn
@@ -0,0 +1,4 @@
+[[!meta title="pages tagged person"]]
+
+[[!inline pages="tagged(person)" actions="no" archive="yes"
+feedshow=10]]

Tweak PDF formatting
diff --git a/Makefile b/Makefile
index 5c1b54d..cccd3bc 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@ chapters = $(shell ./list-chapters index.mdwn)
 all: book.pdf book.epub book.mobi
 
 book.pdf: $(chapters)
-	pandoc --toc -o book.pdf $(chapters)
+	pandoc -V geometry:a4paper --chapters --toc -o book.pdf $(chapters)
 
 book.epub: $(chapters) cover.png
 	pandoc -t epub --epub-metadata=book.xml --epub-cover=cover.png \

Comment moderation
diff --git a/index/comment_7_03316e6556fd8bf7fd2f96e7ae38a923._comment b/index/comment_7_03316e6556fd8bf7fd2f96e7ae38a923._comment
new file mode 100644
index 0000000..ffbb63b
--- /dev/null
+++ b/index/comment_7_03316e6556fd8bf7fd2f96e7ae38a923._comment
@@ -0,0 +1,11 @@
+[[!comment format=mdwn
+ ip="87.221.86.244"
+ subject="Thanks"
+ date="2013-09-29T23:03:13Z"
+ content="""
+Thank you Lars. 
+
+I am going to read it.
+
+Juan
+"""]]

Remove Amazon book links
diff --git a/sidebar.mdwn b/sidebar.mdwn
index c1b6e55..2d11094 100644
--- a/sidebar.mdwn
+++ b/sidebar.mdwn
@@ -3,16 +3,9 @@ Other formats:
 * [EPUB](http://files.liw.fi/gtdfh.epub)
 * [Mobipocket (Kindle)](http://files.liw.fi/gtdfh.mobi)
 * [PDF](http://files.liw.fi/gtdfh.pdf)
-* If you're feeling generous: **Amazon Kindle store**:
-  [.com](http://www.amazon.com/dp/B008C9LUUA/),
-  [.co.uk](http://www.amazon.co.uk/dp/B008C9LUUA/),
-  [.de](http://www.amazon.de/dp/B008C9LUUA/),
-  [.es](http://www.amazon.es/dp/B008C9LUUA/),
-  [.fr](http://www.amazon.fr/dp/B008C9LUUA/),
-  [.it](http://www.amazon.it/dp/B008C9LUUA/)
-* Alternatively, you 
-  buy something from my
-  [Amazon wishlist](http://www.amazon.co.uk/registry/wishlist/IAQ38FB6Y27D/).
+* [No longer on Amazon](http://blog.liw.fi/posts/gtdfd-not-amazon/)
+* If you're feeling generous: buy something from my [Amazon
+  wishlist](http://www.amazon.co.uk/registry/wishlist/IAQ38FB6Y27D/).
   Thanks!
 
 See also:

Comment moderation
diff --git a/projects-next-actions/comment_3_dc470c24cdb444812b3f8e30051c3649._comment b/projects-next-actions/comment_3_dc470c24cdb444812b3f8e30051c3649._comment
new file mode 100644
index 0000000..5cd62eb
--- /dev/null
+++ b/projects-next-actions/comment_3_dc470c24cdb444812b3f8e30051c3649._comment
@@ -0,0 +1,7 @@
+[[!comment format=mdwn
+ ip="93.144.43.61"
+ subject="comment 3"
+ date="2013-05-11T08:00:30Z"
+ content="""
+It's easy to know when \"starting a side business\" is done: if the business is up and running, then the \"starting\" is finished.
+"""]]

Comment moderation
diff --git a/automation/comment_2_1be43c852f9e5c4d72216735083affee._comment b/automation/comment_2_1be43c852f9e5c4d72216735083affee._comment
new file mode 100644
index 0000000..7d0f9c6
--- /dev/null
+++ b/automation/comment_2_1be43c852f9e5c4d72216735083affee._comment
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ username="http://liw.fi/"
+ nickname="Lars Wirzenius"
+ subject="Sorry"
+ date="2013-05-10T06:56:09Z"
+ content="""
+I'm afraid I don't have the script to report suspend/resumes of a
+laptop anymore.
+"""]]

Comment moderation
diff --git a/automation/comment_1_c9aeb4e4df4b6d1c28044d84e1e31522._comment b/automation/comment_1_c9aeb4e4df4b6d1c28044d84e1e31522._comment
new file mode 100644
index 0000000..eeedd41
--- /dev/null
+++ b/automation/comment_1_c9aeb4e4df4b6d1c28044d84e1e31522._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawlG-69kovApYhCGdOp5m9MCzSGU7YceXHo"
+ nickname="Ashish"
+ subject="The Timesheet script "
+ date="2013-05-09T18:25:52Z"
+ content="""
+By anyway, do you have that script? I didn't bother searching for it.
+"""]]

Comment moderation
diff --git a/someday-maybe/comment_1_5b3112eb5759a15c90059814a7e24e57._comment b/someday-maybe/comment_1_5b3112eb5759a15c90059814a7e24e57._comment
new file mode 100644
index 0000000..1fe347c
--- /dev/null
+++ b/someday-maybe/comment_1_5b3112eb5759a15c90059814a7e24e57._comment
@@ -0,0 +1,7 @@
+[[!comment format=mdwn
+ ip="217.216.157.54"
+ subject="Movie quote for a Debian fellow"
+ date="2013-03-25T17:55:56Z"
+ content="""
+You want to learn French but you'll end up living in China ;)
+"""]]

Comment moderation
diff --git a/read-and-review/comment_4_e8b577b8a7c5a45b68953ea1ccd1caad._comment b/read-and-review/comment_4_e8b577b8a7c5a45b68953ea1ccd1caad._comment
new file mode 100644
index 0000000..7192af5
--- /dev/null
+++ b/read-and-review/comment_4_e8b577b8a7c5a45b68953ea1ccd1caad._comment
@@ -0,0 +1,7 @@
+[[!comment format=mdwn
+ ip="95.179.28.133"
+ subject="comment 4"
+ date="2013-03-20T10:21:20Z"
+ content="""
+I can recommend getpocket.com for \"read and review\". Very usable tool.
+"""]]

Use pandoc instead of markdown2pdf
diff --git a/Makefile b/Makefile
index ee5da77..5c1b54d 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@ chapters = $(shell ./list-chapters index.mdwn)
 all: book.pdf book.epub book.mobi
 
 book.pdf: $(chapters)
-	markdown2pdf --toc -o book.pdf $(chapters)
+	pandoc --toc -o book.pdf $(chapters)
 
 book.epub: $(chapters) cover.png
 	pandoc -t epub --epub-metadata=book.xml --epub-cover=cover.png \

Add a note about keeping work and personal inboxes separate
diff --git a/inboxes.mdwn b/inboxes.mdwn
index 5ebe71f..cc6c5f1 100644
--- a/inboxes.mdwn
+++ b/inboxes.mdwn
@@ -56,6 +56,18 @@ This will make you be much more relaxed about your e-mail. You never need
 to worry whether you've replied to everything that needs replying. A further
 benefit is that you're likely to reply to mail much faster than before.
 
+Work versus personal inboxes
+----------------------------
+
+It can be quite stressful to have to deal with work while you're
+supposedly in your free time. Configuring your e-mail so that your
+work mails are not visible on your own computer, or not visible
+unless you're actually working, is quite a good idea. Keeping the
+work and personal inboxes separate is a first step.
+
+If your work e-mail is not in your face all the time, it's easier
+to ignore it, and that makes it easier to relax.
+
 Other kinds of inputs
 ------
 

Write down the goal of a project
diff --git a/projects-next-actions.mdwn b/projects-next-actions.mdwn
index 875608f..3cdcaea 100644
--- a/projects-next-actions.mdwn
+++ b/projects-next-actions.mdwn
@@ -47,6 +47,11 @@ time, though the time will be much longer. Next actions should typically
 be doable within half a day (but shorter is better), whereas projects
 might last up to a year.
 
+It's a good idea to write down the goal of a project in a sentence or
+a paragraph. This concentrates your thinking to be directed at achieving
+that goal and makes it easier to avoid spending time on things that are
+related to the goal, but don't help you achieve it.
+
 Keeping track of projects and next actions: the art of lists
 ------------------------------------------------------------
 

Add more blurbs for the Kindle store
diff --git a/introduction.mdwn b/introduction.mdwn
index 5a080c8..1219875 100644
--- a/introduction.mdwn
+++ b/introduction.mdwn
@@ -115,5 +115,15 @@ what I do, I am not sure I want everyone to be able to edit it. If you want
 to make your own version of the book, feel free to branch the site on
 Branchable and make any changes you like to the content.
 
+If you find the book helpful, and didn't already do so, buying a copy
+on the Amazon Kindle store
+([.com](http://www.amazon.com/dp/B008C9LUUA/),
+[.co.uk](http://www.amazon.co.uk/dp/B008C9LUUA/),
+[.de](http://www.amazon.de/dp/B008C9LUUA/),
+[.es](http://www.amazon.es/dp/B008C9LUUA/),
+[.fr](http://www.amazon.fr/dp/B008C9LUUA/),
+[.it](http://www.amazon.it/dp/B008C9LUUA/))
+would be a nice way to say thank you. It is not, however, required.
+
 "Getting Things Done" and "GTD" are registered trademarks of the
 David Allen Company.

Add blurb for buying book
diff --git a/index.mdwn b/index.mdwn
index 9b58fdb..c153d7e 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -25,3 +25,8 @@ GTD For Hackers
 
 This site gets occasional updates. See the [[news]] page and
 the [[RecentChanges]] page.
+
+You're free to read the book on the site, or download a PDF or
+ebook version from the sidebar. If you find the book helpful,
+send me e-mail or buying a copy via Amazon are excellent ways of
+expressing it. Happy hacking.

Comment moderation
diff --git a/index/comment_6_b60004bcc4a89048bbf712ef9344cd02._comment b/index/comment_6_b60004bcc4a89048bbf712ef9344cd02._comment
new file mode 100644
index 0000000..087007b
--- /dev/null
+++ b/index/comment_6_b60004bcc4a89048bbf712ef9344cd02._comment
@@ -0,0 +1,12 @@
+[[!comment format=mdwn
+ ip="203.89.166.126"
+ subject="Thanks"
+ date="2012-07-26T11:51:50Z"
+ content="""
+Hi Lars,
+
+The way you've laid GTD out is awesome.  I'm going to give this a good go.  Not looking forward to the big cleanup which will have to be staged to keep it manageable.
+
+Thanks,
+  Daniel
+"""]]

Add link to OpenLibrary entry
diff --git a/sidebar.mdwn b/sidebar.mdwn
index 4253909..c1b6e55 100644
--- a/sidebar.mdwn
+++ b/sidebar.mdwn
@@ -15,6 +15,10 @@ Other formats:
   [Amazon wishlist](http://www.amazon.co.uk/registry/wishlist/IAQ38FB6Y27D/).
   Thanks!
 
+See also:
+
+* [OpenLibary](http://openlibrary.org/works/OL16701871W/Getting_Things_Done_for_Hackers)
+
 <hr />
 
 This is a book-type site written by

Remove Paypal suggestion
diff --git a/sidebar.mdwn b/sidebar.mdwn
index 35e0146..4253909 100644
--- a/sidebar.mdwn
+++ b/sidebar.mdwn
@@ -10,7 +10,7 @@ Other formats:
   [.es](http://www.amazon.es/dp/B008C9LUUA/),
   [.fr](http://www.amazon.fr/dp/B008C9LUUA/),
   [.it](http://www.amazon.it/dp/B008C9LUUA/)
-* Alternatively, you can send money via Paypal to liw@liw.fi or
+* Alternatively, you 
   buy something from my
   [Amazon wishlist](http://www.amazon.co.uk/registry/wishlist/IAQ38FB6Y27D/).
   Thanks!

Add Amazon wishlist link to sidebar
diff --git a/sidebar.mdwn b/sidebar.mdwn
index c3ae450..35e0146 100644
--- a/sidebar.mdwn
+++ b/sidebar.mdwn
@@ -10,7 +10,10 @@ Other formats:
   [.es](http://www.amazon.es/dp/B008C9LUUA/),
   [.fr](http://www.amazon.fr/dp/B008C9LUUA/),
   [.it](http://www.amazon.it/dp/B008C9LUUA/)
-* Alternatively, you can send money via Paypal to liw@liw.fi. Thanks!
+* Alternatively, you can send money via Paypal to liw@liw.fi or
+  buy something from my
+  [Amazon wishlist](http://www.amazon.co.uk/registry/wishlist/IAQ38FB6Y27D/).
+  Thanks!
 
 <hr />
 

Comment moderation
diff --git a/read-and-review/comment_3_2232af31ff96df651c038039b56704cb._comment b/read-and-review/comment_3_2232af31ff96df651c038039b56704cb._comment
new file mode 100644
index 0000000..06c51d4
--- /dev/null
+++ b/read-and-review/comment_3_2232af31ff96df651c038039b56704cb._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://liw.fi/"
+ ip="188.220.217.129"
+ subject="MAFF linked"
+ date="2012-07-02T19:49:52Z"
+ content="""
+Thanks, Andrea.
+"""]]

Fix link to MAFF
diff --git a/read-and-review.mdwn b/read-and-review.mdwn
index 89172b5..433e546 100644
--- a/read-and-review.mdwn
+++ b/read-and-review.mdwn
@@ -29,7 +29,7 @@ These days, purely digital things are practical.
 * You can also save web pages on your local hard disk. This is useful
   for reading offline, and also for archiving the page in your filing
   system. The Firefox MAFF extension is excellent for this
-  (see <http://maf.mozdev.org/maff-file-format.html>).
+  (see <http://maf.mozdev.org/>).
 * You can have a "read and review" folder for e-mail as well. Newsletters,
   and any other e-mail that's long and takes a while to read, can be
   put there.

Added link to MAFF
Thanks, Andrea
diff --git a/read-and-review.mdwn b/read-and-review.mdwn
index 5c852e7..89172b5 100644
--- a/read-and-review.mdwn
+++ b/read-and-review.mdwn
@@ -28,7 +28,8 @@ These days, purely digital things are practical.
   bookmark folder. When you've read the page, remove the bookmark.
 * You can also save web pages on your local hard disk. This is useful
   for reading offline, and also for archiving the page in your filing
-  system. The Firefox MAFF extension is excellent for this.
+  system. The Firefox MAFF extension is excellent for this
+  (see <http://maf.mozdev.org/maff-file-format.html>).
 * You can have a "read and review" folder for e-mail as well. Newsletters,
   and any other e-mail that's long and takes a while to read, can be
   put there.

Comment moderation
diff --git a/read-and-review/comment_2_839d2a8028260d67ba364f98d983a8e4._comment b/read-and-review/comment_2_839d2a8028260d67ba364f98d983a8e4._comment
new file mode 100644
index 0000000..6cd6a03
--- /dev/null
+++ b/read-and-review/comment_2_839d2a8028260d67ba364f98d983a8e4._comment
@@ -0,0 +1,17 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawkVKv2TMNt3G0CRJTDLp4xw8QuUIwgqiGc"
+ nickname="Andrea"
+ subject="Reference for MAFF"
+ date="2012-07-02T09:43:07Z"
+ content="""
+Hi,
+
+can you please add link¹ for \"Firefox MAFF extension\".
+
+Thanks a lot for your work,
+
+Andrea
+
+----
+¹ http://maf.mozdev.org/
+"""]]

Tweak sidebar
diff --git a/sidebar.mdwn b/sidebar.mdwn
index 13085e2..c3ae450 100644
--- a/sidebar.mdwn
+++ b/sidebar.mdwn
@@ -10,6 +10,7 @@ Other formats:
   [.es](http://www.amazon.es/dp/B008C9LUUA/),
   [.fr](http://www.amazon.fr/dp/B008C9LUUA/),
   [.it](http://www.amazon.it/dp/B008C9LUUA/)
+* Alternatively, you can send money via Paypal to liw@liw.fi. Thanks!
 
 <hr />
 

Typo fix
diff --git a/read-and-review.mdwn b/read-and-review.mdwn
index decfaec..5c852e7 100644
--- a/read-and-review.mdwn
+++ b/read-and-review.mdwn
@@ -47,7 +47,7 @@ I usually try to read things in a FIFO order. I've found that a document
 that's boring or unpleasant or otherwise easy to push later, always gets
 pushed later. Since there's always new material coming in, there's
 never a time when the boring document is the only one to be read. Sticking
-to FIFO, unleass there's an urgent reason to avoid it, is a good way
+to FIFO, unless there's an urgent reason to avoid it, is a good way
 of avoiding a pile of documents that never get read.
 
 My threshold for putting something into "read and review" is low.

Comment moderation
diff --git a/read-and-review/comment_1_cf60351f3125b982ad2a90cf3ac6bb50._comment b/read-and-review/comment_1_cf60351f3125b982ad2a90cf3ac6bb50._comment
new file mode 100644
index 0000000..97c79c7
--- /dev/null
+++ b/read-and-review/comment_1_cf60351f3125b982ad2a90cf3ac6bb50._comment
@@ -0,0 +1,7 @@
+[[!comment format=mdwn
+ ip="174.51.215.34"
+ subject="misspell"
+ date="2012-06-30T21:45:32Z"
+ content="""
+you misspelled \"unless\" as \"unleass\"
+"""]]

Typo fix
diff --git a/daily-routine.mdwn b/daily-routine.mdwn
index 04d7847..eed4e1b 100644
--- a/daily-routine.mdwn
+++ b/daily-routine.mdwn
@@ -19,7 +19,7 @@ My daily checklist has these things:
 * Weigh.
 * Take morning pills.
 * Check that phone is charged and that ringer volume is suitable.
-* Do morning exercises (mark in excercises.gnumeric).
+* Do morning exercises (mark in exercises.gnumeric).
 * Check calendar.
 * Check all inboxes.
 * Update Journal.

Comment moderation
diff --git a/daily-routine/comment_4_f3cd198eb980a52696e7a90782f492df._comment b/daily-routine/comment_4_f3cd198eb980a52696e7a90782f492df._comment
new file mode 100644
index 0000000..f2c536e
--- /dev/null
+++ b/daily-routine/comment_4_f3cd198eb980a52696e7a90782f492df._comment
@@ -0,0 +1,11 @@
+[[!comment format=mdwn
+ ip="217.212.20.30"
+ subject="Excercises"
+ date="2012-06-30T20:47:11Z"
+ content="""
+Hi Lars,
+
+It still looks wrong above: \"(mark in excercises.gnumeric)\"
+An extra 'c' crept in somehow :)
+
+"""]]

Comment moderation
diff --git a/daily-routine/comment_3_3ed65545b7edb0319ec6b126b9a22bcd._comment b/daily-routine/comment_3_3ed65545b7edb0319ec6b126b9a22bcd._comment
new file mode 100644
index 0000000..f4c0f20
--- /dev/null
+++ b/daily-routine/comment_3_3ed65545b7edb0319ec6b126b9a22bcd._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://liw.fi/"
+ ip="188.220.217.129"
+ subject="Thanks"
+ date="2012-06-24T08:34:01Z"
+ content="""
+Thanks, fixed \"excercises\" on the website.
+"""]]

Typo fix
Thanks, Anonymous.
diff --git a/daily-routine.mdwn b/daily-routine.mdwn
index 3a1f1e8..04d7847 100644
--- a/daily-routine.mdwn
+++ b/daily-routine.mdwn
@@ -19,7 +19,7 @@ My daily checklist has these things:
 * Weigh.
 * Take morning pills.
 * Check that phone is charged and that ringer volume is suitable.
-* Do morning excercises (mark in excercises.gnumeric).
+* Do morning exercises (mark in excercises.gnumeric).
 * Check calendar.
 * Check all inboxes.
 * Update Journal.

Comment moderation
diff --git a/daily-routine/comment_2_426e7346ac15298b33c9c56f6f92874e._comment b/daily-routine/comment_2_426e7346ac15298b33c9c56f6f92874e._comment
new file mode 100644
index 0000000..7fd784b
--- /dev/null
+++ b/daily-routine/comment_2_426e7346ac15298b33c9c56f6f92874e._comment
@@ -0,0 +1,7 @@
+[[!comment format=mdwn
+ ip="75.72.201.81"
+ subject="Spelling"
+ date="2012-06-24T06:17:28Z"
+ content="""
+\"Excercises\" should be \"exercises\" - one C.
+"""]]

Tweak sidebar
diff --git a/sidebar.mdwn b/sidebar.mdwn
index a85d534..13085e2 100644
--- a/sidebar.mdwn
+++ b/sidebar.mdwn
@@ -3,7 +3,7 @@ Other formats:
 * [EPUB](http://files.liw.fi/gtdfh.epub)
 * [Mobipocket (Kindle)](http://files.liw.fi/gtdfh.mobi)
 * [PDF](http://files.liw.fi/gtdfh.pdf)
-* **Amazon Kindle store**:
+* If you're feeling generous: **Amazon Kindle store**:
   [.com](http://www.amazon.com/dp/B008C9LUUA/),
   [.co.uk](http://www.amazon.co.uk/dp/B008C9LUUA/),
   [.de](http://www.amazon.de/dp/B008C9LUUA/),

Add links to each Amazon instance
diff --git a/sidebar.mdwn b/sidebar.mdwn
index b758e2e..a85d534 100644
--- a/sidebar.mdwn
+++ b/sidebar.mdwn
@@ -3,7 +3,13 @@ Other formats:
 * [EPUB](http://files.liw.fi/gtdfh.epub)
 * [Mobipocket (Kindle)](http://files.liw.fi/gtdfh.mobi)
 * [PDF](http://files.liw.fi/gtdfh.pdf)
-* [Amazon Kindle store](http://www.amazon.com/dp/B008C9LUUA/)
+* **Amazon Kindle store**:
+  [.com](http://www.amazon.com/dp/B008C9LUUA/),
+  [.co.uk](http://www.amazon.co.uk/dp/B008C9LUUA/),
+  [.de](http://www.amazon.de/dp/B008C9LUUA/),
+  [.es](http://www.amazon.es/dp/B008C9LUUA/),
+  [.fr](http://www.amazon.fr/dp/B008C9LUUA/),
+  [.it](http://www.amazon.it/dp/B008C9LUUA/)
 
 <hr />
 

Change link to be to Amazon.com not .co.uk
diff --git a/sidebar.mdwn b/sidebar.mdwn
index f9f3113..b758e2e 100644
--- a/sidebar.mdwn
+++ b/sidebar.mdwn
@@ -3,7 +3,7 @@ Other formats:
 * [EPUB](http://files.liw.fi/gtdfh.epub)
 * [Mobipocket (Kindle)](http://files.liw.fi/gtdfh.mobi)
 * [PDF](http://files.liw.fi/gtdfh.pdf)
-* [Amazon Kindle store](http://www.amazon.co.uk/dp/B008C9LUUA/)
+* [Amazon Kindle store](http://www.amazon.com/dp/B008C9LUUA/)
 
 <hr />
 

Add link to Amazon Kindle store to sidebar
diff --git a/sidebar.mdwn b/sidebar.mdwn
index 316d169..f9f3113 100644
--- a/sidebar.mdwn
+++ b/sidebar.mdwn
@@ -3,6 +3,7 @@ Other formats:
 * [EPUB](http://files.liw.fi/gtdfh.epub)
 * [Mobipocket (Kindle)](http://files.liw.fi/gtdfh.mobi)
 * [PDF](http://files.liw.fi/gtdfh.pdf)
+* [Amazon Kindle store](http://www.amazon.co.uk/dp/B008C9LUUA/)
 
 <hr />
 

Further formatting tweaks
diff --git a/cover.svg b/cover.svg
index d9cd8f7..19f8f47 100644
--- a/cover.svg
+++ b/cover.svg
@@ -92,7 +92,7 @@
          x="151.42857"
          y="649.93378"
          id="tspan3814"
-         style="font-size:28px">(2012-06-17b)</tspan></text>
+         style="font-size:28px">(2012-06-17c)</tspan></text>
     <text
        xml:space="preserve"
        style="font-size:72px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans"
diff --git a/files.mdwn b/files.mdwn
index 452beb3..ffa15ae 100644
--- a/files.mdwn
+++ b/files.mdwn
@@ -83,7 +83,7 @@ folders (or equivalent). Have only one level of these.
 
     $HOME/Archive/
       Council tax 2011/
-      Debian DPL plans 2013/
+      Debian DPL plans/
       Orange GSM prepaid/
       Talk: Debconf 2010/
       Three GSM prepaid/
diff --git a/waiting-for.mdwn b/waiting-for.mdwn
index 51924fb..2c76a84 100644
--- a/waiting-for.mdwn
+++ b/waiting-for.mdwn
@@ -17,9 +17,10 @@ waiting for. For example:
 
 I use a "waiting for" list of the following format:
 
-    * Bonus arrives. 2009-09-01
-      - buy a new disco ball
-      - pay off credit card
+    * Bonus arrives.
+      2009-09-01
+      - buy disco ball
+      - pay credit card
 
 This format makes it easy to keep track of what you're waiting for,
 how long you've waited already, and what to do after the event happens.

Update cover page version
diff --git a/cover.svg b/cover.svg
index bcf07ff..d9cd8f7 100644
--- a/cover.svg
+++ b/cover.svg
@@ -92,7 +92,7 @@
          x="151.42857"
          y="649.93378"
          id="tspan3814"
-         style="font-size:28px">(2012-06-17a)</tspan></text>
+         style="font-size:28px">(2012-06-17b)</tspan></text>
     <text
        xml:space="preserve"
        style="font-size:72px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans"

Remove repeat of next actions checklist
diff --git a/review.mdwn b/review.mdwn
index c552263..1baccf6 100644
--- a/review.mdwn
+++ b/review.mdwn
@@ -30,13 +30,6 @@ Here's my checklist for doing a weekly review:
   any projects that are finished or aborted, or move them to someday/maybe
   if that's appropriate.
 * Review next actions list. Are they all of good quality?
-    * a _physical_ action ("write", not "think about")
-        * thinking is part of planning!
-    * it's clear what I need to do (a widget to crank)
-    * duration at most 15 minutes, preferably
-    * I'm committed to doing it
-    * does not depend on anything, can be done immediately
-    * it's clear when it's done
 * Review waiting for list and mail folder.
 * Review pending and support files: 
     * physical folder at home

Remove unresolved future reference
diff --git a/projects-next-actions.mdwn b/projects-next-actions.mdwn
index cf5cbdc..875608f 100644
--- a/projects-next-actions.mdwn
+++ b/projects-next-actions.mdwn
@@ -47,9 +47,6 @@ time, though the time will be much longer. Next actions should typically
 be doable within half a day (but shorter is better), whereas projects
 might last up to a year.
 
-Not everything will fit into these definitions of next actions and
-projects, but we'll get to that later.
-
 Keeping track of projects and next actions: the art of lists
 ------------------------------------------------------------
 

Avoid very wide <pre> sections
diff --git a/files.mdwn b/files.mdwn
index 15a6ab0..452beb3 100644
--- a/files.mdwn
+++ b/files.mdwn
@@ -82,11 +82,11 @@ topic: these are the folders that correspond to the physical manilla
 folders (or equivalent). Have only one level of these.
 
     $HOME/Archive/
-        Debian DPL election plans 2013/
-        Edinburgh council tax 2011/
-        Orange GSM prepaid/
-        Talk: Debconf 2010/
-        Three GSM prepaid/
+      Council tax 2011/
+      Debian DPL plans 2013/
+      Orange GSM prepaid/
+      Talk: Debconf 2010/
+      Three GSM prepaid/
 
 Having only a single level of archive folders makes it easier to
 look for them manually, when full-text search is not available or isn't
diff --git a/inboxes.mdwn b/inboxes.mdwn
index 97ad958..5ebe71f 100644
--- a/inboxes.mdwn
+++ b/inboxes.mdwn
@@ -94,23 +94,6 @@ from the inbox. This means you need to have a place to put it, even
 if it is only the trash. We will cover filing systems and other related
 tools later.
 
-    for inbox in inboxes:
-        while len(inbox) > 0:
-            item = inbox.pop()
-            if item.needs_action:
-                if item.can_be_delegated:
-                    item.delegate()
-                    waiting_for.append(item)
-                elif item.is_quick:
-                    item.do()
-                elif len(item.actions) > 1:
-                    projects.append(item)
-                    next_actions.extend(item.actions)
-                else:
-                    next_actions.append(item)
-            elif item.may_be_needed_later:
-                filing_system.put(item)
-
 Bug trackers: not really inboxes
 --------------------------------
 
diff --git a/waiting-for.mdwn b/waiting-for.mdwn
index d292f84..51924fb 100644
--- a/waiting-for.mdwn
+++ b/waiting-for.mdwn
@@ -17,9 +17,9 @@ waiting for. For example:
 
 I use a "waiting for" list of the following format:
 
-    * End-of-year bonus arrives. 2009-09-01
-      - then buy a new disco ball
-      - then pay off credit card debt
+    * Bonus arrives. 2009-09-01
+      - buy a new disco ball
+      - pay off credit card
 
 This format makes it easy to keep track of what you're waiting for,
 how long you've waited already, and what to do after the event happens.

Update cover image
diff --git a/cover.svg b/cover.svg
index 0f64ac3..bcf07ff 100644
--- a/cover.svg
+++ b/cover.svg
@@ -13,7 +13,7 @@
    height="1052.3622047"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.1 r9760"
+   inkscape:version="0.48.3.1 r9886"
    sodipodi:docname="cover.svg"
    inkscape:export-filename="/home/liw/gtdfh.branchable.com/cover.png"
    inkscape:export-xdpi="89.660004"
@@ -34,9 +34,9 @@
      inkscape:current-layer="layer1"
      showgrid="false"
      inkscape:window-width="1280"
-     inkscape:window-height="742"
+     inkscape:window-height="741"
      inkscape:window-x="0"
-     inkscape:window-y="26"
+     inkscape:window-y="27"
      inkscape:window-maximized="1" />
   <metadata
      id="metadata7">
@@ -46,7 +46,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -90,9 +90,9 @@
          id="tspan2999">Hackers</tspan><tspan
          sodipodi:role="line"
          x="151.42857"
-         y="693.79077"
+         y="649.93378"
          id="tspan3814"
-         style="font-size:28px">(alpha 2)</tspan></text>
+         style="font-size:28px">(2012-06-17a)</tspan></text>
     <text
        xml:space="preserve"
        style="font-size:72px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans"

Fix indentations for lists
diff --git a/projects-next-actions.mdwn b/projects-next-actions.mdwn
index 91bb125..cf5cbdc 100644
--- a/projects-next-actions.mdwn
+++ b/projects-next-actions.mdwn
@@ -18,8 +18,8 @@ you need to do, and when you're finished. A **good next action** would
 fulfill the following criteria:
 
 * a _physical_ action ("write", not "think about")
-  * thinking is part of planning! and that should happen during a review phase
-  * planning can be broken down into next actions, however
+    * thinking is part of planning! and that should happen during a review phase
+    * planning can be broken down into next actions, however
 * it's clear what I need to do (a widget to crank)
 * duration at most 15 minutes, preferably
 * I'm committed to doing it
diff --git a/quickie-overview.mdwn b/quickie-overview.mdwn
index 6625dfd..c1ea565 100644
--- a/quickie-overview.mdwn
+++ b/quickie-overview.mdwn
@@ -11,17 +11,18 @@ A condensed summary of GTD:
   in one or more inboxes
 * you empty your inboxes regularly from stuff
 * stuff is dealt with by one of the following:
-  **do it at once** (if it's quick, or you have to, or really want to);
-  **defer** it for later;
-  **delegate** it to someone else;
-  **file** it somewhere (if you may need it later);
-  **discard** it (ignore it, throw it in a trash bin, whatever)
+    - **do it at once** (if it's quick, or you have to, or really want to);
+    - **defer** it for later;
+    - **delegate** it to someone else;
+    - **file** it somewhere (if you may need it later);
+    - **discard** it (ignore it, throw it in a trash bin, whatever)
 * keep several lists:
-  **next actions**: deferred stuff;
-  **projects**: anything that needs more than one next action to be finished;
-  **waiting for**: delegated stuff;
-  **someday/maybe**: what you may want to do someday, but isn't an active
-    concern right now
+    - **next actions**: deferred stuff;
+    - **projects**: anything that needs more than one next action to be 
+      finished;
+    - **waiting for**: delegated stuff;
+    - **someday/maybe**: what you may want to do someday, but isn't an active
+      concern right now
 * at least once a week, process all inboxes, and review all lists
 * have an archiving system for documents and such
 * have a system for keeping handy files and other things relevant
diff --git a/references.mdwn b/references.mdwn
index 842f11b..a2b8239 100644
--- a/references.mdwn
+++ b/references.mdwn
@@ -2,6 +2,6 @@ References
 ==========
 
 * Getting things done
-  - <http://www.librarything.com/work/1844807>
+    - <http://www.librarything.com/work/1844807>
 * The now habit : a strategic program for overcoming procrastination and enjoying guilt-free play
-  - <http://www.librarything.com/work/7934/details/46964220>
+    - <http://www.librarything.com/work/7934/details/46964220>
diff --git a/review.mdwn b/review.mdwn
index 8ce3188..c552263 100644
--- a/review.mdwn
+++ b/review.mdwn
@@ -30,17 +30,17 @@ Here's my checklist for doing a weekly review:
   any projects that are finished or aborted, or move them to someday/maybe
   if that's appropriate.
 * Review next actions list. Are they all of good quality?
-  * a _physical_ action ("write", not "think about")
-    * thinking is part of planning!
-  * it's clear what I need to do (a widget to crank)
-  * duration at most 15 minutes, preferably
-  * I'm committed to doing it
-  * does not depend on anything, can be done immediately
-  * it's clear when it's done
+    * a _physical_ action ("write", not "think about")
+        * thinking is part of planning!
+    * it's clear what I need to do (a widget to crank)
+    * duration at most 15 minutes, preferably
+    * I'm committed to doing it
+    * does not depend on anything, can be done immediately
+    * it's clear when it's done
 * Review waiting for list and mail folder.
 * Review pending and support files: 
-  * physical folder at home
-  * folder in e-mail
+    * physical folder at home
+    * folder in e-mail
 * Review someday/maybe.
 * Review "Read and Review".
 * Review areas of focus, goals.

Comment moderation
diff --git a/ungood/comment_7_c4c86d2c65110cc944ae344543a964d3._comment b/ungood/comment_7_c4c86d2c65110cc944ae344543a964d3._comment
new file mode 100644
index 0000000..cd35c46
--- /dev/null
+++ b/ungood/comment_7_c4c86d2c65110cc944ae344543a964d3._comment
@@ -0,0 +1,7 @@
+[[!comment format=mdwn
+ ip="129.132.210.21"
+ subject="Emacs Org-Mode and Notmuch Email"
+ date="2012-06-02T04:23:10Z"
+ content="""
+For me the perfect solution. Org-Mode for keeping track of everything, including links to all files and Emails. Fast email search with Notmuch. Made me very productive.
+"""]]

Comment moderation
diff --git a/ungood/comment_6_f3d3c35f2f0c9e9d75804e16b3674d99._comment b/ungood/comment_6_f3d3c35f2f0c9e9d75804e16b3674d99._comment
new file mode 100644
index 0000000..c67dafd
--- /dev/null
+++ b/ungood/comment_6_f3d3c35f2f0c9e9d75804e16b3674d99._comment
@@ -0,0 +1,7 @@
+[[!comment format=mdwn
+ ip="85.218.65.62"
+ subject="comment 6"
+ date="2012-05-26T19:54:24Z"
+ content="""
+I'm personally using taskwarrior (http://taskwarrior.org/projects/taskwarrior), it works really well for me.
+"""]]

Acknowlege GTD trademarks
diff --git a/introduction.mdwn b/introduction.mdwn
index 1aba08a..5a080c8 100644
--- a/introduction.mdwn
+++ b/introduction.mdwn
@@ -114,3 +114,6 @@ accept suggestions and will consider patches, but since the book explains
 what I do, I am not sure I want everyone to be able to edit it. If you want
 to make your own version of the book, feel free to branch the site on
 Branchable and make any changes you like to the content.
+
+"Getting Things Done" and "GTD" are registered trademarks of the
+David Allen Company.

typo fix, thanks afranken
diff --git a/projects-next-actions.mdwn b/projects-next-actions.mdwn
index a821ed8..91bb125 100644
--- a/projects-next-actions.mdwn
+++ b/projects-next-actions.mdwn
@@ -18,7 +18,7 @@ you need to do, and when you're finished. A **good next action** would
 fulfill the following criteria:
 
 * a _physical_ action ("write", not "think about")
-  * thinking is part of planning! and that should happend during review phase
+  * thinking is part of planning! and that should happen during a review phase
   * planning can be broken down into next actions, however
 * it's clear what I need to do (a widget to crank)
 * duration at most 15 minutes, preferably

Remove ikiwiki markup extension usage from chapter pages
diff --git a/inboxes.mdwn b/inboxes.mdwn
index caca35a..97ad958 100644
--- a/inboxes.mdwn
+++ b/inboxes.mdwn
@@ -40,7 +40,7 @@ for every e-mail in each inbox, after reading it:
 * move it to an archival folder, if you think you might need it later on
 
 (Compare the above list with "do, defer, delegate, delete, or file" from
-the [[Quickie overview|quickie-overview]] chapter.)
+the Quickie overview chapter.)
 
 When you have time, you look into the "needs replying" folder, and reply
 to one or more mails in there. After you've replied, you delete or archive
diff --git a/introduction.mdwn b/introduction.mdwn
index 033563c..1aba08a 100644
--- a/introduction.mdwn
+++ b/introduction.mdwn
@@ -14,8 +14,7 @@ implemented it in my own life. It is aimed at
 everyone whose lives include a lot of computer use, and who know how
 to use their computers.
 
-This book stands independent from Allen's three books on GTD (see
-[[references]] for details), but
+This book stands independent from Allen's three books on GTD, but
 you'll benefit from reading the first or third of those as
 well. (The second one should be considered optional.) I provide
 a different view of, and perhaps opinion of, the GTD system.

Extract list of chapters from index.mdwn
There's no point in duplicating the list in Makefile.
diff --git a/Makefile b/Makefile
index ca551f8..ee5da77 100644
--- a/Makefile
+++ b/Makefile
@@ -1,21 +1,4 @@
-chapters = \
-	introduction.mdwn \
-	quickie-overview.mdwn \
-	inboxes.mdwn \
-	projects-next-actions.mdwn \
-	doing.mdwn \
-	calendars.mdwn \
-	journalling.mdwn \
-	files.mdwn \
-	someday-maybe.mdwn \
-	waiting-for.mdwn \
-	daily-routine.mdwn \
-	review.mdwn \
-	automation.mdwn \
-	getting-started.mdwn \
-	ungood.mdwn \
-	conclusion.mdwn \
-	references.mdwn
+chapters = $(shell ./list-chapters index.mdwn)
 
 all: book.pdf book.epub book.mobi
 
diff --git a/list-chapters b/list-chapters
new file mode 100755
index 0000000..55daa28
--- /dev/null
+++ b/list-chapters
@@ -0,0 +1,6 @@
+#!/usr/bin/awk -f
+
+$2 == "[[!traillink" {
+    sub(/\]\].*/, " ")
+    print tolower($3) ".mdwn"
+}

Comment moderation
diff --git a/ungood/comment_5_7e0c5cd9ff60bc10afdf4c94d4020b4b._comment b/ungood/comment_5_7e0c5cd9ff60bc10afdf4c94d4020b4b._comment
new file mode 100644
index 0000000..a7a3114
--- /dev/null
+++ b/ungood/comment_5_7e0c5cd9ff60bc10afdf4c94d4020b4b._comment
@@ -0,0 +1,7 @@
+[[!comment format=mdwn
+ ip="24.93.29.192"
+ subject="checkvist  as a TODO list"
+ date="2012-04-29T10:35:06Z"
+ content="""
+checkvist  has little friction due to its keyboard support, and being just a list.  Using it now as suppose to the tempting cool tools like andbang or asana.
+"""]]

Comment moderation
diff --git a/inboxes/comment_1_a3ffa89a3dfba3ca794550f942cd48a6._comment b/inboxes/comment_1_a3ffa89a3dfba3ca794550f942cd48a6._comment
new file mode 100644
index 0000000..934d9a4
--- /dev/null
+++ b/inboxes/comment_1_a3ffa89a3dfba3ca794550f942cd48a6._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawlr2ufe5QRIgD5HPV2l3bAXBkMxrAM7zVw"
+ nickname="Julia"
+ subject="Thanks"
+ date="2012-04-25T21:55:18Z"
+ content="""
+Have not finished reading this all yet but for the first time in over a decade, I've a clean email in-box.  Small things that make a body very happy.  Thanks 
+"""]]

Add link to news page
diff --git a/index.mdwn b/index.mdwn
index 8ffd388..9b58fdb 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -22,3 +22,6 @@ GTD For Hackers
 * [[!traillink Conclusion]]
 * [[!traillink References]]
 
+
+This site gets occasional updates. See the [[news]] page and
+the [[RecentChanges]] page.

Fixes from Kristina Hoeppner
diff --git a/calendars.mdwn b/calendars.mdwn
index 972837d..b9d2e88 100644
--- a/calendars.mdwn
+++ b/calendars.mdwn
@@ -43,7 +43,7 @@ sent out the invitation, and not remind you if you have.
 
 Some stuff does not fit so easily with calendars. For example,
 suppose you want to cut your nails when they get too long, but you
-keep getting distracted by your computer so that it may take your a
+keep getting distracted by your computer so that it may take you a
 month to notice that it's time to cut them. And when you do, it's
 because you break a nail, which is a bit painful. After some experimentation
 you decide that twelve days after the previous time is a good time to
diff --git a/files.mdwn b/files.mdwn
index 6559022..15a6ab0 100644
--- a/files.mdwn
+++ b/files.mdwn
@@ -19,7 +19,7 @@ affect the way you organize them: much of the organization is dependent
 on naming and sorting, and it is probably best to use the same naming
 system for both digital and paper files.
 
-You may need have things other than documents you need to keep track
+You may have other things than documents you need to keep track
 of for some of your projects. For example, one of your projects might
 be to move some artwork to a different country, and the artwork would
 then be part of your current files. Since large paintings are hard
@@ -45,7 +45,7 @@ have very specific folders (envelopes, tabs in ring binders, whatever).
 Each folder should have very specific kinds of items in it. Thus,
 a folder named "Edinburgh council tax, 2011" would be better than
 "Financial stuff". The former is very specific, the latter would
-quickly grow to be unhelpfully large very quick.
+quickly grow to be unhelpfully large.
 
 Every folder should be labelled clearly. People with a lousy
 handwriting font might want to invest in a label writer of some
diff --git a/getting-started.mdwn b/getting-started.mdwn
index 5fc5cd2..ceea9f9 100644
--- a/getting-started.mdwn
+++ b/getting-started.mdwn
@@ -42,7 +42,7 @@ After I'd cleared the table, I did the same thing with my computers. I
 collected all my files and e-mails and bookmarks and so on into one
 digital inbox per computer, and then processed those. I still kept all
 my lists on paper, though. As it turned out, my digital life was in much
-better order so there was rather less next actions and projects generated
+better order so there were rather fewer next actions and projects generated
 from that.
 
 By Sunday evening all my inboxes were clear, and my lists were long.
diff --git a/inboxes.mdwn b/inboxes.mdwn
index 15941a5..caca35a 100644
--- a/inboxes.mdwn
+++ b/inboxes.mdwn
@@ -11,7 +11,7 @@ Each such folder would be a separate inbox.
 
 A common anti-pattern for people is to keep e-mail in their inboxes.
 They read it, and leave it there. The next time they read e-mail, there
-might be some more new mail, which they read, and leave there. Eventually,
+might be some new mail, which they read, and leave there. Eventually,
 the mail piles up a lot, and it gets hard to find a specific mail you
 may need. Even more importantly, it gets hard to know which mails still
 require you to do something. Perhaps there was a mail from your boss
@@ -54,8 +54,7 @@ action, and any mails that do require action are easy to find.
 
 This will make you be much more relaxed about your e-mail. You never need
 to worry whether you've replied to everything that needs replying. A further
-benefit, also of great benefit, is that you're likely to reply to mail
-much faster than before.
+benefit is that you're likely to reply to mail much faster than before.
 
 Other kinds of inputs
 ------
@@ -138,7 +137,7 @@ Inboxes a la Lars
 Here are the inboxes I use:
 
 * physical inbox: letters and other mail, notes written on paper, etc.
-* wallet: receipts, other bits and pieces that gets collected during the day
+* wallet: receipts, other bits and pieces that get collected during the day
 * notebooks: notes made while out and about and phone/laptop wasn't available
 * backpack: random stuff tends to get collected there
 * phone text messages
@@ -146,8 +145,8 @@ Here are the inboxes I use:
 * phone notebook: I use a note taking application on my smartphone as
   a replacement for a notebook, when I can, because my handwriting font
   is abysmally hard to read
-* e-mail: these two inboxes (personal vs work); I don't split mailing list
-  into separate folders anymore
+* e-mail: this is two inboxes (personal vs work); I no longer have a separate
+  folder for each mailing list, everything goes into the same inbox
 * feeds: blogs, news sites, etc.
 * home directory for each computer I regularly use: tends to collect
   random downloaded files, notes, etc.
diff --git a/introduction.mdwn b/introduction.mdwn
index 44c6111..033563c 100644
--- a/introduction.mdwn
+++ b/introduction.mdwn
@@ -22,7 +22,7 @@ a different view of, and perhaps opinion of, the GTD system.
 
 I discuss what has been good about GTD for me, what has been hard
 to implement, and what has not worked. My goal is to explain what
-I do, and provide inspiration to you for building their own
+I do, and provide inspiration to you for building your own
 GTD system.
 
 GTD is not a system you buy in a shop and install on your desk. It is
diff --git a/projects-next-actions.mdwn b/projects-next-actions.mdwn
index a6e5826..a821ed8 100644
--- a/projects-next-actions.mdwn
+++ b/projects-next-actions.mdwn
@@ -20,7 +20,7 @@ fulfill the following criteria:
 * a _physical_ action ("write", not "think about")
   * thinking is part of planning! and that should happend during review phase
   * planning can be broken down into next actions, however
-* it's clear what I need to (a widget to crank)
+* it's clear what I need to do (a widget to crank)
 * duration at most 15 minutes, preferably
 * I'm committed to doing it
 * does not depend on anything, can be done immediately
diff --git a/quickie-overview.mdwn b/quickie-overview.mdwn
index 119f473..6625dfd 100644
--- a/quickie-overview.mdwn
+++ b/quickie-overview.mdwn
@@ -11,16 +11,16 @@ A condensed summary of GTD:
   in one or more inboxes
 * you empty your inboxes regularly from stuff
 * stuff is dealt with by one of the following:
-  - do it at once (if it's quick, or you have to, or really want to)
-  - defer it for later
-  - delegate it to someone else
-  - file it somewhere (if you may need it later)
-  - discard it (ignore it, throw it in a trash bin, whatever)
+  **do it at once** (if it's quick, or you have to, or really want to);
+  **defer** it for later;
+  **delegate** it to someone else;
+  **file** it somewhere (if you may need it later);
+  **discard** it (ignore it, throw it in a trash bin, whatever)
 * keep several lists:
-  - next actions: deferred stuff
-  - projects: anything that needs more than one next action to be finished
-  - waiting for: delegated stuff
-  - someday/maybe: what you may want to do someday, but isn't an active
+  **next actions**: deferred stuff;
+  **projects**: anything that needs more than one next action to be finished;
+  **waiting for**: delegated stuff;
+  **someday/maybe**: what you may want to do someday, but isn't an active
     concern right now
 * at least once a week, process all inboxes, and review all lists
 * have an archiving system for documents and such
diff --git a/review.mdwn b/review.mdwn
index 69148ee..8ce3188 100644
--- a/review.mdwn
+++ b/review.mdwn
@@ -71,12 +71,12 @@ another problem.)
 Other reviews
 -------------
 
-In addition to the weekly review, it is good to another kind of review
+In addition to the weekly review, it is good to have another kind of review
 about once or twice a year. For this, I find it's best to do a weekly
 review first, and then concentrate on bigger issues: what do I want
 out of life? How do I want to live in one year, five years, twenty years,
 or in my retirement? What do I need to do to achieve those things?
 
-I've not done much of that yet, so I dont have a lot of concrete advice
+I've not done much of that yet, so I don't have a lot of concrete advice
 about that. I'll add more about it when I do.
 
diff --git a/ungood.mdwn b/ungood.mdwn
index 2c6de7f..9d136e2 100644
--- a/ungood.mdwn
+++ b/ungood.mdwn
@@ -9,7 +9,7 @@ Split systems: personal versus work GTD
 ---------------------------------------
 
 I've tried having a separate GTD system for work and personal lives,
-but as a free software develper, the two are mixed enough that it's
+but as a free software developer, the two are mixed enough that it's
 annoying to keep the two systems in sync. For example, if I find a
 bug in Debian, while doing work, should reporting it and maybe fixing
 it be a work-GTD thing or a personal-GTD thing? It's really both:

Add warning about not getting too involved in implementing GTD
diff --git a/conclusion.mdwn b/conclusion.mdwn
index afd90fe..2405f07 100644
--- a/conclusion.mdwn
+++ b/conclusion.mdwn
@@ -3,3 +3,16 @@ Conclusion
 
 Do stuff.
 Be happy.
+
+A word of warning
+-----------------
+
+It's easy to get too interested in GTD. Initially, it's natural and
+expected that you'll spend some time trying out different ways of
+doing things, and various tools and approaches and so on. However,
+this should not become a primary occupation. The goal is not to have
+GTD as a hobby, since that'll just get in the way of actually doing
+useful things.
+
+The irony of the previous paragraph being written by someone who
+wrote a booklet about GTD is duly noted.

Add note about summary entries in journal
diff --git a/doing.mdwn b/doing.mdwn
index 3e6612d..77668b8 100644
--- a/doing.mdwn
+++ b/doing.mdwn
@@ -42,3 +42,6 @@ be quite satisfactory to read, later on. I've found that deleting
 things gives me more pleasure, though, and I keep track of what I've
 done using a journal instead.
 
+I also write summary entries in my journal of things that I've done
+or that have happened, as part of my weekly review.
+

Added a note of what to do when you've done something
Thanks, Francois Marier, for the suggestion.
diff --git a/doing.mdwn b/doing.mdwn
index f5751e4..3e6612d 100644
--- a/doing.mdwn
+++ b/doing.mdwn
@@ -29,4 +29,16 @@ so when I tell myself that they've not been there for very long, I
 believe myself. That's why I put a date (at least year and month) on
 every next action, so I don't believe my own lies.
 
+After you've done something
+---------------------------
+
+When you're finished with a next action, you can delete it from your list,
+or cross it over, or otherwise mark it as done. This can be a very
+satisfying feeling.
+
+Instead of deleting, you may also want to move the item from your
+next actions list to a list of finished stuff. Such a log can also
+be quite satisfactory to read, later on. I've found that deleting
+things gives me more pleasure, though, and I keep track of what I've
+done using a journal instead.
 
diff --git a/news.mdwn b/news.mdwn
index 6fe9f6d..e286409 100644
--- a/news.mdwn
+++ b/news.mdwn
@@ -13,4 +13,4 @@ Since the alpha-2 tag (April 7, 2012):
 * Added this news page.
 * Added pseudo-code for inbox processing.
 * Added a few notes about how much time doing stuff my way takes.
-
+* Added a note of what to do when you've done something.

Added a few notes about how much time doing stuff my way takes
diff --git a/journalling.mdwn b/journalling.mdwn
index 5a708d4..7b41093 100644
--- a/journalling.mdwn
+++ b/journalling.mdwn
@@ -27,13 +27,20 @@ journal](http://liw.fi/obnam/journal-dump/) for the amusement of
 the Internet.)
 
 Journalling can require a bit of effort,
-but it can also be very helpful.
+but it can be very helpful.
 The process of expressing thought processes in writing makes them more
 explicit, and often more clear.
 Anything that's hard to express tends to be unclear in the head, too.
 Later, a journal can be helpful to answer things like
 "what was I thinking?".
 
+Apart from effort, journalling requires time. I type reasonably fast,
+so the extra time to write down my thoughts in some detail, as prose
+that's easily readable later, is not a big overhead. Others might prefer
+to keep a handwritten journal, and only jot down the more important bits,
+and stick to keywords. Or record audio, perhaps. Experiment with what works
+for you; maybe you'll find something, or maybe you'll find it's all wasteful.
+
 The act of journalling should be as easy as possible.
 There should be minimal steps required to start writing,
 and the only requirement for the actual text should be that it's expressing
diff --git a/news.mdwn b/news.mdwn
index bd0e977..6fe9f6d 100644
--- a/news.mdwn
+++ b/news.mdwn
@@ -12,4 +12,5 @@ Since the alpha-2 tag (April 7, 2012):
   sidebar.
 * Added this news page.
 * Added pseudo-code for inbox processing.
+* Added a few notes about how much time doing stuff my way takes.
 
diff --git a/review.mdwn b/review.mdwn
index 310edac..69148ee 100644
--- a/review.mdwn
+++ b/review.mdwn
@@ -46,6 +46,13 @@ Here's my checklist for doing a weekly review:
 * Review areas of focus, goals.
 * Re-process inbox.
 
+It usually takes me a couple of hours per week to do a good review of
+the entire system. Sometimes more, if I do a thorough review of all
+my open bug reports, for example, but I only do that if I have the
+time, and haven't done it in a while. (A thorough review of the bug
+reports tends to mean reading through everything, and sometimes checking
+that bugs still exist.)
+
 It's common for me to postpone doing a review, if I'm tired or busy
 or have any of a number of other excuses. If it gets really bad, 
 I postpone the

Added pseudo-code for inbox processing
diff --git a/inboxes.mdwn b/inboxes.mdwn
index dede9c4..15941a5 100644
--- a/inboxes.mdwn
+++ b/inboxes.mdwn
@@ -95,6 +95,23 @@ from the inbox. This means you need to have a place to put it, even
 if it is only the trash. We will cover filing systems and other related
 tools later.
 
+    for inbox in inboxes:
+        while len(inbox) > 0:
+            item = inbox.pop()
+            if item.needs_action:
+                if item.can_be_delegated:
+                    item.delegate()
+                    waiting_for.append(item)
+                elif item.is_quick:
+                    item.do()
+                elif len(item.actions) > 1:
+                    projects.append(item)
+                    next_actions.extend(item.actions)
+                else:
+                    next_actions.append(item)
+            elif item.may_be_needed_later:
+                filing_system.put(item)
+
 Bug trackers: not really inboxes
 --------------------------------
 
diff --git a/news.mdwn b/news.mdwn
index b2340d5..bd0e977 100644
--- a/news.mdwn
+++ b/news.mdwn
@@ -11,4 +11,5 @@ Since the alpha-2 tag (April 7, 2012):
 * Made PDF, EPub, and Mobipocket versions available, and linked from the
   sidebar.
 * Added this news page.
+* Added pseudo-code for inbox processing.
 

Start a news page
diff --git a/news.mdwn b/news.mdwn
new file mode 100644
index 0000000..b2340d5
--- /dev/null
+++ b/news.mdwn
@@ -0,0 +1,14 @@
+News about the book/site
+========================
+
+Since the alpha-2 tag (April 7, 2012):
+
+* Fixed a lot of typos, based on feedback from readers. See git commit
+  messages (recent changes page) for names.
+* Improved website navigation with the Ikiwiki trail plugin.
+* Made "recent changes" display diffs.
+* Added a comment moderation policy to the sidebar.
+* Made PDF, EPub, and Mobipocket versions available, and linked from the
+  sidebar.
+* Added this news page.
+

Comment moderation
diff --git a/projects-next-actions/comment_2_08769a03caedc1ba8624a4f42ec0ecf2._comment b/projects-next-actions/comment_2_08769a03caedc1ba8624a4f42ec0ecf2._comment
new file mode 100644
index 0000000..a7c911f
--- /dev/null
+++ b/projects-next-actions/comment_2_08769a03caedc1ba8624a4f42ec0ecf2._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://liw.fi/"
+ nickname="Lars Wirzenius"
+ subject="Re: contexts and projects"
+ date="2012-04-12T23:04:56Z"
+ content="""
+I don't put an action into more than one context. I pick the most suitable context. It's easy to worry too much about details like this, and it can lead to paying too much attention to the system and too little time to actually doing things.
+"""]]

Comment moderation
diff --git a/projects-next-actions/comment_1_ea64ce8d33568364d85f4b067f9c2877._comment b/projects-next-actions/comment_1_ea64ce8d33568364d85f4b067f9c2877._comment
new file mode 100644
index 0000000..2e3cb75
--- /dev/null
+++ b/projects-next-actions/comment_1_ea64ce8d33568364d85f4b067f9c2877._comment
@@ -0,0 +1,12 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawlCvEnNKcZkaENpTs-YA2CH5UOK-yPnL9Y"
+ nickname="Workplace"
+ subject="Contexts and projects"
+ date="2012-04-12T14:42:43Z"
+ content="""
+● How are you dealing with actions that could be put under more than 1 context?
+● How would you suspend an entire project at once (e.g. if you need to free up some time in your schedule) considering that its corresponding actions are potentially recorded on multiple context lists?
+
+Best regards, Luc Glasbeek at www.WorkplaceProsperity.com
+
+"""]]

Add verb to incomplete sentence.
diff --git a/inboxes.mdwn b/inboxes.mdwn
index 93eda4e..dede9c4 100644
--- a/inboxes.mdwn
+++ b/inboxes.mdwn
@@ -11,7 +11,7 @@ Each such folder would be a separate inbox.
 
 A common anti-pattern for people is to keep e-mail in their inboxes.
 They read it, and leave it there. The next time they read e-mail, there
-might more some new mail, which they read, and leave there. Eventually,
+might be some more new mail, which they read, and leave there. Eventually,
 the mail piles up a lot, and it gets hard to find a specific mail you
 may need. Even more importantly, it gets hard to know which mails still
 require you to do something. Perhaps there was a mail from your boss

Correct some grammar inconsistencies.
diff --git a/doing.mdwn b/doing.mdwn
index eed88dd..f5751e4 100644
--- a/doing.mdwn
+++ b/doing.mdwn
@@ -4,8 +4,8 @@ Actually doing things
 This is what it's all about. Everything else exists just to support
 this bit: actually doing the things you need to do.
 
-Doing is usually easy when it's clear what you need to do (a well
-defined next action), 
+Doing is usually easy when it's clear what you need to do (a
+well-defined next action),
 and  you have all the things you need for doing it (proper context),
 and the motivation to do it. If you've got your GTD system working
 smoothly, but things still don't get done, the problem is usually
diff --git a/inboxes.mdwn b/inboxes.mdwn
index 4e4dc0e..93eda4e 100644
--- a/inboxes.mdwn
+++ b/inboxes.mdwn
@@ -129,7 +129,7 @@ Here are the inboxes I use:
 * phone notebook: I use a note taking application on my smartphone as
   a replacement for a notebook, when I can, because my handwriting font
   is abysmally hard to read
-* e-mail: this two inboxes (personal vs work); I don't split mailing list
+* e-mail: these two inboxes (personal vs work); I don't split mailing list
   into separate folders anymore
 * feeds: blogs, news sites, etc.
 * home directory for each computer I regularly use: tends to collect
diff --git a/introduction.mdwn b/introduction.mdwn
index 8e1f55e..44c6111 100644
--- a/introduction.mdwn
+++ b/introduction.mdwn
@@ -77,7 +77,7 @@ so I don't know. I'm not trying to convince you one way or
 another: I explain what I do, and why, and you decide if
 it makes any sense to you.
 
-A brief history of GTD and it's place in the greater sociohistorical context of humanity
+A brief history of GTD and its place in the greater sociohistorical context of humanity
 -----------------------
 
 Personal productivity systems have been around for a long time.

Fix two typos.
Fix spelling of "further" and "knock off".
diff --git a/inboxes.mdwn b/inboxes.mdwn
index 3fb2329..4e4dc0e 100644
--- a/inboxes.mdwn
+++ b/inboxes.mdwn
@@ -19,7 +19,7 @@ you need to re-read? Or a mail from your mother that you need to reply
 to? Or perhaps you replied to her already? Can't remember if you did?
 
 Treating an e-mail folder both as an inbox and an archive of old mail,
-and mixing it futher up as a list of things to do, leads to confusion,
+and mixing it further up as a list of things to do, leads to confusion,
 angst, and stress.
 
 Let's make a small change to e-mail handling. Let's keep only
diff --git a/projects-next-actions.mdwn b/projects-next-actions.mdwn
index ec6d3c0..a6e5826 100644
--- a/projects-next-actions.mdwn
+++ b/projects-next-actions.mdwn
@@ -94,7 +94,7 @@ to find something suitable to do.
 
 Say you're waiting for the bus, and you have maybe ten or fifteen minutes.
 You have your laptop, and there's a place for you to sit. This would be
-a perfect time to knock of an item from your next actions list, but
+a perfect time to knock off an item from your next actions list, but
 what should you do? If it takes five minutes to scan the list and find
 something to do, you've wasted maybe half of your available time. Not good.
 

Add dot to etcetera abbreviation.
diff --git a/inboxes.mdwn b/inboxes.mdwn
index 4fa44ab..3fb2329 100644
--- a/inboxes.mdwn
+++ b/inboxes.mdwn
@@ -76,7 +76,7 @@ easiest to have as few as possible, but experiment with what works
 for you.
 
 Your phone may also be an inbox. For example, text messages, voicemail,
-notes you write on the phone, photos and videos you take, etc, are all
+notes you write on the phone, photos and videos you take, etc., are all
 inbox fodder.
 
 When an input can't easily be put into an inbox, put a proxy there
@@ -120,7 +120,7 @@ Inboxes a la Lars
 
 Here are the inboxes I use:
 
-* physical inbox: letters and other mail, notes written on paper, etc
+* physical inbox: letters and other mail, notes written on paper, etc.
 * wallet: receipts, other bits and pieces that gets collected during the day
 * notebooks: notes made while out and about and phone/laptop wasn't available
 * backpack: random stuff tends to get collected there
@@ -131,9 +131,9 @@ Here are the inboxes I use:
   is abysmally hard to read
 * e-mail: this two inboxes (personal vs work); I don't split mailing list
   into separate folders anymore
-* feeds: blogs, news sites, etc
+* feeds: blogs, news sites, etc.
 * home directory for each computer I regularly use: tends to collect
-  random downloaded files, notes, etc
+  random downloaded files, notes, etc.
 * web browser bookmarks: I move any bookmarks I want to keep to
   a link page on my website, the actual bookmarks are just a quick
   way to save something for later
@@ -142,7 +142,7 @@ Here are the inboxes I use:
   possible to treat the bug tracker as a proper inbox as separate from an
   archive
 * inbox.mdwn: a plain text file (actually using markdown syntax),
-  an all-purpose digital inbox for ideas, notes, URLs, phone numbers, etc
+  an all-purpose digital inbox for ideas, notes, URLs, phone numbers, etc.
 * all my ikiwiki instance's comment moderation queues
 * unprocessed photos from camera phone, real cameras
 * laundry that is drying or is dry: this sometimes gets delivered on my
diff --git a/projects-next-actions.mdwn b/projects-next-actions.mdwn
index dd41dfe..ec6d3c0 100644
--- a/projects-next-actions.mdwn
+++ b/projects-next-actions.mdwn
@@ -40,7 +40,7 @@ project:
 * it's clearly defined (it's done when the corporation is formally and
   legally founded, and has a bank account, accountant, e-mail address,
   and other such things)
-* it takes several steps: decide on name, register, open bank account, etc
+* it takes several steps: decide on name, register, open bank account, etc.
 
 Also like next actions, projects should be finished within a limited
 time, though the time will be much longer. Next actions should typically
@@ -122,7 +122,7 @@ Still, for inspiration, here's the list of contexts I use:
   office, or meet someone outside your normal locations
 * **With person X**: things that need to be discussed with a specific
   person, either in person or perhaps over the phone
-* **At home, not using a computer**: cleaning, dishes, etc
+* **At home, not using a computer**: cleaning, dishes, etc.
 * **At home, using computer**: typically involves a desktop computer, or
   external hard disks, or a printer/scanner, or other hardware that is
   hard to carry
diff --git a/read-and-review.mdwn b/read-and-review.mdwn
index 019ba22..decfaec 100644
--- a/read-and-review.mdwn
+++ b/read-and-review.mdwn
@@ -36,7 +36,7 @@ These days, purely digital things are practical.
   on the format. Unread e-books are on the home screen on my Kindle
   (or if the list grows very long, in a folder for unread books). PDFs
   and other big-page formats are in my laptop's "read and review" folder.
-* I keep paper books, magazines, etc, in random piles around my home and
+* I keep paper books, magazines, etc., in random piles around my home and
   at the office. They're rare enough and few enough that I don't need
   a dedicated place to keep track of them. Likewise for DVDs to watch.
 
diff --git a/review.mdwn b/review.mdwn
index 73f74ab..310edac 100644
--- a/review.mdwn
+++ b/review.mdwn
@@ -9,7 +9,7 @@ its right place, and you've not forgotten anything.
 
 The weekly review is a fundamentally important part of making sure
 you stay on top of things. You need to review all your lists, and
-calendars, inboxes, etc, and have a short meditative moment where
+calendars, inboxes, etc., and have a short meditative moment where
 you reflect your life, and try to think of anything you may have
 missed so far. If you do this regularly, and with some thoroughness,
 you'll be certain that you've captured everything into your system.

Comment moderation
diff --git a/waiting-for/comment_1_d96eff4dabd04661d1a113a06b2833f1._comment b/waiting-for/comment_1_d96eff4dabd04661d1a113a06b2833f1._comment
new file mode 100644
index 0000000..7cc6bd7
--- /dev/null
+++ b/waiting-for/comment_1_d96eff4dabd04661d1a113a06b2833f1._comment
@@ -0,0 +1,7 @@
+[[!comment format=mdwn
+ ip="92.40.253.212"
+ subject="waiting vs in progress"
+ date="2012-04-10T18:34:50Z"
+ content="""
+I really like your separation of something to be done that day and for the next review think this has been a key missing part of my system. Thanks!
+"""]]

Update sidebar ordering, moderation policy
diff --git a/sidebar.mdwn b/sidebar.mdwn
index 9680b96..316d169 100644
--- a/sidebar.mdwn
+++ b/sidebar.mdwn
@@ -1,3 +1,11 @@
+Other formats:
+
+* [EPUB](http://files.liw.fi/gtdfh.epub)
+* [Mobipocket (Kindle)](http://files.liw.fi/gtdfh.mobi)
+* [PDF](http://files.liw.fi/gtdfh.pdf)
+
+<hr />
+
 This is a book-type site written by
 Lars Wirzenius.
 
@@ -14,13 +22,9 @@ Until I can write my own, [Charles Stross's moderation
 policy](http://www.antipope.org/charlie/blog-static/2008/06/moderation-policy.html)
 looks good to me.
 
-<hr />
-
-Other formats:
-
-* [EPUB](http://files.liw.fi/gtdfh.epub)
-* [Mobipocket (Kindle)](http://files.liw.fi/gtdfh.mobi)
-* [PDF](http://files.liw.fi/gtdfh.pdf)
+I won't approve/keep comments about typo fixes, but they're still welcome:
+if you include your name in the comment,
+I'll credit you in the git commit that fixes them.
 
 <hr />
 

Comment moderation
diff --git a/index/comment_5_ceaba2f7b10dd1d45571d4acb3d89356._comment b/index/comment_5_ceaba2f7b10dd1d45571d4acb3d89356._comment
new file mode 100644
index 0000000..b95fb09
--- /dev/null
+++ b/index/comment_5_ceaba2f7b10dd1d45571d4acb3d89356._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://openid.alexandrefranke.com/"
+ nickname="Dedalus"
+ subject="Thank you"
+ date="2012-04-10T10:43:43Z"
+ content="""
+I'm downloading the epub version right away.
+"""]]

Comment moderation
diff --git a/index/comment_4_5771ad8b07f5a26c7a53a3d53e536924._comment b/index/comment_4_5771ad8b07f5a26c7a53a3d53e536924._comment
new file mode 100644
index 0000000..2d15f63
--- /dev/null
+++ b/index/comment_4_5771ad8b07f5a26c7a53a3d53e536924._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://liw.fi/"
+ nickname="Lars Wirzenius"
+ subject="PDF, EPUB, Mobi now available"
+ date="2012-04-09T21:38:33Z"
+ content="""
+See links in sidebar. I'll update them manually, when I've made sufficiently significant changes.
+"""]]

Add sidebar links to other formats of the booklet
diff --git a/sidebar.mdwn b/sidebar.mdwn
index 0418ceb..9680b96 100644
--- a/sidebar.mdwn
+++ b/sidebar.mdwn
@@ -16,6 +16,14 @@ looks good to me.
 
 <hr />
 
+Other formats:
+
+* [EPUB](http://files.liw.fi/gtdfh.epub)
+* [Mobipocket (Kindle)](http://files.liw.fi/gtdfh.mobi)
+* [PDF](http://files.liw.fi/gtdfh.pdf)
+
+<hr />
+
 All non-comment content on this site is copyrighted by Lars Wirzenius, 
 with comments copyrighted by their authors; both content and comments
 are licensed under a 

Typo fix
Thanks, Lisandro Damián Nicanor.
diff --git a/quickie-overview.mdwn b/quickie-overview.mdwn
index 19635d5..119f473 100644
--- a/quickie-overview.mdwn
+++ b/quickie-overview.mdwn
@@ -23,7 +23,7 @@ A condensed summary of GTD:
   - someday/maybe: what you may want to do someday, but isn't an active
     concern right now
 * at least once a week, process all inboxes, and review all lists
-* have an archving system for documents and such
+* have an archiving system for documents and such
 * have a system for keeping handy files and other things relevant
   to current projects and next actions
 

Comment moderation
diff --git a/index/comment_3_11a49cdd7f2fa8bedf3883cb617bba5e._comment b/index/comment_3_11a49cdd7f2fa8bedf3883cb617bba5e._comment
new file mode 100644
index 0000000..b2bb285
--- /dev/null
+++ b/index/comment_3_11a49cdd7f2fa8bedf3883cb617bba5e._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://liw.fi/"
+ nickname="Lars Wirzenius"
+ subject="PDF later, git now"
+ date="2012-04-09T19:39:21Z"
+ content="""
+I'll make ebook and PDF versions of the site available later, when I've sorted out some workflow issues. Philipp, I enabled anonymous branching of site just now.
+"""]]

Comment moderation
diff --git a/index/comment_1_a594e043c362d71a7b8ef870fd1467bd._comment b/index/comment_1_a594e043c362d71a7b8ef870fd1467bd._comment
new file mode 100644
index 0000000..50d41a2
--- /dev/null
+++ b/index/comment_1_a594e043c362d71a7b8ef870fd1467bd._comment
@@ -0,0 +1,7 @@
+[[!comment format=mdwn
+ ip="87.79.104.176"
+ subject="PDF available?"
+ date="2012-04-09T12:02:16Z"
+ content="""
+Is there a PDF version of the whole article available?
+"""]]
diff --git a/index/comment_2_75ab47113f98ce4a47e535aaf8c5f3ac._comment b/index/comment_2_75ab47113f98ce4a47e535aaf8c5f3ac._comment
new file mode 100644
index 0000000..7be0f96
--- /dev/null
+++ b/index/comment_2_75ab47113f98ce4a47e535aaf8c5f3ac._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawkgUir7k_amh9RFp4D3QutX1fGh_nd7ko4"
+ nickname="Philipp"
+ subject="Please allow anonymous checkouts of this site"
+ date="2012-04-09T16:47:22Z"
+ content="""
+For offline reading it would be useful to be able to do anonymous checkouts of this site. Could you allow them, please?
+"""]]
diff --git a/ungood/comment_4_3f783090c52ed56e549b0e94b10a907e._comment b/ungood/comment_4_3f783090c52ed56e549b0e94b10a907e._comment
new file mode 100644
index 0000000..4a1eee0
--- /dev/null
+++ b/ungood/comment_4_3f783090c52ed56e549b0e94b10a907e._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ ip="131.107.0.83"
+ subject="GTD in Emacs"
+ date="2012-04-09T18:13:37Z"
+ content="""
+I'm using GTD on Emacs.  I used to work with org-mode, and I really like it, but I wanted something that would be simpler.  I ended up using TaskPaper mode.  Now I can use that, alopg with TaskPaper on the iPad (sorry, not a totally free solution) with seamless DropBox synchronization.
+
+"""]]

Fix typo
Thanks to Mark.
diff --git a/doing.mdwn b/doing.mdwn
index 3e836bd..eed88dd 100644
--- a/doing.mdwn
+++ b/doing.mdwn
@@ -15,7 +15,7 @@ Sometimes the problem is that the next action is defined vaguely:
 it's not actually clear what you need to do. Perhaps it was clear
 when you were planning it, but you didn't write down enough details
 to remember later why you need to do it, or exactly what needs doing.
-"Call Clara's cell" may what you wrote down, but you can't remember
+"Call Clara's cell" may be what you wrote down, but you can't remember
 which Clara, and whether to call her mobile phone or the jail? You
 need to describe next actions with enough information that you don't
 have uncertainty.

Typo fix
Thanks, anonymous commenter
diff --git a/introduction.mdwn b/introduction.mdwn
index 78ada93..8e1f55e 100644
--- a/introduction.mdwn
+++ b/introduction.mdwn
@@ -112,7 +112,6 @@ I'm currently using [Pandoc](http://johnmacfarlane.net/pandoc/) and
 The book is licensed under a CC-BY-SA 3.0 (Unported) license. However,
 the site is only editable by myself, at least for now. I gratefully
 accept suggestions and will consider patches, but since the book explains
-what I do, I am not sure I want everyone to be able to edit it. I you want
+what I do, I am not sure I want everyone to be able to edit it. If you want
 to make your own version of the book, feel free to branch the site on
 Branchable and make any changes you like to the content.
-

Typo fix
Thanks, anonymous commenter.
diff --git a/waiting-for.mdwn b/waiting-for.mdwn
index e5af7ee..d292f84 100644
--- a/waiting-for.mdwn
+++ b/waiting-for.mdwn
@@ -47,7 +47,7 @@ to remember to check up on when they're finished. For example:
   by lunchtime
 
 The "in progress" list is otherwise like the "waiting for" one, but I
-keeps it at the top of the "next actions" list, so it's always in my
+keep it at the top of the "next actions" list, so it's always in my
 face. This makes it harder to forget stuff that is currently happening.
 The crucial difference, for me, is that "in progress" needs to be
 finished the same day, whereas "waiting for" may usually wait until the

Comment moderation
diff --git a/daily-routine/comment_1_7db865a072eba153c3b72059d2e1d152._comment b/daily-routine/comment_1_7db865a072eba153c3b72059d2e1d152._comment
new file mode 100644
index 0000000..10cc439
--- /dev/null
+++ b/daily-routine/comment_1_7db865a072eba153c3b72059d2e1d152._comment
@@ -0,0 +1,14 @@
+[[!comment format=mdwn
+ username="http://x_mass.livejournal.com/"
+ ip="86.6.186.152"
+ subject="some people cant do routine "
+ date="2012-04-08T23:11:28Z"
+ content="""
+It's clear that you can build routines 
+But the ability to build routines varies 
+It is especially bad or non-existent in individuals with ADHD/ADD
+
+This might seem to make GTD unimplementable, but actually it means tools like GTD are needed more, they just take more time and are less effective than for other people 
+
+kate  
+"""]]
diff --git a/ungood/comment_3_f71fd38c2be09a47af187fe3a271a7cb._comment b/ungood/comment_3_f71fd38c2be09a47af187fe3a271a7cb._comment
new file mode 100644
index 0000000..71d6c73
--- /dev/null
+++ b/ungood/comment_3_f71fd38c2be09a47af187fe3a271a7cb._comment
@@ -0,0 +1,18 @@
+[[!comment format=mdwn
+ username="http://x_mass.livejournal.com/"
+ ip="86.6.186.152"
+ subject="paper based GTD"
+ date="2012-04-08T23:01:53Z"
+ content="""
+I am currently using an A5 filofax for my paper based GTD although I am using a separate paper diary as otherwise the filofax become unwieldy, I am storing lists alphabetically using three sets of dividers as filofax doesn't do enough leaves. I am also using it for short medium and long term projects/goals in the height off ground sense.
+
+Having said that, i still find it limiting and I'm hoping that a solution based on astrid plus plugins such as locale running on a droid 3 will help me achieve better control of myself. If that and other software tools fail, then I might try a combination of Lightscribe pens, printing, home punched filofax paper and evernote/scanners to build a digital/paper based overlaping system.  
+
+i am still at a very early stage of implementing GTD, i still haven't reimplemented my office space, And I'm splitting my IN sort into manageable chunks, so i don't turn molehills into mountains.
+
+All i know is that if i want to do anything with my life, i have to be able to manage myself better than i have up till now 
+
+kate 
+
+  
+"""]]

Comment moderation
diff --git a/ungood/comment_2_d2f07fbb8211f257e105f2b84643ff5f._comment b/ungood/comment_2_d2f07fbb8211f257e105f2b84643ff5f._comment
new file mode 100644
index 0000000..61dae1a
--- /dev/null
+++ b/ungood/comment_2_d2f07fbb8211f257e105f2b84643ff5f._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="http://liw.fi/"
+ nickname="Lars Wirzenius"
+ subject="I've tried Trello"
+ date="2012-04-08T22:47:47Z"
+ content="""
+We tried Trello at work, and based on that I wouldn't accept it as a tool for myself. It may work for others. I don't want to rely on online tools that may or may not be available when I need them; and I travel enough that I'm frequently offline. I'm also not going to rely on non-free software if I can help it.
+
+Disregarding those: I found Trello to be a high-friction tool, actually. As so many tools it wanted to force me to do things its own way. But if you like it, excellent. I'm not advocating my choice of tools to anyone else.
+"""]]

Comment moderation
diff --git a/ungood/comment_1_792076280748b989a52e91720469cccf._comment b/ungood/comment_1_792076280748b989a52e91720469cccf._comment
new file mode 100644
index 0000000..1ad7810
--- /dev/null
+++ b/ungood/comment_1_792076280748b989a52e91720469cccf._comment
@@ -0,0 +1,7 @@
+[[!comment format=mdwn
+ ip="175.36.58.105"
+ subject="Trello"
+ date="2012-04-08T22:19:56Z"
+ content="""
+You should try Trello for TODO style lists. Simple, no-friction todos on the web. It completely replaced paper for me.
+"""]]

Use trail plugin in ikiwiki
diff --git a/index.mdwn b/index.mdwn
index e399aaa..8ffd388 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -1,23 +1,24 @@
 GTD For Hackers
 ===============
 
-* [[Introduction]]
-* [[Quickie overview of the GTD system|quickie-overview]]
-* [[Inputs and inboxes|inboxes]]
-* [[Projects and next actions|projects-next-actions]]
-* [[Doing things|doing]]
-* [[Calendars and reminders|calendars]]
-* [[Journalling and other ways of keeping track of things that have 
-  happened|journalling]]
-* [[Keeping track of files|files]]
-* [[Stuff you maybe want to do someday|someday-maybe]]
-* [[Waiting for things to happen|waiting-for]]
-* [[The daily routine|daily-routine]]
-* [[The weekly review|review]]
-* [[Read and review folders|read-and-review]]
-* [[Automation and checklists|automation]]
-* [[Getting started|getting-started]]
-* [[Things that did not work for me|ungood]]
-* [[Conclusion]]
-* [[References]]
+* [[!traillink Introduction]]
+* [[!traillink quickie-overview text="Quickie overview of the GTD system"]]
+* [[!traillink inboxes text="Inputs and inboxes"]]
+* [[!traillink projects-next-actions text="Projects and next actions"]]
+* [[!traillink doing text="Doing things"]]
+* [[!traillink calendars text="Calendars and reminders"]]
+* [[!traillink journalling 
+    text="Journalling and other ways of keeping track of things that have  
+          happened"]]
+* [[!traillink files text="Keeping track of files"]]
+* [[!traillink someday-maybe text="Stuff you maybe want to do someday"]]
+* [[!traillink waiting-for text="Waiting for things to happen"]]
+* [[!traillink daily-routine text="The daily routine"]]
+* [[!traillink review text="The weekly review"]]
+* [[!traillink read-and-review text="Read and review folders"]]
+* [[!traillink automation text="Automation and checklists"]]
+* [[!traillink getting-started text="Getting started"]]
+* [[!traillink ungood text="Things that did not work for me"]]
+* [[!traillink Conclusion]]
+* [[!traillink References]]
 

removed
diff --git a/mc/comment_1_82148b5b06ab01fd6f19d04b934a6001._comment b/mc/comment_1_82148b5b06ab01fd6f19d04b934a6001._comment
deleted file mode 100644
index ba65bdc..0000000
--- a/mc/comment_1_82148b5b06ab01fd6f19d04b934a6001._comment
+++ /dev/null
@@ -1,7 +0,0 @@
-[[!comment format=mdwn
- ip="188.220.217.129"
- subject="test"
- date="2012-04-08T14:49:57Z"
- content="""
-testing
-"""]]

Comment moderation
diff --git a/mc/comment_1_82148b5b06ab01fd6f19d04b934a6001._comment b/mc/comment_1_82148b5b06ab01fd6f19d04b934a6001._comment
new file mode 100644
index 0000000..ba65bdc
--- /dev/null
+++ b/mc/comment_1_82148b5b06ab01fd6f19d04b934a6001._comment
@@ -0,0 +1,7 @@
+[[!comment format=mdwn
+ ip="188.220.217.129"
+ subject="test"
+ date="2012-04-08T14:49:57Z"
+ content="""
+testing
+"""]]

removed
diff --git a/index/comment_1_3a8755fbc303a1c4359ac3e127299e88._comment b/index/comment_1_3a8755fbc303a1c4359ac3e127299e88._comment
deleted file mode 100644
index 6f5c9d0..0000000
--- a/index/comment_1_3a8755fbc303a1c4359ac3e127299e88._comment
+++ /dev/null
@@ -1,8 +0,0 @@
-[[!comment format=mdwn
- username="https://www.google.com/accounts/o8/id?id=AItOawnh_8WF5XeYEZN20B6L8ohSzLhVminTEC8"
- nickname="Jonathan"
- subject="Great writeup!"
- date="2012-04-08T14:30:22Z"
- content="""
-Concise and a great explanation of a useful task system. Thanks!
-"""]]

Added a comment: Great writeup!
diff --git a/index/comment_1_3a8755fbc303a1c4359ac3e127299e88._comment b/index/comment_1_3a8755fbc303a1c4359ac3e127299e88._comment
new file mode 100644
index 0000000..6f5c9d0
--- /dev/null
+++ b/index/comment_1_3a8755fbc303a1c4359ac3e127299e88._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawnh_8WF5XeYEZN20B6L8ohSzLhVminTEC8"
+ nickname="Jonathan"
+ subject="Great writeup!"
+ date="2012-04-08T14:30:22Z"
+ content="""
+Concise and a great explanation of a useful task system. Thanks!
+"""]]

Typo fixes from Marcos Manoni
Thanks!
diff --git a/calendars.mdwn b/calendars.mdwn
index df4f600..972837d 100644
--- a/calendars.mdwn
+++ b/calendars.mdwn
@@ -47,7 +47,7 @@ keep getting distracted by your computer so that it may take your a
 month to notice that it's time to cut them. And when you do, it's
 because you break a nail, which is a bit painful. After some experimentation
 you decide that twelve days after the previous time is a good time to
-cut your nails. Having your computer remind you about it s makes it
+cut your nails. Having your computer remind you about it makes it
 much more likely that you'll do it when it's time. However, having
 your calendar remind you every twelve days may not work so well,
 because you might be travelling on that 12th day, and the annoying
diff --git a/files.mdwn b/files.mdwn
index d8f0a4e..6559022 100644
--- a/files.mdwn
+++ b/files.mdwn
@@ -15,7 +15,7 @@ unless you can find things from it when you need them.
 
 Files may be digital or on paper. You may have current files on your
 computer, and on paper, and ditto for archived files. This might not
-affect the way you organize them: much of the organization is depdendent
+affect the way you organize them: much of the organization is dependent
 on naming and sorting, and it is probably best to use the same naming
 system for both digital and paper files.
 
diff --git a/inboxes.mdwn b/inboxes.mdwn
index c299290..4fa44ab 100644
--- a/inboxes.mdwn
+++ b/inboxes.mdwn
@@ -102,7 +102,7 @@ Hackers tend to deal with bug trackers, ticketing systems, and similar
 systems. These are not purely inboxes. They're also sort of project
 lists, and next actions lists. I have found it most efficient to use
 them as places to trawl for inbox material. It's not possible to
-remove items from bug trackers just because you've decided what to
+remove items from bug trackers just because you've decided what to do
 with them. Instead, I review the list of open bugs, and see if there's
 anything there that's new or that I need to deal with. If there is, I
 add a proxy into my own inbox (or, sometimes, directly as a next action).
diff --git a/projects-next-actions.mdwn b/projects-next-actions.mdwn
index da9a0d2..dd41dfe 100644
--- a/projects-next-actions.mdwn
+++ b/projects-next-actions.mdwn
@@ -99,7 +99,7 @@ what should you do? If it takes five minutes to scan the list and find
 something to do, you've wasted maybe half of your available time. Not good.
 
 You should break down the list by context or other suitable category.
-A context is the things that are reqwuired for you to do the action:
+A context is the things that are required for you to do the action:
 "at phone" would be the context for anything that requires you to use
 your phone; "online" would be all the things you need Internet access
 to do; "at home" for things you must be at home to do, etc.

Add cover image to ebooks
diff --git a/Makefile b/Makefile
index 343e0c2..ca551f8 100644
--- a/Makefile
+++ b/Makefile
@@ -22,15 +22,19 @@ all: book.pdf book.epub book.mobi
 book.pdf: $(chapters)
 	markdown2pdf --toc -o book.pdf $(chapters)
 
-book.epub: $(chapters)
-	pandoc -t epub --epub-metadata=book.xml -o book.epub $(chapters)
+book.epub: $(chapters) cover.png
+	pandoc -t epub --epub-metadata=book.xml --epub-cover=cover.png \
+	    -o book.epub $(chapters)
 
 book.mobi: book.epub
 	ebook-convert book.epub book.mobi
 
+cover.png: cover.svg
+	inkscape -e cover.png cover.svg
+
 count:
 	wc -w $(chapters)
 	echo 100 '*' $$(cat $(chapters) | wc -w) / 30000 | bc -l
 
 clean:
-	rm -f book.pdf book.html book.epub book.mobi
+	rm -f book.pdf book.html book.epub book.mobi cover.png
diff --git a/cover.svg b/cover.svg
new file mode 100644
index 0000000..0f64ac3
--- /dev/null
+++ b/cover.svg
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="744.09448819"
+   height="1052.3622047"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.1 r9760"
+   sodipodi:docname="cover.svg"
+   inkscape:export-filename="/home/liw/gtdfh.branchable.com/cover.png"
+   inkscape:export-xdpi="89.660004"
+   inkscape:export-ydpi="89.660004">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.49497475"
+     inkscape:cx="13.365389"
+     inkscape:cy="514.28571"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1280"
+     inkscape:window-height="742"
+     inkscape:window-x="0"
+     inkscape:window-y="26"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       style="fill:#dcdcdc;stroke:#000000;stroke-width:11;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;fill-opacity:1"
+       id="rect3024"
+       width="733.37073"
+       height="1040.4572"
+       x="8.0812206"
+       y="7.8644514" />
+    <text
+       xml:space="preserve"
+       style="font-size:72px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:DejaVu Sans Mono;-inkscape-font-specification:DejaVu Sans Mono"
+       x="151.42857"
+       y="243.79076"
+       id="text2985"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan2987"
+         x="151.42857"
+         y="243.79076">Getting</tspan><tspan
+         sodipodi:role="line"
+         x="151.42857"
+         y="333.79077"
+         id="tspan2989">Things</tspan><tspan
+         sodipodi:role="line"
+         x="151.42857"
+         y="423.79077"
+         id="tspan2993">Done</tspan><tspan
+         sodipodi:role="line"
+         x="151.42857"
+         y="513.79077"
+         id="tspan2997">for</tspan><tspan
+         sodipodi:role="line"
+         x="151.42857"
+         y="603.79077"
+         id="tspan2999">Hackers</tspan><tspan
+         sodipodi:role="line"
+         x="151.42857"
+         y="693.79077"
+         id="tspan3814"
+         style="font-size:28px">(alpha 2)</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:72px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans"
+       x="148.57143"
+       y="749.50507"
+       id="text3001"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan3003"
+         x="148.57143"
+         y="749.50507"
+         style="font-size:48px">Lars Wirzenius</tspan></text>
+  </g>
+</svg>

Tweak sidebar on feedback
diff --git a/sidebar.mdwn b/sidebar.mdwn
index 1ed98fe..0418ceb 100644
--- a/sidebar.mdwn
+++ b/sidebar.mdwn
@@ -5,7 +5,9 @@ Lars Wirzenius.
 * [My blog](http://blog.liw.fi)
 * [Branchable](http://www.branchable.com/)
 
-This site is not publically editable, but I welcome comments and feedback!
+This site is not publically editable, but I welcome comments and feedback,
+via the site's commenting system or via e-mail.
+
 However, this being the Internet, I need to point out that
 comments that are unconstructive, unhelpful, or unfunny may be removed.
 Until I can write my own, [Charles Stross's moderation