Documentation patch for bug 24496: Forbid resolving fixed when there're unresolved...

diff --git a/docs/en/xml/administration.xml b/docs/en/xml/administration.xml
index 50c2879150b18aa25cd59891ecf0a90bb97ddf98..e28e6fc8d3b6bfbd57b3fb5f92eab877443a6a83 100644 (file)
--- a/docs/en/xml/administration.xml
+++ b/docs/en/xml/administration.xml
@@ -199,6 +199,20 @@
         with bugs outside her privileges. They would still only receive email
         updates for those bugs she could normally view.</para>        
       </step>
+
+      <step>
+        <para>
+          <command>noresolveonopenblockers</command>:
+
+          This option will prevent users from resolving bugs as FIXED if
+          they have unresolved dependencies. Only the FIXED resolution
+          is affected. Users will be still able to resolve bugs to
+          resolutions other than FIXED if they have unresolved dependent
+          bugs.
+
+        </para>
+      </step>
+
     </procedure>
   </section>
 
@@ -313,25 +327,35 @@
 
           <listitem>
             <para>
-            <emphasis>Disable Text</emphasis>: 
-            If you type anything in this box, including just a space, the
-            user is prevented from logging in, or making any changes to 
-            bugs via the web interface. 
-            The HTML you type in this box is presented to the user when
-            they attempt to perform these actions, and should explain
-            why the account was disabled.
-            <warning>
-              <para>Don't disable all the administrator accounts!</para>
-            </warning>
-
+              <emphasis>Disable Text</emphasis>: 
+              If you type anything in this box, including just a space, the
+              user is prevented from logging in, or making any changes to 
+              bugs via the web interface. 
+              The HTML you type in this box is presented to the user when
+              they attempt to perform these actions, and should explain
+              why the account was disabled.
+            </para>
+            <para>
+              Users with disabled accounts will continue to receive
+              mail from Bugzilla; furthermore, they will not be able
+              to log in themselves to change their own preferences and
+              stop it. If you want an account (disabled or active) to
+              stop receiving mail, add the account name (one account
+              per line) to the file <filename>data/nomail</filename>.
+            </para>
             <note>
-              <para>The user can still submit bugs via
-              the e-mail gateway, if you set it up, even if the disabled text
-              field is filled in. The e-mail gateway should 
-              <emphasis>not</emphasis>
-              be enabled for secure installations of Bugzilla.</para>
+              <para>
+                Even users whose accounts have been disabled can still
+                submit bugs via the e-mail gateway, if one exists.
+                The e-mail gateway should <emphasis>not</emphasis> be
+                enabled for secure installations of Bugzilla.
+              </para>
             </note>
-            </para>
+            <warning>
+              <para>
+                Don't disable all the administrator accounts!
+              </para>
+            </warning>
           </listitem>
 
           <listitem>