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 fc6f9e8af1595d07672342e45a41622d13949fac..6c3282576538e62eff77601cbae106da9c04e7f7 100644 (file)
--- a/doc/plugins/inline.mdwn
+++ b/doc/plugins/inline.mdwn
@@ -1,10 +1,5 @@
-[[template id=plugin name=inline core=1 author="[[Joey]]"]]
-
-This is a [[ikiwiki/PreProcessorDirective]] that allows including one wiki page
-inside another. For example:
-
-       \[[inline pages="blog/*"]]
-
-The most common use of inlining is generating blogs and RSS or Atom feeds.
-See [[ikiwiki/blog]] for details.
+[[!template id=plugin name=inline core=1 author="[[Joey]]"]]

 
 

+This plugin provides the [[ikiwiki/directive/inline]]
+[[ikiwiki/directive]], which allows including one wiki page
+inside another.