Bug 203314 - Clean up <ulink/>'s, links to bugs and extra spaces in sentences.

Patch by Martin Wulffeld <martin@wulffeld.org>.
r,a=jake
Also, added Martin to the section about people who have made signifigant conrtibutions.

11 files changed, 162 insertions, 201 deletions

diff --git a/docs/xml/about.xml b/docs/xml/about.xml
index f3a9a1c5f..3b0f18e0f 100644
--- a/docs/xml/about.xml
+++ b/docs/xml/about.xml
@@ -11,9 +11,9 @@
       <para>
 	Permission is granted to copy, distribute and/or modify this
 	document under the terms of the GNU Free Documentation
-	License, Version 1.1 or any later version published  by the
+	License, Version 1.1 or any later version published by the
 	Free Software Foundation; with no Invariant Sections, no
-	Front-Cover Texts, and  with no Back-Cover Texts.  A copy of
+	Front-Cover Texts, and with no Back-Cover Texts. A copy of
 	the license is included in <xref linkend="gfdl"/>.
       </para>
     </blockquote>
@@ -37,15 +37,15 @@
     </para>
     <para>
       All copyrights are held by their respective owners, unless
-      specifically noted otherwise.  Use of a term in this document
+      specifically noted otherwise. Use of a term in this document
       should not be regarded as affecting the validity of any
       trademark or service mark.
     </para>
     <para>
       Naming of particular products or brands should not be seen as
-      endorsements, with the exception of the term "GNU/Linux".  We
+      endorsements, with the exception of the term "GNU/Linux". We
       wholeheartedly endorse the use of GNU/Linux in every situation
-      where it is appropriate.  It is an extremely versatile, stable,
+      where it is appropriate. It is an extremely versatile, stable,
       and robust operating system that offers an ideal operating
       environment for Bugzilla.
     </para>
@@ -60,10 +60,10 @@
       documented or fixed in the code, security holes surely exist.
       Great care should be taken both in the installation and usage of
       this software. Carefully consider the implications of installing
-      other network services with Bugzilla.  The Bugzilla development
+      other network services with Bugzilla. The Bugzilla development
       team members, Netscape Communications, America Online Inc., and
       any affiliated developers or sponsors assume no liability for
-      your use of this product.  You have the source code to this
+      your use of this product. You have the source code to this
       product, and are responsible for auditing it yourself to ensure
       your security needs are met.
     </para>
@@ -88,7 +88,7 @@
     </para>
     <para>
       The newest version of this guide can always be found at <ulink
-      url="http://www.bugzilla.org">bugzilla.org</ulink>; including
+      url="http://www.bugzilla.org"/>; including
       documentation for past releases and the current development version.
     </para>
     <para>
@@ -98,9 +98,8 @@
     </para>
     <para>
       The latest version of this document can always be checked out via CVS.
-	    Please follow the instructions available at 
-      <ulink url="http://www.mozilla.org/cvs.html">the Mozilla CVS page</ulink>,
-      and check out the <filename>mozilla/webtools/bugzilla/docs/</filename>
+      Please follow the <ulink url="http://www.mozilla.org/cvs.html">Mozilla CVS</ulink>
+      instructions and check out the <filename>mozilla/webtools/bugzilla/docs/</filename>
       subtree.
     </para>
     <para>
@@ -181,7 +180,7 @@
     <para>
       Last but not least, all the members of the 
       <ulink url="news://news.mozilla.org/netscape/public/mozilla/webtools"/>
-      newsgroup.  Without your discussions, insight, suggestions, and patches,
+      newsgroup. Without your discussions, insight, suggestions, and patches,
       this could never have happened.
     </para>
     <para>
@@ -194,6 +193,7 @@
         <member>Gervase Markham</member>
         <member>Joe Robins</member>
         <member>Kevin Brannen</member>
+        <member>Martin Wulffeld</member>
         <member>Ron Teitelbaum</member>
         <member>Spencer Smith</member>
         <member>Zach Liption</member>
diff --git a/docs/xml/administration.xml b/docs/xml/administration.xml
index afe50c789..2382fca82 100644
--- a/docs/xml/administration.xml
+++ b/docs/xml/administration.xml
@@ -618,7 +618,7 @@
 
       <listitem>
         <para><emphasis>Maximum Votes a person can put on a single
-         bug"</emphasis>: 
+         bug</emphasis>: 
          It should probably be some number lower than the
         "Maximum votes per person". Don't set this field to "0" if
         "Maximum votes per person" is non-zero; that doesn't make
@@ -884,9 +884,9 @@ skip-networking
       not be accessible is rather complicated. A new installation method
       is currently in the works which should solve this by allowing files
       that shouldn't be accessible from the web to be placed in directory
-      outside the webroot. See
-      <ulink url="http://bugzilla.mozilla.org/show_bug.cgi?id=44659">bug
-      44659</ulink> for more information.
+      outside the webroot. See 
+      <ulink url="http://bugzilla.mozilla.org/show_bug.cgi?id=44659">
+      bug 44659</ulink> for more information.
       </para>
 
       <itemizedlist spacing="compact">
diff --git a/docs/xml/database.xml b/docs/xml/database.xml
index 25a3855ec..aea80640b 100644
--- a/docs/xml/database.xml
+++ b/docs/xml/database.xml
@@ -68,7 +68,7 @@
 
     <para>But Certain Death speaks up -- a tiny voice, from the dark corners
     of the conference room. "I have a concern," the voice hisses from the
-    darkness, "about the use of the word 'verified'.</para>
+    darkness, "about the use of the word 'verified'."</para>
 
     <para>The room, previously filled with happy chatter, lapses into
     reverential silence as Certain Death (better known as the Vice President
@@ -103,10 +103,8 @@
       and a 
       <quote>tinyint</quote>
 
-      entry in MySQL. I recommend you refer to the MySQL documentation,
-      available at 
-      <ulink url="http://www.mysql.com/doc.html">MySQL.com</ulink>
-
+      entry in MySQL. I recommend you refer to the
+      <ulink url="http://www.mysql.com/documentation/">MySQL documentation</ulink>
       . Below are the basics you need to know about the Bugzilla database.
       Check the chart above for more details.</para>
 
@@ -131,7 +129,7 @@
             your database in the Bugzilla FAQ in this directory (under
             "Security"), or more robust security generalities in the 
             <ulink url="http://www.mysql.com/php/manual.php3?section=Privilege_system">MySQL
-            searchable documentation</ulink>.            
+            searchable documentation</ulink>.
             </para>
           </listitem>
 
@@ -207,14 +205,14 @@
 </para>
 
 <literallayout>
-  Here's an overview of what each table does.  Most columns in each table have
+  Here's an overview of what each table does. Most columns in each table have
 descriptive names that make it fairly trivial to figure out their jobs.
 
-attachments: This table stores all attachments to bugs.  It tends to be your
+attachments: This table stores all attachments to bugs. It tends to be your
 largest table, yet also generally has the fewest entries because file
 attachments are so (relatively) large.
 
-bugs:  This is the core of your system.  The bugs table stores most of the
+bugs:  This is the core of your system. The bugs table stores most of the
 current information about a bug, with the exception of the info stored in the
 other tables.
 
@@ -222,26 +220,26 @@ bugs_activity:  This stores information regarding what changes are made to bugs
 when -- a history file.
 
 cc:  This tiny table simply stores all the CC information for any bug which has
-any entries in the CC field of the bug.  Note that, like most other tables in
+any entries in the CC field of the bug. Note that, like most other tables in
 Bugzilla, it does not refer to users by their user names, but by their unique
 userid, stored as a primary key in the profiles table.
 
 components: This stores the programs and components (or products and
-components, in newer Bugzilla parlance) for Bugzilla.  Curiously, the "program"
+components, in newer Bugzilla parlance) for Bugzilla. Curiously, the "program"
 (product) field is the full name of the product, rather than some other unique
 identifier, like bug_id and user_id are elsewhere in the database.
 
 dependencies: Stores data about those cool dependency trees.
 
