From: Jim Pryor <profjim@jimpryor.net>
Date: Thu, 2 Jun 2011 23:46:36 +0000 (-0400)
Subject: Merge branch 'pryor'
X-Git-Url: http://lambda.jimpryor.net/git/gitweb.cgi?p=lambda.git;a=commitdiff_plain;h=b27a7a1123dc21df15cdc007667150719f8d456d;hp=220e27baa06a76e6cd94cdf5ca69cda045a7d1a9

Merge branch 'pryor'
---

diff --git a/index.iki b/index.iki
index 3a2b976e..1575d717 100644
--- a/index.iki
+++ b/index.iki
@@ -8,6 +8,23 @@ the Linguistics building at 10 Washington Place, in room 104 (back of the first
 One student session will be held every Wednesday from 3-4 on the
 fourth floor at 10 Washington Place.
 
+Here is $some^2 x^{e \pi} + 3y$ math, and $$here_{is} some + more$$ End of math.
+Except I want to add this: $\frac{-b\pm\sqrt{b^2-4ac}}{2a\pi^i}$ Okay now I'm finished.
+
+Here is a test:
+
+
+>[[!format  python """
+def f(x):
+    if x &alpha; y:
+        print "hello, world\n"
+    else:
+        return False
+"""]]
+
+End of test.
+
+
 ## Announcements ##
 
 <!--
diff --git a/sandbox.mdwn b/sandbox.mdwn
new file mode 100644
index 00000000..4a289750
--- /dev/null
+++ b/sandbox.mdwn
@@ -0,0 +1,44 @@
+This is the SandBox, a page anyone can edit to learn how to use the wiki.  Here is $some^2 x^{e \pi} + 3y$ math, and $$here_{is} some + more$$. End of math.
+
+Here is [[!img y-combinator.jpg size="200x200" alt="clouds"]]. And rest of paragraph.
+
+Try some math:
+<img src="/cgi-bin/mathtex.cgi?x=\frac{-b\pm\sqrt{b^2-4ac}}{2a\pi^\i}">. Okay, that's it!
+
+----
+[[!inline pages="tagged(foo)" show=0 archive=yes]]
+
+<!--
+[[!inline  pages="test/* and !*/Discussion" show="3" rootpage="test"]]
+-->
+
+----
+
+Here's a paragraph.
+
+Here's another one with *emphasised* text.
+
+# Header
+
+## Subheader
+
+> This is a blockquote.
+>
+> This is the first level of quoting.
+>
+> > This is nested blockquote.
+>
+> Back to the first level.
+
+Numbered list 
+
+1. First item.
+1. Another.
+1. And another..
+
+Bulleted list
+
+* *item*
+* item
+
+[[ikiwiki/WikiLink]]