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

diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index a8ae0ffec102b5c5cd301697af6fb9b17615940b..733edfdd85474efc7e40d18ff95c0fb958604d9f 100644 (file)
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -205,3 +205,4 @@ Personal sites and blogs
 * [Stig Sandbeck Mathisen](http://fnord.no/) - Personal site and blog, with a bootstrap theme, and varnish frontend.
 * Kalle Söderman: [Seen Architecture](http://img.kalleswork.net), [Stockholm Project](http://stockholm.kalleswork.net) - Mainly -image galleries using the album and osm plugins with a customized html5 theme.
 * [James Technotes](http://jamestechnotes.com), my [wiki](http://jamestechnotes.com) and [blog](http://jamestechnotes.com/blog).
+* [Amitai Schlair's site](http://www.schmonz.com/)

diff --git a/doc/plugins/blogspam.mdwn b/doc/plugins/blogspam.mdwn
index 3dd017f61897b318d017b40ad70ae704ea851469..5ced33b7a840e421ddef26b0dcd1b282310399bc 100644 (file)
--- a/doc/plugins/blogspam.mdwn
+++ b/doc/plugins/blogspam.mdwn
@@ -13,7 +13,7 @@ go to your Preferences page, and click the "Comment Moderation" button.
 The plugin requires the [[!cpan RPC::XML]] perl module.
 
 You can control how content is tested via the `blogspam_options` setting.
-The list of options is [here](http://blogspam.net/api/testComment.html#options).
+The list of options is [here](http://blogspam.net/api/1.0/testComment.html#options).
 By default, the options are configured in a way that is appropriate for
 wiki content. This includes turning off some of the more problematic tests.
 An interesting option for testing is `fail`, by setting it (e.g.,

diff --git a/doc/users/schmonz.mdwn b/doc/users/schmonz.mdwn
index dcbb8df9d6d67d86485f57119ba7bc53eefe400d..04b3254f71b4bc1f87ad292f1e7ff195dd3e7226 100644 (file)
--- a/doc/users/schmonz.mdwn
+++ b/doc/users/schmonz.mdwn
@@ -8,6 +8,7 @@ pages="!*/Discussion and ((link(users/schmonz) and plugins/* and !plugins/openid
 
 ## Public
 
+* [My personal web site](http://www.schmonz.com/)
 * [A major open-source project's wiki](http://wiki.netbsd.org) (with
   the [[rcs/cvs]] plugin)
 * [An undergraduate group's university-provided-static-hosted
@@ -24,9 +25,3 @@ pages="!*/Discussion and ((link(users/schmonz) and plugins/* and !plugins/openid
 * On my laptop, personal to-do and scratch space
 * [A small personal site](http://podcast.schmonz.com/) (happily hosted at
   [Branchable](http://www.branchable.com/))
-
-## Non-yet-ikiwiki
-
-* [My personal web site](http://www.schmonz.com/) (to be happily
-  hosted at Branchable when it's running a post-[[todo/fancypodcast]]
-  release)