diff options
| author | intrigeri <intrigeri@boum.org> | 2010-12-20 14:27:21 +0100 |
|---|---|---|
| committer | intrigeri <intrigeri@boum.org> | 2010-12-20 14:27:21 +0100 |
| commit | 75196e76b627709a6ecae3fa948e1fba7928a5ce (patch) | |
| tree | 6aa2baeb9cc68f98ca256ce0ff5cb20909f52ef9 /doc/plugins/contrib/ikiwiki/directive | |
| parent | 8c2962ec48ae57605d6d0e297be437a97b6229ca (diff) | |
| parent | e5ed3c9e3801360cc00ce4f4f325f68ac0770bff (diff) | |
Merge remote branch 'upstream/master' into prv/po
Diffstat (limited to 'doc/plugins/contrib/ikiwiki/directive')
| -rw-r--r-- | doc/plugins/contrib/ikiwiki/directive/ymlfront.mdwn | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/plugins/contrib/ikiwiki/directive/ymlfront.mdwn b/doc/plugins/contrib/ikiwiki/directive/ymlfront.mdwn index bb4a58fc6..1a01834f8 100644 --- a/doc/plugins/contrib/ikiwiki/directive/ymlfront.mdwn +++ b/doc/plugins/contrib/ikiwiki/directive/ymlfront.mdwn @@ -14,4 +14,4 @@ There is one argument to this directive. The YAML-format data. This should be enclosed inside triple-quotes to preserve the data correctly. If more than one ymlfront directive is given per page, the result is undefined. -Likewise, it is inadvisable to try to mix the "---" ymlfront format with the directive form of the data. +Likewise, it is inadvisable to try to mix the non-directive ymlfront format with the directive form of the data. |