[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>

[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>
Hans Verkuil · Mauro Carvalho Chehab
1 parent 7a44e3763d
Showing 4 changed files with 13 additions and 24 deletions Side-by-side Diff
Documentation/DocBook/media/dvb/dvbapi.xml
Documentation/DocBook/media/v4l/compat.xml
Documentation/DocBook/media/v4l/v4l2.xml
Documentation/DocBook/media_api.tmpl
@@ -28,7 +28,7 @@
 	<holder>Convergence GmbH</holder>
 </copyright>
 <copyright>
-	<year>2009-2011</year>
+	<year>2009-2012</year>
 	<holder>Mauro Carvalho Chehab</holder>
 </copyright>
  
@@ -2468,21 +2468,9 @@
 	  <structfield>reserved2</structfield> and removed
 	  <constant>V4L2_BUF_FLAG_INPUT</constant>.</para>
 	</listitem>
-      </orderedlist>
-    </section>
-
-    <section>
-      <title>V4L2 in Linux 3.6</title>
-      <orderedlist>
         <listitem>
 	  <para>Added V4L2_CAP_VIDEO_M2M and V4L2_CAP_VIDEO_M2M_MPLANE capabilities.</para>
         </listitem>
-      </orderedlist>
-    </section>
-
-    <section>
-      <title>V4L2 in Linux 3.6</title>
-      <orderedlist>
         <listitem>
 	  <para>Added support for frequency band enumerations: &VIDIOC-ENUM-FREQ-BANDS;.</para>
         </listitem>
@@ -145,9 +145,12 @@
 	<authorinitials>hv</authorinitials>
 	<revremark>Added VIDIOC_ENUM_FREQ_BANDS.
 	</revremark>
+      </revision>
+
+      <revision>
 	<revnumber>3.5</revnumber>
 	<date>2012-05-07</date>
-	<authorinitials>sa, sn</authorinitials>
+	<authorinitials>sa, sn, hv</authorinitials>
 	<revremark>Added V4L2_CTRL_TYPE_INTEGER_MENU and V4L2 subdev
 	    selections API. Improved the description of V4L2_CID_COLORFX
 	    control, added V4L2_CID_COLORFX_CBCR control.
  
@@ -158,12 +161,9 @@
 	    V4L2_CID_3A_LOCK, V4L2_CID_AUTO_FOCUS_START,
 	    V4L2_CID_AUTO_FOCUS_STOP, V4L2_CID_AUTO_FOCUS_STATUS
 	    and V4L2_CID_AUTO_FOCUS_RANGE.
+	    Added VIDIOC_ENUM_DV_TIMINGS, VIDIOC_QUERY_DV_TIMINGS and
+	    VIDIOC_DV_TIMINGS_CAP.
 	</revremark>
-	<date>2012-05-01</date>
-	<authorinitials>hv</authorinitials>
-	<revremark>Added VIDIOC_ENUM_DV_TIMINGS, VIDIOC_QUERY_DV_TIMINGS and
-	VIDIOC_DV_TIMINGS_CAP.
-	</revremark>
       </revision>
  
       <revision>
@@ -472,7 +472,7 @@
 </partinfo>
  
 <title>Video for Linux Two API Specification</title>
- <subtitle>Revision 3.5</subtitle>
+ <subtitle>Revision 3.6</subtitle>
  
   <chapter id="common">
     &sub-common;
@@ -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 @@
 		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 @@
 		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 @@
 </author>
 </authorgroup>
 <copyright>
-	<year>2009-2011</year>
+	<year>2009-2012</year>
 	<holder>Mauro Carvalho Chehab</holder>
 </copyright>
...	...	@@ -28,7 +28,7 @@
28	28	<holder>Convergence GmbH</holder>
29	29	</copyright>
30	30	<copyright>
31		- <year>2009-2011</year>
	31	+ <year>2009-2012</year>
32	32	<holder>Mauro Carvalho Chehab</holder>
33	33	</copyright>
34	34
...	...	@@ -2468,21 +2468,9 @@
2468	2468	<structfield>reserved2</structfield> and removed
2469	2469	<constant>V4L2_BUF_FLAG_INPUT</constant>.</para>
2470	2470	</listitem>
2471		- </orderedlist>
2472		- </section>
2473		-
2474		- <section>
2475		- <title>V4L2 in Linux 3.6</title>
2476		- <orderedlist>
2477	2471	<listitem>
2478	2472	<para>Added V4L2_CAP_VIDEO_M2M and V4L2_CAP_VIDEO_M2M_MPLANE capabilities.</para>
2479	2473	</listitem>
2480		- </orderedlist>
2481		- </section>
2482		-
2483		- <section>
2484		- <title>V4L2 in Linux 3.6</title>
2485		- <orderedlist>
2486	2474	<listitem>
2487	2475	<para>Added support for frequency band enumerations: &VIDIOC-ENUM-FREQ-BANDS;.</para>
2488	2476	</listitem>
...	...	@@ -145,9 +145,12 @@
145	145	<authorinitials>hv</authorinitials>
146	146	<revremark>Added VIDIOC_ENUM_FREQ_BANDS.
147	147	</revremark>
	148	+ </revision>
	149	+
	150	+ <revision>
148	151	<revnumber>3.5</revnumber>
149	152	<date>2012-05-07</date>
150		- <authorinitials>sa, sn</authorinitials>
	153	+ <authorinitials>sa, sn, hv</authorinitials>
151	154	<revremark>Added V4L2_CTRL_TYPE_INTEGER_MENU and V4L2 subdev
152	155	selections API. Improved the description of V4L2_CID_COLORFX
153	156	control, added V4L2_CID_COLORFX_CBCR control.
154	157
...	...	@@ -158,12 +161,9 @@
158	161	V4L2_CID_3A_LOCK, V4L2_CID_AUTO_FOCUS_START,
159	162	V4L2_CID_AUTO_FOCUS_STOP, V4L2_CID_AUTO_FOCUS_STATUS
160	163	and V4L2_CID_AUTO_FOCUS_RANGE.
	164	+ Added VIDIOC_ENUM_DV_TIMINGS, VIDIOC_QUERY_DV_TIMINGS and
	165	+ VIDIOC_DV_TIMINGS_CAP.
161	166	</revremark>
162		- <date>2012-05-01</date>
163		- <authorinitials>hv</authorinitials>
164		- <revremark>Added VIDIOC_ENUM_DV_TIMINGS, VIDIOC_QUERY_DV_TIMINGS and
165		- VIDIOC_DV_TIMINGS_CAP.
166		- </revremark>
167	167	</revision>
168	168
169	169	<revision>
...	...	@@ -472,7 +472,7 @@
472	472	</partinfo>
473	473
474	474	<title>Video for Linux Two API Specification</title>
475		- <subtitle>Revision 3.5</subtitle>
	475	+ <subtitle>Revision 3.6</subtitle>
476	476
477	477	<chapter id="common">
478	478	&sub-common;
...	...	@@ -29,7 +29,7 @@
29	29	<title>LINUX MEDIA INFRASTRUCTURE API</title>
30	30
31	31	<copyright>
32		- <year>2009-2011</year>
	32	+ <year>2009-2012</year>
33	33	<holder>LinuxTV Developers</holder>
34	34	</copyright>
35	35
...	...	@@ -53,7 +53,7 @@
53	53	video and radio straming devices, including video cameras,
54	54	analog and digital TV receiver cards, AM/FM receiver cards,
55	55	streaming capture devices.</para>
56		- <para>It is divided into three parts.</para>
	56	+ <para>It is divided into four parts.</para>
57	57	<para>The first part covers radio, capture,
58	58	cameras and analog TV devices.</para>
59	59	<para>The second part covers the
...	...	@@ -62,7 +62,8 @@
62	62	in fact it covers several different video standards including
63	63	DVB-T, DVB-S, DVB-C and ATSC. The API is currently being updated
64	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	67	<para>For additional information and for the latest development code,
67	68	see: <ulink url="http://linuxtv.org">http://linuxtv.org</ulink>.</para>
68	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 @@
87	88	</author>
88	89	</authorgroup>
89	90	<copyright>
90		- <year>2009-2011</year>
	91	+ <year>2009-2012</year>
91	92	<holder>Mauro Carvalho Chehab</holder>
92	93	</copyright>
93	94