Bug 264227: The MySQL statement for granting permission to the 'bugs' user was being...

Patch by GavinS <bugzilla@chimpychompy.org>
r=jake

diff --git a/docs/xml/installation.xml b/docs/xml/installation.xml
index f9e1efd7d4df35829d1ed123556c23a63a2d93ac..7a5ec30ca47d14a662440ecd85abff6c2a36b067 100644 (file)
--- a/docs/xml/installation.xml
+++ b/docs/xml/installation.xml
@@ -670,52 +670,25 @@ AllowOverride Limit
 
       <para>Remember to set &lt;bugs_password&gt; to some unique password.</para>
 
-      <para>If you are using MySQL 4.0 or newer, enter:
-      <simplelist>
-        <member>
-          <computeroutput>
-            <prompt>mysql&gt;</prompt>
-
-            <command>GRANT SELECT,INSERT,UPDATE,DELETE,INDEX,
-            ALTER,CREATE,DROP,LOCK TABLES,CREATE TEMPORARY
-            TABLES,REFERENCES ON bugs.* TO bugs@localhost
-            IDENTIFIED BY '&lt;bugs_password&gt;';</command>
-          </computeroutput>
-        </member>
-
-        <member>
-          <computeroutput>
-            <prompt>mysql&gt;</prompt>
-
-            <command>FLUSH PRIVILEGES;</command>
-          </computeroutput>
-        </member>
-      </simplelist>
-      </para>
-
-      <para>If you are using an older version of MySQL,
-        the LOCK TABLES and CREATE TEMPORARY TABLES permissions
-        need to be removed from the list:
-        <simplelist>
-          <member>
-            <computeroutput>
-              <prompt>mysql&gt;</prompt>
-
-              <command>GRANT SELECT,INSERT,UPDATE,DELETE,INDEX,
-              ALTER,CREATE,DROP,REFERENCES ON bugs.* TO bugs@localhost
-              IDENTIFIED BY '&lt;bugs_password&gt;';</command>
-            </computeroutput>
-          </member>
-
-          <member>
-            <computeroutput>
-              <prompt>mysql&gt;</prompt>
-
-              <command>FLUSH PRIVILEGES;</command>
-            </computeroutput>
-          </member>
-        </simplelist>
-      </para>
+      <para>If you are using MySQL 4.0 or newer, enter:</para>
+
+        <screen>  <prompt>mysql&gt;</prompt> <command>GRANT SELECT, INSERT,
+         UPDATE, DELETE, INDEX, ALTER, CREATE, LOCK TABLES,
+         CREATE TEMPORARY TABLES, DROP, REFERENCES ON bugs.*
+         TO bugs@localhost IDENTIFIED BY '<replaceable>$db_pass</replaceable>';</command>
+  <prompt>mysql&gt;</prompt> <command>FLUSH PRIVILEGES;</command></screen>
+
+        <para>If you are using an older version of MySQL,
+          the <computeroutput>LOCK TABLES</computeroutput> and 
+          <computeroutput>CREATE TEMPORARY TABLES</computeroutput>
+          permissions will be unavailable and should be removed from the permissions
+          list. In this case, the following command line can be used:</para>
+
+        <screen>  <prompt>mysql&gt;</prompt> <command>GRANT SELECT, INSERT,
+         UPDATE, DELETE, INDEX, ALTER, CREATE, DROP,
+         REFERENCES ON bugs.* TO bugs@localhost IDENTIFIED BY
+         '<replaceable>$db_pass</replaceable>';</command>
+    <prompt>mysql&gt;</prompt> <command>FLUSH PRIVILEGES;</command></screen>
     </section>
 
     <section>