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

8 files changed, 32 insertions, 9 deletions

diff --git a/doc/bugs/aggregate_plugin_should_honour_a_post__39__s_mctime.mdwn b/doc/bugs/aggregate_plugin_should_honour_a_post__39__s_mctime.mdwn
new file mode 100644
index 000000000..6d837dbdd
--- /dev/null
+++ b/doc/bugs/aggregate_plugin_should_honour_a_post__39__s_mctime.mdwn
@@ -0,0 +1 @@
+It would be nice if the [[aggregate_plugin|plugin/aggregate]] would try to extract the m/ctime out of each post and touch the files on the filesystem appropriately, so that ikiwiki reflects the actual time of the post via the [[inline_plugin|plugin/inline]], rather than the time when the aggregation ran to pull the post in. --[[madduck]]
diff --git a/doc/bugs/rst_plugin_traceback_with_SimpleXMLRPCDispatcher_from_pyhton_2.5.mdwn b/doc/bugs/rst_plugin_traceback_with_SimpleXMLRPCDispatcher_from_pyhton_2.5.mdwn
new file mode 100644
index 000000000..95f7b44bd
--- /dev/null
+++ b/doc/bugs/rst_plugin_traceback_with_SimpleXMLRPCDispatcher_from_pyhton_2.5.mdwn
@@ -0,0 +1,11 @@
+After adding rst to plugins, ikiwiki --setup fails:
+
+    Traceback (most recent call last):
+      File "/usr/lib/ikiwiki/plugins/rst", line 93, in <module>
+        handler = SimpleStdinOutXMLRPCHandler()
+      File "/usr/lib/ikiwiki/plugins/rst", line 65, in __init__
+        SimpleXMLRPCDispatcher.__init__(self)
+    TypeError: __init__() takes exactly 3 arguments (1 given)
+
+This is ikiwiki version 2.40 and
+[SimpleXMLRPCServer.py](http://svn.python.org/view/python/tags/r25/Lib/SimpleXMLRPCServer.py?rev=51918&view=markup) from python-2.5
diff --git a/doc/news/openid.mdwn b/doc/news/openid.mdwn
index 597950724..c576d8c97 100644
--- 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 45 "Accept only OpenID for logins" 17 "Accept only password logins" 33 "Accept both"]]
+[[poll 46 "Accept only OpenID for logins" 17 "Accept only password logins" 33 "Accept both"]]
diff --git a/doc/plugins/contrib/hnb.mdwn b/doc/plugins/contrib/hnb.mdwn
index 59af76316..4f4457cd6 100644
--- a/doc/plugins/contrib/hnb.mdwn
+++ b/doc/plugins/contrib/hnb.mdwn
@@ -7,6 +7,6 @@ hnb installed, since it uses the commandline interface of `hnb` program.
 
 It is roughly based on the `otl` plugin but uses `mktemp` to create temporary files since `hnb` has no "quiet" switch and otherwise the hnb version number and other as well as the output file name always would be in the output itself.
 
-For now it's available for download at [http://noone.org/hnb/hnb.pm](http://noone.org/hnb/hnb.pm)
+For now it's available for download at <http://noone.org/hnb/hnb.pm>
 
 TODO: Make a switch to allow both HTML export routines of hnb (`export_html` and `export_htmlcss`) to be used.
diff --git a/doc/plugins/contrib/sourcehighlight.mdwn b/doc/plugins/contrib/sourcehighlight.mdwn
index 2cf0ca563..f89677d9e 100644
--- a/doc/plugins/contrib/sourcehighlight.mdwn
+++ b/doc/plugins/contrib/sourcehighlight.mdwn
@@ -1,16 +1,16 @@
+[[!template id=plugin name=sourcehighlight core=0 author="[[DavidBremner]]"]]
+
 I noticed several places in the wiki talking about similar ideas, so I decided to put a page here to point to what I am working on.
 
-I have copied otl.pm and am wrapping source-highlight (why this instead of vim highlight, I dunno, I must be a real emacs guy).  You can find more or less the latest 
-version on 
-[my wiki](http://www.cs.unb.ca/~bremner/wiki/software/ikiwiki/sourcehighlight.pm).
+I have implemented a simple wrapper around
+ [source-highlight](http://www.gnu.org/software/src-highlite/).  You can find the latest version in 
+[git](http://http://pivot.cs.unb.ca/git?p=ikiperl.git;a=blob_plain;f=IkiWiki/Plugin/sourcehighlight.pm;hb=HEAD).
 You must specify `highlight_lang=>"foo,bar"` in your setup file.
 where foo and bar are the (source-supported) languages you want to
 highlight
-# Issues
+### Issues
 
-- I would like to have a link to the raw source; using will_render() and then copying the file 
-may work. 
-The discussion in [[plugins/contrib/texinfo]] seems relevant.
+- I would like to have a link to the raw source; using will_render() and then copying the file should work. 
 
 - the common case of foo.c and foo.h breaks
 because they both generate page working/dir/foo. 
diff --git a/doc/plugins/contrib/tex4ht.mdwn b/doc/plugins/contrib/tex4ht.mdwn
index 5ea13ac60..e5a549c05 100644
--- a/doc/plugins/contrib/tex4ht.mdwn
+++ b/doc/plugins/contrib/tex4ht.mdwn
@@ -6,4 +6,10 @@ my old tex4ht based home page, it seems to work OK.
 The current version is available from 
 [git](http://pivot.cs.unb.ca/git?p=ikiperl.git;a=blob_plain;f=IkiWiki/Plugin/tex4ht.pm;hb=HEAD)
 
+### Other related ideas/plugins:
+
+- [[todo/latex]] There is work in progress at converting snippets of latex.  No idea how the hybrid approach of tex4ht (part fonts, part bitmaps) compares to the [[todo/latex]] approach.
+
+- pandoc can also convert latex to html or markdown. It is much faster than tex4ht; on the other hand, the rendering quality is not quite as good, and pandoc does not understand user defined TeX macros.
+
 [[!tag type/slow]]
diff --git a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
index 90864d514..fac450a22 100644
--- a/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
+++ b/doc/todo/auto-create_tag_pages_according_to_a_template.mdwn
@@ -5,3 +5,5 @@ Tags are mainly specific to the object to which they’re stuck. However, I ofte
 Also see: <http://madduck.net/blog/2008.01.06:new-blog/> and <http://users.itk.ppke.hu/~cstamas/code/ikiwiki/autocreatetagpage/>
 
 [[tag wishlist]]
+
+I would love to see this as well. -- dato
diff --git a/doc/users/dato.mdwn b/doc/users/dato.mdwn
new file mode 100644
index 000000000..935a529cf
--- /dev/null
+++ b/doc/users/dato.mdwn
@@ -0,0 +1,3 @@
+[[meta title="Adeodato Simó"]]
+
+<http://chistera.yi.org/~adeodato>