From: Joey Hess Date: Sat, 1 Mar 2008 03:47:26 +0000 (-0500) Subject: Merge branch 'master' of git://git.madduck.net/code/ikiwiki X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/279db7860dc98bedbd8333bb7de57251dcfb223d?hp=be0b4f603f918444b906e42825908ddac78b7073 Merge branch 'master' of git://git.madduck.net/code/ikiwiki --- diff --git a/doc/bugs/No_link_for_blog_items_when_filename_contains_a_colon.mdwn b/doc/bugs/No_link_for_blog_items_when_filename_contains_a_colon.mdwn index 4f370372c..0e8ead4ea 100644 --- a/doc/bugs/No_link_for_blog_items_when_filename_contains_a_colon.mdwn +++ b/doc/bugs/No_link_for_blog_items_when_filename_contains_a_colon.mdwn @@ -1,3 +1,23 @@ Since upgrading from Ikiwiki 2.20 to 2.32.3 (from Debian Lenny), I don't get hyperlinks to items which have a colon in their name anymore. This applies to both the normal and the archive view. Before the update, the links have been created as relative links, so they weren't usable either as the browser tried to take the part before the colon as protocol specification (as in e.g. `http:`). Iirc, this applied to the archive view only, links in the normal view were ok (will check this out again if it's important). Is there a way to quote each colon as %xy in the hyperlinks? Perhaps it's only a problem with my config, and not an actual bug...? EDIT: I just found that in this wiki under the entry "mailto: links not properly generated in rss/atom feeds" also doesn't have a hyperlink - at least it's not a problem with my config only ;-) + +[[madduck]]: I traced this down to `htmlscrubber`. If disabled, it works. If +enabled, then `$safe_url_regexp` determines the URL unsafe because of the +colon and hence removes the `src` attribute. + +Digging into this, I find that [[rfc 3986]] pretty much discourages colons in +filenames: + +> A path segment that contains a colon character (e.g., "this:that") cannot be +> used as the first segment of a relative-path reference, as it would be +> mistaken for a scheme name. Such a segment must be preceded by +> a dot-segment (e.g., "./this:that") to make a relative- path reference. + +The solution seems not to use colons. + +In any case, `htmlscrubber` should get a new regexp, courtesy of dato: +`[^:]+($|\/)`. I have tested and verified this. + +[Commit/patch +be0b4f60](http://git.madduck.net/v/code/ikiwiki.git?a=commit;h=be0b4f603f918444b906e42825908ddac78b7073) fixes this. diff --git a/doc/bugs/img_plugin_renders___60__img__62___tag_without_src_attribute_post-2.20.mdwn b/doc/bugs/img_plugin_renders___60__img__62___tag_without_src_attribute_post-2.20.mdwn index 531e82474..f7883dbb7 100644 --- a/doc/bugs/img_plugin_renders___60__img__62___tag_without_src_attribute_post-2.20.mdwn +++ b/doc/bugs/img_plugin_renders___60__img__62___tag_without_src_attribute_post-2.20.mdwn @@ -30,3 +30,7 @@ I added `print STDERR "$imgtag\n";` to `img.pm` after the `my $imgtag=' Something like [[discussion/castle]] and [[discussion/castle/discussion]]? (Sorry about the noise, btw.) --Ethan +>> this really didn't seem to work -- here's my attempted comment; http://ikiwiki.info/sandbox/castle/discussion/test_comment/index.html. -- JonDowland + I don't think that the nesting is very clear, I found it confusing.. Would each page be its own individual blog? Or its own blog post? To me it seems like an entire wiki can be viewed as a blog, with threaded or unthreaded comments underneath. diff --git a/doc/todo/plugin.mdwn b/doc/todo/plugin.mdwn index 89dbb04a2..da9226575 100644 --- a/doc/todo/plugin.mdwn +++ b/doc/todo/plugin.mdwn @@ -45,3 +45,6 @@ Suggestions of ideas for plugins: * As I couldn't find another place to ask, I'll try here. I would like to install some contributed plugins, but can not find anywhere to downlod them. > Not sure what you mean, the [[plugins/contrib]] page lists contributed plugins, and each of their pages tells where to download the plugin from.. --[[Joey]] + +* I'm thinking about starting a simple LaTeX plugin. This would be mainly to convert my old tex4ht based website. Would anyone else find this useful, +or should I just hack some offline converter together? I should clarify that I mean converting the latex text to HTML (maybe via something else). I found pandoc, which almost works to convert to .rst. Perhaps the most useful thing would be an offline filter to convert latex to markdown+embedded teximg --[[DavidBremner]] diff --git a/doc/users/DavidBremner.mdwn b/doc/users/DavidBremner.mdwn new file mode 100644 index 000000000..8462b1b4f --- /dev/null +++ b/doc/users/DavidBremner.mdwn @@ -0,0 +1 @@ + diff --git a/doc/users/jondowland.mdwn b/doc/users/jondowland.mdwn new file mode 100644 index 000000000..fae384d39 --- /dev/null +++ b/doc/users/jondowland.mdwn @@ -0,0 +1,3 @@ +A new ikiwiki user, looking at ikiwiki both for his personal site but also as a team-documentation management system for a small-sized group of UNIX sysadmins. + +(currently non-ikiwiki) Homepage: http://alcopop.org/