[2/2] [docs] winedev: Simplify/tweak a number of URLs

[Frédéric Delanoy]

---
 en/winedev-debugger.sgml      |  5 ++---
 en/winedev-documentation.sgml |  8 +++-----
 en/winedev-ole.sgml           | 18 ++++++------------
 en/winedev-otherdebug.sgml    |  3 +--
 4 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/en/winedev-debugger.sgml b/en/winedev-debugger.sgml
index c727985..0003f01 100644
--- a/en/winedev-debugger.sgml
+++ b/en/winedev-debugger.sgml
@@ -675,7 +675,7 @@ process  tid      prio (all id:s are in hex)
         <para>
           Also of considerable fame amongst disassemblers is
           <application>SoftIce</application> from NuMega.  That software has since been
-          acquired by CompuWare (http://www.compuware.com/) and made part of
+          acquired by <ulink url="http://www.compuware.com/">CompuWare</ulink> and made part of
           their Windows driver development suite.  Newer versions of SoftIce
           needs to run as a Windows Service and therefore won't currently
           work under Wine.
@@ -1037,8 +1037,7 @@ winedbg myprog.exe
             <term>
               <application>XRAY</application>:
               <filename>
-                <ulink url="http://garbo.uwasa.fi/pub/pc/sysinfo/xray15.zip">
-                 http://garbo.uwasa.fi/pub/pc/sysinfo/xray15.zip</ulink>
+                <ulink url="http://garbo.uwasa.fi/pub/pc/sysinfo/xray15.zip"></ulink>
               </filename>
             </term>
             <listitem>
diff --git a/en/winedev-documentation.sgml b/en/winedev-documentation.sgml
index 070308d..9f30b87 100644
--- a/en/winedev-documentation.sgml
+++ b/en/winedev-documentation.sgml
@@ -628,7 +628,7 @@
           <orderedlist>
 
           <listitem><para>
-          Go to <ulink url="http://www.sgmltools.org">http://www.sgmltools.org</ulink>
+          Go to <ulink url="http://www.sgmltools.org"></ulink>
           </para></listitem>
 
           <listitem><para>
@@ -1067,8 +1067,7 @@
             We won't cover all of these elements here (over 300
             DocBook tags exist!), but we will cover the basics.  To
             learn more about the other tags, check out the official
-            DocBook guide, at <ulink
-            url="http://docbook.org">http://docbook.org</ulink>.  To
+            DocBook guide at <ulink url="http://docbook.org"></ulink>.  To
             see how they are used in practice, download the SGML
             source for this manual (the Wine Developer's Guide) and
             browse through it, comparing it to the generated HTML (or
@@ -1642,8 +1641,7 @@
               <term><sgmltag class="starttag">ulink</sgmltag></term>
               <listitem>
                 <para>
-                  Hyperlink in URL form, e.g. <ulink
-                  url="http://www.winehq.org">http://www.winehq.org</ulink>.
+                  Hyperlink in URL form, e.g. <ulink url="http://www.winehq.org"></ulink>.
                 </para>
               </listitem>
             </varlistentry>
diff --git a/en/winedev-ole.sgml b/en/winedev-ole.sgml
index 847f1b7..f1b2a27 100644
--- a/en/winedev-ole.sgml
+++ b/en/winedev-ole.sgml
@@ -1116,37 +1116,31 @@ static ICOM_VTABLE(IDirect3D) d3dvt = {
 
         <itemizedlist>
             <listitem><para>
-              <ulink url="http://www-csag.ucsd.edu/individual/achien/cs491-f97/projects/dcom-writeup.ps">
-                http://www-csag.ucsd.edu/individual/achien/cs491-f97/projects/dcom-writeup.ps</ulink>
+              <ulink url="http://www-csag.ucsd.edu/individual/achien/cs491-f97/projects/dcom-writeup.ps"></ulink>
 
             </para></listitem>
 
             <listitem><para>
-              <ulink url="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/com/htm/cmi_n2p_459u.asp">
-                http://msdn.microsoft.com/library/default.asp?url=/library/en-us/com/htm/cmi_n2p_459u.asp</ulink>
+              <ulink url="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/com/htm/cmi_n2p_459u.asp"></ulink>
 
             </para></listitem>
 
 
             <listitem><para>
-              <ulink url="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/com/htm/cmi_q2z_5ygi.asp">
-                http://msdn.microsoft.com/library/default.asp?url=/library/en-us/com/htm/cmi_q2z_5ygi.asp</ulink>
+              <ulink url="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/com/htm/cmi_q2z_5ygi.asp"></ulink>
             </para></listitem>
 
 
             <listitem><para>
-                <ulink url="http://www.microsoft.com/msj/0398/dcom.aspx">
-                  http://www.microsoft.com/msj/0398/dcom.aspx</ulink>
+                <ulink url="http://www.microsoft.com/msj/0398/dcom.aspx"></ulink>
             </para></listitem>
 
             <listitem><para>
-                <ulink url="http://www.microsoft.com/ntserver/techresources/appserv/COM/DCOM/4_ConnectionMgmt.asp">
-                  http://www.microsoft.com/ntserver/techresources/appserv/COM/DCOM/4_ConnectionMgmt.asp</ulink>
+                <ulink url="http://www.microsoft.com/ntserver/techresources/appserv/COM/DCOM/4_ConnectionMgmt.asp"></ulink>
             </para></listitem>
 
 
-            <listitem><para><ulink url="http://www.idevresource.com/com/library/articles/comonlinux.asp">
-                  http://www.idevresource.com/com/library/articles/comonlinux.asp</ulink>
+            <listitem><para><ulink url="http://www.idevresource.com/com/library/articles/comonlinux.asp"></ulink>
 
                 (unfortunately part 2 of this article does not seem to exist anymore, if it was ever written)</para></listitem>
         </itemizedlist>
diff --git a/en/winedev-otherdebug.sgml b/en/winedev-otherdebug.sgml
index 8b208d5..ee7cab0 100644
--- a/en/winedev-otherdebug.sgml
+++ b/en/winedev-otherdebug.sgml
@@ -337,8 +337,7 @@ less registry.c.gcov
       <para>
         For a further in depth description of gcov, the official gcc
         compiler suite page for gcov is <ulink
-        url="http://gcc.gnu.org/onlinedocs/gcc/Gcov.html">
-        http://gcc.gnu.org/onlinedocs/gcc/Gcov.html</ulink>.
+        url="http://gcc.gnu.org/onlinedocs/gcc/Gcov.html"></ulink>.
       </para>
     </sect1>
 
-- 
1.8.3.2