Edit page EditingTips

[wiki.git] / EditingTips

diff --git a/EditingTips b/EditingTips
index fc3462b07ad2e47cd4fcc497efb6daa13c2e7f5d..5963c4a8fc74e96318c20d2238dee36afda3f483 100644 (file)
--- a/EditingTips
+++ b/EditingTips
@@ -1,5 +1,4 @@
-Click '''Raw Text''' to see the markup for this page, and try it
-yourself in WikiSandBox.
+Click **Raw Text** to see the markup for this page, and try it yourself in WikiSandBox.

 
 ---
 
 
 ---
 


@@ -20,6 +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]]
+
+== 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,16 +71,36 @@ 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/****/. \\
-Double quotes are also supported for backwards compatiblity with other wikis. \\
+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.
 
 TIP: four consecutive stars (*////*////*////*) or slashes (/****/****/****/****) are a good
 These keywords are highlighted: FIXME, TODO, DONE.
 
 TIP: four consecutive stars (*////*////*////*) or slashes (/****/****/****/****) are a good

-way to prevent the syntax. :-)
+way to escape the syntax. :-)

 
 
 == Rulers ==
 
 
 == Rulers ==


@@ -89,7 +129,7 @@ way to prevent the syntax. :-)
 == Inline HTML ==
 
 <div style="align:right; clear:right; font-size:24px; width:20em; max-width:60%; margin:1ex 0ex 1ex 1ex; border:3px outset #969; background-color:#faf; color: #f00; padding:.3em; text-align:center;">
 == Inline HTML ==
 
 <div style="align:right; clear:right; font-size:24px; width:20em; max-width:60%; margin:1ex 0ex 1ex 1ex; border:3px outset #969; background-color:#faf; color: #f00; padding:.3em; text-align:center;">

-You can use {{div}}, {{span}} and {{iframe}} elements with any attribute, including
+You can use ##div##, ##span## and ##iframe## elements with any attribute, including

 <span style="color: green">CSS</span>, of course.
 </div>
 
 <span style="color: green">CSS</span>, of course.
 </div>