double bubble, boil and trouble

diff --git a/bdale/talks.mdwn b/bdale/talks.mdwn
index 6e587aeeccfa4bf0a4cc625a9fcd1cbd84a3f930..5997fe6d1d6d8d5a0076e2fdc44b698a0f1e4ba0 100644 (file)
--- a/bdale/talks.mdwn
+++ b/bdale/talks.mdwn
@@ -1 +1,22 @@
-[[!map pages="bdale/talks/* and ! bdale/talks/*/*"]]
+## Upcoming Trips
+
+Not all of these include talks, of course, but since I'm not good about keeping
+a list of upcoming talks, this is the best alternative for now:
+
+<div id="tripit-badge"><script type="text/javascript" src="http://www.tripit.com/account/badge/id/1D47109753F837357BDAB298B93E7124/div_id/tripit-badge/badge.js"></script><noscript><a href="http://www.tripit.com/">TripIt - Organize your travel</a></noscript></div>
+
+## Talks I've Given
+
+I've given a fairly large number of talks over the years.  Many happened 
+before it occurred to me that it might be worth parking copies online for 
+later reference... I still have the presentation materials from many of my 
+early talks, and may someday get around to putting some of the old gems 
+online.  I'm also not good about keeping up with adding new things there, 
+if there is a particular talk I've given that you would like to review, feel 
+free to contact me if you don't see the materials here. 
+
+# 2011 
+
+[[!map pages="bdale/talks/2011/* and ! bdale/talks/2011/*/*"]]
+
+# [Older Talks](http://www.gag.com/~bdale/talks/)

diff --git a/bdale/talks/index.mdwn b/bdale/talks/index.mdwn
deleted file mode 100644 (file)
index 28676bc..0000000
--- a/bdale/talks/index.mdwn
+++ /dev/null
@@ -1,12 +0,0 @@
-## talks info
-
-# map
-
-# 2011 
-
-[[!map pages="bdale/talks/2011/* and ! bdale/talks/2011/*/*"]]
-
-# inline
-
-[[!inline pages="./* and !*/Discussion and !*.odp" show="10" rss="no" raw="yes" ]]
-