Merge commit 'upstream/master'

[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 c0af59eba54dc36924791da2dd59f4179be23f38..1542f39ae05e3377fc61369c3c200d6168a5c3f5 100644 (file)
--- a/doc/todo/preprocessor_directive_for_proposed_changes.mdwn
+++ b/doc/todo/preprocessor_directive_for_proposed_changes.mdwn
@@ -7,7 +7,7 @@ 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>
 \[[!suggest op=merge dstfile=trunk srcfile=branches/jk oldrev=1234 newrev=1342]]
 
 <pre>
 \[[!suggest op=merge dstfile=trunk srcfile=branches/jk oldrev=1234 newrev=1342]]