Recent changes to this wiki:

calendar update
diff --git a/archives/2021.mdwn b/archives/2021.mdwn
new file mode 100644
index 0000000..34206f7
--- /dev/null
+++ b/archives/2021.mdwn
@@ -0,0 +1 @@
+[[!calendar type=year year=2021 pages="posts/* and !*/Discussion"]]
diff --git a/archives/2021/01.mdwn b/archives/2021/01.mdwn
new file mode 100644
index 0000000..ffbc29a
--- /dev/null
+++ b/archives/2021/01.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=01 year=2021 pages="posts/* and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(01) and creation_year(2021) and posts/* and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2021/02.mdwn b/archives/2021/02.mdwn
new file mode 100644
index 0000000..5c921c7
--- /dev/null
+++ b/archives/2021/02.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=02 year=2021 pages="posts/* and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(02) and creation_year(2021) and posts/* and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2021/03.mdwn b/archives/2021/03.mdwn
new file mode 100644
index 0000000..97c247f
--- /dev/null
+++ b/archives/2021/03.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=03 year=2021 pages="posts/* and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(03) and creation_year(2021) and posts/* and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2021/04.mdwn b/archives/2021/04.mdwn
new file mode 100644
index 0000000..a7cef38
--- /dev/null
+++ b/archives/2021/04.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=04 year=2021 pages="posts/* and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(04) and creation_year(2021) and posts/* and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2021/05.mdwn b/archives/2021/05.mdwn
new file mode 100644
index 0000000..57b6c49
--- /dev/null
+++ b/archives/2021/05.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=05 year=2021 pages="posts/* and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(05) and creation_year(2021) and posts/* and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2021/06.mdwn b/archives/2021/06.mdwn
new file mode 100644
index 0000000..aa6f970
--- /dev/null
+++ b/archives/2021/06.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=06 year=2021 pages="posts/* and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(06) and creation_year(2021) and posts/* and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2021/07.mdwn b/archives/2021/07.mdwn
new file mode 100644
index 0000000..fe456df
--- /dev/null
+++ b/archives/2021/07.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=07 year=2021 pages="posts/* and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(07) and creation_year(2021) and posts/* and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2021/08.mdwn b/archives/2021/08.mdwn
new file mode 100644
index 0000000..e91b18e
--- /dev/null
+++ b/archives/2021/08.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=08 year=2021 pages="posts/* and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(08) and creation_year(2021) and posts/* and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2021/09.mdwn b/archives/2021/09.mdwn
new file mode 100644
index 0000000..d8a22c9
--- /dev/null
+++ b/archives/2021/09.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=09 year=2021 pages="posts/* and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(09) and creation_year(2021) and posts/* and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2021/10.mdwn b/archives/2021/10.mdwn
new file mode 100644
index 0000000..5faafe9
--- /dev/null
+++ b/archives/2021/10.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=10 year=2021 pages="posts/* and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(10) and creation_year(2021) and posts/* and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2021/11.mdwn b/archives/2021/11.mdwn
new file mode 100644
index 0000000..b4f7902
--- /dev/null
+++ b/archives/2021/11.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=11 year=2021 pages="posts/* and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(11) and creation_year(2021) and posts/* and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2021/12.mdwn b/archives/2021/12.mdwn
new file mode 100644
index 0000000..85cff4a
--- /dev/null
+++ b/archives/2021/12.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=12 year=2021 pages="posts/* and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(12) and creation_year(2021) and posts/* and !*/Discussion" show=0 feeds=no reverse=yes]]

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

In Transition II
diff --git a/posts/in_transition_ii.mdwn b/posts/in_transition_ii.mdwn
new file mode 100644
index 0000000..c19f969
--- /dev/null
+++ b/posts/in_transition_ii.mdwn
@@ -0,0 +1,39 @@
+[[!meta title="In Transition II"]]
+[[!tag transition doctors singing]]
+
+I don't appear to have much effort to write here in my blog, but since
+I was passing by I thought I'd write an update on my transition; for
+posterity if nothing else.
+
+Over the summer I've had my EV dose doubled; it looks as if 4mg might
+be sufficient to maintain a reasonable Oestradiol level (but we'll
+have to wait for my most recent bloods to be sure); and started on
+decapeptyl - a GnRH antagonist (which causes the body to stop
+producing testosterone).
+
+I have also somehow caused my brain to naturally sing in the upper
+part of my vocal range, at which point all the latent singing skills I
+had from before puberty started have kicked in and produced a singing
+voice I'm actually happy with (even if my ability to stay on pitch is
+still a bit lacking).  Speaking voice will require actual work; and
+I've started watching Z's transvoice videos with an aim of working on
+that.
+
+I now have breasts that are visible to even me, about a 38C bra size;
+and I'm told that some of the fat from my tummy has migrated to my
+bum - although I'm incapable of seeing either of those things.
+
+I spent some time last year with pink hair, but haven't been able to
+leave the house this year to get it redone.
+
+I'm thinking more clearly, more often, and in more convoluted
+sentences.  I cry sometimes and have a mood range that my pre-HRT self
+would have regarded as impossible.  I am happier all the time, even
+when I spend 5 hours crying.
+
+I have also, very cautiously, started drinking alcohol - the reasons
+why I never did don't exist any more, and I actually feel like I'm
+growing up now.
+
+I need to ask my GP to confirm with the GIC that they've even received
+my referal since I've not heard even a squeek out of them.

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

Yes, you are Trans Enough review.
diff --git a/posts/book_review_i_yyare.mdwn b/posts/book_review_i_yyare.mdwn
new file mode 100644
index 0000000..3f89eae
--- /dev/null
+++ b/posts/book_review_i_yyare.mdwn
@@ -0,0 +1,48 @@
+[[!meta title="Book Review I: Yes, You Are Trans Enough"]]
+[[!tag book transition]]
+
+*Yes, you are Trans Enough, my transition from self-loathing to self
+love* by *Mia Violet* is a primarily autobiographical book with some
+reflections and opinions on the state of trans issues in the UK.
+ 
+I've followed Mia on twitter since I was in my own transition egg and
+she was one of the people who produced the environment that made me
+ready to hatch.  She is also a lovely person.  It would probably have
+helped me to read this book at that point, but it wasn't published
+until 2018 by which point my egg was well cracked.  This book is aimed
+at little egg me, but I'd argue that it's also the perfect book for
+anyone with trans friends who wants to understand them better.
+
+Mia starts at the very beginning (a very good place to start) with
+childhood and works her way through indicative experiences, trials,
+and tribulations.  I have to admit that some of the passages had me in
+tears; and in general Mia seems to have had a worse time of things
+than I did, although there are places where I envy her.
+
+I'm actually writing this review having got to page 226; where Mia has
+just taken her first HRT pills because I'm just bursting with love for
+this book.  On every page there's an experience either I've had myself
+or I know a friend has had; and these things are so hard to talk
+about.  Mia is a very brave person for having put all of these
+thoughts and experiences into print and I want everyone to benefit
+from them.
+
+Once I've finished the remaining third of the book (which ends with a
+happy Mia, I hasten to add) it's available for any of my friends in
+Cambridge to borrow.  It's also available on Kindle as well as in
+print.
+
+Title
+: Yes, you are Trans Enough
+
+Author
+: Violet, Mia
+
+Published
+: 2018
+
+Reviewed Format
+: Paperback
+
+ISBN
+: 978 1 78592 315 9

calendar update
diff --git a/archives/2020.mdwn b/archives/2020.mdwn
new file mode 100644
index 0000000..dbf69ba
--- /dev/null
+++ b/archives/2020.mdwn
@@ -0,0 +1 @@
+[[!calendar type=year year=2020 pages="posts/* and !*/Discussion"]]
diff --git a/archives/2020/01.mdwn b/archives/2020/01.mdwn
new file mode 100644
index 0000000..194f598
--- /dev/null
+++ b/archives/2020/01.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=01 year=2020 pages="posts/* and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(01) and creation_year(2020) and posts/* and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2020/02.mdwn b/archives/2020/02.mdwn
new file mode 100644
index 0000000..3ef226f
--- /dev/null
+++ b/archives/2020/02.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=02 year=2020 pages="posts/* and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(02) and creation_year(2020) and posts/* and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2020/03.mdwn b/archives/2020/03.mdwn
new file mode 100644
index 0000000..709a6bb
--- /dev/null
+++ b/archives/2020/03.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=03 year=2020 pages="posts/* and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(03) and creation_year(2020) and posts/* and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2020/04.mdwn b/archives/2020/04.mdwn
new file mode 100644
index 0000000..7fd2de6
--- /dev/null
+++ b/archives/2020/04.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=04 year=2020 pages="posts/* and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(04) and creation_year(2020) and posts/* and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2020/05.mdwn b/archives/2020/05.mdwn
new file mode 100644
index 0000000..afe1ce8
--- /dev/null
+++ b/archives/2020/05.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=05 year=2020 pages="posts/* and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(05) and creation_year(2020) and posts/* and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2020/06.mdwn b/archives/2020/06.mdwn
new file mode 100644
index 0000000..40b0911
--- /dev/null
+++ b/archives/2020/06.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=06 year=2020 pages="posts/* and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(06) and creation_year(2020) and posts/* and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2020/07.mdwn b/archives/2020/07.mdwn
new file mode 100644
index 0000000..bdbe588
--- /dev/null
+++ b/archives/2020/07.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=07 year=2020 pages="posts/* and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(07) and creation_year(2020) and posts/* and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2020/08.mdwn b/archives/2020/08.mdwn
new file mode 100644
index 0000000..e602753
--- /dev/null
+++ b/archives/2020/08.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=08 year=2020 pages="posts/* and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(08) and creation_year(2020) and posts/* and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2020/09.mdwn b/archives/2020/09.mdwn
new file mode 100644
index 0000000..8325aa1
--- /dev/null
+++ b/archives/2020/09.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=09 year=2020 pages="posts/* and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(09) and creation_year(2020) and posts/* and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2020/10.mdwn b/archives/2020/10.mdwn
new file mode 100644
index 0000000..c58e4dd
--- /dev/null
+++ b/archives/2020/10.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=10 year=2020 pages="posts/* and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(10) and creation_year(2020) and posts/* and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2020/11.mdwn b/archives/2020/11.mdwn
new file mode 100644
index 0000000..e51cb6d
--- /dev/null
+++ b/archives/2020/11.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=11 year=2020 pages="posts/* and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(11) and creation_year(2020) and posts/* and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2020/12.mdwn b/archives/2020/12.mdwn
new file mode 100644
index 0000000..543d122
--- /dev/null
+++ b/archives/2020/12.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=12 year=2020 pages="posts/* and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(12) and creation_year(2020) and posts/* and !*/Discussion" show=0 feeds=no reverse=yes]]

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

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

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

In Transition I
diff --git a/posts/in_transition_i.mdwn b/posts/in_transition_i.mdwn
new file mode 100644
index 0000000..8edd983
--- /dev/null
+++ b/posts/in_transition_i.mdwn
@@ -0,0 +1,26 @@
+[[!meta title="In Transition I"]]
+[[!tag transition pills doctors]]
+
+I haven't written here yet about transitioning; maybe I'll put down
+some of my thoughts another time, but suffice it for now to say that I
+started transitioning at some point in the last 12 months depending on
+when you count.
+
+For reasons mostly relating to the waiting lists for NHS GICs being
+ludicrously long I have gone private for a dysphoria diagnosis and to
+start on hormones.  My GP is willing to have a Shared Care arrangement
+which means that the private gender specialists take care of me for
+gender-related stuff and she does the rest; including continuing
+prescriptions started by the gender people.
+
+A few days ago I got my prescription for Estradiol Valerate (girl
+hormones!).  This was a private prescription but it turns out EV isn't
+very expensive anyway.  I'm starting on a 2mg dose which is maybe a
+quarter of what I might expect to be on eventually; and they don't
+start you on antiandrogens until they see how your body responds to
+the oestogens - some people don't need them at all.
+
+I haven't really noticed any changes yet; although I think I might
+occasionally have flashes of extra smell sensitivity.
+
+[[!img "IMG_20190409_145946.jpg" size=640x alt="Estradion Valerate Tablets"]]
diff --git a/posts/in_transition_i/IMG_20190409_145946.jpg b/posts/in_transition_i/IMG_20190409_145946.jpg
new file mode 100644
index 0000000..f670c7a
Binary files /dev/null and b/posts/in_transition_i/IMG_20190409_145946.jpg differ

calendar update
diff --git a/archives/2019.mdwn b/archives/2019.mdwn
new file mode 100644
index 0000000..c33ddaf
--- /dev/null
+++ b/archives/2019.mdwn
@@ -0,0 +1 @@
+[[!calendar type=year year=2019 pages="posts/* and !*/Discussion"]]
diff --git a/archives/2019/01.mdwn b/archives/2019/01.mdwn
new file mode 100644
index 0000000..96526e2
--- /dev/null
+++ b/archives/2019/01.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=01 year=2019 pages="posts/* and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(01) and creation_year(2019) and posts/* and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2019/02.mdwn b/archives/2019/02.mdwn
new file mode 100644
index 0000000..64256b2
--- /dev/null
+++ b/archives/2019/02.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=02 year=2019 pages="posts/* and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(02) and creation_year(2019) and posts/* and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2019/03.mdwn b/archives/2019/03.mdwn
new file mode 100644
index 0000000..d7f6df2
--- /dev/null
+++ b/archives/2019/03.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=03 year=2019 pages="posts/* and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(03) and creation_year(2019) and posts/* and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2019/04.mdwn b/archives/2019/04.mdwn
new file mode 100644
index 0000000..4685ed1
--- /dev/null
+++ b/archives/2019/04.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=04 year=2019 pages="posts/* and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(04) and creation_year(2019) and posts/* and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2019/05.mdwn b/archives/2019/05.mdwn
new file mode 100644
index 0000000..e5d00f9
--- /dev/null
+++ b/archives/2019/05.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=05 year=2019 pages="posts/* and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(05) and creation_year(2019) and posts/* and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2019/06.mdwn b/archives/2019/06.mdwn
new file mode 100644
index 0000000..073890f
--- /dev/null
+++ b/archives/2019/06.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=06 year=2019 pages="posts/* and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(06) and creation_year(2019) and posts/* and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2019/07.mdwn b/archives/2019/07.mdwn
new file mode 100644
index 0000000..6698a47
--- /dev/null
+++ b/archives/2019/07.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=07 year=2019 pages="posts/* and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(07) and creation_year(2019) and posts/* and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2019/08.mdwn b/archives/2019/08.mdwn
new file mode 100644
index 0000000..a001a5f
--- /dev/null
+++ b/archives/2019/08.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=08 year=2019 pages="posts/* and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(08) and creation_year(2019) and posts/* and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2019/09.mdwn b/archives/2019/09.mdwn
new file mode 100644
index 0000000..4e76c37
--- /dev/null
+++ b/archives/2019/09.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=09 year=2019 pages="posts/* and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(09) and creation_year(2019) and posts/* and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2019/10.mdwn b/archives/2019/10.mdwn
new file mode 100644
index 0000000..8043b0b
--- /dev/null
+++ b/archives/2019/10.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=10 year=2019 pages="posts/* and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(10) and creation_year(2019) and posts/* and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2019/11.mdwn b/archives/2019/11.mdwn
new file mode 100644
index 0000000..568a665
--- /dev/null
+++ b/archives/2019/11.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=11 year=2019 pages="posts/* and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(11) and creation_year(2019) and posts/* and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2019/12.mdwn b/archives/2019/12.mdwn
new file mode 100644
index 0000000..c12615b
--- /dev/null
+++ b/archives/2019/12.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=12 year=2019 pages="posts/* and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(12) and creation_year(2019) and posts/* and !*/Discussion" show=0 feeds=no reverse=yes]]

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

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

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

