diff options
author | Joey Hess <joey@kodama.kitenet.net> | 2008-07-31 19:35:37 -0400 |
---|---|---|
committer | Joey Hess <joey@kodama.kitenet.net> | 2008-07-31 19:35:37 -0400 |
commit | 041923a89ece8b1ed195cb7b528843c15770ea6f (patch) | |
tree | d85f7c488c05d8d6983ec1b65b2e427c59cc3acf /doc/plugins/creole.mdwn | |
parent | e12627e0a4c73d4d47ac2f10750defe22b41580e (diff) | |
parent | 861dea7f1c720ff889ff11ef7b7e925a3c209c5d (diff) |
Merge branch 'master' into autoconfig
Conflicts:
IkiWiki/Plugin/git.pm
debian/changelog
po/ikiwiki.pot
Diffstat (limited to 'doc/plugins/creole.mdwn')
-rw-r--r-- | doc/plugins/creole.mdwn | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/plugins/creole.mdwn b/doc/plugins/creole.mdwn index b6861ab26..ed347e2c5 100644 --- a/doc/plugins/creole.mdwn +++ b/doc/plugins/creole.mdwn @@ -12,5 +12,5 @@ wiki markup formats, so should be fairly easy to guess at. There is also a [CheatSheet](http://www.wikicreole.org/wiki/CheatSheet). Links are standard [[WikiLinks|ikiwiki/WikiLink]]. Links and -[[PreProcessorDirectives]] inside `{{{ }}}` blocks are still expanded, +[[ikiwiki/PreProcessorDirectives]] inside `{{{ }}}` blocks are still expanded, since this happens before the creole format is processed. |