Merge branch 'fbdev-next' of github.com:timur-tabi/linux-2.6 into for-linus

[~andy/linux] / Documentation / DocBook / media_api.tmpl

diff --git a/Documentation/DocBook/media_api.tmpl b/Documentation/DocBook/media_api.tmpl
index 4e8e8985cc1722a5594efdb61c2c0a5af1294929..f2413acfe24105b00b529feca5a0490d6a9b126d 100644 (file)
--- a/Documentation/DocBook/media_api.tmpl
+++ b/Documentation/DocBook/media_api.tmpl
@@ -29,7 +29,7 @@
 <title>LINUX MEDIA INFRASTRUCTURE API</title>
 
 <copyright>
-       <year>2009-2011</year>
+       <year>2009-2012</year>
        <holder>LinuxTV Developers</holder>
 </copyright>
 
@@ -53,7 +53,7 @@ Foundation. A copy of the license is included in the chapter entitled
                video and radio straming devices, including video cameras,
                analog and digital TV receiver cards, AM/FM receiver cards,
                streaming capture devices.</para>
-       <para>It is divided into three parts.</para>
+       <para>It is divided into four parts.</para>
        <para>The first part covers radio, capture,
                cameras and analog TV devices.</para>
        <para>The second part covers the
@@ -62,7 +62,8 @@ Foundation. A copy of the license is included in the chapter entitled
                in fact it covers several different video standards including
                DVB-T, DVB-S, DVB-C and ATSC. The API is currently being updated
                to documment support also for DVB-S2, ISDB-T and ISDB-S.</para>
-       <para>The third part covers Remote Controller API</para>
+       <para>The third part covers the Remote Controller API.</para>
+       <para>The fourth part covers the Media Controller API.</para>
        <para>For additional information and for the latest development code,
                see: <ulink url="http://linuxtv.org">http://linuxtv.org</ulink>.</para>
        <para>For discussing improvements, reporting troubles, sending new drivers, etc, please mail to: <ulink url="http://vger.kernel.org/vger-lists.html#linux-media">Linux Media Mailing List (LMML).</ulink>.</para>
@@ -87,7 +88,7 @@ Foundation. A copy of the license is included in the chapter entitled
 </author>
 </authorgroup>
 <copyright>
-       <year>2009-2011</year>
+       <year>2009-2012</year>
        <holder>Mauro Carvalho Chehab</holder>
 </copyright>