Changeset 665ac79f

Timestamp:

06/01/2013 12:20:39 PM (11 years ago)

Author:

Krejzi <krejzi@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 12.2, 7.10, 7.4, 7.5, 7.6, 7.6-blfs, 7.6-systemd, 7.7, 7.8, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, gimp3, gnome, kde5-13430, kde5-14269, kde5-14686, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, krejzi/svn, lazarus, lxqt, nosym, perl-modules, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, systemd-11177, systemd-13485, trunk, upgradedb, xry111/for-12.3, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/spidermonkey128, xry111/test-20220226, xry111/xf86-video-removal

Children:

da95f07

Parents:

18cdcb9

Message:

Removal of GNOME, part 5.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@11236 af4574ff-66df-0310-9fd7-8a98e5e911e0

Files:

• general.ent (modified) (12 diffs)
• general/genlib/genlib.xml (modified) (2 diffs)
• general/genlib/libunique3.xml (deleted)
• general/genlib/telepathy-farstream.xml (deleted)
• general/genlib/telepathy-glib.xml (deleted)
• general/genlib/telepathy-logger.xml (deleted)
• general/genlib/telepathy-mission-control.xml (deleted)
• general/genutils/gtk-doc.xml (modified) (1 diff)
• general/genutils/xscreensaver.xml (modified) (1 diff)
• general/prog/subversion.xml (modified) (1 diff)
• general/sysutils/colord.xml (modified) (1 diff)
• gnome/gnome-intro.xml (deleted)
• gnome/gnome.xml (modified) (1 diff)
• networking/mailnews/other.xml (modified) (1 diff)
• networking/netlibs/librest.xml (deleted)
• networking/netlibs/netlibs.xml (modified) (1 diff)
• postlfs/security/liboauth.xml (deleted)
• postlfs/security/libpwquality.xml (deleted)
• postlfs/security/security.xml (modified) (1 diff)
• x/lib/colord-gtk.xml (deleted)
• x/lib/gtk-vnc.xml (deleted)
• x/lib/lib.xml (modified) (2 diffs)
• x/lib/notification-daemon.xml (deleted)
• x/wm/fluxbox.xml (modified) (2 diffs)
• xfce/apps/midori.xml (modified) (1 diff)
• xfce/core/libwnck2.xml (modified) (2 diffs)
• xsoft/office/abiword.xml (modified) (4 diffs)
• xsoft/office/gnucash.xml (modified) (2 diffs)
• xsoft/office/libreoffice.xml (modified) (1 diff)
• xsoft/other/balsa.xml (modified) (1 diff)
• xsoft/other/blueman.xml (modified) (1 diff)
• xsoft/other/ekiga.xml (modified) (1 diff)
• xsoft/other/gparted.xml (modified) (2 diffs)
• xsoft/other/pidgin.xml (modified) (1 diff)

general.ent

@@ -156 +156 @@
 <!ENTITY iptables-version             "1.4.18">
 <!ENTITY libcap2-version              "2.22">
-<!ENTITY liboauth-version             "1.0.1">
-<!ENTITY libpwquality-version         "1.2.1">
 <!ENTITY linux-pam-version            "1.1.6">
 <!ENTITY mitkrb-version               "1.11.2">
@@ -252 +250 @@
 <!ENTITY libsigc-version              "2.2.11">
 <!ENTITY libtasn1-version             "3.3">
-<!ENTITY libunique3-version           "3.0.2">
 <!ENTITY libunistring-version         "0.9.3">
 <!ENTITY libusb-version               "1.0.9">
@@ -271 +268 @@
 <!ENTITY slib-version                 "3b3">
 <!ENTITY talloc-version               "2.0.8">
-<!ENTITY telepathy-glib-version       "0.20.2">
-<!ENTITY telepathy-logger-version     "0.8.0">
-<!ENTITY telepathy-farstream-version  "0.6.0">
-<!ENTITY telepathy-mission-control-version "5.14.1">
 <!ENTITY wv-version                   "1.2.9">
 
@@ -476 +469 @@
 <!ENTITY libpcap-version              "1.4.0">
 <!ENTITY libproxy-version             "0.4.7">
-<!ENTITY librest-version              "0.7.90">
 <!ENTITY libsoup-version              "2.40.3">
 <!ENTITY libtirpc-version             "0.2.3">
