Recent changes to this wiki:

calendar update
diff --git a/archives/2024.mdwn b/archives/2024.mdwn
new file mode 100644
index 0000000..8817cf5
--- /dev/null
+++ b/archives/2024.mdwn
@@ -0,0 +1 @@
+[[!calendar type=year year=2024 pages="*"]]
diff --git a/archives/2024/01.mdwn b/archives/2024/01.mdwn
new file mode 100644
index 0000000..0559299
--- /dev/null
+++ b/archives/2024/01.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=01 year=2024 pages="*"]]
+"""]]
+
+[[!inline pages="creation_month(01) and creation_year(2024) and *" show=0 feeds=no reverse=yes]]
diff --git a/archives/2024/02.mdwn b/archives/2024/02.mdwn
new file mode 100644
index 0000000..61eae24
--- /dev/null
+++ b/archives/2024/02.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=02 year=2024 pages="*"]]
+"""]]
+
+[[!inline pages="creation_month(02) and creation_year(2024) and *" show=0 feeds=no reverse=yes]]
diff --git a/archives/2024/03.mdwn b/archives/2024/03.mdwn
new file mode 100644
index 0000000..c446ae1
--- /dev/null
+++ b/archives/2024/03.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=03 year=2024 pages="*"]]
+"""]]
+
+[[!inline pages="creation_month(03) and creation_year(2024) and *" show=0 feeds=no reverse=yes]]
diff --git a/archives/2024/04.mdwn b/archives/2024/04.mdwn
new file mode 100644
index 0000000..bd09b92
--- /dev/null
+++ b/archives/2024/04.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=04 year=2024 pages="*"]]
+"""]]
+
+[[!inline pages="creation_month(04) and creation_year(2024) and *" show=0 feeds=no reverse=yes]]
diff --git a/archives/2024/05.mdwn b/archives/2024/05.mdwn
new file mode 100644
index 0000000..b3298da
--- /dev/null
+++ b/archives/2024/05.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=05 year=2024 pages="*"]]
+"""]]
+
+[[!inline pages="creation_month(05) and creation_year(2024) and *" show=0 feeds=no reverse=yes]]
diff --git a/archives/2024/06.mdwn b/archives/2024/06.mdwn
new file mode 100644
index 0000000..32abecf
--- /dev/null
+++ b/archives/2024/06.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=06 year=2024 pages="*"]]
+"""]]
+
+[[!inline pages="creation_month(06) and creation_year(2024) and *" show=0 feeds=no reverse=yes]]
diff --git a/archives/2024/07.mdwn b/archives/2024/07.mdwn
new file mode 100644
index 0000000..ffb491e
--- /dev/null
+++ b/archives/2024/07.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=07 year=2024 pages="*"]]
+"""]]
+
+[[!inline pages="creation_month(07) and creation_year(2024) and *" show=0 feeds=no reverse=yes]]
diff --git a/archives/2024/08.mdwn b/archives/2024/08.mdwn
new file mode 100644
index 0000000..622c5e6
--- /dev/null
+++ b/archives/2024/08.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=08 year=2024 pages="*"]]
+"""]]
+
+[[!inline pages="creation_month(08) and creation_year(2024) and *" show=0 feeds=no reverse=yes]]
diff --git a/archives/2024/09.mdwn b/archives/2024/09.mdwn
new file mode 100644
index 0000000..81ca9e8
--- /dev/null
+++ b/archives/2024/09.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=09 year=2024 pages="*"]]
+"""]]
+
+[[!inline pages="creation_month(09) and creation_year(2024) and *" show=0 feeds=no reverse=yes]]
diff --git a/archives/2024/10.mdwn b/archives/2024/10.mdwn
new file mode 100644
index 0000000..2d1b86b
--- /dev/null
+++ b/archives/2024/10.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=10 year=2024 pages="*"]]
+"""]]
+
+[[!inline pages="creation_month(10) and creation_year(2024) and *" show=0 feeds=no reverse=yes]]
diff --git a/archives/2024/11.mdwn b/archives/2024/11.mdwn
new file mode 100644
index 0000000..c47681d
--- /dev/null
+++ b/archives/2024/11.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=11 year=2024 pages="*"]]
+"""]]
+
+[[!inline pages="creation_month(11) and creation_year(2024) and *" show=0 feeds=no reverse=yes]]
diff --git a/archives/2024/12.mdwn b/archives/2024/12.mdwn
new file mode 100644
index 0000000..da63df6
--- /dev/null
+++ b/archives/2024/12.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=12 year=2024 pages="*"]]
+"""]]
+
+[[!inline pages="creation_month(12) and creation_year(2024) and *" show=0 feeds=no reverse=yes]]

mastodon migration
diff --git a/blogs.mdwn b/blogs.mdwn
index d802fa4..b22adee 100644
--- a/blogs.mdwn
+++ b/blogs.mdwn
@@ -9,7 +9,7 @@ List of feeds:
 * [[!aggregate expireage=35 name="Anna and Mark: Wetknee" feedurl="https://wetknee.com/feed/" url="https://wetknee.com/"]]
 * [[!aggregate expireage=35 name="Joey" feedurl="http://joeyh.name/blog/index.rss" url="http://joeyh.name/blog/"]]
 * [[!aggregate expireage=35 name="Joey devblog" feedurl="http://joeyh.name/devblog/index.rss" url="http://joeyh.name/devblog/"]]
-* [[!aggregate expireage=35 name="Joey short" feedurl="https://octodon.social/@joeyh.rss" url="https://octodon.social/@joeyh"]]
+* [[!aggregate expireage=35 name="Joey short" feedurl="https://hachyderm.io/@joeyh.rss" url="https://hachyderm.io/@joeyh"]]
 * [[!aggregate expireage=35 name="Jay" feedurl="http://www.livejournal.com/users/jenderqueer/data/rss" url="http://www.livejournal.com/users/jenderqueer/"]]
 * [[!aggregate expireage=35 name="Errol" feedurl="http://www.livejournal.com/users/plumbbobline/data/rss" url="http://www.livejournal.com/users/plumbbobline/"]]
 * [[!aggregate expireage=35 name="Maggie" feedurl="https://thruschizoaffectiveeyes.blogspot.com/feeds/posts/default?alt=rss" url="https://thruschizoaffectiveeyes.blogspot.com/"]]

new blog for maggie
diff --git a/blogs.mdwn b/blogs.mdwn
index 357cee0..d802fa4 100644
--- a/blogs.mdwn
+++ b/blogs.mdwn
@@ -1,4 +1,4 @@
-[[!inline pages="internal(blogs/*) and !Maggie/* and !*/Discussion" show=100]]
+[[!inline pages="internal(blogs/*) and !*/Discussion" show=100]]
 [[!meta title="Family blogs"]]
 
 ----
@@ -12,7 +12,7 @@ List of feeds:
 * [[!aggregate expireage=35 name="Joey short" feedurl="https://octodon.social/@joeyh.rss" url="https://octodon.social/@joeyh"]]
 * [[!aggregate expireage=35 name="Jay" feedurl="http://www.livejournal.com/users/jenderqueer/data/rss" url="http://www.livejournal.com/users/jenderqueer/"]]
 * [[!aggregate expireage=35 name="Errol" feedurl="http://www.livejournal.com/users/plumbbobline/data/rss" url="http://www.livejournal.com/users/plumbbobline/"]]
-* [[!aggregate expireage=35 name="Maggie also" feedurl="http://beautyitselfispurpose.branchable.com/index.atom" url="http://beautyitselfispurpose.branchable.com/"]]
+* [[!aggregate expireage=35 name="Maggie" feedurl="https://thruschizoaffectiveeyes.blogspot.com/feeds/posts/default?alt=rss" url="https://thruschizoaffectiveeyes.blogspot.com/"]]
 * [[!aggregate expireage=35 name="Tomoko" feedurl="http://sktk.exblog.jp/atom.xml" url="http://sktk.exblog.jp/"]]
 * [[!aggregate expireage=35 name="Jerry" feedurl="http://carpentrydiem.blogspot.com/feeds/posts/default" url="http://carpentrydiem.blogspot.com/"]]
 * [[!aggregate expireage=35 name="Dani" feedurl="https://doctorcowgirl.wordpress.com/feed/" url="https://doctorcowgirl.wordpress.com/"]]

calendar update
diff --git a/archives/2023.mdwn b/archives/2023.mdwn
new file mode 100644
index 0000000..6a8289b
--- /dev/null
+++ b/archives/2023.mdwn
@@ -0,0 +1 @@
+[[!calendar type=year year=2023 pages="*"]]
diff --git a/archives/2023/01.mdwn b/archives/2023/01.mdwn
new file mode 100644
index 0000000..cc2d582
--- /dev/null
+++ b/archives/2023/01.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=01 year=2023 pages="*"]]
+"""]]
+
+[[!inline pages="creation_month(01) and creation_year(2023) and *" show=0 feeds=no reverse=yes]]
diff --git a/archives/2023/02.mdwn b/archives/2023/02.mdwn
new file mode 100644
index 0000000..00f5db9
--- /dev/null
+++ b/archives/2023/02.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=02 year=2023 pages="*"]]
+"""]]
+
+[[!inline pages="creation_month(02) and creation_year(2023) and *" show=0 feeds=no reverse=yes]]
diff --git a/archives/2023/03.mdwn b/archives/2023/03.mdwn
new file mode 100644
index 0000000..2ba3ac1
--- /dev/null
+++ b/archives/2023/03.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=03 year=2023 pages="*"]]
+"""]]
+
+[[!inline pages="creation_month(03) and creation_year(2023) and *" show=0 feeds=no reverse=yes]]
diff --git a/archives/2023/04.mdwn b/archives/2023/04.mdwn
new file mode 100644
index 0000000..333265d
--- /dev/null
+++ b/archives/2023/04.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=04 year=2023 pages="*"]]
+"""]]
+
+[[!inline pages="creation_month(04) and creation_year(2023) and *" show=0 feeds=no reverse=yes]]
diff --git a/archives/2023/05.mdwn b/archives/2023/05.mdwn
new file mode 100644
index 0000000..16edc30
--- /dev/null
+++ b/archives/2023/05.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=05 year=2023 pages="*"]]
+"""]]
+
+[[!inline pages="creation_month(05) and creation_year(2023) and *" show=0 feeds=no reverse=yes]]
diff --git a/archives/2023/06.mdwn b/archives/2023/06.mdwn
new file mode 100644
index 0000000..0bb4701
--- /dev/null
+++ b/archives/2023/06.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=06 year=2023 pages="*"]]
+"""]]
+
+[[!inline pages="creation_month(06) and creation_year(2023) and *" show=0 feeds=no reverse=yes]]
diff --git a/archives/2023/07.mdwn b/archives/2023/07.mdwn
new file mode 100644
index 0000000..288eb60
--- /dev/null
+++ b/archives/2023/07.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=07 year=2023 pages="*"]]
+"""]]
+
+[[!inline pages="creation_month(07) and creation_year(2023) and *" show=0 feeds=no reverse=yes]]
diff --git a/archives/2023/08.mdwn b/archives/2023/08.mdwn
new file mode 100644
index 0000000..b1b522d
--- /dev/null
+++ b/archives/2023/08.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=08 year=2023 pages="*"]]
+"""]]
+
+[[!inline pages="creation_month(08) and creation_year(2023) and *" show=0 feeds=no reverse=yes]]
diff --git a/archives/2023/09.mdwn b/archives/2023/09.mdwn
new file mode 100644
index 0000000..5fbac39
--- /dev/null
+++ b/archives/2023/09.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=09 year=2023 pages="*"]]
+"""]]
+
+[[!inline pages="creation_month(09) and creation_year(2023) and *" show=0 feeds=no reverse=yes]]
diff --git a/archives/2023/10.mdwn b/archives/2023/10.mdwn
new file mode 100644
index 0000000..1babb60
--- /dev/null
+++ b/archives/2023/10.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=10 year=2023 pages="*"]]
+"""]]
+
+[[!inline pages="creation_month(10) and creation_year(2023) and *" show=0 feeds=no reverse=yes]]
diff --git a/archives/2023/11.mdwn b/archives/2023/11.mdwn
new file mode 100644
index 0000000..b5b6a38
--- /dev/null
+++ b/archives/2023/11.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=11 year=2023 pages="*"]]
+"""]]
+
+[[!inline pages="creation_month(11) and creation_year(2023) and *" show=0 feeds=no reverse=yes]]
diff --git a/archives/2023/12.mdwn b/archives/2023/12.mdwn
new file mode 100644
index 0000000..894b775
--- /dev/null
+++ b/archives/2023/12.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=12 year=2023 pages="*"]]
+"""]]
+
+[[!inline pages="creation_month(12) and creation_year(2023) and *" show=0 feeds=no reverse=yes]]

oops
diff --git a/blogs.mdwn b/blogs.mdwn
index 2873fc3..357cee0 100644
--- a/blogs.mdwn
+++ b/blogs.mdwn
@@ -6,7 +6,7 @@
 List of feeds:
 
 * [[!aggregate expireage=35 name="Anna and Mark: Waldeneffect" feedurl="http://www.waldeneffect.org/index.rss" url="http://www.waldeneffect.org/"]]
-* [[!aggregate expireage=35 name="Anna and Mark: Wetknee" feedurl="https://wetknee.com/feed" url="https://wetknee.com/"]]
+* [[!aggregate expireage=35 name="Anna and Mark: Wetknee" feedurl="https://wetknee.com/feed/" url="https://wetknee.com/"]]
 * [[!aggregate expireage=35 name="Joey" feedurl="http://joeyh.name/blog/index.rss" url="http://joeyh.name/blog/"]]
 * [[!aggregate expireage=35 name="Joey devblog" feedurl="http://joeyh.name/devblog/index.rss" url="http://joeyh.name/devblog/"]]
 * [[!aggregate expireage=35 name="Joey short" feedurl="https://octodon.social/@joeyh.rss" url="https://octodon.social/@joeyh"]]

fix feed link
diff --git a/blogs.mdwn b/blogs.mdwn
index 357cee0..2873fc3 100644
--- a/blogs.mdwn
+++ b/blogs.mdwn
@@ -6,7 +6,7 @@
 List of feeds:
 
 * [[!aggregate expireage=35 name="Anna and Mark: Waldeneffect" feedurl="http://www.waldeneffect.org/index.rss" url="http://www.waldeneffect.org/"]]
-* [[!aggregate expireage=35 name="Anna and Mark: Wetknee" feedurl="https://wetknee.com/feed/" url="https://wetknee.com/"]]
+* [[!aggregate expireage=35 name="Anna and Mark: Wetknee" feedurl="https://wetknee.com/feed" url="https://wetknee.com/"]]
 * [[!aggregate expireage=35 name="Joey" feedurl="http://joeyh.name/blog/index.rss" url="http://joeyh.name/blog/"]]
 * [[!aggregate expireage=35 name="Joey devblog" feedurl="http://joeyh.name/devblog/index.rss" url="http://joeyh.name/devblog/"]]
 * [[!aggregate expireage=35 name="Joey short" feedurl="https://octodon.social/@joeyh.rss" url="https://octodon.social/@joeyh"]]

add wetknee
diff --git a/blogs.mdwn b/blogs.mdwn
index a55a31f..357cee0 100644
--- a/blogs.mdwn
+++ b/blogs.mdwn
@@ -5,8 +5,8 @@
 
 List of feeds:
 
-* [[!aggregate expireage=35 name="Anna" feedurl="http://www.livejournal.com/users/wetkneefarm/data/rss" url="http://www.livejournal.com/users/wetkneefarm/"]]
 * [[!aggregate expireage=35 name="Anna and Mark: Waldeneffect" feedurl="http://www.waldeneffect.org/index.rss" url="http://www.waldeneffect.org/"]]
+* [[!aggregate expireage=35 name="Anna and Mark: Wetknee" feedurl="https://wetknee.com/feed/" url="https://wetknee.com/"]]
 * [[!aggregate expireage=35 name="Joey" feedurl="http://joeyh.name/blog/index.rss" url="http://joeyh.name/blog/"]]
 * [[!aggregate expireage=35 name="Joey devblog" feedurl="http://joeyh.name/devblog/index.rss" url="http://joeyh.name/devblog/"]]
 * [[!aggregate expireage=35 name="Joey short" feedurl="https://octodon.social/@joeyh.rss" url="https://octodon.social/@joeyh"]]

update
diff --git a/blogs.mdwn b/blogs.mdwn
index 385bfb4..a55a31f 100644
--- a/blogs.mdwn
+++ b/blogs.mdwn
@@ -12,7 +12,6 @@ List of feeds:
 * [[!aggregate expireage=35 name="Joey short" feedurl="https://octodon.social/@joeyh.rss" url="https://octodon.social/@joeyh"]]
 * [[!aggregate expireage=35 name="Jay" feedurl="http://www.livejournal.com/users/jenderqueer/data/rss" url="http://www.livejournal.com/users/jenderqueer/"]]
 * [[!aggregate expireage=35 name="Errol" feedurl="http://www.livejournal.com/users/plumbbobline/data/rss" url="http://www.livejournal.com/users/plumbbobline/"]]
-* [[!aggregate expireage=35 name="Maggie too" feedurl="http://brazenlyquiver.livejournal.com/data/atom" url="http://brazenlyquiver.livejournal.com/"]]
 * [[!aggregate expireage=35 name="Maggie also" feedurl="http://beautyitselfispurpose.branchable.com/index.atom" url="http://beautyitselfispurpose.branchable.com/"]]
 * [[!aggregate expireage=35 name="Tomoko" feedurl="http://sktk.exblog.jp/atom.xml" url="http://sktk.exblog.jp/"]]
 * [[!aggregate expireage=35 name="Jerry" feedurl="http://carpentrydiem.blogspot.com/feeds/posts/default" url="http://carpentrydiem.blogspot.com/"]]

back
diff --git a/blogs.mdwn b/blogs.mdwn
index a2f87be..385bfb4 100644
--- a/blogs.mdwn
+++ b/blogs.mdwn
@@ -9,6 +9,7 @@ List of feeds:
 * [[!aggregate expireage=35 name="Anna and Mark: Waldeneffect" feedurl="http://www.waldeneffect.org/index.rss" url="http://www.waldeneffect.org/"]]
 * [[!aggregate expireage=35 name="Joey" feedurl="http://joeyh.name/blog/index.rss" url="http://joeyh.name/blog/"]]
 * [[!aggregate expireage=35 name="Joey devblog" feedurl="http://joeyh.name/devblog/index.rss" url="http://joeyh.name/devblog/"]]
+* [[!aggregate expireage=35 name="Joey short" feedurl="https://octodon.social/@joeyh.rss" url="https://octodon.social/@joeyh"]]
 * [[!aggregate expireage=35 name="Jay" feedurl="http://www.livejournal.com/users/jenderqueer/data/rss" url="http://www.livejournal.com/users/jenderqueer/"]]
 * [[!aggregate expireage=35 name="Errol" feedurl="http://www.livejournal.com/users/plumbbobline/data/rss" url="http://www.livejournal.com/users/plumbbobline/"]]
 * [[!aggregate expireage=35 name="Maggie too" feedurl="http://brazenlyquiver.livejournal.com/data/atom" url="http://brazenlyquiver.livejournal.com/"]]

remove my mastodon feed
diff --git a/blogs.mdwn b/blogs.mdwn
index 64ce67d..a2f87be 100644
--- a/blogs.mdwn
+++ b/blogs.mdwn
@@ -9,7 +9,6 @@ List of feeds:
 * [[!aggregate expireage=35 name="Anna and Mark: Waldeneffect" feedurl="http://www.waldeneffect.org/index.rss" url="http://www.waldeneffect.org/"]]
 * [[!aggregate expireage=35 name="Joey" feedurl="http://joeyh.name/blog/index.rss" url="http://joeyh.name/blog/"]]
 * [[!aggregate expireage=35 name="Joey devblog" feedurl="http://joeyh.name/devblog/index.rss" url="http://joeyh.name/devblog/"]]
-* [[!aggregate expireage=35 name="Joey's mastodon" feedurl="https://octodon.social/@joeyh.rss" url="https://octodon.social/@joeyh"]]
 * [[!aggregate expireage=35 name="Jay" feedurl="http://www.livejournal.com/users/jenderqueer/data/rss" url="http://www.livejournal.com/users/jenderqueer/"]]
 * [[!aggregate expireage=35 name="Errol" feedurl="http://www.livejournal.com/users/plumbbobline/data/rss" url="http://www.livejournal.com/users/plumbbobline/"]]
 * [[!aggregate expireage=35 name="Maggie too" feedurl="http://brazenlyquiver.livejournal.com/data/atom" url="http://brazenlyquiver.livejournal.com/"]]