-fielddefs:  A nifty table that defines other tables.  For instance, when you
+fielddefs:  A nifty table that defines other tables. For instance, when you
 submit a form that changes the value of "AssignedTo" this table allows
 translation to the actual field name "assigned_to" for entry into MySQL.
 
-groups:  defines bitmasks for groups.  A bitmask is a number that can uniquely
-identify group memberships.  For instance, say the group that is allowed to
+groups:  defines bitmasks for groups. A bitmask is a number that can uniquely
+identify group memberships. For instance, say the group that is allowed to
 tweak parameters is assigned a value of "1", the group that is allowed to edit
 users is assigned a "2", and the group that is allowed to create new groups is
-assigned the bitmask of "4".  By uniquely combining the group bitmasks (much
+assigned the bitmask of "4". By uniquely combining the group bitmasks (much
 like the chmod command in UNIX,) you can identify a user is allowed to tweak
 parameters and create groups, but not edit users, by giving him a bitmask of
 "5", or a user allowed to edit users and create groups, but not tweak
@@ -256,15 +254,15 @@ keywords: Unlike what you'd think, this table holds which keywords are
 associated with which bug id's.
 
 logincookies: This stores every login cookie ever assigned to you for every
-machine you've ever logged into Bugzilla from.  Curiously, it never does any
-housecleaning -- I see cookies in this file I've not used for months.  However,
+machine you've ever logged into Bugzilla from. Curiously, it never does any
+housecleaning -- I see cookies in this file I've not used for months. However,
 since Bugzilla never expires your cookie (for convenience' sake), it makes
 sense.
 
 longdescs:  The meat of bugzilla -- here is where all user comments are stored!
 You've only got 2^24 bytes per comment (it's a mediumtext field), so speak
 sparingly -- that's only the amount of space the Old Testament from the Bible
-would take (uncompressed, 16 megabytes).  Each comment is keyed to the
+would take (uncompressed, 16 megabytes). Each comment is keyed to the
 bug_id to which it's attached, so the order is necessarily chronological, for
 comments are played back in the order in which they are received.
 
@@ -272,12 +270,12 @@ milestones:  Interesting that milestones are associated with a specific product
 in this table, but Bugzilla does not yet support differing milestones by
 product through the standard configuration interfaces.
 
-namedqueries:  This is where everybody stores their "custom queries".  Very
+namedqueries:  This is where everybody stores their "custom queries". Very
 cool feature; it beats the tar out of having to bookmark each cool query you
 construct.
 
 products:  What products you have, whether new bug entries are allowed for the
-product, what milestone you're working toward on that product, votes, etc.  It
+product, what milestone you're working toward on that product, votes, etc. It
 will be nice when the components table supports these same features, so you
 could close a particular component for bug entry without having to close an
 entire product...
@@ -312,7 +310,7 @@ mysql> show columns from table;
 mysql> select * from table;
 
   -- note: this is a very bad idea to do on, for instance, the "bugs" table if
-you have 50,000 bugs.  You'll be sitting there a while until you ctrl-c or
+you have 50,000 bugs. You'll be sitting there a while until you ctrl-c or
 50,000 bugs play across your screen.
 
   You can limit the display from above a little with the command, where
@@ -325,7 +323,7 @@ mysql> select * from table where (column = "some info");
 mysql> select * from table where (column != "some info");
 
   Let's take our example from the introduction, and assume you need to change
-the word "verified" to "approved" in the resolution field.  We know from the
+the word "verified" to "approved" in the resolution field. We know from the
 above information that the resolution is likely to be stored in the "bugs"
 table. Note we'll need to change a little perl code as well as this database
 change, but I won't plunge into that in this document. Let's verify the
@@ -336,10 +334,10 @@ mysql> show columns from bugs
   (exceedingly long output truncated here)
 | bug_status| enum('UNCONFIRMED','NEW','ASSIGNED','REOPENED','RESOLVED','VERIFIED','CLOSED')||MUL | UNCONFIRMED||
 
-  Sorry about that long line.  We see from this that the "bug status" column is
+  Sorry about that long line. We see from this that the "bug status" column is
 an "enum field", which is a MySQL peculiarity where a string type field can
-only have certain types of entries.  While I think this is very cool, it's not
-standard SQL.  Anyway, we need to add the possible enum field entry
+only have certain types of entries. While I think this is very cool, it's not
+standard SQL. Anyway, we need to add the possible enum field entry
 'APPROVED' by altering the "bugs" table.
 
 mysql> ALTER table bugs CHANGE bug_status bug_status
@@ -355,15 +353,15 @@ mysql> show columns from bugs;
 
   you'll see that the bug_status field has an extra "APPROVED" enum that's
 available!  Cool thing, too, is that this is reflected on your query page as
-well -- you can query by the new status.  But how's it fit into the existing
+well -- you can query by the new status. But how's it fit into the existing
 scheme of things?
   Looks like you need to go back and look for instances of the word "verified"
 in the perl code for Bugzilla -- wherever you find "verified", change it to
 "approved" and you're in business (make sure that's a case-insensitive search).
 Although you can query by the enum field, you can't give something a status
-of "APPROVED" until you make the perl changes.   Note that this change I
+of "APPROVED" until you make the perl changes. Note that this change I
 mentioned can also be done by editing checksetup.pl, which automates a lot of
-this.  But you need to know this stuff anyway, right?
+this. But you need to know this stuff anyway, right?
 	</literallayout>
       </section>
     </section>
diff --git a/docs/xml/faq.xml b/docs/xml/faq.xml
index bff9376ab..02de867d6 100644
--- a/docs/xml/faq.xml
+++ b/docs/xml/faq.xml
@@ -21,8 +21,7 @@
 	<answer>
 	  <para>
 	    You can stay up-to-date with the latest Bugzilla
-	    information at <ulink url="http://www.bugzilla.org/">
-	    http://www.bugzilla.org/</ulink>
+	    information at <ulink url="http://www.bugzilla.org/"/>.
 	  </para>
 	</answer>
       </qandaentry>
@@ -36,8 +35,7 @@
 	<answer>
 	  <para>
 	    Bugzilla is covered by the Mozilla Public License.
-	    See details at <ulink url="http://www.mozilla.org/MPL/">
-	    http://www.mozilla.org/MPL/</ulink>
+	    See details at <ulink url="http://www.mozilla.org/MPL/"/>.
 	  </para>
 	</answer>
       </qandaentry>
@@ -50,12 +48,12 @@
 	</question>
 	<answer>
           <para>