@@ -492 +484 @@
 <!ENTITY mutt-version                 "1.5.21">
 <!ENTITY re-alpine-version            "2.02">
-<!ENTITY tin-version                  "1.8.3">
 
 <!-- Part V -->
@@ -556 +547 @@
 <!ENTITY clutter-gst2-version         "2.0.2">
 <!ENTITY clutter-gtk-version          "1.4.2">
-<!ENTITY colord-gtk-version           "0.1.25">
 <!ENTITY freeglut-version             "2.8.1">
 <!ENTITY gdk-pixbuf-version           "2.26.5">
@@ -566 +556 @@
 <!ENTITY gtkmm2-version               "2.24.2">
 <!ENTITY gtkmm3-version               "3.6.0">
-<!ENTITY gtk-vnc-version              "0.5.2">
 <!ENTITY hicolor-icon-theme-version   "0.12">
 <!ENTITY libnotify-version            "0.7.5">
 <!ENTITY libxklavier-version          "5.3">
-<!ENTITY notification-daemon-version  "0.7.6">
 <!ENTITY pango-version                "1.32.5">
 <!ENTITY pangox-version               "0.0.2">
@@ -582 +570 @@
 <!ENTITY gtk2-libdir                  "2.0/2.10.0">
 <!ENTITY qt-dir                       "$QTDIR">
-
-<!-- Removed
-<!ENTITY libsexy-version              "0.1.11">
-<!ENTITY mx-version                   "1.4.6">
--->
 
 <!-- Chapter 26 -->
@@ -628 +611 @@
 <!ENTITY accountsservice-version      "0.6.31">
 <!ENTITY polkit-gnome-version         "0.105">
-<!ENTITY gnome-doc-utils-version      "0.20.10">
-<!ENTITY yelp-xsl-version             "3.6.1">
+<!ENTITY gsettings-desktop-schemas-version "3.6.1">
+<!ENTITY GConf-version                "3.2.6">
 <!ENTITY libgnome-keyring-version     "3.6.0">
 <!ENTITY libsecret-version            "0.14">
-<!ENTITY gsettings-desktop-schemas-version "3.6.1">
-<!ENTITY dconf-version                "0.14.1">
-<!ENTITY GConf-version                "3.2.6">
 <!ENTITY gcr-version                  "3.6.2">
-<!ENTITY libgee-version               "0.6.7">
-<!ENTITY libgweather-version          "3.6.2">
+<!ENTITY gnome-keyring-version        "3.6.3">
+<!ENTITY gvfs-version                 "1.14.2">
+<!ENTITY yelp-xsl-version             "3.6.1">
+<!ENTITY gjs-version                  "1.34.0">
+<!ENTITY gnome-desktop-version        "3.6.2">
+<!ENTITY gnome-video-effects-version  "0.4.0">
+<!ENTITY gtksourceview-version        "3.6.2">
+<!ENTITY libgtop-version              "2.28.4">
+<!ENTITY libpeas-version              "1.6.2">
 <!ENTITY libwnck-version              "3.4.4">
-<!ENTITY libgnomekbd-version          "3.6.0">
-<!ENTITY libgtop-version              "2.28.4">
-<!ENTITY libwacom-version             "0.6.1">
-<!ENTITY gnome-online-accounts-version "3.6.2">
-<!ENTITY libgdata-version             "0.13.2">
-<!ENTITY evolution-data-server-version "3.6.4">
 <!ENTITY libzeitgeist-version         "0.3.18">
-<!ENTITY folks-version                "0.8.0">
-<!ENTITY gnome-js-common-version      "0.1.2">
-<!ENTITY gjs-version                  "1.34.0">
-<!ENTITY seed-version                 "3.2.0">
-<!ENTITY libpeas-version              "1.6.2">
-<!ENTITY gtksourceview-version        "3.6.2">
-<!ENTITY gtkhtml-version              "4.6.4">
 <!ENTITY totem-pl-parser-version      "3.4.3">
 <!ENTITY vte-version                  "0.34.2">
 
-<!-- Desktop -->
-<!ENTITY gnome-backgrounds-version    "3.6.1">
+<!-- Runtime -->
+<!ENTITY dconf-version                "0.14.1">
 <!ENTITY gnome-icon-theme-version     "3.6.2">