add back my mastodon under a different name
diff --git a/blogs.mdwn b/blogs.mdwn
index a2f87be..64ce67d 100644
--- a/blogs.mdwn
+++ b/blogs.mdwn
@@ -9,6 +9,7 @@ List of feeds:
 * [[!aggregate expireage=35 name="Anna and Mark: Waldeneffect" feedurl="http://www.waldeneffect.org/index.rss" url="http://www.waldeneffect.org/"]]
 * [[!aggregate expireage=35 name="Joey" feedurl="http://joeyh.name/blog/index.rss" url="http://joeyh.name/blog/"]]
 * [[!aggregate expireage=35 name="Joey devblog" feedurl="http://joeyh.name/devblog/index.rss" url="http://joeyh.name/devblog/"]]
+* [[!aggregate expireage=35 name="Joey's mastodon" feedurl="https://octodon.social/@joeyh.rss" url="https://octodon.social/@joeyh"]]
 * [[!aggregate expireage=35 name="Jay" feedurl="http://www.livejournal.com/users/jenderqueer/data/rss" url="http://www.livejournal.com/users/jenderqueer/"]]
 * [[!aggregate expireage=35 name="Errol" feedurl="http://www.livejournal.com/users/plumbbobline/data/rss" url="http://www.livejournal.com/users/plumbbobline/"]]
 * [[!aggregate expireage=35 name="Maggie too" feedurl="http://brazenlyquiver.livejournal.com/data/atom" url="http://brazenlyquiver.livejournal.com/"]]

remove my mastodon feed temporarily
diff --git a/blogs.mdwn b/blogs.mdwn
index cf67bc7..a2f87be 100644
--- a/blogs.mdwn
+++ b/blogs.mdwn
@@ -8,7 +8,6 @@ List of feeds:
 * [[!aggregate expireage=35 name="Anna" feedurl="http://www.livejournal.com/users/wetkneefarm/data/rss" url="http://www.livejournal.com/users/wetkneefarm/"]]
 * [[!aggregate expireage=35 name="Anna and Mark: Waldeneffect" feedurl="http://www.waldeneffect.org/index.rss" url="http://www.waldeneffect.org/"]]
 * [[!aggregate expireage=35 name="Joey" feedurl="http://joeyh.name/blog/index.rss" url="http://joeyh.name/blog/"]]
-* [[!aggregate expireage=35 name="Joey mastodon" feedurl="https://octodon.social/@joeyh.rss" url="https://octodon.social/@joeyh"]]
 * [[!aggregate expireage=35 name="Joey devblog" feedurl="http://joeyh.name/devblog/index.rss" url="http://joeyh.name/devblog/"]]
 * [[!aggregate expireage=35 name="Jay" feedurl="http://www.livejournal.com/users/jenderqueer/data/rss" url="http://www.livejournal.com/users/jenderqueer/"]]
 * [[!aggregate expireage=35 name="Errol" feedurl="http://www.livejournal.com/users/plumbbobline/data/rss" url="http://www.livejournal.com/users/plumbbobline/"]]

Revert "add anna rss feed for instagram"
This reverts commit abab2d19fd578225fcef0a4cdf4e1ed7e9daff85.
rs.app is a paid service, nope
diff --git a/blogs.mdwn b/blogs.mdwn
index 8d5e131..cf67bc7 100644
--- a/blogs.mdwn
+++ b/blogs.mdwn
@@ -7,7 +7,6 @@ List of feeds:
 
 * [[!aggregate expireage=35 name="Anna" feedurl="http://www.livejournal.com/users/wetkneefarm/data/rss" url="http://www.livejournal.com/users/wetkneefarm/"]]
 * [[!aggregate expireage=35 name="Anna and Mark: Waldeneffect" feedurl="http://www.waldeneffect.org/index.rss" url="http://www.waldeneffect.org/"]]
-* [[!aggregate expireage=35 name="Anna instagram" feedurl="https://rss.app/feeds/4hY3fKNvraECBL4r.xml" url="https://www.instagram.com/annahessphoto/"]]
 * [[!aggregate expireage=35 name="Joey" feedurl="http://joeyh.name/blog/index.rss" url="http://joeyh.name/blog/"]]
 * [[!aggregate expireage=35 name="Joey mastodon" feedurl="https://octodon.social/@joeyh.rss" url="https://octodon.social/@joeyh"]]
 * [[!aggregate expireage=35 name="Joey devblog" feedurl="http://joeyh.name/devblog/index.rss" url="http://joeyh.name/devblog/"]]

add anna rss feed for instagram
diff --git a/blogs.mdwn b/blogs.mdwn
index cf67bc7..8d5e131 100644
--- a/blogs.mdwn
+++ b/blogs.mdwn
@@ -7,6 +7,7 @@ List of feeds:
 
 * [[!aggregate expireage=35 name="Anna" feedurl="http://www.livejournal.com/users/wetkneefarm/data/rss" url="http://www.livejournal.com/users/wetkneefarm/"]]
 * [[!aggregate expireage=35 name="Anna and Mark: Waldeneffect" feedurl="http://www.waldeneffect.org/index.rss" url="http://www.waldeneffect.org/"]]
+* [[!aggregate expireage=35 name="Anna instagram" feedurl="https://rss.app/feeds/4hY3fKNvraECBL4r.xml" url="https://www.instagram.com/annahessphoto/"]]
 * [[!aggregate expireage=35 name="Joey" feedurl="http://joeyh.name/blog/index.rss" url="http://joeyh.name/blog/"]]
 * [[!aggregate expireage=35 name="Joey mastodon" feedurl="https://octodon.social/@joeyh.rss" url="https://octodon.social/@joeyh"]]
 * [[!aggregate expireage=35 name="Joey devblog" feedurl="http://joeyh.name/devblog/index.rss" url="http://joeyh.name/devblog/"]]

calendar update
diff --git a/archives/2022.mdwn b/archives/2022.mdwn
new file mode 100644
index 0000000..81a39b2
--- /dev/null
+++ b/archives/2022.mdwn
@@ -0,0 +1 @@
+[[!calendar type=year year=2022 pages="*"]]
diff --git a/archives/2022/01.mdwn b/archives/2022/01.mdwn
new file mode 100644
index 0000000..cada14a
--- /dev/null
+++ b/archives/2022/01.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=01 year=2022 pages="*"]]
+"""]]
+
+[[!inline pages="creation_month(01) and creation_year(2022) and *" show=0 feeds=no reverse=yes]]
diff --git a/archives/2022/02.mdwn b/archives/2022/02.mdwn
new file mode 100644
index 0000000..1ca459c
--- /dev/null
+++ b/archives/2022/02.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=02 year=2022 pages="*"]]
+"""]]
+
+[[!inline pages="creation_month(02) and creation_year(2022) and *" show=0 feeds=no reverse=yes]]
diff --git a/archives/2022/03.mdwn b/archives/2022/03.mdwn
new file mode 100644
index 0000000..8208960
--- /dev/null
+++ b/archives/2022/03.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=03 year=2022 pages="*"]]
+"""]]
+
+[[!inline pages="creation_month(03) and creation_year(2022) and *" show=0 feeds=no reverse=yes]]
diff --git a/archives/2022/04.mdwn b/archives/2022/04.mdwn
new file mode 100644
index 0000000..addcba7
--- /dev/null
+++ b/archives/2022/04.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=04 year=2022 pages="*"]]
+"""]]
+
+[[!inline pages="creation_month(04) and creation_year(2022) and *" show=0 feeds=no reverse=yes]]
diff --git a/archives/2022/05.mdwn b/archives/2022/05.mdwn
new file mode 100644
index 0000000..1dd846a
--- /dev/null
+++ b/archives/2022/05.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=05 year=2022 pages="*"]]
+"""]]
+
+[[!inline pages="creation_month(05) and creation_year(2022) and *" show=0 feeds=no reverse=yes]]
diff --git a/archives/2022/06.mdwn b/archives/2022/06.mdwn
new file mode 100644
index 0000000..36288d3
--- /dev/null
+++ b/archives/2022/06.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=06 year=2022 pages="*"]]
+"""]]
+
+[[!inline pages="creation_month(06) and creation_year(2022) and *" show=0 feeds=no reverse=yes]]
diff --git a/archives/2022/07.mdwn b/archives/2022/07.mdwn
new file mode 100644
index 0000000..d702de3
--- /dev/null
+++ b/archives/2022/07.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=07 year=2022 pages="*"]]
+"""]]
+
+[[!inline pages="creation_month(07) and creation_year(2022) and *" show=0 feeds=no reverse=yes]]
diff --git a/archives/2022/08.mdwn b/archives/2022/08.mdwn
new file mode 100644
index 0000000..07e5cee
--- /dev/null
+++ b/archives/2022/08.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=08 year=2022 pages="*"]]
+"""]]
+
+[[!inline pages="creation_month(08) and creation_year(2022) and *" show=0 feeds=no reverse=yes]]
diff --git a/archives/2022/09.mdwn b/archives/2022/09.mdwn
new file mode 100644
index 0000000..8b78c78
--- /dev/null
+++ b/archives/2022/09.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=09 year=2022 pages="*"]]
+"""]]
+
+[[!inline pages="creation_month(09) and creation_year(2022) and *" show=0 feeds=no reverse=yes]]
diff --git a/archives/2022/10.mdwn b/archives/2022/10.mdwn
new file mode 100644
index 0000000..0a9009f
--- /dev/null
+++ b/archives/2022/10.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=10 year=2022 pages="*"]]
+"""]]
+
+[[!inline pages="creation_month(10) and creation_year(2022) and *" show=0 feeds=no reverse=yes]]
diff --git a/archives/2022/11.mdwn b/archives/2022/11.mdwn
new file mode 100644
index 0000000..ece27b4
--- /dev/null
+++ b/archives/2022/11.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=11 year=2022 pages="*"]]
+"""]]
+
+[[!inline pages="creation_month(11) and creation_year(2022) and *" show=0 feeds=no reverse=yes]]
diff --git a/archives/2022/12.mdwn b/archives/2022/12.mdwn
new file mode 100644
index 0000000..2d054f3
--- /dev/null
+++ b/archives/2022/12.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=12 year=2022 pages="*"]]
+"""]]
+
+[[!inline pages="creation_month(12) and creation_year(2022) and *" show=0 feeds=no reverse=yes]]

back
diff --git a/blogs.mdwn b/blogs.mdwn
index a2f87be..cf67bc7 100644
--- a/blogs.mdwn
+++ b/blogs.mdwn
@@ -8,6 +8,7 @@ List of feeds:
 * [[!aggregate expireage=35 name="Anna" feedurl="http://www.livejournal.com/users/wetkneefarm/data/rss" url="http://www.livejournal.com/users/wetkneefarm/"]]
 * [[!aggregate expireage=35 name="Anna and Mark: Waldeneffect" feedurl="http://www.waldeneffect.org/index.rss" url="http://www.waldeneffect.org/"]]
 * [[!aggregate expireage=35 name="Joey" feedurl="http://joeyh.name/blog/index.rss" url="http://joeyh.name/blog/"]]
+* [[!aggregate expireage=35 name="Joey mastodon" feedurl="https://octodon.social/@joeyh.rss" url="https://octodon.social/@joeyh"]]
 * [[!aggregate expireage=35 name="Joey devblog" feedurl="http://joeyh.name/devblog/index.rss" url="http://joeyh.name/devblog/"]]
 * [[!aggregate expireage=35 name="Jay" feedurl="http://www.livejournal.com/users/jenderqueer/data/rss" url="http://www.livejournal.com/users/jenderqueer/"]]
 * [[!aggregate expireage=35 name="Errol" feedurl="http://www.livejournal.com/users/plumbbobline/data/rss" url="http://www.livejournal.com/users/plumbbobline/"]]

testing more
diff --git a/blogs.mdwn b/blogs.mdwn
index 5c95eb3..a2f87be 100644
--- a/blogs.mdwn
+++ b/blogs.mdwn
@@ -8,7 +8,6 @@ List of feeds:
 * [[!aggregate expireage=35 name="Anna" feedurl="http://www.livejournal.com/users/wetkneefarm/data/rss" url="http://www.livejournal.com/users/wetkneefarm/"]]
 * [[!aggregate expireage=35 name="Anna and Mark: Waldeneffect" feedurl="http://www.waldeneffect.org/index.rss" url="http://www.waldeneffect.org/"]]
 * [[!aggregate expireage=35 name="Joey" feedurl="http://joeyh.name/blog/index.rss" url="http://joeyh.name/blog/"]]
-* [[!aggregate expireage=35 name="Joey short" feedurl="https://octodon.social/@joeyh.rss" url="https://octodon.social/@joeyh"]]
 * [[!aggregate expireage=35 name="Joey devblog" feedurl="http://joeyh.name/devblog/index.rss" url="http://joeyh.name/devblog/"]]
 * [[!aggregate expireage=35 name="Jay" feedurl="http://www.livejournal.com/users/jenderqueer/data/rss" url="http://www.livejournal.com/users/jenderqueer/"]]
 * [[!aggregate expireage=35 name="Errol" feedurl="http://www.livejournal.com/users/plumbbobline/data/rss" url="http://www.livejournal.com/users/plumbbobline/"]]

add back my mastodon under different name for testing
diff --git a/blogs.mdwn b/blogs.mdwn
index a2f87be..5c95eb3 100644
--- a/blogs.mdwn
+++ b/blogs.mdwn
@@ -8,6 +8,7 @@ List of feeds:
 * [[!aggregate expireage=35 name="Anna" feedurl="http://www.livejournal.com/users/wetkneefarm/data/rss" url="http://www.livejournal.com/users/wetkneefarm/"]]
 * [[!aggregate expireage=35 name="Anna and Mark: Waldeneffect" feedurl="http://www.waldeneffect.org/index.rss" url="http://www.waldeneffect.org/"]]
 * [[!aggregate expireage=35 name="Joey" feedurl="http://joeyh.name/blog/index.rss" url="http://joeyh.name/blog/"]]
+* [[!aggregate expireage=35 name="Joey short" feedurl="https://octodon.social/@joeyh.rss" url="https://octodon.social/@joeyh"]]
 * [[!aggregate expireage=35 name="Joey devblog" feedurl="http://joeyh.name/devblog/index.rss" url="http://joeyh.name/devblog/"]]
 * [[!aggregate expireage=35 name="Jay" feedurl="http://www.livejournal.com/users/jenderqueer/data/rss" url="http://www.livejournal.com/users/jenderqueer/"]]
 * [[!aggregate expireage=35 name="Errol" feedurl="http://www.livejournal.com/users/plumbbobline/data/rss" url="http://www.livejournal.com/users/plumbbobline/"]]

temporarily removing my mastodon feed
diff --git a/blogs.mdwn b/blogs.mdwn
index 72afcf7..a2f87be 100644
--- a/blogs.mdwn
+++ b/blogs.mdwn
@@ -9,7 +9,6 @@ List of feeds:
 * [[!aggregate expireage=35 name="Anna and Mark: Waldeneffect" feedurl="http://www.waldeneffect.org/index.rss" url="http://www.waldeneffect.org/"]]
 * [[!aggregate expireage=35 name="Joey" feedurl="http://joeyh.name/blog/index.rss" url="http://joeyh.name/blog/"]]
 * [[!aggregate expireage=35 name="Joey devblog" feedurl="http://joeyh.name/devblog/index.rss" url="http://joeyh.name/devblog/"]]
-* [[!aggregate expireage=35 name="Joey mastrodon" feedurl="https://octodon.social/@joeyh.rss" url="https://octodon.social/@joeyh"]]
 * [[!aggregate expireage=35 name="Jay" feedurl="http://www.livejournal.com/users/jenderqueer/data/rss" url="http://www.livejournal.com/users/jenderqueer/"]]
 * [[!aggregate expireage=35 name="Errol" feedurl="http://www.livejournal.com/users/plumbbobline/data/rss" url="http://www.livejournal.com/users/plumbbobline/"]]
 * [[!aggregate expireage=35 name="Maggie too" feedurl="http://brazenlyquiver.livejournal.com/data/atom" url="http://brazenlyquiver.livejournal.com/"]]

fix
diff --git a/blogs.mdwn b/blogs.mdwn
index c5f9282..72afcf7 100644
--- a/blogs.mdwn
+++ b/blogs.mdwn
@@ -9,7 +9,7 @@ List of feeds:
 * [[!aggregate expireage=35 name="Anna and Mark: Waldeneffect" feedurl="http://www.waldeneffect.org/index.rss" url="http://www.waldeneffect.org/"]]
 * [[!aggregate expireage=35 name="Joey" feedurl="http://joeyh.name/blog/index.rss" url="http://joeyh.name/blog/"]]
 * [[!aggregate expireage=35 name="Joey devblog" feedurl="http://joeyh.name/devblog/index.rss" url="http://joeyh.name/devblog/"]]
-* [[!aggregate expireage=35 name="Joey mastrodon" feedurl="view-source:https://octodon.social/@joeyh.rss" url="view-source:https://octodon.social/@joeyh"]]
+* [[!aggregate expireage=35 name="Joey mastrodon" feedurl="https://octodon.social/@joeyh.rss" url="https://octodon.social/@joeyh"]]
 * [[!aggregate expireage=35 name="Jay" feedurl="http://www.livejournal.com/users/jenderqueer/data/rss" url="http://www.livejournal.com/users/jenderqueer/"]]
 * [[!aggregate expireage=35 name="Errol" feedurl="http://www.livejournal.com/users/plumbbobline/data/rss" url="http://www.livejournal.com/users/plumbbobline/"]]
 * [[!aggregate expireage=35 name="Maggie too" feedurl="http://brazenlyquiver.livejournal.com/data/atom" url="http://brazenlyquiver.livejournal.com/"]]

add mastodon feed
diff --git a/blogs.mdwn b/blogs.mdwn
index a2f87be..c5f9282 100644
--- a/blogs.mdwn
+++ b/blogs.mdwn
@@ -9,6 +9,7 @@ List of feeds:
 * [[!aggregate expireage=35 name="Anna and Mark: Waldeneffect" feedurl="http://www.waldeneffect.org/index.rss" url="http://www.waldeneffect.org/"]]
 * [[!aggregate expireage=35 name="Joey" feedurl="http://joeyh.name/blog/index.rss" url="http://joeyh.name/blog/"]]
 * [[!aggregate expireage=35 name="Joey devblog" feedurl="http://joeyh.name/devblog/index.rss" url="http://joeyh.name/devblog/"]]
+* [[!aggregate expireage=35 name="Joey mastrodon" feedurl="view-source:https://octodon.social/@joeyh.rss" url="view-source:https://octodon.social/@joeyh"]]
 * [[!aggregate expireage=35 name="Jay" feedurl="http://www.livejournal.com/users/jenderqueer/data/rss" url="http://www.livejournal.com/users/jenderqueer/"]]
 * [[!aggregate expireage=35 name="Errol" feedurl="http://www.livejournal.com/users/plumbbobline/data/rss" url="http://www.livejournal.com/users/plumbbobline/"]]
 * [[!aggregate expireage=35 name="Maggie too" feedurl="http://brazenlyquiver.livejournal.com/data/atom" url="http://brazenlyquiver.livejournal.com/"]]

remove richard's blog on his request
diff --git a/blogs.mdwn b/blogs.mdwn
index b86560f..a2f87be 100644
--- a/blogs.mdwn
+++ b/blogs.mdwn
@@ -16,4 +16,3 @@ List of feeds:
 * [[!aggregate expireage=35 name="Tomoko" feedurl="http://sktk.exblog.jp/atom.xml" url="http://sktk.exblog.jp/"]]
 * [[!aggregate expireage=35 name="Jerry" feedurl="http://carpentrydiem.blogspot.com/feeds/posts/default" url="http://carpentrydiem.blogspot.com/"]]
 * [[!aggregate expireage=35 name="Dani" feedurl="https://doctorcowgirl.wordpress.com/feed/" url="https://doctorcowgirl.wordpress.com/"]]
-* [[!aggregate expireage=35 name="Richard" feedurl="https://tidymanblog.wordpress.com/feed/" url="https://tidymanblog.wordpress.com/"]]

add
diff --git a/pics/misc/old_wallet_photos.jpg b/pics/misc/old_wallet_photos.jpg
new file mode 100644
index 0000000..5812839
Binary files /dev/null and b/pics/misc/old_wallet_photos.jpg differ

