diff --git a/webtools/bugzilla/docs/html/Bugzilla-Guide.html b/webtools/bugzilla/docs/html/Bugzilla-Guide.html
index 694648c261a..9fe33476c4b 100644
--- a/webtools/bugzilla/docs/html/Bugzilla-Guide.html
+++ b/webtools/bugzilla/docs/html/Bugzilla-Guide.html
@@ -85,7 +85,7 @@ NAME="AEN14"
 HREF="http://bugzilla.mozilla.org/enter_bug.cgi?product=Bugzilla&component=Documentation"
 TARGET="_top"
 >Bugzilla Documentation</A
-> compontent.
+> component.
       </P
 ><P
 >This is a development version of this guide.  Information in it
@@ -3180,7 +3180,7 @@ CLASS="prompt"
 
             <B
 CLASS="command"
->UPDATE user SET Password=PASSWORD('&#60;new_password'&#62;)
+>UPDATE user SET Password=PASSWORD('&#60;new_password&#62;')
             WHERE user='root';</B
 >
           </TT
@@ -4034,10 +4034,10 @@ CLASS="filename"
       which can limit connections by ip-address. You may download this module
       at 
       <A
-HREF="http://www.snert.com/Software/Throttle/"
+HREF="http://www.snert.com/Software/mod_throttle/"
 TARGET="_top"
->&#13;      http://www.snert.com/Software/Throttle/</A
->. 
+>http://www.snert.com/Software/mod_throttle/</A
+>
       Follow the instructions to install into your Apache install. 
       <EM
 >This module only functions with the Apache web
@@ -4051,7 +4051,7 @@ CLASS="command"
 
       command provided by this module to accomplish this goal. See the 
       <A
-HREF="http://www.snert.com/Software/Throttle/"
+HREF="http://www.snert.com/Software/mod_throttle/"
 TARGET="_top"
 >Module
       Instructions</A
@@ -13330,6 +13330,23 @@ NAME="gloss-rdbms"
         that stores information in tables that are related to each other.
         </P
 ></DD
+><DT
+><A
+NAME="gloss-regexp"
+></A
+><B
+>Regular Expression</B
+></DT
+> (regexp)<DD
+><P
+>A regular expression is an expression used for pattern matching.
+              <A
+HREF="http://perldoc.com/perl5.6/pod/perlre.html#Regular-Expressions"
+TARGET="_top"
+>Documentation</A
+>
+        </P
+></DD
 ></DL
 ></DIV
 ><DIV
@@ -13482,7 +13499,7 @@ NAME="gloss-zarro"
         Terry had the following to say:
         </P
 ><A
-NAME="AEN2515"
+NAME="AEN2521"
 ></A
 ><TABLE
 BORDER="0"
diff --git a/webtools/bugzilla/docs/html/extraconfig.html b/webtools/bugzilla/docs/html/extraconfig.html
index 0bd60486a84..917e839bfc6 100644
--- a/webtools/bugzilla/docs/html/extraconfig.html
+++ b/webtools/bugzilla/docs/html/extraconfig.html
@@ -607,10 +607,10 @@ CLASS="filename"
       which can limit connections by ip-address. You may download this module
       at 
       <A
-HREF="http://www.snert.com/Software/Throttle/"
+HREF="http://www.snert.com/Software/mod_throttle/"
 TARGET="_top"
->&#13;      http://www.snert.com/Software/Throttle/</A
->. 
+>http://www.snert.com/Software/mod_throttle/</A
+>
       Follow the instructions to install into your Apache install. 
       <EM
 >This module only functions with the Apache web
@@ -624,7 +624,7 @@ CLASS="command"
 
       command provided by this module to accomplish this goal. See the 
       <A
-HREF="http://www.snert.com/Software/Throttle/"
+HREF="http://www.snert.com/Software/mod_throttle/"
 TARGET="_top"
 >Module
       Instructions</A
diff --git a/webtools/bugzilla/docs/html/glossary.html b/webtools/bugzilla/docs/html/glossary.html
index 3894e8a9b6c..7f36c0c1aad 100644
--- a/webtools/bugzilla/docs/html/glossary.html
+++ b/webtools/bugzilla/docs/html/glossary.html
@@ -697,6 +697,23 @@ NAME="gloss-rdbms"
         that stores information in tables that are related to each other.
         </P
 ></DD
+><DT
+><A
+NAME="gloss-regexp"
+></A
+><B
+>Regular Expression</B
+></DT
+> (regexp)<DD
+><P
+>A regular expression is an expression used for pattern matching.
+              <A
+HREF="http://perldoc.com/perl5.6/pod/perlre.html#Regular-Expressions"
+TARGET="_top"
+>Documentation</A
+>
+        </P
+></DD
 ></DL
 ></DIV
 ><DIV
@@ -849,7 +866,7 @@ NAME="gloss-zarro"
         Terry had the following to say:
         </P
 ><A
-NAME="AEN2515"
+NAME="AEN2521"
 ></A
 ><TABLE
 BORDER="0"
diff --git a/webtools/bugzilla/docs/html/index.html b/webtools/bugzilla/docs/html/index.html
index 3cabc43e5bf..4290a3f9f3c 100644
--- a/webtools/bugzilla/docs/html/index.html
+++ b/webtools/bugzilla/docs/html/index.html
@@ -88,7 +88,7 @@ NAME="AEN14"
 HREF="http://bugzilla.mozilla.org/enter_bug.cgi?product=Bugzilla&component=Documentation"
 TARGET="_top"
 >Bugzilla Documentation</A
-> compontent.
+> component.
       </P
 ><P
 >This is a development version of this guide.  Information in it
diff --git a/webtools/bugzilla/docs/html/stepbystep.html b/webtools/bugzilla/docs/html/stepbystep.html
index 33244655f39..caf6b9dc1a7 100644
--- a/webtools/bugzilla/docs/html/stepbystep.html
+++ b/webtools/bugzilla/docs/html/stepbystep.html
@@ -1078,7 +1078,7 @@ CLASS="prompt"
 
             <B
 CLASS="command"
->UPDATE user SET Password=PASSWORD('&#60;new_password'&#62;)
+>UPDATE user SET Password=PASSWORD('&#60;new_password&#62;')
             WHERE user='root';</B
 >
           </TT
diff --git a/webtools/bugzilla/docs/txt/Bugzilla-Guide.txt b/webtools/bugzilla/docs/txt/Bugzilla-Guide.txt
index 5195385a0b1..60a4591c310 100644
--- a/webtools/bugzilla/docs/txt/Bugzilla-Guide.txt
+++ b/webtools/bugzilla/docs/txt/Bugzilla-Guide.txt
@@ -16,7 +16,7 @@ The Bugzilla Team
 
    This documentation is maintained in DocBook 4.1.2 XML format. Changes
    are best submitted as plain text or XML diffs, attached to a bug filed
-   in the Bugzilla Documentation compontent.
+   in the Bugzilla Documentation component.
 
    This is a development version of this guide. Information in it is
    subject to change before the 2.18 release of this guide (which will
@@ -944,7 +944,7 @@ Chapter 4. Installation
    limited to 16 characters.
 
    bash# mysql -u root mysql
-   mysql> UPDATE user SET Password=PASSWORD('<new_password'>) WHERE
+   mysql> UPDATE user SET Password=PASSWORD('<new_password>') WHERE
    user='root';
    mysql> FLUSH PRIVILEGES;
 
@@ -1191,7 +1191,7 @@ set=ISO-8859-1/i" *.cgi *.pl
    speeds for other users. If your Bugzilla installation is experiencing
    this problem , you may install the Apache module mod_throttle which
    can limit connections by ip-address. You may download this module at
-   http://www.snert.com/Software/Throttle/. Follow the instructions to
+   http://www.snert.com/Software/mod_throttle/ Follow the instructions to
    install into your Apache install. This module only functions with the
    Apache web server! You may use the ThrottleClientIP command provided
    by this module to accomplish this goal. See the Module Instructions
@@ -4448,6 +4448,10 @@ R
           that stores information in tables that are related to each
           other.
 
+   Regular Expression (regexp)
+          A regular expression is an expression used for pattern
+          matching. Documentation
+
 S
 
    SGML