Merge commit 'upstream/master' into pub/master

[git.ikiwiki.info.git] / doc / plugins / inline.mdwn

diff --git a/doc/plugins/inline.mdwn b/doc/plugins/inline.mdwn
index f77afa91751d17c4bcaa3621d5e472d29ab0529e..6c3282576538e62eff77601cbae106da9c04e7f7 100644 (file)
--- a/doc/plugins/inline.mdwn
+++ b/doc/plugins/inline.mdwn
@@ -1,6 +1,5 @@
-Allows including one wiki page inside another, generating blogs and RSS
-feeds. See [[blog]] for details.
+[[!template id=plugin name=inline core=1 author="[[Joey]]"]]

 
 

-This plugin is enabled by default.
-
-[[tag plugins/type/core]]
+This plugin provides the [[ikiwiki/directive/inline]]
+[[ikiwiki/directive]], which allows including one wiki page
+inside another.