-            <ulink url="http://bugzilla.org/consulting.html">http://bugzilla.org/consulting.html</ulink>
+            <ulink url="http://bugzilla.org/consulting.html"/>
             is a list of people and companies who have asked us to list them
             as consultants for Bugzilla.
           </para>
 	  <para>
-	    <ulink url="http://www.collab.net/">www.collab.net</ulink> offers
+	    <ulink url="http://www.collab.net/"/> offers
 	    Bugzilla as part of their standard offering to large projects.
 	    They do have some minimum fees that are pretty hefty, and generally
 	    aren't interested in small projects.
@@ -79,7 +77,7 @@
 	<answer>
 	  <para>
 	    There are <emphasis>dozens</emphasis> of major companies with public
-	    Bugzilla sites to track bugs in their products.  A few include:
+	    Bugzilla sites to track bugs in their products. A few include:
 	    <simplelist>
 	      <member>Netscape/AOL</member>
 	      <member>Mozilla.org</member>
@@ -116,7 +114,7 @@
 	  <para>
 	    A 
       <ulink url="http://www.bugzilla.org/who_we_are.html">core team</ulink>,
-      led by Dave Miller (justdave@netscape.com).      
+      led by Dave Miller (justdave@netscape.com).
 	  </para>
 	</answer>
       </qandaentry>
@@ -158,8 +156,8 @@
 	<answer>
 	  <para>
 	    It may be that the support has not been built yet, or that you
-	    have not yet found it.  Bugzilla is making tremendous strides in
-	    usability, customizability, scalability, and user interface.  It
+	    have not yet found it. Bugzilla is making tremendous strides in
+	    usability, customizability, scalability, and user interface. It
 	    is widely considered the most complete and popular open-source
 	    bug-tracking software in existence.
 	  </para>
@@ -187,11 +185,11 @@
 	  </para>
           <para>
             There is currently work in progress to make Bugzilla work on
-            PostgreSQL and Sybase in the default distribution.  You can track
-            the progress of these initiatives in bugs <ulink
-            url="http://bugzilla.mozilla.org/show_bug.cgi?id=98304">98304</ulink>
+            PostgreSQL and Sybase in the default distribution. You can track
+            the progress of these initiatives in <ulink
+            url="http://bugzilla.mozilla.org/show_bug.cgi?id=98304">bug 98304</ulink>
             and <ulink
-            url="http://bugzilla.mozilla.org/show_bug.cgi?id=173130">173130</ulink>
+            url="http://bugzilla.mozilla.org/show_bug.cgi?id=173130">bug 173130</ulink>
             respectively.
           </para>
           <para>
@@ -213,8 +211,8 @@
             <filename>/usr/bonsaitools/bin/perl</filename> because when
             Terry first started writing the code for mozilla.org he needed a
             version of Perl and other tools that were completely under his
