summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@gnu.kitenet.net>2010-01-09 16:20:14 -0500
committerJoey Hess <joey@gnu.kitenet.net>2010-01-09 16:20:14 -0500
commit9dbeb003df73ff04fe608558004a6bfe4e3eaf78 (patch)
treede8720af0d18c2a96a8d8c765a1953d1abf959ac
parent59d929d6b1271c84c6d17ffbff65b57bf67d49e6 (diff)
parentfe0f6866841d6fb6e85dec42e88c56114d98e7f4 (diff)
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
-rw-r--r--doc/forum/link_to_an_image_inside_the_wiki_without_inlining_it.mdwn5
-rw-r--r--doc/users/jerojasro.mdwn1
2 files changed, 5 insertions, 1 deletions
diff --git a/doc/forum/link_to_an_image_inside_the_wiki_without_inlining_it.mdwn b/doc/forum/link_to_an_image_inside_the_wiki_without_inlining_it.mdwn
index 8a7fd7a29..67bb7f85f 100644
--- a/doc/forum/link_to_an_image_inside_the_wiki_without_inlining_it.mdwn
+++ b/doc/forum/link_to_an_image_inside_the_wiki_without_inlining_it.mdwn
@@ -6,7 +6,7 @@ I tought this:
would work, but it doesn't.
-Any hints?
+Any hints? --[[jerojasro]]
> Well, currently the syntax above will display the image
> inline with the specified link text used as an alt attribute. Although
@@ -39,3 +39,6 @@ Any hints?
> Anyway, the cheap and simple answer to your question is to use html
> or markdown instead of a [[ikiwiki/wikilink]]. Ie,
> `[look at this](img/lolcat.jpg)`. --[[Joey]]
+
+> > thanks a lot, that's a quite straightforward solution. I actually wrote a
+> > broken plugin to do that, and now I can ditch it --[[jerojasro]]
diff --git a/doc/users/jerojasro.mdwn b/doc/users/jerojasro.mdwn
new file mode 100644
index 000000000..4b331a0b9
--- /dev/null
+++ b/doc/users/jerojasro.mdwn
@@ -0,0 +1 @@
+Javier Rojas