diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2008-10-23 13:09:06 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2008-10-23 13:09:06 +0200 |
| commit | 262712e706420c9f421c7a4fc7a33ebe9bf1b1bf (patch) | |
| tree | ddb63a8126a2cd3e948106a55069c033dcd523ac /ikiwiki.mdwn | |
| parent | 687abc4f9f74256d3f019b608cb4565b13df78ed (diff) | |
| parent | b1fadc6eacaacb4d892b495e15ff82e9ba36c638 (diff) | |
Merge branch 'master' into scs
Diffstat (limited to 'ikiwiki.mdwn')
| -rw-r--r-- | ikiwiki.mdwn | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/ikiwiki.mdwn b/ikiwiki.mdwn index 89337d0..e0a971d 100644 --- a/ikiwiki.mdwn +++ b/ikiwiki.mdwn @@ -7,11 +7,10 @@ This wiki is powered by [ikiwiki](http://ikiwiki.info/). Some documentation on using ikiwiki: * [[ikiwiki/formatting]] -* [[ikiwiki/blog]] +* [[ikiwiki/wikilink]] +* [[ikiwiki/subpage]] * [[ikiwiki/pagespec]] * [[ikiwiki/directive]] -* [[ikiwiki/wikilink]] * [[ikiwiki/markdown]] -* [[ikiwiki/subpage]] * [[ikiwiki/openid]] * [[ikiwiki/searching]] |