From 53556163ef0af551e99c50fc1bfcb6590ed693c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Sun, 25 Sep 2011 23:40:30 +0300
Subject: [PATCH 2/3] Fix external links in docs, use <ulink> for them.

---
 scripts/desc/xdg-desktop-icon.xml  |    2 +-
 scripts/desc/xdg-desktop-menu.xml  |    8 ++++----
 scripts/desc/xdg-email.xml         |    4 ++--
 scripts/desc/xdg-icon-resource.xml |    2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/scripts/desc/xdg-desktop-icon.xml b/scripts/desc/xdg-desktop-icon.xml
index e1152cc..a886d5c 100644
--- a/scripts/desc/xdg-desktop-icon.xml
+++ b/scripts/desc/xdg-desktop-icon.xml
@@ -249,7 +249,7 @@
     </variablelist>
     <para>
       For a complete overview of the *.desktop file format please
-      visit http://www.freedesktop.org/wiki/Standards/desktop-entry-spec
+      visit <ulink url="http://www.freedesktop.org/wiki/Specifications/desktop-entry-spec"/>
     </para>
   </refsect1>
   <refsect1 id="env_vars">
diff --git a/scripts/desc/xdg-desktop-menu.xml b/scripts/desc/xdg-desktop-menu.xml
index a85a471..e7bda35 100644
--- a/scripts/desc/xdg-desktop-menu.xml
+++ b/scripts/desc/xdg-desktop-menu.xml
@@ -75,7 +75,7 @@
     <para>
       The application menu works according to the
       XDG Desktop Menu Specification at
-      http://www.freedesktop.org/Standards/menu-spec
+      <ulink url="http://www.freedesktop.org/wiki/Specifications/menu-spec"/>
     </para>
   </refsect1>
   <refsect1 id="commands">
@@ -363,8 +363,8 @@
           </simpara>
           <simpara>
             See Appendix A of the XDG Desktop Menu Specification
-            for information about additional categories. 
-            http://standards.freedesktop.org/menu-spec/menu-spec-1.0.html
+            for information about additional categories:
+            <ulink url="http://standards.freedesktop.org/menu-spec/menu-spec-1.0.html#category-registry"/>
 	  </simpara>
 	</listitem>
       </varlistentry>
@@ -382,7 +382,7 @@
     </variablelist>
     <para>
       For a complete overview of the *.desktop file format please
-      visit http://www.freedesktop.org/wiki/Standards/desktop-entry-spec
+      visit <ulink url="http://www.freedesktop.org/wiki/Specifications/desktop-entry-spec"/>
     </para>
   </refsect1>
   <refsect1 id="directoryfiles">
diff --git a/scripts/desc/xdg-email.xml b/scripts/desc/xdg-email.xml
index 28c2e5c..a141906 100644
--- a/scripts/desc/xdg-email.xml
+++ b/scripts/desc/xdg-email.xml
@@ -80,7 +80,7 @@
       It is not recommended to use xdg-email as root.
     </para>
     <para>
-      See http://portland.freedesktop.org/EmailConfig for information on
+      See <ulink url="http://portland.freedesktop.org/wiki/EmailConfig"/> for information on
       how the user can change the e-mail composer that is used.
     </para>
   </refsect1>
@@ -252,7 +252,7 @@
   </refsect1>
   <refsect1 id="configuration">
     <title>Configuration</title>
-    <para>Visit http://portland.freedesktop.org/EmailConfig for information
+    <para>Visit <ulink url="http://portland.freedesktop.org/wiki/EmailConfig"/> for information
       how to configure xdg-email to use the email client of your choice.
     </para>
   </refsect1>
diff --git a/scripts/desc/xdg-icon-resource.xml b/scripts/desc/xdg-icon-resource.xml
index e7503af..aa09fde 100644
--- a/scripts/desc/xdg-icon-resource.xml
+++ b/scripts/desc/xdg-icon-resource.xml
@@ -89,7 +89,7 @@
     <para>
       The desktop icon system works according to the
       XDG Icon Theme Specification at
-      http://www.freedesktop.org/Standards/icon-theme-spec
+      <ulink url="http://www.freedesktop.org/wiki/Specifications/icon-theme-spec"/>
     </para>
   </refsect1>
   <refsect1 id="commands">
-- 
1.7.6