Merge

simplewiki_create.html

@@ -2,7 +2,7 @@
 
 <%inherit file="simplewiki_base.html"/>
 
-<%block name="title"><title>Create Article - MITx 6.002 Wiki</title></%block>
+<%block name="title"><title>Create Article - MITx 6.002x Wiki</title></%block>
 
 <%block name="wiki_page_title">
 <h1>Create article</h1>

simplewiki_edit.html

@@ -2,7 +2,7 @@
 
 <%inherit file="simplewiki_base.html"/>
 
-<%block name="title"><title>${"Edit " + wiki_title + " - " if wiki_title is not UNDEFINED else ""}MITx 6.002 Wiki</title></%block>
+<%block name="title"><title>${"Edit " + wiki_title + " - " if wiki_title is not UNDEFINED else ""}MITx 6.002x Wiki</title></%block>
 
 <%block name="wiki_page_title">
 <h1>${ wiki_article.title }</h1>

simplewiki_error.html

@@ -6,7 +6,7 @@
     from django.core.urlresolvers import reverse
 %>
 
-<%block name="title"><title>Oops... - MITx 6.002 Wiki</title></%block>
+<%block name="title"><title>Oops... - MITx 6.002x Wiki</title></%block>
 
 
 <%block name="wiki_page_title">

simplewiki_history.html

@@ -2,7 +2,7 @@
 
 <%inherit file="simplewiki_base.html"/>
 
-<%block name="title"><title>${"Revision history of " + wiki_title + " - " if wiki_title is not UNDEFINED else ""}MITx 6.002 Wiki</title></%block>
+<%block name="title"><title>${"Revision history of " + wiki_title + " - " if wiki_title is not UNDEFINED else ""}MITx 6.002x Wiki</title></%block>
 
 <%!
     from django.core.urlresolvers import reverse

simplewiki_searchresults.html

@@ -2,7 +2,7 @@
 
 <%inherit file="simplewiki_base.html"/>
 
-<%block name="title"><title>Search Results - MITx 6.002 Wiki</title></%block>
+<%block name="title"><title>Search Results - MITx 6.002x Wiki</title></%block>
 
 <%!
 from django.core.urlresolvers import reverse