merge change from doc to basewiki

diff --git a/basewiki/helponformatting.mdwn b/basewiki/helponformatting.mdwn
index 4e5661b165f20be4d0b55e0f7eaa1d4b0c97c1d6..8c6483275f8e262910a963993e886dbc53215d16 100644 (file)
--- a/basewiki/helponformatting.mdwn
+++ b/basewiki/helponformatting.mdwn
@@ -29,9 +29,26 @@ size of the header:
 ## ## h2
 ### ### h3
 #### #### h4
 ## ## h2
 ### ### h3
 #### #### h4

+##### ##### h5
+###### ###### h6

 
 

-To create a horizontal rule, just write three or more dashes on their own
-line:
+You can also make the first two levels of heading by underlining text with
+equals or dash:
+
+heading 1
+=========
+
+    heading 1
+    =========
+
+heading 2
+---------
+
+    heading 2
+    ---------
+
+To create a horizontal rule, just write three or more dashes or stars on
+their own line:

 
 ----
 
 
 ----
 


@@ -53,8 +70,7 @@ 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.
+You can also 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.
 
 Also, if the smiley plugin is enabled in your wiki, you can insert
 [[smileys]] and some other useful symbols.

diff --git a/doc/helponformatting.mdwn b/doc/helponformatting.mdwn
deleted file mode 100644 (file)
index 8c64832..0000000
--- a/doc/helponformatting.mdwn
+++ /dev/null
@@ -1,76 +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
-##### ##### h5
-###### ###### h6
-
-You can also make the first two levels of heading by underlining text with
-equals or dash:
-
-heading 1
-=========
-
-    heading 1
-    =========
-
-heading 2
----------
-
-    heading 2
-    ---------
-
-To create a horizontal rule, just write three or more dashes or stars 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\)
-
-----
-
-You can also 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.