SW Advent day I
diff --git a/posts/sw_advent_i.mdwn b/posts/sw_advent_i.mdwn
new file mode 100644
index 0000000..1e4f42c
--- /dev/null
+++ b/posts/sw_advent_i.mdwn
@@ -0,0 +1,6 @@
+[[!meta title="Star Wars Advent Calendar I"]]
+[[!tag lego starwars photo]]
+
+Landspeeder from my first advent calendar door.
+
+[[!img "IMG_20181201_180032.jpg" size=620x alt="Day One, Landspeeder"]]
diff --git a/posts/sw_advent_i/IMG_20181201_180032.jpg b/posts/sw_advent_i/IMG_20181201_180032.jpg
new file mode 100644
index 0000000..713ee9c
Binary files /dev/null and b/posts/sw_advent_i/IMG_20181201_180032.jpg differ

calendar update
diff --git a/archives/2018.mdwn b/archives/2018.mdwn
new file mode 100644
index 0000000..e2bd8d7
--- /dev/null
+++ b/archives/2018.mdwn
@@ -0,0 +1 @@
+[[!calendar type=year year=2018 pages="posts/* and !*/Discussion"]]
diff --git a/archives/2018/01.mdwn b/archives/2018/01.mdwn
new file mode 100644
index 0000000..cb660ab
--- /dev/null
+++ b/archives/2018/01.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=01 year=2018 pages="posts/* and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(01) and creation_year(2018) and posts/* and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2018/02.mdwn b/archives/2018/02.mdwn
new file mode 100644
index 0000000..8342965
--- /dev/null
+++ b/archives/2018/02.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=02 year=2018 pages="posts/* and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(02) and creation_year(2018) and posts/* and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2018/03.mdwn b/archives/2018/03.mdwn
new file mode 100644
index 0000000..e21c5f3
--- /dev/null
+++ b/archives/2018/03.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=03 year=2018 pages="posts/* and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(03) and creation_year(2018) and posts/* and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2018/04.mdwn b/archives/2018/04.mdwn
new file mode 100644
index 0000000..d608ceb
--- /dev/null
+++ b/archives/2018/04.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=04 year=2018 pages="posts/* and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(04) and creation_year(2018) and posts/* and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2018/05.mdwn b/archives/2018/05.mdwn
new file mode 100644
index 0000000..bf7b8a8
--- /dev/null
+++ b/archives/2018/05.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=05 year=2018 pages="posts/* and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(05) and creation_year(2018) and posts/* and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2018/06.mdwn b/archives/2018/06.mdwn
new file mode 100644
index 0000000..56695a0
--- /dev/null
+++ b/archives/2018/06.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=06 year=2018 pages="posts/* and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(06) and creation_year(2018) and posts/* and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2018/07.mdwn b/archives/2018/07.mdwn
new file mode 100644
index 0000000..9c763c5
--- /dev/null
+++ b/archives/2018/07.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=07 year=2018 pages="posts/* and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(07) and creation_year(2018) and posts/* and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2018/08.mdwn b/archives/2018/08.mdwn
new file mode 100644
index 0000000..db4bbaf
--- /dev/null
+++ b/archives/2018/08.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=08 year=2018 pages="posts/* and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(08) and creation_year(2018) and posts/* and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2018/09.mdwn b/archives/2018/09.mdwn
new file mode 100644
index 0000000..5f59d37
--- /dev/null
+++ b/archives/2018/09.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=09 year=2018 pages="posts/* and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(09) and creation_year(2018) and posts/* and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2018/10.mdwn b/archives/2018/10.mdwn
new file mode 100644
index 0000000..99c23db
--- /dev/null
+++ b/archives/2018/10.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=10 year=2018 pages="posts/* and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(10) and creation_year(2018) and posts/* and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2018/11.mdwn b/archives/2018/11.mdwn
new file mode 100644
index 0000000..2a9a752
--- /dev/null
+++ b/archives/2018/11.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=11 year=2018 pages="posts/* and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(11) and creation_year(2018) and posts/* and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2018/12.mdwn b/archives/2018/12.mdwn
new file mode 100644
index 0000000..d4bec99
--- /dev/null
+++ b/archives/2018/12.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=12 year=2018 pages="posts/* and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(12) and creation_year(2018) and posts/* and !*/Discussion" show=0 feeds=no reverse=yes]]

three buttons
diff --git a/posts/installing_debian_on_xps13_9350.mdwn b/posts/installing_debian_on_xps13_9350.mdwn
index d2882b9..1611b8b 100644
--- a/posts/installing_debian_on_xps13_9350.mdwn
+++ b/posts/installing_debian_on_xps13_9350.mdwn
@@ -498,7 +498,8 @@ After Installation
     + triple finger clicks as middle
     + clicks in the bottom right as right
     + double finger drags as scrollwheel
-    
+*   If you want to use an external USB mouse note that the default
+    setup doesn't do Emulate3Buttons
 
 
 [^1]: The list of files that iwlwifi complains are missing are 20, 19, 18, 17, 16, 15, 14, and 13.ucode but the ones from the ubuntu image appear to be sufficient.

calendar update
diff --git a/archives/2017.mdwn b/archives/2017.mdwn
new file mode 100644
index 0000000..c2fd9e5
--- /dev/null
+++ b/archives/2017.mdwn
@@ -0,0 +1 @@
+[[!calendar type=year year=2017 pages="posts/* and !*/Discussion"]]
diff --git a/archives/2017/01.mdwn b/archives/2017/01.mdwn
new file mode 100644
index 0000000..c029047
--- /dev/null
+++ b/archives/2017/01.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=01 year=2017 pages="posts/* and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(01) and creation_year(2017) and posts/* and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2017/02.mdwn b/archives/2017/02.mdwn
new file mode 100644
index 0000000..19e3f71
--- /dev/null
+++ b/archives/2017/02.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=02 year=2017 pages="posts/* and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(02) and creation_year(2017) and posts/* and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2017/03.mdwn b/archives/2017/03.mdwn
new file mode 100644
index 0000000..896f8da
--- /dev/null
+++ b/archives/2017/03.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=03 year=2017 pages="posts/* and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(03) and creation_year(2017) and posts/* and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2017/04.mdwn b/archives/2017/04.mdwn
new file mode 100644
index 0000000..d344e10
--- /dev/null
+++ b/archives/2017/04.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=04 year=2017 pages="posts/* and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(04) and creation_year(2017) and posts/* and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2017/05.mdwn b/archives/2017/05.mdwn
new file mode 100644
index 0000000..2aeb207
--- /dev/null
+++ b/archives/2017/05.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=05 year=2017 pages="posts/* and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(05) and creation_year(2017) and posts/* and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2017/06.mdwn b/archives/2017/06.mdwn
new file mode 100644
index 0000000..2bffd55
--- /dev/null
+++ b/archives/2017/06.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=06 year=2017 pages="posts/* and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(06) and creation_year(2017) and posts/* and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2017/07.mdwn b/archives/2017/07.mdwn
new file mode 100644
index 0000000..44ade5d
--- /dev/null
+++ b/archives/2017/07.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=07 year=2017 pages="posts/* and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(07) and creation_year(2017) and posts/* and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2017/08.mdwn b/archives/2017/08.mdwn
new file mode 100644
index 0000000..7a02e2e
--- /dev/null
+++ b/archives/2017/08.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=08 year=2017 pages="posts/* and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(08) and creation_year(2017) and posts/* and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2017/09.mdwn b/archives/2017/09.mdwn
new file mode 100644
index 0000000..8dae84c
--- /dev/null
+++ b/archives/2017/09.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=09 year=2017 pages="posts/* and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(09) and creation_year(2017) and posts/* and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2017/10.mdwn b/archives/2017/10.mdwn
new file mode 100644
index 0000000..0e53ee5
--- /dev/null
+++ b/archives/2017/10.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=10 year=2017 pages="posts/* and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(10) and creation_year(2017) and posts/* and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2017/11.mdwn b/archives/2017/11.mdwn
new file mode 100644
index 0000000..c7a078e
--- /dev/null
+++ b/archives/2017/11.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=11 year=2017 pages="posts/* and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(11) and creation_year(2017) and posts/* and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2017/12.mdwn b/archives/2017/12.mdwn
new file mode 100644
index 0000000..c5bcca4
--- /dev/null
+++ b/archives/2017/12.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=12 year=2017 pages="posts/* and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(12) and creation_year(2017) and posts/* and !*/Discussion" show=0 feeds=no reverse=yes]]

Wifi card
diff --git a/posts/installing_debian_on_xps13_9350.mdwn b/posts/installing_debian_on_xps13_9350.mdwn
index 8ea816e..d2882b9 100644
--- a/posts/installing_debian_on_xps13_9350.mdwn
+++ b/posts/installing_debian_on_xps13_9350.mdwn
@@ -481,6 +481,8 @@ After Installation
     so have xdm and a window manager ready.  Doing this while using
     the X server appears to put the system in a not very consistent
     state so I'd recommend rebooting after.
+*   Also after removing systemd you'll lose network-manager and will
+    have to set up some other way of configuring your wireless card.
 
 **mouse**
 

Installation!
diff --git a/posts/installing_debian_on_xps13_9350.mdwn b/posts/installing_debian_on_xps13_9350.mdwn
index 5dbea4a..8ea816e 100644
--- a/posts/installing_debian_on_xps13_9350.mdwn
+++ b/posts/installing_debian_on_xps13_9350.mdwn
@@ -49,8 +49,8 @@ Setup
 7.  Restart the laptop and press F2 when the Dell logo appears to enter
     BIOS setup mode.
 8.  Under "Secure Boot > Secure Boot Enable" select (•) Disabled.
-9.  Under "General > Advanced Boot Options" select [✓] Enable Legacy
-    Option ROMs.
+9.  If you have any problem booting the USB then under "General >
+    Advanced Boot Options" select [✓] Enable Legacy Option ROMs.
 10. Apply your changes.
 11. You may want to change other settings here.  In particular if you
     want to run VMs on your system ensure that the Virtualization
@@ -345,4 +345,158 @@ destructively installing debian.
 
 (To Be Continued...)
 
