From: Joey Hess Date: Mon, 29 Mar 2010 16:18:09 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info X-Git-Tag: 3.20100403~62 X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/b0411319009237c4aea48de78945388d019fc21c?hp=97898ce585b36dbcb0a83356ef3e54c41d369437 Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info Conflicts: doc/todo/allow_site-wide_meta_definitions.mdwn --- diff --git a/doc/bugs/Comments_dissapeared.mdwn b/doc/bugs/Comments_dissapeared.mdwn index b737d9bef..ad1638236 100644 --- a/doc/bugs/Comments_dissapeared.mdwn +++ b/doc/bugs/Comments_dissapeared.mdwn @@ -13,3 +13,8 @@ Any other ideas? With thanks, > Your setup file only allows comments to pages under archives. That > seems unlikely to be right, so I guess it is causing your problem. > --[[Joey]] + +That's the only place where I want comments. +Has the pagespec changed? Is it `archives/*/*` or something like that? + +It worked just fine with this configuration. I swear I have not modified it. :) -- [[Kai Hendry]] diff --git a/doc/todo/allow_site-wide_meta_definitions.mdwn b/doc/todo/allow_site-wide_meta_definitions.mdwn index e4638f94b..704cb2c64 100644 --- a/doc/todo/allow_site-wide_meta_definitions.mdwn +++ b/doc/todo/allow_site-wide_meta_definitions.mdwn @@ -212,6 +212,9 @@ definitions essentially. >>> Hopefully I'll be back in the mix soon, too. In the meantime, Joey, have >>> you had a chance to look at this yet? -- [[Jon]] +>>>> Ping :) Hi. [[Joey]], would you consider this patch for the next +>>>> ikiwiki release? -- [[Jon]] + >>> For this to work with websetup and --dumpsetup, it needs to define the >>> `meta_*` settings in the getsetup function. >>>