calendar update
diff --git a/archives/2021.mdwn b/archives/2021.mdwn
new file mode 100644
index 0000000..15ee4cd
--- /dev/null
+++ b/archives/2021.mdwn
@@ -0,0 +1 @@
+[[!calendar type=year year=2021 pages="*"]]
diff --git a/archives/2021/01.mdwn b/archives/2021/01.mdwn
new file mode 100644
index 0000000..7266adb
--- /dev/null
+++ b/archives/2021/01.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=01 year=2021 pages="*"]]
+"""]]
+
+[[!inline pages="creation_month(01) and creation_year(2021) and *" show=0 feeds=no reverse=yes]]
diff --git a/archives/2021/02.mdwn b/archives/2021/02.mdwn
new file mode 100644
index 0000000..218e804
--- /dev/null
+++ b/archives/2021/02.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=02 year=2021 pages="*"]]
+"""]]
+
+[[!inline pages="creation_month(02) and creation_year(2021) and *" show=0 feeds=no reverse=yes]]
diff --git a/archives/2021/03.mdwn b/archives/2021/03.mdwn
new file mode 100644
index 0000000..d78855f
--- /dev/null
+++ b/archives/2021/03.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=03 year=2021 pages="*"]]
+"""]]
+
+[[!inline pages="creation_month(03) and creation_year(2021) and *" show=0 feeds=no reverse=yes]]
diff --git a/archives/2021/04.mdwn b/archives/2021/04.mdwn
new file mode 100644
index 0000000..7938694
--- /dev/null
+++ b/archives/2021/04.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=04 year=2021 pages="*"]]
+"""]]
+
+[[!inline pages="creation_month(04) and creation_year(2021) and *" show=0 feeds=no reverse=yes]]
diff --git a/archives/2021/05.mdwn b/archives/2021/05.mdwn
new file mode 100644
index 0000000..420b8d4
--- /dev/null
+++ b/archives/2021/05.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=05 year=2021 pages="*"]]
+"""]]
+
+[[!inline pages="creation_month(05) and creation_year(2021) and *" show=0 feeds=no reverse=yes]]
diff --git a/archives/2021/06.mdwn b/archives/2021/06.mdwn
new file mode 100644
index 0000000..d058f7e
--- /dev/null
+++ b/archives/2021/06.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=06 year=2021 pages="*"]]
+"""]]
+
+[[!inline pages="creation_month(06) and creation_year(2021) and *" show=0 feeds=no reverse=yes]]
diff --git a/archives/2021/07.mdwn b/archives/2021/07.mdwn
new file mode 100644
index 0000000..d3a8b21
--- /dev/null
+++ b/archives/2021/07.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=07 year=2021 pages="*"]]
+"""]]
+
+[[!inline pages="creation_month(07) and creation_year(2021) and *" show=0 feeds=no reverse=yes]]
diff --git a/archives/2021/08.mdwn b/archives/2021/08.mdwn
new file mode 100644
index 0000000..fc3fed1
--- /dev/null
+++ b/archives/2021/08.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=08 year=2021 pages="*"]]
+"""]]
+
+[[!inline pages="creation_month(08) and creation_year(2021) and *" show=0 feeds=no reverse=yes]]
diff --git a/archives/2021/09.mdwn b/archives/2021/09.mdwn
new file mode 100644
index 0000000..35921da
--- /dev/null
+++ b/archives/2021/09.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=09 year=2021 pages="*"]]
+"""]]
+
+[[!inline pages="creation_month(09) and creation_year(2021) and *" show=0 feeds=no reverse=yes]]
diff --git a/archives/2021/10.mdwn b/archives/2021/10.mdwn
new file mode 100644
index 0000000..c230f6b
--- /dev/null
+++ b/archives/2021/10.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=10 year=2021 pages="*"]]
+"""]]
+
+[[!inline pages="creation_month(10) and creation_year(2021) and *" show=0 feeds=no reverse=yes]]
diff --git a/archives/2021/11.mdwn b/archives/2021/11.mdwn
new file mode 100644
index 0000000..bd371af
--- /dev/null
+++ b/archives/2021/11.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=11 year=2021 pages="*"]]
+"""]]
+
+[[!inline pages="creation_month(11) and creation_year(2021) and *" show=0 feeds=no reverse=yes]]
diff --git a/archives/2021/12.mdwn b/archives/2021/12.mdwn
new file mode 100644
index 0000000..f32707f
--- /dev/null
+++ b/archives/2021/12.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=12 year=2021 pages="*"]]
+"""]]
+
+[[!inline pages="creation_month(12) and creation_year(2021) and *" show=0 feeds=no reverse=yes]]

despam
diff --git a/documents/comment_1_1f3fb447b9b7febb08175f48750f12d1._comment b/documents/comment_1_1f3fb447b9b7febb08175f48750f12d1._comment
deleted file mode 100644
index 6a6662f..0000000
--- a/documents/comment_1_1f3fb447b9b7febb08175f48750f12d1._comment
+++ /dev/null
@@ -1,10 +0,0 @@
-[[!comment format=mdwn
- username="loveoweb3@fe2d9d003c0c3969760e0ab947c7396afc02c711"
- nickname="loveoweb3"
- avatar="http://cdn.libravatar.org/avatar/0fbce03076dd8d59dada96175bf88339"
- subject="Evangelio de Hoy"
- date="2020-03-18T19:01:01Z"
- content="""
-<a href='https://www.evangeliodehoy.net/'>reflexion del evangelio de hoy</a>
-
-"""]]
diff --git a/documents/comment_2_049842be550d2128f8fc9d7ccde26530._comment b/documents/comment_2_049842be550d2128f8fc9d7ccde26530._comment
deleted file mode 100644
index 889c796..0000000
--- a/documents/comment_2_049842be550d2128f8fc9d7ccde26530._comment
+++ /dev/null
@@ -1,10 +0,0 @@
-[[!comment format=mdwn
- username="orame222@2f19198215d4f1503b964faa5541e6941a036aa8"
- nickname="orame222"
- avatar="http://cdn.libravatar.org/avatar/de5729a2996b7784d126711c9ea57773"
- subject="Oración A Dios"
- date="2020-11-27T15:05:08Z"
- content="""
-<a href='https://www.oracionadios.org'>oracion a dios</a>
-
-"""]]

Added a comment: Oración A Dios
diff --git a/documents/comment_2_049842be550d2128f8fc9d7ccde26530._comment b/documents/comment_2_049842be550d2128f8fc9d7ccde26530._comment
new file mode 100644
index 0000000..889c796
--- /dev/null
+++ b/documents/comment_2_049842be550d2128f8fc9d7ccde26530._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="orame222@2f19198215d4f1503b964faa5541e6941a036aa8"
+ nickname="orame222"
+ avatar="http://cdn.libravatar.org/avatar/de5729a2996b7784d126711c9ea57773"
+ subject="Oración A Dios"
+ date="2020-11-27T15:05:08Z"
+ content="""
+<a href='https://www.oracionadios.org'>oracion a dios</a>
+
+"""]]

remove old blog entries
diff --git a/blogs.mdwn b/blogs.mdwn
index 5de6feb..b86560f 100644
--- a/blogs.mdwn
+++ b/blogs.mdwn
@@ -1,4 +1,4 @@
-[[!inline pages="internal(blogs/*) and !*/Discussion" show=100]]
+[[!inline pages="internal(blogs/*) and !Maggie/* and !*/Discussion" show=100]]
 [[!meta title="Family blogs"]]
 
 ----

remove old feed
diff --git a/blogs.mdwn b/blogs.mdwn
index 4e773dd..5de6feb 100644
--- a/blogs.mdwn
+++ b/blogs.mdwn
@@ -11,7 +11,6 @@ List of feeds:
 * [[!aggregate expireage=35 name="Joey devblog" feedurl="http://joeyh.name/devblog/index.rss" url="http://joeyh.name/devblog/"]]
 * [[!aggregate expireage=35 name="Jay" feedurl="http://www.livejournal.com/users/jenderqueer/data/rss" url="http://www.livejournal.com/users/jenderqueer/"]]
 * [[!aggregate expireage=35 name="Errol" feedurl="http://www.livejournal.com/users/plumbbobline/data/rss" url="http://www.livejournal.com/users/plumbbobline/"]]
-* [[!aggregate expireage=35 name="Maggie" feedurl="http://rainbowpilgrim.postagon.com/feed" url="http://rainbowpilgrim.postagon.com/"]]
 * [[!aggregate expireage=35 name="Maggie too" feedurl="http://brazenlyquiver.livejournal.com/data/atom" url="http://brazenlyquiver.livejournal.com/"]]
 * [[!aggregate expireage=35 name="Maggie also" feedurl="http://beautyitselfispurpose.branchable.com/index.atom" url="http://beautyitselfispurpose.branchable.com/"]]
 * [[!aggregate expireage=35 name="Tomoko" feedurl="http://sktk.exblog.jp/atom.xml" url="http://sktk.exblog.jp/"]]

Added a comment: Evangelio de Hoy
diff --git a/documents/comment_1_1f3fb447b9b7febb08175f48750f12d1._comment b/documents/comment_1_1f3fb447b9b7febb08175f48750f12d1._comment
new file mode 100644
index 0000000..6a6662f
--- /dev/null
+++ b/documents/comment_1_1f3fb447b9b7febb08175f48750f12d1._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="loveoweb3@fe2d9d003c0c3969760e0ab947c7396afc02c711"
+ nickname="loveoweb3"
+ avatar="http://cdn.libravatar.org/avatar/0fbce03076dd8d59dada96175bf88339"
+ subject="Evangelio de Hoy"
+ date="2020-03-18T19:01:01Z"
+ content="""
+<a href='https://www.evangeliodehoy.net/'>reflexion del evangelio de hoy</a>
+
+"""]]

calendar update
diff --git a/archives/2020.mdwn b/archives/2020.mdwn
new file mode 100644
index 0000000..8567926
--- /dev/null
+++ b/archives/2020.mdwn
@@ -0,0 +1 @@
+[[!calendar type=year year=2020 pages="*"]]
diff --git a/archives/2020/01.mdwn b/archives/2020/01.mdwn
new file mode 100644
index 0000000..17dc334
--- /dev/null
+++ b/archives/2020/01.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=01 year=2020 pages="*"]]
+"""]]
+
+[[!inline pages="creation_month(01) and creation_year(2020) and *" show=0 feeds=no reverse=yes]]
diff --git a/archives/2020/02.mdwn b/archives/2020/02.mdwn
new file mode 100644
index 0000000..5a8f143
--- /dev/null
+++ b/archives/2020/02.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=02 year=2020 pages="*"]]
+"""]]
+
+[[!inline pages="creation_month(02) and creation_year(2020) and *" show=0 feeds=no reverse=yes]]
diff --git a/archives/2020/03.mdwn b/archives/2020/03.mdwn
new file mode 100644
index 0000000..dbc8cec
--- /dev/null
+++ b/archives/2020/03.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=03 year=2020 pages="*"]]
+"""]]
+
+[[!inline pages="creation_month(03) and creation_year(2020) and *" show=0 feeds=no reverse=yes]]
diff --git a/archives/2020/04.mdwn b/archives/2020/04.mdwn
new file mode 100644
index 0000000..5fed1bb
--- /dev/null
+++ b/archives/2020/04.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=04 year=2020 pages="*"]]
+"""]]
+
+[[!inline pages="creation_month(04) and creation_year(2020) and *" show=0 feeds=no reverse=yes]]
diff --git a/archives/2020/05.mdwn b/archives/2020/05.mdwn
new file mode 100644
index 0000000..5380b82
--- /dev/null
+++ b/archives/2020/05.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=05 year=2020 pages="*"]]
+"""]]
+
+[[!inline pages="creation_month(05) and creation_year(2020) and *" show=0 feeds=no reverse=yes]]
diff --git a/archives/2020/06.mdwn b/archives/2020/06.mdwn
new file mode 100644
index 0000000..84863b8
--- /dev/null
+++ b/archives/2020/06.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=06 year=2020 pages="*"]]
+"""]]
+
+[[!inline pages="creation_month(06) and creation_year(2020) and *" show=0 feeds=no reverse=yes]]
diff --git a/archives/2020/07.mdwn b/archives/2020/07.mdwn
new file mode 100644
index 0000000..0428828
--- /dev/null
+++ b/archives/2020/07.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=07 year=2020 pages="*"]]
+"""]]
+
+[[!inline pages="creation_month(07) and creation_year(2020) and *" show=0 feeds=no reverse=yes]]
diff --git a/archives/2020/08.mdwn b/archives/2020/08.mdwn
new file mode 100644
index 0000000..dca0150
--- /dev/null
+++ b/archives/2020/08.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=08 year=2020 pages="*"]]
+"""]]
+
+[[!inline pages="creation_month(08) and creation_year(2020) and *" show=0 feeds=no reverse=yes]]
diff --git a/archives/2020/09.mdwn b/archives/2020/09.mdwn
new file mode 100644
index 0000000..1b76366
--- /dev/null
+++ b/archives/2020/09.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=09 year=2020 pages="*"]]
+"""]]
+
+[[!inline pages="creation_month(09) and creation_year(2020) and *" show=0 feeds=no reverse=yes]]
diff --git a/archives/2020/10.mdwn b/archives/2020/10.mdwn
new file mode 100644
index 0000000..d8a69c4
--- /dev/null
+++ b/archives/2020/10.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=10 year=2020 pages="*"]]
+"""]]
+
+[[!inline pages="creation_month(10) and creation_year(2020) and *" show=0 feeds=no reverse=yes]]
diff --git a/archives/2020/11.mdwn b/archives/2020/11.mdwn
new file mode 100644
index 0000000..0b532fb
--- /dev/null
+++ b/archives/2020/11.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=11 year=2020 pages="*"]]
+"""]]
+
+[[!inline pages="creation_month(11) and creation_year(2020) and *" show=0 feeds=no reverse=yes]]
diff --git a/archives/2020/12.mdwn b/archives/2020/12.mdwn
new file mode 100644
index 0000000..f560bef
--- /dev/null
+++ b/archives/2020/12.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=12 year=2020 pages="*"]]
+"""]]
+
+[[!inline pages="creation_month(12) and creation_year(2020) and *" show=0 feeds=no reverse=yes]]

despam
diff --git a/documents/comment_1_eb8a33ffb42689f7d8d39fb64ca237a2._comment b/documents/comment_1_eb8a33ffb42689f7d8d39fb64ca237a2._comment
deleted file mode 100644
index e00e290..0000000
--- a/documents/comment_1_eb8a33ffb42689f7d8d39fb64ca237a2._comment
+++ /dev/null
@@ -1,9 +0,0 @@
-[[!comment format=mdwn
- username="ok"
- avatar="http://cdn.libravatar.org/avatar/51d1a6160e7cf1bccbce3a8c4c609ab7"
- subject="Good"
- date="2019-02-28T18:09:27Z"
- content="""
-<a href='https://www.comorezarelrosario.com/'>rezar el rosario</a>
-
-"""]]

Added a comment: Good
diff --git a/documents/comment_1_eb8a33ffb42689f7d8d39fb64ca237a2._comment b/documents/comment_1_eb8a33ffb42689f7d8d39fb64ca237a2._comment
new file mode 100644
index 0000000..e00e290
--- /dev/null
+++ b/documents/comment_1_eb8a33ffb42689f7d8d39fb64ca237a2._comment
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ username="ok"
+ avatar="http://cdn.libravatar.org/avatar/51d1a6160e7cf1bccbce3a8c4c609ab7"
+ subject="Good"
+ date="2019-02-28T18:09:27Z"
+ content="""
+<a href='https://www.comorezarelrosario.com/'>rezar el rosario</a>
+
+"""]]

calendar update
diff --git a/archives/2019.mdwn b/archives/2019.mdwn
new file mode 100644
index 0000000..b975bd4
--- /dev/null
+++ b/archives/2019.mdwn
@@ -0,0 +1 @@
+[[!calendar type=year year=2019 pages="*"]]
diff --git a/archives/2019/01.mdwn b/archives/2019/01.mdwn
new file mode 100644
index 0000000..44d6a4f
--- /dev/null
+++ b/archives/2019/01.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=01 year=2019 pages="*"]]
+"""]]
+
+[[!inline pages="creation_month(01) and creation_year(2019) and *" show=0 feeds=no reverse=yes]]
diff --git a/archives/2019/02.mdwn b/archives/2019/02.mdwn
new file mode 100644
index 0000000..bb2d1d8
--- /dev/null
+++ b/archives/2019/02.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=02 year=2019 pages="*"]]
+"""]]
+
+[[!inline pages="creation_month(02) and creation_year(2019) and *" show=0 feeds=no reverse=yes]]
diff --git a/archives/2019/03.mdwn b/archives/2019/03.mdwn
new file mode 100644
index 0000000..6ca10ed
--- /dev/null
+++ b/archives/2019/03.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=03 year=2019 pages="*"]]
+"""]]
+
+[[!inline pages="creation_month(03) and creation_year(2019) and *" show=0 feeds=no reverse=yes]]
diff --git a/archives/2019/04.mdwn b/archives/2019/04.mdwn
new file mode 100644
index 0000000..f86401b
--- /dev/null
+++ b/archives/2019/04.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=04 year=2019 pages="*"]]
+"""]]
+
+[[!inline pages="creation_month(04) and creation_year(2019) and *" show=0 feeds=no reverse=yes]]
diff --git a/archives/2019/05.mdwn b/archives/2019/05.mdwn
new file mode 100644
index 0000000..8a38f82
--- /dev/null
+++ b/archives/2019/05.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=05 year=2019 pages="*"]]
+"""]]
+
+[[!inline pages="creation_month(05) and creation_year(2019) and *" show=0 feeds=no reverse=yes]]
diff --git a/archives/2019/06.mdwn b/archives/2019/06.mdwn
new file mode 100644
index 0000000..d6ae7a9
--- /dev/null
+++ b/archives/2019/06.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=06 year=2019 pages="*"]]
+"""]]
+
+[[!inline pages="creation_month(06) and creation_year(2019) and *" show=0 feeds=no reverse=yes]]
diff --git a/archives/2019/07.mdwn b/archives/2019/07.mdwn
new file mode 100644
index 0000000..e452c43
--- /dev/null
+++ b/archives/2019/07.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=07 year=2019 pages="*"]]
+"""]]
+
+[[!inline pages="creation_month(07) and creation_year(2019) and *" show=0 feeds=no reverse=yes]]
diff --git a/archives/2019/08.mdwn b/archives/2019/08.mdwn
new file mode 100644
index 0000000..f960583
--- /dev/null
+++ b/archives/2019/08.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=08 year=2019 pages="*"]]
+"""]]
+
+[[!inline pages="creation_month(08) and creation_year(2019) and *" show=0 feeds=no reverse=yes]]
diff --git a/archives/2019/09.mdwn b/archives/2019/09.mdwn
new file mode 100644
index 0000000..a114624
--- /dev/null
+++ b/archives/2019/09.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=09 year=2019 pages="*"]]
+"""]]
+
+[[!inline pages="creation_month(09) and creation_year(2019) and *" show=0 feeds=no reverse=yes]]
diff --git a/archives/2019/10.mdwn b/archives/2019/10.mdwn
new file mode 100644
index 0000000..a1ebbbe
--- /dev/null
+++ b/archives/2019/10.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=10 year=2019 pages="*"]]
+"""]]
+
+[[!inline pages="creation_month(10) and creation_year(2019) and *" show=0 feeds=no reverse=yes]]
diff --git a/archives/2019/11.mdwn b/archives/2019/11.mdwn
new file mode 100644
index 0000000..fb2f22c
--- /dev/null
+++ b/archives/2019/11.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=11 year=2019 pages="*"]]
+"""]]
+
+[[!inline pages="creation_month(11) and creation_year(2019) and *" show=0 feeds=no reverse=yes]]
diff --git a/archives/2019/12.mdwn b/archives/2019/12.mdwn
new file mode 100644
index 0000000..d8b5e00
--- /dev/null
+++ b/archives/2019/12.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=12 year=2019 pages="*"]]
+"""]]
+
+[[!inline pages="creation_month(12) and creation_year(2019) and *" show=0 feeds=no reverse=yes]]

update
diff --git a/blogs.mdwn b/blogs.mdwn
index 88889ea..4e773dd 100644
--- a/blogs.mdwn
+++ b/blogs.mdwn
@@ -13,7 +13,7 @@ List of feeds:
 * [[!aggregate expireage=35 name="Errol" feedurl="http://www.livejournal.com/users/plumbbobline/data/rss" url="http://www.livejournal.com/users/plumbbobline/"]]
 * [[!aggregate expireage=35 name="Maggie" feedurl="http://rainbowpilgrim.postagon.com/feed" url="http://rainbowpilgrim.postagon.com/"]]
 * [[!aggregate expireage=35 name="Maggie too" feedurl="http://brazenlyquiver.livejournal.com/data/atom" url="http://brazenlyquiver.livejournal.com/"]]
-* [[!aggregate expireage=35 name="Maggie also" feedurl="http://beautyitselfispurpose.branchable.com/" url="http://beautyitselfispurpose.branchable.com/index.atom"]]
+* [[!aggregate expireage=35 name="Maggie also" feedurl="http://beautyitselfispurpose.branchable.com/index.atom" url="http://beautyitselfispurpose.branchable.com/"]]
 * [[!aggregate expireage=35 name="Tomoko" feedurl="http://sktk.exblog.jp/atom.xml" url="http://sktk.exblog.jp/"]]
 * [[!aggregate expireage=35 name="Jerry" feedurl="http://carpentrydiem.blogspot.com/feeds/posts/default" url="http://carpentrydiem.blogspot.com/"]]
 * [[!aggregate expireage=35 name="Dani" feedurl="https://doctorcowgirl.wordpress.com/feed/" url="https://doctorcowgirl.wordpress.com/"]]