-            control.  This location was abandoned for the 2.18 release in favor
-            of the more sensible <filename>/usr/bin/perl</filename>.  If you
+            control. This location was abandoned for the 2.18 release in favor
+            of the more sensible <filename>/usr/bin/perl</filename>. If you
             installed an older verion of Bugzilla and created the symlink we
             suggested, you can remove it now (provided that you don't have
             anything else, such as Bonsai, using it and you don't intend to
@@ -233,7 +231,7 @@
         <answer>
           <para>
             Yes, the following bit of perl magic will change all the shebang
-            lines.  Be sure to change <filename>/usr/local/bin/perl</filename>
+            lines. Be sure to change <filename>/usr/local/bin/perl</filename>
             to your path to the perl binary.
           </para>
           <programlisting>
@@ -276,7 +274,7 @@ perl -pi -e 's@#\!/usr/bin/perl@#\!/usr/local/bin/perl@' *cgi *pl
 	</question>
 	<answer>
 	  <para>
-	    It is web and e-mail based.  You can edit bugs by sending specially
+	    It is web and e-mail based. You can edit bugs by sending specially
 	    formatted email to a properly configured Bugzilla, or control via the web.
 	  </para>
 	</answer>
@@ -335,7 +333,7 @@ perl -pi -e 's@#\!/usr/bin/perl@#\!/usr/local/bin/perl@' *cgi *pl
 	<answer>
 	  <para>
 	    Yes - any sort of attachment is allowed, although administrators can
-      configure a maximum size.  
+      configure a maximum size.
             Bugzilla gives the user the option of either using the MIME-type
             supplied by the browser, choosing from a pre-defined list or
             manually typing any arbitrary MIME-type. 
@@ -353,15 +351,14 @@ perl -pi -e 's@#\!/usr/bin/perl@#\!/usr/local/bin/perl@' *cgi *pl
 	</question>
 	<answer>
 	  <para>
-	    Yes.  However, modifying some fields, notably those related to bug
+	    Yes. However, modifying some fields, notably those related to bug
 	    progression states, also require adjusting the program logic to
 	    compensate for the change.
 	  </para>
 	  <para>
 	    There is no GUI for adding fields to Bugzilla at this
-	    time.  You can follow development of this feature at
-	    <ulink
-		   url="http://bugzilla.mozilla.org/show_bug.cgi?id=91037">http://bugzilla.mozilla.org/show_bug.cgi?id=91037</ulink>
+	    time. You can follow development of this feature in 
+	    <ulink url="http://bugzilla.mozilla.org/show_bug.cgi?id=91037">bug 91037</ulink>
 	  </para>
 	</answer>
       </qandaentry>
@@ -375,9 +372,8 @@ perl -pi -e 's@#\!/usr/bin/perl@#\!/usr/local/bin/perl@' *cgi *pl
 	</question>
 	<answer>
 	  <para>
-	    Yes.  Look at <ulink url="http://bugzilla.mozilla.org/report.cgi">
-	    http://bugzilla.mozilla.org/report.cgi</ulink> for samples of what
-            Bugzilla can do in reporting and graphing.
+	    Yes. Look at <ulink url="http://bugzilla.mozilla.org/report.cgi"/>
+            for samples of what Bugzilla can do in reporting and graphing.
 	  </para>
 	  <para>
             If you can not get the reports you want from the included reporting
@@ -399,7 +395,7 @@ perl -pi -e 's@#\!/usr/bin/perl@#\!/usr/local/bin/perl@' *cgi *pl
 	</question>
 	<answer>
 	  <para>
-	    Email notification is user-configurable.  By default, the bug id and 
+	    Email notification is user-configurable. By default, the bug id and 
       Summary of the bug report accompany each email notification, along with
 	    a list of the changes made.
 	  </para>
@@ -436,7 +432,7 @@ perl -pi -e 's@#\!/usr/bin/perl@#\!/usr/local/bin/perl@' *cgi *pl
 		If you decide to use the bugzilla_email integration features
 		to allow Bugzilla to record responses to mail with the associated bug,
 		you may need to caution your users to set their mailer to "respond
-		to messages in the format in which they were sent".  For security reasons
+		to messages in the format in which they were sent". For security reasons
 		Bugzilla ignores HTML tags in comments, and if a user sends HTML-based
 		email into Bugzilla the resulting comment looks downright awful.
 	      </para>
@@ -458,12 +454,12 @@ perl -pi -e 's@#\!/usr/bin/perl@#\!/usr/local/bin/perl@' *cgi *pl
           <para>
             Bugzilla can output buglists as HTML (the default), CSV or RDF.
             The link for CSV can be found at the bottom of the buglist in HTML
-            format.  This CSV format can easily be imported into MS Excel or
+            format. This CSV format can easily be imported into MS Excel or
             other spread-sheet applications.
           </para>
           <para>
             To use the RDF format of the buglist it is necessary to append a
-            <computeroutput>&amp;ctype=rdf</computeroutput> to the URL.  RDF
+            <computeroutput>&amp;ctype=rdf</computeroutput> to the URL. RDF
             is meant to be machine readable and thus it is assumed that the
             URL would be generated progmatically so there is no user visible
             link to this format.
@@ -493,12 +489,12 @@ perl -pi -e 's@#\!/usr/bin/perl@#\!/usr/local/bin/perl@' *cgi *pl
 	</question>
 	<answer>
 	  <para>
-            Yes.  For more information including available translated templates,
+            Yes. For more information including available translated templates,
             see <ulink
             url="http://www.bugzilla.org/download.html#localizations"/>.
             The admin interfaces are still not included in these translated
-            templates and is therefore still English only.  Also, there may be
-            issues with the charset not being declared.  See <ulink
+            templates and is therefore still English only. Also, there may be
+            issues with the charset not being declared. See <ulink
             url="http://bugzilla.mozilla.org/show_bug.cgi?id=126266">bug 126226</ulink>
             for more information.
 	  </para>
@@ -514,7 +510,7 @@ perl -pi -e 's@#\!/usr/bin/perl@#\!/usr/local/bin/perl@' *cgi *pl
 	</question>
 	<answer>
 	  <para>
-	    Yes.  No.  Yes (using the CSV format).
+	    Yes. No. Yes (using the CSV format).
 	  </para>
 	</answer>
       </qandaentry>
@@ -528,7 +524,7 @@ perl -pi -e 's@#\!/usr/bin/perl@#\!/usr/local/bin/perl@' *cgi *pl
 	</question>
 	<answer>
 	  <para>
-	    You have no idea.  Bugzilla's query interface, particularly with the
+	    You have no idea. Bugzilla's query interface, particularly with the
 	    advanced Boolean operators, is incredibly versatile.
 	  </para>
 	</answer>
@@ -544,7 +540,7 @@ perl -pi -e 's@#\!/usr/bin/perl@#\!/usr/local/bin/perl@' *cgi *pl
 	</question>
 	<answer>
 	  <para>
-	    Bugzilla does not lock records.  It provides mid-air collision detection,
+	    Bugzilla does not lock records. It provides mid-air collision detection,
 	    and offers the offending user a choice of options to deal with the conflict.
 	  </para>
 	</answer>
@@ -560,8 +556,7 @@ perl -pi -e 's@#\!/usr/bin/perl@#\!/usr/local/bin/perl@' *cgi *pl
 	  <para>
 	    MySQL, the database back-end for Bugzilla, allows hot-backup of data.
 	    You can find strategies for dealing with backup considerations
-	    at <ulink url="http://www.mysql.com/doc/B/a/Backup.html">
-	    http://www.mysql.com/doc/B/a/Backup.html</ulink>
+	    at <ulink url="http://www.mysql.com/doc/B/a/Backup.html"/>.
 	  </para>
 	</answer>
       </qandaentry>
@@ -574,8 +569,8 @@ perl -pi -e 's@#\!/usr/bin/perl@#\!/usr/local/bin/perl@' *cgi *pl
 	</question>
 	<answer>
 	  <para>
-	    Yes.  However, commits to the database must wait
-	    until the tables are unlocked.  Bugzilla databases are typically
+	    Yes. However, commits to the database must wait
+	    until the tables are unlocked. Bugzilla databases are typically
 	    very small, and backups routinely take less than a minute.
 	  </para>
 	</answer>
@@ -598,7 +593,7 @@ perl -pi -e 's@#\!/usr/bin/perl@#\!/usr/local/bin/perl@' *cgi *pl
 	  </para>
 	  <para>
 	    Commercial Bug-tracking software typically costs somewhere upwards
-	    of $20,000 or more for 5-10 floating licenses.  Bugzilla consultation
+	    of $20,000 or more for 5-10 floating licenses. Bugzilla consultation
 	    is available from skilled members of the newsgroup. Simple questions
       are answered there and then.
 	  </para>
@@ -617,9 +612,9 @@ perl -pi -e 's@#\!/usr/bin/perl@#\!/usr/local/bin/perl@' *cgi *pl
 	</question>
 	<answer>
 	  <para>
-	    It all depends on your level of commitment.  Someone with much Bugzilla
+	    It all depends on your level of commitment. Someone with much Bugzilla
 	    experience can get you up and running in less than a day, and
-	    your Bugzilla install can run untended for years.  If your
+	    your Bugzilla install can run untended for years. If your
 	    Bugzilla strategy is critical to your business workflow, hire somebody
 	    with reasonable UNIX or Perl skills to handle your process management and
 	    bug-tracking maintenance &amp; customization.
@@ -636,7 +631,7 @@ perl -pi -e 's@#\!/usr/bin/perl@#\!/usr/local/bin/perl@' *cgi *pl
 	</question>
 	<answer>
 	  <para>
-	    No.  MySQL asks, if you find their product valuable, that you purchase
+	    No. MySQL asks, if you find their product valuable, that you purchase
 	    a support contract from them that suits your needs.
 	  </para>
 	</answer>
@@ -655,7 +650,7 @@ perl -pi -e 's@#\!/usr/bin/perl@#\!/usr/local/bin/perl@' *cgi *pl
 	</question>
 	<answer>
 	  <para>
-	    Run MySQL like this: "mysqld --skip-grant-tables".  Please remember <emphasis>this
+	    Run MySQL like this: "mysqld --skip-grant-tables". Please remember <emphasis>this
 	    makes MySQL as secure as taping a $100 to the floor of a football stadium
 	    bathroom for safekeeping.</emphasis> 
 	  </para>
@@ -741,12 +736,12 @@ perl -pi -e 's@#\!/usr/bin/perl@#\!/usr/local/bin/perl@' *cgi *pl
 	</question>
 	<answer>
 	  <para>
-	    Try Klaas Freitag's excellent patch for "whineatassigned" functionality.
-	    You can find it at <ulink
-            url="http://bugzilla.mozilla.org/show_bug.cgi?id=6679"/>. This
+	    Try Klaas Freitag's excellent patch for "whineatassigned"
+            functionality. You can find it in <ulink
+            url="http://bugzilla.mozilla.org/show_bug.cgi?id=6679">bug 6679</ulink>. This
 	    patch is against an older version of Bugzilla, so you must apply
 	    the diffs manually.
-            <!-- TODO: Mention Joel's "Fine Whine" patch" -->
+            <!-- TODO: Mention Joel's "Fine Whine" patch. -->
 	  </para>
 	</answer>
       </qandaentry>
@@ -769,7 +764,7 @@ perl -pi -e 's@#\!/usr/bin/perl@#\!/usr/local/bin/perl@' *cgi *pl
 	    </blockquote>
 	    However, this is fairly nasty and subject to problems; you also
 	    need to set up your smrsh (sendmail restricted shell) to allow
-	    it.  In a pinch, though, it can work.
+	    it. In a pinch, though, it can work.
 	  </para>
 	</answer>
       </qandaentry>
@@ -826,7 +821,7 @@ perl -pi -e 's@#\!/usr/bin/perl@#\!/usr/local/bin/perl@' *cgi *pl
 	  </para>
 	  <para>
 	    If you never receive mail from Bugzilla, chances you do not have
-	    sendmail in "/usr/lib/sendmail".  Ensure sendmail lives in, or is symlinked
+	    sendmail in "/usr/lib/sendmail". Ensure sendmail lives in, or is symlinked
 	    to, "/usr/lib/sendmail".
 	  </para>
 	</answer>
@@ -846,7 +841,7 @@ perl -pi -e 's@#\!/usr/bin/perl@#\!/usr/local/bin/perl@' *cgi *pl
 	  <para>
             Red Hat's old version of Bugzilla (based on 2.8) worked on Oracle.
             Red Hat's newer version (based on 2.17.1 and soon to be merged into
-            the main distribution) runs on PostgreSQL.  At this time we know of
+            the main distribution) runs on PostgreSQL. At this time we know of
             no recent ports of Bugzilla to Oracle but do intend to support it
             in the future (possibly the 2.20 time-frame).
 	  </para>
