web commit by JoshTriplett: Add marclist shortcut.

[git.ikiwiki.info.git] / doc / helponformatting.mdwn

diff --git a/doc/helponformatting.mdwn b/doc/helponformatting.mdwn
index 8c6483275f8e262910a963993e886dbc53215d16..5834706c0e8afb412b5a955fdc1373eee3ff882f 100644 (file)
--- a/doc/helponformatting.mdwn
+++ b/doc/helponformatting.mdwn
@@ -32,21 +32,6 @@ size of the header:
 ##### ##### h5
 ###### ###### h6
 
 ##### ##### 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 create a horizontal rule, just write three or more dashes or stars on
 their own line:
 


@@ -65,12 +50,30 @@ To write a code block, indent each line with a tab or 4 spaces:
 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 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\)
+To link to any other web page, or to an email address, you can just put the
+url in angle brackets: <<http://ikiwiki.info>>, or you can use the
+form \[link text\]\(url\)

 
 ----
 
 You can also 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.
+[[if test="enabled(inline) and blog" then="""
+This wiki has the inline plugin enabled, so you can create a [[blog]] on any
+page.
+"""]]
+
+[[if test="enabled(smiley) and smileys" then="""
+This wiki has the smiley plugin enabled, so you can insert [[smileys]] and some
+other useful symbols.
+"""]]
+
+[[if test="enabled(shortcut) and shortcuts" then="""
+This wiki has the shortcut plugin enabled, so you can use [[shortcuts]] to link
+to common resources.
+"""]]
+
+[[if test="enabled(template) and templates" then="""
+This wiki has the template plugin enabled, so you can create and use
+[[templates]] for repeated chunks of parameterized wiki text.
+"""]]