From 8f1b56f42a35f970d04c837876a93eb4ac48f03c Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Tue, 15 Sep 2009 20:49:43 -0300
Subject: [PATCH] --- yaml --- r: 164117 b: refs/heads/master c:
 e5b20214e6628cc30d32b153640e230a4bfdea3b h: refs/heads/master i:   164115:
 ab7f71e2d173834d954645f668741852fbf5453f v: v3

---
 [refs]                                           | 2 +-
 trunk/Documentation/DocBook/v4l/dev-teletext.xml | 4 ++--
 trunk/Documentation/DocBook/v4l/pixfmt.xml       | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 1b5c8dbf7214..756fe751fa94 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9aa08855a47a7d25e231457f893af6f5ab903870
+refs/heads/master: e5b20214e6628cc30d32b153640e230a4bfdea3b
diff --git a/trunk/Documentation/DocBook/v4l/dev-teletext.xml b/trunk/Documentation/DocBook/v4l/dev-teletext.xml
index 59f9993e1489..76184e8ed618 100644
--- a/trunk/Documentation/DocBook/v4l/dev-teletext.xml
+++ b/trunk/Documentation/DocBook/v4l/dev-teletext.xml
@@ -10,8 +10,8 @@ connected to the PC parallel port.</para>
 
   <para>The Teletext API was designed by Martin Buck. It is defined in
 the kernel header file <filename>linux/videotext.h</filename>, the
-specification is available from <ulink url="http://home.pages.de/~videotext/">
-http://home.pages.de/~videotext/</ulink>. (Videotext is the name of
+specification is available from <ulink url="ftp://ftp.gwdg.de/pub/linux/misc/videotext/">
+ftp://ftp.gwdg.de/pub/linux/misc/videotext/</ulink>. (Videotext is the name of
 the German public television Teletext service.) Conventional character
 device file names are <filename>/dev/vtx</filename> and
 <filename>/dev/vttuner</filename>, with device number 83, 0 and 83, 16
diff --git a/trunk/Documentation/DocBook/v4l/pixfmt.xml b/trunk/Documentation/DocBook/v4l/pixfmt.xml
index aaea55d44592..ebfbed03dbb2 100644
--- a/trunk/Documentation/DocBook/v4l/pixfmt.xml
+++ b/trunk/Documentation/DocBook/v4l/pixfmt.xml
@@ -157,7 +157,7 @@ used in the Windows world.</para>
     <!-- See proposal by Billy Biggs, video4linux-list@redhat.com
 on 11 Oct 2002, subject: "Re: [V4L] Re: v4l2 api", and
 http://vektor.theorem.ca/graphics/ycbcr/ and
-http://www.inforamp.net/~poynton/notes/colour_and_gamma/index.html -->
+http://www.poynton.com/notes/colour_and_gamma/ColorFAQ.html -->
 
     <para>
       <variablelist>