X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/fa96eab12016e2f29a0a3522f1229039fbbf2c5e..d4c61b72813b880d86b316770f2e3819a6428202:/templates/editpage.tmpl diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl index a5c44dc4c..68b7d1942 100644 --- a/templates/editpage.tmpl +++ b/templates/editpage.tmpl @@ -8,17 +8,29 @@ - +

-Your changes confict with other changes made to the page. +Your changes conflict with other changes made to the page.

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. +

+ + +

+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.

@@ -41,7 +53,7 @@ Page type: Optional comment about this change:

- +