Merge commit 'upstream/master' into prv/po

[git.ikiwiki.info.git] / doc / todo / preprocessor_directive_for_proposed_changes.mdwn

diff --git a/doc/todo/preprocessor_directive_for_proposed_changes.mdwn b/doc/todo/preprocessor_directive_for_proposed_changes.mdwn
index e73e6c09ef970096ab8751d9feac1bebd9bb3af5..1542f39ae05e3377fc61369c3c200d6168a5c3f5 100644 (file)
--- a/doc/todo/preprocessor_directive_for_proposed_changes.mdwn
+++ b/doc/todo/preprocessor_directive_for_proposed_changes.mdwn
@@ -7,14 +7,14 @@ which can't be made through the web interface:
 
 Of course in these cases, you can add your request to a discussion page
 and wait for someone with the access/confidence to apply them.
 
 Of course in these cases, you can add your request to a discussion page
 and wait for someone with the access/confidence to apply them.

-Maybe this can be enhanced with a [[ikiwiki/PreprocessorDirective]]:
+Maybe this can be enhanced with a [[ikiwiki/Directive]]:

 
 <pre>
 
 <pre>

-\[[suggest op=merge dstfile=trunk srcfile=branches/jk oldrev=1234 newrev=1342]]
+\[[!suggest op=merge dstfile=trunk srcfile=branches/jk oldrev=1234 newrev=1342]]

 
 

-\[[suggest op=move srcpage=/blog dstpage=/blog_support]]
+\[[!suggest op=move srcpage=/blog dstpage=/blog_support]]

 
 

-\[[suggest patch="""
+\[[!suggest patch="""

 Index: IkiWiki/CGI.pm
 ===================================================================
 --- IkiWiki/CGI.pm      (révision 4119)
 Index: IkiWiki/CGI.pm
 ===================================================================
 --- IkiWiki/CGI.pm      (révision 4119)