Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki

app/views/admin/edit_web.rhtml

@@ -18,7 +18,7 @@
                  onchange="proposeAddress();" />   
     <label for="address">Address:</label> <input type="text" class="disableAutoComplete" id="address" name="address" value="<%= @web.address %>" 
                     onchange="cleanAddress();" />
-    <small><em>(Letters and digits only)</em></small>
+    <em>(Letters and digits only)</em>
   </div>
 
   <h2 style="margin-bottom: 3px">Specialize</h2>

app/views/file/import.rhtml

@@ -15,7 +15,7 @@
     <input type="text" name="author" id="authorName" value="<%= @author %>" 
         onclick="this.value == 'AnonymousCoward' ? this.value = '' : true" />
 	<%- if @page -%>
-      | <%= link_to 'Cancel', :web => @web.address, :action => 'file'%> <small>(unlocks page)</small>
+      | <%= link_to 'Cancel', :web => @web.address, :action => 'file'%> <em>(unlocks page)</em>
     <%- end -%>
     
   </p>

app/views/wiki/rollback.rhtml

@@ -4,8 +4,6 @@
   @hide_navigation = true
 -%>
 
-<%= "<p style='color:red'>Please correct the error that caused this error in rendering:<br/><small>#{params["msg"]}</small></p>" if params["msg"] %>
-
 <div id="MarkupHelp">
 <%= render(:file => "#{@web.markup}_help") -%>
 <%= render(:file => 'wiki_words_help') unless @web.brackets_only? -%>