diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-09-14 01:26:17 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-09-14 01:26:17 -0300 |
| commit | e4bdbcc62f329b3737868f414d592d73470ada20 (patch) | |
| tree | 097d32d27525baa87fe0372dff1a41fccebf7cc8 | |
| parent | 17ff228d421a441ed50f4642cbbfac8c734db4e0 (diff) | |
| download | mediapointer-dvb-s2-e4bdbcc62f329b3737868f414d592d73470ada20.tar.gz mediapointer-dvb-s2-e4bdbcc62f329b3737868f414d592d73470ada20.tar.bz2 | |
staging-specs: fix licenses at the doc
From: Mauro Carvalho Chehab <mchehab@redhat.com>
While both V4L and DVB parts are GNU Free Documentation license v1.1, the V4L
part adds license for the code examples. However, during the merge, this field
weren't properly copied at DocBook structs. Fix it.
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| -rw-r--r-- | staging-specs/media.xml | 2 | ||||
| -rw-r--r-- | staging-specs/v4l/v4l2.xml | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/staging-specs/media.xml b/staging-specs/media.xml index 714650c9b..122c4662e 100644 --- a/staging-specs/media.xml +++ b/staging-specs/media.xml @@ -39,8 +39,6 @@ this document under the terms of the GNU Free Documentation License, Version 1.1 or any later version published by the Free Software Foundation. A copy of the license is included in the chapter entitled "GNU Free Documentation License"</para> -<para>Programming examples can be used and distributed without - restrictions.</para> </legalnotice> </bookinfo> diff --git a/staging-specs/v4l/v4l2.xml b/staging-specs/v4l/v4l2.xml index be1717bff..2ba64c0df 100644 --- a/staging-specs/v4l/v4l2.xml +++ b/staging-specs/v4l/v4l2.xml @@ -67,8 +67,7 @@ MPEG stream embedded, sliced VBI data format in this specification. <firstname>Mauro</firstname> <surname>Carvalho Chehab</surname> <contrib>Documented libv4l, designed and added v4l2grab example, -Remote Controller chapter - </contrib> +Remote Controller chapter.</contrib> <affiliation> <address> <email>mchehab@redhat.com</email> @@ -92,6 +91,10 @@ Remote Controller chapter <holder>Bill Dirks, Michael H. Schimek, Hans Verkuil, Martin Rubli, Andy Walls, Mauro Carvalho Chehab</holder> </copyright> + <legalnotice> + <para>Except when explicitly stated as GPL, programming examples within + this part can be used and distributed without restrictions.</para> + </legalnotice> <revhistory> <!-- Put document revisions here, newest first. --> <!-- API revisions (changes and additions of defines, enums, |