diff options
| author | Joey Hess <joeyh@joeyh.name> | 2015-01-02 12:45:54 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-01-02 12:45:54 -0400 |
| commit | bd8198fb77ed5cf77ddeb860ca1ac983bfaacbbd (patch) | |
| tree | 50d784e48059358a2eaad1ac0241201d94ecab0d | |
| parent | 2ad84a27d4959a50184c87ee6d285a41690e9e4e (diff) | |
| parent | 4ce18a7f4a85c5ba2cea73dc2dab093bc44ea934 (diff) | |
| download | ikiwiki-bd8198fb77ed5cf77ddeb860ca1ac983bfaacbbd.tar ikiwiki-bd8198fb77ed5cf77ddeb860ca1ac983bfaacbbd.tar.gz | |
Merge branch 'master' of ssh://git.ikiwiki.info
| -rw-r--r-- | doc/ikiwikiusers.mdwn | 1 | ||||
| -rw-r--r-- | doc/plugins/blogspam.mdwn | 2 | ||||
| -rw-r--r-- | doc/users/schmonz.mdwn | 7 |
3 files changed, 3 insertions, 7 deletions
diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn index a8ae0ffec..733edfdd8 100644 --- 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 3dd017f61..5ced33b7a 100644 --- 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 dcbb8df9d..04b3254f7 100644 --- 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) |