From: Hans Verkuil <hans.verk...@cisco.com>
Signed-off-by: Hans Verkuil <hans.verk...@cisco.com>
---
Documentation/DocBook/media/v4l/biblio.xml | 12 ++++++------
Documentation/DocBook/media/v4l/controls.xml | 6 +++---
Documentation/DocBook/media/v4l/dev-rds.xml | 2 +-
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/Documentation/DocBook/media/v4l/biblio.xml
b/Documentation/DocBook/media/v4l/biblio.xml
index 1078e45..18b6fc9 100644
--- a/Documentation/DocBook/media/v4l/biblio.xml
+++ b/Documentation/DocBook/media/v4l/biblio.xml
@@ -178,23 +178,23 @@ Signal - NTSC for Studio Applications"</title>
1125-Line High-Definition Production"</title>
</biblioentry>
- <biblioentry id="en50067">
- <abbrev>EN 50067</abbrev>
+ <biblioentry id="iec62106">
+ <abbrev>IEC 62106</abbrev>
<authorgroup>
- <corpauthor>European Committee for Electrotechnical Standardization
-(<ulink url="http://www.cenelec.eu";>http://www.cenelec.eu</ulink>)</corpauthor>
+ <corpauthor>International Electrotechnical Commission
+(<ulink url="http://www.iec.ch";>http://www.iec.ch</ulink>)</corpauthor>
</authorgroup>
<title>Specification of the radio data system (RDS) for VHF/FM sound
broadcasting
in the frequency range from 87,5 to 108,0 MHz</title>
</biblioentry>
<biblioentry id="nrsc4">
- <abbrev>NRSC-4</abbrev>
+ <abbrev>NRSC-4-B</abbrev>
<authorgroup>
<corpauthor>National Radio Systems Committee
(<ulink
url="http://www.nrscstandards.org";>http://www.nrscstandards.org</ulink>)</corpauthor>
</authorgroup>
- <title>NRSC-4: United States RBDS Standard</title>
+ <title>NRSC-4-B: United States RBDS Standard</title>
</biblioentry>
<biblioentry id="iso12232">
diff --git a/Documentation/DocBook/media/v4l/controls.xml
b/Documentation/DocBook/media/v4l/controls.xml
index 93dc48b..93b9c68 100644
--- a/Documentation/DocBook/media/v4l/controls.xml
+++ b/Documentation/DocBook/media/v4l/controls.xml
@@ -3505,7 +3505,7 @@ This encodes up to 31 pre-defined programme types.</entry>
</row>
<row><entry spanname="descr">Sets the Programme Service name
(PS_NAME) for transmission.
It is intended for static display on a receiver. It is the primary aid to
listeners in programme service
-identification and selection. In Annex E of <xref linkend="en50067" />, the
RDS specification,
+identification and selection. In Annex E of <xref linkend="iec62106" />, the
RDS specification,
there is a full description of the correct character encoding for Programme
Service name strings.
Also from RDS specification, PS is usually a single eight character text.
However, it is also possible
to find receivers which can scroll strings sized as 8 x N characters. So, this
control must be configured
@@ -3519,7 +3519,7 @@ with steps of 8 characters. The result is it must always
contain a string with s
what is being broadcasted. RDS Radio Text can be applied when broadcaster
wishes to transmit longer PS names,
programme-related information or any other text. In these cases, RadioText
should be used in addition to
<constant>V4L2_CID_RDS_TX_PS_NAME</constant>. The encoding for Radio Text
strings is also fully described
-in Annex E of <xref linkend="en50067" />. The length of Radio Text strings
depends on which RDS Block is being
+in Annex E of <xref linkend="iec62106" />. The length of Radio Text strings
depends on which RDS Block is being
used to transmit it, either 32 (2A block) or 64 (2B block). However, it is
also possible
to find receivers which can scroll strings sized as 32 x N or 64 x N
characters. So, this control must be configured
with steps of 32 or 64 characters. The result is it must always contain a
string with size multiple of 32 or 64. </entry>
@@ -3650,7 +3650,7 @@ manually or automatically if set to zero. Unit, range and
step are driver-specif
</table>
<para>For more details about RDS specification, refer to
-<xref linkend="en50067" /> document, from CENELEC.</para>
+<xref linkend="iec62106" /> document, from CENELEC.</para>
</section>
<section id="flash-controls">
diff --git a/Documentation/DocBook/media/v4l/dev-rds.xml
b/Documentation/DocBook/media/v4l/dev-rds.xml
index 38883a4..be2f337 100644
--- a/Documentation/DocBook/media/v4l/dev-rds.xml
+++ b/Documentation/DocBook/media/v4l/dev-rds.xml
@@ -6,7 +6,7 @@ information, on an inaudible audio subcarrier of a radio
program. This
interface is aimed at devices capable of receiving and/or transmitting RDS
information.</para>
- <para>For more information see the core RDS standard <xref
linkend="en50067" />
+ <para>For more information see the core RDS standard <xref
linkend="iec62106" />
and the RBDS standard <xref linkend="nrsc4" />.</para>
<para>Note that the RBDS standard as is used in the USA is almost
identical
--
1.7.10.4
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