remove my identica feed
diff --git a/blogs.mdwn b/blogs.mdwn
index 2cacb3e..88889ea 100644
--- a/blogs.mdwn
+++ b/blogs.mdwn
@@ -8,7 +8,6 @@ List of feeds:
 * [[!aggregate expireage=35 name="Anna" feedurl="http://www.livejournal.com/users/wetkneefarm/data/rss" url="http://www.livejournal.com/users/wetkneefarm/"]]
 * [[!aggregate expireage=35 name="Anna and Mark: Waldeneffect" feedurl="http://www.waldeneffect.org/index.rss" url="http://www.waldeneffect.org/"]]
 * [[!aggregate expireage=35 name="Joey" feedurl="http://joeyh.name/blog/index.rss" url="http://joeyh.name/blog/"]]
-* [[!aggregate expirecount=35 name="Joey chatter" feedurl="https://tmp.joeyh.name/pump.atom" url="https://identi.ca/joeyh"]]
 * [[!aggregate expireage=35 name="Joey devblog" feedurl="http://joeyh.name/devblog/index.rss" url="http://joeyh.name/devblog/"]]
 * [[!aggregate expireage=35 name="Jay" feedurl="http://www.livejournal.com/users/jenderqueer/data/rss" url="http://www.livejournal.com/users/jenderqueer/"]]
 * [[!aggregate expireage=35 name="Errol" feedurl="http://www.livejournal.com/users/plumbbobline/data/rss" url="http://www.livejournal.com/users/plumbbobline/"]]

atom
diff --git a/blogs.mdwn b/blogs.mdwn
index b4c1563..2cacb3e 100644
--- a/blogs.mdwn
+++ b/blogs.mdwn
@@ -14,7 +14,7 @@ List of feeds:
 * [[!aggregate expireage=35 name="Errol" feedurl="http://www.livejournal.com/users/plumbbobline/data/rss" url="http://www.livejournal.com/users/plumbbobline/"]]
 * [[!aggregate expireage=35 name="Maggie" feedurl="http://rainbowpilgrim.postagon.com/feed" url="http://rainbowpilgrim.postagon.com/"]]
 * [[!aggregate expireage=35 name="Maggie too" feedurl="http://brazenlyquiver.livejournal.com/data/atom" url="http://brazenlyquiver.livejournal.com/"]]
-* [[!aggregate expireage=35 name="Maggie also" feedurl="http://beautyitselfispurpose.branchable.com/" url="http://beautyitselfispurpose.branchable.com/index.rss"]]
+* [[!aggregate expireage=35 name="Maggie also" feedurl="http://beautyitselfispurpose.branchable.com/" url="http://beautyitselfispurpose.branchable.com/index.atom"]]
 * [[!aggregate expireage=35 name="Tomoko" feedurl="http://sktk.exblog.jp/atom.xml" url="http://sktk.exblog.jp/"]]
 * [[!aggregate expireage=35 name="Jerry" feedurl="http://carpentrydiem.blogspot.com/feeds/posts/default" url="http://carpentrydiem.blogspot.com/"]]
 * [[!aggregate expireage=35 name="Dani" feedurl="https://doctorcowgirl.wordpress.com/feed/" url="https://doctorcowgirl.wordpress.com/"]]

maggie
diff --git a/blogs.mdwn b/blogs.mdwn
index 38de88e..b4c1563 100644
--- a/blogs.mdwn
+++ b/blogs.mdwn
@@ -12,8 +12,9 @@ List of feeds:
 * [[!aggregate expireage=35 name="Joey devblog" feedurl="http://joeyh.name/devblog/index.rss" url="http://joeyh.name/devblog/"]]
 * [[!aggregate expireage=35 name="Jay" feedurl="http://www.livejournal.com/users/jenderqueer/data/rss" url="http://www.livejournal.com/users/jenderqueer/"]]
 * [[!aggregate expireage=35 name="Errol" feedurl="http://www.livejournal.com/users/plumbbobline/data/rss" url="http://www.livejournal.com/users/plumbbobline/"]]
-* [[!aggregate expireage=35 name="Maggie too" feedurl="http://brazenlyquiver.livejournal.com/data/atom" url="http://brazenlyquiver.livejournal.com/"]]
 * [[!aggregate expireage=35 name="Maggie" feedurl="http://rainbowpilgrim.postagon.com/feed" url="http://rainbowpilgrim.postagon.com/"]]
+* [[!aggregate expireage=35 name="Maggie too" feedurl="http://brazenlyquiver.livejournal.com/data/atom" url="http://brazenlyquiver.livejournal.com/"]]
+* [[!aggregate expireage=35 name="Maggie also" feedurl="http://beautyitselfispurpose.branchable.com/" url="http://beautyitselfispurpose.branchable.com/index.rss"]]
 * [[!aggregate expireage=35 name="Tomoko" feedurl="http://sktk.exblog.jp/atom.xml" url="http://sktk.exblog.jp/"]]
 * [[!aggregate expireage=35 name="Jerry" feedurl="http://carpentrydiem.blogspot.com/feeds/posts/default" url="http://carpentrydiem.blogspot.com/"]]
 * [[!aggregate expireage=35 name="Dani" feedurl="https://doctorcowgirl.wordpress.com/feed/" url="https://doctorcowgirl.wordpress.com/"]]

calendar update
diff --git a/archives/2018.mdwn b/archives/2018.mdwn
new file mode 100644
index 0000000..38d897b
--- /dev/null
+++ b/archives/2018.mdwn
@@ -0,0 +1 @@
+[[!calendar type=year year=2018 pages="*"]]
diff --git a/archives/2018/01.mdwn b/archives/2018/01.mdwn
new file mode 100644
index 0000000..e611322
--- /dev/null
+++ b/archives/2018/01.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=01 year=2018 pages="*"]]
+"""]]
+
+[[!inline pages="creation_month(01) and creation_year(2018) and *" show=0 feeds=no reverse=yes]]
diff --git a/archives/2018/02.mdwn b/archives/2018/02.mdwn
new file mode 100644
index 0000000..36ec3e1
--- /dev/null
+++ b/archives/2018/02.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=02 year=2018 pages="*"]]
+"""]]
+
+[[!inline pages="creation_month(02) and creation_year(2018) and *" show=0 feeds=no reverse=yes]]
diff --git a/archives/2018/03.mdwn b/archives/2018/03.mdwn
new file mode 100644
index 0000000..150ddf3
--- /dev/null
+++ b/archives/2018/03.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=03 year=2018 pages="*"]]
+"""]]
+
+[[!inline pages="creation_month(03) and creation_year(2018) and *" show=0 feeds=no reverse=yes]]
diff --git a/archives/2018/04.mdwn b/archives/2018/04.mdwn
new file mode 100644
index 0000000..8c04758
--- /dev/null
+++ b/archives/2018/04.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=04 year=2018 pages="*"]]
+"""]]
+
+[[!inline pages="creation_month(04) and creation_year(2018) and *" show=0 feeds=no reverse=yes]]
diff --git a/archives/2018/05.mdwn b/archives/2018/05.mdwn
new file mode 100644
index 0000000..fc3b77d
--- /dev/null
+++ b/archives/2018/05.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=05 year=2018 pages="*"]]
+"""]]
+
+[[!inline pages="creation_month(05) and creation_year(2018) and *" show=0 feeds=no reverse=yes]]
diff --git a/archives/2018/06.mdwn b/archives/2018/06.mdwn
new file mode 100644
index 0000000..19c3e9e
--- /dev/null
+++ b/archives/2018/06.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=06 year=2018 pages="*"]]
+"""]]
+
+[[!inline pages="creation_month(06) and creation_year(2018) and *" show=0 feeds=no reverse=yes]]
diff --git a/archives/2018/07.mdwn b/archives/2018/07.mdwn
new file mode 100644
index 0000000..3213f22
--- /dev/null
+++ b/archives/2018/07.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=07 year=2018 pages="*"]]
+"""]]
+
+[[!inline pages="creation_month(07) and creation_year(2018) and *" show=0 feeds=no reverse=yes]]
diff --git a/archives/2018/08.mdwn b/archives/2018/08.mdwn
new file mode 100644
index 0000000..201b2bc
--- /dev/null
+++ b/archives/2018/08.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=08 year=2018 pages="*"]]
+"""]]
+
+[[!inline pages="creation_month(08) and creation_year(2018) and *" show=0 feeds=no reverse=yes]]
diff --git a/archives/2018/09.mdwn b/archives/2018/09.mdwn
new file mode 100644
index 0000000..08ddb5d
--- /dev/null
+++ b/archives/2018/09.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=09 year=2018 pages="*"]]
+"""]]
+
+[[!inline pages="creation_month(09) and creation_year(2018) and *" show=0 feeds=no reverse=yes]]
diff --git a/archives/2018/10.mdwn b/archives/2018/10.mdwn
new file mode 100644
index 0000000..9efd2c1
--- /dev/null
+++ b/archives/2018/10.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=10 year=2018 pages="*"]]
+"""]]
+
+[[!inline pages="creation_month(10) and creation_year(2018) and *" show=0 feeds=no reverse=yes]]
diff --git a/archives/2018/11.mdwn b/archives/2018/11.mdwn
new file mode 100644
index 0000000..1933e3c
--- /dev/null
+++ b/archives/2018/11.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=11 year=2018 pages="*"]]
+"""]]
+
+[[!inline pages="creation_month(11) and creation_year(2018) and *" show=0 feeds=no reverse=yes]]
diff --git a/archives/2018/12.mdwn b/archives/2018/12.mdwn
new file mode 100644
index 0000000..ff50f84
--- /dev/null
+++ b/archives/2018/12.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=12 year=2018 pages="*"]]
+"""]]
+
+[[!inline pages="creation_month(12) and creation_year(2018) and *" show=0 feeds=no reverse=yes]]

rm
diff --git a/blogs.mdwn b/blogs.mdwn
index 9940c65..38de88e 100644
--- a/blogs.mdwn
+++ b/blogs.mdwn
@@ -13,7 +13,6 @@ List of feeds:
 * [[!aggregate expireage=35 name="Jay" feedurl="http://www.livejournal.com/users/jenderqueer/data/rss" url="http://www.livejournal.com/users/jenderqueer/"]]
 * [[!aggregate expireage=35 name="Errol" feedurl="http://www.livejournal.com/users/plumbbobline/data/rss" url="http://www.livejournal.com/users/plumbbobline/"]]
 * [[!aggregate expireage=35 name="Maggie too" feedurl="http://brazenlyquiver.livejournal.com/data/atom" url="http://brazenlyquiver.livejournal.com/"]]
-* [[!aggregate expireage=35 name="Maggie also" feedurl="http://beautyitselfispurpose.branchable.com/index.rss" url="http://beautyitselfispurpose.branchable.com/"]]
 * [[!aggregate expireage=35 name="Maggie" feedurl="http://rainbowpilgrim.postagon.com/feed" url="http://rainbowpilgrim.postagon.com/"]]
 * [[!aggregate expireage=35 name="Tomoko" feedurl="http://sktk.exblog.jp/atom.xml" url="http://sktk.exblog.jp/"]]
 * [[!aggregate expireage=35 name="Jerry" feedurl="http://carpentrydiem.blogspot.com/feeds/posts/default" url="http://carpentrydiem.blogspot.com/"]]

nope
diff --git a/blogs.mdwn b/blogs.mdwn
index 9076b88..9940c65 100644
--- a/blogs.mdwn
+++ b/blogs.mdwn
@@ -1,4 +1,4 @@
-[[!inline pages="internal(blogs/*) and !*/Discussion and !Maggie also too/*" show=100]]
+[[!inline pages="internal(blogs/*) and !*/Discussion" show=100]]
 [[!meta title="Family blogs"]]
 
 ----

remove
diff --git a/blogs.mdwn b/blogs.mdwn
index 9940c65..9076b88 100644
--- a/blogs.mdwn
+++ b/blogs.mdwn
@@ -1,4 +1,4 @@
-[[!inline pages="internal(blogs/*) and !*/Discussion" show=100]]
+[[!inline pages="internal(blogs/*) and !*/Discussion and !Maggie also too/*" show=100]]
 [[!meta title="Family blogs"]]
 
 ----

remove, not maggie's any more
diff --git a/blogs.mdwn b/blogs.mdwn
index 9f8f1d3..9940c65 100644
--- a/blogs.mdwn
+++ b/blogs.mdwn
@@ -14,7 +14,6 @@ List of feeds:
 * [[!aggregate expireage=35 name="Errol" feedurl="http://www.livejournal.com/users/plumbbobline/data/rss" url="http://www.livejournal.com/users/plumbbobline/"]]
 * [[!aggregate expireage=35 name="Maggie too" feedurl="http://brazenlyquiver.livejournal.com/data/atom" url="http://brazenlyquiver.livejournal.com/"]]
 * [[!aggregate expireage=35 name="Maggie also" feedurl="http://beautyitselfispurpose.branchable.com/index.rss" url="http://beautyitselfispurpose.branchable.com/"]]
-* [[!aggregate expireage=35 name="Maggie also too" feedurl="http://travelswithmaggie.postagon.com/feed" url="http://travelswithmaggie.postagon.com/"]]
 * [[!aggregate expireage=35 name="Maggie" feedurl="http://rainbowpilgrim.postagon.com/feed" url="http://rainbowpilgrim.postagon.com/"]]
 * [[!aggregate expireage=35 name="Tomoko" feedurl="http://sktk.exblog.jp/atom.xml" url="http://sktk.exblog.jp/"]]
 * [[!aggregate expireage=35 name="Jerry" feedurl="http://carpentrydiem.blogspot.com/feeds/posts/default" url="http://carpentrydiem.blogspot.com/"]]

maggie maggie
diff --git a/blogs.mdwn b/blogs.mdwn
index 9940c65..9f8f1d3 100644
--- a/blogs.mdwn
+++ b/blogs.mdwn
@@ -14,6 +14,7 @@ List of feeds:
 * [[!aggregate expireage=35 name="Errol" feedurl="http://www.livejournal.com/users/plumbbobline/data/rss" url="http://www.livejournal.com/users/plumbbobline/"]]
 * [[!aggregate expireage=35 name="Maggie too" feedurl="http://brazenlyquiver.livejournal.com/data/atom" url="http://brazenlyquiver.livejournal.com/"]]
 * [[!aggregate expireage=35 name="Maggie also" feedurl="http://beautyitselfispurpose.branchable.com/index.rss" url="http://beautyitselfispurpose.branchable.com/"]]
+* [[!aggregate expireage=35 name="Maggie also too" feedurl="http://travelswithmaggie.postagon.com/feed" url="http://travelswithmaggie.postagon.com/"]]
 * [[!aggregate expireage=35 name="Maggie" feedurl="http://rainbowpilgrim.postagon.com/feed" url="http://rainbowpilgrim.postagon.com/"]]
 * [[!aggregate expireage=35 name="Tomoko" feedurl="http://sktk.exblog.jp/atom.xml" url="http://sktk.exblog.jp/"]]
 * [[!aggregate expireage=35 name="Jerry" feedurl="http://carpentrydiem.blogspot.com/feeds/posts/default" url="http://carpentrydiem.blogspot.com/"]]

dani
diff --git a/blogs.mdwn b/blogs.mdwn
index b6fd251..9940c65 100644
--- a/blogs.mdwn
+++ b/blogs.mdwn
@@ -11,11 +11,11 @@ List of feeds:
 * [[!aggregate expirecount=35 name="Joey chatter" feedurl="https://tmp.joeyh.name/pump.atom" url="https://identi.ca/joeyh"]]
 * [[!aggregate expireage=35 name="Joey devblog" feedurl="http://joeyh.name/devblog/index.rss" url="http://joeyh.name/devblog/"]]
 * [[!aggregate expireage=35 name="Jay" feedurl="http://www.livejournal.com/users/jenderqueer/data/rss" url="http://www.livejournal.com/users/jenderqueer/"]]
-* [[!aggregate expireage=35 name="Dani" feedurl="http://www.livejournal.com/users/dani62/data/rss" url="http://www.livejournal.com/users/dani62/"]]
 * [[!aggregate expireage=35 name="Errol" feedurl="http://www.livejournal.com/users/plumbbobline/data/rss" url="http://www.livejournal.com/users/plumbbobline/"]]
 * [[!aggregate expireage=35 name="Maggie too" feedurl="http://brazenlyquiver.livejournal.com/data/atom" url="http://brazenlyquiver.livejournal.com/"]]
 * [[!aggregate expireage=35 name="Maggie also" feedurl="http://beautyitselfispurpose.branchable.com/index.rss" url="http://beautyitselfispurpose.branchable.com/"]]
 * [[!aggregate expireage=35 name="Maggie" feedurl="http://rainbowpilgrim.postagon.com/feed" url="http://rainbowpilgrim.postagon.com/"]]
 * [[!aggregate expireage=35 name="Tomoko" feedurl="http://sktk.exblog.jp/atom.xml" url="http://sktk.exblog.jp/"]]
 * [[!aggregate expireage=35 name="Jerry" feedurl="http://carpentrydiem.blogspot.com/feeds/posts/default" url="http://carpentrydiem.blogspot.com/"]]
+* [[!aggregate expireage=35 name="Dani" feedurl="https://doctorcowgirl.wordpress.com/feed/" url="https://doctorcowgirl.wordpress.com/"]]
 * [[!aggregate expireage=35 name="Richard" feedurl="https://tidymanblog.wordpress.com/feed/" url="https://tidymanblog.wordpress.com/"]]

add richard
diff --git a/blogs.mdwn b/blogs.mdwn
index 46b85d4..b6fd251 100644
--- a/blogs.mdwn
+++ b/blogs.mdwn
@@ -18,3 +18,4 @@ List of feeds:
 * [[!aggregate expireage=35 name="Maggie" feedurl="http://rainbowpilgrim.postagon.com/feed" url="http://rainbowpilgrim.postagon.com/"]]
 * [[!aggregate expireage=35 name="Tomoko" feedurl="http://sktk.exblog.jp/atom.xml" url="http://sktk.exblog.jp/"]]
 * [[!aggregate expireage=35 name="Jerry" feedurl="http://carpentrydiem.blogspot.com/feeds/posts/default" url="http://carpentrydiem.blogspot.com/"]]
+* [[!aggregate expireage=35 name="Richard" feedurl="https://tidymanblog.wordpress.com/feed/" url="https://tidymanblog.wordpress.com/"]]

add
diff --git a/blogs.mdwn b/blogs.mdwn
index f4a9f79..46b85d4 100644
--- a/blogs.mdwn
+++ b/blogs.mdwn
@@ -14,7 +14,7 @@ List of feeds:
 * [[!aggregate expireage=35 name="Dani" feedurl="http://www.livejournal.com/users/dani62/data/rss" url="http://www.livejournal.com/users/dani62/"]]
 * [[!aggregate expireage=35 name="Errol" feedurl="http://www.livejournal.com/users/plumbbobline/data/rss" url="http://www.livejournal.com/users/plumbbobline/"]]
 * [[!aggregate expireage=35 name="Maggie too" feedurl="http://brazenlyquiver.livejournal.com/data/atom" url="http://brazenlyquiver.livejournal.com/"]]
-* [[!aggregate expireage=35 name="Maggie also" feedurl="http://yourbrazenworld.tumblr.com/rss" url="http://yourbrazenworld.tumblr.com/"]]
+* [[!aggregate expireage=35 name="Maggie also" feedurl="http://beautyitselfispurpose.branchable.com/index.rss" url="http://beautyitselfispurpose.branchable.com/"]]
 * [[!aggregate expireage=35 name="Maggie" feedurl="http://rainbowpilgrim.postagon.com/feed" url="http://rainbowpilgrim.postagon.com/"]]
 * [[!aggregate expireage=35 name="Tomoko" feedurl="http://sktk.exblog.jp/atom.xml" url="http://sktk.exblog.jp/"]]
 * [[!aggregate expireage=35 name="Jerry" feedurl="http://carpentrydiem.blogspot.com/feeds/posts/default" url="http://carpentrydiem.blogspot.com/"]]

typo
diff --git a/blogs.mdwn b/blogs.mdwn
index 4e95d12..f4a9f79 100644
--- a/blogs.mdwn
+++ b/blogs.mdwn
@@ -13,7 +13,7 @@ List of feeds:
 * [[!aggregate expireage=35 name="Jay" feedurl="http://www.livejournal.com/users/jenderqueer/data/rss" url="http://www.livejournal.com/users/jenderqueer/"]]
 * [[!aggregate expireage=35 name="Dani" feedurl="http://www.livejournal.com/users/dani62/data/rss" url="http://www.livejournal.com/users/dani62/"]]
 * [[!aggregate expireage=35 name="Errol" feedurl="http://www.livejournal.com/users/plumbbobline/data/rss" url="http://www.livejournal.com/users/plumbbobline/"]]