-<!ENTITY gnome-icon-theme-extras-version "3.6.2">
 <!ENTITY gnome-icon-theme-symbolic-version "3.6.2">
 <!ENTITY gnome-themes-standard-version "3.6.5">
-<!ENTITY gnome-video-effects-version  "0.4.0">
-<!ENTITY gnome-desktop-version        "3.6.2">
-<!ENTITY gnome-keyring-version        "3.6.3">
-<!ENTITY gnome-menus-version          "3.6.2">
-<!ENTITY gnome-panel-version          "3.6.2">
-<!ENTITY gvfs-version                 "1.14.2">
-<!ENTITY nautilus-version             "3.6.3">
-<!ENTITY nautilus-sendto-version      "3.6.1">
-<!ENTITY gnome-screensaver-version    "3.6.1">
-<!ENTITY gnome-power-manager-version  "3.6.0">
-<!ENTITY gnome-bluetooth-version      "3.6.1">
-<!ENTITY gnome-user-share-version     "3.0.4">
-<!ENTITY gnome-settings-daemon-version "3.6.4">
-<!ENTITY gnome-control-center-version "3.6.3">
-<!ENTITY gnome-terminal-version       "3.6.1">
-<!ENTITY zenity-version               "3.6.0">
-<!ENTITY metacity-version             "2.34.13">
-<!ENTITY network-manager-applet-version "0.9.8.0">
-<!ENTITY caribou-version              "0.4.4.2">
-<!ENTITY mutter-version               "3.6.3">
-<!ENTITY gnome-shell-version          "3.6.3.1">
-<!ENTITY gnome-session-version        "3.6.2">
-<!ENTITY gnome-user-docs-version      "3.6.2">
 <!ENTITY yelp-version                 "3.6.2">
-
-<!-- System Services -->
-<!ENTITY gdm-version                  "3.6.2">
 
 <!-- Chapter 31 -->
 <!-- Applications -->
-<!ENTITY aisleriot-version            "3.6.2">
-<!ENTITY alacarte-version             "3.6.1">
-<!ENTITY baobab-version               "3.6.4">
+
 <!ENTITY brasero-version              "3.6.1">
 <!ENTITY cheese-version               "3.6.2">
-<!ENTITY empathy-version              "3.6.3">
 <!ENTITY eog-version                  "3.6.2">
-<!ENTITY epiphany-version             "3.6.1">
-<!ENTITY epiphany-extensions-version  "3.6.0">
 <!ENTITY evince-version               "3.6.1">
-<!ENTITY evolution-version            "3.6.4">
 <!ENTITY file-roller-version          "3.6.3">
 <!ENTITY gcalctool-version            "6.6.2">
 <!ENTITY gedit-version                "3.6.2">
-<!ENTITY gnome-color-manager-version  "3.6.1">
-<!ENTITY gnome-contacts-version       "3.6.2">
-<!ENTITY gnome-dictionary-version     "3.6.0">
-<!ENTITY gnome-disk-utility-version   "3.6.1">
-<!ENTITY gnome-games-version          "3.6.1">
 <!ENTITY gnome-nettool-version        "3.2.0">
-<!ENTITY gnome-screenshot-version     "3.6.1">
-<!ENTITY gnome-search-tool-version    "3.6.0">
-<!ENTITY gnome-system-log-version     "3.6.1">
+<!ENTITY gnome-power-manager-version  "3.6.0">
 <!ENTITY gnome-system-monitor-version "3.6.1">
-<!ENTITY gnome-tweak-tool-version     "3.6.1">
+<!ENTITY gnome-terminal-version       "3.6.1">
 <!ENTITY gucharmap-version            "3.6.1">
-<!ENTITY mousetweaks-version          "3.6.0">
-<!ENTITY orca-version                 "3.6.3">
+<!ENTITY nautilus-version             "3.6.3">
+<!ENTITY network-manager-applet-version "0.9.8.0">
 <!ENTITY seahorse-version             "3.6.3">
-<!ENTITY sound-juicer-version         "3.4.0">
 <!ENTITY totem-version                "3.6.3">
-<!ENTITY vinagre-version              "3.6.2">
-<!ENTITY vino-version                 "3.6.2">
 
 <!-- Chapter 32 -->
