merge: http://linuxtv.org/hg/~pb/v4l-dvb/

From: Mauro Carvalho Chehab <mchehab@redhat.com>

Priority: normal

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

1 files changed, 21 insertions, 21 deletions

diff --git a/v4l2-spec/common.sgml b/v4l2-spec/common.sgml
index 75c7141e3..dd598ac9a 100644
--- a/v4l2-spec/common.sgml
+++ b/v4l2-spec/common.sgml
@@ -27,7 +27,7 @@ input, video standard, picture brightness a.&nbsp;o.</para>
 
   <para>In practice most steps are optional and can be executed out of
 order. It depends on the V4L2 device type, you can read about the
-details in <xref linkend="devices">. In this chapter we will discuss
+details in <xref linkend="devices" />. In this chapter we will discuss
 the basic concepts applicable to all devices.</para>
 
   <section id="open">
@@ -75,8 +75,8 @@ written as: <informalexample>
 	  <screen>
 alias char-major-81-0 mydriver
 alias char-major-81-1 mydriver
-alias char-major-81-64 mydriver              <co id="alias">
-options mydriver video_nr=0,1 radio_nr=0,1   <co id="options">
+alias char-major-81-64 mydriver              <co id="alias" />
+options mydriver video_nr=0,1 radio_nr=0,1   <co id="options" />
 	  </screen>
 	  <calloutlist>
 	    <callout arearefs="alias">
@@ -91,7 +91,7 @@ with minor number 64 and 65 (base 64).</para>
 	    </callout>
 	  </calloutlist>
 	</informalexample> When no minor number is given as module
-option the driver supplies a default. <xref linkend="devices">
+option the driver supplies a default. <xref linkend="devices" />
 recommends the base minor numbers to be used for the various device
 types. Obviously minor numbers must be unique. When the number is
 already in use the <emphasis>offending device</emphasis> will not be
@@ -101,7 +101,7 @@ linux-kernel@vger.kernel.org, 2002-11-20. --></para>
       <para>By convention system administrators create various
 character device special files with these major and minor numbers in
 the <filename>/dev</filename> directory. The names recomended for the
-different V4L2 device types are listed in <xref linkend="devices">.
+different V4L2 device types are listed in <xref linkend="devices" />.
 </para>
 
       <para>The creation of character special files (with
@@ -143,7 +143,7 @@ compatibility with old applications drivers must still register different
 minor numbers to assign a default function to the device. But if related
 functions are supported by the driver they must be available under all
 registered minor numbers. The desired function can be selected after
-opening the device as described in <xref linkend="devices">.</para>
+opening the device as described in <xref linkend="devices" />.</para>
 
       <para>Imagine a driver supporting video capturing, video
 overlay, raw VBI capturing, and FM radio reception. It registers three
@@ -197,7 +197,7 @@ so applications cannot know if it really works.</para>
 to read or write the requested type of data, and to change related
 properties, to this file descriptor. Applications can request
 additional access privileges using the priority mechanism described in
-<xref linkend="app-pri">.</para>
+<xref linkend="app-pri" />.</para>
     </section>
 
     <section>
@@ -303,10 +303,10 @@ device has one or more outputs.</para>
       <title>Input and output enumeration is the root of most device properties.</title>
       <mediaobject>
 	<imageobject>
-	  <imagedata fileref="links.pdf" format="ps">
+	  <imagedata fileref="links.pdf" format="ps" />
 	</imageobject>
 	<imageobject>
-	  <imagedata fileref="links.gif" format="gif">
+	  <imagedata fileref="links.gif" format="gif" />
 	</imageobject>
 	<textobject>
 	  <phrase>Links between various device property structures.</phrase>
@@ -604,7 +604,7 @@ to zero, the <constant>VIDIOC_G_STD</constant>,
 <constant>VIDIOC_QUERYSTD</constant> and
 <constant>VIDIOC_ENUMSTD</constant> ioctls shall return the
 &EINVAL;.<footnote>
-	<para>See <xref linkend="buffer"> for a rationale. Probably
+	<para>See <xref linkend="buffer" /> for a rationale. Probably
 even USB cameras follow some well known video standard. It might have
 been better to explicitly indicate elsewhere if a device cannot live
 up to normal expectations, instead of this exception.</para>
@@ -752,8 +752,8 @@ using the aggregate &v4l2-format; and the &VIDIOC-G-FMT; and
 used to examine what the hardware <emphasis>could</emphasis> do,
 without actually selecting a new data format. The data formats
 supported by the V4L2 API are covered in the respective device section
-in <xref linkend="devices">. For a closer look at image formats see
-<xref linkend="pixfmt">.</para>
+in <xref linkend="devices" />. For a closer look at image formats see
+<xref linkend="pixfmt" />.</para>
 
       <para>The <constant>VIDIOC_S_FMT</constant> ioctl is a major
 turning-point in the initialization sequence. Prior to this point
@@ -863,10 +863,10 @@ determine if scaling takes place.</emphasis></para>
 	<title>Image Cropping, Insertion and Scaling</title>
 	<mediaobject>
 	  <imageobject>
-	    <imagedata fileref="crop.pdf" format="PS">
+	    <imagedata fileref="crop.pdf" format="PS" />
 	  </imageobject>
 	  <imageobject>
-	    <imagedata fileref="crop.gif" format="GIF">
+	    <imagedata fileref="crop.gif" format="GIF" />
 	  </imageobject>
 	  <textobject>
 	    <phrase>The cropping, insertion and scaling process</phrase>
@@ -881,10 +881,10 @@ the <structfield>bounds</structfield> substructure of the
 ioctl. To support a wide range of hardware this specification does not
 define an origin or units. However by convention drivers should
 horizontally count unscaled samples relative to 0H (the leading edge
-of the horizontal sync pulse, see <xref linkend="vbi-hsync">).
+of the horizontal sync pulse, see <xref linkend="vbi-hsync" />).
 Vertically ITU-R line
-numbers of the first field (<xref linkend="vbi-525">, <xref
-linkend="vbi-625">), multiplied by two if the driver can capture both
+numbers of the first field (<xref linkend="vbi-525" />, <xref
+linkend="vbi-625" />), multiplied by two if the driver can capture both
 fields.</para>
 
       <para>The top left corner, width and height of the source
@@ -1036,13 +1036,13 @@ if (-1 == ioctl (fd, &VIDIOC-S-FMT;, &amp;format)) {
 	<title>Selecting an output area</title>
 
 	<programlisting>
-&v4l2-cropcap cropcap;
-&v4l2-crop crop;
+&v4l2-cropcap; cropcap;
+&v4l2-crop; crop;
 
 memset (&amp;cropcap, 0, sizeof (cropcap));
 cropcap.type = V4L2_BUF_TYPE_VIDEO_OUTPUT;
 
-if (-1 == ioctl (fd, VIDIOC_CROPCAP, &amp;cropcap)) {
+if (-1 == ioctl (fd, VIDIOC_CROPCAP;, &amp;cropcap)) {
 	perror ("VIDIOC_CROPCAP");
 	exit (EXIT_FAILURE);
 }
@@ -1063,7 +1063,7 @@ crop.c.top += crop.c.height / 2;
 /* Ignore if cropping is not supported (EINVAL). */
 
 if (-1 == ioctl (fd, VIDIOC_S_CROP, &amp;crop)
-    && errno != EINVAL) {
+    &amp;&amp; errno != EINVAL) {
 	perror ("VIDIOC_S_CROP");
 	exit (EXIT_FAILURE);
 }