Backout bug 232378, as it doesn't appear to be working correctly.

14 files changed, 122 insertions, 105 deletions

diff --git a/docs/en/xml/Bugzilla-Guide.xml b/docs/en/xml/Bugzilla-Guide.xml
index 6a5b066f4..58a75448e 100644
--- a/docs/en/xml/Bugzilla-Guide.xml
+++ b/docs/en/xml/Bugzilla-Guide.xml
@@ -1,4 +1,4 @@
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" [
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
 
 <!-- Include macros -->
 <!ENTITY about SYSTEM "about.xml">
@@ -9,10 +9,12 @@
 <!ENTITY glossary SYSTEM "glossary.xml">
 <!ENTITY installation SYSTEM "installation.xml">
 <!ENTITY administration SYSTEM "administration.xml">
+<!ENTITY security SYSTEM "security.xml">
 <!ENTITY using SYSTEM "using.xml">
 <!ENTITY integration SYSTEM "integration.xml">
 <!ENTITY index SYSTEM "index.xml">
 <!ENTITY customization SYSTEM "customization.xml">
+<!ENTITY troubleshooting SYSTEM "troubleshooting.xml">
 <!ENTITY patches SYSTEM "patches.xml">
 <!ENTITY introduction SYSTEM "introduction.xml">
 <!ENTITY modules SYSTEM "modules.xml">
@@ -21,47 +23,52 @@
      * bz-ver to current stable
      * bz-nexver to next stable
      * bz-date to the release date
-     * bz-devel to "IGNORE"
+     * Remove the BZ-DEVEL comments
      - COMPILE DOCS AND CHECKIN -
        Also, tag and tarball before completing
      * bz-ver to devel version
-     * bz-devel to "INCLUDE"
  
      For a devel release, simple bump bz-ver and bz-date
 -->
 
-<!ENTITY bz-ver "2.19">
-<!ENTITY bz-nextver "2.20">
-<!ENTITY bz-date "2004-07-10">
-<!ENTITY % bz-devel "INCLUDE">
+<!ENTITY bz-ver "2.22rc1">
+<!ENTITY bz-nextver "2.22">
+<!ENTITY bz-date "2006-02-20">
+<!ENTITY current-year "2006">
 
 <!ENTITY landfillbase "http://landfill.bugzilla.org/bugzilla-tip/">
 <!ENTITY bz "http://www.bugzilla.org/">
 <!ENTITY bzg-bugs "<ulink url='http://bugzilla.mozilla.org/enter_bug.cgi?product=Bugzilla&amp;component=Documentation'>Bugzilla Documentation</ulink>">
 <!ENTITY mysql "http://www.mysql.com/">
-<!ENTITY newest-perl-ver "5.8.3">
 
 <!-- For minimum versions -->
-<!ENTITY min-mysql-ver "3.23.41">
-<!ENTITY min-perl-ver "5.6.0">
+<!ENTITY min-mysql-ver "4.0.14">
+<!ENTITY min-pg-ver "7.3.x">
+<!ENTITY min-perl-ver "5.6.1">
+<!ENTITY min-perl-ver-win "5.8.1">
 <!ENTITY min-template-ver "2.08">
 <!ENTITY min-file-temp-ver "any">
 <!ENTITY min-appconfig-ver "1.52">
 <!ENTITY min-text-wrap-ver "2001.0131">
-<!ENTITY min-file-spec-ver "0.82">
+<!ENTITY min-file-spec-ver "0.84">
 <!ENTITY min-data-dumper-ver "any">
-<!ENTITY min-dbd-mysql-ver "2.1010">
-<!ENTITY min-dbi-ver "1.32">
+<!ENTITY min-dbd-mysql-ver "2.9003">
+<!ENTITY min-dbd-pg-ver "1.31">
+<!ENTITY min-dbi-ver "1.38">
 <!ENTITY min-date-format-ver "2.21">
 <!ENTITY min-cgi-ver "2.93">
+<!ENTITY min-mail-mailer-ver "1.67">
+<!ENTITY min-mime-base64-ver "3.01">
+<!ENTITY min-mime-parser-ver "5.406">
+<!ENTITY min-storable-ver "any">
 <!-- Optional modules -->
 <!ENTITY min-gd-ver "1.20">
 <!ENTITY min-gd-graph-ver "any">
 <!ENTITY min-gd-text-align-ver "any">
 <!ENTITY min-chart-base-ver "1.0">
 <!ENTITY min-xml-parser-ver "any">
-<!ENTITY min-mime-parser-ver "any">
 <!ENTITY min-patchreader-ver "0.9.4">
+<!ENTITY min-image-magick-ver "any">
 
 ]>
 
@@ -94,7 +101,8 @@
 
   <bookinfo>
     <title>The Bugzilla Guide - &bz-ver; 