@@ -874 +805 @@
 
 <!-- Chapter 40 -->
-<!ENTITY dvb-apps-version             "2012-06-10">
 <!ENTITY ffmpeg-version               "1.2.1">
 <!ENTITY mplayer-version              "1.1.1">
@@ -893 +823 @@
 <!ENTITY cups-version                 "1.6.2">
 <!ENTITY cups-filters-version         "1.0.34">
-<!ENTITY LPRng-version                "3.8.B">
 <!ENTITY gs-version                   "9.06">
 <!ENTITY gutenprint-version           "5.2.9">
@@ -921 +850 @@
 <!ENTITY enscript-version             "1.6.6">
 <!ENTITY psutils-version              "p17">
-<!ENTITY gsview-version               "4.8">
-<!ENTITY xpdf-version                 "3.02">
 <!ENTITY epdfview-version             "0.1.8">
 <!ENTITY fop-version                  "1.1">
 <!ENTITY paps-version                 "0.6.8">
 
-<!-- Removed
-<!ENTITY libgxps-version              "0.2.2">
--->
-
 <!-- Chapter 47 -->
 <!ENTITY texlive-version              "20120701">
-<!ENTITY jadetex-version              "3.13">
-
+

general/genlib/genlib.xml

@@ -81 +81 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libsigc++.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libtasn1.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libunique3.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libunistring.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libusb.xml"/>
@@ -100 +99 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="slib.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="talloc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="telepathy-glib.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="telepathy-logger.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="telepathy-farstream.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="telepathy-mission-control.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="wv.xml"/>
 

general/genutils/gtk-doc.xml

@@ -76 +76 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-    <ulink url="http://sourceforge.net/projects/dblatex/">dblatex</ulink> or
-    <xref linkend="fop"/> (XML PDF support),
-    <xref linkend="glib2"/> (for the test suite),
-    <xref linkend="gnome-doc-utils"/> and
-    <xref linkend="which"/> (required for the test suite and gtk-doc documentation),
-    <xref linkend="openjade"/> with
-    <xref linkend="sgml-dtd"/> and
-    <xref linkend="docbook-dsssl"/>
-    (SGML support, not actively maintained any more),
-    <xref linkend="python2"/> (builds gtkdoc-depscan), and
-    <xref linkend="rarian"/></para>
+      <ulink url="http://sourceforge.net/projects/dblatex/">dblatex</ulink> or
+      <xref linkend="fop"/> (XML PDF support),
+      <xref linkend="glib2"/> (for the test suite),
+      <ulink url="&gnome-download-http;/gnome-doc-utils/">
+      GNOME Doc Utils</ulink> and
+      <xref linkend="which"/> (required for the test suite and gtk-doc documentation),
+      <xref linkend="openjade"/> with
+      <xref linkend="sgml-dtd"/> and
+      <xref linkend="docbook-dsssl"/>
+      (SGML support, not actively maintained any more),
+      <xref linkend="python2"/> (builds gtkdoc-depscan), and
+      <xref linkend="rarian"/>
+    </para>
 
     <para condition="html" role="usernotes">User Notes:

general/genutils/xscreensaver.xml

@@ -89 +89 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="gdm"/>,
+      <ulink url="&gnome-download-http;/gdm/">GDM</ulink>,
       <ulink url="http://linas.org/gle/">GLE</ulink> and
       <xref linkend="linux-pam"/>

general/prog/subversion.xml

@@ -110 +110 @@
       <xref linkend="openssl"/>,
       <xref linkend="dbus-glib"/>,
-      <xref linkend="gnome-keyring"/>,
+      <xref linkend="libgnome-keyring"/>,
       <xref linkend="kdelibs"/> (for <ulink url="http://utils.kde.org/projects/kwalletmanager/">KWallet</ulink> support) and
       <xref linkend="apache"/>

general/sysutils/colord.xml

@@ -96 +96 @@
     <para role="optional">
       <ulink url="bash-completion.alioth.debian.org">Bash Completion</ulink>,
-      <xref linkend="colord-gtk"/> and <xref linkend="gnome-desktop"/>
+      <ulink url="http://www.freedesktop.org/software/colord/releases/">
+      colord-gtk</ulink> and <xref linkend="gnome-desktop"/>
       (To build the example tools),
       <xref linkend="docbook-utils"/>,

