summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2007-05-20 00:18:58 +0000
committerjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2007-05-20 00:18:58 +0000
commit76386c5e8bb52c38c1ffff18413c8818c471930a (patch)
treef223233efdffc3dd5a0f432e53b3f7ac1eb09f3c /doc
parent84731fa04e1606d54fe136cd37e2d25ea3b59855 (diff)
move wikilinks to extra features section
Diffstat (limited to 'doc')
-rw-r--r--doc/helponformatting.mdwn8
1 files changed, 4 insertions, 4 deletions
diff --git a/doc/helponformatting.mdwn b/doc/helponformatting.mdwn
index 732226666..e3c1de22f 100644
--- a/doc/helponformatting.mdwn
+++ b/doc/helponformatting.mdwn
@@ -47,10 +47,7 @@ To write a code block, indent each line with a tab or 4 spaces:
10 PRINT "Hello, world!"
20 GOTO 10
-To link to another page on the wiki, place the page's name inside double
-square brackets, so you would use `\[[WikiLink]]` to link to [[WikiLink]].
-
-To link to any other web page, or to an email address, you can just put the
+To link to an url or email address, you can just put the
url in angle brackets: <<http://ikiwiki.info>>, or you can use the
form \[link text\]\(url\)
@@ -59,6 +56,9 @@ form \[link text\]\(url\)
In addition to basic html formatting using [[MarkDown]], this wiki lets
you use the following additional features:
+* To link to another page on the wiki, place the page's name inside double
+ square brackets. So you would use `\[[WikiLink]]` to link to [[WikiLink]].
+
[[if test="enabled(smiley) and smileys" then="""
* Insert [[smileys]] and some other useful symbols. :-)
"""]]