-    <![%bz-devel;[Development ]]>Release</title>
+    <!-- BZ-DEVEL -->Development <!-- /BZ-DEVEL -->
+    Release</title>
 
     <authorgroup>
       <corpauthor>The Bugzilla Team</corpauthor>
@@ -141,6 +149,9 @@
 <!-- Administering Bugzilla -->
 &administration;
 
+<!-- Securing Bugzilla -->
+&security;
+
 <!-- Customizing Bugzilla -->
 &customization;
 
@@ -150,6 +161,9 @@
 <!-- Appendix: The Frequently Asked Questions -->
 &faq;
 
+<!-- Appendix: Troubleshooting -->
+&troubleshooting;
+
 <!-- Appendix: Custom Patches -->
 &patches;
 
@@ -188,3 +202,4 @@ sgml-shorttag:t
 sgml-tag-region-if-active:t
 End:
 -->
+
diff --git a/docs/en/xml/about.xml b/docs/en/xml/about.xml
index b1dab24f6..6e502ee75 100644
--- a/docs/en/xml/about.xml
+++ b/docs/en/xml/about.xml
@@ -1,9 +1,6 @@
-<?xml version="1.0"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-                         "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-    <!ENTITY % myents SYSTEM "bugzilla.ent">
-    %myents;
-]>
+<!-- <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
+<!ENTITY conventions SYSTEM "conventions.xml"> ] > -->
+<!-- $Id: about.xml,v 1.21 2008/04/04 06:48:13 mozilla%colinogilvie.co.uk Exp $ -->
 
 <chapter id="about">
 <title>About This Guide</title>
@@ -212,9 +209,9 @@
     </para>
   </section>
 