-* [[!aggregate expireage=35 name="Maggie too" feedurl="http://brazenlyquiver.livejournal.com/data/atom" url="http://brazenlyquiver.livejournal.com/"]]a
+* [[!aggregate expireage=35 name="Maggie too" feedurl="http://brazenlyquiver.livejournal.com/data/atom" url="http://brazenlyquiver.livejournal.com/"]]
 * [[!aggregate expireage=35 name="Maggie also" feedurl="http://yourbrazenworld.tumblr.com/rss" url="http://yourbrazenworld.tumblr.com/"]]
 * [[!aggregate expireage=35 name="Maggie" feedurl="http://rainbowpilgrim.postagon.com/feed" url="http://rainbowpilgrim.postagon.com/"]]
 * [[!aggregate expireage=35 name="Tomoko" feedurl="http://sktk.exblog.jp/atom.xml" url="http://sktk.exblog.jp/"]]

remove olduse.net blog
diff --git a/blogs.mdwn b/blogs.mdwn
index 2f76dca..4e95d12 100644
--- a/blogs.mdwn
+++ b/blogs.mdwn
@@ -10,7 +10,6 @@ List of feeds:
 * [[!aggregate expireage=35 name="Joey" feedurl="http://joeyh.name/blog/index.rss" url="http://joeyh.name/blog/"]]
 * [[!aggregate expirecount=35 name="Joey chatter" feedurl="https://tmp.joeyh.name/pump.atom" url="https://identi.ca/joeyh"]]
 * [[!aggregate expireage=35 name="Joey devblog" feedurl="http://joeyh.name/devblog/index.rss" url="http://joeyh.name/devblog/"]]
-* [[!aggregate expireage=35 name="Joey: olduse.net blog" feedurl="http://olduse.net/blog/index.rss" url="http://olduse.net/blog/"]]
 * [[!aggregate expireage=35 name="Jay" feedurl="http://www.livejournal.com/users/jenderqueer/data/rss" url="http://www.livejournal.com/users/jenderqueer/"]]
 * [[!aggregate expireage=35 name="Dani" feedurl="http://www.livejournal.com/users/dani62/data/rss" url="http://www.livejournal.com/users/dani62/"]]
 * [[!aggregate expireage=35 name="Errol" feedurl="http://www.livejournal.com/users/plumbbobline/data/rss" url="http://www.livejournal.com/users/plumbbobline/"]]

cleanup
diff --git a/blogs.mdwn b/blogs.mdwn
index fda626f..2f76dca 100644
--- a/blogs.mdwn
+++ b/blogs.mdwn
@@ -16,7 +16,6 @@ List of feeds:
 * [[!aggregate expireage=35 name="Errol" feedurl="http://www.livejournal.com/users/plumbbobline/data/rss" url="http://www.livejournal.com/users/plumbbobline/"]]
 * [[!aggregate expireage=35 name="Maggie too" feedurl="http://brazenlyquiver.livejournal.com/data/atom" url="http://brazenlyquiver.livejournal.com/"]]a
 * [[!aggregate expireage=35 name="Maggie also" feedurl="http://yourbrazenworld.tumblr.com/rss" url="http://yourbrazenworld.tumblr.com/"]]
-* [[!aggregate expireage=35 name="Maggie poemaday" feedurl="http://poemaday.postagon.com/feed" url="http://poemaday.postagon.com/"]]
 * [[!aggregate expireage=35 name="Maggie" feedurl="http://rainbowpilgrim.postagon.com/feed" url="http://rainbowpilgrim.postagon.com/"]]
 * [[!aggregate expireage=35 name="Tomoko" feedurl="http://sktk.exblog.jp/atom.xml" url="http://sktk.exblog.jp/"]]
 * [[!aggregate expireage=35 name="Jerry" feedurl="http://carpentrydiem.blogspot.com/feeds/posts/default" url="http://carpentrydiem.blogspot.com/"]]

my new combined devblog
diff --git a/blogs.mdwn b/blogs.mdwn
index 3fa2ac8..fda626f 100644
--- a/blogs.mdwn
+++ b/blogs.mdwn
@@ -9,7 +9,7 @@ List of feeds:
 * [[!aggregate expireage=35 name="Anna and Mark: Waldeneffect" feedurl="http://www.waldeneffect.org/index.rss" url="http://www.waldeneffect.org/"]]
 * [[!aggregate expireage=35 name="Joey" feedurl="http://joeyh.name/blog/index.rss" url="http://joeyh.name/blog/"]]
 * [[!aggregate expirecount=35 name="Joey chatter" feedurl="https://tmp.joeyh.name/pump.atom" url="https://identi.ca/joeyh"]]
-* [[!aggregate expireage=35 name="Joey git-annex devblog" feedurl="http://git-annex.branchable.com/devblog/index.rss" url="http://git-annex.branchable.com/devblog/"]]
+* [[!aggregate expireage=35 name="Joey devblog" feedurl="http://joeyh.name/devblog/index.rss" url="http://joeyh.name/devblog/"]]
 * [[!aggregate expireage=35 name="Joey: olduse.net blog" feedurl="http://olduse.net/blog/index.rss" url="http://olduse.net/blog/"]]
 * [[!aggregate expireage=35 name="Jay" feedurl="http://www.livejournal.com/users/jenderqueer/data/rss" url="http://www.livejournal.com/users/jenderqueer/"]]
 * [[!aggregate expireage=35 name="Dani" feedurl="http://www.livejournal.com/users/dani62/data/rss" url="http://www.livejournal.com/users/dani62/"]]

show more posts
diff --git a/blogs.mdwn b/blogs.mdwn
index 7b8ea2e..3fa2ac8 100644
--- a/blogs.mdwn
+++ b/blogs.mdwn
@@ -1,4 +1,4 @@
-[[!inline pages="internal(blogs/*) and !*/Discussion" show=50]]
+[[!inline pages="internal(blogs/*) and !*/Discussion" show=100]]
 [[!meta title="Family blogs"]]
 
 ----

maggie maggie maggie
diff --git a/blogs.mdwn b/blogs.mdwn
index 32e51d5..7b8ea2e 100644
--- a/blogs.mdwn
+++ b/blogs.mdwn
@@ -16,6 +16,7 @@ List of feeds:
 * [[!aggregate expireage=35 name="Errol" feedurl="http://www.livejournal.com/users/plumbbobline/data/rss" url="http://www.livejournal.com/users/plumbbobline/"]]
 * [[!aggregate expireage=35 name="Maggie too" feedurl="http://brazenlyquiver.livejournal.com/data/atom" url="http://brazenlyquiver.livejournal.com/"]]a
 * [[!aggregate expireage=35 name="Maggie also" feedurl="http://yourbrazenworld.tumblr.com/rss" url="http://yourbrazenworld.tumblr.com/"]]
+* [[!aggregate expireage=35 name="Maggie poemaday" feedurl="http://poemaday.postagon.com/feed" url="http://poemaday.postagon.com/"]]
 * [[!aggregate expireage=35 name="Maggie" feedurl="http://rainbowpilgrim.postagon.com/feed" url="http://rainbowpilgrim.postagon.com/"]]
 * [[!aggregate expireage=35 name="Tomoko" feedurl="http://sktk.exblog.jp/atom.xml" url="http://sktk.exblog.jp/"]]
 * [[!aggregate expireage=35 name="Jerry" feedurl="http://carpentrydiem.blogspot.com/feeds/posts/default" url="http://carpentrydiem.blogspot.com/"]]

despam
diff --git a/documents/comment_1_48484c4037222e8f22d01b6757faab00._comment b/documents/comment_1_48484c4037222e8f22d01b6757faab00._comment
deleted file mode 100644
index c0cf6cf..0000000
--- a/documents/comment_1_48484c4037222e8f22d01b6757faab00._comment
+++ /dev/null
@@ -1,11 +0,0 @@
-[[!comment format=mdwn
- username="newsletter@da35d9a5182d3f5b2640e931c5923e0476ad3905"
- nickname="newsletter"
- subject="News Documents"
- date="2016-07-29T16:54:18Z"
- content="""
-
-<a href=\"http://www.good-fundraising-ideas.com/\">Good Fundraising Ideas</a>
-
-
-"""]]

tmp fix
diff --git a/blogs.mdwn b/blogs.mdwn
index a21e18c..32e51d5 100644
--- a/blogs.mdwn
+++ b/blogs.mdwn
@@ -8,7 +8,7 @@ List of feeds:
 * [[!aggregate expireage=35 name="Anna" feedurl="http://www.livejournal.com/users/wetkneefarm/data/rss" url="http://www.livejournal.com/users/wetkneefarm/"]]
 * [[!aggregate expireage=35 name="Anna and Mark: Waldeneffect" feedurl="http://www.waldeneffect.org/index.rss" url="http://www.waldeneffect.org/"]]
 * [[!aggregate expireage=35 name="Joey" feedurl="http://joeyh.name/blog/index.rss" url="http://joeyh.name/blog/"]]
-* [[!aggregate expirecount=35 name="Joey chatter" feedurl="https://pump2rss.com/feed/joeyh@identi.ca.atom" url="https://identi.ca/joeyh"]]
+* [[!aggregate expirecount=35 name="Joey chatter" feedurl="https://tmp.joeyh.name/pump.atom" url="https://identi.ca/joeyh"]]
 * [[!aggregate expireage=35 name="Joey git-annex devblog" feedurl="http://git-annex.branchable.com/devblog/index.rss" url="http://git-annex.branchable.com/devblog/"]]
 * [[!aggregate expireage=35 name="Joey: olduse.net blog" feedurl="http://olduse.net/blog/index.rss" url="http://olduse.net/blog/"]]
 * [[!aggregate expireage=35 name="Jay" feedurl="http://www.livejournal.com/users/jenderqueer/data/rss" url="http://www.livejournal.com/users/jenderqueer/"]]

calendar update
diff --git a/archives/2017.mdwn b/archives/2017.mdwn
new file mode 100644
index 0000000..58b348c
--- /dev/null
+++ b/archives/2017.mdwn
@@ -0,0 +1 @@
+[[!calendar type=year year=2017 pages="*"]]
diff --git a/archives/2017/01.mdwn b/archives/2017/01.mdwn
new file mode 100644
index 0000000..01e3df0
--- /dev/null
+++ b/archives/2017/01.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=01 year=2017 pages="*"]]
+"""]]
+
+[[!inline pages="creation_month(01) and creation_year(2017) and *" show=0 feeds=no reverse=yes]]
diff --git a/archives/2017/02.mdwn b/archives/2017/02.mdwn
new file mode 100644
index 0000000..9207db1
--- /dev/null
+++ b/archives/2017/02.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=02 year=2017 pages="*"]]
+"""]]
+
+[[!inline pages="creation_month(02) and creation_year(2017) and *" show=0 feeds=no reverse=yes]]
diff --git a/archives/2017/03.mdwn b/archives/2017/03.mdwn
new file mode 100644
index 0000000..f795e87
--- /dev/null
+++ b/archives/2017/03.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=03 year=2017 pages="*"]]
+"""]]
+
+[[!inline pages="creation_month(03) and creation_year(2017) and *" show=0 feeds=no reverse=yes]]
diff --git a/archives/2017/04.mdwn b/archives/2017/04.mdwn
new file mode 100644
index 0000000..e6bf226
--- /dev/null
+++ b/archives/2017/04.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=04 year=2017 pages="*"]]
+"""]]
+
+[[!inline pages="creation_month(04) and creation_year(2017) and *" show=0 feeds=no reverse=yes]]
diff --git a/archives/2017/05.mdwn b/archives/2017/05.mdwn
new file mode 100644
index 0000000..2a8ff01
--- /dev/null
+++ b/archives/2017/05.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=05 year=2017 pages="*"]]
+"""]]
+
+[[!inline pages="creation_month(05) and creation_year(2017) and *" show=0 feeds=no reverse=yes]]
diff --git a/archives/2017/06.mdwn b/archives/2017/06.mdwn
new file mode 100644
index 0000000..d2133e6
--- /dev/null
+++ b/archives/2017/06.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=06 year=2017 pages="*"]]
+"""]]
+
+[[!inline pages="creation_month(06) and creation_year(2017) and *" show=0 feeds=no reverse=yes]]
diff --git a/archives/2017/07.mdwn b/archives/2017/07.mdwn
new file mode 100644
index 0000000..037a0c8
--- /dev/null
+++ b/archives/2017/07.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=07 year=2017 pages="*"]]
+"""]]
+
+[[!inline pages="creation_month(07) and creation_year(2017) and *" show=0 feeds=no reverse=yes]]
diff --git a/archives/2017/08.mdwn b/archives/2017/08.mdwn
new file mode 100644
index 0000000..33b4dab
--- /dev/null
+++ b/archives/2017/08.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=08 year=2017 pages="*"]]
+"""]]
+
+[[!inline pages="creation_month(08) and creation_year(2017) and *" show=0 feeds=no reverse=yes]]
diff --git a/archives/2017/09.mdwn b/archives/2017/09.mdwn
new file mode 100644
index 0000000..b952f5c
--- /dev/null
+++ b/archives/2017/09.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=09 year=2017 pages="*"]]
+"""]]
+
+[[!inline pages="creation_month(09) and creation_year(2017) and *" show=0 feeds=no reverse=yes]]
diff --git a/archives/2017/10.mdwn b/archives/2017/10.mdwn
new file mode 100644
index 0000000..22e1a5f
--- /dev/null
+++ b/archives/2017/10.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=10 year=2017 pages="*"]]
+"""]]
+
+[[!inline pages="creation_month(10) and creation_year(2017) and *" show=0 feeds=no reverse=yes]]
diff --git a/archives/2017/11.mdwn b/archives/2017/11.mdwn
new file mode 100644
index 0000000..6e52e34
--- /dev/null
+++ b/archives/2017/11.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=11 year=2017 pages="*"]]
+"""]]
+
+[[!inline pages="creation_month(11) and creation_year(2017) and *" show=0 feeds=no reverse=yes]]
diff --git a/archives/2017/12.mdwn b/archives/2017/12.mdwn
new file mode 100644
index 0000000..4d8e44b
--- /dev/null
+++ b/archives/2017/12.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=12 year=2017 pages="*"]]
+"""]]
+
+[[!inline pages="creation_month(12) and creation_year(2017) and *" show=0 feeds=no reverse=yes]]

Added a comment: News Documents
diff --git a/documents/comment_1_48484c4037222e8f22d01b6757faab00._comment b/documents/comment_1_48484c4037222e8f22d01b6757faab00._comment
new file mode 100644
index 0000000..c0cf6cf
--- /dev/null
+++ b/documents/comment_1_48484c4037222e8f22d01b6757faab00._comment
@@ -0,0 +1,11 @@
+[[!comment format=mdwn
+ username="newsletter@da35d9a5182d3f5b2640e931c5923e0476ad3905"
+ nickname="newsletter"
+ subject="News Documents"
+ date="2016-07-29T16:54:18Z"
+ content="""
+
+<a href=\"http://www.good-fundraising-ideas.com/\">Good Fundraising Ideas</a>
+
+
+"""]]

despam
diff --git a/index/comment_2_8754da699b38ea6365231ff1fbab98c7._comment b/index/comment_2_8754da699b38ea6365231ff1fbab98c7._comment
deleted file mode 100644
index 2449956..0000000
--- a/index/comment_2_8754da699b38ea6365231ff1fbab98c7._comment
+++ /dev/null
@@ -1,8 +0,0 @@
-[[!comment format=mdwn
- username="editor@8283d6eb4b8cdd5520ea55e1cf49d50d130f61be"
- nickname="editor"
- subject="Good Fundraising Ideas"
- date="2016-07-22T21:15:02Z"
- content="""
-I would like to share a new website on fundraising . You can comment and participate on news and ideas creating a listing of all the public mailing. The Good Fundraising Ideas team is composed of professionals of the fundraising world, as well as anonymous people that just want to help other people. For example idea.  <a href=\"https://www.good-fundraising-ideas.com/fundraising-ideas-for-kids\">Visit fundraising ideas</a> . Thanks 
-"""]]

removed
diff --git a/index/comment_2_8a23b5477bf7a539ec4b98328553e7f1._comment b/index/comment_2_8a23b5477bf7a539ec4b98328553e7f1._comment
deleted file mode 100644
index 7823c66..0000000
--- a/index/comment_2_8a23b5477bf7a539ec4b98328553e7f1._comment
+++ /dev/null
@@ -1,8 +0,0 @@
-[[!comment format=mdwn
- username="editor@8283d6eb4b8cdd5520ea55e1cf49d50d130f61be"
- nickname="editor"
- subject="Good Fundraising Ideas"
- date="2016-07-22T21:07:49Z"
- content="""
-I would like to share a new website on fundraising . You can comment and participate on news and ideas creating a listing of all the public mailing. The Good Fundraising Ideas team is composed of professionals of the fundraising world, as well as anonymous people that just want to help other people. For example idea.  <a href=\"https://www.good-fundraising-ideas.com/fundraising-ideas-for-kids\">Visit fundraising Web</a> . Thanks 
-"""]]

Added a comment: Good Fundraising Ideas
diff --git a/index/comment_2_8754da699b38ea6365231ff1fbab98c7._comment b/index/comment_2_8754da699b38ea6365231ff1fbab98c7._comment
new file mode 100644
index 0000000..2449956
--- /dev/null
+++ b/index/comment_2_8754da699b38ea6365231ff1fbab98c7._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="editor@8283d6eb4b8cdd5520ea55e1cf49d50d130f61be"
+ nickname="editor"
+ subject="Good Fundraising Ideas"
+ date="2016-07-22T21:15:02Z"
+ content="""
+I would like to share a new website on fundraising . You can comment and participate on news and ideas creating a listing of all the public mailing. The Good Fundraising Ideas team is composed of professionals of the fundraising world, as well as anonymous people that just want to help other people. For example idea.  <a href=\"https://www.good-fundraising-ideas.com/fundraising-ideas-for-kids\">Visit fundraising ideas</a> . Thanks 
+"""]]

removed
diff --git a/index/comment_1_1caa5ae07c60f50dade7ffab7c42b9fa._comment b/index/comment_1_1caa5ae07c60f50dade7ffab7c42b9fa._comment
deleted file mode 100644
index 0dbbfe7..0000000
--- a/index/comment_1_1caa5ae07c60f50dade7ffab7c42b9fa._comment
+++ /dev/null
@@ -1,8 +0,0 @@
-[[!comment format=mdwn
- username="editor@8283d6eb4b8cdd5520ea55e1cf49d50d130f61be"
- nickname="editor"
- subject="Good Fundraising Ideas"
- date="2016-07-22T19:39:43Z"
- content="""
-I would like to share a new website on fundraising . You can comment and participate on news and ideas creating a listing of all the public mailing. The Good Fundraising Ideas team is composed of professionals of the fundraising world, as well as anonymous people that just want to help other people. For example https://www.good-fundraising-ideas.com/fundraising-ideas-for-kids/ . Thanks
-"""]]

Added a comment: Good Fundraising Ideas
diff --git a/index/comment_2_8a23b5477bf7a539ec4b98328553e7f1._comment b/index/comment_2_8a23b5477bf7a539ec4b98328553e7f1._comment
new file mode 100644
index 0000000..7823c66
--- /dev/null
+++ b/index/comment_2_8a23b5477bf7a539ec4b98328553e7f1._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="editor@8283d6eb4b8cdd5520ea55e1cf49d50d130f61be"
+ nickname="editor"
+ subject="Good Fundraising Ideas"
+ date="2016-07-22T21:07:49Z"
+ content="""
+I would like to share a new website on fundraising . You can comment and participate on news and ideas creating a listing of all the public mailing. The Good Fundraising Ideas team is composed of professionals of the fundraising world, as well as anonymous people that just want to help other people. For example idea.  <a href=\"https://www.good-fundraising-ideas.com/fundraising-ideas-for-kids\">Visit fundraising Web</a> . Thanks 
+"""]]

Added a comment: Good Fundraising Ideas
diff --git a/index/comment_1_1caa5ae07c60f50dade7ffab7c42b9fa._comment b/index/comment_1_1caa5ae07c60f50dade7ffab7c42b9fa._comment
new file mode 100644
index 0000000..0dbbfe7
--- /dev/null
+++ b/index/comment_1_1caa5ae07c60f50dade7ffab7c42b9fa._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="editor@8283d6eb4b8cdd5520ea55e1cf49d50d130f61be"
+ nickname="editor"
+ subject="Good Fundraising Ideas"
+ date="2016-07-22T19:39:43Z"
+ content="""
+I would like to share a new website on fundraising . You can comment and participate on news and ideas creating a listing of all the public mailing. The Good Fundraising Ideas team is composed of professionals of the fundraising world, as well as anonymous people that just want to help other people. For example https://www.good-fundraising-ideas.com/fundraising-ideas-for-kids/ . Thanks
+"""]]

