Merge commit 'upstream/master' into prv/po

[git.ikiwiki.info.git] / doc / ikiwiki / directive / cutpaste.mdwn

diff --git a/doc/ikiwiki/directive/cutpaste.mdwn b/doc/ikiwiki/directive/cutpaste.mdwn
index 7c1d5b6cbd8b2f314990824e5b17c9e7d9d25333..ca580e54f63e51cc4844be31febedc0739ea902d 100644 (file)
--- a/doc/ikiwiki/directive/cutpaste.mdwn
+++ b/doc/ikiwiki/directive/cutpaste.mdwn
@@ -1,5 +1,5 @@
 The `copy`, `cut` and `paste` directives are supplied by the
 The `copy`, `cut` and `paste` directives are supplied by the

-[[!iki plugins/cutpaste]] plugin.
+[[!iki plugins/cutpaste desc=cutpaste]] plugin.

 
 With these directives you can store and recall pieces of text in a page:
 
 
 With these directives you can store and recall pieces of text in a page:
 


@@ -17,17 +17,11 @@ follow the paste directive that uses its text.  In fact, this is quite useful
 to postpone big blocks of text like long annotations and have a more natural
 flow.  For example:
 
 to postpone big blocks of text like long annotations and have a more natural
 flow.  For example:
 

-       This plugin provides three directives:
+       \[[!toggleable id="cut" text="[[!paste id=cutlongdesc]]"]]
+       \[[!toggleable id="copy" text="[[!paste id=copylongdesc]]"]]
+       \[[!toggleable id="paste" text="[[!paste id=pastelongdesc]]"]]

 
 

-        * \[[!toggle id="cut" text="cut"]] that cuts text
-        * \[[!toggle id="copy" text="copy"]] that copies text
-        * \[[!toggle id="paste" text="paste"]] that pastes text
-
-       \[[!toggleable id="cut" text="\[[!paste id=cutlongdesc]]"]]
-       \[[!toggleable id="copy" text="\[[!paste id=copylongdesc]]"]]
-       \[[!toggleable id="paste" text="\[[!paste id=pastelongdesc]]"]]
-
-       \[...some time later...]
+       [...some time later...]

 
        \[[!cut id=cutlongdesc text="""
           blah blah blah
 
        \[[!cut id=cutlongdesc text="""
           blah blah blah


@@ -46,7 +40,7 @@ Since you can paste without using double quotes, copy and paste can be used to
 nest directives that require multiline parameters inside each other:
 
        \[[!toggleable id=foo text="""
 nest directives that require multiline parameters inside each other:
 
        \[[!toggleable id=foo text="""

-         \[[!toggleable id=bar text="\[[!paste id=baz]]"]]
+         [[!toggleable id=bar text="[[!paste id=baz]]"]]

        """]]
 
        \[[!cut id=baz text="""
        """]]
 
        \[[!cut id=baz text="""