Merge branch 'master' of ssh://git.ikiwiki.info

diff --git a/doc/todo/fancypodcast.mdwn b/doc/todo/fancypodcast.mdwn
index 8ce3dd3e7cace45eb7dc8573099c4dddd22ac67b..ea3bebd94dd9f6245fe19c703f1c60887af9f229 100644 (file)
--- a/doc/todo/fancypodcast.mdwn
+++ b/doc/todo/fancypodcast.mdwn
@@ -5,6 +5,38 @@ also have lots more metadata.
 
 [[!toc]]
 
+## Status
+
+[[!template id=gitbranch branch=schmonz/fancypodcast author="[[schmonz]]"]]
+[[!tag patch]]
+
+In summary, the branch preserves ikiwiki's existing podcast behavior,
+adds more featureful behavior, and has been tested to work well in
+some common podcatchers. I believe it is ready for review and
+possible integration, and I'd like to get feedback to that effect
+(or to the contrary) before making further enhancements. I know
+[[joey]]'s the final arbiter here, but I'd appreciate any qualified,
+critical eyes ([[smcv]]?) raking over my diffs. --[[schmonz]]
+
+## Features
+
+[[!table data="""
+Feature            |iTunes RSS|iTunes Atom|Downcast RSS|Downcast Atom
+Feed image         |{X}       |{X}        |{X}         |{X}
+Feed title         |(./)      |(./)       |(./)        |(./)
+Feed publisher     |{X}       |{X}        |{X}         |{X}
+Feed "category"    |{X}       |{X}        |{X}         |{X}
+Feed date          |(./)      |(./)       |(./)        |(./)
+Feed description   |(./)      |(./)       |(./)        |{X}
+Episode image      |{X}       |{X}        |{X}         |{X}
+Episode title      |(./)      |(./)       |(./)        |(./)
+Episode date       |(./)      |(./)       |(./)        |(./)
+Episode duration   |{X}       |{X}        |{X}         |{X}
+Episode author     |{X}       |{X}        |{X}         |{X}
+Episode description|(./)      |(./)       |(./)        |{X}
+Episode enclosure  |(./)      |(./)       |(./)        |(./)
+"""]]
+
 ## Design
 
 7. For each fancy podcast episode, write a blog post containing
@@ -18,9 +50,6 @@ also have lots more metadata.
 
 ## Implementation
 
-[[!template id=gitbranch branch=schmonz/fancypodcast author="[[schmonz]]"]]
-[[!tag patch]]
-
 ### Completed
 
 * Cover the existing simple podcast behavior with tests.
@@ -43,31 +72,20 @@ also have lots more metadata.
 * Subscribe to a fancy feed in some common podcatchers and verify
   display details against a reference podcast.
 
-### Status
-
-[[!table data="""
-Feature            |iTunes RSS|iTunes Atom|Downcast RSS|Downcast Atom
-Feed image         |{X}       |{X}        |{X}         |{X}
-Feed title         |(./)      |(./)       |(./)        |(./)
-Feed publisher     |{X}       |{X}        |{X}         |{X}
-Feed "category"    |{X}       |{X}        |{X}         |{X}
-Feed date          |(./)      |(./)       |(./)        |(./)
-Feed description   |(./)      |(./)       |(./)        |{X}
-Episode image      |{X}       |{X}        |{X}         |{X}
-Episode title      |(./)      |(./)       |(./)        |(./)
-Episode date       |(./)      |(./)       |(./)        |(./)
-Episode duration   |{X}       |{X}        |{X}         |{X}
-Episode author     |{X}       |{X}        |{X}         |{X}
-Episode description|(./)      |(./)       |(./)        |{X}
-Episode enclosure  |(./)      |(./)       |(./)        |(./)
-"""]]
-
 ### Must-have (for [[schmonz]], anyway)
 
 * Think carefully about...
     * UTF-8.
-    * Whether [[tips/howto avoid flooding aggregators]] suffices for
-      migrating a fancy podcast into ikiwiki.
+    * Whether [[tips/howto avoid flooding aggregators]] suffices for...
+        * Converting a simple podcast to a fancy one.
+            7. Set up a non-production copy of one of my podcasts.
+                * Manually test that feeds match production.
+                * Subscribe to the copy in `r2e`, iTunes, Downcast.
+            7. Try migrating the copy from simple to fancy.
+                * Document the steps I take.
+                * Make the feed readers update.
+                * Document what happens for each of them.
+        * Migrating a fancy podcast from elsewhere into ikiwiki.
 * Verify that _all_ the tests pass (not just my new ones).
 
 -----

diff --git a/doc/users/schmonz.mdwn b/doc/users/schmonz.mdwn
index 10ca6e6ebe1cbb1bf16ab25fe44ede99be302f99..84dca19485a67d31fcdbf5f8df407b9eebc44782 100644 (file)
--- a/doc/users/schmonz.mdwn
+++ b/doc/users/schmonz.mdwn
@@ -1,10 +1,20 @@
-[Amitai Schlair](http://www.schmonz.com/) finds himself using ikiwiki
-for all sorts of things. His attempts at contributing:
+[Amitai Schlair](http://www.schmonz.com/) uses ikiwiki
+for all sorts of things:
+
+* a undergraduate group's university-provided-static-hosted site
+  (with [[plugins/rsync]] and a [WIND
+  authentication](http://www.columbia.edu/acis/rad/authmethods/wind/)
+  plugin)
+* a major open-source project's wiki (with the [[rcs/cvs]] plugin)
+* team documentation and project planning at work: product and
+  sprint backlogs, burndown charts, release plans/procedures/announcements,
+  aggregating feeds of shared interest, etc. (with the
+  [[plugins/contrib/dynamiccookies]] and [[plugins/contrib/proxies]]
+  plugins)
+* personal to-do and scratch space
+
+ikiwiki contributions:
 
 [[!map
 pages="!*/Discussion and ((link(users/schmonz) and plugins/*) or rcs/cvs or todo/fancypodcast)"
 ]]
-
-He's also written a plugin for [WIND
-authentication](http://www.columbia.edu/acis/rad/authmethods/wind/), which
-may or may not be of general utility.