update
diff --git a/blogs.mdwn b/blogs.mdwn
index afeb73a..a21e18c 100644
--- a/blogs.mdwn
+++ b/blogs.mdwn
@@ -8,7 +8,7 @@ List of feeds:
 * [[!aggregate expireage=35 name="Anna" feedurl="http://www.livejournal.com/users/wetkneefarm/data/rss" url="http://www.livejournal.com/users/wetkneefarm/"]]
 * [[!aggregate expireage=35 name="Anna and Mark: Waldeneffect" feedurl="http://www.waldeneffect.org/index.rss" url="http://www.waldeneffect.org/"]]
 * [[!aggregate expireage=35 name="Joey" feedurl="http://joeyh.name/blog/index.rss" url="http://joeyh.name/blog/"]]
-* [[!aggregate expirecount=35 name="Joey chatter" feedurl="http://tmp.joeyh.name/pump.atom" url="https://identi.ca/joeyh"]]
+* [[!aggregate expirecount=35 name="Joey chatter" feedurl="https://pump2rss.com/feed/joeyh@identi.ca.atom" url="https://identi.ca/joeyh"]]
 * [[!aggregate expireage=35 name="Joey git-annex devblog" feedurl="http://git-annex.branchable.com/devblog/index.rss" url="http://git-annex.branchable.com/devblog/"]]
 * [[!aggregate expireage=35 name="Joey: olduse.net blog" feedurl="http://olduse.net/blog/index.rss" url="http://olduse.net/blog/"]]
 * [[!aggregate expireage=35 name="Jay" feedurl="http://www.livejournal.com/users/jenderqueer/data/rss" url="http://www.livejournal.com/users/jenderqueer/"]]

new url
diff --git a/blogs.mdwn b/blogs.mdwn
index 7876571..afeb73a 100644
--- a/blogs.mdwn
+++ b/blogs.mdwn
@@ -8,7 +8,7 @@ List of feeds:
 * [[!aggregate expireage=35 name="Anna" feedurl="http://www.livejournal.com/users/wetkneefarm/data/rss" url="http://www.livejournal.com/users/wetkneefarm/"]]
 * [[!aggregate expireage=35 name="Anna and Mark: Waldeneffect" feedurl="http://www.waldeneffect.org/index.rss" url="http://www.waldeneffect.org/"]]
 * [[!aggregate expireage=35 name="Joey" feedurl="http://joeyh.name/blog/index.rss" url="http://joeyh.name/blog/"]]
-* [[!aggregate expirecount=35 name="Joey chatter" feedurl="http://tmp.kitenet.net/pump.atom" url="https://identi.ca/joeyh"]]
+* [[!aggregate expirecount=35 name="Joey chatter" feedurl="http://tmp.joeyh.name/pump.atom" url="https://identi.ca/joeyh"]]
 * [[!aggregate expireage=35 name="Joey git-annex devblog" feedurl="http://git-annex.branchable.com/devblog/index.rss" url="http://git-annex.branchable.com/devblog/"]]
 * [[!aggregate expireage=35 name="Joey: olduse.net blog" feedurl="http://olduse.net/blog/index.rss" url="http://olduse.net/blog/"]]
 * [[!aggregate expireage=35 name="Jay" feedurl="http://www.livejournal.com/users/jenderqueer/data/rss" url="http://www.livejournal.com/users/jenderqueer/"]]

srsly
diff --git a/blogs.mdwn b/blogs.mdwn
index 4488f85..7876571 100644
--- a/blogs.mdwn
+++ b/blogs.mdwn
@@ -16,5 +16,6 @@ List of feeds:
 * [[!aggregate expireage=35 name="Errol" feedurl="http://www.livejournal.com/users/plumbbobline/data/rss" url="http://www.livejournal.com/users/plumbbobline/"]]
 * [[!aggregate expireage=35 name="Maggie too" feedurl="http://brazenlyquiver.livejournal.com/data/atom" url="http://brazenlyquiver.livejournal.com/"]]a
 * [[!aggregate expireage=35 name="Maggie also" feedurl="http://yourbrazenworld.tumblr.com/rss" url="http://yourbrazenworld.tumblr.com/"]]
+* [[!aggregate expireage=35 name="Maggie" feedurl="http://rainbowpilgrim.postagon.com/feed" url="http://rainbowpilgrim.postagon.com/"]]
 * [[!aggregate expireage=35 name="Tomoko" feedurl="http://sktk.exblog.jp/atom.xml" url="http://sktk.exblog.jp/"]]
 * [[!aggregate expireage=35 name="Jerry" feedurl="http://carpentrydiem.blogspot.com/feeds/posts/default" url="http://carpentrydiem.blogspot.com/"]]

calendar update
diff --git a/archives/2016.mdwn b/archives/2016.mdwn
new file mode 100644
index 0000000..ccd7a33
--- /dev/null
+++ b/archives/2016.mdwn
@@ -0,0 +1 @@
+[[!calendar type=year year=2016 pages="*"]]
diff --git a/archives/2016/01.mdwn b/archives/2016/01.mdwn
new file mode 100644
index 0000000..f469b6a
--- /dev/null
+++ b/archives/2016/01.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=01 year=2016 pages="*"]]
+"""]]
+
+[[!inline pages="creation_month(01) and creation_year(2016) and *" show=0 feeds=no reverse=yes]]
diff --git a/archives/2016/02.mdwn b/archives/2016/02.mdwn
new file mode 100644
index 0000000..c57b121
--- /dev/null
+++ b/archives/2016/02.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=02 year=2016 pages="*"]]
+"""]]
+
+[[!inline pages="creation_month(02) and creation_year(2016) and *" show=0 feeds=no reverse=yes]]
diff --git a/archives/2016/03.mdwn b/archives/2016/03.mdwn
new file mode 100644
index 0000000..a29f59e
--- /dev/null
+++ b/archives/2016/03.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=03 year=2016 pages="*"]]
+"""]]
+
+[[!inline pages="creation_month(03) and creation_year(2016) and *" show=0 feeds=no reverse=yes]]
diff --git a/archives/2016/04.mdwn b/archives/2016/04.mdwn
new file mode 100644
index 0000000..fe25ea4
--- /dev/null
+++ b/archives/2016/04.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=04 year=2016 pages="*"]]
+"""]]
+
+[[!inline pages="creation_month(04) and creation_year(2016) and *" show=0 feeds=no reverse=yes]]
diff --git a/archives/2016/05.mdwn b/archives/2016/05.mdwn
new file mode 100644
index 0000000..3d83662
--- /dev/null
+++ b/archives/2016/05.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=05 year=2016 pages="*"]]
+"""]]
+
+[[!inline pages="creation_month(05) and creation_year(2016) and *" show=0 feeds=no reverse=yes]]
diff --git a/archives/2016/06.mdwn b/archives/2016/06.mdwn
new file mode 100644
index 0000000..73ea515
--- /dev/null
+++ b/archives/2016/06.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=06 year=2016 pages="*"]]
+"""]]
+
+[[!inline pages="creation_month(06) and creation_year(2016) and *" show=0 feeds=no reverse=yes]]
diff --git a/archives/2016/07.mdwn b/archives/2016/07.mdwn
new file mode 100644
index 0000000..842184c
--- /dev/null
+++ b/archives/2016/07.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=07 year=2016 pages="*"]]
+"""]]
+
+[[!inline pages="creation_month(07) and creation_year(2016) and *" show=0 feeds=no reverse=yes]]
diff --git a/archives/2016/08.mdwn b/archives/2016/08.mdwn
new file mode 100644
index 0000000..6918717
--- /dev/null
+++ b/archives/2016/08.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=08 year=2016 pages="*"]]
+"""]]
+
+[[!inline pages="creation_month(08) and creation_year(2016) and *" show=0 feeds=no reverse=yes]]
diff --git a/archives/2016/09.mdwn b/archives/2016/09.mdwn
new file mode 100644
index 0000000..be719a6
--- /dev/null
+++ b/archives/2016/09.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=09 year=2016 pages="*"]]
+"""]]
+
+[[!inline pages="creation_month(09) and creation_year(2016) and *" show=0 feeds=no reverse=yes]]
diff --git a/archives/2016/10.mdwn b/archives/2016/10.mdwn
new file mode 100644
index 0000000..ea2ffe4
--- /dev/null
+++ b/archives/2016/10.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=10 year=2016 pages="*"]]
+"""]]
+
+[[!inline pages="creation_month(10) and creation_year(2016) and *" show=0 feeds=no reverse=yes]]
diff --git a/archives/2016/11.mdwn b/archives/2016/11.mdwn
new file mode 100644
index 0000000..7a4f15d
--- /dev/null
+++ b/archives/2016/11.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=11 year=2016 pages="*"]]
+"""]]
+
+[[!inline pages="creation_month(11) and creation_year(2016) and *" show=0 feeds=no reverse=yes]]
diff --git a/archives/2016/12.mdwn b/archives/2016/12.mdwn
new file mode 100644
index 0000000..1e5859f
--- /dev/null
+++ b/archives/2016/12.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=12 year=2016 pages="*"]]
+"""]]
+
+[[!inline pages="creation_month(12) and creation_year(2016) and *" show=0 feeds=no reverse=yes]]

remove now spam blog
diff --git a/blogs.mdwn b/blogs.mdwn
index 8c6d3f9..4488f85 100644
--- a/blogs.mdwn
+++ b/blogs.mdwn
@@ -14,7 +14,6 @@ List of feeds:
 * [[!aggregate expireage=35 name="Jay" feedurl="http://www.livejournal.com/users/jenderqueer/data/rss" url="http://www.livejournal.com/users/jenderqueer/"]]
 * [[!aggregate expireage=35 name="Dani" feedurl="http://www.livejournal.com/users/dani62/data/rss" url="http://www.livejournal.com/users/dani62/"]]
 * [[!aggregate expireage=35 name="Errol" feedurl="http://www.livejournal.com/users/plumbbobline/data/rss" url="http://www.livejournal.com/users/plumbbobline/"]]
-* [[!aggregate expireage=35 name="Maggie" feedurl="http://brazen.postagon.com/feed" url="http://brazen.postagon.com/"]]
 * [[!aggregate expireage=35 name="Maggie too" feedurl="http://brazenlyquiver.livejournal.com/data/atom" url="http://brazenlyquiver.livejournal.com/"]]a
 * [[!aggregate expireage=35 name="Maggie also" feedurl="http://yourbrazenworld.tumblr.com/rss" url="http://yourbrazenworld.tumblr.com/"]]
 * [[!aggregate expireage=35 name="Tomoko" feedurl="http://sktk.exblog.jp/atom.xml" url="http://sktk.exblog.jp/"]]

cleanup
diff --git a/blogs.mdwn b/blogs.mdwn
index 2ee2d05..8c6d3f9 100644
--- a/blogs.mdwn
+++ b/blogs.mdwn
@@ -7,7 +7,6 @@ List of feeds:
 
 * [[!aggregate expireage=35 name="Anna" feedurl="http://www.livejournal.com/users/wetkneefarm/data/rss" url="http://www.livejournal.com/users/wetkneefarm/"]]
 * [[!aggregate expireage=35 name="Anna and Mark: Waldeneffect" feedurl="http://www.waldeneffect.org/index.rss" url="http://www.waldeneffect.org/"]]
-* [[!aggregate expireage=35 name="Anna and Mark: Clinch Trails" feedurl="http://www.clinchtrails.com/index.rss" url="http://www.clinchtrails.com/"]]
 * [[!aggregate expireage=35 name="Joey" feedurl="http://joeyh.name/blog/index.rss" url="http://joeyh.name/blog/"]]
 * [[!aggregate expirecount=35 name="Joey chatter" feedurl="http://tmp.kitenet.net/pump.atom" url="https://identi.ca/joeyh"]]
 * [[!aggregate expireage=35 name="Joey git-annex devblog" feedurl="http://git-annex.branchable.com/devblog/index.rss" url="http://git-annex.branchable.com/devblog/"]]

mag
diff --git a/blogs.mdwn b/blogs.mdwn
index f947985..2ee2d05 100644
--- a/blogs.mdwn
+++ b/blogs.mdwn
@@ -16,6 +16,7 @@ List of feeds:
 * [[!aggregate expireage=35 name="Dani" feedurl="http://www.livejournal.com/users/dani62/data/rss" url="http://www.livejournal.com/users/dani62/"]]
 * [[!aggregate expireage=35 name="Errol" feedurl="http://www.livejournal.com/users/plumbbobline/data/rss" url="http://www.livejournal.com/users/plumbbobline/"]]
 * [[!aggregate expireage=35 name="Maggie" feedurl="http://brazen.postagon.com/feed" url="http://brazen.postagon.com/"]]
-* [[!aggregate expireage=35 name="Maggie too" feedurl="http://brazenlyquiver.livejournal.com/data/atom" url="http://brazenlyquiver.livejournal.com/"]]
+* [[!aggregate expireage=35 name="Maggie too" feedurl="http://brazenlyquiver.livejournal.com/data/atom" url="http://brazenlyquiver.livejournal.com/"]]a
+* [[!aggregate expireage=35 name="Maggie also" feedurl="http://yourbrazenworld.tumblr.com/rss" url="http://yourbrazenworld.tumblr.com/"]]
 * [[!aggregate expireage=35 name="Tomoko" feedurl="http://sktk.exblog.jp/atom.xml" url="http://sktk.exblog.jp/"]]
 * [[!aggregate expireage=35 name="Jerry" feedurl="http://carpentrydiem.blogspot.com/feeds/posts/default" url="http://carpentrydiem.blogspot.com/"]]

calendar update
diff --git a/archives/2015.mdwn b/archives/2015.mdwn
new file mode 100644
index 0000000..d0fd310
--- /dev/null
+++ b/archives/2015.mdwn
@@ -0,0 +1 @@
+[[!calendar type=year year=2015 pages="*"]]
diff --git a/archives/2015/01.mdwn b/archives/2015/01.mdwn
new file mode 100644
index 0000000..034b00c
--- /dev/null
+++ b/archives/2015/01.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=01 year=2015 pages="*"]]
+"""]]
+
+[[!inline pages="creation_month(01) and creation_year(2015) and *" show=0 feeds=no reverse=yes]]
diff --git a/archives/2015/02.mdwn b/archives/2015/02.mdwn
new file mode 100644
index 0000000..a4d426c
--- /dev/null
+++ b/archives/2015/02.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=02 year=2015 pages="*"]]
+"""]]
+
+[[!inline pages="creation_month(02) and creation_year(2015) and *" show=0 feeds=no reverse=yes]]
diff --git a/archives/2015/03.mdwn b/archives/2015/03.mdwn
new file mode 100644
index 0000000..fd1cea7
--- /dev/null
+++ b/archives/2015/03.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=03 year=2015 pages="*"]]
+"""]]
+
+[[!inline pages="creation_month(03) and creation_year(2015) and *" show=0 feeds=no reverse=yes]]
diff --git a/archives/2015/04.mdwn b/archives/2015/04.mdwn
new file mode 100644
index 0000000..d600fa1
--- /dev/null
+++ b/archives/2015/04.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=04 year=2015 pages="*"]]
+"""]]
+
+[[!inline pages="creation_month(04) and creation_year(2015) and *" show=0 feeds=no reverse=yes]]
diff --git a/archives/2015/05.mdwn b/archives/2015/05.mdwn
new file mode 100644
index 0000000..1cf508e
--- /dev/null
+++ b/archives/2015/05.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=05 year=2015 pages="*"]]
+"""]]
+
+[[!inline pages="creation_month(05) and creation_year(2015) and *" show=0 feeds=no reverse=yes]]
diff --git a/archives/2015/06.mdwn b/archives/2015/06.mdwn
new file mode 100644
index 0000000..9506451
--- /dev/null
+++ b/archives/2015/06.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=06 year=2015 pages="*"]]
+"""]]
+
+[[!inline pages="creation_month(06) and creation_year(2015) and *" show=0 feeds=no reverse=yes]]
diff --git a/archives/2015/07.mdwn b/archives/2015/07.mdwn
new file mode 100644
index 0000000..0b3b853
--- /dev/null
+++ b/archives/2015/07.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=07 year=2015 pages="*"]]
+"""]]
+
+[[!inline pages="creation_month(07) and creation_year(2015) and *" show=0 feeds=no reverse=yes]]
diff --git a/archives/2015/08.mdwn b/archives/2015/08.mdwn
new file mode 100644
index 0000000..849c1c9
--- /dev/null
+++ b/archives/2015/08.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=08 year=2015 pages="*"]]
+"""]]
+
+[[!inline pages="creation_month(08) and creation_year(2015) and *" show=0 feeds=no reverse=yes]]
diff --git a/archives/2015/09.mdwn b/archives/2015/09.mdwn
new file mode 100644
index 0000000..7495683
--- /dev/null
+++ b/archives/2015/09.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=09 year=2015 pages="*"]]
+"""]]
+
+[[!inline pages="creation_month(09) and creation_year(2015) and *" show=0 feeds=no reverse=yes]]
diff --git a/archives/2015/10.mdwn b/archives/2015/10.mdwn
new file mode 100644
index 0000000..fabe90a
--- /dev/null
+++ b/archives/2015/10.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=10 year=2015 pages="*"]]
+"""]]
+
+[[!inline pages="creation_month(10) and creation_year(2015) and *" show=0 feeds=no reverse=yes]]
diff --git a/archives/2015/11.mdwn b/archives/2015/11.mdwn
new file mode 100644
index 0000000..43f7689
--- /dev/null
+++ b/archives/2015/11.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=11 year=2015 pages="*"]]
+"""]]
+
+[[!inline pages="creation_month(11) and creation_year(2015) and *" show=0 feeds=no reverse=yes]]
diff --git a/archives/2015/12.mdwn b/archives/2015/12.mdwn
new file mode 100644
index 0000000..4264d3b
--- /dev/null
+++ b/archives/2015/12.mdwn
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=12 year=2015 pages="*"]]
+"""]]
+
+[[!inline pages="creation_month(12) and creation_year(2015) and *" show=0 feeds=no reverse=yes]]

title
diff --git a/blogs.mdwn b/blogs.mdwn
index cc007be..f947985 100644
--- a/blogs.mdwn
+++ b/blogs.mdwn
@@ -1,4 +1,5 @@
 [[!inline pages="internal(blogs/*) and !*/Discussion" show=50]]
+[[!meta title="Family blogs"]]
 
 ----
 

maggie new blog dance
diff --git a/blogs.mdwn b/blogs.mdwn
index 92a35f0..cc007be 100644
--- a/blogs.mdwn
+++ b/blogs.mdwn
@@ -15,5 +15,6 @@ List of feeds:
 * [[!aggregate expireage=35 name="Dani" feedurl="http://www.livejournal.com/users/dani62/data/rss" url="http://www.livejournal.com/users/dani62/"]]
 * [[!aggregate expireage=35 name="Errol" feedurl="http://www.livejournal.com/users/plumbbobline/data/rss" url="http://www.livejournal.com/users/plumbbobline/"]]
 * [[!aggregate expireage=35 name="Maggie" feedurl="http://brazen.postagon.com/feed" url="http://brazen.postagon.com/"]]
+* [[!aggregate expireage=35 name="Maggie too" feedurl="http://brazenlyquiver.livejournal.com/data/atom" url="http://brazenlyquiver.livejournal.com/"]]
 * [[!aggregate expireage=35 name="Tomoko" feedurl="http://sktk.exblog.jp/atom.xml" url="http://sktk.exblog.jp/"]]
 * [[!aggregate expireage=35 name="Jerry" feedurl="http://carpentrydiem.blogspot.com/feeds/posts/default" url="http://carpentrydiem.blogspot.com/"]]

workaround for expired ssl cert
diff --git a/blogs.mdwn b/blogs.mdwn
index f7dca46..92a35f0 100644
--- a/blogs.mdwn
+++ b/blogs.mdwn
@@ -8,7 +8,7 @@ List of feeds:
 * [[!aggregate expireage=35 name="Anna and Mark: Waldeneffect" feedurl="http://www.waldeneffect.org/index.rss" url="http://www.waldeneffect.org/"]]
 * [[!aggregate expireage=35 name="Anna and Mark: Clinch Trails" feedurl="http://www.clinchtrails.com/index.rss" url="http://www.clinchtrails.com/"]]
 * [[!aggregate expireage=35 name="Joey" feedurl="http://joeyh.name/blog/index.rss" url="http://joeyh.name/blog/"]]
