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

diff --git a/doc/soc/ideas.mdwn b/doc/soc/ideas.mdwn
index 07c7e669e6081132fc2788a9b99e967c9f92be93..88f06b0f1aa9808aaefb61650c3d011d07f58fd9 100644 (file)
--- a/doc/soc/ideas.mdwn
+++ b/doc/soc/ideas.mdwn
@@ -6,4 +6,3 @@ but please don't add the `soc` tag yourself.
 [[!inline pages="(todo/* or bugs/*) and link(soc) and !todo/done and
 !link(todo/done) and !bugs/done and !link(bugs/done) and 
 !*/Discussion" actions=yes show=0]]
-[http://www.yaheodj.com/ khn]

diff --git a/doc/todo/Gallery.mdwn b/doc/todo/Gallery.mdwn
index 5018d85c42412a3dd9205777bd789be291f10a80..f41980333fc19d9b0b773eaddf8f1551df7ac555 100644 (file)
--- a/doc/todo/Gallery.mdwn
+++ b/doc/todo/Gallery.mdwn
@@ -80,4 +80,4 @@ Additional details are available [here](http://myweb.unomaha.edu/~ajain/ikiwikig
 
 See also [[/users/smcv/gallery]] for another implementation of the same sort of
 thing. Unfortunately, none of the implementation ideas
-I have there seem quite right either... --[[smcv]] [Lightbox](http://www.asererogether.com)
+I have there seem quite right either... --[[smcv]]