X-Git-Url: https://codewiz.org/gitweb?p=wiki.git;a=blobdiff_plain;f=EditingTips;h=5963c4a8fc74e96318c20d2238dee36afda3f483;hp=d22946cf1cc693e612bf61d380aac7aac69d3b6e;hb=078bf51686ba3f0bbe0ab3f99cfeb9d4c437d264;hpb=f71e84646a581871e6eb075a657405e5e91ebd30

diff --git a/EditingTips b/EditingTips
index d22946c..5963c4a 100644
--- a/EditingTips
+++ b/EditingTips
@@ -21,6 +21,34 @@ Anchored links also work with [[FrontPage|wiki pages]], [[/index.html | local pa
 
 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 ==
 
 Leave blank lines between paragraphs.
@@ -33,14 +61,6 @@ If you indent text
   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:
 
 {{{
@@ -51,12 +71,31 @@ To insert program source without reformatting in a monospace font, use three cur
 
 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 ==
 
-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.