diff options
| author | Joey Hess <joey@kodama.kitenet.net> | 2008-07-21 11:33:43 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kodama.kitenet.net> | 2008-07-21 11:34:49 -0400 |
| commit | d5e65e582a34ae2494fee493ddcb2b959e4a4bce (patch) | |
| tree | 14bf1f7a604406ecb98523eda42c2e864321e1d0 /doc/todo/preprocessor_directive_for_proposed_changes.mdwn | |
| parent | d13200f92b74aa3d4e315809c78f1c2ec6c925a7 (diff) | |
| parent | e3a84952715cdd625258e1695cb74898006c31f3 (diff) | |
Merge commit 'smcv/prefix'
Conflicts:
doc/news/version_2.49.mdwn
Also fixed the newest news file (and my wikiannounce script).
Diffstat (limited to 'doc/todo/preprocessor_directive_for_proposed_changes.mdwn')
| -rw-r--r-- | doc/todo/preprocessor_directive_for_proposed_changes.mdwn | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/todo/preprocessor_directive_for_proposed_changes.mdwn b/doc/todo/preprocessor_directive_for_proposed_changes.mdwn index e73e6c09e..c0af59eba 100644 --- a/doc/todo/preprocessor_directive_for_proposed_changes.mdwn +++ b/doc/todo/preprocessor_directive_for_proposed_changes.mdwn @@ -10,11 +10,11 @@ and wait for someone with the access/confidence to apply them. Maybe this can be enhanced with a [[ikiwiki/PreprocessorDirective]]: <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) |