upstream: [media] DocBook media: update copyright years and Introduction

It's now 2014, so update those copyright years. Also fix a typo in the introduction
and mention that this document also covers output, codec and remote control
devices.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>

diff --git a/Documentation/DocBook/media/dvb/dvbapi.xml b/Documentation/DocBook/media/dvb/dvbapi.xml
index 0197bcc..edcd90f 100644 (file)
--- a/Documentation/DocBook/media/dvb/dvbapi.xml
+++ b/Documentation/DocBook/media/dvb/dvbapi.xml
@@ -28,7 +28,7 @@
        <holder>Convergence GmbH</holder>
 </copyright>
 <copyright>
-       <year>2009-2012</year>
+       <year>2009-2014</year>
        <holder>Mauro Carvalho Chehab</holder>
 </copyright>
 

diff --git a/Documentation/DocBook/media/v4l/v4l2.xml b/Documentation/DocBook/media/v4l/v4l2.xml
index bfe823d..69b5ca1 100644 (file)
--- a/Documentation/DocBook/media/v4l/v4l2.xml
+++ b/Documentation/DocBook/media/v4l/v4l2.xml
@@ -125,6 +125,7 @@ Remote Controller chapter.</contrib>
       <year>2011</year>
       <year>2012</year>
       <year>2013</year>
+      <year>2014</year>
       <holder>Bill Dirks, Michael H. Schimek, Hans Verkuil, Martin
 Rubli, Andy Walls, Muralidharan Karicheri, Mauro Carvalho Chehab,
        Pawel Osciak</holder>

diff --git a/Documentation/DocBook/media_api.tmpl b/Documentation/DocBook/media_api.tmpl
index 4c8d282..1df4906 100644 (file)
--- a/Documentation/DocBook/media_api.tmpl
+++ b/Documentation/DocBook/media_api.tmpl
@@ -37,7 +37,7 @@
 <title>LINUX MEDIA INFRASTRUCTURE API</title>
 
 <copyright>
-       <year>2009-2012</year>
+       <year>2009-2014</year>
        <holder>LinuxTV Developers</holder>
 </copyright>
 
@@ -58,12 +58,13 @@ Foundation. A copy of the license is included in the chapter entitled
        <title>Introduction</title>
 
        <para>This document covers the Linux Kernel to Userspace API's used by
-               video and radio straming devices, including video cameras,
+               video and radio streaming devices, including video cameras,
                analog and digital TV receiver cards, AM/FM receiver cards,
-               streaming capture devices.</para>
+               streaming capture and output devices, codec devices and remote
+               controllers.</para>
        <para>It is divided into four parts.</para>
-       <para>The first part covers radio, capture,
-               cameras and analog TV devices.</para>
+       <para>The first part covers radio, video capture and output,
+               cameras, analog TV devices and codecs.</para>
        <para>The second part covers the
                API used for digital TV and Internet reception via one of the
                several digital tv standards. While it is called as DVB API,
@@ -96,7 +97,7 @@ Foundation. A copy of the license is included in the chapter entitled
 </author>
 </authorgroup>
 <copyright>
-       <year>2009-2012</year>
+       <year>2009-2014</year>
        <holder>Mauro Carvalho Chehab</holder>
 </copyright>