-<!-- conventions used here (didn't want to give it a chapter of its own) -->
-<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="conventions.xml" /> 
-</chapter> 
+  <!-- conventions used here (didn't want to give it a chapter of its own) -->
+&conventions;
+ </chapter> 
 
 <!-- Keep this comment at the end of the file 
 Local variables: 
diff --git a/docs/en/xml/administration.xml b/docs/en/xml/administration.xml
index e8d70a102..a32a61a59 100644
--- a/docs/en/xml/administration.xml
+++ b/docs/en/xml/administration.xml
@@ -82,6 +82,22 @@
 
       <varlistentry>
         <term>
+          maildeliverymethod
+        </term>
+        <listitem>
+          <para>
+            This is used to specify how email is sent, or if it is sent at 
+            all.  There are several options included for different MTAs, 
+            along with two additional options that disable email sending.  
+            "testfile" does not send mail, but instead saves it in 
+            <filename>data/mailer.testfile</filename> for later review.  
+            "none" disables email sending entirely.
+          </para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>
           shadowdb
         </term>
         <listitem>
@@ -193,7 +209,7 @@
         <listitem>
           <para>
             This allows you to define an email address for each component, 
-            in addition to that of the default owner, who will be sent
+            in addition to that of the default assignee, who will be sent
             carbon copies of incoming bugs.
           </para>
         </listitem>
@@ -520,6 +536,46 @@
           </listitem>
         </itemizedlist>
       </section>
+      
+      <section id="impersonatingusers">
+        <title>Impersonating Users</title>
+        
+        <para>
+        There may be times when an administrator would like to do something as
+        another user.  The <command>sudo</command> feature may be used to do 
+        this.
+        </para>
+        
+        <note>
+          <para>
+          To use the sudo feature, you must be in the
+          <emphasis>bz_sudoers</emphasis> group.  By default, all
+          administrators are in this group.</para>
+        </note>
+        
+        <para>
+        If you have access to this feature, you may start a session by
+        going to the Edit Users page, Searching for a user and clicking on 
+        their login.  You should see a link below their login name titled 
+        "Impersonate this user".  Click on the link.  This will take you 
+        to a page where you will see a description of the feature and 
+        instructions for using it.  After reading the text, simply 
+        enter the login of the user you would like to impersonate, provide 
+        a short message explaining why you are doing this, and press the 
+        button.</para>
+        
+        <para>
+        As long as you are using this feature, everything you do will be done 
+        as if you were logged in as the user you are impersonating.</para>
+        
+        <warning>
+          <para>
+          The user you are impersonating will not be told about what you are 
+          doing.  If you do anything that results in mail being sent, that 
+          mail will appear to be from the user you are impersonating.  You 
+          should be extremely careful while using this feature.</para>
+        </warning>
+      </section>
     </section>
   </section>
 
@@ -580,12 +636,12 @@
     company.</para>
 
     <para>
-    Each component has a owner and (if you turned it on in the parameters),
-    a QA Contact. The owner should be the primary person who fixes bugs in
+    Each component has a default assignee and (if you turned it on in the parameters),
+    a QA Contact. The default assignee should be the primary person who fixes bugs in
     that component. The QA Contact should be the person who will ensure
-    these bugs are completely fixed. The Owner, QA Contact, and Reporter
+    these bugs are completely fixed. The Assignee, QA Contact, and Reporter
     will get email when new bugs are created in this Component and when
-    these bugs change. Default Owner and Default QA Contact fields only
+    these bugs change. Default Assignee and Default QA Contact fields only
     dictate the 
     <emphasis>default assignments</emphasis>; 
     these can be changed on bug submission, or at any later point in
@@ -605,9 +661,9 @@
 
       <listitem>
         <para>Fill out the "Component" field, a short "Description", 
-        the "Initial Owner" and "Initial QA Contact" (if enabled.) 
+        the "Default Assignee" and "Default QA Contact" (if enabled.) 
         The Component and Description fields may contain HTML; 
-        the "Initial Owner" field must be a login name
+        the "Default Assignee" field must be a login name
         already existing in the database. 
         </para>
       </listitem>
@@ -874,7 +930,7 @@
        </para>
        <para>
          Only users with the ability to edit the bug may 
-         set flags on bugs. This includes the owner, reporter, and 
+         set flags on bugs. This includes the assignee, reporter, and 
          any user with the <computeroutput>editbugs</computeroutput> 
          permission.
        </para>
@@ -902,7 +958,7 @@
        
         <para>
           When you click on the <quote>Create a Flag Type for...</quote>
-          link, you will be presented with a form. Here is what the felds in 
+          link, you will be presented with a form. Here is what the fields in 
           the form mean:
         </para>
 
@@ -919,7 +975,7 @@
           <title>Description</title>
           <para>
             This describes the flag in more detail. At present, this doesn't
-            whos up anywhere helpful; ideally, it would be nice to have
+            show up anywhere helpful; ideally, it would be nice to have
             it show up as a tooltip. This field 
             can be as long as you like, and can contain any character you want.
           </para>
@@ -1255,7 +1311,9 @@
              resulted in a user acquiring permanent membership in a group.
              To remove a user from a group the user was in due to a regular
              expression in version 2.16 or earlier, the user must be explicitly
-             removed from the group.</para>
+             removed from the group. This can easily be done by pressing
+             buttons named 'Remove Memberships' or 'Remove Memberships
+             included in regular expression' under the table.</para>
            </note>
            <warning>
              <para>If specifying a domain in the regexp, make sure you end
@@ -1354,7 +1412,7 @@
       </orderedlist>
       <para>These controls are often described in this order, so a 
       product that requires a user to be a member of group "foo" 
-      to enter a bug and then requires that the bug stay resticted
+      to enter a bug and then requires that the bug stay restricted
       to group "foo" at all times and that only members of group "foo"
       can edit the bug even if they otherwise could see the bug would 
       have its controls summarized by...</para>
diff --git a/docs/en/xml/conventions.xml b/docs/en/xml/conventions.xml
index 9f92a4755..24986d66b 100644
--- a/docs/en/xml/conventions.xml
+++ b/docs/en/xml/conventions.xml
@@ -1,10 +1,4 @@
-<?xml version="1.0"?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-                         "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-    <!ENTITY % myents SYSTEM "bugzilla.ent">
-    %myents;
-]>
-
+<!-- <!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook V4.1//EN"> -->
 <section id="conventions">
   <title>Document Conventions</title>
 
diff --git a/docs/en/xml/customization.xml b/docs/en/xml/customization.xml
index b677ce804..37c64cca0 100644
--- a/docs/en/xml/customization.xml
+++ b/docs/en/xml/customization.xml
@@ -1,10 +1,4 @@
-<?xml version="1.0"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-                      "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-    <!ENTITY % myents SYSTEM "bugzilla.ent">
-    %myents;
-]>
-
+<!-- <!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook V4.1//EN"> -->
 <chapter id="customization">
   <title>Customising Bugzilla</title>
 
@@ -1099,8 +1093,8 @@ this. But you need to know this stuff anyway, right?
     </section>
   </section>
 
-<!-- Integrating Bugzilla with Third-Party Tools -->
-<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="integration.xml" />
+  <!-- Integrating Bugzilla with Third-Party Tools -->
+  &integration;
 
 </chapter>
 
diff --git a/docs/en/xml/gfdl.xml b/docs/en/xml/gfdl.xml
index 0de66acd3..1d84d1255 100644
--- a/docs/en/xml/gfdl.xml
+++ b/docs/en/xml/gfdl.xml
@@ -1,10 +1,4 @@
-<?xml version="1.0"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-                      "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-    <!ENTITY % myents SYSTEM "bugzilla.ent">
-    %myents;
-]>
-
+<!-- <!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook V4.1//EN"> -->
 <appendix id="gfdl">
   <title>GNU Free Documentation License</title>
 
