From 3dd15bc2beb01d38dc62a810b207cbb6532a408f Mon Sep 17 00:00:00 2001
From: "mbarnson%sisna.com"
 <mbarnson%sisna.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Tue, 5 Nov 2002 01:59:20 +0000
Subject: [PATCH] Patched lines per bug 177993. Customization of "mid-air
 collision" template file.

git-svn-id: svn://10.0.0.236/trunk@132979 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../webtools/bugzilla/docs/sgml/administration.sgml | 13 +++++++++++++
 .../webtools/bugzilla/docs/xml/administration.xml   | 13 +++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/mozilla/webtools/bugzilla/docs/sgml/administration.sgml b/mozilla/webtools/bugzilla/docs/sgml/administration.sgml
index a0ff3e174bc..14adb0b503d 100644
--- a/mozilla/webtools/bugzilla/docs/sgml/administration.sgml
+++ b/mozilla/webtools/bugzilla/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/mozilla/webtools/bugzilla/docs/xml/administration.xml b/mozilla/webtools/bugzilla/docs/xml/administration.xml
index a0ff3e174bc..14adb0b503d 100644
--- a/mozilla/webtools/bugzilla/docs/xml/administration.xml
+++ b/mozilla/webtools/bugzilla/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