X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/96c529826d3104bee299b4d3ea09c95229b9b64d..7481329bdd11d81c4b3e85a446ab1e4bfcc298c8:/templates/editpage.tmpl diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl index 1c30d1d85..d6ad80614 100644 --- a/templates/editpage.tmpl +++ b/templates/editpage.tmpl @@ -1,46 +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. -

- + +
@@ -48,17 +8,18 @@ together before saving. -Page location: -Page type: + + -
 +

+
-Optional comment about this change:
-
+ +
 @@ -77,6 +38,7 @@ Optional comment about this change:
+
@@ -87,3 +49,12 @@ Optional comment about this change:
 + +
+
+Diff: +
+
+ +
+