gnome/gnome.xml

@@ -16 +16 @@
   <title>GNOME</title>
 
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-intro.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="core/core.xml"/>
+<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gnome-intro.xml"/> -->
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="platform/platform.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="applications/applications.xml"/>
   <!-- transitionally, gnome-2 packages used elsewhere -->

networking/mailnews/other.xml

@@ -32 +32 @@
   <application>Mozilla</application> code base.</para>
 
-  <para><xref linkend="evolution"/> includes a GTK2 based mail client.</para>
-
 </sect1>

networking/netlibs/netlibs.xml

@@ -29 +29 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libnl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libpcap.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="librest.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libsoup.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libtirpc.xml"/>

postlfs/security/security.xml

@@ -55 +55 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="firewalling.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libcap2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="liboauth.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libpwquality.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="linux-pam.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mitkrb.xml"/>

x/lib/lib.xml

@@ -36 +36 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="clutter-gst2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="clutter-gtk.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="colord-gtk.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="freeglut.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gdk-pixbuf.xml"/>
@@ -46 +45 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gtkmm2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gtkmm3.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gtk-vnc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="hicolor-icon-theme.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libnotify.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libxklavier.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="notification-daemon.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pango.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pangomm.xml"/>

x/wm/fluxbox.xml

@@ -131 +131 @@
 
       <para>Or alternatively, if you use a login manager like
-      <xref linkend="gdm"/> or <application>kdm</application> and would
+      <application>GDM</application> or <application>KDM</application> and would
       like to be able to choose <application>Fluxbox</application> at the login
       prompt, create a <filename>fluxbox.desktop</filename> file like this.</para>
@@ -146 +146 @@
 EOF</userinput></screen>
 
-      <para>If you didn't install <xref linkend="gdm"/> or
-      <application>kdm</application> in <filename class='directory'>/usr</filename>,
+      <para>If you didn't install <application>GDM</application> or
+      <application>KDM</application> in <filename class='directory'>/usr</filename>,
       then change that command to fit the prefix you chose.</para>
 

xfce/apps/midori.xml

@@ -89 +89 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <ulink url="&gnome-download-http;/gnome-keyring">GNOME Keyring (2.x)</ulink> or
+      <ulink url="&gnome-download-http;/gnome-keyring/">GNOME Keyring (2.x)</ulink> or
       <xref linkend="gcr"/>,
       <xref linkend="gtk-doc"/>,
       <xref linkend="libunique"/> or
-      <xref linkend="libunique3"/> and
+      <ulink url="&gnome-download-http;/libunique/">libunique (3.x)</ulink> and
       <xref linkend="libzeitgeist"/>
     </para>

xfce/core/libwnck2.xml

@@ -179 +179 @@
             interact with it.
           </para>
-          <indexterm zone="libwnck wnckprop-1">
+          <indexterm zone="libwnck2 wnckprop-1">
             <primary sortas="b-wnckprop-1">wnckprop-1</primary>
           </indexterm>
@@ -191 +191 @@
             contains functions for writing pagers and task lists.
           </para>
-          <indexterm zone="libwnck libwnck-1">
+          <indexterm zone="libwnck2 libwnck-1">
             <primary sortas="c-libwnck-1">libwnck-1.so</primary>
           </indexterm>

xsoft/office/abiword.xml

@@ -118 +118 @@
       <ulink url="http://aiksaurus.sourceforge.net/">Aiksaurus</ulink>,
       <xref linkend="dbus-glib"/>,
-      <xref linkend="evolution-data-server"/>,
+      <ulink url="&gnome-download-http;/evolution-data-server/">
+      Evolution Data Server</ulink>,
       <xref linkend="gobject-introspection"/>,
       <ulink url="http://helm.cs.unibo.it/mml-widget/">GtkMathView</ulink>,
@@ -129 +130 @@
       <ulink url="http://sourceforge.net/projects/libwpg/">libwpg</ulink>,
       <ulink url="http://sourceforge.net/projects/libwps/">libwps</ulink>,
-      <ulink url="http://www.abisource.com/projects/link-grammar/">Link Grammar Parser</ulink>,
+      <ulink url="http://www.abisource.com/projects/link-grammar/">
+      Link Grammar Parser</ulink>,
       <ulink url="&gnome-download-http;/loudmouth">Loudmouth</ulink>,
       <xref linkend="redland"/>,
