Added editing instructions on the wiki edit page.

sass/_wiki.scss

@@ -77,7 +77,32 @@ div.wiki-wrapper {
 
   section.wiki-body {
     @extend .content;
-
+    
+    form#wiki_revision {
+      float: left;
+      width: flex-grid(7, 9);
+      margin-right: flex-gutter(9);
+    }
+  
+    #wiki_edit_instructions {
+      float: left;
+      width: flex-grid(2, 9);
+      
+      .markdown-example {
+        background-color: $light-gray;
+        padding-top: 5px;
+        padding-right: 2px;
+        padding-bottom: 5px;
+        padding-left: 5px;
+        
+        margin-top: 5px;
+        margin-bottom: 7px;
+        margin-left: 5px;
+        
+        line-height: 1.0;
+      }
+    }
+    
     header {
       @extend .topbar;
 

simplewiki_edit.html

@@ -8,13 +8,37 @@ ${ wiki_article.title }
 
 <%block name="wiki_body">
 <form method="POST" id="wiki_revision">
-	<div style="display:none">
-	    <input type="hidden" name="csrfmiddlewaretoken" value="${csrf_token}"/>
-	</div>
+  <div style="display:none">
+      <input type="hidden" name="csrfmiddlewaretoken" value="${csrf_token}"/>
+  </div>
 
   ${wiki_form}
 
   <input type="submit" name="edit" value="Edit article" />
   <input type="submit" name="delete" value="Delete article" />
 </form>
+
+<div id="wiki_edit_instructions">
+  This wiki uses <strong>Markdown</strong> for styling. There are several <a href="http://daringfireball.net/projects/markdown/basics">useful</a> <a href="http://greg.vario.us/doc/markdown.txt">guides</a> <a href="http://www.lowendtalk.com/discussion/6/miniature-markdown-guide">online</a>.
+  <br>
+  <br>MITx Additions:
+  <p class="markdown-example">circuit:basic</p>
+  <p class="markdown-example"><span>$</span>LaTeX Math Expression<span>$</span></p>
+  To create a new wiki article, create a link to it. Clicking the link gives you the creation page.  
+  <p class="markdown-example">[Article](/wiki/view/Article/Child/)</p>
+  Other useful examples:<br>
+  <p class="markdown-example">[Link](http://google.com)</p>
+  <p class="markdown-example">Huge Header
+  <br>====</p>
+  <p class="markdown-example">Smaller Header
+  <br>-------</p>
+  <p class="markdown-example">*emphasis* or _emphasis_</p>
+  <p class="markdown-example">**strong** or __strong__</p>
+  <p class="markdown-example">- Unordered List
+  <br>&nbsp&nbsp- Sub Item 1
+  <br>&nbsp&nbsp- Sub Item 2</p>
+  <p class="markdown-example">1. Ordered
+  <br>2. List</p>
+</div>
+
 </%block>