diff options
| author | intrigeri <intrigeri@boum.org> | 2010-08-22 11:05:03 +0200 |
|---|---|---|
| committer | intrigeri <intrigeri@boum.org> | 2010-08-22 11:05:03 +0200 |
| commit | 474b6524e0fe4b4bb3402bf6551bf97be7f3ee1f (patch) | |
| tree | f303c5391cb168793bdd8d08265d37900eb96330 /doc/plugins/contrib/ymlfront | |
| parent | 0055354e3cce1d1fb8ea2ac0d5c67a4c16a2b0b0 (diff) | |
| parent | 20ecef4d024f751481645db3aa68d098e1251b19 (diff) | |
Merge remote branch 'upstream/master' into prv/po
Diffstat (limited to 'doc/plugins/contrib/ymlfront')
| -rw-r--r-- | doc/plugins/contrib/ymlfront/discussion.mdwn | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/doc/plugins/contrib/ymlfront/discussion.mdwn b/doc/plugins/contrib/ymlfront/discussion.mdwn index b5c08fedd..b1fd65fff 100644 --- a/doc/plugins/contrib/ymlfront/discussion.mdwn +++ b/doc/plugins/contrib/ymlfront/discussion.mdwn @@ -1,13 +1,6 @@ -My field-etc branch in git://git.pseudorandom.co.uk/git/smcv/ikiwiki.git (gitweb: -<http://git.pseudorandom.co.uk/smcv/ikiwiki.git?a=shortlog;h=refs/heads/field-etc>) -has some fixes for compatibility with old YAML modules, mostly done by imitating -Joey's code in IkiWiki::Setup::Yaml. Please consider merging :-) --[[smcv]] +Now that I have implemented a \[[!ymlfront ...]] directive, I would like to remove support for the old "---" delimited format, because -> I would if I could *find* it. I checked out the "field-etc" branch, but I can't find the plugins in question under IkiWiki/Plugin; am I looking in the wrong place, or what? -> --[[KathrynAndersen]] +* it is fragile (easily breakable) +* it is non-standard ->> Sorry, I accidentally removed `field-etc` by pushing with `--mirror` from a ->> different checkout. I've put it back; it's a branch from your `ikiplugins.git`, ->> so yes, the code should be in `IkiWiki/Plugin`. --[[smcv]] - ->>> Done a while back, but now I've actually pushed to my repo. --[[KathrynAndersen]] +Any objections? |