@@ -866,15 +861,15 @@ perl -pi -e 's@#\!/usr/bin/perl@#\!/usr/local/bin/perl@' *cgi *pl
 	    (<filename>./sanitycheck.cgi</filename> in the
 	    Bugzilla_home directory) from your web browser to see! If
 	    it finishes without errors, you're
-	    <emphasis>probably</emphasis> OK.  If it doesn't come back
+	    <emphasis>probably</emphasis> OK. If it doesn't come back
 	    OK (i.e. any red letters), there are certain things
-	    Bugzilla can recover from and certain things it can't.  If
+	    Bugzilla can recover from and certain things it can't. If
 	    it can't auto-recover, I hope you're familiar with
 	    mysqladmin commands or have installed another way to
-	    manage your database.  Sanity Check, although it is a good
+	    manage your database. Sanity Check, although it is a good
 	    basic check on your database integrity, by no means is a
 	    substitute for competent database administration and
-	    avoiding deletion of data.  It is not exhaustive, and was
+	    avoiding deletion of data. It is not exhaustive, and was
 	    created to do a basic check for the most common problems
 	    in Bugzilla databases.
 	  </para>
@@ -893,7 +888,7 @@ perl -pi -e 's@#\!/usr/bin/perl@#\!/usr/local/bin/perl@' *cgi *pl
 	    not a smart thing to do if you don't know exactly what you're doing.
 	    However, if you understand SQL you can use the <command>mysql</command>
             command line utility to manually insert, delete and modify table
-            information.  There are also more intuitive GUI clients available.
+            information. There are also more intuitive GUI clients available.
             Personal favorites of the Bugzilla team are <ulink
             url="http://www.phpmyadmin.net/">phpMyAdmin</ulink> and <ulink
             url="http://www.mysql.com/downloads/gui-mycc.html">MySQL Control
@@ -936,7 +931,7 @@ perl -pi -e 's@#\!/usr/bin/perl@#\!/usr/local/bin/perl@' *cgi *pl
 	</question>
 	<answer>
 	  <para>
-	    Well, you can synchronize or you can move bugs.  Synchronization will
+	    Well, you can synchronize or you can move bugs. Synchronization will
 	    only work one way -- you can create a read-only copy of the database
 	    at one site, and have it regularly updated at intervals from the main
 	    database.
@@ -980,8 +975,8 @@ perl -pi -e 's@#\!/usr/bin/perl@#\!/usr/local/bin/perl@' *cgi *pl
 	</question>
 	<answer>
 	  <para>
-	    Not currently.  Bundle::Bugzilla enormously simplifies Bugzilla
-	    installation on UNIX systems.  If someone can volunteer to
+	    Not currently. Bundle::Bugzilla enormously simplifies Bugzilla
+	    installation on UNIX systems. If someone can volunteer to
 	    create a suitable PPM bundle for Win32, it would be appreciated.
 	  </para>
 	</answer>
@@ -1058,8 +1053,7 @@ perl -pi -e 's@#\!/usr/bin/perl@#\!/usr/local/bin/perl@' *cgi *pl
 	    </orderedlist>
 	    I reckon TimeDate and Data::Dumper come with the activeperl. You can check
 	    the ActiveState site for packages for installation through PPM.
-	    <ulink url=" http://www.activestate.com/Packages/">
-	      http://www.activestate.com/Packages/</ulink>
+	    <ulink url="http://www.activestate.com/Packages/"/>.
 	  </para>
 	</answer>
       </qandaentry>
@@ -1086,7 +1080,7 @@ perl -pi -e 's@#\!/usr/bin/perl@#\!/usr/local/bin/perl@' *cgi *pl
       <qandaentry>
 	<question id="faq-use-query">
 	  <para>
-	    The query page is very confusing.  Isn't there a simpler way to query?
+	    The query page is very confusing. Isn't there a simpler way to query?
 	  </para>
 	</question>
 	<answer>
@@ -1108,16 +1102,15 @@ perl -pi -e 's@#\!/usr/bin/perl@#\!/usr/local/bin/perl@' *cgi *pl
 	<answer>
 	  <para>
 	    The current behavior is acceptable to bugzilla.mozilla.org and most
-	    users.  You have your choice of patches
-	    to change this behavior, however.
+	    users. You have your choice of patches to change this behavior, however.
 	    <simplelist>
 	      <member><ulink url="http://bugzilla.mozilla.org/showattachment.cgi?attach_id=8029">
 		Add a "and accept bug" radio button</ulink></member>
 	      <member><ulink url="http://bugzilla.mozilla.org/showattachment.cgi?attach_id=8153">
 		"Accept" button automatically assigns to you</ulink></member>
 	    </simplelist>
-	    Note that these patches are somewhat dated.  You will need to apply
-      them manually.  
+	    Note that these patches are somewhat dated. You will need to apply
+      them manually.
 	  </para>
 	</answer>
       </qandaentry>
@@ -1126,13 +1119,13 @@ perl -pi -e 's@#\!/usr/bin/perl@#\!/usr/local/bin/perl@' *cgi *pl
 	<question id="faq-use-attachment">
 	  <para>
 	    I can't upload anything into the database via the "Create Attachment"
-	    link.  What am I doing wrong?
+	    link. What am I doing wrong?
 	  </para>
 	</question>
 	<answer>
 	  <para>
 	    The most likely cause is a very old browser or a browser that is
-	    incompatible with file upload via POST.  Download the latest Netscape,
+	    incompatible with file upload via POST. Download the latest Netscape,
 	    Microsoft, or Mozilla browser to handle uploads correctly.
 	  </para>
 	</answer>
@@ -1147,8 +1140,8 @@ perl -pi -e 's@#\!/usr/bin/perl@#\!/usr/local/bin/perl@' *cgi *pl
 	<answer>
 	  <para>
 	    In the Bugzilla administrator UI, edit the keyword and it will let you