diff --git a/docs/en/xml/glossary.xml b/docs/en/xml/glossary.xml
index 980835053..79fb2baeb 100644
--- a/docs/en/xml/glossary.xml
+++ b/docs/en/xml/glossary.xml
@@ -1,10 +1,4 @@
-<?xml version="1.0"?>
-<!DOCTYPE glossary PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-                         "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-    <!ENTITY % myents SYSTEM "bugzilla.ent">
-    %myents;
-]>
-
+<!-- <!DOCTYPE glossary PUBLIC "-//OASIS//DTD DocBook V4.1//EN" > -->
 <glossary id="glossary">
   <glossdiv>
     <title>0-9, high ascii</title>
diff --git a/docs/en/xml/index.xml b/docs/en/xml/index.xml
index e8a228493..7fc1a4c14 100644
--- a/docs/en/xml/index.xml
+++ b/docs/en/xml/index.xml
@@ -18,3 +18,4 @@ sgml-shorttag:t
 sgml-tag-region-if-active:t
 End:
 -->
+
diff --git a/docs/en/xml/installation.xml b/docs/en/xml/installation.xml
index e6d35544f..97ce5955d 100644
--- a/docs/en/xml/installation.xml
+++ b/docs/en/xml/installation.xml
@@ -1,10 +1,5 @@
-<?xml version="1.0"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-                      "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-    <!ENTITY % myents SYSTEM "bugzilla.ent">
-    %myents;
-]>
-
+<!-- <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"> -->
+<!-- $Id: installation.xml,v 1.109 2008/04/04 06:47:39 mozilla%colinogilvie.co.uk Exp $ -->
 <chapter id="installing-bugzilla">
   <title>Installing Bugzilla</title>
 
diff --git a/docs/en/xml/modules.xml b/docs/en/xml/modules.xml
index ac5040f02..59c58530e 100644
--- a/docs/en/xml/modules.xml
+++ b/docs/en/xml/modules.xml
@@ -1,10 +1,4 @@
-<?xml version="1.0"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-                      "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-    <!ENTITY % myents SYSTEM "bugzilla.ent">
-    %myents;
-]>
-
+<!-- <!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook V4.1//EN"> -->
 <appendix id="install-perlmodules-manual">
   <title>Manual Installation of Perl Modules</title>
   
diff --git a/docs/en/xml/patches.xml b/docs/en/xml/patches.xml
index f3e17290c..11a5ecf11 100644
--- a/docs/en/xml/patches.xml
+++ b/docs/en/xml/patches.xml
@@ -1,10 +1,4 @@
-<?xml version="1.0"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-                      "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-    <!ENTITY % myents SYSTEM "bugzilla.ent">
-    %myents;
-]>
-
+<!-- <!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook V4.1//EN"> -->
 <appendix id="patches" xreflabel="Useful Patches and Utilities for Bugzilla">
   <title>Contrib</title>
 
diff --git a/docs/en/xml/security.xml b/docs/en/xml/security.xml
index a1f2f5770..394976d6b 100644
--- a/docs/en/xml/security.xml
+++ b/docs/en/xml/security.xml
@@ -1,9 +1,5 @@
-<?xml version="1.0"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-                      "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-    <!ENTITY % myents SYSTEM "bugzilla.ent">
-    %myents;
-]>
+<!-- <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"> -->
+<!-- $Id: security.xml,v 1.10 2008/04/04 06:48:17 mozilla%colinogilvie.co.uk Exp $ -->
 
 <chapter id="security">
 <title>Bugzilla Security</title>
diff --git a/docs/en/xml/troubleshooting.xml b/docs/en/xml/troubleshooting.xml
index 10ad59f1c..c4ed53b00 100644
--- a/docs/en/xml/troubleshooting.xml
+++ b/docs/en/xml/troubleshooting.xml
@@ -1,9 +1,5 @@
-<?xml version="1.0"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-                      "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-    <!ENTITY % myents SYSTEM "bugzilla.ent">
-    %myents;
-]>
+<!-- <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"> -->
+<!-- $Id: troubleshooting.xml,v 1.8 2008/04/04 06:48:20 mozilla%colinogilvie.co.uk Exp $ -->
 
 <appendix id="troubleshooting">
 <title>Troubleshooting</title>
diff --git a/docs/en/xml/using.xml b/docs/en/xml/using.xml
index 8f50cfa44..dc56e4f06 100644
--- a/docs/en/xml/using.xml
+++ b/docs/en/xml/using.xml
@@ -1,9 +1,4 @@
-<?xml version="1.0"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-                      "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-    <!ENTITY % myents SYSTEM "bugzilla.ent">
-    %myents;
-]>
+<!-- <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook V4.1//EN"> -->
 
 <chapter id="using">
   <title>Using Bugzilla</title>