X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/badfb9a5c91b92d0e6a61f331bcaff6683ee11bc..8e072cf1b075389b0bcf9e94e3ce3cf97ef48d5c:/templates/editpage.tmpl diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl index 7f6c2a97a..a7f6d084f 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. -

- + @@ -62,8 +22,8 @@ Optional comment about this change:
-Attachments +Attachments
@@ -71,12 +31,22 @@ Optional comment about this change:
- +
 +
+

By submitting content to this wiki, you agree to release your work under + the dual license of

+
    +
  • the Creative Commons Attribution-Share Alike license, and
    • +
  • the GNU Free Documentation License, with no Invariant Sections, no + Front-Cover Texts, and no Back-Cover-Texts.
    • +
+
+