Merge heads

simplewiki_base.html

@@ -102,10 +102,7 @@
           <div id="wiki_create_form">
             <%
               theaction = "this.wiki_article_name.value.replace(/([^a-zA-Z0-9\-])/g, '')"
-              if (wiki_article is not UNDEFINED):
-                baseURL = reverse("wiki_create", args=[wiki_article.get_url()])
-              else:
-                baseURL = reverse("wiki_create", args=["/"])
+              baseURL = reverse("wiki_create", args=["/"])
             %>
 
             <form method="GET" onsubmit="this.action='${baseURL + "' + " + theaction};">

simplewiki_instructions.html

@@ -5,7 +5,7 @@
   <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 Name](wiki:ArticleName)</p>
+  <p class="markdown-example">[Article Name](/wiki/view/ArticleName)</p>
   Other useful examples:<br>
   <p class="markdown-example">[Link](http://google.com)</p>
   <p class="markdown-example">Huge Header