+Installation
+------------
+
+28. Repeat the above boot instructions to boot the install USB again.
+29. I wish to install without systemd, so following
+    [[the instructions on wiki.debian.org|https://wiki.debian.org/systemd#Installing_without_systemd]]
+    I will postpend:
+    
+        preseed/late_command="in-target apt-get install -y sysvinit-core"
+        
+    to my grub command line.
+30. This time you'll want to load crypto-dm-modules if you want to do
+    encrypted filesystems.
+31. Continue with the standard installation path:
+    + Set up users and passwords
+    + Configure the clock
+    + Detect disks
+32. Partition disks:
+    + This is what I have before starting:
+    
+        /dev/nvme0n1 - 512.1 GB Unknown                           
+        >             1.0 MB        FREE SPACE                    
+        >     #1    524.3 MB  B     fat32       EFI system p      
+        >     #2      3.2 GB        fat32       Basic data p      
+        >     #3     34.4 GB        ext4                          
+        >     #4      8.6 GB     F  swap                      swap
+        >           465.4 GB        FREE SPACE                    
+    
+    + Set the swap space to "do not use"
+    + I'm setting #3 (the ubuntu partition) to mount on /mnt/danae
+    + Add a partition for /boot - I'm giving this 4GB
+    + Add a partition for "physical volume for encryption".  I'm
+      filling the rest of the disk with it.
+    + Configure encrypted volumes
+    + Set the encrypted volume as "physical volume for LVM"
+    + Configure the Logical Volume Manager
+        - Create volume group
+        - Create whatever lvs you want
+    + Add whatever partitions you want
+    + My final setup looks like:
+    
+        Encrypted volume (nvme0n1p6_crypt) - 461.4 GB Linux device-mapper 
+        >     #1    461.4 GB     K  lvm                                   
+        LVM VG vg-nvme, LV game-base - 9.0 GB Linux device-mapper (linear 
+        >     #1      9.0 GB                                              
+        LVM VG vg-nvme, LV home - 160.0 GB Linux device-mapper (linear)   
+        >     #1    160.0 GB     f  ext4                      /home       
+        LVM VG vg-nvme, LV slash - 4.0 GB Linux device-mapper (linear)    
+        >     #1      4.0 GB     f  ext4                      /           
+        LVM VG vg-nvme, LV swap - 40.0 GB Linux device-mapper (linear)    
+        >     #1     40.0 GB     f  swap                      swap        
+        LVM VG vg-nvme, LV usr - 16.0 GB Linux device-mapper (linear)     
+        >     #1     16.0 GB     f  ext4                      /usr        
+        LVM VG vg-nvme, LV var - 16.0 GB Linux device-mapper (linear)     
+        >     #1     16.0 GB     f  ext4                      /var        
+        /dev/nvme0n1 - 512.1 GB Unknown                                   
+        >             1.0 MB        FREE SPACE                            
+        >     #1    524.3 MB  B     fat32       EFI system p              
+        >     #2      3.2 GB        fat32       Basic data p              
+        >     #3     34.4 GB     K  ext4                      /mnt/danae  
+        >     #4      8.6 GB        swap                                  
+        >     #5      4.0 GB     F  ext4        boot          /boot       
+        >     #6    461.4 GB     K  crypto                    (nvme0n1p6_ 
+        >           335.4 kB        FREE SPACE                            
+
+    + Finish partitioning and write changes to disk
+33. Install the base system
+    + linux-image-amd64
+    + Targeted initrd
+34. Configure the package manager
+35. Select and install software.  I'm going for:
+
+        [*] Debian desktop environment
+        [ ] ... GNOME                 
+        [ ] ... Xfce                  
+        [ ] ... KDE                   
+        [ ] ... Cinnamon              
+        [ ] ... MATE                  
+        [ ] ... LXDE                  
+        [*] web server                
+        [*] print server              
+        [*] SSH server                
+        [*] standard system utilities 
+        [ ] Debian Pure Blends        
+        [ ] ... Debian Astro          
+        [ ] ... Debian Edu            
+        [ ] ... Debian EzGo           
+        [ ] ... Debian Games          
+        [ ] ... Debian GIS            
+        [ ] ... Hamradio              
+        [ ] ... Debian Junior         
+        [ ] ... Debian Med            
+        [ ] ... DebianMultimedia      
+        [ ] ... Debian Science        
+        [ ] ... DebiChem              
+
+36. Wait around for a while.  Don't do what I did and let the laptop
+    run out of battery.
+    This took about 15 minutes for me.
+37. Install the GRUB boot loader on a hard disk.
+38. Finish the installation.
+39. The system will reboot.  All being well debian should be the top
+    of the EFI boot order and Debian's grub should therefore start up.
+40. Unfortunately something in the installation process went wrong for
+    me and I never got a grub.cfg installed only a grub.cfg.new.  This
+    can be booted from with:
+
+        normal (hd0,gpt5)/grub/grub.cfg.new
+        
+41. Hopefully you should now have a shiny new Debian login prompt.
+    Oddly this appears to be on VC1.  To fix the grub problem log in
+    as root and then update-grub.
+    
+After Installation
+------------------
+
+**udev**
+
+*   The default install has a number of annoying udev rules that
+    rename your network interfaces to crazy unique things.
+    
+    These rules can be overriden by adding new rules files in
+    /etc/udev/rules.d .  I have created empty files called
+
+        73-usb-net-by-mac.rules
+        75-net-description.rules
+
+    You might also want 99-systemd.rules if you're keeping systemd.
+
+**systemd**
+
+*   The system installs with still far too much systemd for my
+    liking.  Imma purge it all.  This will also remove gdm3 and gnome 
+    so have xdm and a window manager ready.  Doing this while using
+    the X server appears to put the system in a not very consistent
+    state so I'd recommend rebooting after.
+
+**mouse**
+
+*   psmouse and synaptics don't play nice together.
+    
+        blacklist psmouse
+
+    in /etc/modprobe.d/modprobe.conf will stop the system loading
+    psmouse.
+*   By default synaptics ignores taps, and treats 
+    + single finger clicks as left
+    + double finger clicks as right
+    + triple finger clicks as middle
+    + clicks in the bottom right as right
+    + double finger drags as scrollwheel
+    
+
+
 [^1]: The list of files that iwlwifi complains are missing are 20, 19, 18, 17, 16, 15, 14, and 13.ucode but the ones from the ubuntu image appear to be sufficient.

Typo
diff --git a/posts/installing_debian_on_xps13_9350.mdwn b/posts/installing_debian_on_xps13_9350.mdwn
index 42d62d4..5dbea4a 100644
--- a/posts/installing_debian_on_xps13_9350.mdwn
+++ b/posts/installing_debian_on_xps13_9350.mdwn
@@ -345,4 +345,4 @@ destructively installing debian.
 
 (To Be Continued...)
 
-[^1]: The list of tiles that iwlwifi complains are missing are 20, 19, 18, 17, 16, 15, 14, and 13.ucode but the ones from the ubuntu image appear to be sufficient.
+[^1]: The list of files that iwlwifi complains are missing are 20, 19, 18, 17, 16, 15, 14, and 13.ucode but the ones from the ubuntu image appear to be sufficient.

Convert broken fenced code blocks into indented code blocks
diff --git a/posts/installing_debian_on_xps13_9350.mdwn b/posts/installing_debian_on_xps13_9350.mdwn
index 9cdd7f4..42d62d4 100644
--- a/posts/installing_debian_on_xps13_9350.mdwn
+++ b/posts/installing_debian_on_xps13_9350.mdwn
@@ -189,161 +189,151 @@ destructively installing debian.
     Debian.
 20. Resize /dev/nvme0n1p3 to minimum size:
 
-    ```
-    ~ # e2fsck -f /dev/nvme0n1p3
-    e2fsck 1.43-WIP (15-Mar-2016)
-    Pass 1: Checking inodes, blocks, and sizes
-    Pass 2: Checking directory structure
-    Pass 3: Checking directory connectivity
-    Pass 4: Checking reference counts
-    Pass 5: Checking group summary information
-    /dev/nvme0n1p3: 226904/28950528 files (0.1% non-contiguous),
-    3497825/115802112 blocks
-    ~ # resize2fs -p /dev/nvme0n1p3 4000000
-    resize2fs 1.43-WIP (15-Mar-2016)
-    Resizing the filesystem on /dev/nvme0n1p3 to 4000000 (4k) blocks.
-    Begin pass 2 (max = 672429)
-    Relocating blocks
-    XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-    Begin pass 3 (max = 3534)
-    Scanning inode table
-    XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-    Begin pass 4 (max = 23529)
-    Updating inode references
-    XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
-    The filesystem on /dev/nvme0n1p3 is now 4000000 (4k) blocks long.
-    ```
+        ~ # e2fsck -f /dev/nvme0n1p3
+        e2fsck 1.43-WIP (15-Mar-2016)
+        Pass 1: Checking inodes, blocks, and sizes
+        Pass 2: Checking directory structure
+        Pass 3: Checking directory connectivity
+        Pass 4: Checking reference counts
+        Pass 5: Checking group summary information
+        /dev/nvme0n1p3: 226904/28950528 files (0.1% non-contiguous),
+        3497825/115802112 blocks
+        ~ # resize2fs -p /dev/nvme0n1p3 4000000
+        resize2fs 1.43-WIP (15-Mar-2016)
+        Resizing the filesystem on /dev/nvme0n1p3 to 4000000 (4k) blocks.
+        Begin pass 2 (max = 672429)
+        Relocating blocks
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+        Begin pass 3 (max = 3534)
+        Scanning inode table
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+        Begin pass 4 (max = 23529)
+        Updating inode references
+        XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+        The filesystem on /dev/nvme0n1p3 is now 4000000 (4k) blocks long.
 21. Resize the partition in the partition table:
 
-    ```
-    ~ # fdisk /dev/nvme0n1
-    
-    Welcome to fdisk (util-linux 2.28).
-    Changes will remain in memory only, until you decide to write
-    them.
-    Be careful before using the write command.
-    
-    
-    Command (m for help): d
-    Partition number (1-4, default 4): 3
-    
-    Partition 3 has been deleted.
-    
-    Command (m for help): n
-    Partition number (3,5-128, default 3):
-    First sector (7317504-1000215182, default 7317504):
-    Last sector, +sectors or +size{K,M,G,T,P} (7317504-933734399,
-    default 933734399): +32G
-    
-    Created a new partition 3 of type 'Linux filesystem' and of size
-    32 GiB.
-    
-    Command (m for help): p
-    Disk /dev/nvme0n1: 477 GiB, 512110190592 bytes, 1000215216 sectors
-    Units: sectors of 1 * 512 = 512 bytes
-    Sector size (logical/physical): 512 bytes / 512 bytes
-    I/O size (minimum/optimal): 512 bytes / 512 bytes
-    Disklabel type: gpt
-    Disk identifier: 6F4D25D6-8E9A-4642-91F6-8B9123AE66AB
-    
-    Device             Start        End  Sectors  Size Type
-    /dev/nvme0n1p1      2048    1026047  1024000  500M EFI System
-    /dev/nvme0n1p2   1026048    7317503  6291456    3G Microsoft basic data
-    /dev/nvme0n1p3   7317504   74426367 67108864   32G Linux filesystem
-    /dev/nvme0n1p4 933734400 1000214527 66480128 31.7G Linux swap
-    
-    Command (m for help): w
-    The partition table has been altered.
-    Calling ioctl() to re-read partition table.
-    Syncing disks.
-    ```
+        ~ # fdisk /dev/nvme0n1
+
+        Welcome to fdisk (util-linux 2.28).
+        Changes will remain in memory only, until you decide to write
+        them.
+        Be careful before using the write command.
+
+
+        Command (m for help): d
+        Partition number (1-4, default 4): 3
+
+        Partition 3 has been deleted.
+
+        Command (m for help): n
+        Partition number (3,5-128, default 3):
+        First sector (7317504-1000215182, default 7317504):
+        Last sector, +sectors or +size{K,M,G,T,P} (7317504-933734399,
+        default 933734399): +32G
+
+        Created a new partition 3 of type 'Linux filesystem' and of size
+        32 GiB.
+
+        Command (m for help): p
+        Disk /dev/nvme0n1: 477 GiB, 512110190592 bytes, 1000215216 sectors
+        Units: sectors of 1 * 512 = 512 bytes
+        Sector size (logical/physical): 512 bytes / 512 bytes
+        I/O size (minimum/optimal): 512 bytes / 512 bytes
+        Disklabel type: gpt
+        Disk identifier: 6F4D25D6-8E9A-4642-91F6-8B9123AE66AB
+
+        Device             Start        End  Sectors  Size Type
+        /dev/nvme0n1p1      2048    1026047  1024000  500M EFI System
+        /dev/nvme0n1p2   1026048    7317503  6291456    3G Microsoft basic data
+        /dev/nvme0n1p3   7317504   74426367 67108864   32G Linux filesystem
+        /dev/nvme0n1p4 933734400 1000214527 66480128 31.7G Linux swap
+
+        Command (m for help): w
+        The partition table has been altered.
+        Calling ioctl() to re-read partition table.
+        Syncing disks.
 22. Resize /dev/nvme0n1p3 to fill the whole partition:
 
-    ```
-    ~ # e2fsck -f /dev/nvme0n1p3
-    e2fsck 1.43-WIP (15-Mar-2016)
-    Pass 1: Checking inodes, blocks, and sizes
-    Pass 2: Checking directory structure
-    Pass 3: Checking directory connectivity
-    Pass 4: Checking reference counts
-    Pass 5: Checking group summary information
-    /dev/nvme0n1p3: 226904/1007616 files (0.3% non-contiguous),
-    1736567/4000000 blocks
-    ~ # resize2fs -p /dev/nvme0n1p3
-    resize2fs 1.43-WIP (15-Mar-2016)
-    Resizing the filesystem on /dev/nvme0n1p3 to 8388608 (4k) blocks.
-    The filesystem on /dev/nvme0n1p3 is now 8388608 (4k) blocks long.
-    ```
+        ~ # e2fsck -f /dev/nvme0n1p3
+        e2fsck 1.43-WIP (15-Mar-2016)
+        Pass 1: Checking inodes, blocks, and sizes
+        Pass 2: Checking directory structure
+        Pass 3: Checking directory connectivity
+        Pass 4: Checking reference counts
+        Pass 5: Checking group summary information
+        /dev/nvme0n1p3: 226904/1007616 files (0.3% non-contiguous),
+        1736567/4000000 blocks
+        ~ # resize2fs -p /dev/nvme0n1p3
+        resize2fs 1.43-WIP (15-Mar-2016)
+        Resizing the filesystem on /dev/nvme0n1p3 to 8388608 (4k) blocks.
+        The filesystem on /dev/nvme0n1p3 is now 8388608 (4k) blocks long.
 23. Mount /dev/nvme0n1p3 and have a quick check to ensure all is OK:
 
-    ```
-    ~ # mount -oro /dev/nvme0n1p3 /mnt/
-    ~ # ls /mnt/
-    bin         etc         lib32       mnt         run         tmp
-    boot        home        lib64       opt         sbin        usr
-    cdrom       initrd.img  lost+found  proc        srv         var
-    dev         lib         media       root        sys
-    vmlinuz
-    ~ # df /mnt/ -h
-    Filesystem                Size      Used Available Use% Mounted on
-    /dev/nvme0n1p3           31.4G      6.3G     23.5G  21% /mnt
-    ~ # umount /mnt/    
-    ```
+        ~ # mount -oro /dev/nvme0n1p3 /mnt/
+        ~ # ls /mnt/
+        bin         etc         lib32       mnt         run         tmp
+        boot        home        lib64       opt         sbin        usr
+        cdrom       initrd.img  lost+found  proc        srv         var
+        dev         lib         media       root        sys
+        vmlinuz
+        ~ # df /mnt/ -h
+        Filesystem                Size      Used Available Use% Mounted on
+        /dev/nvme0n1p3           31.4G      6.3G     23.5G  21% /mnt
+        ~ # umount /mnt/    
 24. Remove the current swap partition and create a new one:
 
-    ```
-    ~ # fdisk /dev/nvme0n1
-    
-    Welcome to fdisk (util-linux 2.28).

(Diff truncated)
How about an indented code block?
diff --git a/posts/installing_debian_on_xps13_9350.mdwn b/posts/installing_debian_on_xps13_9350.mdwn
index b420c55..9cdd7f4 100644
--- a/posts/installing_debian_on_xps13_9350.mdwn
+++ b/posts/installing_debian_on_xps13_9350.mdwn
@@ -101,78 +101,74 @@ destructively installing debian.
 18. Alternatively Alt-→ again to use the console.
 19. Some system information:
 
-    ```
-    Blargh
+        ~ # fdisk -l /dev/nvme0n1
+        Disk /dev/nvme0n1: 477 GiB, 512110190592 bytes, 1000215216 sectors
+        Units: sectors of 1 * 512 = 512 bytes
+        Sector size (logical/physical): 512 bytes / 512 bytes
+        I/O size (minimum/optimal): 512 bytes / 512 bytes
+        Disklabel type: gpt
+        Disk identifier: 6F4D25D6-8E9A-4642-91F6-8B9123AE66AB
 
-    ~ # fdisk -l /dev/nvme0n1
-    Disk /dev/nvme0n1: 477 GiB, 512110190592 bytes, 1000215216 sectors
-    Units: sectors of 1 * 512 = 512 bytes
-    Sector size (logical/physical): 512 bytes / 512 bytes
-    I/O size (minimum/optimal): 512 bytes / 512 bytes
-    Disklabel type: gpt
-    Disk identifier: 6F4D25D6-8E9A-4642-91F6-8B9123AE66AB
-    
-    Device             Start        End   Sectors   Size Type
-    /dev/nvme0n1p1      2048    1026047   1024000   500M EFI System
-    /dev/nvme0n1p2   1026048    7317503   6291456     3G Microsoft basic data
-    /dev/nvme0n1p3   7317504  933734399 926416896 441.8G Linux filesystem
-    /dev/nvme0n1p4 933734400 1000214527  66480128  31.7G Linux swap
-    ~ # mount -oro /dev/nvme0n1p3 /mnt
-    ~ # df -h /dev/nvme0n1p3
-    Filesystem                Size      Used Available Use% Mounted on
-    /dev/nvme0n1p3          434.7G      6.3G    406.3G   2% /mnt
-    ~ # umount /dev/nvme0n1p3
-    ~ # tune2fs -l /dev/nvme0n1p3
-    tune2fs 1.43-WIP (15-Mar-2016)
-    Filesystem volume name:   <none>
-    Last mounted on:          /
-    Filesystem UUID:          a64ddc80-e9a1-4002-b509-ab82813b4c89
-    Filesystem magic number:  0xEF53
-    Filesystem revision #:    1 (dynamic)
-    Filesystem features:      has_journal ext_attr resize_inode
-    dir_index filetype extent flex_bg sparse_super large_file
-    huge_file uninit_bg dir_nlink extra_isize
-    Filesystem flags:         signed_directory_hash
-    Default mount options:    user_xattr acl
-    Filesystem state:         clean
-    Errors behavior:          Continue
-    Filesystem OS type:       Linux
-    Inode count:              28950528
-    Block count:              115802112
-    Reserved block count:     5790105
-    Free blocks:              112304287
-    Free inodes:              28723624
-    First block:              0
-    Block size:               4096
-    Fragment size:            4096
-    Reserved GDT blocks:      996
-    Blocks per group:         32768
-    Fragments per group:      32768
-    Inodes per group:         8192
-    Inode blocks per group:   512
-    Flex block group size:    16
-    Filesystem created:       Tue May 24 17:01:33 2016
-    Last mount time:          Wed Jun  8 22:49:18 2016
-    Last write time:          Wed Jun  8 22:49:18 2016
-    Mount count:              23
-    Maximum mount count:      -1
-    Last checked:             Tue May 24 17:01:33 2016
-    Check interval:           0 (<none>)
-    Lifetime writes:          16 GB
-    Reserved blocks uid:      0 (user root)
-    Reserved blocks gid:      0 (group root)
-    First inode:              11
-    Inode size:               256
-    Required extra isize:     28
-    Desired extra isize:      28
-    Journal inode:            8
-    Default directory hash:   half_md4
-    Directory Hash Seed:      d91fc1a7-cf0d-48c4-a69e-b96c4768ec41
-    Journal backup:           inode blocks    
-    ~ # resize2fs -P /dev/nvme0n1p3
-    resize2fs 1.43-WIP (15-Mar-2016)
-    Estimated minimum size of the filesystem: 2060940    
-    ```
+        Device             Start        End   Sectors   Size Type
+        /dev/nvme0n1p1      2048    1026047   1024000   500M EFI System
+        /dev/nvme0n1p2   1026048    7317503   6291456     3G Microsoft basic data
+        /dev/nvme0n1p3   7317504  933734399 926416896 441.8G Linux filesystem
+        /dev/nvme0n1p4 933734400 1000214527  66480128  31.7G Linux swap
+        ~ # mount -oro /dev/nvme0n1p3 /mnt
+        ~ # df -h /dev/nvme0n1p3
+        Filesystem                Size      Used Available Use% Mounted on
+        /dev/nvme0n1p3          434.7G      6.3G    406.3G   2% /mnt
+        ~ # umount /dev/nvme0n1p3
+        ~ # tune2fs -l /dev/nvme0n1p3
+        tune2fs 1.43-WIP (15-Mar-2016)
+        Filesystem volume name:   <none>
+        Last mounted on:          /
+        Filesystem UUID:          a64ddc80-e9a1-4002-b509-ab82813b4c89
+        Filesystem magic number:  0xEF53
+        Filesystem revision #:    1 (dynamic)
+        Filesystem features:      has_journal ext_attr resize_inode
+        dir_index filetype extent flex_bg sparse_super large_file
+        huge_file uninit_bg dir_nlink extra_isize
+        Filesystem flags:         signed_directory_hash
+        Default mount options:    user_xattr acl
+        Filesystem state:         clean
+        Errors behavior:          Continue
+        Filesystem OS type:       Linux
+        Inode count:              28950528
+        Block count:              115802112
+        Reserved block count:     5790105
+        Free blocks:              112304287
+        Free inodes:              28723624
+        First block:              0
+        Block size:               4096
+        Fragment size:            4096
+        Reserved GDT blocks:      996
+        Blocks per group:         32768
+        Fragments per group:      32768
+        Inodes per group:         8192
+        Inode blocks per group:   512
+        Flex block group size:    16
+        Filesystem created:       Tue May 24 17:01:33 2016
+        Last mount time:          Wed Jun  8 22:49:18 2016
+        Last write time:          Wed Jun  8 22:49:18 2016
+        Mount count:              23
+        Maximum mount count:      -1
+        Last checked:             Tue May 24 17:01:33 2016
+        Check interval:           0 (<none>)
+        Lifetime writes:          16 GB
+        Reserved blocks uid:      0 (user root)
+        Reserved blocks gid:      0 (group root)
+        First inode:              11
+        Inode size:               256
+        Required extra isize:     28
+        Desired extra isize:      28
+        Journal inode:            8
+        Default directory hash:   half_md4
+        Directory Hash Seed:      d91fc1a7-cf0d-48c4-a69e-b96c4768ec41
+        Journal backup:           inode blocks    
+        ~ # resize2fs -P /dev/nvme0n1p3
+        resize2fs 1.43-WIP (15-Mar-2016)
+        Estimated minimum size of the filesystem: 2060940    
     
     + /dev/nvme0n1p1 is the EFI partition.
     + /dev/nvme0n1p2 appears to contain the same stuff as the ubuntu

?
diff --git a/posts/installing_debian_on_xps13_9350.mdwn b/posts/installing_debian_on_xps13_9350.mdwn
index 57d2f69..b420c55 100644
--- a/posts/installing_debian_on_xps13_9350.mdwn
+++ b/posts/installing_debian_on_xps13_9350.mdwn
@@ -101,7 +101,8 @@ destructively installing debian.
 18. Alternatively Alt-→ again to use the console.
 19. Some system information:
 
-    ~~~
+    ```
+    Blargh
 
     ~ # fdisk -l /dev/nvme0n1
     Disk /dev/nvme0n1: 477 GiB, 512110190592 bytes, 1000215216 sectors
@@ -171,7 +172,7 @@ destructively installing debian.
     ~ # resize2fs -P /dev/nvme0n1p3
     resize2fs 1.43-WIP (15-Mar-2016)
     Estimated minimum size of the filesystem: 2060940    
-    ~~~
+    ```
     
     + /dev/nvme0n1p1 is the EFI partition.
     + /dev/nvme0n1p2 appears to contain the same stuff as the ubuntu

?
diff --git a/posts/installing_debian_on_xps13_9350.mdwn b/posts/installing_debian_on_xps13_9350.mdwn
index 2e48454..57d2f69 100644
--- a/posts/installing_debian_on_xps13_9350.mdwn
+++ b/posts/installing_debian_on_xps13_9350.mdwn
@@ -101,7 +101,7 @@ destructively installing debian.
 18. Alternatively Alt-→ again to use the console.
 19. Some system information:
 
-    ```
+    ~~~
 
     ~ # fdisk -l /dev/nvme0n1
     Disk /dev/nvme0n1: 477 GiB, 512110190592 bytes, 1000215216 sectors
@@ -171,7 +171,7 @@ destructively installing debian.
     ~ # resize2fs -P /dev/nvme0n1p3
     resize2fs 1.43-WIP (15-Mar-2016)
     Estimated minimum size of the filesystem: 2060940    
-    ```
+    ~~~
     
     + /dev/nvme0n1p1 is the EFI partition.
     + /dev/nvme0n1p2 appears to contain the same stuff as the ubuntu

?
diff --git a/posts/installing_debian_on_xps13_9350.mdwn b/posts/installing_debian_on_xps13_9350.mdwn
index 35f096d..2e48454 100644
--- a/posts/installing_debian_on_xps13_9350.mdwn
+++ b/posts/installing_debian_on_xps13_9350.mdwn
@@ -102,6 +102,7 @@ destructively installing debian.
 19. Some system information:
 
     ```
+
     ~ # fdisk -l /dev/nvme0n1
     Disk /dev/nvme0n1: 477 GiB, 512110190592 bytes, 1000215216 sectors
     Units: sectors of 1 * 512 = 512 bytes

Try to fix up formatting
diff --git a/posts/installing_debian_on_xps13_9350.mdwn b/posts/installing_debian_on_xps13_9350.mdwn
index 0845a5e..35f096d 100644
--- a/posts/installing_debian_on_xps13_9350.mdwn
+++ b/posts/installing_debian_on_xps13_9350.mdwn
@@ -99,7 +99,9 @@ destructively installing debian.
     * Log in from your desktop
     * Select "Start shell"
 18. Alternatively Alt-→ again to use the console.
-19. ```
+19. Some system information:
+
+    ```
     ~ # fdisk -l /dev/nvme0n1
     Disk /dev/nvme0n1: 477 GiB, 512110190592 bytes, 1000215216 sectors
     Units: sectors of 1 * 512 = 512 bytes
@@ -188,6 +190,7 @@ destructively installing debian.
     *NOTE:* This swap isn't encrypted, so we don't want to use it for
     Debian.
 20. Resize /dev/nvme0n1p3 to minimum size:
+
     ```
     ~ # e2fsck -f /dev/nvme0n1p3
     e2fsck 1.43-WIP (15-Mar-2016)
@@ -213,6 +216,7 @@ destructively installing debian.
     The filesystem on /dev/nvme0n1p3 is now 4000000 (4k) blocks long.
     ```
 21. Resize the partition in the partition table:
+
     ```
     ~ # fdisk /dev/nvme0n1
     
@@ -256,6 +260,7 @@ destructively installing debian.
     Syncing disks.
     ```
 22. Resize /dev/nvme0n1p3 to fill the whole partition:
+
     ```
     ~ # e2fsck -f /dev/nvme0n1p3
     e2fsck 1.43-WIP (15-Mar-2016)
@@ -272,6 +277,7 @@ destructively installing debian.
     The filesystem on /dev/nvme0n1p3 is now 8388608 (4k) blocks long.
     ```
 23. Mount /dev/nvme0n1p3 and have a quick check to ensure all is OK:
+
     ```
     ~ # mount -oro /dev/nvme0n1p3 /mnt/
     ~ # ls /mnt/
@@ -286,6 +292,7 @@ destructively installing debian.
     ~ # umount /mnt/    
     ```
 24. Remove the current swap partition and create a new one:
+
     ```
     ~ # fdisk /dev/nvme0n1
     
@@ -339,6 +346,7 @@ destructively installing debian.
     Setting up swapspace version 1, size = 8589930496 bytes
     UUID=ffe6618f-66cd-4f1f-ac24-3463b18aae40
     ```
+
     Remember the UUID, you'll want it later.
 25. Back on the laptop select "Abort the installation" and reboot into
     Ubuntu.  I had some graphical oddities at this stage; wait until

Repartitioning
diff --git a/posts/installing_debian_on_xps13_9350.mdwn b/posts/installing_debian_on_xps13_9350.mdwn
index d883d67..0845a5e 100644
--- a/posts/installing_debian_on_xps13_9350.mdwn
+++ b/posts/installing_debian_on_xps13_9350.mdwn
@@ -55,6 +55,7 @@ Setup
 11. You may want to change other settings here.  In particular if you
     want to run VMs on your system ensure that the Virtualization
     settings are turned on.
+12. Exit
 
 *NOTE:* We need to remember to turn Legacy Option ROMs off once we're
 done.
@@ -62,7 +63,289 @@ done.
 *NOTE:* Debian doesn't currently support Secure Boot; but probably
 will do in the future.
 
+Repartitioning
+--------------
 
+This sequence could probably be combined with installation below; but
+I'm paranoid and want to ensure I can still run ubuntu before
+destructively installing debian.
+
+13. Press F12 when the Dell logo appears to enter BIOS Boot Menu
+14. Select USB
+15. After a few seconds the laptop will beep very loudly and GRUB will
+    come up.  Select Advanced Options > Expert Installation.
+16. Run the following stages of the installer menu:
+    * Choose Language
+    * Configure the keyboard
+    * Detect and mount CD-ROM
+    * Load installer components from CD: loading network-console
+    * Detect network hardware:
+        + This will prompt for a removable media with the firmware
+          files as above<sup>[^1]</sup>.  d-i probably won't detect
+          the partition on sda3; so Alt-→ to the next console and do:
+          
+          ```
+          mount -oext2 /dev/sda3 /media
+          ```
+        + Alt-← to return to the installer menu.
+        + d-i will prompt for the missing firmware files again, but
+          won't complain if you tell it to scan again.
+    * Configure the network
+    * Detect disks
+17. Configure installation remotely using SSH.  This isn't really
+    necessary but it makes life significantly easier.
+    * This will prompt for a password and then give instructions for
+      logging in remotely.
+    * Log in from your desktop
+    * Select "Start shell"
+18. Alternatively Alt-→ again to use the console.
+19. ```
+    ~ # fdisk -l /dev/nvme0n1
+    Disk /dev/nvme0n1: 477 GiB, 512110190592 bytes, 1000215216 sectors
+    Units: sectors of 1 * 512 = 512 bytes
+    Sector size (logical/physical): 512 bytes / 512 bytes
+    I/O size (minimum/optimal): 512 bytes / 512 bytes
+    Disklabel type: gpt
+    Disk identifier: 6F4D25D6-8E9A-4642-91F6-8B9123AE66AB
+    
+    Device             Start        End   Sectors   Size Type
+    /dev/nvme0n1p1      2048    1026047   1024000   500M EFI System
+    /dev/nvme0n1p2   1026048    7317503   6291456     3G Microsoft basic data
+    /dev/nvme0n1p3   7317504  933734399 926416896 441.8G Linux filesystem
+    /dev/nvme0n1p4 933734400 1000214527  66480128  31.7G Linux swap
+    ~ # mount -oro /dev/nvme0n1p3 /mnt
+    ~ # df -h /dev/nvme0n1p3
+    Filesystem                Size      Used Available Use% Mounted on
+    /dev/nvme0n1p3          434.7G      6.3G    406.3G   2% /mnt
+    ~ # umount /dev/nvme0n1p3
+    ~ # tune2fs -l /dev/nvme0n1p3
+    tune2fs 1.43-WIP (15-Mar-2016)
+    Filesystem volume name:   <none>
+    Last mounted on:          /
+    Filesystem UUID:          a64ddc80-e9a1-4002-b509-ab82813b4c89
+    Filesystem magic number:  0xEF53
+    Filesystem revision #:    1 (dynamic)
+    Filesystem features:      has_journal ext_attr resize_inode
+    dir_index filetype extent flex_bg sparse_super large_file
+    huge_file uninit_bg dir_nlink extra_isize
+    Filesystem flags:         signed_directory_hash
+    Default mount options:    user_xattr acl
+    Filesystem state:         clean
+    Errors behavior:          Continue
+    Filesystem OS type:       Linux
+    Inode count:              28950528
+    Block count:              115802112
+    Reserved block count:     5790105
+    Free blocks:              112304287
+    Free inodes:              28723624
+    First block:              0
+    Block size:               4096
+    Fragment size:            4096
+    Reserved GDT blocks:      996
+    Blocks per group:         32768
+    Fragments per group:      32768
+    Inodes per group:         8192
+    Inode blocks per group:   512
+    Flex block group size:    16
+    Filesystem created:       Tue May 24 17:01:33 2016
+    Last mount time:          Wed Jun  8 22:49:18 2016
+    Last write time:          Wed Jun  8 22:49:18 2016
+    Mount count:              23
+    Maximum mount count:      -1
+    Last checked:             Tue May 24 17:01:33 2016
+    Check interval:           0 (<none>)
+    Lifetime writes:          16 GB
+    Reserved blocks uid:      0 (user root)
+    Reserved blocks gid:      0 (group root)
+    First inode:              11
+    Inode size:               256
+    Required extra isize:     28
+    Desired extra isize:      28
+    Journal inode:            8
+    Default directory hash:   half_md4
+    Directory Hash Seed:      d91fc1a7-cf0d-48c4-a69e-b96c4768ec41
+    Journal backup:           inode blocks    
+    ~ # resize2fs -P /dev/nvme0n1p3
+    resize2fs 1.43-WIP (15-Mar-2016)
+    Estimated minimum size of the filesystem: 2060940    
+    ```
+    
+    + /dev/nvme0n1p1 is the EFI partition.
+    + /dev/nvme0n1p2 appears to contain the same stuff as the ubuntu
+      USB we made earlier; presumably it's the installer for the base
+      install.
+    + /dev/nvme0n1p3 is the main ubuntu install.
+    + /dev/nvme0n1p4 is the ubuntu swap.
+    
+    We want to resize /dev/nvme0n1p3 to, say, 32G.  tune2fs says the
+    block size is 4k and resize2fs estimates a minimum size of 2060940
+    blocks so that's about 8G, which is all consistent.
+    
+    We want to move the ubuntu swap to just after the ubuntu partition
+    and resize it; I think 8G should be enough since I'm not planning
+    on doing anything hard in ubuntu.
+    
+    *NOTE:* This swap isn't encrypted, so we don't want to use it for
+    Debian.
+20. Resize /dev/nvme0n1p3 to minimum size:
+    ```
+    ~ # e2fsck -f /dev/nvme0n1p3
+    e2fsck 1.43-WIP (15-Mar-2016)
+    Pass 1: Checking inodes, blocks, and sizes
+    Pass 2: Checking directory structure
+    Pass 3: Checking directory connectivity
+    Pass 4: Checking reference counts
+    Pass 5: Checking group summary information
+    /dev/nvme0n1p3: 226904/28950528 files (0.1% non-contiguous),
+    3497825/115802112 blocks
+    ~ # resize2fs -p /dev/nvme0n1p3 4000000
+    resize2fs 1.43-WIP (15-Mar-2016)
+    Resizing the filesystem on /dev/nvme0n1p3 to 4000000 (4k) blocks.
+    Begin pass 2 (max = 672429)
+    Relocating blocks
+    XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+    Begin pass 3 (max = 3534)
+    Scanning inode table
+    XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+    Begin pass 4 (max = 23529)
+    Updating inode references
+    XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+    The filesystem on /dev/nvme0n1p3 is now 4000000 (4k) blocks long.
+    ```
+21. Resize the partition in the partition table:
+    ```
+    ~ # fdisk /dev/nvme0n1
+    
+    Welcome to fdisk (util-linux 2.28).
+    Changes will remain in memory only, until you decide to write
+    them.
+    Be careful before using the write command.
+    
+    
+    Command (m for help): d
+    Partition number (1-4, default 4): 3
+    
+    Partition 3 has been deleted.
+    
+    Command (m for help): n
+    Partition number (3,5-128, default 3):
+    First sector (7317504-1000215182, default 7317504):
+    Last sector, +sectors or +size{K,M,G,T,P} (7317504-933734399,
+    default 933734399): +32G
+    
+    Created a new partition 3 of type 'Linux filesystem' and of size
+    32 GiB.
+    
+    Command (m for help): p
+    Disk /dev/nvme0n1: 477 GiB, 512110190592 bytes, 1000215216 sectors
+    Units: sectors of 1 * 512 = 512 bytes
+    Sector size (logical/physical): 512 bytes / 512 bytes
+    I/O size (minimum/optimal): 512 bytes / 512 bytes
+    Disklabel type: gpt
+    Disk identifier: 6F4D25D6-8E9A-4642-91F6-8B9123AE66AB
+    
+    Device             Start        End  Sectors  Size Type
+    /dev/nvme0n1p1      2048    1026047  1024000  500M EFI System
+    /dev/nvme0n1p2   1026048    7317503  6291456    3G Microsoft basic data

(Diff truncated)
18 not 28
diff --git a/posts/installing_debian_on_xps13_9350.mdwn b/posts/installing_debian_on_xps13_9350.mdwn
index 5b2ae9a..d883d67 100644
--- a/posts/installing_debian_on_xps13_9350.mdwn
+++ b/posts/installing_debian_on_xps13_9350.mdwn
@@ -66,4 +66,4 @@ will do in the future.
 
 (To Be Continued...)
 
-[^1]: The list of tiles that iwlwifi complains are missing are 20, 19, 28, 17, 16, 15, 14, and 13.ucode but the ones from the ubuntu image appear to be sufficient.
+[^1]: The list of tiles that iwlwifi complains are missing are 20, 19, 18, 17, 16, 15, 14, and 13.ucode but the ones from the ubuntu image appear to be sufficient.

Bullet
diff --git a/posts/installing_debian_on_xps13_9350.mdwn b/posts/installing_debian_on_xps13_9350.mdwn
index b1633ed..5b2ae9a 100644
--- a/posts/installing_debian_on_xps13_9350.mdwn
+++ b/posts/installing_debian_on_xps13_9350.mdwn
@@ -48,7 +48,7 @@ Setup
 6.  Shut down ubuntu
 7.  Restart the laptop and press F2 when the Dell logo appears to enter
     BIOS setup mode.
-8.  Under "Secure Boot > Secure Boot Enable" select (*) Disabled.
+8.  Under "Secure Boot > Secure Boot Enable" select (•) Disabled.
 9.  Under "General > Advanced Boot Options" select [✓] Enable Legacy
     Option ROMs.
 10. Apply your changes.
@@ -66,6 +66,4 @@ will do in the future.
 
 (To Be Continued...)
 
-----
-
 [^1]: The list of tiles that iwlwifi complains are missing are 20, 19, 28, 17, 16, 15, 14, and 13.ucode but the ones from the ubuntu image appear to be sufficient.

...
diff --git a/posts/installing_debian_on_xps13_9350.mdwn b/posts/installing_debian_on_xps13_9350.mdwn
index 5a1ec8b..b1633ed 100644
--- a/posts/installing_debian_on_xps13_9350.mdwn
+++ b/posts/installing_debian_on_xps13_9350.mdwn
@@ -40,7 +40,7 @@ Setup
 3.  Add another partition and format it.  We're going to put the
     wireless firmware on this partiton.
 4.  Mount the third partition on /mnt
-5.  Create a directory 'firmware' on the third partition and[^1]:
+5.  Create a directory 'firmware' on the third partition and<sup>[^1]</sup>:
 
     ```
     cp /lib/firmware/iwlwifi-8000C-* /mnt/firmware/
@@ -68,4 +68,4 @@ will do in the future.
 
 ----
 
-[^1]: The list of tiles that iwlwifi complains are missing are 20, 19, 28, 17, 16, 15, 14, and 13.ucode but the ones from the ubuntu image appear to be sufficient.]
+[^1]: The list of tiles that iwlwifi complains are missing are 20, 19, 28, 17, 16, 15, 14, and 13.ucode but the ones from the ubuntu image appear to be sufficient.

Footnote
diff --git a/posts/installing_debian_on_xps13_9350.mdwn b/posts/installing_debian_on_xps13_9350.mdwn
index fae8ab1..5a1ec8b 100644
--- a/posts/installing_debian_on_xps13_9350.mdwn
+++ b/posts/installing_debian_on_xps13_9350.mdwn
@@ -40,13 +40,11 @@ Setup
 3.  Add another partition and format it.  We're going to put the
     wireless firmware on this partiton.
 4.  Mount the third partition on /mnt
-5.  Create a directory 'firmware' on the third partition and:
+5.  Create a directory 'firmware' on the third partition and[^1]:
 
     ```
     cp /lib/firmware/iwlwifi-8000C-* /mnt/firmware/
-    ```
-    
-    [^The list of tiles that iwlwifi complains are missing are 20, 19, 28, 17, 16, 15, 14, and 13.ucode but the ones from the ubuntu image appear to be sufficient.]
+    ```    
 6.  Shut down ubuntu
 7.  Restart the laptop and press F2 when the Dell logo appears to enter
     BIOS setup mode.
@@ -67,3 +65,7 @@ will do in the future.
 
 
 (To Be Continued...)
+
+----
+
+[^1]: The list of tiles that iwlwifi complains are missing are 20, 19, 28, 17, 16, 15, 14, and 13.ucode but the ones from the ubuntu image appear to be sufficient.]

More formatting
diff --git a/posts/installing_debian_on_xps13_9350.mdwn b/posts/installing_debian_on_xps13_9350.mdwn
index d44c1e3..fae8ab1 100644
--- a/posts/installing_debian_on_xps13_9350.mdwn
+++ b/posts/installing_debian_on_xps13_9350.mdwn
@@ -31,6 +31,7 @@ Setup
     * Don't forget to label the stick or you'll get confused later.
 2.  Write the install image to to the other USB stick.
     * This used to require dd but nowadays you can just do it with cp.
+
       ```
       cp installer.iso /dev/sdd
       ```
@@ -40,9 +41,11 @@ Setup
     wireless firmware on this partiton.
 4.  Mount the third partition on /mnt
 5.  Create a directory 'firmware' on the third partition and:
+
     ```
     cp /lib/firmware/iwlwifi-8000C-* /mnt/firmware/
     ```
+    
     [^The list of tiles that iwlwifi complains are missing are 20, 19, 28, 17, 16, 15, 14, and 13.ucode but the ones from the ubuntu image appear to be sufficient.]
 6.  Shut down ubuntu
 7.  Restart the laptop and press F2 when the Dell logo appears to enter

Maybe this markdown implementation doesn't like brackets?
diff --git a/posts/installing_debian_on_xps13_9350.mdwn b/posts/installing_debian_on_xps13_9350.mdwn
index 12f9007..d44c1e3 100644
--- a/posts/installing_debian_on_xps13_9350.mdwn
+++ b/posts/installing_debian_on_xps13_9350.mdwn
@@ -24,34 +24,34 @@ desktop.
 Setup
 -----
 
-1)  Start the laptop as per the Quick Start Guide and get Ubuntu set
+1.  Start the laptop as per the Quick Start Guide and get Ubuntu set
     up.
     * During the Ubuntu setup it will prompt you for one of your USB
       sticks to make a liveusb.
     * Don't forget to label the stick or you'll get confused later.
-2)  Write the install image to to the other USB stick.
+2.  Write the install image to to the other USB stick.
     * This used to require dd but nowadays you can just do it with cp.
       ```
       cp installer.iso /dev/sdd
       ```
     * Don't forget to label the stick or you'll get confused later.
     The installer image will include two partitions.
-3)  Add another partition and format it.  We're going to put the
+3.  Add another partition and format it.  We're going to put the
     wireless firmware on this partiton.
-4)  Mount the third partition on /mnt
-5)  Create a directory 'firmware' on the third partition and:
+4.  Mount the third partition on /mnt
+5.  Create a directory 'firmware' on the third partition and:
     ```
     cp /lib/firmware/iwlwifi-8000C-* /mnt/firmware/
     ```
     [^The list of tiles that iwlwifi complains are missing are 20, 19, 28, 17, 16, 15, 14, and 13.ucode but the ones from the ubuntu image appear to be sufficient.]
-6)  Shut down ubuntu
-7)  Restart the laptop and press F2 when the Dell logo appears to enter
+6.  Shut down ubuntu
+7.  Restart the laptop and press F2 when the Dell logo appears to enter
     BIOS setup mode.
-8)  Under "Secure Boot > Secure Boot Enable" select (*) Disabled.
-9)  Under "General > Advanced Boot Options" select [✓] Enable Legacy
+8.  Under "Secure Boot > Secure Boot Enable" select (*) Disabled.
+9.  Under "General > Advanced Boot Options" select [✓] Enable Legacy
     Option ROMs.
-10) Apply your changes.
-11) You may want to change other settings here.  In particular if you
+10. Apply your changes.
+11. You may want to change other settings here.  In particular if you
     want to run VMs on your system ensure that the Virtualization
     settings are turned on.
 

Markup fixup
diff --git a/posts/installing_debian_on_xps13_9350.mdwn b/posts/installing_debian_on_xps13_9350.mdwn
index 5b99104..12f9007 100644
--- a/posts/installing_debian_on_xps13_9350.mdwn
+++ b/posts/installing_debian_on_xps13_9350.mdwn
@@ -24,31 +24,31 @@ desktop.
 Setup
 -----
 
- 1) Start the laptop as per the Quick Start Guide and get Ubuntu set
+1)  Start the laptop as per the Quick Start Guide and get Ubuntu set
     up.
     * During the Ubuntu setup it will prompt you for one of your USB
       sticks to make a liveusb.
     * Don't forget to label the stick or you'll get confused later.
- 2) Write the install image to to the other USB stick.
+2)  Write the install image to to the other USB stick.
     * This used to require dd but nowadays you can just do it with cp.
       ```
       cp installer.iso /dev/sdd
       ```
     * Don't forget to label the stick or you'll get confused later.
     The installer image will include two partitions.
- 3) Add another partition and format it.  We're going to put the
+3)  Add another partition and format it.  We're going to put the
     wireless firmware on this partiton.
- 4) Mount the third partition on /mnt
- 5) Create a directory 'firmware' on the third partition and:
+4)  Mount the third partition on /mnt
+5)  Create a directory 'firmware' on the third partition and:
     ```
     cp /lib/firmware/iwlwifi-8000C-* /mnt/firmware/
     ```
     [^The list of tiles that iwlwifi complains are missing are 20, 19, 28, 17, 16, 15, 14, and 13.ucode but the ones from the ubuntu image appear to be sufficient.]
- 6) Shut down ubuntu
- 7) Restart the laptop and press F2 when the Dell logo appears to enter
+6)  Shut down ubuntu
+7)  Restart the laptop and press F2 when the Dell logo appears to enter
     BIOS setup mode.
- 8) Under "Secure Boot > Secure Boot Enable" select (*) Disabled.
- 9) Under "General > Advanced Boot Options" select [✓] Enable Legacy
+8)  Under "Secure Boot > Secure Boot Enable" select (*) Disabled.
+9)  Under "General > Advanced Boot Options" select [✓] Enable Legacy
     Option ROMs.
 10) Apply your changes.
 11) You may want to change other settings here.  In particular if you

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

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

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

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

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

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

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

First up of Installing Debian on XPS13
diff --git a/posts/installing_debian_on_xps13_9350.mdwn b/posts/installing_debian_on_xps13_9350.mdwn
new file mode 100644
index 0000000..5b99104
--- /dev/null
+++ b/posts/installing_debian_on_xps13_9350.mdwn
@@ -0,0 +1,66 @@
+[[!meta title="Installing Debian on XPS13 9350 Developer Edition"]]
+[[!tag computers debian laptop xps13 project-sputnik stretch 14.04]]
+[[!toc]]
+
+Introduction
+------------
+
+This is an installation record for installing Debian Stretch on the
+XPS13 9350 Developer Edition.
+
+You will need:
+
+* A Dell XPS13 9350 Developer Edition
+* Two USB sticks (8GB should be sufficient)
+* An install image for
+  [[Debian Stretch|https://www.debian.org/devel/debian-installer/]] 
+  (I recommend the netinst image)
+* Wifi
+
+Thanks to the Ubuntu install already on the laptop everything can
+probably be done on the laptop, but I'm doing most of it on my
+desktop.
+
+Setup
+-----
+
+ 1) Start the laptop as per the Quick Start Guide and get Ubuntu set
+    up.
+    * During the Ubuntu setup it will prompt you for one of your USB
+      sticks to make a liveusb.
+    * Don't forget to label the stick or you'll get confused later.
+ 2) Write the install image to to the other USB stick.
+    * This used to require dd but nowadays you can just do it with cp.
+      ```
+      cp installer.iso /dev/sdd
+      ```
+    * Don't forget to label the stick or you'll get confused later.
+    The installer image will include two partitions.
+ 3) Add another partition and format it.  We're going to put the
+    wireless firmware on this partiton.
+ 4) Mount the third partition on /mnt
+ 5) Create a directory 'firmware' on the third partition and:
+    ```
+    cp /lib/firmware/iwlwifi-8000C-* /mnt/firmware/
+    ```
+    [^The list of tiles that iwlwifi complains are missing are 20, 19, 28, 17, 16, 15, 14, and 13.ucode but the ones from the ubuntu image appear to be sufficient.]
+ 6) Shut down ubuntu
+ 7) Restart the laptop and press F2 when the Dell logo appears to enter
+    BIOS setup mode.
+ 8) Under "Secure Boot > Secure Boot Enable" select (*) Disabled.
+ 9) Under "General > Advanced Boot Options" select [✓] Enable Legacy
+    Option ROMs.
+10) Apply your changes.
+11) You may want to change other settings here.  In particular if you
+    want to run VMs on your system ensure that the Virtualization
+    settings are turned on.
+
+*NOTE:* We need to remember to turn Legacy Option ROMs off once we're
+done.
+
+*NOTE:* Debian doesn't currently support Secure Boot; but probably
+will do in the future.
+
+
+
+(To Be Continued...)

calendar update
diff --git a/archives/2016.mdwn b/archives/2016.mdwn
new file mode 100644
index 0000000..7d7429a
--- /dev/null
+++ b/archives/2016.mdwn
@@ -0,0 +1 @@
+[[!calendar type=year year=2016 pages="posts/* and !*/Discussion"]]
diff --git a/archives/2016/01.mdwn b/archives/2016/01.mdwn
new file mode 100644
index 0000000..a66f456
--- /dev/null
+++ b/archives/2016/01.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=01 year=2016 pages="posts/* and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(01) and creation_year(2016) and posts/* and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2016/02.mdwn b/archives/2016/02.mdwn
new file mode 100644
index 0000000..d6a4908
--- /dev/null
+++ b/archives/2016/02.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=02 year=2016 pages="posts/* and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(02) and creation_year(2016) and posts/* and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2016/03.mdwn b/archives/2016/03.mdwn
new file mode 100644
index 0000000..e251e7e
--- /dev/null
+++ b/archives/2016/03.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=03 year=2016 pages="posts/* and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(03) and creation_year(2016) and posts/* and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2016/04.mdwn b/archives/2016/04.mdwn
new file mode 100644
index 0000000..18a6f61
--- /dev/null
+++ b/archives/2016/04.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=04 year=2016 pages="posts/* and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(04) and creation_year(2016) and posts/* and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2016/05.mdwn b/archives/2016/05.mdwn
new file mode 100644
index 0000000..2ced0c4
--- /dev/null
+++ b/archives/2016/05.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=05 year=2016 pages="posts/* and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(05) and creation_year(2016) and posts/* and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2016/06.mdwn b/archives/2016/06.mdwn
new file mode 100644
index 0000000..e4e0866
--- /dev/null
+++ b/archives/2016/06.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=06 year=2016 pages="posts/* and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(06) and creation_year(2016) and posts/* and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2016/07.mdwn b/archives/2016/07.mdwn
new file mode 100644
index 0000000..b77aadc
--- /dev/null
+++ b/archives/2016/07.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=07 year=2016 pages="posts/* and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(07) and creation_year(2016) and posts/* and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2016/08.mdwn b/archives/2016/08.mdwn
new file mode 100644
index 0000000..44f66b4
--- /dev/null
+++ b/archives/2016/08.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=08 year=2016 pages="posts/* and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(08) and creation_year(2016) and posts/* and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2016/09.mdwn b/archives/2016/09.mdwn
new file mode 100644
index 0000000..3996355
--- /dev/null
+++ b/archives/2016/09.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=09 year=2016 pages="posts/* and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(09) and creation_year(2016) and posts/* and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2016/10.mdwn b/archives/2016/10.mdwn
new file mode 100644
index 0000000..3463669
--- /dev/null
+++ b/archives/2016/10.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=10 year=2016 pages="posts/* and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(10) and creation_year(2016) and posts/* and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2016/11.mdwn b/archives/2016/11.mdwn
new file mode 100644
index 0000000..e3e4f5d
--- /dev/null
+++ b/archives/2016/11.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=11 year=2016 pages="posts/* and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(11) and creation_year(2016) and posts/* and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2016/12.mdwn b/archives/2016/12.mdwn
new file mode 100644
index 0000000..7a25782
--- /dev/null
+++ b/archives/2016/12.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=12 year=2016 pages="posts/* and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(12) and creation_year(2016) and posts/* and !*/Discussion" show=0 feeds=no reverse=yes]]

comment
diff --git a/posts/speaking_of_proportionality/comment_1_354482a42ed6bc630c7db4b61a933166._comment b/posts/speaking_of_proportionality/comment_1_354482a42ed6bc630c7db4b61a933166._comment
new file mode 100644
index 0000000..545c0f3
--- /dev/null
+++ b/posts/speaking_of_proportionality/comment_1_354482a42ed6bc630c7db4b61a933166._comment
@@ -0,0 +1,12 @@
+[[!comment format=html
+ username="http://ilanin.livejournal.com/"
+ ip="2.101.5.125"
+ avatar="http://cdn.libravatar.org/avatar/dd6cfd160048e8baa130f18151d6ebb83a5424922e32eba18dde84fcbcae15f2"
+ subject="comment 1"
+ date="2015-05-08T22:24:37Z"
+ content="""
+Have an approximately related thing: 
+<img src=\"http://ic.pics.livejournal.com/ilanin/2132496/14827/14827_900.png\"></img>
+
+Labour's 2005 victory rates 0.75 Bercows per MP, though over 1.75 Martins (who was Speaker in 2005). However, this may be related to a) low turnout in Glasgow North-East and b) the fact that the Speaker was opposed by the SNP (whose constitution requires them to fight every Scottish seat, apparently). 
+"""]]

Correct typo
diff --git a/posts/speaking_of_proportionality.mdwn b/posts/speaking_of_proportionality.mdwn
index 841b516..b4e1be1 100644
--- a/posts/speaking_of_proportionality.mdwn
+++ b/posts/speaking_of_proportionality.mdwn
@@ -26,7 +26,7 @@ for presentation
 | Green Party      |  33⅖      |
 | Labour           |    1⅙     |
 | Liberal Democrat |    8¾     |
-| Plaid Cymry      |    1¾     |
+| Plaid Cymru      |    1¾     |
 | SDLP             |    1      |
 | SNP              |    ¾      |
 | Sinn Fein        |    1¼     |

squash!
diff --git a/posts/speaking_of_proportionality.mdwn b/posts/speaking_of_proportionality.mdwn
index 1a51501..841b516 100644
--- a/posts/speaking_of_proportionality.mdwn
+++ b/posts/speaking_of_proportionality.mdwn
@@ -19,7 +19,7 @@ to elect each MP on average?  These figures have been slightly rounded
 for presentation
 
 | Party            | Bercows   |
-|-----------------:|:----------|
+|:-----------------|:---------:|
 | Speaker          |    1      |
 | Conservative     |    1      |
 | DUP              |    ⅔      |

squash!
diff --git a/posts/speaking_of_proportionality.mdwn b/posts/speaking_of_proportionality.mdwn
index b6793d4..1a51501 100644
--- a/posts/speaking_of_proportionality.mdwn
+++ b/posts/speaking_of_proportionality.mdwn
@@ -52,4 +52,4 @@ for presentation
 [//]: # ( Other 6.282 )
 In addition the Alliance Party got 1¾ Bercows and no seat, and the TUSC
 got just over 1 Bercow and no seat.  Other candidates between them got 6¼
-Bercows without any seats.
+Bercows without any seats. 

squash!
diff --git a/posts/speaking_of_proportionality.mdwn b/posts/speaking_of_proportionality.mdwn
index f33b8ee..b6793d4 100644
--- a/posts/speaking_of_proportionality.mdwn
+++ b/posts/speaking_of_proportionality.mdwn
@@ -34,7 +34,7 @@ for presentation
 | UUP              |    1⅔     |
 
 [//]: # ( | Party            | Bercows | )
-[//]: # ( |-----------------:|:--------| )
+[//]: # ( |:-----------------|:-------:| )
 [//]: # ( | Speaker          |      1  | )
 [//]: # ( | Conservative     |      1  | )
 [//]: # ( | DUP              |  0.666  | )

squash!
diff --git a/posts/speaking_of_proportionality.mdwn b/posts/speaking_of_proportionality.mdwn
index 31a75e9..f33b8ee 100644
--- a/posts/speaking_of_proportionality.mdwn
+++ b/posts/speaking_of_proportionality.mdwn
@@ -18,21 +18,35 @@ of the parties who won at least one seat, how many Bercows did it take
 to elect each MP on average?  These figures have been slightly rounded
 for presentation
 
-| Party            | Bercows  [//]: # (  |         ) |
-|-----------------:|:--------------------------------|
-| Speaker          |    1     [//]: # (  |      1  ) |
-| Conservative     |    1     [//]: # (  |      1  ) |
-| DUP              |    ⅔     [//]: # (  |  0.666  ) |
-| Green Party      |  33⅖     [//]: # (  |  33.44  ) |
-| Labour           |    1⅙    [//]: # (  |  1.164  ) |
-| Liberal Democrat |    8¾    [//]: # (  |   8.72  ) |
-| Plaid Cymry      |    1¾    [//]: # (  |   1.75  ) |
-| SDLP             |    1     [//]: # (  |   0.96  ) |
-| SNP              |    ¾     [//]: # (  |   0.75  ) |
-| Sinn Fein        |    1¼    [//]: # (  |   1.27  ) |
-| UKIP             |  112⅛    [//]: # (  | 112.12  ) |
-| UUP              |    1⅔    [//]: # (  |   1.66  ) |
+| Party            | Bercows   |
+|-----------------:|:----------|
+| Speaker          |    1      |
+| Conservative     |    1      |
+| DUP              |    ⅔      |
+| Green Party      |  33⅖      |
+| Labour           |    1⅙     |
+| Liberal Democrat |    8¾     |
+| Plaid Cymry      |    1¾     |
+| SDLP             |    1      |
+| SNP              |    ¾      |
+| Sinn Fein        |    1¼     |
+| UKIP             |  112⅛     |
+| UUP              |    1⅔     |
 
+[//]: # ( | Party            | Bercows | )
+[//]: # ( |-----------------:|:--------| )
+[//]: # ( | Speaker          |      1  | )
+[//]: # ( | Conservative     |      1  | )
+[//]: # ( | DUP              |  0.666  | )
+[//]: # ( | Green Party      |  33.44  | )
+[//]: # ( | Labour           |  1.164  | )
+[//]: # ( | Liberal Democrat |   8.72  | )
+[//]: # ( | Plaid Cymry      |   1.75  | )
+[//]: # ( | SDLP             |   0.96  | )
+[//]: # ( | SNP              |   0.75  | )
+[//]: # ( | Sinn Fein        |   1.27  | )
+[//]: # ( | UKIP             | 112.12  | )
+[//]: # ( | UUP              |   1.66  | )
 [//]: # ( Alliance 1.78 )
 [//]: # ( TUSC 1.05 )
 [//]: # ( Other 6.282 )

squash!
diff --git a/posts/speaking_of_proportionality.mdwn b/posts/speaking_of_proportionality.mdwn
index 55e6768..31a75e9 100644
--- a/posts/speaking_of_proportionality.mdwn
+++ b/posts/speaking_of_proportionality.mdwn
@@ -18,24 +18,24 @@ of the parties who won at least one seat, how many Bercows did it take
 to elect each MP on average?  These figures have been slightly rounded
 for presentation
 
-| Party            | Bercows | [//]: #         |
-|-----------------:|:--------| [//]: # --------|
-| Speaker          |    1    | [//]: #       1 |
-| Conservative     |    1    | [//]: #       1 |
-| DUP              |    ⅔    | [//]: #   0.666 |
-| Green Party      |  33⅖    | [//]: #   33.44 |
-| Labour           |    1⅙   | [//]: #   1.164 |
-| Liberal Democrat |    8¾   | [//]: #    8.72 |
-| Plaid Cymry      |    1¾   | [//]: #    1.75 |
-| SDLP             |    1    | [//]: #    0.96 |
-| SNP              |    ¾    | [//]: #    0.75 |
-| Sinn Fein        |    1¼   | [//]: #    1.27 |
-| UKIP             |  112⅛   | [//]: #  112.12 |
-| UUP              |    1⅔   | [//]: #    1.66 |
+| Party            | Bercows  [//]: # (  |         ) |
+|-----------------:|:--------------------------------|
+| Speaker          |    1     [//]: # (  |      1  ) |
+| Conservative     |    1     [//]: # (  |      1  ) |
+| DUP              |    ⅔     [//]: # (  |  0.666  ) |
+| Green Party      |  33⅖     [//]: # (  |  33.44  ) |
+| Labour           |    1⅙    [//]: # (  |  1.164  ) |
+| Liberal Democrat |    8¾    [//]: # (  |   8.72  ) |
+| Plaid Cymry      |    1¾    [//]: # (  |   1.75  ) |
+| SDLP             |    1     [//]: # (  |   0.96  ) |
+| SNP              |    ¾     [//]: # (  |   0.75  ) |
+| Sinn Fein        |    1¼    [//]: # (  |   1.27  ) |
+| UKIP             |  112⅛    [//]: # (  | 112.12  ) |
+| UUP              |    1⅔    [//]: # (  |   1.66  ) |
 
-[//]: # Alliance 1.78
-[//]: # TUSC 1.05
-[//]: # Other 6.282
+[//]: # ( Alliance 1.78 )
+[//]: # ( TUSC 1.05 )
+[//]: # ( Other 6.282 )
 In addition the Alliance Party got 1¾ Bercows and no seat, and the TUSC
 got just over 1 Bercow and no seat.  Other candidates between them got 6¼
 Bercows without any seats.

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

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

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

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

Speaking of Proportionality!
diff --git a/posts/speaking_of_proportionality.mdwn b/posts/speaking_of_proportionality.mdwn
new file mode 100644
index 0000000..55e6768
--- /dev/null
+++ b/posts/speaking_of_proportionality.mdwn
@@ -0,0 +1,41 @@
+[[!meta title="Speaking of Proportionality"]]
+[[!tag politics ge15 fptp electoral-reform]]
+
+One thing that's been noted about this election is the unusual
+disparity in ranges of numbers of votes required to secure seats
+between parties.  To some extent this is because the SNP had a
+"roaring" good election and won 56 out of 59 seats that they contested
+(giving them very little chance to "waste" votes).  On the other side
+UKIP contested an awful lot of seats for very little effect; but here
+I present this figures in a very slightly easier to read form.  Maybe
+later I'll produce an infographic.
+
+For reasons the Speaker, if seeking reelection as Speaker, is
+traditionally regarded as neutral and not contested (in fact both UKIP
+and Green did contest his seat); so I'm taking my base unit as the
+number of votes required to elect one John Bercow - 34,617.  For each
+of the parties who won at least one seat, how many Bercows did it take
+to elect each MP on average?  These figures have been slightly rounded
+for presentation
+
+| Party            | Bercows | [//]: #         |
+|-----------------:|:--------| [//]: # --------|
+| Speaker          |    1    | [//]: #       1 |
+| Conservative     |    1    | [//]: #       1 |
+| DUP              |    ⅔    | [//]: #   0.666 |
+| Green Party      |  33⅖    | [//]: #   33.44 |
+| Labour           |    1⅙   | [//]: #   1.164 |
+| Liberal Democrat |    8¾   | [//]: #    8.72 |
+| Plaid Cymry      |    1¾   | [//]: #    1.75 |
+| SDLP             |    1    | [//]: #    0.96 |
+| SNP              |    ¾    | [//]: #    0.75 |
+| Sinn Fein        |    1¼   | [//]: #    1.27 |
+| UKIP             |  112⅛   | [//]: #  112.12 |
+| UUP              |    1⅔   | [//]: #    1.66 |
+
+[//]: # Alliance 1.78
+[//]: # TUSC 1.05
+[//]: # Other 6.282
+In addition the Alliance Party got 1¾ Bercows and no seat, and the TUSC
+got just over 1 Bercow and no seat.  Other candidates between them got 6¼
+Bercows without any seats.

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

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

post
diff --git a/posts/mauled_by_a_sad_puppy.mdwn b/posts/mauled_by_a_sad_puppy.mdwn
new file mode 100644
index 0000000..cc6645b
--- /dev/null
+++ b/posts/mauled_by_a_sad_puppy.mdwn
@@ -0,0 +1,21 @@
+[[!meta title="Mauled by a Sad Puppy"]]
+[[!tag hugos sadpuppies]]
+
+### Being a list of Hugo Nominees who've distanced themselves from the puppies
+	
+(This post will probably get updated as and when)
+
+* Best Short Story
+ * [[Annie Bellet|https://overactive.wordpress.com/2015/04/05/hugo-nomination-and-thoughts/]] (equivocal?)
+* Best Semiprozine
+ * [[Andromeda Spaceways In-Flight Magazine|https://simonpetrie.wordpress.com/2015/04/05/hugo-nominations-fan-incoming-3-2-1/]]
+* Best Editor (Short Form)
+ * [[Bryan Thomas Schmidt|http://bryanthomasschmidt.net/on-my-first-best-editor-short-form-hugo-nomination/]] (equivocal about Sad Puppies, clear about Rabid ones)
+* Best Editor (Long Form)
+ * [[Sheila Gilbert|https://twitter.com/KariSperring/status/586190425192583168]] (second-hand, equivocal)
+
+ 
+One example that only distances himself from the Rabid Puppies, not the Sad ones:
+
+* Best Editor (Short Form)
+ * [[Mike Resnick|http://file770.com/?p=21715&cpage=1#comment-249829]]

rename image
diff --git a/posts/mini_metro_ii.mdwn b/posts/mini_metro_ii.mdwn
index b01012e..27b14dd 100644
--- a/posts/mini_metro_ii.mdwn
+++ b/posts/mini_metro_ii.mdwn
@@ -7,4 +7,4 @@ they're up to beta 20 now; with new features like "Rush Hour Mode"
 really like.  It's somewhat harder and produces odder-looking maps
 though:
 
-[[!img "London Map 11.png" size=640x alt="Mini Metro London Map"]]
+[[!img "London_Map_11.png" size=640x alt="Mini Metro London Map"]]
diff --git a/posts/mini_metro_ii/London Map 11.png b/posts/mini_metro_ii/London Map 11.png
deleted file mode 100644
index f546784..0000000
Binary files a/posts/mini_metro_ii/London Map 11.png and /dev/null differ
diff --git a/posts/mini_metro_ii/London_Map_11.png b/posts/mini_metro_ii/London_Map_11.png
new file mode 100644
index 0000000..f546784
Binary files /dev/null and b/posts/mini_metro_ii/London_Map_11.png differ

Mini Metro II
diff --git a/posts/mini_metro_ii.mdwn b/posts/mini_metro_ii.mdwn
new file mode 100644
index 0000000..b01012e
--- /dev/null
+++ b/posts/mini_metro_ii.mdwn
@@ -0,0 +1,10 @@
+[[!meta title="Mini Metro II"]]
+[[!tag games tube rail]]
+
+[[Mini Metro|http://dinopoloclub.com/minimetro/]] is coming along;
+they're up to beta 20 now; with new features like "Rush Hour Mode"
+(where you can't move lines and trains around once placed) which I
+really like.  It's somewhat harder and produces odder-looking maps
+though:
+
+[[!img "London Map 11.png" size=640x alt="Mini Metro London Map"]]
diff --git a/posts/mini_metro_ii/London Map 11.png b/posts/mini_metro_ii/London Map 11.png
new file mode 100644
index 0000000..f546784
Binary files /dev/null and b/posts/mini_metro_ii/London Map 11.png differ

calendar update
diff --git a/archives/2015.mdwn b/archives/2015.mdwn
new file mode 100644
index 0000000..79ea3e9
--- /dev/null
+++ b/archives/2015.mdwn
@@ -0,0 +1 @@
+[[!calendar type=year year=2015 pages="posts/* and !*/Discussion"]]
diff --git a/archives/2015/01.mdwn b/archives/2015/01.mdwn
new file mode 100644
index 0000000..a78d16b
--- /dev/null
+++ b/archives/2015/01.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=01 year=2015 pages="posts/* and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(01) and creation_year(2015) and posts/* and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2015/02.mdwn b/archives/2015/02.mdwn
new file mode 100644
index 0000000..9d13489
--- /dev/null
+++ b/archives/2015/02.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=02 year=2015 pages="posts/* and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(02) and creation_year(2015) and posts/* and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2015/03.mdwn b/archives/2015/03.mdwn
new file mode 100644
index 0000000..66b9cf5
--- /dev/null
+++ b/archives/2015/03.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=03 year=2015 pages="posts/* and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(03) and creation_year(2015) and posts/* and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2015/04.mdwn b/archives/2015/04.mdwn
new file mode 100644
index 0000000..71e6c78
--- /dev/null
+++ b/archives/2015/04.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=04 year=2015 pages="posts/* and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(04) and creation_year(2015) and posts/* and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2015/05.mdwn b/archives/2015/05.mdwn
new file mode 100644
index 0000000..779041b
--- /dev/null
+++ b/archives/2015/05.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=05 year=2015 pages="posts/* and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(05) and creation_year(2015) and posts/* and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2015/06.mdwn b/archives/2015/06.mdwn
new file mode 100644
index 0000000..0e2e4ad
--- /dev/null
+++ b/archives/2015/06.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=06 year=2015 pages="posts/* and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(06) and creation_year(2015) and posts/* and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2015/07.mdwn b/archives/2015/07.mdwn
new file mode 100644
index 0000000..72ef3f5
--- /dev/null
+++ b/archives/2015/07.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=07 year=2015 pages="posts/* and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(07) and creation_year(2015) and posts/* and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2015/08.mdwn b/archives/2015/08.mdwn
new file mode 100644
index 0000000..df16c5c
--- /dev/null
+++ b/archives/2015/08.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=08 year=2015 pages="posts/* and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(08) and creation_year(2015) and posts/* and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2015/09.mdwn b/archives/2015/09.mdwn
new file mode 100644
index 0000000..d055e91
--- /dev/null
+++ b/archives/2015/09.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=09 year=2015 pages="posts/* and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(09) and creation_year(2015) and posts/* and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2015/10.mdwn b/archives/2015/10.mdwn
new file mode 100644
index 0000000..18c6b9e
--- /dev/null
+++ b/archives/2015/10.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=10 year=2015 pages="posts/* and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(10) and creation_year(2015) and posts/* and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2015/11.mdwn b/archives/2015/11.mdwn
new file mode 100644
index 0000000..59ffbca
--- /dev/null
+++ b/archives/2015/11.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=11 year=2015 pages="posts/* and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(11) and creation_year(2015) and posts/* and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2015/12.mdwn b/archives/2015/12.mdwn
new file mode 100644
index 0000000..8679680
--- /dev/null
+++ b/archives/2015/12.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=12 year=2015 pages="posts/* and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(12) and creation_year(2015) and posts/* and !*/Discussion" show=0 feeds=no reverse=yes]]

Comment
diff --git a/posts/ck2_alba/comment_1_8297de1dc47548878e30f747894b1c51._comment b/posts/ck2_alba/comment_1_8297de1dc47548878e30f747894b1c51._comment
new file mode 100644
index 0000000..26dfb7a
--- /dev/null
+++ b/posts/ck2_alba/comment_1_8297de1dc47548878e30f747894b1c51._comment
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ username="http://ilanin.livejournal.com/"
+ ip="92.20.232.222"
+ avatar="http://cdn.libravatar.org/avatar/dd6cfd160048e8baa130f18151d6ebb83a5424922e32eba18dde84fcbcae15f2"
+ subject="comment 1"
+ date="2014-10-15T19:37:01Z"
+ content="""
+Ooh, it's a CK2. I have still never finished a game of that or of EU3; I have a King of Wales-and-Ireland-and-Italy (there were some heretics) sitting around somewhere, and probably a Muslim Spain savegame somewhere or if not definitely a Holland one in EU3+ (a mod so good Paradox hired the designer...well, for that and other reasons). 
+"""]]

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

Not Exactly an Empire that the Sun does not Set On
diff --git a/posts/ck2_alba.mdwn b/posts/ck2_alba.mdwn
new file mode 100644
index 0000000..cf955f5
--- /dev/null
+++ b/posts/ck2_alba.mdwn
@@ -0,0 +1,25 @@
+[[!meta title="Not Exactly an Empire that the Sun does not Set On"]]
+[[!tag games ck2]]
+
+I've finally won a game of *Crusader Kings II*.  That is got to 1453
+without either losing or giving up because I've been reduced to a
+single boring county somewhere.
+
+I started off as Dublin (possibly the easiest independent county in
+1066) and ended up as this (Irish) Empire of Alba (total score 167024,
+which I note purely for my future reference):
+
+[[!img "empire_alba.png" size=512x alt="CK2 Map"]]
+
+Sadly Norway took the duchy of Orkney back by getting the Duke of it
+elected king near the end of the game and there's a couple of enclaves
+in Hispania.  Also it annoys me that when I create the the Empire
+level title my nice green Ireland colour becomes an ugly red.
+
+I suspect if I ever get EU4 this will make a very OP starting
+position.  Or I'd guess Lithuania or Pisa might make a playable start
+other than Alba.
+
+Having won as a "normal" Catholic monarch, my next go is going to be
+trying as a Norse Republic (I've hand edited a Year 867 start to add
+this, based in Iceland...)
diff --git a/posts/ck2_alba/empire_alba.png b/posts/ck2_alba/empire_alba.png
new file mode 100644
index 0000000..90148a8
Binary files /dev/null and b/posts/ck2_alba/empire_alba.png differ

Added a comment
diff --git a/posts/mini_metro/comment_2_084040dc9a28058b0348e78177ddb47b._comment b/posts/mini_metro/comment_2_084040dc9a28058b0348e78177ddb47b._comment
new file mode 100644
index 0000000..54565c4
--- /dev/null
+++ b/posts/mini_metro/comment_2_084040dc9a28058b0348e78177ddb47b._comment
@@ -0,0 +1,11 @@
+[[!comment format=mdwn
+ username="http://senji.sdf.org/"
+ ip="81.187.132.36"
+ avatar="http://cdn.libravatar.org/avatar/f8664e2372fcecab872639cdea2adf14ab4ad8c7042e9531ef57d3b60dee650d"
+ subject="comment 2"
+ date="2014-10-15T08:12:51Z"
+ content="""
+Heh, I guess so.
+
+It does really look much more like Paris' big ball of string than London's map.
+"""]]

err, I thought I committed this
diff --git a/posts/mini_metro.mdwn b/posts/mini_metro.mdwn
index dd8541a..b53817b 100644
--- a/posts/mini_metro.mdwn
+++ b/posts/mini_metro.mdwn
@@ -9,4 +9,4 @@ It clearly needs some work (and documentation) but it's a fun
 distraction right now.  So far this is the best I've managed which
 scored 2470 passengers delivered:
 
-[[!img "London Map 3" size=620x alt="Mini Metro London Map"]]
+[[!img "London_Map_3.png" size=620x alt="Mini Metro London Map"]]

Comment
diff --git a/posts/mini_metro/comment_1_7f077fc1796d0180740e1976fbaa7912._comment b/posts/mini_metro/comment_1_7f077fc1796d0180740e1976fbaa7912._comment
new file mode 100644
index 0000000..fda8bd8
--- /dev/null
+++ b/posts/mini_metro/comment_1_7f077fc1796d0180740e1976fbaa7912._comment
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ username="http://ilanin.livejournal.com/"
+ ip="92.24.230.174"
+ avatar="http://cdn.libravatar.org/avatar/dd6cfd160048e8baa130f18151d6ebb83a5424922e32eba18dde84fcbcae15f2"
+ subject="comment 1"
+ date="2014-10-14T22:03:15Z"
+ content="""
+It is interesting to observe you appear to have spent your time playing with something that looks like a knotted mass of string in order to de-stress, under the circumstances. 
+"""]]

Change image filename
diff --git a/posts/mini_metro/London Map 3.png b/posts/mini_metro/London Map 3.png
deleted file mode 100755
index 5176538..0000000
Binary files a/posts/mini_metro/London Map 3.png and /dev/null differ
diff --git a/posts/mini_metro/London_Map_3.png b/posts/mini_metro/London_Map_3.png
new file mode 100755
index 0000000..5176538
Binary files /dev/null and b/posts/mini_metro/London_Map_3.png differ

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

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

Mini Metro
diff --git a/posts/mini_metro.mdwn b/posts/mini_metro.mdwn
new file mode 100644
index 0000000..dd8541a
--- /dev/null
+++ b/posts/mini_metro.mdwn
@@ -0,0 +1,12 @@
+[[!meta title="Mini Metro"]]
+[[!tag games tube rail]]
+
+I spotted [[Mini Metro|http://dinopoloclub.com/minimetro/]] on the
+Humble Bundle yesterday and in a fit of trying to reduce stress tried
+playing it last night.
+
+It clearly needs some work (and documentation) but it's a fun
+distraction right now.  So far this is the best I've managed which
+scored 2470 passengers delivered:
+
+[[!img "London Map 3" size=620x alt="Mini Metro London Map"]]
diff --git a/posts/mini_metro/London Map 3.png b/posts/mini_metro/London Map 3.png
new file mode 100755
index 0000000..5176538
Binary files /dev/null and b/posts/mini_metro/London Map 3.png differ

More on string and cats
diff --git a/posts/string_and_cats.mdwn b/posts/string_and_cats.mdwn
index 37202a1..9a1938a 100644
--- a/posts/string_and_cats.mdwn
+++ b/posts/string_and_cats.mdwn
@@ -1,4 +1,4 @@
-[[!meta title="String and Cats Don't Mix"]]
+[[!meta title="String and Cats Don't Mix I/II"]]
 [[!tag cat solo vet]]
 
 We had to take Solo to the vet this morning :-(.
diff --git a/posts/string_and_cats_ii.mdwn b/posts/string_and_cats_ii.mdwn
new file mode 100644
index 0000000..a3a8e38
--- /dev/null
+++ b/posts/string_and_cats_ii.mdwn
@@ -0,0 +1,7 @@
+[[!meta title="String and Cats Don't Mix II/II"]]
+[[!tag cat solo vet]]
+
+Solo went to the vet again this morning, and was showing no negative
+signs; then about two hours ago she vomited up a bolus containing most
+or all of the string.  So hopefully everything is now well; although
+she's finally feeling a bit sorry for herself.

fix layout
diff --git a/posts/string_and_cats.mdwn b/posts/string_and_cats.mdwn
index 6c8d014..37202a1 100644
--- a/posts/string_and_cats.mdwn
+++ b/posts/string_and_cats.mdwn
@@ -3,8 +3,8 @@
 
 We had to take Solo to the vet this morning :-(.
 
-Last night, at about 7pm, she ate a piece of string about 2’ long.  
-String is bad inside cats (and other pets!) because they can't
+Last night, at about 7pm, she ate a piece of string about 2’ long. String 
+is bad inside cats (and other pets!) because they can't
 digest it and it can make hoops and hooks that get caught on the
 insides and cause all kinds of pain and doom.
 

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

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

String and Cats
diff --git a/posts/string_and_cats.mdwn b/posts/string_and_cats.mdwn
new file mode 100644
index 0000000..6c8d014
--- /dev/null
+++ b/posts/string_and_cats.mdwn
@@ -0,0 +1,21 @@
+[[!meta title="String and Cats Don't Mix"]]
+[[!tag cat solo vet]]
+
+We had to take Solo to the vet this morning :-(.
+
+Last night, at about 7pm, she ate a piece of string about 2’ long.  
+String is bad inside cats (and other pets!) because they can't
+digest it and it can make hoops and hooks that get caught on the
+insides and cause all kinds of pain and doom.
+
+Fortunately the vet said that Solo is OK so far; but we have to keep
+her seperated from the other cats, with her own litterbox, so we can
+check if the string has come out; and phone them up if there are any
+of various kinds of distress. And we have another appointment to get
+her prodded again tomorrow morning.
+
+If we'd thought to phone the emergency vet line then they might have
+been able to get her to vomit the string up; if we'd got her to them
+within about an hour; but we didn't do that sadly.
+
+All the cats are quite distressed by the separation.

comment from stephdairy
diff --git a/posts/off_to_the_seaside/comment_1_a8c6bf2e59cc4c4399752c99d591709e._comment b/posts/off_to_the_seaside/comment_1_a8c6bf2e59cc4c4399752c99d591709e._comment
new file mode 100644
index 0000000..5331778
--- /dev/null
+++ b/posts/off_to_the_seaside/comment_1_a8c6bf2e59cc4c4399752c99d591709e._comment
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ username="http://stephdairy.livejournal.com/"
+ ip="131.111.17.47"
+ avatar="http://cdn.libravatar.org/avatar/849ff836abbdadea4183ad53271668804a5b68fc05d670fa114d2001a80ad204"
+ subject="comment 1"
+ date="2014-10-10T09:30:09Z"
+ content="""
+Without knowing exactly where the place in question is, a rightward facing quote is one of the standard ways of representing the Arabic letter ع and a leftward facing quote one of the standard ways of representingء 
+"""]]

Oh, and that looks like a punctuation mistake
diff --git a/posts/off_to_the_seaside.mdwn b/posts/off_to_the_seaside.mdwn
index 0f9ebc5..9c50a72 100644
--- a/posts/off_to_the_seaside.mdwn
+++ b/posts/off_to_the_seaside.mdwn
@@ -4,3 +4,5 @@
 According to the BBC I'm in Saudi Arabia today...
 
 [[!img 42210.2.png size=539x alt="BBC Weather App Screenshot"]]
+
+Also, is that a "smartquote" inspired mistake there, Auntie?

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

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

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

New blog post: Off to the Seaside?
diff --git a/posts/off_to_the_seaside.mdwn b/posts/off_to_the_seaside.mdwn
new file mode 100644
index 0000000..0f9ebc5
--- /dev/null
+++ b/posts/off_to_the_seaside.mdwn
@@ -0,0 +1,6 @@
+[[!meta title="Off to the Seaside?"]]
+[[!tag android bbc wtf]]
+
+According to the BBC I'm in Saudi Arabia today...
+
+[[!img 42210.2.png size=539x alt="BBC Weather App Screenshot"]]
diff --git a/posts/off_to_the_seaside/42210.2.png b/posts/off_to_the_seaside/42210.2.png
new file mode 100644
index 0000000..84a65ef
Binary files /dev/null and b/posts/off_to_the_seaside/42210.2.png differ

update .gitignore
diff --git a/.gitignore b/.gitignore
index eecda60..6a1906b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,4 @@
 /.ikiwiki
+*~
+\#*\#
+.\#*

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

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

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

Not going on a train
diff --git a/posts/not_going_on_a_train.mdwn b/posts/not_going_on_a_train.mdwn
new file mode 100644
index 0000000..1bdaa6d
--- /dev/null
+++ b/posts/not_going_on_a_train.mdwn
@@ -0,0 +1,12 @@
+[[!meta title="Not Going on a Train"]]
+[[!tag steamtrains rail birthday]]
+
+I was looking forward to going on a steam train day trip on Sunday, to
+celebrate getting olderer (it happens every year, tedious isn't it);
+but I've had notification that it has been postponed because rail
+engineering work near Ipswich has overrun so Network Rail can't
+allocate it the required paths.
+
+Sigh.
+
+Oh well, hopefully it'll be fun when it does eventually happen.

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

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

Note to Cat I
diff --git a/posts/note_to_cat_i.mdwn b/posts/note_to_cat_i.mdwn
new file mode 100644
index 0000000..a89702b
--- /dev/null
+++ b/posts/note_to_cat_i.mdwn
@@ -0,0 +1,7 @@
+[[!meta title="Note to Cat I"]]
+[[!tag cat bearhug]]
+
+Note to Cat: This is a Sink.  
+
+The primary purpose of sinks is to be receptacles for water, not for
+cats.

calendar update
diff --git a/archives/2014.mdwn b/archives/2014.mdwn
new file mode 100644
index 0000000..4ebad6a
--- /dev/null
+++ b/archives/2014.mdwn
@@ -0,0 +1 @@
+[[!calendar type=year year=2014 pages="posts/* and !*/Discussion"]]
diff --git a/archives/2014/01.mdwn b/archives/2014/01.mdwn
new file mode 100644
index 0000000..5557efd
--- /dev/null
+++ b/archives/2014/01.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=01 year=2014 pages="posts/* and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(01) and creation_year(2014) and posts/* and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2014/02.mdwn b/archives/2014/02.mdwn
new file mode 100644
index 0000000..8515d31
--- /dev/null
+++ b/archives/2014/02.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=02 year=2014 pages="posts/* and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(02) and creation_year(2014) and posts/* and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2014/03.mdwn b/archives/2014/03.mdwn
new file mode 100644
index 0000000..d928af1
--- /dev/null
+++ b/archives/2014/03.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=03 year=2014 pages="posts/* and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(03) and creation_year(2014) and posts/* and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2014/04.mdwn b/archives/2014/04.mdwn
new file mode 100644
index 0000000..2abefff
--- /dev/null
+++ b/archives/2014/04.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=04 year=2014 pages="posts/* and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(04) and creation_year(2014) and posts/* and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2014/05.mdwn b/archives/2014/05.mdwn
new file mode 100644
index 0000000..2557291
--- /dev/null
+++ b/archives/2014/05.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=05 year=2014 pages="posts/* and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(05) and creation_year(2014) and posts/* and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2014/06.mdwn b/archives/2014/06.mdwn
new file mode 100644
index 0000000..8b9096f
--- /dev/null
+++ b/archives/2014/06.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=06 year=2014 pages="posts/* and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(06) and creation_year(2014) and posts/* and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2014/07.mdwn b/archives/2014/07.mdwn
new file mode 100644
index 0000000..4816f98
--- /dev/null
+++ b/archives/2014/07.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=07 year=2014 pages="posts/* and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(07) and creation_year(2014) and posts/* and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2014/08.mdwn b/archives/2014/08.mdwn
new file mode 100644
index 0000000..3f636d7
--- /dev/null
+++ b/archives/2014/08.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=08 year=2014 pages="posts/* and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(08) and creation_year(2014) and posts/* and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2014/09.mdwn b/archives/2014/09.mdwn
new file mode 100644
index 0000000..8489732
--- /dev/null
+++ b/archives/2014/09.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=09 year=2014 pages="posts/* and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(09) and creation_year(2014) and posts/* and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2014/10.mdwn b/archives/2014/10.mdwn
new file mode 100644
index 0000000..ac9e8af
--- /dev/null
+++ b/archives/2014/10.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=10 year=2014 pages="posts/* and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(10) and creation_year(2014) and posts/* and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2014/11.mdwn b/archives/2014/11.mdwn
new file mode 100644
index 0000000..1d1986b
--- /dev/null
+++ b/archives/2014/11.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=11 year=2014 pages="posts/* and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(11) and creation_year(2014) and posts/* and !*/Discussion" show=0 feeds=no reverse=yes]]
diff --git a/archives/2014/12.mdwn b/archives/2014/12.mdwn
new file mode 100644
index 0000000..21a1b9f
--- /dev/null
+++ b/archives/2014/12.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=12 year=2014 pages="posts/* and !*/Discussion"]]
+"""]]
+
+[[!inline pages="creation_month(12) and creation_year(2014) and posts/* and !*/Discussion" show=0 feeds=no reverse=yes]]

LJ tracker
diff --git a/posts/finally_a_new_blog.mdwn b/posts/finally_a_new_blog.mdwn
index 93e4f7b..fe4d937 100644
--- a/posts/finally_a_new_blog.mdwn
+++ b/posts/finally_a_new_blog.mdwn
@@ -9,4 +9,4 @@ Eventually I intend to migrate all my old LJ posts here but ikiwiki
 currently only supports unthreaded comments so there's a SMOP to
 handle there.
 
-There is an LJ tracker for the feed at 
+There is an LJ tracker for the feed at [[circle_feed|http://circle-feed.livejournal.com/]].

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

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

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

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

Grr massive git fuckuperby. Hopefully everything except the commit log looks sane now
diff --git a/posts/another_post.mdwn b/posts/another_post.mdwn
deleted file mode 100644
index 2cbaedd..0000000
--- a/posts/another_post.mdwn
+++ /dev/null
@@ -1,2 +0,0 @@
-This is another post.
-

First post!
diff --git a/posts/another_post.mdwn b/posts/another_post.mdwn
deleted file mode 100644
index 2cbaedd..0000000
--- a/posts/another_post.mdwn
+++ /dev/null
@@ -1,2 +0,0 @@
-This is another post.
-
diff --git a/posts/finally_a_new_blog.mdwn b/posts/finally_a_new_blog.mdwn
new file mode 100644
index 0000000..93e4f7b
--- /dev/null
+++ b/posts/finally_a_new_blog.mdwn
@@ -0,0 +1,12 @@
+[[!meta title="Finally!  A New Blog"]]
+[[!tag meta lj ikiwiki smop]]
+
+After many years of moaning about LJ going bad, and bitching about
+DW's T&Cs I've finally got around to making a new blog; thanks to
+ikiwiki.
+
+Eventually I intend to migrate all my old LJ posts here but ikiwiki
+currently only supports unthreaded comments so there's a SMOP to
+handle there.
+
+There is an LJ tracker for the feed at 
diff --git a/posts/first_post.mdwn b/posts/first_post.mdwn
deleted file mode 100644
index 343497d..0000000
--- a/posts/first_post.mdwn
+++ /dev/null
@@ -1,2 +0,0 @@
-This is the first post to this example blog. To add new posts, just add
-files to the posts/ subdirectory, or use the web form.