-	    replace the old keyword name with a new one.  This will cause a problem
-	    with the keyword cache.  Run sanitycheck.cgi to fix it.
+	    replace the old keyword name with a new one. This will cause a problem
+	    with the keyword cache. Run sanitycheck.cgi to fix it.
 	  </para>
 	</answer>
       </qandaentry>
@@ -1167,7 +1160,7 @@ perl -pi -e 's@#\!/usr/bin/perl@#\!/usr/local/bin/perl@' *cgi *pl
 	<answer>
 	  <para>
 	    Gerv and Myk suggest a 2-space indent, with embedded code sections on
-	    their own line, in line with outer tags.  Like this:</para>
+	    their own line, in line with outer tags. Like this:</para>
 	    <programlisting><![CDATA[
 <fred>
 [% IF foo %]
@@ -1189,7 +1182,7 @@ perl -pi -e 's@#\!/usr/bin/perl@#\!/usr/local/bin/perl@' *cgi *pl
 
 	<para>Please note that many have differing opinions on this subject,
 	and the existing templates in Bugzilla espouse both this and a 4-space
-	style.  Either is acceptable; the above is preferred.</para>
+	style. Either is acceptable; the above is preferred.</para>
 	</answer>
       </qandaentry>
 
@@ -1209,7 +1202,7 @@ perl -pi -e 's@#\!/usr/bin/perl@#\!/usr/local/bin/perl@' *cgi *pl
 	    You can view bugs marked for &bz-nextver; release
 	    <ulink url="http://bugzilla.mozilla.org/buglist.cgi?product=Bugzilla&amp;target_milestone=Bugzilla+&bz-nextver;">here</ulink>.
 	    This list includes bugs for the &bz-nextver; release that have already
-	    been fixed and checked into CVS.  Please consult the
+	    been fixed and checked into CVS. Please consult the
 	    <ulink url="http://www.bugzilla.org/">
 	      Bugzilla Project Page</ulink> for details on how to
 	    check current sources out of CVS so you can have these
@@ -1227,11 +1220,10 @@ perl -pi -e 's@#\!/usr/bin/perl@#\!/usr/local/bin/perl@' *cgi *pl
 	</question>
 	<answer>
 	  <para>
-	    This is well-documented here: <ulink url="http://bugzilla.mozilla.org/show_bug.cgi?id=49862">
-	    http://bugzilla.mozilla.org/show_bug.cgi?id=49862</ulink>.  Ultimately, it's as easy
-	    as adding the "---" priority field to your localconfig file in the appropriate area,
-	    re-running checksetup.pl, and then changing the default priority in your browser using
-	    "editparams.cgi". 
+	    This is well-documented in <ulink url="http://bugzilla.mozilla.org/show_bug.cgi?id=49862">
+	    bug 49862</ulink>. Ultimately, it's as easy as adding the "---" priority field to your
+            localconfig file in the appropriate area, re-running checksetup.pl, and then changing the
+            default priority in your browser using "editparams.cgi". 
 	  </para>
 	</answer>
       </qandaentry>
@@ -1259,7 +1251,7 @@ perl -pi -e 's@#\!/usr/bin/perl@#\!/usr/local/bin/perl@' *cgi *pl
 		  or new source file by clicking
 		  "Create a new attachment" link on the bug page you've just created, and
 		  include any descriptions of database changes you may make, into the bug
-		  ID you submitted in step #1.  Be sure and click the "Patch" checkbox
+		  ID you submitted in step #1. Be sure and click the "Patch" checkbox
 		  to indicate the text you are sending is a patch!
 		</para>
 	      </listitem>
@@ -1267,7 +1259,7 @@ perl -pi -e 's@#\!/usr/bin/perl@#\!/usr/local/bin/perl@' *cgi *pl
 		<para>
 		  Announce your patch and the associated URL
 		  (http://bugzilla.mozilla.org/show_bug.cgi?id=XXXXXX) for discussion in
-		  the newsgroup (netscape.public.mozilla.webtools).  You'll get a really
+		  the newsgroup (netscape.public.mozilla.webtools). You'll get a really
 		  good, fairly immediate reaction to the implications of your patch,
 		  which will also give us an idea how well-received the change would
 		  be.
diff --git a/docs/xml/gfdl.xml b/docs/xml/gfdl.xml
index ae19501d2..93987caf6 100644
--- a/docs/xml/gfdl.xml
+++ b/docs/xml/gfdl.xml
@@ -381,10 +381,7 @@
     the GNU Free Documentation License from time to time. Such new versions
     will be similar in spirit to the present version, but may differ in
     detail to address new problems or concerns. See 
-    <ulink url="http://www.gnu.org/copyleft/">
-    http://www.gnu.org/copyleft/</ulink>
-
-    .</para>
+    <ulink url="http://www.gnu.org/copyleft/"/>.</para>
 
     <para>Each version of the License is given a distinguishing version
     number. If the Document specifies that a particular numbered version of
diff --git a/docs/xml/installation.xml b/docs/xml/installation.xml
index 9964b88c8..142afaba7 100644
--- a/docs/xml/installation.xml
+++ b/docs/xml/installation.xml
@@ -44,7 +44,7 @@
 
 <listitem>
   <para>
-    <ulink url="http://www.perl.org">Perl</ulink>
+    <ulink url="http://www.perl.org/">Perl</ulink>
     (&min-perl-ver;, 5.6.1 is recommended if you wish to
     use Bundle::Bugzilla)
   </para>
@@ -209,7 +209,7 @@
       <title>MySQL</title>
 
       <para>Visit the MySQL homepage at 
-      <ulink url="http://www.mysql.com">www.mysql.com</ulink>
+      <ulink url="http://www.mysql.com"/>
       to grab and install the latest stable release of the server. 
       </para>
       
@@ -257,7 +257,7 @@
 
       <para>Any machine that doesn't have Perl on it is a sad machine indeed.
       Perl can be got in source form from 
-      <ulink url="http://www.perl.com">perl.com</ulink> for the rare 
+      <ulink url="http://www.perl.org"/> for the rare 
       *nix systems which don't have it. 
       Although Bugzilla runs with perl &min-perl-ver;,
       it's a good idea to be up to the very latest version
@@ -620,7 +620,7 @@
       </title>
 
       <para>Next, run the magic checksetup.pl script. (Many thanks to 
-      <ulink url="mailto:holgerschurig@nikocity.de">Holger Schurig </ulink> 
+      <ulink url="mailto:holgerschurig@nikocity.de">Holger Schurig</ulink> 
       for writing this script!) 
       This script is designed to make sure your MySQL database and other
       configuration options are consistent with the Bugzilla CGI files. 
@@ -870,10 +870,9 @@ man 5 crontab
 
       <para>You can also try using <ulink url="http://www.openldap.org/">
       OpenLDAP</ulink> with Bugzilla, using any of a number of administration
-      tools.  You should apply the patch attached this bug:
-      <ulink url="http://bugzilla.mozilla.org/show_bug.cgi?id=158630">
-      http://bugzilla.mozilla.org/show_bug.cgi?id=158630</ulink>, then set
-      the following object classes for your users:
+      tools.  You should apply the patch attached to 
+      <ulink url="http://bugzilla.mozilla.org/show_bug.cgi?id=158630">bug 158630</ulink>
+      , then set the following object classes for your users:
 
       <orderedlist>
       <listitem><para>objectClass: person</para></listitem>
@@ -902,8 +901,7 @@ man 5 crontab
       incorporate the code changes necessary to fulfill the CERT advisory
       requirements mentioned in 
       <ulink
-      url="http://www.cet.org/tech_tips/malicious_code_mitigation.html/#3">
-      http://www.cet.org/tech_tips/malicious_code_mitigation.html/#3</ulink>.
+      url="http://www.cet.org/tech_tips/malicious_code_mitigation.html/#3"/>.
       Executing the following code snippet from a UNIX command shell will
       rectify the problem if your Bugzilla installation is intended for an
       English-speaking audience. As always, be sure your Bugzilla
@@ -931,9 +929,9 @@ bash# perl -pi -e "s/Content-Type\: text\/html/Content-Type\: text\/html\; chars
       <note>
         <para>Using &lt;meta&gt; tags to set the charset is not
         recommended, as there's a bug in Netscape 4.x which causes pages
-        marked up in this way to load twice. See 
-        <ulink url="http://bugzilla.mozilla.org/show_bug.cgi?id=126266">bug
-        126266</ulink> for more information including progress toward making
+        marked up in this way to load twice. See  
+        <ulink url="http://bugzilla.mozilla.org/show_bug.cgi?id=126266">bug 126266</ulink>
+        for more information including progress toward making
         bugzilla charset aware by default.
         </para>
       </note>
@@ -1032,7 +1030,7 @@ bash# perl -pi -e "s/Content-Type\: text\/html/Content-Type\: text\/html\; chars
         <para>Perl for Windows can be obtained from <ulink
         url="http://www.activestate.com/">ActiveState</ulink>. You should be
         able to find a compiled binary at <ulink
-        url="http://aspn.activestate.com/ASPN/Downloads/ActivePerl/">http://aspn.activestate.com/ASPN/Downloads/ActivePerl/</ulink>.
+        url="http://aspn.activestate.com/ASPN/Downloads/ActivePerl/"/>.
         </para>
       </section>
 
@@ -1059,7 +1057,7 @@ C:\perl&gt; <command>ppm &lt;module name&gt;</command>
 
         <tip>
           <para>A complete list of modules that can be installed using ppm can
-          be found at <ulink url="http://www.activestate.com/PPMPackages/5.6plus">http://www.activestate.com/PPMPackages/5.6plus</ulink>.
+          be found at <ulink url="http://www.activestate.com/PPMPackages/5.6plus"/>.
           </para>
         </tip>
       </section>
@@ -1362,7 +1360,7 @@ deny from all
       <productname>Personal Web Server</productname> you should be able
       to. You will need to configure them to know how to run CGI scripts,
       however. This is described in Microsoft Knowledge Base article
-      <ulink url="http://support.microsoft.com/support/kb/articles/Q245/2/25.asp">Q245225 </ulink>
+      <ulink url="http://support.microsoft.com/support/kb/articles/Q245/2/25.asp">Q245225</ulink>
       for <productname>Internet Information Services</productname> and
       <ulink url="http://support.microsoft.com/support/kb/articles/Q231/9/98.asp">Q231998</ulink>          
       for <productname>Personal Web Server</productname>.
@@ -1415,9 +1413,9 @@ proc filter_deny { why } {
       <warning>
         <para>This probably doesn't account for all possible editor backup
         files so you may wish to add some additional variations of
-        <filename>localconfig</filename>. For more information, see
-        <ulink url="http://bugzilla.mozilla.org/show_bug.cgi?id=186383">bug
-        186383</ulink> or <ulink
+        <filename>localconfig</filename>. For more information, see 
+        <ulink url="http://bugzilla.mozilla.org/show_bug.cgi?id=186383">
+        bug 186383</ulink> or <ulink
         url="http://online.securityfocus.com/bid/6501">Bugtraq ID 6501</ulink>.
         </para>
       </warning>
diff --git a/docs/xml/integration.xml b/docs/xml/integration.xml
index 514064d26..65451dc75 100644
--- a/docs/xml/integration.xml
+++ b/docs/xml/integration.xml
@@ -36,9 +36,7 @@
 
     <para>There is also a CVSZilla project, based upon somewhat dated 
     Bugzilla code, to integrate CVS and Bugzilla through CVS' ability to 
-    email. Check it out at: 
-    <ulink url="http://homepages.kcbbs.gen.nz/~tonyg/">
-    http://homepages.kcbbs.gen.nz/~tonyg/</ulink>.
+    email. Check it out at: <ulink url="http://homepages.kcbbs.gen.nz/~tonyg/"/>.
     </para>
   </section>
 
@@ -49,16 +47,14 @@
 
     <para>You can find the project page for Bugzilla and Teamtrack Perforce
     integration (p4dti) at: 
-    <ulink url="http://www.ravenbrook.com/project/p4dti/">
-    http://www.ravenbrook.com/project/p4dti</ulink>
+    <ulink url="http://www.ravenbrook.com/project/p4dti/"/>
 
     . 
     <quote>p4dti</quote>
 
     is now an officially supported product from Perforce, and you can find
     the "Perforce Public Depot" p4dti page at 
-    <ulink url="http://public.perforce.com/public/perforce/p4dti/index.html">
-    http://public.perforce.com/public/perforce/p4dti/index.html</ulink>
+    <ulink url="http://public.perforce.com/public/perforce/p4dti/index.html"/>
 
     .</para>
 
diff --git a/docs/xml/patches.xml b/docs/xml/patches.xml
index 84d83d333..b8c068fac 100644
--- a/docs/xml/patches.xml
+++ b/docs/xml/patches.xml
@@ -37,7 +37,7 @@ RewriteRule ^/([0-9]+)$ http://foo.bar.com/show_bug.cgi?id=$1 [L,R]
       <listitem>
         <para>There are many, many more things you can do with mod_rewrite.
         Please refer to the mod_rewrite documentation at 
-        <ulink url="http://www.apache.org">http://www.apache.org</ulink>.
+        <ulink url="http://www.apache.org"/>.
         </para>
       </listitem>
     </orderedlist>
diff --git a/docs/xml/requiredsoftware.xml b/docs/xml/requiredsoftware.xml
index 95988ec83..8a8c35774 100644
--- a/docs/xml/requiredsoftware.xml
+++ b/docs/xml/requiredsoftware.xml
@@ -6,59 +6,52 @@
   stay current for a while.</para>
 
   <para>Apache Web Server: 
-  <ulink url="http://www.apache.org/">http://www.apache.org</ulink>
+  <ulink url="http://www.apache.org/"/>
 
   Optional web server for Bugzilla, but recommended because of broad user
   base and support.</para>
 
   <para>Bugzilla: 
-  <ulink url="http://www.bugzilla.org/">
-  http://www.bugzilla.org/</ulink>
+  <ulink url="http://www.bugzilla.org/"/>
   </para>
 
   <para>MySQL: 
-  <ulink url="http://www.mysql.com/">http://www.mysql.com/</ulink>
+  <ulink url="http://www.mysql.com/"/>
   </para>
 
   <para>Perl: 
-  <ulink url="http://www.perl.org">http://www.perl.org/</ulink>
+  <ulink url="http://www.perl.org/"/>
   </para>
 
   <para>CPAN: 
-  <ulink url="http://www.cpan.org/">http://www.cpan.org/</ulink>
+  <ulink url="http://www.cpan.org/"/>
   </para>
 
   <para>DBI Perl module: 
-  <ulink url="http://www.cpan.org/modules/by-module/DBI/">
-  http://www.cpan.org/modules/by-module/DBI/</ulink>
+  <ulink url="http://www.cpan.org/modules/by-module/DBI/"/>
   </para>
 
   <para>Data::Dumper module: 
-  <ulink url="http://www.cpan.org/modules/by-module/Data/">
-  http://www.cpan.org/modules/by-module/Data/</ulink>
+  <ulink url="http://www.cpan.org/modules/by-module/Data/"/>
   </para>
 
   <para>MySQL related Perl modules: 
-  <ulink url="http://www.cpan.org/modules/by-module/Mysql/">
-  http://www.cpan.org/modules/by-module/Mysql/</ulink>
+  <ulink url="http://www.cpan.org/modules/by-module/Mysql/"/>
   </para>
 
   <para>TimeDate Perl module collection: 
-  <ulink url="http://www.cpan.org/modules/by-module/Date/">
-  http://www.cpan.org/modules/by-module/Date/</ulink>
+  <ulink url="http://www.cpan.org/modules/by-module/Date/"/>
   </para>
 
   <para>GD Perl module: 
-  <ulink url="http://www.cpan.org/modules/by-module/GD/">
-  http://www.cpan.org/modules/by-module/GD/</ulink>
+  <ulink url="http://www.cpan.org/modules/by-module/GD/"/>
 
   Alternately, you should be able to find the latest version of GD at 
-  <ulink url="http://www.boutell.com/gd/">http://www.boutell.com/gd/</ulink>
+  <ulink url="http://www.boutell.com/gd/"/>
   </para>
 
   <para>Chart::Base module: 
-  <ulink url="http://www.cpan.org/modules/by-module/Chart/">
-  http://www.cpan.org/modules/by-module/Chart/</ulink>
+  <ulink url="http://www.cpan.org/modules/by-module/Chart/"/>
   </para>
 
   <para>(But remember, Bundle::Bugzilla will install all the modules for you.)
diff --git a/docs/xml/using.xml b/docs/xml/using.xml
index b5dab9d0a..e74c1ead3 100644
--- a/docs/xml/using.xml
+++ b/docs/xml/using.xml
@@ -22,8 +22,7 @@
       Consult with the administrator responsible for your installation of
       Bugzilla for the URL you should use to access it. If you're
       test-driving Bugzilla, use this URL: 
-      <ulink url="http://landfill.bugzilla.org/bugzilla-tip/">
-      http://landfill.bugzilla.org/bugzilla-tip/</ulink>
+      <ulink url="http://landfill.bugzilla.org/bugzilla-tip/"/>.
       </para>
 
       <orderedlist>
@@ -269,10 +268,7 @@
       <para>The Bugzilla Search page is is the interface where you can find
       any bug report, comment, or patch currently in the Bugzilla system. You
       can play with it here: 
-      <ulink url="http://landfill.bugzilla.org/bugzilla-tip/query.cgi">
-      landfill.bugzilla.org/bugzilla-tip/query.cgi</ulink>
-
-      .</para>
+      <ulink url="http://landfill.bugzilla.org/bugzilla-tip/query.cgi"/>.</para>
 
       <para>The Search page has controls for selecting different possible
       values for all of the fields in a bug, as described above. Once you've
@@ -392,7 +388,7 @@
       However, Bugzilla will automatically make hyperlinks out of certain
       sorts of text in comments. For example, the text 
       http://www.bugzilla.org will be turned into
-      <ulink url="http://www.bugzilla.org">http://www.bugzilla.org</ulink>.
+      <ulink url="http://www.bugzilla.org"/>.
       Other strings which get linkified in the obvious manner are:
       <simplelist>
         <member>bug 12345</member>
diff --git a/docs/xml/variants.xml b/docs/xml/variants.xml
index 690b50987..4f1d2be18 100644
--- a/docs/xml/variants.xml
+++ b/docs/xml/variants.xml
@@ -6,28 +6,25 @@
   and variants, then found a wonderful site which covers an awful lot of what
   I wanted to discuss. Rather than quote it in its entirety, I'll simply
   refer you here: 
-  <ulink url="http://linas.org/linux/pm.html">
-  http://linas.org/linux/pm.html</ulink>
+  <ulink url="http://linas.org/linux/pm.html"/>.
   </para>
 
   <section id="variant-redhat">
     <title>Red Hat Bugzilla</title>
 
     <para>Red Hat's old fork of Bugzilla which was based on version 2.8 is now
-    obsolete.  The newest version in use is based on version 2.17.1 and is in
-    the process of being integrated into the main Bugzilla source tree.  The
+    obsolete. The newest version in use is based on version 2.17.1 and is in
+    the process of being integrated into the main Bugzilla source tree. The
     back-end is modified to work with PostgreSQL instead of MySQL and they have
     custom templates to get their desired look and feel, but other than that it
-    is Bugzilla 2.17.1.  Dave Lawrence of Red Hat put forth a great deal of
+    is Bugzilla 2.17.1. Dave Lawrence of Red Hat put forth a great deal of
     effort to make sure that the changes he made could be integrated back into
     the main tree. 
-    <ulink url="http://bugzilla.mozilla.org/show_bug.cgi?id=98304">Bug
-    98304</ulink> exists to track this integration.
+    <ulink url="http://bugzilla.mozilla.org/show_bug.cgi?id=98304">Bug 98304</ulink>
+    exists to track this integration.
     </para>
 
-    <para>URL: 
-    <ulink url="http://bugzilla.redhat.com/bugzilla/">
-    http://bugzilla.redhat.com/bugzilla/</ulink>
+    <para>URL: <ulink url="http://bugzilla.redhat.com/bugzilla/"/>
     </para>
 
     <para>This section last updated 24 Dec 2002</para>
@@ -61,8 +58,7 @@
     <para>Scarab is a new open source bug-tracking system built using Java
     Servlet technology. It is currently at version 1.0 beta 13.</para>
 
-    <para>URL: 
-    <ulink url="http://scarab.tigris.org/">http://scarab.tigris.org</ulink>
+    <para>URL: <ulink url="http://scarab.tigris.org/"/>
     </para>
 
     <para>This section last updated 18 Jan 2003</para>
@@ -75,10 +71,7 @@
     such through the <quote>jobs</quote>
     functionality.</para>
 
-    <para>URL: 
-    <ulink url="http://www.perforce.com/perforce/technotes/note052.html">
-    http://www.perforce.com/perforce/technotes/note052.html
-    </ulink>
+    <para>URL: <ulink url="http://www.perforce.com/perforce/technotes/note052.html"/>
     </para>
 
     <para>This section last updated 27 Jul 2002</para>
@@ -91,9 +84,7 @@
     distributed free software and open source projects over the Internet.
     It has a built-in bug tracker, but it's not highly thought of.</para>
 
-    <para>URL: 
-    <ulink url="http://www.sourceforge.net">
-    http://www.sourceforge.net</ulink>
+    <para>URL: <ulink url="http://www.sourceforge.net"/>
     </para>
 
     <para>This section last updated 27 Jul 2002</para>