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

diff --git a/doc/bugs/sitemap_includes_images_directly.mdwn b/doc/bugs/sitemap_includes_images_directly.mdwn
new file mode 100644 (file)
index 0000000..3295202
--- /dev/null
+++ b/doc/bugs/sitemap_includes_images_directly.mdwn
@@ -0,0 +1,5 @@
+A bug in the plugin [[/plugins/map]]: It displays images inline.
+
+When I tried, it displayed the one image I have in my small wiki inline in the map. ideally it should link to it, just like it links to pages. [example at my site][uw]. Note that I normally keep images outside, but this time I thought, why not have it all at the same place? (Images are also contextual content (fits to its subpage))--ulrik
+
+[uw]: http://www.student.lu.se/~cif04usv/wiki/sitemap.html
\ No newline at end of file

diff --git a/doc/plugins/openid/discussion.mdwn b/doc/plugins/openid/discussion.mdwn
new file mode 100644 (file)
index 0000000..66c4318
--- /dev/null
+++ b/doc/plugins/openid/discussion.mdwn
@@ -0,0 +1,9 @@
+There will be a *talk* by Stephane Bortzmeye about *OpenID* within the program of the
+[*umeet 2007* online conference](http://umeet.uninet.edu/umeet2007/english/pres.html).
+
+It is scheduled for 2007-12-20 18:00 UTC.
+
+See <http://umeet.uninet.edu/umeet2007/english/prog.html> for the complete program
+and for information about how to join.
+
+--[[tschwinge]]
\ No newline at end of file