diff options
author | Hans Verkuil <hans.verkuil@cisco.com> | 2012-08-09 05:04:43 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-08-11 15:13:24 -0400 |
commit | 571d19c39714bdea4fbffd6e03f9ff5646ac571b (patch) | |
tree | 0d48741728d78f4bb93f90e3987f667b15896475 /Documentation/DocBook/media_api.tmpl | |
parent | 7a44e3763d7ac90524961212ef0033c32403c3eb (diff) |
[media] DocBook: various version/copyright year updates
- update 2011 to 2012 for copyrights
- update V4L2 spec version to 3.6
- update the intro to also refer to part four: the Media Controller
- fix an incorrect revision section
- fix an incorrect 3.6 kernel changes section
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'Documentation/DocBook/media_api.tmpl')
-rw-r--r-- | Documentation/DocBook/media_api.tmpl | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Documentation/DocBook/media_api.tmpl b/Documentation/DocBook/media_api.tmpl index 4e8e8985cc17..f2413acfe241 100644 --- a/Documentation/DocBook/media_api.tmpl +++ b/Documentation/DocBook/media_api.tmpl | |||
@@ -29,7 +29,7 @@ | |||
29 | <title>LINUX MEDIA INFRASTRUCTURE API</title> | 29 | <title>LINUX MEDIA INFRASTRUCTURE API</title> |
30 | 30 | ||
31 | <copyright> | 31 | <copyright> |
32 | <year>2009-2011</year> | 32 | <year>2009-2012</year> |
33 | <holder>LinuxTV Developers</holder> | 33 | <holder>LinuxTV Developers</holder> |
34 | </copyright> | 34 | </copyright> |
35 | 35 | ||
@@ -53,7 +53,7 @@ Foundation. A copy of the license is included in the chapter entitled | |||
53 | video and radio straming devices, including video cameras, | 53 | video and radio straming devices, including video cameras, |
54 | analog and digital TV receiver cards, AM/FM receiver cards, | 54 | analog and digital TV receiver cards, AM/FM receiver cards, |
55 | streaming capture devices.</para> | 55 | streaming capture devices.</para> |
56 | <para>It is divided into three parts.</para> | 56 | <para>It is divided into four parts.</para> |
57 | <para>The first part covers radio, capture, | 57 | <para>The first part covers radio, capture, |
58 | cameras and analog TV devices.</para> | 58 | cameras and analog TV devices.</para> |
59 | <para>The second part covers the | 59 | <para>The second part covers the |
@@ -62,7 +62,8 @@ Foundation. A copy of the license is included in the chapter entitled | |||
62 | in fact it covers several different video standards including | 62 | in fact it covers several different video standards including |
63 | DVB-T, DVB-S, DVB-C and ATSC. The API is currently being updated | 63 | DVB-T, DVB-S, DVB-C and ATSC. The API is currently being updated |
64 | to documment support also for DVB-S2, ISDB-T and ISDB-S.</para> | 64 | to documment support also for DVB-S2, ISDB-T and ISDB-S.</para> |
65 | <para>The third part covers Remote Controller API</para> | 65 | <para>The third part covers the Remote Controller API.</para> |
66 | <para>The fourth part covers the Media Controller API.</para> | ||
66 | <para>For additional information and for the latest development code, | 67 | <para>For additional information and for the latest development code, |
67 | see: <ulink url="http://linuxtv.org">http://linuxtv.org</ulink>.</para> | 68 | see: <ulink url="http://linuxtv.org">http://linuxtv.org</ulink>.</para> |
68 | <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> | 69 | <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 | |||
87 | </author> | 88 | </author> |
88 | </authorgroup> | 89 | </authorgroup> |
89 | <copyright> | 90 | <copyright> |
90 | <year>2009-2011</year> | 91 | <year>2009-2012</year> |
91 | <holder>Mauro Carvalho Chehab</holder> | 92 | <holder>Mauro Carvalho Chehab</holder> |
92 | </copyright> | 93 | </copyright> |
93 | 94 | ||