Edit page EditingTips

[wiki.git] / EditingTips

diff --git a/EditingTips b/EditingTips
index 5d24572d66b74ced8fa8c9fc1bfc2fbd6faa48d6..5963c4a8fc74e96318c20d2238dee36afda3f483 100644 (file)
--- a/EditingTips
+++ b/EditingTips
@@ -19,7 +19,35 @@ Links to images will appear inline: http://www.w3.org/Icons/valid-css.png
 
 Anchored links also work with [[FrontPage|wiki pages]], [[/index.html | local paths]], and [[non_wiki_words]].
 
 
 Anchored links also work with [[FrontPage|wiki pages]], [[/index.html | local paths]], and [[non_wiki_words]].
 

-Image links: [[http://www.laptopgiving.org/ | GiveOneGetOne.jpg]]
+Image links: [[http://www.laptopgiving.org/|GiveOneGetOne.jpg]]
+
+== Inline media ==
+
+==== Images ====
+{{GerryStich.jpg}}
+
+==== Images with thumbnails ====
+{{GerryStich.jpg|Stich!}}
+
+==== Scaled images ====
+{{GerryStich.jpg|tiny|maxwidth=48}}
+
+
+==== Including other wiki pages ====
+{{IncludedPage}}
+
+You can also pass arguments to included pages!  It works like a minimal templating system:
+
+{{TemplatePage | hello=Ciao | world=mondo }}
+
+==== Including external resources inline ====
+{{http://www.codewiz.org/wikigit/geekigeeki.git/blob_plain/HEAD:/geekigeeki.py}}
+
+== Macros ==
+
+ * Your remote IP: <<CgiVar | REMOTE_ADDR>>
+ * Query string: <<CgiVar | QUERY_STRING>>
+ * <<NonexistentMacro | param1 | param2 >>

 
 == Block elements ==
 
 
 == Block elements ==
 


@@ -33,14 +61,6 @@ If you indent text
   like this, then it is indented in the output
     you can have multiple levels of indent
 
   like this, then it is indented in the output
     you can have multiple levels of indent
 

-And if you put asterisks at the start of the line
-
-  * you get a 
-  * bulleted
-  * list
-    * which can also be indented
-      * to several levels
-

 To insert program source without reformatting in a monospace font, use three curly braces:
 
 {{{
 To insert program source without reformatting in a monospace font, use three curly braces:
 
 {{{


@@ -51,12 +71,31 @@ To insert program source without reformatting in a monospace font, use three cur
 
 Just like that.
 
 
 Just like that.
 

+== Itemized lists ==
+
+If you put asterisks (*) at the start of the line
+
+  * you get a 
+  * bulleted
+  * list
+    * which can also be indented
+      * to several levels
+
+You can also have numbered lists, using the number (#) sign:
+ # first item
+ # second item
+   # first indented item
+   # second indented item
+ # third item

 
 == Text Styles ==
 
 
 == Text Styles ==
 

-To write **bold text**, enclose the text in double stars: *////*some word*////*. \\
-To write //italic text//, enclose the text in double slashes: /****/some word/****/. \\
-To write ##monospace text##, enclose the text in double hashes: #****#some word#****#. \\
+To write **bold text**, enclose it in double stars: *////*some word*////*. \\
+To write //italic text//, enclose it in double slashes: /****/some word/****/. \\
+To write ##monospace text##, enclose it in double hashes: #****#some word#****#. \\
+To write __underlined text__, enclose it in double underscores: _****_some word_****_. \\
+To write ^^superscript text^^, enclose it in double carets: ^****^some word^****^. \\
+To write ,,subscript text,,, enclose it in double commas: ,****,some word,****,. \\

 ''Double'' and '''triple''' quotes are also supported for compatiblity with other wikis. \\
 These keywords are highlighted: FIXME, TODO, DONE.
 
 ''Double'' and '''triple''' quotes are also supported for compatiblity with other wikis. \\
 These keywords are highlighted: FIXME, TODO, DONE.