Skip to content

Commit e7121ab

Browse files
mchehabmchehab
committed
media: docs: fix some GPL licensing ambiguity at the text
Those files are meant to be dual GPL 2.0 and GFDL without implicit sections. However, by a wrong cut-and-paste, I ended by applying a GPL 2+ license text to it, while still using the GPL 2.0 SPDX tag, with would cause an ambiguity about the licensing model. Solve this by explicitly mentioning that the dual licensing is between GPL 2.0 and GFDL and correcting the text. Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
1 parent 4bd257d commit e7121ab

13 files changed

+39
-39
lines changed

‎Documentation/media/uapi/dvb/dvbstb.svg

Lines changed: 3 additions & 3 deletions
Loading

‎Documentation/media/uapi/mediactl/media-ioc-request-alloc.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
.. This file is dual-licensed: you can use it either under the terms
2-
.. of the GPL or the GFDL 1.1+ license, at your option. Note that this
2+
.. of the GPL 2.0 or the GFDL 1.1+ license, at your option. Note that this
33
.. dual licensing only applies to this file, and not this project as a
44
.. whole.
55
..
66
.. a) This file is free software; you can redistribute it and/or
77
.. modify it under the terms of the GNU General Public License as
8-
.. published by the Free Software Foundation; either version 2 of
9-
.. the License, or (at your option) any later version.
8+
.. published by the Free Software Foundation version 2 of
9+
.. the License.
1010
..
1111
.. This file is distributed in the hope that it will be useful,
1212
.. but WITHOUT ANY WARRANTY; without even the implied warranty of

‎Documentation/media/uapi/mediactl/media-request-ioc-queue.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
.. This file is dual-licensed: you can use it either under the terms
2-
.. of the GPL or the GFDL 1.1+ license, at your option. Note that this
2+
.. of the GPL 2.0 or the GFDL 1.1+ license, at your option. Note that this
33
.. dual licensing only applies to this file, and not this project as a
44
.. whole.
55
..
66
.. a) This file is free software; you can redistribute it and/or
77
.. modify it under the terms of the GNU General Public License as
8-
.. published by the Free Software Foundation; either version 2 of
9-
.. the License, or (at your option) any later version.
8+
.. published by the Free Software Foundation version 2 of
9+
.. the License.
1010
..
1111
.. This file is distributed in the hope that it will be useful,
1212
.. but WITHOUT ANY WARRANTY; without even the implied warranty of

‎Documentation/media/uapi/mediactl/media-request-ioc-reinit.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
.. This file is dual-licensed: you can use it either under the terms
2-
.. of the GPL or the GFDL 1.1+ license, at your option. Note that this
2+
.. of the GPL 2.0 or the GFDL 1.1+ license, at your option. Note that this
33
.. dual licensing only applies to this file, and not this project as a
44
.. whole.
55
..
66
.. a) This file is free software; you can redistribute it and/or
77
.. modify it under the terms of the GNU General Public License as
8-
.. published by the Free Software Foundation; either version 2 of
9-
.. the License, or (at your option) any later version.
8+
.. published by the Free Software Foundation version 2 of
9+
.. the License.
1010
..
1111
.. This file is distributed in the hope that it will be useful,
1212
.. but WITHOUT ANY WARRANTY; without even the implied warranty of

‎Documentation/media/uapi/mediactl/request-api.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
.. This file is dual-licensed: you can use it either under the terms
2-
.. of the GPL or the GFDL 1.1+ license, at your option. Note that this
2+
.. of the GPL 2.0 or the GFDL 1.1+ license, at your option. Note that this
33
.. dual licensing only applies to this file, and not this project as a
44
.. whole.
55
..
66
.. a) This file is free software; you can redistribute it and/or
77
.. modify it under the terms of the GNU General Public License as
8-
.. published by the Free Software Foundation; either version 2 of
9-
.. the License, or (at your option) any later version.
8+
.. published by the Free Software Foundation version 2 of
9+
.. the License.
1010
..
1111
.. This file is distributed in the hope that it will be useful,
1212
.. but WITHOUT ANY WARRANTY; without even the implied warranty of

‎Documentation/media/uapi/mediactl/request-func-close.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
.. This file is dual-licensed: you can use it either under the terms
2-
.. of the GPL or the GFDL 1.1+ license, at your option. Note that this
2+
.. of the GPL 2.0 or the GFDL 1.1+ license, at your option. Note that this
33
.. dual licensing only applies to this file, and not this project as a
44
.. whole.
55
..
66
.. a) This file is free software; you can redistribute it and/or
77
.. modify it under the terms of the GNU General Public License as
8-
.. published by the Free Software Foundation; either version 2 of
9-
.. the License, or (at your option) any later version.
8+
.. published by the Free Software Foundation version 2 of
9+
.. the License.
1010
..
1111
.. This file is distributed in the hope that it will be useful,
1212
.. but WITHOUT ANY WARRANTY; without even the implied warranty of

‎Documentation/media/uapi/mediactl/request-func-ioctl.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
.. This file is dual-licensed: you can use it either under the terms
2-
.. of the GPL or the GFDL 1.1+ license, at your option. Note that this
2+
.. of the GPL 2.0 or the GFDL 1.1+ license, at your option. Note that this
33
.. dual licensing only applies to this file, and not this project as a
44
.. whole.
55
..
66
.. a) This file is free software; you can redistribute it and/or
77
.. modify it under the terms of the GNU General Public License as
8-
.. published by the Free Software Foundation; either version 2 of
9-
.. the License, or (at your option) any later version.
8+
.. published by the Free Software Foundation version 2 of
9+
.. the License.
1010
..
1111
.. This file is distributed in the hope that it will be useful,
1212
.. but WITHOUT ANY WARRANTY; without even the implied warranty of

‎Documentation/media/uapi/mediactl/request-func-poll.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
.. This file is dual-licensed: you can use it either under the terms
2-
.. of the GPL or the GFDL 1.1+ license, at your option. Note that this
2+
.. of the GPL 2.0 or the GFDL 1.1+ license, at your option. Note that this
33
.. dual licensing only applies to this file, and not this project as a
44
.. whole.
55
..
66
.. a) This file is free software; you can redistribute it and/or
77
.. modify it under the terms of the GNU General Public License as
8-
.. published by the Free Software Foundation; either version 2 of
9-
.. the License, or (at your option) any later version.
8+
.. published by the Free Software Foundation version 2 of
9+
.. the License.
1010
..
1111
.. This file is distributed in the hope that it will be useful,
1212
.. but WITHOUT ANY WARRANTY; without even the implied warranty of

‎Documentation/media/uapi/v4l/bayer.svg

Lines changed: 3 additions & 3 deletions
Loading

‎Documentation/media/uapi/v4l/constraints.svg

Lines changed: 3 additions & 3 deletions
Loading

‎Documentation/media/uapi/v4l/nv12mt.svg

Lines changed: 3 additions & 3 deletions
Loading

‎Documentation/media/uapi/v4l/nv12mt_example.svg

Lines changed: 3 additions & 3 deletions
Loading

‎Documentation/media/uapi/v4l/selection.svg

Lines changed: 3 additions & 3 deletions
Loading

0 commit comments

Comments
 (0)