From: mbarnson%sisna.com <>
Date: Tue, 5 Nov 2002 09:59:20 +0000 (+0000)
Subject: Patched lines per bug 177993.
X-Git-Tag: bugzilla-2.17.1~33
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f5bc5fe1f25d4c3dbe82dbfea47de811e76bc178;p=thirdparty%2Fbugzilla.git

Patched lines per bug 177993.
Customization of "mid-air collision" template file.
---

diff --git a/docs/sgml/administration.sgml b/docs/sgml/administration.sgml
index a0ff3e174b..14adb0b503 100644
--- a/docs/sgml/administration.sgml
+++ b/docs/sgml/administration.sgml
@@ -1100,6 +1100,19 @@
         By modifying this, you can tell your users how they should report
         bugs.
       </para>
+
+      <para>
+        <command>bug/process/midair.html.tmpl</command>:
+        This is the page used if two people submit simultaneous changes to the
+        same bug.  The second person to submit their changes will get this page
+        to tell them what the first person did, and ask if they wish to
+        overwrite those changes or go back and revisit the bug.  The default
+        title and header on this page read "Mid-air collision detected!"  If
+        you work in the aviation industry, or other environment where this
+        might be found offensive (yes, we have true stories of this happening)
+        you'll want to change this to something more appropriate for your
+        environment.
+      </para>
         
       <para>
         <command>bug/create/create.html.tmpl</command> and
diff --git a/docs/xml/administration.xml b/docs/xml/administration.xml
index a0ff3e174b..14adb0b503 100644
--- a/docs/xml/administration.xml
+++ b/docs/xml/administration.xml
@@ -1100,6 +1100,19 @@
         By modifying this, you can tell your users how they should report
         bugs.
       </para>
+
+      <para>
+        <command>bug/process/midair.html.tmpl</command>:
+        This is the page used if two people submit simultaneous changes to the
+        same bug.  The second person to submit their changes will get this page
+        to tell them what the first person did, and ask if they wish to
+        overwrite those changes or go back and revisit the bug.  The default
+        title and header on this page read "Mid-air collision detected!"  If
+        you work in the aviation industry, or other environment where this
+        might be found offensive (yes, we have true stories of this happening)
+        you'll want to change this to something more appropriate for your
+        environment.
+      </para>
         
       <para>
         <command>bug/create/create.html.tmpl</command> and