+
X-Git-Url: http://git.tremily.us/?p=ikiwiki.git;a=blobdiff_plain;f=templates%2Feditpage.tmpl;h=d6ad8061420f2c8056b6c1d12f3da6223ba0582f;hp=3b3570a448557f98f7dc674cc95de81b04a09721;hb=252e3f600670040b2a184e5ca0581db720096a80;hpb=26213f8ee443addfbc74e92a693e172d023b16e6 diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl index 3b3570a44..d6ad80614 100644 --- a/templates/editpage.tmpl +++ b/templates/editpage.tmpl @@ -1,90 +1,60 @@ - - -
--Your changes conflict with other changes made to the page. -
--Conflict markers have been inserted into the page content. Reconcile the -conflict and commit again to save your changes. -
--Failed to save your changes. -
--Your changes were not able to be saved to disk. The system gave the error: -
--Your changes are preserved below, and you can try again to save them. - --
-The page you were editing has disappeared. -
--Perhaps someone else has deleted it or moved it. If you want to recreate -this page with your text, click "Save Page" again. -
--While you were creating this page, someone else independently created a page -with the same name. -
--The edit box below contains the page's current content, followed by the -content you entered previously, to allow you to merge the two contents -together before saving. -
-