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. + + + bug/process/midair.html.tmpl: + 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. + bug/create/create.html.tmpl 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. + + + bug/process/midair.html.tmpl: + 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. + bug/create/create.html.tmpl and