* Fix a bug introduced last version to do with nested inlines.

[ikiwiki.git] / basewiki / helponformatting.mdwn

diff --git a/basewiki/helponformatting.mdwn b/basewiki/helponformatting.mdwn
index 9f7bcd9d13803bea69956c3cbfa6aac0cfe6ba4c..3b6258a7f1bd8ce9e8c0f127caa454e5daa14184 100644 (file)
--- a/basewiki/helponformatting.mdwn
+++ b/basewiki/helponformatting.mdwn
@@ -1,7 +1,8 @@
-## Help on formatting text
+# Help on formatting text
 
-Text on this wiki is written in a form very close to how you might write
-text for an email message.
+Text on this wiki is, by default, written in a form very close to how you
+might write text for an email message. This style of text formatting is
+called [[MarkDown]], and it works like this:
 
 Leave blank lines between paragraphs.
 
@@ -24,6 +25,7 @@ To create a header, start a line with one or more `#` characters followed
 by a space and the header text. The number of `#` characters controls the
 size of the header:
 
+# # h1
 ## ## h2
 ### ### h3
 #### #### h4
@@ -54,6 +56,5 @@ To link to any other web page, or to an email address, you can just put the url
 Advanced users can use [[PreProcessorDirective]]s to do additional cool
 stuff.
 
-----
-
-This style of text formatting is called [[MarkDown]].
+Also, if the smiley plugin is enabled in your wiki, you can insert
+[[smileys]] and some other useful symbols.