aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2006-09-16 01:10:06 +0000
committerjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2006-09-16 01:10:06 +0000
commit3b42bd84ca352082489d658cad7debd4b0ef2f8a (patch)
tree65a9dd9a416b11bbac2f7ad43d63ca19e780520d
parent0f25ec8eb640a850a8f1efe7081c03d05d04eda4 (diff)
downloadikiwiki-3b42bd84ca352082489d658cad7debd4b0ef2f8a.tar
ikiwiki-3b42bd84ca352082489d658cad7debd4b0ef2f8a.tar.gz
merge helponformatting fix to basewiki
-rw-r--r--basewiki/helponformatting.mdwn2
-rw-r--r--doc/helponformatting.mdwn60
2 files changed, 1 insertions, 61 deletions
diff --git a/basewiki/helponformatting.mdwn b/basewiki/helponformatting.mdwn
index 3b6258a7f..4e5661b16 100644
--- a/basewiki/helponformatting.mdwn
+++ b/basewiki/helponformatting.mdwn
@@ -40,7 +40,7 @@ To quote someone, prefix the quote with ">":
> To be or not to be,
> that is the question.
-To write a code block, indent each line with a tab or 8 spaces:
+To write a code block, indent each line with a tab or 4 spaces:
10 PRINT "Hello, world!"
20 GOTO 10
diff --git a/doc/helponformatting.mdwn b/doc/helponformatting.mdwn
deleted file mode 100644
index 4e5661b16..000000000
--- a/doc/helponformatting.mdwn
+++ /dev/null
@@ -1,60 +0,0 @@
-# Help on formatting text
-
-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.
-
-You can \**emphasise*\* or \*\***strongly emphasise**\*\* text by placing it
-in single or double asterisks.
-
-To create a list, start each line with an asterisk:
-
-* "* this is my list"
-* "* another item"
-
-To make a numbered list, start each line with a number (any number will
-do) followed by a period:
-
-1. "1. first line"
-2. "2. second line"
-2. "2. third line"
-
-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
-
-To create a horizontal rule, just write three or more dashes on their own
-line:
-
-----
-
-To quote someone, prefix the quote with ">":
-
-> To be or not to be,
-> that is the question.
-
-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 url in angle brackets: <<http://ikiwiki.kitenet.net>>, or you can use the form
-\[link text\]\(url\)
-
-----
-
-Advanced users can use [[PreProcessorDirective]]s to do additional cool
-stuff.
-
-Also, if the smiley plugin is enabled in your wiki, you can insert
-[[smileys]] and some other useful symbols.