From: Jim Pryor <profjim@jimpryor.net>
Date: Wed, 1 Jun 2011 09:15:18 +0000 (-0400)
Subject: Merge branch 'pryor'
X-Git-Url: http://lambda.jimpryor.net/git/gitweb.cgi?p=lambda.git;a=commitdiff_plain;h=896a2f0df335532bbfce46c319f3b1bf6a4c805e;hp=2e6a5dfb2cbe7ba242572e6d50e97447ea8331dd

Merge branch 'pryor'
---

diff --git a/index.iki b/index.iki
index 3a2b976e..b7f7e652 100644
--- a/index.iki
+++ b/index.iki
@@ -6,7 +6,8 @@ This course is co-taught by [Chris Barker](http://homepages.nyu.edu/~cb125/) and
 The seminar meets on Mondays from 4-6, in 
 the Linguistics building at 10 Washington Place, in room 104 (back of the first floor).
 One student session will be held every Wednesday from 3-4 on the
-fourth floor at 10 Washington Place.
+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.
 
 ## 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]]