-* [[!aggregate expirecount=35 name="Joey chatter" feedurl="https://pump2rss.com/feed/joeyh@identi.ca.atom" url="https://identi.ca/joeyh"]]
+* [[!aggregate expirecount=35 name="Joey chatter" feedurl="http://tmp.kitenet.net/pump.atom" url="https://identi.ca/joeyh"]]
 * [[!aggregate expireage=35 name="Joey git-annex devblog" feedurl="http://git-annex.branchable.com/devblog/index.rss" url="http://git-annex.branchable.com/devblog/"]]
 * [[!aggregate expireage=35 name="Joey: olduse.net blog" feedurl="http://olduse.net/blog/index.rss" url="http://olduse.net/blog/"]]
 * [[!aggregate expireage=35 name="Jay" feedurl="http://www.livejournal.com/users/jenderqueer/data/rss" url="http://www.livejournal.com/users/jenderqueer/"]]

remove dead account
diff --git a/blogs.mdwn b/blogs.mdwn
index 8289097..f7dca46 100644
--- a/blogs.mdwn
+++ b/blogs.mdwn
@@ -14,7 +14,6 @@ List of feeds:
 * [[!aggregate expireage=35 name="Jay" feedurl="http://www.livejournal.com/users/jenderqueer/data/rss" url="http://www.livejournal.com/users/jenderqueer/"]]
 * [[!aggregate expireage=35 name="Dani" feedurl="http://www.livejournal.com/users/dani62/data/rss" url="http://www.livejournal.com/users/dani62/"]]
 * [[!aggregate expireage=35 name="Errol" feedurl="http://www.livejournal.com/users/plumbbobline/data/rss" url="http://www.livejournal.com/users/plumbbobline/"]]
-* [[!aggregate expireage=35 name="Adrianne" feedurl="http://www.livejournal.com/users/adrianne-hess/data/rss" url="http://www.livejournal.com/users/adrianne-hess/"]]
 * [[!aggregate expireage=35 name="Maggie" feedurl="http://brazen.postagon.com/feed" url="http://brazen.postagon.com/"]]
 * [[!aggregate expireage=35 name="Tomoko" feedurl="http://sktk.exblog.jp/atom.xml" url="http://sktk.exblog.jp/"]]
 * [[!aggregate expireage=35 name="Jerry" feedurl="http://carpentrydiem.blogspot.com/feeds/posts/default" url="http://carpentrydiem.blogspot.com/"]]

update link
diff --git a/blogs.mdwn b/blogs.mdwn
index 214cf34..8289097 100644
--- a/blogs.mdwn
+++ b/blogs.mdwn
@@ -7,7 +7,7 @@ List of feeds:
 * [[!aggregate expireage=35 name="Anna" feedurl="http://www.livejournal.com/users/wetkneefarm/data/rss" url="http://www.livejournal.com/users/wetkneefarm/"]]
 * [[!aggregate expireage=35 name="Anna and Mark: Waldeneffect" feedurl="http://www.waldeneffect.org/index.rss" url="http://www.waldeneffect.org/"]]
 * [[!aggregate expireage=35 name="Anna and Mark: Clinch Trails" feedurl="http://www.clinchtrails.com/index.rss" url="http://www.clinchtrails.com/"]]
-* [[!aggregate expireage=35 name="Joey" feedurl="http://kitenet.net/~joey/blog/index.rss" url="http://kitenet.net/~joey/blog/"]]
+* [[!aggregate expireage=35 name="Joey" feedurl="http://joeyh.name/blog/index.rss" url="http://joeyh.name/blog/"]]
 * [[!aggregate expirecount=35 name="Joey chatter" feedurl="https://pump2rss.com/feed/joeyh@identi.ca.atom" url="https://identi.ca/joeyh"]]
 * [[!aggregate expireage=35 name="Joey git-annex devblog" feedurl="http://git-annex.branchable.com/devblog/index.rss" url="http://git-annex.branchable.com/devblog/"]]
 * [[!aggregate expireage=35 name="Joey: olduse.net blog" feedurl="http://olduse.net/blog/index.rss" url="http://olduse.net/blog/"]]

maggie blog
diff --git a/blogs.mdwn b/blogs.mdwn
index 7aa8b37..214cf34 100644
--- a/blogs.mdwn
+++ b/blogs.mdwn
@@ -15,7 +15,6 @@ List of feeds:
 * [[!aggregate expireage=35 name="Dani" feedurl="http://www.livejournal.com/users/dani62/data/rss" url="http://www.livejournal.com/users/dani62/"]]
 * [[!aggregate expireage=35 name="Errol" feedurl="http://www.livejournal.com/users/plumbbobline/data/rss" url="http://www.livejournal.com/users/plumbbobline/"]]
 * [[!aggregate expireage=35 name="Adrianne" feedurl="http://www.livejournal.com/users/adrianne-hess/data/rss" url="http://www.livejournal.com/users/adrianne-hess/"]]
-* [[!aggregate expireage=35 name="Maggie" feedurl="http://livingwithmaggie.branchable.com/index.rss" url="http://livingwithmaggie.branchable.com/"]]
-* [[!aggregate expireage=35 name="Maggie: What Wabi Sabi Isn't" feedurl="http://whatwabisabiisnt.branchable.com/index.rss" url="http://whatwabisabiisnt.branchable.com/"]]
+* [[!aggregate expireage=35 name="Maggie" feedurl="http://brazen.postagon.com/feed" url="http://brazen.postagon.com/"]]
 * [[!aggregate expireage=35 name="Tomoko" feedurl="http://sktk.exblog.jp/atom.xml" url="http://sktk.exblog.jp/"]]
 * [[!aggregate expireage=35 name="Jerry" feedurl="http://carpentrydiem.blogspot.com/feeds/posts/default" url="http://carpentrydiem.blogspot.com/"]]

add my olduse.net blog
diff --git a/blogs.mdwn b/blogs.mdwn
index d032e2c..7aa8b37 100644
--- a/blogs.mdwn
+++ b/blogs.mdwn
@@ -10,6 +10,7 @@ List of feeds:
 * [[!aggregate expireage=35 name="Joey" feedurl="http://kitenet.net/~joey/blog/index.rss" url="http://kitenet.net/~joey/blog/"]]
 * [[!aggregate expirecount=35 name="Joey chatter" feedurl="https://pump2rss.com/feed/joeyh@identi.ca.atom" url="https://identi.ca/joeyh"]]
 * [[!aggregate expireage=35 name="Joey git-annex devblog" feedurl="http://git-annex.branchable.com/devblog/index.rss" url="http://git-annex.branchable.com/devblog/"]]
+* [[!aggregate expireage=35 name="Joey: olduse.net blog" feedurl="http://olduse.net/blog/index.rss" url="http://olduse.net/blog/"]]
 * [[!aggregate expireage=35 name="Jay" feedurl="http://www.livejournal.com/users/jenderqueer/data/rss" url="http://www.livejournal.com/users/jenderqueer/"]]
 * [[!aggregate expireage=35 name="Dani" feedurl="http://www.livejournal.com/users/dani62/data/rss" url="http://www.livejournal.com/users/dani62/"]]
 * [[!aggregate expireage=35 name="Errol" feedurl="http://www.livejournal.com/users/plumbbobline/data/rss" url="http://www.livejournal.com/users/plumbbobline/"]]

new identica feed
diff --git a/blogs.mdwn b/blogs.mdwn
index 5820507..d032e2c 100644
--- a/blogs.mdwn
+++ b/blogs.mdwn
@@ -8,7 +8,7 @@ List of feeds:
 * [[!aggregate expireage=35 name="Anna and Mark: Waldeneffect" feedurl="http://www.waldeneffect.org/index.rss" url="http://www.waldeneffect.org/"]]
 * [[!aggregate expireage=35 name="Anna and Mark: Clinch Trails" feedurl="http://www.clinchtrails.com/index.rss" url="http://www.clinchtrails.com/"]]
 * [[!aggregate expireage=35 name="Joey" feedurl="http://kitenet.net/~joey/blog/index.rss" url="http://kitenet.net/~joey/blog/"]]
-* [[!aggregate expirecount=35 name="Joey chatter" feedurl="http://tmp.kitenet.net/identica.rss" url="https://identi.ca/joeyh"]]
+* [[!aggregate expirecount=35 name="Joey chatter" feedurl="https://pump2rss.com/feed/joeyh@identi.ca.atom" url="https://identi.ca/joeyh"]]
 * [[!aggregate expireage=35 name="Joey git-annex devblog" feedurl="http://git-annex.branchable.com/devblog/index.rss" url="http://git-annex.branchable.com/devblog/"]]
 * [[!aggregate expireage=35 name="Jay" feedurl="http://www.livejournal.com/users/jenderqueer/data/rss" url="http://www.livejournal.com/users/jenderqueer/"]]
 * [[!aggregate expireage=35 name="Dani" feedurl="http://www.livejournal.com/users/dani62/data/rss" url="http://www.livejournal.com/users/dani62/"]]

add devblog
diff --git a/blogs.mdwn b/blogs.mdwn
index b998157..5820507 100644
--- a/blogs.mdwn
+++ b/blogs.mdwn
@@ -9,6 +9,7 @@ List of feeds:
 * [[!aggregate expireage=35 name="Anna and Mark: Clinch Trails" feedurl="http://www.clinchtrails.com/index.rss" url="http://www.clinchtrails.com/"]]
 * [[!aggregate expireage=35 name="Joey" feedurl="http://kitenet.net/~joey/blog/index.rss" url="http://kitenet.net/~joey/blog/"]]
 * [[!aggregate expirecount=35 name="Joey chatter" feedurl="http://tmp.kitenet.net/identica.rss" url="https://identi.ca/joeyh"]]
+* [[!aggregate expireage=35 name="Joey git-annex devblog" feedurl="http://git-annex.branchable.com/devblog/index.rss" url="http://git-annex.branchable.com/devblog/"]]
 * [[!aggregate expireage=35 name="Jay" feedurl="http://www.livejournal.com/users/jenderqueer/data/rss" url="http://www.livejournal.com/users/jenderqueer/"]]
 * [[!aggregate expireage=35 name="Dani" feedurl="http://www.livejournal.com/users/dani62/data/rss" url="http://www.livejournal.com/users/dani62/"]]
 * [[!aggregate expireage=35 name="Errol" feedurl="http://www.livejournal.com/users/plumbbobline/data/rss" url="http://www.livejournal.com/users/plumbbobline/"]]

calendar does not handle internal aggregated pages well
diff --git a/blogs.mdwn b/blogs.mdwn
index 44aa4ec..b998157 100644
--- a/blogs.mdwn
+++ b/blogs.mdwn
@@ -17,7 +17,3 @@ List of feeds:
 * [[!aggregate expireage=35 name="Maggie: What Wabi Sabi Isn't" feedurl="http://whatwabisabiisnt.branchable.com/index.rss" url="http://whatwabisabiisnt.branchable.com/"]]
 * [[!aggregate expireage=35 name="Tomoko" feedurl="http://sktk.exblog.jp/atom.xml" url="http://sktk.exblog.jp/"]]
 * [[!aggregate expireage=35 name="Jerry" feedurl="http://carpentrydiem.blogspot.com/feeds/posts/default" url="http://carpentrydiem.blogspot.com/"]]
-
-[[!sidebar content="""
-[[!calendar pages="internal(blogs/*) and !*/Discussion"]]
-"""]]

try adding calendar
diff --git a/blogs.mdwn b/blogs.mdwn
index 7b82f34..44aa4ec 100644
--- a/blogs.mdwn
+++ b/blogs.mdwn
@@ -4,16 +4,20 @@
 
 List of feeds:
 
-* [[!aggregate expireage=20 name="Anna" feedurl="http://www.livejournal.com/users/wetkneefarm/data/rss" url="http://www.livejournal.com/users/wetkneefarm/"]]
-* [[!aggregate expireage=20 name="Anna and Mark: Waldeneffect" feedurl="http://www.waldeneffect.org/index.rss" url="http://www.waldeneffect.org/"]]
-* [[!aggregate expireage=20 name="Anna and Mark: Clinch Trails" feedurl="http://www.clinchtrails.com/index.rss" url="http://www.clinchtrails.com/"]]
-* [[!aggregate expireage=20 name="Joey" feedurl="http://kitenet.net/~joey/blog/index.rss" url="http://kitenet.net/~joey/blog/"]]
-* [[!aggregate expirecount=20 name="Joey chatter" feedurl="http://tmp.kitenet.net/identica.rss" url="https://identi.ca/joeyh"]]
-* [[!aggregate expireage=20 name="Jay" feedurl="http://www.livejournal.com/users/jenderqueer/data/rss" url="http://www.livejournal.com/users/jenderqueer/"]]
-* [[!aggregate expireage=20 name="Dani" feedurl="http://www.livejournal.com/users/dani62/data/rss" url="http://www.livejournal.com/users/dani62/"]]
-* [[!aggregate expireage=20 name="Errol" feedurl="http://www.livejournal.com/users/plumbbobline/data/rss" url="http://www.livejournal.com/users/plumbbobline/"]]
-* [[!aggregate expireage=20 name="Adrianne" feedurl="http://www.livejournal.com/users/adrianne-hess/data/rss" url="http://www.livejournal.com/users/adrianne-hess/"]]
-* [[!aggregate expireage=20 name="Maggie" feedurl="http://livingwithmaggie.branchable.com/index.rss" url="http://livingwithmaggie.branchable.com/"]]
-* [[!aggregate expireage=20 name="Maggie: What Wabi Sabi Isn't" feedurl="http://whatwabisabiisnt.branchable.com/index.rss" url="http://whatwabisabiisnt.branchable.com/"]]
-* [[!aggregate expireage=20 name="Tomoko" feedurl="http://sktk.exblog.jp/atom.xml" url="http://sktk.exblog.jp/"]]
-* [[!aggregate expireage=20 name="Jerry" feedurl="http://carpentrydiem.blogspot.com/feeds/posts/default" url="http://carpentrydiem.blogspot.com/"]]
+* [[!aggregate expireage=35 name="Anna" feedurl="http://www.livejournal.com/users/wetkneefarm/data/rss" url="http://www.livejournal.com/users/wetkneefarm/"]]
+* [[!aggregate expireage=35 name="Anna and Mark: Waldeneffect" feedurl="http://www.waldeneffect.org/index.rss" url="http://www.waldeneffect.org/"]]
+* [[!aggregate expireage=35 name="Anna and Mark: Clinch Trails" feedurl="http://www.clinchtrails.com/index.rss" url="http://www.clinchtrails.com/"]]
+* [[!aggregate expireage=35 name="Joey" feedurl="http://kitenet.net/~joey/blog/index.rss" url="http://kitenet.net/~joey/blog/"]]
+* [[!aggregate expirecount=35 name="Joey chatter" feedurl="http://tmp.kitenet.net/identica.rss" url="https://identi.ca/joeyh"]]
+* [[!aggregate expireage=35 name="Jay" feedurl="http://www.livejournal.com/users/jenderqueer/data/rss" url="http://www.livejournal.com/users/jenderqueer/"]]
+* [[!aggregate expireage=35 name="Dani" feedurl="http://www.livejournal.com/users/dani62/data/rss" url="http://www.livejournal.com/users/dani62/"]]
+* [[!aggregate expireage=35 name="Errol" feedurl="http://www.livejournal.com/users/plumbbobline/data/rss" url="http://www.livejournal.com/users/plumbbobline/"]]
+* [[!aggregate expireage=35 name="Adrianne" feedurl="http://www.livejournal.com/users/adrianne-hess/data/rss" url="http://www.livejournal.com/users/adrianne-hess/"]]
+* [[!aggregate expireage=35 name="Maggie" feedurl="http://livingwithmaggie.branchable.com/index.rss" url="http://livingwithmaggie.branchable.com/"]]
+* [[!aggregate expireage=35 name="Maggie: What Wabi Sabi Isn't" feedurl="http://whatwabisabiisnt.branchable.com/index.rss" url="http://whatwabisabiisnt.branchable.com/"]]
+* [[!aggregate expireage=35 name="Tomoko" feedurl="http://sktk.exblog.jp/atom.xml" url="http://sktk.exblog.jp/"]]
+* [[!aggregate expireage=35 name="Jerry" feedurl="http://carpentrydiem.blogspot.com/feeds/posts/default" url="http://carpentrydiem.blogspot.com/"]]
+
+[[!sidebar content="""
+[[!calendar pages="internal(blogs/*) and !*/Discussion"]]
+"""]]

clean
diff --git a/blogs.mdwn b/blogs.mdwn
index c18e86a..7b82f34 100644
--- a/blogs.mdwn
+++ b/blogs.mdwn
@@ -1,8 +1,3 @@
-[[!template id=note text="""
-Recent [[chatter]]:
-[[!inline pages="internal(chatter/*)" template=microblog show=5 feeds=no]]
-"""]]
-
 [[!inline pages="internal(blogs/*) and !*/Discussion" show=50]]
 
 ----

move identi.ca to main feed
diff --git a/blogs.mdwn b/blogs.mdwn
index cb4c972..c18e86a 100644
--- a/blogs.mdwn
+++ b/blogs.mdwn
@@ -13,6 +13,7 @@ List of feeds:
 * [[!aggregate expireage=20 name="Anna and Mark: Waldeneffect" feedurl="http://www.waldeneffect.org/index.rss" url="http://www.waldeneffect.org/"]]
 * [[!aggregate expireage=20 name="Anna and Mark: Clinch Trails" feedurl="http://www.clinchtrails.com/index.rss" url="http://www.clinchtrails.com/"]]
 * [[!aggregate expireage=20 name="Joey" feedurl="http://kitenet.net/~joey/blog/index.rss" url="http://kitenet.net/~joey/blog/"]]
+* [[!aggregate expirecount=20 name="Joey chatter" feedurl="http://tmp.kitenet.net/identica.rss" url="https://identi.ca/joeyh"]]
 * [[!aggregate expireage=20 name="Jay" feedurl="http://www.livejournal.com/users/jenderqueer/data/rss" url="http://www.livejournal.com/users/jenderqueer/"]]
 * [[!aggregate expireage=20 name="Dani" feedurl="http://www.livejournal.com/users/dani62/data/rss" url="http://www.livejournal.com/users/dani62/"]]
 * [[!aggregate expireage=20 name="Errol" feedurl="http://www.livejournal.com/users/plumbbobline/data/rss" url="http://www.livejournal.com/users/plumbbobline/"]]
diff --git a/chatter.mdwn b/chatter.mdwn
deleted file mode 100644
index b7f7e4e..0000000
--- a/chatter.mdwn
+++ /dev/null
@@ -1,7 +0,0 @@
-[[!inline pages="internal(chatter/*) and !*/Discussion" template=microblog show=30]]
-
-----
-
-List of feeds:
-
-* [[!aggregate expirecount=20 name="Joey chatter" feedurl="http://tmp.kitenet.net/identica.rss" url="https://identi.ca/joeyh"]]

foo
diff --git a/chatter.mdwn b/chatter.mdwn
index b18cc2a..b7f7e4e 100644
--- a/chatter.mdwn
+++ b/chatter.mdwn
@@ -4,4 +4,4 @@
 
 List of feeds:
 
-* [[!aggregate expirecount=20 name="Joey (short items)" feedurl="http://tmp.kitenet.net/identica.rss" url="https://identi.ca/joeyh"]]
+* [[!aggregate expirecount=20 name="Joey chatter" feedurl="http://tmp.kitenet.net/identica.rss" url="https://identi.ca/joeyh"]]

update
diff --git a/chatter.mdwn b/chatter.mdwn
index f4c3973..b18cc2a 100644
--- a/chatter.mdwn
+++ b/chatter.mdwn
@@ -4,4 +4,4 @@
 
 List of feeds:
 
-* [[!aggregate expirecount=20 name="Joey" feedurl="http://tmp.kitenet.net/identica.rss" url="https://identi.ca/joeyh"]]
+* [[!aggregate expirecount=20 name="Joey (short items)" feedurl="http://tmp.kitenet.net/identica.rss" url="https://identi.ca/joeyh"]]

rename
diff --git a/chatter.mdwn b/chatter.mdwn
index 45f08cf..f4c3973 100644
--- a/chatter.mdwn
+++ b/chatter.mdwn
@@ -4,4 +4,4 @@
 
 List of feeds:
 
-* [[!aggregate expirecount=20 name="Joey" feedurl="http://tmp.kitenet.net/identica.rss" url="http://identi.ca/joeyh"]]
+* [[!aggregate expirecount=20 name="Joey" feedurl="http://tmp.kitenet.net/identica.rss" url="https://identi.ca/joeyh"]]

rename
diff --git a/chatter.mdwn b/chatter.mdwn
index e378045..45f08cf 100644
--- a/chatter.mdwn
+++ b/chatter.mdwn
@@ -4,4 +4,4 @@
 
 List of feeds:
 
