From bd7ffaec11a01272faad8b5d182beb4cb3f836db Mon Sep 17 00:00:00 2001 From: Thomas Schwinge Date: Sat, 14 Mar 2009 15:07:35 +0100 Subject: Update to ikiwiki's 7ca39f49db67de756795ad419791082e115fbd98. --- .templates/editpage.tmpl | 61 +++++++++++++++--------------------------------- 1 file changed, 19 insertions(+), 42 deletions(-) (limited to '.templates') diff --git a/.templates/editpage.tmpl b/.templates/editpage.tmpl index 906f39ce..45060ffe 100644 --- a/.templates/editpage.tmpl +++ b/.templates/editpage.tmpl @@ -1,44 +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. -

- +
+ + @@ -71,14 +33,29 @@ rights to copy, modify, and redistribute your contributions.

We're requiring these copyright assignments, so that we'll easily be able to include your contributions in official GNU documentation, such as the GNU Hurd manual, etc. Send email to <hurd-maintainers@gnu.org> +href="mailto:hurd-maintainers@gnu.org">hurd-maintainers@gnu.org if there are questions.

+ +Attachments +
+ + + + + + + + +
+
+ +
-- cgit v1.2.3