From e4b6f13fea2fe0dd35798c8673430dafa894b155 Mon Sep 17 00:00:00 2001
From: Thomas Schwinge
+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. +
+By contributing to this page, you agree to assign copyright for +your contribution to the Free Software Foundation. The Free Software +Foundation promises to always use a free documentation license (as per +our criteria of free documentation) when publishing your contribution. +We grant you back all your rights under copyright, including the +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> +if there are questions.
+ +By contributing to this page, you agree to assign copyright for
your contribution to the Free Software Foundation. The Free Software
diff --git a/local.css b/local.css
index 24a8df70..6f730216 100644
--- a/local.css
+++ b/local.css
@@ -61,7 +61,7 @@ pre + *
}
/* Used in `.templates/editpage.tmpl'.
-#copyright_assignment_notice
+.copyright_assignment_notice
{
background-color: #f0f0f0;
font-size: small;
--
cgit v1.2.3
From 78ad20d2d844faadc03323bb53f55b4e36b76785 Mon Sep 17 00:00:00 2001
From: Thomas Schwinge
-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. -
-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.