-      <xref linkend="telepathy-glib"/>,
+      <ulink url="http://telepathy.freedesktop.org/releases/telepathy-glib/">
+      Telepathy GLib</ulink>,
       <ulink url="http://libots.sourceforge.net/">OTS</ulink>
       <ulink url="http://software.frodo.looijaard.name/psiconv/">Psiconv</ulink> and
@@ -196 +199 @@
       <option>--disable-collab-backend-telepathy</option>: This switch disables
       <application>Telepathy</application> Colab backend which causes build to
-      fail when using recent versions of <xref linkend="telepathy-glib"/>.
+      fail when using recent versions of <application>Telepathy GLib</application>.
     </para>
 
@@ -204 +207 @@
       <application>Evolution Data Server</application> support which is known
       to fail when using recent versions of
-      <xref linkend="evolution-data-server"/>.
+      <application>Evolution Data Server</application>.
     </para>
 

xsoft/office/gnucash.xml

@@ -120 +120 @@
       <xref linkend="libgnomeui"/>,
       <xref linkend="gnome-vfs"/>,
-      <xref linkend="slib"/> and
-      <xref linkend="goffice"/>.
-    </para>
-    <para role="required">
-      <!-- needs gtkhtml-3 <xref linkend="gtkhtml"/> or -->
+      <xref linkend="slib"/>,
+      <xref linkend="goffice"/> and
       <xref linkend="webkitgtk"/> (configured <option>--with-gtk=2.0</option>).
     </para>
@@ -246 +243 @@
       <xref linkend="webkitgtk"/> (configured <option>--with-gtk=2.0</option>)
       instead of gtkhtml : the default is Gtkhtml-3 which does not build on
-      current <application>Glib2</application> without various changes, and
-      <xref linkend="gtkhtml"/> is not recognised by this application.
+      current <application>Glib2</application> without various changes.
     </para>
 

xsoft/office/libreoffice.xml

@@ -204 +204 @@
       <xref linkend="postgresql"/>,
       <xref linkend="sane"/> and
-      <xref linkend="zenity"/>
+      <ulink url="&gnome-download-http;/zenity/">Zenity</ulink>
     </para>
 

xsoft/other/balsa.xml

@@ -78 +78 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="gtkhtml"/>,
+      <ulink url="&gnome-download-http;/gtkhtml/">GtkHTML</ulink>,
       <xref linkend="gtksourceview"/>,
       <xref linkend="openssl"/>,

xsoft/other/blueman.xml

@@ -91 +91 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="nautilus-sendto"/>
+      <ulink url="&gnome-download-http;/nautilus-sendto/">Nautilus SendTo</ulink>
     </para>
 

xsoft/other/ekiga.xml

@@ -95 +95 @@
     <para role="optional">
       <xref linkend="avahi"/>,
-      <xref linkend="evolution-data-server"/>,
-      <xref linkend="gnome-doc-utils"/> and
+      <ulink url="&gnome-download-http;/evolution-data-server/">
+      Evolution Data Server</ulink>,
+      <ulink url="&gnome-download-http;/gnome-doc-utils/">
+      GNOME Doc Utils</ulink> and
       <xref linkend="openldap"/>
     </para>

xsoft/other/gparted.xml

@@ -83 +83 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="gnome-doc-utils"/> and
+      <ulink url="&gnome-download-http;/gnome-doc-utils/">
+      GNOME Doc Utils</ulink> and
       <xref linkend="rarian"/>
     </para>
@@ -121 +122 @@
       <option>--disable-doc</option>: This switch disables building of
       the optional documentation. Remove it if you have installed
-      <xref linkend="gnome-doc-utils"/>.
+      <application>GNOME Doc Utils</application>.
     </para>
 

xsoft/other/pidgin.xml

@@ -100 +100 @@
       <xref linkend="cyrus-sasl"/>,
       <xref linkend="dbus-glib"/>,
-      <xref linkend="evolution-data-server"/>,
+      <ulink url="&gnome-download-http;/evolution-data-server/">
+      Evolution Data Server</ulink>,
       <ulink url="http://www.freedesktop.org/wiki/Software/Farstream">
       Farstream (Version 0.1)</ulink>