Recent changes to this wiki:

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/"]]

add Jerry's blog
diff --git a/blogs.mdwn b/blogs.mdwn
index 061f973..2aa2bcb 100644
--- a/blogs.mdwn
+++ b/blogs.mdwn
@@ -21,3 +21,4 @@ List of feeds:
 * [[!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/"]]

diff --git a/index.mdwn b/index.mdwn
index 93a64b9..6076baf 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -2,3 +2,4 @@
 * [[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.

update
diff --git a/blogs.mdwn b/blogs.mdwn
index 4565c21..061f973 100644
--- a/blogs.mdwn
+++ b/blogs.mdwn
@@ -19,4 +19,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/"]]

update
diff --git a/blogs.mdwn b/blogs.mdwn
index 53d24d3..4565c21 100644
--- a/blogs.mdwn
+++ b/blogs.mdwn
@@ -18,6 +18,5 @@ List of feeds:
 * [[!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://observations.branchable.com/index.rss" url="http://observations.branchable.com/"]]
 * [[!aggregate expireage=20 name="Maggie" feedurl="http://livingwithmaggie.branchable.com/index.rss" url="http://livingwithmaggie.branchable.com/"]]
 * [[!aggregate expireage=20 name="Tomoko" feedurl="http://sktk.exblog.jp/atom.xml" url="http://sktk.exblog.jp/"]]

update
diff --git a/blogs.mdwn b/blogs.mdwn
index 5f2c55e..53d24d3 100644
--- a/blogs.mdwn
+++ b/blogs.mdwn
@@ -19,4 +19,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://observations.branchable.com/index.rss" url="http://observations.branchable.com/"]]
+* [[!aggregate expireage=20 name="Maggie" feedurl="http://livingwithmaggie.branchable.com/index.rss" url="http://livingwithmaggie.branchable.com/"]]
 * [[!aggregate expireage=20 name="Tomoko" feedurl="http://sktk.exblog.jp/atom.xml" url="http://sktk.exblog.jp/"]]

new blog for tomoko
diff --git a/blogs.mdwn b/blogs.mdwn
index b52f31d..5f2c55e 100644
--- a/blogs.mdwn
+++ b/blogs.mdwn
@@ -12,12 +12,11 @@ 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="nature feature" feedurl="http://kitenet.net/~anna/nature-feature/index.rss" url="http://kitenet.net/~anna/nature-feature/"]]
+* [[!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/"]]
 * [[!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://observations.branchable.com/index.rss" url="http://observations.branchable.com/"]]
-* [[!aggregate expireage=20 name="Tomoko" feedurl="http://rss.exblog.jp/rss/exblog/sktjrun/index.xml" url="http://sktjrun.exblog.jp/"]]
-* [[!aggregate expireage=20 name="Clinch Trails" feedurl="http://clinchtrails.com/index.rss" url="http://clinchtrails.com/"]]
+* [[!aggregate expireage=20 name="Tomoko" feedurl="http://sktk.exblog.jp/atom.xml" url="http://sktk.exblog.jp/"]]

add clinch trails
diff --git a/blogs.mdwn b/blogs.mdwn
index 847810c..b52f31d 100644
--- a/blogs.mdwn
+++ b/blogs.mdwn
@@ -10,7 +10,8 @@ Recent [[chatter]]:
 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" feedurl="http://www.waldeneffect.org/index.rss" url="http://www.waldeneffect.org/"]]
+* [[!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="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/"]]

diff --git a/index.mdwn b/index.mdwn
index e337162..93a64b9 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -1,3 +1,4 @@
 * [[blogs]]
 * [[pics]]
 * [[documents]]
+* [bug tracking database](http://www.bontq.com)

add clinch trails
diff --git a/blogs.mdwn b/blogs.mdwn
index a9aa89d..847810c 100644
--- a/blogs.mdwn
+++ b/blogs.mdwn
@@ -19,3 +19,4 @@ List of feeds:
 * [[!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://observations.branchable.com/index.rss" url="http://observations.branchable.com/"]]
 * [[!aggregate expireage=20 name="Tomoko" feedurl="http://rss.exblog.jp/rss/exblog/sktjrun/index.xml" url="http://sktjrun.exblog.jp/"]]
+* [[!aggregate expireage=20 name="Clinch Trails" feedurl="http://clinchtrails.com/index.rss" url="http://clinchtrails.com/"]]

new maggie blog
diff --git a/blogs.mdwn b/blogs.mdwn
index 0a72da0..a9aa89d 100644
--- a/blogs.mdwn
+++ b/blogs.mdwn
@@ -17,5 +17,5 @@ List of feeds:
 * [[!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://soothfasting.blogspot.com/feeds/posts/default" * url="http://soothfasting.blogspot.com/"]]
+* [[!aggregate expireage=20 name="Maggie" feedurl="http://observations.branchable.com/index.rss" url="http://observations.branchable.com/"]]
 * [[!aggregate expireage=20 name="Tomoko" feedurl="http://rss.exblog.jp/rss/exblog/sktjrun/index.xml" url="http://sktjrun.exblog.jp/"]]

update
diff --git a/chatter.mdwn b/chatter.mdwn
index 83cdfa7..48d3667 100644
--- a/chatter.mdwn
+++ b/chatter.mdwn
@@ -5,4 +5,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/17661581.atom" url="http://twitter.com/mugword"]]
+* [[!aggregate expirecount=20 name="Maggie (twitter)" feedurl="http://twitter.com/statuses/user_timeline/146665774.rss" url="http://twitter.com/persimmons"]]

boingy boingy boingy
diff --git a/blogs.mdwn b/blogs.mdwn
index 968bae5..0a72da0 100644
--- a/blogs.mdwn
+++ b/blogs.mdwn
@@ -17,5 +17,5 @@ List of feeds:
 * [[!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://themeofmylife.blogspot.com/feeds/posts/default" url="http://themeofmylife.blogspot.com/"]]
+* [[!aggregate expireage=20 name="Maggie" feedurl="http://soothfasting.blogspot.com/feeds/posts/default" * url="http://soothfasting.blogspot.com/"]]
 * [[!aggregate expireage=20 name="Tomoko" feedurl="http://rss.exblog.jp/rss/exblog/sktjrun/index.xml" url="http://sktjrun.exblog.jp/"]]

identica atom feed broken
diff --git a/chatter.mdwn b/chatter.mdwn
index e41d106..83cdfa7 100644
--- a/chatter.mdwn
+++ b/chatter.mdwn
@@ -4,5 +4,5 @@
 
 List of feeds:
 
-* [[!aggregate expirecount=20 name="Joey (identica)" feedurl="http://identi.ca/api/statuses/user_timeline/joeyh.atom" url="http://identi.ca/joeyh"]]
+* [[!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/17661581.atom" url="http://twitter.com/mugword"]]

new blog for maggie
diff --git a/blogs.mdwn b/blogs.mdwn
index ff23eef..968bae5 100644
--- a/blogs.mdwn
+++ b/blogs.mdwn
@@ -17,5 +17,5 @@ List of feeds:
 * [[!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://soulspiritsoul.livejournal.com/data/rss" url="http://soulspiritsoul.livejournal.com/"]]
+* [[!aggregate expireage=20 name="Maggie" feedurl="http://themeofmylife.blogspot.com/feeds/posts/default" url="http://themeofmylife.blogspot.com/"]]
 * [[!aggregate expireage=20 name="Tomoko" feedurl="http://rss.exblog.jp/rss/exblog/sktjrun/index.xml" url="http://sktjrun.exblog.jp/"]]

This reverts commit 2dea91a8374d6cd14f097f68dd1b43430648e669.
diff --git a/blogs.mdwn b/blogs.mdwn
index 1adc8f1..ff23eef 100644
--- a/blogs.mdwn
+++ b/blogs.mdwn
@@ -5,7 +5,6 @@ Recent [[chatter]]:
 
 [[!inline pages="internal(blogs/*) and !*/Discussion" show=50]]
 
-
 ----
 
 List of feeds:
@@ -20,7 +19,3 @@ List of feeds:
 * [[!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://soulspiritsoul.livejournal.com/data/rss" url="http://soulspiritsoul.livejournal.com/"]]
 * [[!aggregate expireage=20 name="Tomoko" feedurl="http://rss.exblog.jp/rss/exblog/sktjrun/index.xml" url="http://sktjrun.exblog.jp/"]]
-
-The people behind the software in Debian. (List of [[feeds]]).
-(List of documented software [[!aggregate name="essays" tag="kde" url="http://uk.bestessays.com/" feedurl="http://aseigo.blogspot.com/atom.xml" expirecount=10]]
-

diff --git a/blogs.mdwn b/blogs.mdwn
index ff23eef..1adc8f1 100644
--- a/blogs.mdwn
+++ b/blogs.mdwn
@@ -5,6 +5,7 @@ Recent [[chatter]]:
 
 [[!inline pages="internal(blogs/*) and !*/Discussion" show=50]]
 
+
 ----
 
 List of feeds:
@@ -19,3 +20,7 @@ List of feeds:
 * [[!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://soulspiritsoul.livejournal.com/data/rss" url="http://soulspiritsoul.livejournal.com/"]]
 * [[!aggregate expireage=20 name="Tomoko" feedurl="http://rss.exblog.jp/rss/exblog/sktjrun/index.xml" url="http://sktjrun.exblog.jp/"]]
+
+The people behind the software in Debian. (List of [[feeds]]).
+(List of documented software [[!aggregate name="essays" tag="kde" url="http://uk.bestessays.com/" feedurl="http://aseigo.blogspot.com/atom.xml" expirecount=10]]
+

add
diff --git a/pics/anna_mark_wedding/imgp2804.jpg b/pics/anna_mark_wedding/imgp2804.jpg
new file mode 100755
index 0000000..1be0ff6
Binary files /dev/null and b/pics/anna_mark_wedding/imgp2804.jpg differ
diff --git a/pics/anna_mark_wedding/imgp2805.jpg b/pics/anna_mark_wedding/imgp2805.jpg
new file mode 100755
index 0000000..291f655
Binary files /dev/null and b/pics/anna_mark_wedding/imgp2805.jpg differ
diff --git a/pics/anna_mark_wedding/imgp2806.jpg b/pics/anna_mark_wedding/imgp2806.jpg
new file mode 100755
index 0000000..b27f826
Binary files /dev/null and b/pics/anna_mark_wedding/imgp2806.jpg differ
diff --git a/pics/anna_mark_wedding/imgp2807.jpg b/pics/anna_mark_wedding/imgp2807.jpg
new file mode 100755
index 0000000..9d7f73c
Binary files /dev/null and b/pics/anna_mark_wedding/imgp2807.jpg differ
diff --git a/pics/anna_mark_wedding/imgp2808.jpg b/pics/anna_mark_wedding/imgp2808.jpg
new file mode 100755
index 0000000..d8bc619
Binary files /dev/null and b/pics/anna_mark_wedding/imgp2808.jpg differ
diff --git a/pics/anna_mark_wedding/imgp2809.jpg b/pics/anna_mark_wedding/imgp2809.jpg
new file mode 100755
index 0000000..0639239
Binary files /dev/null and b/pics/anna_mark_wedding/imgp2809.jpg differ
diff --git a/pics/anna_mark_wedding/imgp2810.jpg b/pics/anna_mark_wedding/imgp2810.jpg
new file mode 100755
index 0000000..b0e2776
Binary files /dev/null and b/pics/anna_mark_wedding/imgp2810.jpg differ
diff --git a/pics/anna_mark_wedding/imgp2811.jpg b/pics/anna_mark_wedding/imgp2811.jpg
new file mode 100755
index 0000000..1137982
Binary files /dev/null and b/pics/anna_mark_wedding/imgp2811.jpg differ
diff --git a/pics/anna_mark_wedding/imgp2812.jpg b/pics/anna_mark_wedding/imgp2812.jpg
new file mode 100755
index 0000000..1ac6c53
Binary files /dev/null and b/pics/anna_mark_wedding/imgp2812.jpg differ
diff --git a/pics/anna_mark_wedding/imgp2813.jpg b/pics/anna_mark_wedding/imgp2813.jpg
new file mode 100755
index 0000000..03dcbe1
Binary files /dev/null and b/pics/anna_mark_wedding/imgp2813.jpg differ
diff --git a/pics/anna_mark_wedding/imgp2814.jpg b/pics/anna_mark_wedding/imgp2814.jpg
new file mode 100755
index 0000000..b77bb24
Binary files /dev/null and b/pics/anna_mark_wedding/imgp2814.jpg differ
diff --git a/pics/anna_mark_wedding/imgp2815.jpg b/pics/anna_mark_wedding/imgp2815.jpg
new file mode 100755
index 0000000..5efae65
Binary files /dev/null and b/pics/anna_mark_wedding/imgp2815.jpg differ
diff --git a/pics/anna_mark_wedding/imgp2816.jpg b/pics/anna_mark_wedding/imgp2816.jpg
new file mode 100755
index 0000000..1b978e2
Binary files /dev/null and b/pics/anna_mark_wedding/imgp2816.jpg differ
diff --git a/pics/anna_mark_wedding/imgp2817.jpg b/pics/anna_mark_wedding/imgp2817.jpg
new file mode 100755
index 0000000..86156f4
Binary files /dev/null and b/pics/anna_mark_wedding/imgp2817.jpg differ
diff --git a/pics/anna_mark_wedding/imgp2818.jpg b/pics/anna_mark_wedding/imgp2818.jpg
new file mode 100755
index 0000000..d8b612b
Binary files /dev/null and b/pics/anna_mark_wedding/imgp2818.jpg differ
diff --git a/pics/anna_mark_wedding/imgp2819.jpg b/pics/anna_mark_wedding/imgp2819.jpg
new file mode 100755
index 0000000..2d0f173
Binary files /dev/null and b/pics/anna_mark_wedding/imgp2819.jpg differ
diff --git a/pics/anna_mark_wedding/imgp2820.jpg b/pics/anna_mark_wedding/imgp2820.jpg
new file mode 100755
index 0000000..0fec97a
Binary files /dev/null and b/pics/anna_mark_wedding/imgp2820.jpg differ
diff --git a/pics/anna_mark_wedding/imgp2821.jpg b/pics/anna_mark_wedding/imgp2821.jpg
new file mode 100755
index 0000000..8f4829e
Binary files /dev/null and b/pics/anna_mark_wedding/imgp2821.jpg differ
diff --git a/pics/anna_mark_wedding/imgp2822.jpg b/pics/anna_mark_wedding/imgp2822.jpg
new file mode 100755
index 0000000..0d84598
Binary files /dev/null and b/pics/anna_mark_wedding/imgp2822.jpg differ
diff --git a/pics/anna_mark_wedding/imgp2823.jpg b/pics/anna_mark_wedding/imgp2823.jpg
new file mode 100755
index 0000000..4136627
Binary files /dev/null and b/pics/anna_mark_wedding/imgp2823.jpg differ
diff --git a/pics/anna_mark_wedding/imgp2824.jpg b/pics/anna_mark_wedding/imgp2824.jpg
new file mode 100755
index 0000000..dd91a3d
Binary files /dev/null and b/pics/anna_mark_wedding/imgp2824.jpg differ
diff --git a/pics/anna_mark_wedding/imgp2825.jpg b/pics/anna_mark_wedding/imgp2825.jpg
new file mode 100755
index 0000000..7ebcde8
Binary files /dev/null and b/pics/anna_mark_wedding/imgp2825.jpg differ
diff --git a/pics/anna_mark_wedding/imgp2826.jpg b/pics/anna_mark_wedding/imgp2826.jpg
new file mode 100755
index 0000000..2faafcc
Binary files /dev/null and b/pics/anna_mark_wedding/imgp2826.jpg differ
diff --git a/pics/anna_mark_wedding/imgp2827.jpg b/pics/anna_mark_wedding/imgp2827.jpg
new file mode 100755
index 0000000..dbcea86
Binary files /dev/null and b/pics/anna_mark_wedding/imgp2827.jpg differ
diff --git a/pics/anna_mark_wedding/imgp2828.jpg b/pics/anna_mark_wedding/imgp2828.jpg
new file mode 100755
index 0000000..88d13e9
Binary files /dev/null and b/pics/anna_mark_wedding/imgp2828.jpg differ
diff --git a/pics/anna_mark_wedding/imgp2829.jpg b/pics/anna_mark_wedding/imgp2829.jpg
new file mode 100755
index 0000000..6d2327e
Binary files /dev/null and b/pics/anna_mark_wedding/imgp2829.jpg differ
diff --git a/pics/anna_mark_wedding/imgp2830.jpg b/pics/anna_mark_wedding/imgp2830.jpg
new file mode 100755
index 0000000..615a1f9
Binary files /dev/null and b/pics/anna_mark_wedding/imgp2830.jpg differ
diff --git a/pics/anna_mark_wedding/imgp2831.jpg b/pics/anna_mark_wedding/imgp2831.jpg
new file mode 100755
index 0000000..462b13f
Binary files /dev/null and b/pics/anna_mark_wedding/imgp2831.jpg differ
diff --git a/pics/anna_mark_wedding/imgp2832.jpg b/pics/anna_mark_wedding/imgp2832.jpg
new file mode 100755
index 0000000..e1421d8
Binary files /dev/null and b/pics/anna_mark_wedding/imgp2832.jpg differ
diff --git a/pics/anna_mark_wedding/imgp2833.jpg b/pics/anna_mark_wedding/imgp2833.jpg
new file mode 100755
index 0000000..e6ab7d4
Binary files /dev/null and b/pics/anna_mark_wedding/imgp2833.jpg differ
diff --git a/pics/anna_mark_wedding/imgp2834.jpg b/pics/anna_mark_wedding/imgp2834.jpg
new file mode 100755
index 0000000..0d7aed8
Binary files /dev/null and b/pics/anna_mark_wedding/imgp2834.jpg differ
diff --git a/pics/anna_mark_wedding/imgp2835.jpg b/pics/anna_mark_wedding/imgp2835.jpg
new file mode 100755
index 0000000..9058cf5
Binary files /dev/null and b/pics/anna_mark_wedding/imgp2835.jpg differ
diff --git a/pics/anna_mark_wedding/imgp2836.jpg b/pics/anna_mark_wedding/imgp2836.jpg
new file mode 100755
index 0000000..f5a82dc
Binary files /dev/null and b/pics/anna_mark_wedding/imgp2836.jpg differ
diff --git a/pics/anna_mark_wedding/imgp2837.jpg b/pics/anna_mark_wedding/imgp2837.jpg
new file mode 100755
index 0000000..a06814c
Binary files /dev/null and b/pics/anna_mark_wedding/imgp2837.jpg differ
diff --git a/pics/anna_mark_wedding/imgp2838.jpg b/pics/anna_mark_wedding/imgp2838.jpg
new file mode 100755
index 0000000..e9924b1
Binary files /dev/null and b/pics/anna_mark_wedding/imgp2838.jpg differ
diff --git a/pics/anna_mark_wedding/imgp2839.jpg b/pics/anna_mark_wedding/imgp2839.jpg
new file mode 100755
index 0000000..6a0a960
Binary files /dev/null and b/pics/anna_mark_wedding/imgp2839.jpg differ
diff --git a/pics/anna_mark_wedding/imgp2840.jpg b/pics/anna_mark_wedding/imgp2840.jpg
new file mode 100755
index 0000000..b16e5b8
Binary files /dev/null and b/pics/anna_mark_wedding/imgp2840.jpg differ
diff --git a/pics/anna_mark_wedding/imgp2841.jpg b/pics/anna_mark_wedding/imgp2841.jpg
new file mode 100755
index 0000000..7ab254e
Binary files /dev/null and b/pics/anna_mark_wedding/imgp2841.jpg differ
diff --git a/pics/anna_mark_wedding/imgp2842.jpg b/pics/anna_mark_wedding/imgp2842.jpg
new file mode 100755
index 0000000..42e5410
Binary files /dev/null and b/pics/anna_mark_wedding/imgp2842.jpg differ
diff --git a/pics/anna_mark_wedding/imgp2843.jpg b/pics/anna_mark_wedding/imgp2843.jpg
new file mode 100755
index 0000000..7f6e8bf
Binary files /dev/null and b/pics/anna_mark_wedding/imgp2843.jpg differ
diff --git a/pics/anna_mark_wedding/imgp2844.jpg b/pics/anna_mark_wedding/imgp2844.jpg
new file mode 100755
index 0000000..32ff010
Binary files /dev/null and b/pics/anna_mark_wedding/imgp2844.jpg differ
diff --git a/pics/anna_mark_wedding/imgp2845.jpg b/pics/anna_mark_wedding/imgp2845.jpg
new file mode 100755
index 0000000..1a2249f
Binary files /dev/null and b/pics/anna_mark_wedding/imgp2845.jpg differ
diff --git a/pics/anna_mark_wedding/imgp2846.jpg b/pics/anna_mark_wedding/imgp2846.jpg
new file mode 100755
index 0000000..f619ccb
Binary files /dev/null and b/pics/anna_mark_wedding/imgp2846.jpg differ
diff --git a/pics/anna_mark_wedding/imgp2847.jpg b/pics/anna_mark_wedding/imgp2847.jpg
new file mode 100755
index 0000000..1a43b02
Binary files /dev/null and b/pics/anna_mark_wedding/imgp2847.jpg differ
diff --git a/pics/anna_mark_wedding/imgp2848.jpg b/pics/anna_mark_wedding/imgp2848.jpg
new file mode 100755
index 0000000..ab04c81
Binary files /dev/null and b/pics/anna_mark_wedding/imgp2848.jpg differ
diff --git a/pics/anna_mark_wedding/imgp2849.jpg b/pics/anna_mark_wedding/imgp2849.jpg
new file mode 100755
index 0000000..ff54ae1
Binary files /dev/null and b/pics/anna_mark_wedding/imgp2849.jpg differ
diff --git a/pics/anna_mark_wedding/imgp2850.jpg b/pics/anna_mark_wedding/imgp2850.jpg
new file mode 100755
index 0000000..0033c09
Binary files /dev/null and b/pics/anna_mark_wedding/imgp2850.jpg differ
diff --git a/pics/anna_mark_wedding/imgp2851.jpg b/pics/anna_mark_wedding/imgp2851.jpg
new file mode 100755
index 0000000..1e8e29a
Binary files /dev/null and b/pics/anna_mark_wedding/imgp2851.jpg differ
diff --git a/pics/anna_mark_wedding/imgp2852.jpg b/pics/anna_mark_wedding/imgp2852.jpg
new file mode 100755
index 0000000..eb3b31a
Binary files /dev/null and b/pics/anna_mark_wedding/imgp2852.jpg differ
diff --git a/pics/anna_mark_wedding/imgp2853.jpg b/pics/anna_mark_wedding/imgp2853.jpg
new file mode 100755
index 0000000..3d73712
Binary files /dev/null and b/pics/anna_mark_wedding/imgp2853.jpg differ

(Diff truncated)
better expiry
diff --git a/blogs.mdwn b/blogs.mdwn
index 8e6bb47..ff23eef 100644
--- a/blogs.mdwn
+++ b/blogs.mdwn
@@ -3,19 +3,19 @@ Recent [[chatter]]:
 [[!inline pages="internal(chatter/*)" template=microblog show=5 feeds=no]]
 """]]
 
-[[!inline pages="internal(blogs/*) and !*/Discussion" show=30]]
+[[!inline pages="internal(blogs/*) and !*/Discussion" show=50]]
 
 ----
 
 List of feeds:
 
-* [[!aggregate expirecount=20 name="Anna" feedurl="http://www.livejournal.com/users/wetkneefarm/data/rss" url="http://www.livejournal.com/users/wetkneefarm/"]]
-* [[!aggregate expirecount=20 name="Anna and Mark" feedurl="http://www.waldeneffect.org/index.rss" url="http://www.waldeneffect.org/"]]
-* [[!aggregate expirecount=20 name="nature feature" feedurl="http://kitenet.net/~anna/nature-feature/index.rss" url="http://kitenet.net/~anna/nature-feature/"]]
-* [[!aggregate expirecount=20 name="Joey" feedurl="http://kitenet.net/~joey/blog/index.rss" url="http://kitenet.net/~joey/blog/"]]
-* [[!aggregate expirecount=20 name="Jay" feedurl="http://www.livejournal.com/users/jenderqueer/data/rss" url="http://www.livejournal.com/users/jenderqueer/"]]
-* [[!aggregate expirecount=20 name="Dani" feedurl="http://www.livejournal.com/users/dani62/data/rss" url="http://www.livejournal.com/users/dani62/"]]
-* [[!aggregate expirecount=20 name="Errol" feedurl="http://www.livejournal.com/users/plumbbobline/data/rss" url="http://www.livejournal.com/users/plumbbobline/"]]
-* [[!aggregate expirecount=20 name="Adrianne" feedurl="http://www.livejournal.com/users/adrianne-hess/data/rss" url="http://www.livejournal.com/users/adrianne-hess/"]]
-* [[!aggregate expirecount=20 name="Maggie" feedurl="http://soulspiritsoul.livejournal.com/data/rss" url="http://soulspiritsoul.livejournal.com/"]]
-* [[!aggregate expirecount=20 name="Tomoko" feedurl="http://rss.exblog.jp/rss/exblog/sktjrun/index.xml" url="http://sktjrun.exblog.jp/"]]
+* [[!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" feedurl="http://www.waldeneffect.org/index.rss" url="http://www.waldeneffect.org/"]]
+* [[!aggregate expireage=20 name="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/"]]
+* [[!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://soulspiritsoul.livejournal.com/data/rss" url="http://soulspiritsoul.livejournal.com/"]]
+* [[!aggregate expireage=20 name="Tomoko" feedurl="http://rss.exblog.jp/rss/exblog/sktjrun/index.xml" url="http://sktjrun.exblog.jp/"]]

Merge branch 'master' of ssh://joey@git.kitenet.net/srv/git/familywiki
Conflicts:
blogs.mdwn
add Tomoko's blog
diff --git a/blogs.mdwn b/blogs.mdwn
index 19ce062..c9baab4 100644
--- a/blogs.mdwn
+++ b/blogs.mdwn
@@ -13,3 +13,4 @@ List of feeds:
 * [[!aggregate expirecount=20 name="Errol" feedurl="http://www.livejournal.com/users/plumbbobline/data/rss" url="http://www.livejournal.com/users/plumbbobline/"]]
 * [[!aggregate expirecount=20 name="Maggie" feedurl="http://www.mugword.blogspot.com/feeds/posts/default" url="http://www.mugword.blogspot.com/"]]
 * [[!aggregate expirecount=20 name="Adrianne" feedurl="http://www.livejournal.com/users/adrianne-hess/data/rss" url="http://www.livejournal.com/users/adrianne-hess/"]]
+* [[!aggregate expirecount=20 name="Tomoko" feedurl="http://rss.exblog.jp/rss/exblog/sktjrun/index.xml" url="http://sktjrun.exblog.jp/"]]

fix
diff --git a/pics/adri/farm.mdwn b/pics/adri/farm.mdwn
index 4c1f013..cd9d5c5 100644
--- a/pics/adri/farm.mdwn
+++ b/pics/adri/farm.mdwn
@@ -12,7 +12,7 @@ Adri + Keeter, Errol + Rick, Tom Payton
 [[!img photo1.jpg caption="
 The Old House at the Store
 Thanksgiving Day, 1973
-by Candy Cutin's father"]]
+by Candy Curin's father"]]
 
 [[!img photo11.jpg caption="
 May 31, 1976

fix
diff --git a/pics/adri/farm.mdwn b/pics/adri/farm.mdwn
index d637b61..4c1f013 100644
--- a/pics/adri/farm.mdwn
+++ b/pics/adri/farm.mdwn
@@ -2,7 +2,7 @@
 
 [[!img defaults size="400x"]]
 
-[[!img photo.jpg caption="""
+[[!img photo5.jpg caption="""
 c. '74 or so
 The Old House at the Store
 Adri + Keeter, Errol + Rick, Tom Payton

update
diff --git a/pics.mdwn b/pics.mdwn
index 8f7ea3c..74c2ab8 100644
--- a/pics.mdwn
+++ b/pics.mdwn
@@ -12,4 +12,9 @@ If you have pics to contribute, mail them to Joey.
 * [[Summer2008]]
 * [[CostaRica]]
 * [[Jack_and_Dorothy_Hess_photo_albumn|1976]] (circa 1976)
+* Adrianne's collection:
+  * [[adri/Panama]]
+  * [[Eckbergs|adri/eckberg]]
+  * [[Farm_and_Store|adri/farm]]
+  * [[80's|adri/80s]]
 * [[misc]] other pictures
diff --git a/pics/adri.mdwn b/pics/adri.mdwn
new file mode 100644
index 0000000..0f4279f
--- /dev/null
+++ b/pics/adri.mdwn
@@ -0,0 +1,6 @@
+These pictures were collected by Adrianne.
+
+* [[Panama]]
+* [[Eckbergs|eckberg]]
+* [[Farm_and_Store|farm]]
+* [[80's|80s]]

add
diff --git a/pics/adri/farm.mdwn b/pics/adri/farm.mdwn
new file mode 100644
index 0000000..d637b61
--- /dev/null
+++ b/pics/adri/farm.mdwn
@@ -0,0 +1,44 @@
+[[!meta title="farm (and store)"]]
+
+[[!img defaults size="400x"]]
+
+[[!img photo.jpg caption="""
+c. '74 or so
+The Old House at the Store
+Adri + Keeter, Errol + Rick, Tom Payton
+"The Stove Room"
+"""]]
+
+[[!img photo1.jpg caption="
+The Old House at the Store
+Thanksgiving Day, 1973
+by Candy Cutin's father"]]
+
+[[!img photo11.jpg caption="
+May 31, 1976
+On Dervey's Hill at Cove Ridge Store
+- by AEE Sr"]]
+
+[[!img photo12.jpg caption="Joey, Anna 1981 - by AEE Sr"]]
+
+[[!img photo13.jpg caption="The Honeymoon Truck"]]
+
+[[!img photo14.jpg caption="summer or fall 1981
+Bob Patey's tipi
+& Joey
+& cinderbrick
+Also Trillium + Keeter"]]
+
+[[!img photo15.jpg caption="1984? Maggie, Joey, Anna"]]
+
+[[!img photo24.jpg caption="AE Clogging with
+Elwood Grizzle
+at the Carter Festival
+Aug 1975"]]
+
+[[!img photo26.jpg caption="At store"]]
+
+[[!img photo27.jpg caption="May 1980 Grandma E, Anna, Joey, Mom & Daddy"]]
+
+[[!img photo39.jpg caption="by AEE Sr"]]
+

resize
diff --git a/pics/adri/eckberg.mdwn b/pics/adri/eckberg.mdwn
index cd144f3..ca1af41 100644
--- a/pics/adri/eckberg.mdwn
+++ b/pics/adri/eckberg.mdwn
@@ -1,6 +1,6 @@
 [[!meta title="Eckbergs etc"]]
 
-[[!img defaults size="300x"]]
+[[!img defaults size="400x"]]
 
 [[!img photo20.jpg caption="1944
 PHT, AE & MGT

update
diff --git a/pics/adri/panama.mdwn b/pics/adri/panama.mdwn
index caf4959..80b2509 100644
--- a/pics/adri/panama.mdwn
+++ b/pics/adri/panama.mdwn
@@ -1,10 +1,8 @@
 [[!meta title="Panama"]]
 
-[[!img defaults size="300x"]]
+[[!img defaults size="400x"]]
 
-[[!img photo19.jpg caption="1922 AEE Sr"]]
-
-[[!img photo2.jpg caption="by AEE Sr
+[[!img photo2.jpg size="500x" caption="by AEE Sr
 of Frances
 1940?"]]
 
@@ -72,3 +70,5 @@ Chagres River. First bananas expected in March.
 Picture taken on Dec 10, 1922 -- by AEE Sr"]]
 
 [[!img photo42.jpg caption="Balboa C.Z. High School -- by Frances?"]]
+
+[[!img photo19.jpg caption="1922 AEE Sr"]]

add
diff --git a/pics/adri/eckberg.mdwn b/pics/adri/eckberg.mdwn
index ea0eb0e..cd144f3 100644
--- a/pics/adri/eckberg.mdwn
+++ b/pics/adri/eckberg.mdwn
@@ -4,8 +4,8 @@
 
 [[!img photo20.jpg caption="1944
 PHT, AE & MGT
-Prince Henry + Mary Greene Tirrill
-on my Grandpa Tirrill's last boat"]]
+Prince Henry + Mary Greene Tirrell
+on my Grandpa Tirrell's last boat"]]
 
 [[!img photo25.jpg caption="1966?
 My Falcon
diff --git a/pics/adri/panama.mdwn b/pics/adri/panama.mdwn
new file mode 100644
index 0000000..caf4959
--- /dev/null
+++ b/pics/adri/panama.mdwn
@@ -0,0 +1,74 @@
+[[!meta title="Panama"]]
+
+[[!img defaults size="300x"]]
+
+[[!img photo19.jpg caption="1922 AEE Sr"]]
+
+[[!img photo2.jpg caption="by AEE Sr
+of Frances
+1940?"]]
+
+[[!img photo21.jpg caption="Balboa to Christobal 1932
+Aunt Sarah - 69
+FTE - 24
++ Polly - 14"]]
+
+[[!img photo22.jpg caption="Balboa to Christobal 1932
+Aunt Sarah,
+Frances,
+Aunt Amey -53
+  or Grandma Tirrell - 55"]]
+
+[[!img photo23.jpg caption="(note this is a postcard)
+AEE at camp in jungle 1922
+"]]
+
+[[!img photo16.jpg caption="Natives, making cayuca on bank of river, 
+10 hours, by river from the Canal Zone
+-- by AEE Sr 1922"]]
+
+[[!img photo28.jpg caption="""
+left photo: Saging(?) car at station, above Alajuela. Car crosses river on
+	cable. Used to gauge stream, -- by AEE Sr
+right photo: another view of cayuca made of Espave (See "Tree Book")
+	-- AEE Sr
+"""]]
+
+[[!img photo3.jpg caption="""Ruth + Frances + "Sugar"?"""]]
+
+[[!img photo35.jpg caption="view of tents from rear of camp.
+Good view of native shack. -- 1922 AEE Sr"]]
+
+[[!img photo30.jpg caption="Another view of Camp (in Jungle of Panama) --
+by AEE Sr 1922"]]
+
+[[!img photo31.jpg caption="by AEE Sr 1922"]]
+[[!img photo31back.jpg caption="back of above photo"]]
+
+[[!img photo32.jpg caption="by AEE Sr 1922"]]
+[[!img photo32back.jpg caption="back of above photo"]]
+
+[[!img photo33.jpg caption="by AEE Sr 1922"]]
+[[!img photo33back.jpg caption="back of above photo"]]
+
+[[!img photo36.jpg caption="
+Building where I live.
+Is half way up Ancon
+Hill, about 275 feet
+above sea. 1922
+  -- Photo by AEE Sr"]]
+
+[[!img photo37.jpg caption="Where Frances worked (postcard)"]]
+
+[[!img photo38.jpg caption="(postcard)"]]
+
+[[!img photo4.jpg caption="on San Juan"]]
+
+[[!img photo40.jpg caption="By Frances?"]]
+
+[[!img photo41.jpg caption="young banana plants on
+Mr Marti's plantation up
+Chagres River. First bananas expected in March.
+Picture taken on Dec 10, 1922 -- by AEE Sr"]]
+
+[[!img photo42.jpg caption="Balboa C.Z. High School -- by Frances?"]]

rotate
diff --git a/pics/adri/panama/photo33back.jpg b/pics/adri/panama/photo33back.jpg
index 836b275..dba4369 100644
Binary files a/pics/adri/panama/photo33back.jpg and b/pics/adri/panama/photo33back.jpg differ

fix
diff --git a/pics/adri/eckberg.mdwn b/pics/adri/eckberg.mdwn
index 171320c..ea0eb0e 100644
--- a/pics/adri/eckberg.mdwn
+++ b/pics/adri/eckberg.mdwn
@@ -2,12 +2,12 @@
 
 [[!img defaults size="300x"]]
 
-[[!img photo25.jpg caption="1944
+[[!img photo20.jpg caption="1944
 PHT, AE & MGT
 Prince Henry + Mary Greene Tirrill
 on my Grandpa Tirrill's last boat"]]
 
-[[!img photo17.jpg caption="1966?
+[[!img photo25.jpg caption="1966?
 My Falcon
 S. Weymouth
 Back to New Bedford"]]

update
diff --git a/pics/adri/80s.mdwn b/pics/adri/80s.mdwn
new file mode 100644
index 0000000..c895213
--- /dev/null
+++ b/pics/adri/80s.mdwn
@@ -0,0 +1,9 @@
+[[!meta title="misc pics from the 80's"]]
+
+[[!img defaults size="300x"]]
+
+[[!img photo17.jpg caption="Joey, Maggie, Anna at Hatteras lighthouse (1988)"]]
+
+[[!img photo18.jpg caption="Joey, Anna on Ocracoke ferry (1988)"]]
+
+[[!img photo29.jpg caption="Errol, Joey at Easter Seals Fundraiser"]]
diff --git a/pics/adri/80s/photo17.jpg b/pics/adri/80s/photo17.jpg
new file mode 100644
index 0000000..996ef09
Binary files /dev/null and b/pics/adri/80s/photo17.jpg differ
diff --git a/pics/adri/80s/photo18.jpg b/pics/adri/80s/photo18.jpg
new file mode 100644
index 0000000..b99298d
Binary files /dev/null and b/pics/adri/80s/photo18.jpg differ
diff --git a/pics/adri/80s/photo29.jpg b/pics/adri/80s/photo29.jpg
new file mode 100644
index 0000000..b250e06
Binary files /dev/null and b/pics/adri/80s/photo29.jpg differ
diff --git a/pics/adri/eckberg.mdwn b/pics/adri/eckberg.mdwn
new file mode 100644
index 0000000..171320c
--- /dev/null
+++ b/pics/adri/eckberg.mdwn
@@ -0,0 +1,32 @@
+[[!meta title="Eckbergs etc"]]
+
+[[!img defaults size="300x"]]
+
+[[!img photo25.jpg caption="1944
+PHT, AE & MGT
+Prince Henry + Mary Greene Tirrill
+on my Grandpa Tirrill's last boat"]]
+
+[[!img photo17.jpg caption="1966?
+My Falcon
+S. Weymouth
+Back to New Bedford"]]
+
+[[!img photo34.jpg caption="postcard front"]]
+[[!img photo34back.jpg caption="postcard back"]]
+
+[[!img photo6.jpg caption="1922
+AEE Sr"]]
+
+[[!img photo7.jpg caption="1918
+Ruth - 11
+PHT - 42
+Frances - 10"]]
+
+[[!img photo8.jpg caption="Joan, Ellen, Frances + Adrianne
+Long Beach or Coney Island"]]
+
+[[!img photo9.jpg caption="1944?
+AEE, Sr
+Joan (18) + Franny (9)
+New Hyde Park?"]]
diff --git a/pics/adri/eckberg/photo20.jpg b/pics/adri/eckberg/photo20.jpg
new file mode 100644
index 0000000..77ae721
Binary files /dev/null and b/pics/adri/eckberg/photo20.jpg differ
diff --git a/pics/adri/eckberg/photo25.jpg b/pics/adri/eckberg/photo25.jpg
new file mode 100644
index 0000000..e6d102c
Binary files /dev/null and b/pics/adri/eckberg/photo25.jpg differ
diff --git a/pics/adri/eckberg/photo34.jpg b/pics/adri/eckberg/photo34.jpg
new file mode 100644
index 0000000..6e1228e
Binary files /dev/null and b/pics/adri/eckberg/photo34.jpg differ
diff --git a/pics/adri/eckberg/photo34back.jpg b/pics/adri/eckberg/photo34back.jpg
new file mode 100644
index 0000000..f60c8f2
Binary files /dev/null and b/pics/adri/eckberg/photo34back.jpg differ
diff --git a/pics/adri/eckberg/photo6.jpg b/pics/adri/eckberg/photo6.jpg
new file mode 100644
index 0000000..04d3c67
Binary files /dev/null and b/pics/adri/eckberg/photo6.jpg differ
diff --git a/pics/adri/eckberg/photo7.jpg b/pics/adri/eckberg/photo7.jpg
new file mode 100644
index 0000000..12ee4a1
Binary files /dev/null and b/pics/adri/eckberg/photo7.jpg differ
diff --git a/pics/adri/eckberg/photo8.jpg b/pics/adri/eckberg/photo8.jpg
new file mode 100644
index 0000000..856f005
Binary files /dev/null and b/pics/adri/eckberg/photo8.jpg differ
diff --git a/pics/adri/eckberg/photo9.jpg b/pics/adri/eckberg/photo9.jpg
new file mode 100644
index 0000000..d13b5cc
Binary files /dev/null and b/pics/adri/eckberg/photo9.jpg differ
diff --git a/pics/adri/family/80s.mdwn b/pics/adri/family/80s.mdwn
deleted file mode 100644
index c895213..0000000
--- a/pics/adri/family/80s.mdwn
+++ /dev/null
@@ -1,9 +0,0 @@
-[[!meta title="misc pics from the 80's"]]
-
-[[!img defaults size="300x"]]
-
-[[!img photo17.jpg caption="Joey, Maggie, Anna at Hatteras lighthouse (1988)"]]
-
-[[!img photo18.jpg caption="Joey, Anna on Ocracoke ferry (1988)"]]
-
-[[!img photo29.jpg caption="Errol, Joey at Easter Seals Fundraiser"]]
diff --git a/pics/adri/family/80s/photo17.jpg b/pics/adri/family/80s/photo17.jpg
deleted file mode 100644
index 996ef09..0000000
Binary files a/pics/adri/family/80s/photo17.jpg and /dev/null differ
diff --git a/pics/adri/family/80s/photo18.jpg b/pics/adri/family/80s/photo18.jpg
deleted file mode 100644
index b99298d..0000000
Binary files a/pics/adri/family/80s/photo18.jpg and /dev/null differ
diff --git a/pics/adri/family/80s/photo29.jpg b/pics/adri/family/80s/photo29.jpg
deleted file mode 100644
index b250e06..0000000
Binary files a/pics/adri/family/80s/photo29.jpg and /dev/null differ
diff --git a/pics/adri/family/photo20.jpg b/pics/adri/family/photo20.jpg
deleted file mode 100644
index 77ae721..0000000
Binary files a/pics/adri/family/photo20.jpg and /dev/null differ
diff --git a/pics/adri/family/photo25.jpg b/pics/adri/family/photo25.jpg
deleted file mode 100644
index e6d102c..0000000
Binary files a/pics/adri/family/photo25.jpg and /dev/null differ
diff --git a/pics/adri/family/photo26.jpg b/pics/adri/family/photo26.jpg
deleted file mode 100644
index 0df1440..0000000
Binary files a/pics/adri/family/photo26.jpg and /dev/null differ
diff --git a/pics/adri/family/photo34.jpg b/pics/adri/family/photo34.jpg
deleted file mode 100644
index 6e1228e..0000000
Binary files a/pics/adri/family/photo34.jpg and /dev/null differ
diff --git a/pics/adri/family/photo34back.jpg b/pics/adri/family/photo34back.jpg
deleted file mode 100644
index f60c8f2..0000000
Binary files a/pics/adri/family/photo34back.jpg and /dev/null differ
diff --git a/pics/adri/family/photo6.jpg b/pics/adri/family/photo6.jpg
deleted file mode 100644
index 04d3c67..0000000
Binary files a/pics/adri/family/photo6.jpg and /dev/null differ
diff --git a/pics/adri/family/photo7.jpg b/pics/adri/family/photo7.jpg
deleted file mode 100644
index 12ee4a1..0000000
Binary files a/pics/adri/family/photo7.jpg and /dev/null differ
diff --git a/pics/adri/family/photo8.jpg b/pics/adri/family/photo8.jpg
deleted file mode 100644
index 856f005..0000000
Binary files a/pics/adri/family/photo8.jpg and /dev/null differ
diff --git a/pics/adri/family/photo9.jpg b/pics/adri/family/photo9.jpg
deleted file mode 100644
index d13b5cc..0000000
Binary files a/pics/adri/family/photo9.jpg and /dev/null differ
diff --git a/pics/adri/farm/photo26.jpg b/pics/adri/farm/photo26.jpg
new file mode 100644
index 0000000..0df1440
Binary files /dev/null and b/pics/adri/farm/photo26.jpg differ

fix
diff --git a/pics/adri/family/80s.mdwn b/pics/adri/family/80s.mdwn
index 4aa7b8d..c895213 100644
--- a/pics/adri/family/80s.mdwn
+++ b/pics/adri/family/80s.mdwn
@@ -2,7 +2,7 @@
 
 [[!img defaults size="300x"]]
 
-[[!img photo17.jpg caption="Joey, Maggie, Anna at hatterass lighthouse (1988)"]]
+[[!img photo17.jpg caption="Joey, Maggie, Anna at Hatteras lighthouse (1988)"]]
 
 [[!img photo18.jpg caption="Joey, Anna on Ocracoke ferry (1988)"]]
 

fix
diff --git a/pics/adri/family/80s.mdwn b/pics/adri/family/80s.mdwn
index 1085478..4aa7b8d 100644
--- a/pics/adri/family/80s.mdwn
+++ b/pics/adri/family/80s.mdwn
@@ -2,7 +2,7 @@
 
 [[!img defaults size="300x"]]
 
-[[!img photo17.jpg caption=""Joey, Maggie, Anna at hatterass lighthouse (1988)]]
+[[!img photo17.jpg caption="Joey, Maggie, Anna at hatterass lighthouse (1988)"]]
 
 [[!img photo18.jpg caption="Joey, Anna on Ocracoke ferry (1988)"]]
 

fix
diff --git a/pics/adri/family/80s.mdwn b/pics/adri/family/80s.mdwn
index bc1541f..1085478 100644
--- a/pics/adri/family/80s.mdwn
+++ b/pics/adri/family/80s.mdwn
@@ -1,6 +1,6 @@
 [[!meta title="misc pics from the 80's"]]
 
-[[!img defaults size=""]]
+[[!img defaults size="300x"]]
 
 [[!img photo17.jpg caption=""Joey, Maggie, Anna at hatterass lighthouse (1988)]]
 

update
diff --git a/pics/adri/family/80s.mdwn b/pics/adri/family/80s.mdwn
new file mode 100644
index 0000000..bc1541f
--- /dev/null
+++ b/pics/adri/family/80s.mdwn
@@ -0,0 +1,9 @@
+[[!meta title="misc pics from the 80's"]]
+
+[[!img defaults size=""]]
+
+[[!img photo17.jpg caption=""Joey, Maggie, Anna at hatterass lighthouse (1988)]]
+
+[[!img photo18.jpg caption="Joey, Anna on Ocracoke ferry (1988)"]]
+
+[[!img photo29.jpg caption="Errol, Joey at Easter Seals Fundraiser"]]
diff --git a/pics/adri/family/index.mdwn b/pics/adri/family/index.mdwn
deleted file mode 100644
index 4fa726c..0000000
--- a/pics/adri/family/index.mdwn
+++ /dev/null
@@ -1,9 +0,0 @@
-[[!meta title="misc pics from the 80's"]]
-
-[[!img defaults size=""]]
-
-[[!img photo17.jpg caption=""Joey, Maggie, Anna at hatterass lighthouse]]
-
-[[!img photo18.jpg caption="Joey, Anna on Ocracoke ferry"]]
-
-[[!img photo29.jpg caption="Errol, Joey at EasterSeals telethon"]]

80s
diff --git a/pics/adri/family/80s/photo17.jpg b/pics/adri/family/80s/photo17.jpg
new file mode 100644
index 0000000..996ef09
Binary files /dev/null and b/pics/adri/family/80s/photo17.jpg differ
diff --git a/pics/adri/family/80s/photo18.jpg b/pics/adri/family/80s/photo18.jpg
new file mode 100644
index 0000000..b99298d
Binary files /dev/null and b/pics/adri/family/80s/photo18.jpg differ
diff --git a/pics/adri/family/80s/photo29.jpg b/pics/adri/family/80s/photo29.jpg
new file mode 100644
index 0000000..b250e06
Binary files /dev/null and b/pics/adri/family/80s/photo29.jpg differ
diff --git a/pics/adri/family/index.mdwn b/pics/adri/family/index.mdwn
new file mode 100644
index 0000000..4fa726c
--- /dev/null
+++ b/pics/adri/family/index.mdwn
@@ -0,0 +1,9 @@
+[[!meta title="misc pics from the 80's"]]
+
+[[!img defaults size=""]]
+
+[[!img photo17.jpg caption=""Joey, Maggie, Anna at hatterass lighthouse]]
+
+[[!img photo18.jpg caption="Joey, Anna on Ocracoke ferry"]]
+
+[[!img photo29.jpg caption="Errol, Joey at EasterSeals telethon"]]
diff --git a/pics/adri/family/photo17.jpg b/pics/adri/family/photo17.jpg
deleted file mode 100644
index 996ef09..0000000
Binary files a/pics/adri/family/photo17.jpg and /dev/null differ
diff --git a/pics/adri/family/photo18.jpg b/pics/adri/family/photo18.jpg
deleted file mode 100644
index b99298d..0000000
Binary files a/pics/adri/family/photo18.jpg and /dev/null differ
diff --git a/pics/adri/family/photo29.jpg b/pics/adri/family/photo29.jpg
deleted file mode 100644
index b250e06..0000000
Binary files a/pics/adri/family/photo29.jpg and /dev/null differ

move
diff --git a/pics/adri/family/photo1.jpg b/pics/adri/family/photo1.jpg
deleted file mode 100644
index 5285b9c..0000000
Binary files a/pics/adri/family/photo1.jpg and /dev/null differ
diff --git a/pics/adri/farm/photo1.jpg b/pics/adri/farm/photo1.jpg
new file mode 100644
index 0000000..5285b9c
Binary files /dev/null and b/pics/adri/farm/photo1.jpg differ

maggie's new (new new) blog
diff --git a/blogs.mdwn b/blogs.mdwn
index cd627eb..98b4771 100644
--- a/blogs.mdwn
+++ b/blogs.mdwn
@@ -17,3 +17,4 @@ List of feeds:
 * [[!aggregate expirecount=20 name="Dani" feedurl="http://www.livejournal.com/users/dani62/data/rss" url="http://www.livejournal.com/users/dani62/"]]
 * [[!aggregate expirecount=20 name="Errol" feedurl="http://www.livejournal.com/users/plumbbobline/data/rss" url="http://www.livejournal.com/users/plumbbobline/"]]
 * [[!aggregate expirecount=20 name="Adrianne" feedurl="http://www.livejournal.com/users/adrianne-hess/data/rss" url="http://www.livejournal.com/users/adrianne-hess/"]]
+* [[!aggregate expirecount=20 name="Maggie" feedurl="http://soulspiritsoul.livejournal.com/data/rss" url="http://soulspiritsoul.livejournal.com/"]]

add scans of photos from mom
These include pics from Panama and the farm years and some Eckberg family pics
Will be adding index pages and captions later.
diff --git a/pics/adri/family/photo1.jpg b/pics/adri/family/photo1.jpg
new file mode 100644
index 0000000..5285b9c
Binary files /dev/null and b/pics/adri/family/photo1.jpg differ
diff --git a/pics/adri/family/photo17.jpg b/pics/adri/family/photo17.jpg
new file mode 100644
index 0000000..996ef09
Binary files /dev/null and b/pics/adri/family/photo17.jpg differ
diff --git a/pics/adri/family/photo18.jpg b/pics/adri/family/photo18.jpg
new file mode 100644
index 0000000..b99298d
Binary files /dev/null and b/pics/adri/family/photo18.jpg differ
diff --git a/pics/adri/family/photo20.jpg b/pics/adri/family/photo20.jpg
new file mode 100644
index 0000000..77ae721
Binary files /dev/null and b/pics/adri/family/photo20.jpg differ
diff --git a/pics/adri/family/photo25.jpg b/pics/adri/family/photo25.jpg
new file mode 100644
index 0000000..e6d102c
Binary files /dev/null and b/pics/adri/family/photo25.jpg differ
diff --git a/pics/adri/family/photo26.jpg b/pics/adri/family/photo26.jpg
new file mode 100644
index 0000000..0df1440
Binary files /dev/null and b/pics/adri/family/photo26.jpg differ
diff --git a/pics/adri/family/photo29.jpg b/pics/adri/family/photo29.jpg
new file mode 100644
index 0000000..b250e06
Binary files /dev/null and b/pics/adri/family/photo29.jpg differ
diff --git a/pics/adri/family/photo34.jpg b/pics/adri/family/photo34.jpg
new file mode 100644
index 0000000..6e1228e
Binary files /dev/null and b/pics/adri/family/photo34.jpg differ
diff --git a/pics/adri/family/photo34back.jpg b/pics/adri/family/photo34back.jpg
new file mode 100644
index 0000000..f60c8f2
Binary files /dev/null and b/pics/adri/family/photo34back.jpg differ
diff --git a/pics/adri/family/photo6.jpg b/pics/adri/family/photo6.jpg
new file mode 100644
index 0000000..04d3c67
Binary files /dev/null and b/pics/adri/family/photo6.jpg differ
diff --git a/pics/adri/family/photo7.jpg b/pics/adri/family/photo7.jpg
new file mode 100644
index 0000000..12ee4a1
Binary files /dev/null and b/pics/adri/family/photo7.jpg differ
diff --git a/pics/adri/family/photo8.jpg b/pics/adri/family/photo8.jpg
new file mode 100644
index 0000000..856f005
Binary files /dev/null and b/pics/adri/family/photo8.jpg differ
diff --git a/pics/adri/family/photo9.jpg b/pics/adri/family/photo9.jpg
new file mode 100644
index 0000000..d13b5cc
Binary files /dev/null and b/pics/adri/family/photo9.jpg differ
diff --git a/pics/adri/farm/photo11.jpg b/pics/adri/farm/photo11.jpg
new file mode 100644
index 0000000..08171cb
Binary files /dev/null and b/pics/adri/farm/photo11.jpg differ
diff --git a/pics/adri/farm/photo12.jpg b/pics/adri/farm/photo12.jpg
new file mode 100644
index 0000000..30f6429
Binary files /dev/null and b/pics/adri/farm/photo12.jpg differ
diff --git a/pics/adri/farm/photo13.jpg b/pics/adri/farm/photo13.jpg
new file mode 100644
index 0000000..37bf74b
Binary files /dev/null and b/pics/adri/farm/photo13.jpg differ
diff --git a/pics/adri/farm/photo14.jpg b/pics/adri/farm/photo14.jpg
new file mode 100644
index 0000000..45425a7
Binary files /dev/null and b/pics/adri/farm/photo14.jpg differ
diff --git a/pics/adri/farm/photo15.jpg b/pics/adri/farm/photo15.jpg
new file mode 100644
index 0000000..6105de9
Binary files /dev/null and b/pics/adri/farm/photo15.jpg differ
diff --git a/pics/adri/farm/photo24.jpg b/pics/adri/farm/photo24.jpg
new file mode 100644
index 0000000..12d6672
Binary files /dev/null and b/pics/adri/farm/photo24.jpg differ
diff --git a/pics/adri/farm/photo27.jpg b/pics/adri/farm/photo27.jpg
new file mode 100644
index 0000000..b790473
Binary files /dev/null and b/pics/adri/farm/photo27.jpg differ
diff --git a/pics/adri/farm/photo39.jpg b/pics/adri/farm/photo39.jpg
new file mode 100644
index 0000000..b24f3a5
Binary files /dev/null and b/pics/adri/farm/photo39.jpg differ
diff --git a/pics/adri/farm/photo5.jpg b/pics/adri/farm/photo5.jpg
new file mode 100644
index 0000000..3e602bd
Binary files /dev/null and b/pics/adri/farm/photo5.jpg differ
diff --git a/pics/adri/panama/photo16.jpg b/pics/adri/panama/photo16.jpg
new file mode 100644
index 0000000..0eb54cb
Binary files /dev/null and b/pics/adri/panama/photo16.jpg differ
diff --git a/pics/adri/panama/photo19.jpg b/pics/adri/panama/photo19.jpg
new file mode 100644
index 0000000..039a5e9
Binary files /dev/null and b/pics/adri/panama/photo19.jpg differ
diff --git a/pics/adri/panama/photo2.jpg b/pics/adri/panama/photo2.jpg
new file mode 100644
index 0000000..7b32918
Binary files /dev/null and b/pics/adri/panama/photo2.jpg differ
diff --git a/pics/adri/panama/photo21.jpg b/pics/adri/panama/photo21.jpg
new file mode 100644
index 0000000..6f8613f
Binary files /dev/null and b/pics/adri/panama/photo21.jpg differ
diff --git a/pics/adri/panama/photo22.jpg b/pics/adri/panama/photo22.jpg
new file mode 100644
index 0000000..901f3ff
Binary files /dev/null and b/pics/adri/panama/photo22.jpg differ
diff --git a/pics/adri/panama/photo23.jpg b/pics/adri/panama/photo23.jpg
new file mode 100644
index 0000000..d7857c5
Binary files /dev/null and b/pics/adri/panama/photo23.jpg differ
diff --git a/pics/adri/panama/photo28.jpg b/pics/adri/panama/photo28.jpg
new file mode 100644
index 0000000..2626881
Binary files /dev/null and b/pics/adri/panama/photo28.jpg differ
diff --git a/pics/adri/panama/photo3.jpg b/pics/adri/panama/photo3.jpg
new file mode 100644
index 0000000..cdd53d9
Binary files /dev/null and b/pics/adri/panama/photo3.jpg differ
diff --git a/pics/adri/panama/photo30.jpg b/pics/adri/panama/photo30.jpg
new file mode 100644
index 0000000..872a48c
Binary files /dev/null and b/pics/adri/panama/photo30.jpg differ
diff --git a/pics/adri/panama/photo31.jpg b/pics/adri/panama/photo31.jpg
new file mode 100644
index 0000000..eda2444
Binary files /dev/null and b/pics/adri/panama/photo31.jpg differ
diff --git a/pics/adri/panama/photo31back.jpg b/pics/adri/panama/photo31back.jpg
new file mode 100644
index 0000000..1514b8b
Binary files /dev/null and b/pics/adri/panama/photo31back.jpg differ
diff --git a/pics/adri/panama/photo32.jpg b/pics/adri/panama/photo32.jpg
new file mode 100644
index 0000000..a82bebe
Binary files /dev/null and b/pics/adri/panama/photo32.jpg differ
diff --git a/pics/adri/panama/photo32back.jpg b/pics/adri/panama/photo32back.jpg
new file mode 100644
index 0000000..d168b5d
Binary files /dev/null and b/pics/adri/panama/photo32back.jpg differ
diff --git a/pics/adri/panama/photo33.jpg b/pics/adri/panama/photo33.jpg
new file mode 100644
index 0000000..17c9514
Binary files /dev/null and b/pics/adri/panama/photo33.jpg differ
diff --git a/pics/adri/panama/photo33back.jpg b/pics/adri/panama/photo33back.jpg
new file mode 100644
index 0000000..836b275
Binary files /dev/null and b/pics/adri/panama/photo33back.jpg differ
diff --git a/pics/adri/panama/photo35.jpg b/pics/adri/panama/photo35.jpg
new file mode 100644
index 0000000..3c09ee9
Binary files /dev/null and b/pics/adri/panama/photo35.jpg differ
diff --git a/pics/adri/panama/photo36.jpg b/pics/adri/panama/photo36.jpg
new file mode 100644
index 0000000..72cf34f
Binary files /dev/null and b/pics/adri/panama/photo36.jpg differ
diff --git a/pics/adri/panama/photo37.jpg b/pics/adri/panama/photo37.jpg
new file mode 100644
index 0000000..0d9390f
Binary files /dev/null and b/pics/adri/panama/photo37.jpg differ
diff --git a/pics/adri/panama/photo38.jpg b/pics/adri/panama/photo38.jpg
new file mode 100644
index 0000000..fa6a7e6
Binary files /dev/null and b/pics/adri/panama/photo38.jpg differ
diff --git a/pics/adri/panama/photo4.jpg b/pics/adri/panama/photo4.jpg
new file mode 100644
index 0000000..aded951
Binary files /dev/null and b/pics/adri/panama/photo4.jpg differ
diff --git a/pics/adri/panama/photo40.jpg b/pics/adri/panama/photo40.jpg
new file mode 100644
index 0000000..6cb0e02
Binary files /dev/null and b/pics/adri/panama/photo40.jpg differ
diff --git a/pics/adri/panama/photo41.jpg b/pics/adri/panama/photo41.jpg
new file mode 100644
index 0000000..381bb2a
Binary files /dev/null and b/pics/adri/panama/photo41.jpg differ
diff --git a/pics/adri/panama/photo42.jpg b/pics/adri/panama/photo42.jpg
new file mode 100644
index 0000000..b8e060d
Binary files /dev/null and b/pics/adri/panama/photo42.jpg differ

remove maggie's blog at her request
diff --git a/blogs.mdwn b/blogs.mdwn
index ecb04c4..cd627eb 100644
--- a/blogs.mdwn
+++ b/blogs.mdwn
@@ -16,5 +16,4 @@ List of feeds:
 * [[!aggregate expirecount=20 name="Jay" feedurl="http://www.livejournal.com/users/jenderqueer/data/rss" url="http://www.livejournal.com/users/jenderqueer/"]]
 * [[!aggregate expirecount=20 name="Dani" feedurl="http://www.livejournal.com/users/dani62/data/rss" url="http://www.livejournal.com/users/dani62/"]]
 * [[!aggregate expirecount=20 name="Errol" feedurl="http://www.livejournal.com/users/plumbbobline/data/rss" url="http://www.livejournal.com/users/plumbbobline/"]]
-* [[!aggregate expirecount=20 name="Maggie" feedurl="http://www.mugword.blogspot.com/feeds/posts/default" url="http://www.mugword.blogspot.com/"]]
 * [[!aggregate expirecount=20 name="Adrianne" feedurl="http://www.livejournal.com/users/adrianne-hess/data/rss" url="http://www.livejournal.com/users/adrianne-hess/"]]

use new template
diff --git a/blogs.mdwn b/blogs.mdwn
index e4f44d8..ecb04c4 100644
--- a/blogs.mdwn
+++ b/blogs.mdwn
@@ -1,6 +1,6 @@
 [[!template id=note text="""
 Recent [[chatter]]:
-[[!inline pages="internal(chatter/*)" archive=yes show=5 feeds=no]]
+[[!inline pages="internal(chatter/*)" template=microblog show=5 feeds=no]]
 """]]
 
 [[!inline pages="internal(blogs/*) and !*/Discussion" show=30]]
diff --git a/chatter.mdwn b/chatter.mdwn
index aacf45d..e41d106 100644
--- a/chatter.mdwn
+++ b/chatter.mdwn
@@ -1,4 +1,4 @@
-[[!inline pages="internal(chatter/*) and !*/Discussion" archive=yes show=30]]
+[[!inline pages="internal(chatter/*) and !*/Discussion" template=microblog show=30]]
 
 ----
 

fix
diff --git a/chatter.mdwn b/chatter.mdwn
index 984e6f0..aacf45d 100644
--- a/chatter.mdwn
+++ b/chatter.mdwn
@@ -4,5 +4,5 @@
 
 List of feeds:
 
-* [[!aggregate expirecount=20 name="Joey" feedurl="http://identi.ca/api/statuses/user_timeline/joeyh.atom" url="http://identi.ca/joeyh"]]
-* [[!aggregate expirecount=20 name="Maggie" feedurl="http://twitter.com/statuses/user_timeline/17661581.atom" url="http://twitter.com/mugword"]]
+* [[!aggregate expirecount=20 name="Joey (identica)" feedurl="http://identi.ca/api/statuses/user_timeline/joeyh.atom" url="http://identi.ca/joeyh"]]
+* [[!aggregate expirecount=20 name="Maggie (twitter)" feedurl="http://twitter.com/statuses/user_timeline/17661581.atom" url="http://twitter.com/mugword"]]

less chatter
diff --git a/blogs.mdwn b/blogs.mdwn
index fdddeeb..e4f44d8 100644
--- a/blogs.mdwn
+++ b/blogs.mdwn
@@ -1,6 +1,6 @@
 [[!template id=note text="""
 Recent [[chatter]]:
-[[!inline pages="internal(chatter/*)" archive=yes show=10 feeds=no]]
+[[!inline pages="internal(chatter/*)" archive=yes show=5 feeds=no]]
 """]]
 
 [[!inline pages="internal(blogs/*) and !*/Discussion" show=30]]

force build
diff --git a/blogs.mdwn b/blogs.mdwn
index cfd7060..fdddeeb 100644
--- a/blogs.mdwn
+++ b/blogs.mdwn
@@ -1,7 +1,7 @@
 [[!template id=note text="""
 Recent [[chatter]]:
 [[!inline pages="internal(chatter/*)" archive=yes show=10 feeds=no]]
-"""]] 
+"""]]
 
 [[!inline pages="internal(blogs/*) and !*/Discussion" show=30]]
 

force build
diff --git a/blogs.mdwn b/blogs.mdwn
index fdddeeb..cfd7060 100644
--- a/blogs.mdwn
+++ b/blogs.mdwn
@@ -1,7 +1,7 @@
 [[!template id=note text="""
 Recent [[chatter]]:
 [[!inline pages="internal(chatter/*)" archive=yes show=10 feeds=no]]
-"""]]
+"""]] 
 
 [[!inline pages="internal(blogs/*) and !*/Discussion" show=30]]