Merge branch 'master' into debian-jessie-backports

[git.ikiwiki.info.git] / doc / plugins / contrib / ikiwiki / directive / ymlfront.mdwn

diff --git a/doc/plugins/contrib/ikiwiki/directive/ymlfront.mdwn b/doc/plugins/contrib/ikiwiki/directive/ymlfront.mdwn
index bb4a58fc699d70e0377434a0d8a60af3b34ffede..1a01834f8e48d72588f5421ea4fd7516cc51746d 100644 (file)
--- 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.
   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.