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

diff --git a/doc/news/openid.mdwn b/doc/news/openid.mdwn
index ad76606aab0e89c12ce73b6b15acca084b3159c8..45414142cefb9fd50f596a565e49a096c0a1871b 100644 (file)
--- a/doc/news/openid.mdwn
+++ b/doc/news/openid.mdwn
@@ -10,4 +10,4 @@ log back in, try out the OpenID signup process if you don't already have an
 OpenID, and see how OpenID works for you. And let me know your feelings about
 making such a switch. --[[Joey]]
 
-[[!poll 59 "Accept only OpenID for logins" 18 "Accept only password logins" 35 "Accept both"]]
+[[!poll 60 "Accept only OpenID for logins" 18 "Accept only password logins" 35 "Accept both"]]

diff --git a/doc/todo/automatic_use_of_syntax_plugin_on_source_code_files/discussion.mdwn b/doc/todo/automatic_use_of_syntax_plugin_on_source_code_files/discussion.mdwn
index dc6c0001e7b38d2e1ccebefce14c528fdcfee86d..59c1a245b4595565bfc20b9233a24aef728424dd 100644 (file)
--- a/doc/todo/automatic_use_of_syntax_plugin_on_source_code_files/discussion.mdwn
+++ b/doc/todo/automatic_use_of_syntax_plugin_on_source_code_files/discussion.mdwn
@@ -4,6 +4,19 @@ Updated to use fix noted in [[bugs/multiple_pages_with_same_name]].
 
 -- [[Will]]
 
+----
+I was trying to replace sourcehighlight with sourcecode. I had to modify the 
+htmlize call slightly so that it would work in a format directive.
+([modified version](http://pivot.cs.unb.ca/git/?p=ikiplugins.git;a=blob_plain;f=IkiWiki/Plugin/sourcecode.pm;hb=21fc57091edb9))
+I hit a wall the following example (the last commit in the above repo).
+
+    \[[!meta title="Solutions to assignment 1"]]
+
+    - [[!format cc """
+    test
+    """]]
+
+
 ----
 
     #!/usr/bin/perl