DocBook: Update with the -git changes

From: Mauro Carvalho Chehab <mchehab@redhat.com>

After this patch, -git and -hg trees were updated to have the DocBook at
the kernel tree.

All duplicated info were removed.

Still pending: there are some dynamic files generated:
        media-entities.tmpl and media-indexes.tmpl:
                created from v4l and dvb *.xml files;
        *.c.xml *.h.xml:
                created from some in-trees and out-trees files.

We need a proccess to auto-generate those files every time
someone touches a file that affects the DocBook.

It would be possible to add the rules to generate some of
them at kernel's Makefile, but what to do with the out-of-tree
files? move them to kernel tree?

kernel-sync:

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

3 files changed, 7 insertions, 7 deletions

diff --git a/linux/Documentation/DocBook/dvb/examples.xml b/linux/Documentation/DocBook/dvb/examples.xml
index b89dceda6..f037e568e 100644
--- a/linux/Documentation/DocBook/dvb/examples.xml
+++ b/linux/Documentation/DocBook/dvb/examples.xml
@@ -2,7 +2,7 @@
 <para>In this section we would like to present some examples for using the DVB API.
 </para>
 <para>Maintainer note: This section is out of date. Please refer to the sample programs packaged
-with the driver distribution from <emphasis role="tt">http://linuxtv.org/</emphasis>.
+with the driver distribution from <ulink url="http://linuxtv.org/hg/dvb-apps" />.
 </para>
 
 <section id="tuning">
diff --git a/linux/Documentation/DocBook/dvb/frontend.xml b/linux/Documentation/DocBook/dvb/frontend.xml
index 91a749f70..028c9f23f 100644
--- a/linux/Documentation/DocBook/dvb/frontend.xml
+++ b/linux/Documentation/DocBook/dvb/frontend.xml
@@ -11,8 +11,8 @@ role="tt">linux/dvb/frontend.h</emphasis> in your application.</para>
 is not yet handled by this API but a future extension is possible. For
 DVB-S the frontend device also supports satellite equipment control
 (SEC) via DiSEqC and V-SEC protocols. The DiSEqC (digital SEC)
-specification is available from Eutelsat <emphasis
-role="tt">http://www.eutelsat.org/</emphasis>.</para>
+specification is available from
+<ulink url="http://www.eutelsat.com/satellites/4_5_5.html">Eutelsat</ulink>.</para>
 
 <para>Note that the DVB API may also be used for MPEG decoder-only PCI
 cards, in which case there exists no frontend device.</para>
diff --git a/linux/Documentation/DocBook/dvb/intro.xml b/linux/Documentation/DocBook/dvb/intro.xml
index 83676c44e..0dc83f672 100644
--- a/linux/Documentation/DocBook/dvb/intro.xml
+++ b/linux/Documentation/DocBook/dvb/intro.xml
@@ -10,8 +10,8 @@ you should know what a program/transport stream (PS/TS) is and what is
 meant by a packetized elementary stream (PES) or an I-frame.</para>
 
 <para>Various DVB standards documents are available from
-<emphasis role="tt">http://www.dvb.org/</emphasis> and/or
-<emphasis role="tt">http://www.etsi.org/</emphasis>.</para>
+<ulink url="http://www.dvb.org" /> and/or
+<ulink url="http://www.etsi.org" />.</para>
 
 <para>It is also necessary to know how to access unix/linux devices and
 how to use ioctl calls. This also includes the knowledge of C or C++.
@@ -31,8 +31,8 @@ and filtering several section and PES data streams at the same time.
 <para>In early 2000, we were approached by Nokia with a proposal for a
 new standard Linux DVB API. As a commitment to the development of
 terminals based on open standards, Nokia and Convergence made it
-available to all Linux developers and published it on <emphasis
-role="tt">http://www.linuxtv.org/</emphasis> in September 2000.
+available to all Linux developers and published it on
+<ulink url="http://www.linuxtv.org/" /> in September 2000.
 Convergence is the maintainer of the Linux DVB API. Together with the
 LinuxTV community (i.e. you, the reader of this document), the Linux DVB
 API will be constantly reviewed and improved. With the Linux driver for