X-Git-Url: http://git.tremily.us/?a=blobdiff_plain;f=templates%2Feditpage.tmpl;h=d6ad8061420f2c8056b6c1d12f3da6223ba0582f;hb=3d7147992ab24d953c87b91f75851ca45895073c;hp=f8eda1b47c9a0aadee0d505e0c915815cbf80401;hpb=edfbd7e1aa8f9f2cb789f45c0668a0d987e0b368;p=ikiwiki.git diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl index f8eda1b47..d6ad80614 100644 --- a/templates/editpage.tmpl +++ b/templates/editpage.tmpl @@ -1,45 +1,6 @@ - -

-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 -together before saving. -

- + +
@@ -47,22 +8,23 @@ together before saving. -Page location: -Page type: + + -
 +

+
-Optional comment about this change:
-
+ +
 -Attachments +Attachments
@@ -70,12 +32,13 @@ Optional comment about this change:
- +
 +
@@ -86,3 +49,12 @@ Optional comment about this change:
 + +
+
+Diff: +
+
+ +
+