diff options
author | Hans Verkuil <hans.verkuil@cisco.com> | 2014-01-07 04:46:37 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2014-02-04 07:02:47 -0500 |
commit | 1b962087a792556f67191b88a2f80bf949175e54 (patch) | |
tree | f837fbeecf8608d4d03adbd3efd32581d7127c96 /Documentation/DocBook | |
parent | 7183eeb9dc831f372d7d78b8939f3715042b971e (diff) |
[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>
Diffstat (limited to 'Documentation/DocBook')
-rw-r--r-- | Documentation/DocBook/media/dvb/dvbapi.xml | 2 | ||||
-rw-r--r-- | Documentation/DocBook/media/v4l/v4l2.xml | 1 | ||||
-rw-r--r-- | Documentation/DocBook/media_api.tmpl | 13 |
3 files changed, 9 insertions, 7 deletions
diff --git a/Documentation/DocBook/media/dvb/dvbapi.xml b/Documentation/DocBook/media/dvb/dvbapi.xml index 49f46e874ad3..4c15396c67e5 100644 --- a/Documentation/DocBook/media/dvb/dvbapi.xml +++ b/Documentation/DocBook/media/dvb/dvbapi.xml | |||
@@ -28,7 +28,7 @@ | |||
28 | <holder>Convergence GmbH</holder> | 28 | <holder>Convergence GmbH</holder> |
29 | </copyright> | 29 | </copyright> |
30 | <copyright> | 30 | <copyright> |
31 | <year>2009-2012</year> | 31 | <year>2009-2014</year> |
32 | <holder>Mauro Carvalho Chehab</holder> | 32 | <holder>Mauro Carvalho Chehab</holder> |
33 | </copyright> | 33 | </copyright> |
34 | 34 | ||
diff --git a/Documentation/DocBook/media/v4l/v4l2.xml b/Documentation/DocBook/media/v4l/v4l2.xml index 4584841f6864..1a304637b6e8 100644 --- a/Documentation/DocBook/media/v4l/v4l2.xml +++ b/Documentation/DocBook/media/v4l/v4l2.xml | |||
@@ -125,6 +125,7 @@ Remote Controller chapter.</contrib> | |||
125 | <year>2011</year> | 125 | <year>2011</year> |
126 | <year>2012</year> | 126 | <year>2012</year> |
127 | <year>2013</year> | 127 | <year>2013</year> |
128 | <year>2014</year> | ||
128 | <holder>Bill Dirks, Michael H. Schimek, Hans Verkuil, Martin | 129 | <holder>Bill Dirks, Michael H. Schimek, Hans Verkuil, Martin |
129 | Rubli, Andy Walls, Muralidharan Karicheri, Mauro Carvalho Chehab, | 130 | Rubli, Andy Walls, Muralidharan Karicheri, Mauro Carvalho Chehab, |
130 | Pawel Osciak</holder> | 131 | Pawel Osciak</holder> |
diff --git a/Documentation/DocBook/media_api.tmpl b/Documentation/DocBook/media_api.tmpl index df6db3a45c6f..ba1d704e4910 100644 --- a/Documentation/DocBook/media_api.tmpl +++ b/Documentation/DocBook/media_api.tmpl | |||
@@ -37,7 +37,7 @@ | |||
37 | <title>LINUX MEDIA INFRASTRUCTURE API</title> | 37 | <title>LINUX MEDIA INFRASTRUCTURE API</title> |
38 | 38 | ||
39 | <copyright> | 39 | <copyright> |
40 | <year>2009-2012</year> | 40 | <year>2009-2014</year> |
41 | <holder>LinuxTV Developers</holder> | 41 | <holder>LinuxTV Developers</holder> |
42 | </copyright> | 42 | </copyright> |
43 | 43 | ||
@@ -58,12 +58,13 @@ Foundation. A copy of the license is included in the chapter entitled | |||
58 | <title>Introduction</title> | 58 | <title>Introduction</title> |
59 | 59 | ||
60 | <para>This document covers the Linux Kernel to Userspace API's used by | 60 | <para>This document covers the Linux Kernel to Userspace API's used by |
61 | video and radio straming devices, including video cameras, | 61 | video and radio streaming devices, including video cameras, |
62 | analog and digital TV receiver cards, AM/FM receiver cards, | 62 | analog and digital TV receiver cards, AM/FM receiver cards, |
63 | streaming capture devices.</para> | 63 | streaming capture and output devices, codec devices and remote |
64 | controllers.</para> | ||
64 | <para>It is divided into four parts.</para> | 65 | <para>It is divided into four parts.</para> |
65 | <para>The first part covers radio, capture, | 66 | <para>The first part covers radio, video capture and output, |
66 | cameras and analog TV devices.</para> | 67 | cameras, analog TV devices and codecs.</para> |
67 | <para>The second part covers the | 68 | <para>The second part covers the |
68 | API used for digital TV and Internet reception via one of the | 69 | API used for digital TV and Internet reception via one of the |
69 | several digital tv standards. While it is called as DVB API, | 70 | 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 | |||
96 | </author> | 97 | </author> |
97 | </authorgroup> | 98 | </authorgroup> |
98 | <copyright> | 99 | <copyright> |
99 | <year>2009-2012</year> | 100 | <year>2009-2014</year> |
100 | <holder>Mauro Carvalho Chehab</holder> | 101 | <holder>Mauro Carvalho Chehab</holder> |
101 | </copyright> | 102 | </copyright> |
102 | 103 | ||