-* [[!aggregate expirecount=20 name="Joey (identica)" feedurl="http://tmp.kitenet.net/identica.rss" url="http://identi.ca/joeyh"]]
+* [[!aggregate expirecount=20 name="Joey" feedurl="http://tmp.kitenet.net/identica.rss" url="http://identi.ca/joeyh"]]

try using my new feed for identica
diff --git a/chatter.mdwn b/chatter.mdwn
index 48d3667..e378045 100644
--- a/chatter.mdwn
+++ b/chatter.mdwn
@@ -4,5 +4,4 @@
 
 List of feeds:
 
-* [[!aggregate expirecount=20 name="Joey (identica)" feedurl="http://identi.ca/api/statuses/user_timeline/14601.rss" url="http://identi.ca/joeyh"]]
-* [[!aggregate expirecount=20 name="Maggie (twitter)" feedurl="http://twitter.com/statuses/user_timeline/146665774.rss" url="http://twitter.com/persimmons"]]
+* [[!aggregate expirecount=20 name="Joey (identica)" feedurl="http://tmp.kitenet.net/identica.rss" url="http://identi.ca/joeyh"]]

Revert "update"
This reverts commit 29cba3ab644b597e540fae8993ee2f9166515f23.
diff --git a/blogs.mdwn b/blogs.mdwn
index 8c54dbc..cb4c972 100644
--- a/blogs.mdwn
+++ b/blogs.mdwn
@@ -1,7 +1,6 @@
 [[!template id=note text="""
 Recent [[chatter]]:
-(not currently available for technical reasons;
-see [here](http://identi.ca/joeyh) for Joey's microblog)
+[[!inline pages="internal(chatter/*)" template=microblog show=5 feeds=no]]
 """]]
 
 [[!inline pages="internal(blogs/*) and !*/Discussion" show=50]]

update
diff --git a/blogs.mdwn b/blogs.mdwn
index cb4c972..8c54dbc 100644
--- a/blogs.mdwn
+++ b/blogs.mdwn
@@ -1,6 +1,7 @@
 [[!template id=note text="""
 Recent [[chatter]]:
-[[!inline pages="internal(chatter/*)" template=microblog show=5 feeds=no]]
+(not currently available for technical reasons;
+see [here](http://identi.ca/joeyh) for Joey's microblog)
 """]]
 
 [[!inline pages="internal(blogs/*) and !*/Discussion" show=50]]

pics from wedding
diff --git a/pics.mdwn b/pics.mdwn
index d644bdc..00e56de 100644
--- a/pics.mdwn
+++ b/pics.mdwn
@@ -17,6 +17,7 @@ If you have pics to contribute, mail them to Joey.
   * [[Eckbergs|adri/eckberg]]
   * [[Farm_and_Store|adri/farm]]
   * [[80's|adri/80s]]
+* [[Jay and Timnah's wedding|jay_timnah_wedding]]
 * [[misc]] other pictures
 
 [[!edittemplate template=templates/pictemplate match="pics/*" silent=yes]]
diff --git a/pics/jay_timnah_wedding.mdwn b/pics/jay_timnah_wedding.mdwn
new file mode 100644
index 0000000..65bfab3
--- /dev/null
+++ b/pics/jay_timnah_wedding.mdwn
@@ -0,0 +1,32 @@
+[[!meta title="Jay and Timnah's wedding"]]
+
+[[!img defaults alt="photo" size=300x300]]
+
+[[!img 228531_10151192456998653_1741552618_n.jpg]]
+[[!img 246851_10151192454893653_2145880704_n.jpg]]
+[[!img 253964_10151192458483653_105052837_n.jpg]]
+[[!img 254973_10151202946097018_1050960483_n.jpg]]
+[[!img 383911_10151192455458653_471238468_n.jpg]]
+[[!img 383938_10151192457693653_657466731_n.jpg]]
+[[!img 394396_10151192454993653_1146500527_n.jpg]]
+[[!img 405178_10151192458128653_1375774747_n.jpg]]
+[[!img 405241_10151120337389559_1268288908_n.jpg]]
+[[!img 418868_10151192457298653_1420753811_n.jpg]]
+[[!img 422514_10151192457558653_1812158542_n.jpg]]
+[[!img 431100_10151192455048653_162856744_n.jpg]]
+[[!img 488313_10151192457138653_162132926_n.jpg]]
+[[!img 523229_10151192458568653_35661434_n.jpg]]
+[[!img 524427_10151192456353653_1742989263_n.jpg]]
+[[!img 540174_10151192458618653_1984803375_n.jpg]]
+[[!img 540221_10151192455278653_1576517563_n.jpg]]
+[[!img 546610_10151192455098653_127811136_n.jpg]]
+[[!img 551566_10151192458713653_933681554_n.jpg]]
+[[!img 555637_10151120531279559_1126832704_n.jpg]]
+[[!img 558654_10151192455768653_975844349_n.jpg]]
+[[!img 559097_10151192458043653_495383529_n.jpg]]
+[[!img 561822_10151192456568653_1126175108_n.jpg]]
+[[!img 574723_10151192458308653_724842525_n.jpg]]
+[[!img 582676_10151192455193653_2117276224_n.jpg]]
+[[!img 603510_10151192457353653_1645032034_n-1.jpg]]
+[[!img chuppah.jpg]]
+[[!img engaged.jpg]]
diff --git a/pics/jay_timnah_wedding/228531_10151192456998653_1741552618_n.jpg b/pics/jay_timnah_wedding/228531_10151192456998653_1741552618_n.jpg
new file mode 100644
index 0000000..29c1ab6
Binary files /dev/null and b/pics/jay_timnah_wedding/228531_10151192456998653_1741552618_n.jpg differ
diff --git a/pics/jay_timnah_wedding/246851_10151192454893653_2145880704_n.jpg b/pics/jay_timnah_wedding/246851_10151192454893653_2145880704_n.jpg
new file mode 100644
index 0000000..8e34adf
Binary files /dev/null and b/pics/jay_timnah_wedding/246851_10151192454893653_2145880704_n.jpg differ
diff --git a/pics/jay_timnah_wedding/253964_10151192458483653_105052837_n.jpg b/pics/jay_timnah_wedding/253964_10151192458483653_105052837_n.jpg
new file mode 100644
index 0000000..c61f174
Binary files /dev/null and b/pics/jay_timnah_wedding/253964_10151192458483653_105052837_n.jpg differ
diff --git a/pics/jay_timnah_wedding/254973_10151202946097018_1050960483_n.jpg b/pics/jay_timnah_wedding/254973_10151202946097018_1050960483_n.jpg
new file mode 100644
index 0000000..03b84ce
Binary files /dev/null and b/pics/jay_timnah_wedding/254973_10151202946097018_1050960483_n.jpg differ
diff --git a/pics/jay_timnah_wedding/383911_10151192455458653_471238468_n.jpg b/pics/jay_timnah_wedding/383911_10151192455458653_471238468_n.jpg
new file mode 100644
index 0000000..575586a
Binary files /dev/null and b/pics/jay_timnah_wedding/383911_10151192455458653_471238468_n.jpg differ
diff --git a/pics/jay_timnah_wedding/383938_10151192457693653_657466731_n.jpg b/pics/jay_timnah_wedding/383938_10151192457693653_657466731_n.jpg
new file mode 100644
index 0000000..4dba7aa
Binary files /dev/null and b/pics/jay_timnah_wedding/383938_10151192457693653_657466731_n.jpg differ
diff --git a/pics/jay_timnah_wedding/394396_10151192454993653_1146500527_n.jpg b/pics/jay_timnah_wedding/394396_10151192454993653_1146500527_n.jpg
new file mode 100644
index 0000000..2dcba9f
Binary files /dev/null and b/pics/jay_timnah_wedding/394396_10151192454993653_1146500527_n.jpg differ
diff --git a/pics/jay_timnah_wedding/405178_10151192458128653_1375774747_n.jpg b/pics/jay_timnah_wedding/405178_10151192458128653_1375774747_n.jpg
new file mode 100644
index 0000000..53187e2
Binary files /dev/null and b/pics/jay_timnah_wedding/405178_10151192458128653_1375774747_n.jpg differ
diff --git a/pics/jay_timnah_wedding/405241_10151120337389559_1268288908_n.jpg b/pics/jay_timnah_wedding/405241_10151120337389559_1268288908_n.jpg
new file mode 100644
index 0000000..e7ca568
Binary files /dev/null and b/pics/jay_timnah_wedding/405241_10151120337389559_1268288908_n.jpg differ
diff --git a/pics/jay_timnah_wedding/418868_10151192457298653_1420753811_n.jpg b/pics/jay_timnah_wedding/418868_10151192457298653_1420753811_n.jpg
new file mode 100644
index 0000000..63e6845
Binary files /dev/null and b/pics/jay_timnah_wedding/418868_10151192457298653_1420753811_n.jpg differ
diff --git a/pics/jay_timnah_wedding/422514_10151192457558653_1812158542_n.jpg b/pics/jay_timnah_wedding/422514_10151192457558653_1812158542_n.jpg
new file mode 100644
index 0000000..4941725
Binary files /dev/null and b/pics/jay_timnah_wedding/422514_10151192457558653_1812158542_n.jpg differ
diff --git a/pics/jay_timnah_wedding/431100_10151192455048653_162856744_n.jpg b/pics/jay_timnah_wedding/431100_10151192455048653_162856744_n.jpg
new file mode 100644
index 0000000..cd83521
Binary files /dev/null and b/pics/jay_timnah_wedding/431100_10151192455048653_162856744_n.jpg differ
diff --git a/pics/jay_timnah_wedding/488313_10151192457138653_162132926_n.jpg b/pics/jay_timnah_wedding/488313_10151192457138653_162132926_n.jpg
new file mode 100644
index 0000000..2e39051
Binary files /dev/null and b/pics/jay_timnah_wedding/488313_10151192457138653_162132926_n.jpg differ
diff --git a/pics/jay_timnah_wedding/523229_10151192458568653_35661434_n.jpg b/pics/jay_timnah_wedding/523229_10151192458568653_35661434_n.jpg
new file mode 100644
index 0000000..f90823a
Binary files /dev/null and b/pics/jay_timnah_wedding/523229_10151192458568653_35661434_n.jpg differ
diff --git a/pics/jay_timnah_wedding/524427_10151192456353653_1742989263_n.jpg b/pics/jay_timnah_wedding/524427_10151192456353653_1742989263_n.jpg
new file mode 100644
index 0000000..006a778
Binary files /dev/null and b/pics/jay_timnah_wedding/524427_10151192456353653_1742989263_n.jpg differ
diff --git a/pics/jay_timnah_wedding/540174_10151192458618653_1984803375_n.jpg b/pics/jay_timnah_wedding/540174_10151192458618653_1984803375_n.jpg
new file mode 100644
index 0000000..3e4c121
Binary files /dev/null and b/pics/jay_timnah_wedding/540174_10151192458618653_1984803375_n.jpg differ
diff --git a/pics/jay_timnah_wedding/540221_10151192455278653_1576517563_n.jpg b/pics/jay_timnah_wedding/540221_10151192455278653_1576517563_n.jpg
new file mode 100644
index 0000000..321ca50
Binary files /dev/null and b/pics/jay_timnah_wedding/540221_10151192455278653_1576517563_n.jpg differ
diff --git a/pics/jay_timnah_wedding/546610_10151192455098653_127811136_n.jpg b/pics/jay_timnah_wedding/546610_10151192455098653_127811136_n.jpg
new file mode 100644
index 0000000..8ec1f8b
Binary files /dev/null and b/pics/jay_timnah_wedding/546610_10151192455098653_127811136_n.jpg differ
diff --git a/pics/jay_timnah_wedding/551566_10151192458713653_933681554_n.jpg b/pics/jay_timnah_wedding/551566_10151192458713653_933681554_n.jpg
new file mode 100644
index 0000000..70b6261
Binary files /dev/null and b/pics/jay_timnah_wedding/551566_10151192458713653_933681554_n.jpg differ
diff --git a/pics/jay_timnah_wedding/555637_10151120531279559_1126832704_n.jpg b/pics/jay_timnah_wedding/555637_10151120531279559_1126832704_n.jpg
new file mode 100644
index 0000000..26763f4
Binary files /dev/null and b/pics/jay_timnah_wedding/555637_10151120531279559_1126832704_n.jpg differ
diff --git a/pics/jay_timnah_wedding/558654_10151192455768653_975844349_n.jpg b/pics/jay_timnah_wedding/558654_10151192455768653_975844349_n.jpg
new file mode 100644
index 0000000..e6a7956
Binary files /dev/null and b/pics/jay_timnah_wedding/558654_10151192455768653_975844349_n.jpg differ
diff --git a/pics/jay_timnah_wedding/559097_10151192458043653_495383529_n.jpg b/pics/jay_timnah_wedding/559097_10151192458043653_495383529_n.jpg
new file mode 100644
index 0000000..9fa53f8
Binary files /dev/null and b/pics/jay_timnah_wedding/559097_10151192458043653_495383529_n.jpg differ
diff --git a/pics/jay_timnah_wedding/561822_10151192456568653_1126175108_n.jpg b/pics/jay_timnah_wedding/561822_10151192456568653_1126175108_n.jpg
new file mode 100644
index 0000000..ef7a8a5
Binary files /dev/null and b/pics/jay_timnah_wedding/561822_10151192456568653_1126175108_n.jpg differ
diff --git a/pics/jay_timnah_wedding/574723_10151192458308653_724842525_n.jpg b/pics/jay_timnah_wedding/574723_10151192458308653_724842525_n.jpg
new file mode 100644
index 0000000..a41aa89
Binary files /dev/null and b/pics/jay_timnah_wedding/574723_10151192458308653_724842525_n.jpg differ
diff --git a/pics/jay_timnah_wedding/582676_10151192455193653_2117276224_n.jpg b/pics/jay_timnah_wedding/582676_10151192455193653_2117276224_n.jpg
new file mode 100644
index 0000000..25d153a
Binary files /dev/null and b/pics/jay_timnah_wedding/582676_10151192455193653_2117276224_n.jpg differ
diff --git a/pics/jay_timnah_wedding/603510_10151192457353653_1645032034_n-1.jpg b/pics/jay_timnah_wedding/603510_10151192457353653_1645032034_n-1.jpg
new file mode 100644
index 0000000..e090aec
Binary files /dev/null and b/pics/jay_timnah_wedding/603510_10151192457353653_1645032034_n-1.jpg differ
diff --git a/pics/jay_timnah_wedding/chuppah.jpg b/pics/jay_timnah_wedding/chuppah.jpg
new file mode 100644
index 0000000..686a6ec
Binary files /dev/null and b/pics/jay_timnah_wedding/chuppah.jpg differ
diff --git a/pics/jay_timnah_wedding/engaged.jpg b/pics/jay_timnah_wedding/engaged.jpg
new file mode 100644
index 0000000..c806509
Binary files /dev/null and b/pics/jay_timnah_wedding/engaged.jpg differ

update
diff --git a/blogs.mdwn b/blogs.mdwn
index ff706b9..cb4c972 100644
--- a/blogs.mdwn
+++ b/blogs.mdwn
@@ -18,5 +18,6 @@ List of feeds:
 * [[!aggregate expireage=20 name="Errol" feedurl="http://www.livejournal.com/users/plumbbobline/data/rss" url="http://www.livejournal.com/users/plumbbobline/"]]
 * [[!aggregate expireage=20 name="Adrianne" feedurl="http://www.livejournal.com/users/adrianne-hess/data/rss" url="http://www.livejournal.com/users/adrianne-hess/"]]
 * [[!aggregate expireage=20 name="Maggie" feedurl="http://livingwithmaggie.branchable.com/index.rss" url="http://livingwithmaggie.branchable.com/"]]
+* [[!aggregate expireage=20 name="Maggie: What Wabi Sabi Isn't" feedurl="http://whatwabisabiisnt.branchable.com/index.rss" url="http://whatwabisabiisnt.branchable.com/"]]
 * [[!aggregate expireage=20 name="Tomoko" feedurl="http://sktk.exblog.jp/atom.xml" url="http://sktk.exblog.jp/"]]
 * [[!aggregate expireage=20 name="Jerry" feedurl="http://carpentrydiem.blogspot.com/feeds/posts/default" url="http://carpentrydiem.blogspot.com/"]]

add template for pics
diff --git a/pics.mdwn b/pics.mdwn
index 74c2ab8..d644bdc 100644
--- a/pics.mdwn
+++ b/pics.mdwn
@@ -18,3 +18,5 @@ If you have pics to contribute, mail them to Joey.
   * [[Farm_and_Store|adri/farm]]
   * [[80's|adri/80s]]
 * [[misc]] other pictures
+
+[[!edittemplate template=templates/pictemplate match="pics/*" silent=yes]]
diff --git a/templates/pictemplate.mdwn b/templates/pictemplate.mdwn
new file mode 100644
index 0000000..922a5e8
--- /dev/null
+++ b/templates/pictemplate.mdwn
@@ -0,0 +1,5 @@
+
+
+[[!img defaults alt="photo" size=300x300]]
+
+

cleanup
diff --git a/blogs.mdwn b/blogs.mdwn
index 3da721e..ff706b9 100644
--- a/blogs.mdwn
+++ b/blogs.mdwn
@@ -18,6 +18,5 @@ List of feeds:
 * [[!aggregate expireage=20 name="Errol" feedurl="http://www.livejournal.com/users/plumbbobline/data/rss" url="http://www.livejournal.com/users/plumbbobline/"]]
 * [[!aggregate expireage=20 name="Adrianne" feedurl="http://www.livejournal.com/users/adrianne-hess/data/rss" url="http://www.livejournal.com/users/adrianne-hess/"]]
 * [[!aggregate expireage=20 name="Maggie" feedurl="http://livingwithmaggie.branchable.com/index.rss" url="http://livingwithmaggie.branchable.com/"]]
-* [[!aggregate expireage=20 name="Maggie: Skeleton Earth" feedurl="http://skeletonearth.branchable.com/index.rss" url="http://skeletonearth.branchable.com/"]]
 * [[!aggregate expireage=20 name="Tomoko" feedurl="http://sktk.exblog.jp/atom.xml" url="http://sktk.exblog.jp/"]]
 * [[!aggregate expireage=20 name="Jerry" feedurl="http://carpentrydiem.blogspot.com/feeds/posts/default" url="http://carpentrydiem.blogspot.com/"]]

despam
diff --git a/index.mdwn b/index.mdwn
index 6076baf..e337162 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -1,5 +1,3 @@
 * [[blogs]]
 * [[pics]]
 * [[documents]]
-* [bug tracking database](http://www.bontq.com)
-* Gemini is an [agile project management software](http://www.geminiplatform.com/scrum-agile). Gemini is an award-wining [bug tracking](http://www.geminiplatform.com) and issue tracking software. It has been developed by Countersoft.

cleanup
diff --git a/discussion.mdwn b/discussion.mdwn
deleted file mode 100644
index f8e5454..0000000
--- a/discussion.mdwn
+++ /dev/null
@@ -1 +0,0 @@
-Anyone want to twll a story about the Hess family?
\ No newline at end of file
diff --git a/index/discussion.mdwn b/index/discussion.mdwn
deleted file mode 100644
index bd18ecb..0000000
--- a/index/discussion.mdwn
+++ /dev/null
@@ -1 +0,0 @@
-[[WikiLink]]  Celo North Carolina
\ No newline at end of file

initial commit
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..eecda60
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/.ikiwiki

cleanup
diff --git a/blogs.mdwn b/blogs.mdwn
index 2aa2bcb..3da721e 100644
--- a/blogs.mdwn
+++ b/blogs.mdwn
@@ -12,7 +12,6 @@ List of feeds:
 * [[!aggregate expireage=20 name="Anna" feedurl="http://www.livejournal.com/users/wetkneefarm/data/rss" url="http://www.livejournal.com/users/wetkneefarm/"]]
 * [[!aggregate expireage=20 name="Anna and Mark: Waldeneffect" feedurl="http://www.waldeneffect.org/index.rss" url="http://www.waldeneffect.org/"]]
 * [[!aggregate expireage=20 name="Anna and Mark: Clinch Trails" feedurl="http://www.clinchtrails.com/index.rss" url="http://www.clinchtrails.com/"]]
-* [[!aggregate expireage=20 name="Anna: nature feature" feedurl="http://kitenet.net/~anna/nature-feature/index.rss" url="http://kitenet.net/~anna/nature-feature/"]]
 * [[!aggregate expireage=20 name="Joey" feedurl="http://kitenet.net/~joey/blog/index.rss" url="http://kitenet.net/~joey/blog/"]]
 * [[!aggregate expireage=20 name="Jay" feedurl="http://www.livejournal.com/users/jenderqueer/data/rss" url="http://www.livejournal.com/users/jenderqueer/"]]
 * [[!aggregate expireage=20 name="Dani" feedurl="http://www.livejournal.com/users/dani62/data/rss" url="http://www.livejournal.com/users/dani62/"]]