diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2008-08-30 06:17:15 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2008-08-30 06:17:15 +0200 |
| commit | 0f935cae8775f5d94dfdc6c50c753eded796abfc (patch) | |
| tree | d7769dcc2bac98eafca69063d6f1c0a1c5329252 /ikiwiki/markdown.mdwn | |
| parent | 7a34ab14c1c817bc9ac43197c002c7b95e6ad1cc (diff) | |
| parent | 70090d29241b365d5532360afed8782d3c7dfd2e (diff) | |
Merge branch 'master' into clean + drop ikiwiki/preprocessordirective.mdwn
Diffstat (limited to 'ikiwiki/markdown.mdwn')
| -rw-r--r-- | ikiwiki/markdown.mdwn | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ikiwiki/markdown.mdwn b/ikiwiki/markdown.mdwn index bbda9ad..a419094 100644 --- a/ikiwiki/markdown.mdwn +++ b/ikiwiki/markdown.mdwn @@ -8,6 +8,6 @@ For documentation about the markdown syntax, see [[formatting]] and [markdown mode](http://jblevins.org/projects/markdown-mode/) for emacs can help in editing. -Note that [[WikiLink]]s and [[PreProcessorDirective]]s are not part of the -markdown syntax, and are the only bit of markup that this wiki handles -internally. +Note that [[WikiLinks|WikiLink]] and [[directives|directive]] are not part +of the markdown syntax, and are the only bit of markup that this wiki +handles internally. |