From: Joey Hess Date: Tue, 26 May 2009 21:05:39 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/4b81616c0468956b434207fc7266cb3eb4d1bbfa?hp=96087cbd88fd056ae34675abfb0e3e411f019763 Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info --- diff --git a/doc/bugs/complex_wiki-code___40__braces__41___in_wikilink-text_breaks_wikilinks.mdwn b/doc/bugs/complex_wiki-code___40__braces__41___in_wikilink-text_breaks_wikilinks.mdwn new file mode 100644 index 000000000..364fae394 --- /dev/null +++ b/doc/bugs/complex_wiki-code___40__braces__41___in_wikilink-text_breaks_wikilinks.mdwn @@ -0,0 +1,9 @@ +Example (from [here](http://git.ikiwiki.info/?p=ikiwiki;a=blobdiff;f=doc/todo/matching_different_kinds_of_links.mdwn;h=26c5a072bf3cb205b238a4e6fd0882583a0b7609;hp=1d7c78d9065d78307b43a1f58a53300cde4015fa;hb=9b4c83127fdef0ceb682c104db9bfb321b17022e;hpb=df4cc4c16ca230ee99b80c80043ba54fb95f6e71)): +
+[[`\[[!taglink TAG\]\]`|plugins/tag]]
+
+gives: + +[[`\[[!taglink TAG\]\]`|plugins/tag]] + +Expected: there is a [[ikiwiki/wikilink]] with the complex text as the displayed text. --Ivan Z. diff --git a/doc/bugs/firefox_doesn__39__t_want_to_load_updated_pages_at_ikiwiki.info.mdwn b/doc/bugs/firefox_doesn__39__t_want_to_load_updated_pages_at_ikiwiki.info.mdwn new file mode 100644 index 000000000..8cb47f864 --- /dev/null +++ b/doc/bugs/firefox_doesn__39__t_want_to_load_updated_pages_at_ikiwiki.info.mdwn @@ -0,0 +1,5 @@ +I'm using firefox-3.0.8-alt0.M41.1 (Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.0.4pre) Gecko/2008100921 Firefox/3.0). I have noticed that quite often it shows an old state of a page at http://ikiwiki.info, e.g., [[recentchanges]] without my last edits, or the last page I edited (say, 50 min ago) in the state it was before I edited it. + +Only explicitly pressing "reload" helps. + +Is it a bug? I haven't been noticing such problems usually on other sites. --Ivan Z. diff --git a/doc/bugs/tagged__40____41___matching_wikilinks.mdwn b/doc/bugs/tagged__40____41___matching_wikilinks.mdwn index 2b30f247e..e7e4af7c3 100644 --- a/doc/bugs/tagged__40____41___matching_wikilinks.mdwn +++ b/doc/bugs/tagged__40____41___matching_wikilinks.mdwn @@ -27,3 +27,7 @@ rationale on this, or what am I doing wrong, and how to achieve what I want? >> No, he has no pages under tagbase that aren't tags. This bug >> is valid. [[todo/matching_different_kinds_of_links]] is probably >> how it will eventually be solved. --[[Joey]] + +> And this is an illustration why a clean work-around (without changing the software) is not possible: while thinking about [[todo/matching_different_kinds_of_links]], I thought one could work around the problem by simply explicitly including the kind of the relation into the link target (like the tagbase in tags), and by having a separate page without the "tagbase" to link to when one wants simply to refer to the tag without tagging. But this won't work: one has to at least once refer to the real tag page if one wants to talk about it, and this reference will count as tagging (unwanted). --Ivan Z. + +> But well, perhaps there is a workaround without introducing different kinds of links. One could modify the [[tag plugin|plugins/tag]] so that it adds 2 links to a page: for tagging -- `tagbase/TAG`, and for navigation -- `tagdescription/TAG` (displayed at the bottom). Then the `tagdescription/TAG` page would hold whatever list one wishes (with `tagged(TAG)` in the pagespec), and whenever one wants to merely refer to the tag, one should link to `tagdescription/TAG`--this link won't count as tagging. So, `tagbase/TAG` would become completely auxiliary (internal) link targets for ikiwiki, the users would edit or link to only `tagdescription/TAG`. --Ivan Z. diff --git a/doc/plugins/contrib/po.mdwn b/doc/plugins/contrib/po.mdwn index 5b33f6716..265f37fd2 100644 --- a/doc/plugins/contrib/po.mdwn +++ b/doc/plugins/contrib/po.mdwn @@ -423,3 +423,5 @@ daring a timid "please pull"... or rather, please review again :) >> --[[intrigeri]] >> >>> Did you get a chance to? --[[Joey]] + +Related to this is [bug#530574](http://bugs.debian.org/530574) with improved po4a Markdown support. -- [[JonasSmedegaard]] diff --git a/doc/todo/matching_different_kinds_of_links.mdwn b/doc/todo/matching_different_kinds_of_links.mdwn index b71d7cc5f..26c5a072b 100644 --- a/doc/todo/matching_different_kinds_of_links.mdwn +++ b/doc/todo/matching_different_kinds_of_links.mdwn @@ -35,3 +35,13 @@ Besides pagespecs, the `rel=` attribute could be used for styles. --Ivan Z. > was not available, which is why I didn't make it differentiate from > normal links.) Might be better to go ahead and add the variable to > core though. --[[Joey]] + +I saw somewhere else here some suggestions for the wiki-syntax for specifying the relation name of a link. One more suggestion---[the syntax used in Semantic MediaWiki](http://en.wikipedia.org/wiki/Semantic_MediaWiki#Basic_usage), like this: + +
+... the capital city is \[[Has capital::Berlin]] ...
+
+ +So a part of the effect of [[`\[[!taglink TAG\]\]`|plugins/tag]] could be represented as something like `\[[tag::TAG]]` or (more understandable relation name in what concerns the direction) `\[[tagged::TAG]]`. + +I don't have any opinion on this syntax (whether it's good or not)...--Ivan Z. diff --git a/doc/todo/section-numbering.mdwn b/doc/todo/section-numbering.mdwn index 6f8c44a4c..3a2d232a8 100644 --- a/doc/todo/section-numbering.mdwn +++ b/doc/todo/section-numbering.mdwn @@ -2,4 +2,6 @@ Optional automatic section numbering would help reading: otherwise, a reader (like me) gets lost in the structure of a long page. -I guess it is implementable with complex CSS... but one has first to compose this CSS in any case. So, this wish still has a todo status. +I guess it is implementable with complex CSS... but one has first to compose this CSS in any case. So, this wish still has a todo status. --Ivan Z. + +And another aspect why this is related to ikiwiki, not just authoring a CSS, is that the style of the numbers (genereated by CSS probably) should match the style of the numbers in ikiwiki's [[plugins/toc]]. --Ivan Z. diff --git a/doc/todo/target_filter_for_brokenlinks.mdwn b/doc/todo/target_filter_for_brokenlinks.mdwn new file mode 100644 index 000000000..137277c21 --- /dev/null +++ b/doc/todo/target_filter_for_brokenlinks.mdwn @@ -0,0 +1,9 @@ +[[!tag wishlist]] + +Currently, [[plugins/brokenlinks]] supports filtering by the place where a broken wikilink is used. + +Filtering by the target of the broken link would also be useful, e.g., + + \[[!brokenlinks matching="tagbase/*"]] + +would list the tags not yet "filled out". --Ivan Z.