web commit by JoshTriplett: Does discussion end up in examples?

[ikiwiki.git] / templates / editpage.tmpl
diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl

index a5c44dc4c650b765ef7f00fc8ef4c381cf33494c..f63a4b08990f1d2e0f0cd053b5255aec2f29000d 100644 (file)
--- a/templates/editpage.tmpl
+++ b/templates/editpage.tmpl
@@ -8,17 +8,17 @@
  <link rel="stylesheet" href="<TMPL_VAR BASEURL>style.css" type="text/css" />
  <link rel="stylesheet" href="<TMPL_VAR BASEURL>local.css" type="text/css" />
  <TMPL_IF NAME="FAVICON">
-<link rel="icon" href="<TMPL_VAR BASEURL><TMPL_VAR FAVICON>" type="image/x-ico" />
+<link rel="icon" href="<TMPL_VAR BASEURL><TMPL_VAR FAVICON>" type="image/x-icon" />
  </TMPL_IF>
  </head>
  <body>
  <TMPL_IF NAME="PAGE_CONFLICT">
  <p>
-<b>Your changes confict with other changes made to the page.</b>
+<b>Your changes conflict with other changes made to the page.</b>
  </p>
  <p>
  Conflict markers have been inserted into the page content. Reconcile the
-confict and commit again to save your changes.
+conflict and commit again to save your changes.
  </p>
  </TMPL_IF>
  <TMPL_VAR FORM-START>
@@ -41,7 +41,7 @@ Page type: <TMPL_VAR FIELD-TYPE>
  Optional comment about this change:<br />
  <TMPL_VAR FIELD-COMMENTS><br />
  </TMPL_IF>
-<TMPL_VAR FORM-SUBMIT>
+<input id="_submit" name="_submit" type="submit" value="Save Page" /><input id="_submit_2" name="_submit" type="submit" value="Preview" /><input id="_submit_3" name="_submit" type="submit" value="Cancel" />
  <TMPL_VAR HELPONFORMATTINGLINK>
  <TMPL_VAR FORM-END>
  <TMPL_IF NAME="PAGE_PREVIEW">