media: docs: move uAPI book to userspace-api/media

Since 2017, there is an space reserved for userspace API, created by changeset 1d596de ("docs: Create a user-space API guide"). As the media subsystem was one of the first subsystems to use Sphinx, until this patch, we were keeping things on a separate place. Let's just use the new location, as having all uAPI altogether will likely make things easier for developers. Signed-off-by: Mauro Carvalho Chehab <[email protected]>
josf · Apr 14, 2020 · 54f38fc · 54f38fc
1 parent 5dfb8db
commit 54f38fc
Show file tree

Hide file tree

Showing 464 changed files with 464 additions and 462 deletions.
diff --git a/Documentation/ABI/testing/debugfs-cec-error-inj b/Documentation/ABI/testing/debugfs-cec-error-inj
@@ -37,4 +37,4 @@ when changes are made.
 
 The following CEC error injection implementations exist:
 
-- Documentation/media/uapi/cec/cec-pin-error-inj.rst
+- Documentation/userspace-api/media/cec/cec-pin-error-inj.rst
diff --git a/Documentation/Makefile b/Documentation/Makefile
@@ -55,15 +55,15 @@ I18NSPHINXOPTS  = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
 loop_cmd = $(echo-cmd) $(cmd_$(1)) || exit;
 
 # $2 sphinx builder e.g. "html"
-# $3 name of the build subfolder / e.g. "media", used as:
+# $3 name of the build subfolder / e.g. "userspace-api/media", used as:
 #    * dest folder relative to $(BUILDDIR) and
 #    * cache folder relative to $(BUILDDIR)/.doctrees
-# $4 dest subfolder e.g. "man" for man pages at media/man
+# $4 dest subfolder e.g. "man" for man pages at userspace-api/media/man
 # $5 reST source folder relative to $(srctree)/$(src),
-#    e.g. "media" for the linux-tv book-set at ./Documentation/media
+#    e.g. "userspace-api/media" for the linux-tv book-set at ./Documentation/userspace-api/media
 
 quiet_cmd_sphinx = SPHINX  $@ --> file://$(abspath $(BUILDDIR)/$3/$4)
-      cmd_sphinx = $(MAKE) BUILDDIR=$(abspath $(BUILDDIR)) $(build)=Documentation/media $2 && \
+      cmd_sphinx = $(MAKE) BUILDDIR=$(abspath $(BUILDDIR)) $(build)=Documentation/userspace-api/media $2 && \
 	PYTHONDONTWRITEBYTECODE=1 \
 	BUILDDIR=$(abspath $(BUILDDIR)) SPHINX_CONF=$(abspath $(srctree)/$(src)/$5/$(SPHINX_CONF)) \
 	$(PYTHON) $(srctree)/scripts/jobserver-exec \
@@ -120,7 +120,7 @@ refcheckdocs:
 
 cleandocs:
 	$(Q)rm -rf $(BUILDDIR)
-	$(Q)$(MAKE) BUILDDIR=$(abspath $(BUILDDIR)) $(build)=Documentation/media clean
+	$(Q)$(MAKE) BUILDDIR=$(abspath $(BUILDDIR)) $(build)=Documentation/userspace-api/media clean
 
 dochelp:
 	@echo  ' Linux kernel internal documentation in different formats from ReST:'

diff --git a/Documentation/doc-guide/parse-headers.rst b/Documentation/doc-guide/parse-headers.rst
@@ -10,7 +10,7 @@ if a symbol is not found at the documentation. That helps to keep the
 uAPI documentation in sync with the Kernel changes.
 The :ref:`parse_headers.pl <parse_headers>` provide a way to generate such
 cross-references. It has to be called via Makefile, while building the
-documentation. Please see ``Documentation/media/Makefile`` for an example
+documentation. Please see ``Documentation/userspace-api/media/Makefile`` for an example
 about how to use it inside the Kernel tree.
 
 .. _parse_headers:

diff --git a/Documentation/fb/api.rst b/Documentation/fb/api.rst
@@ -290,12 +290,12 @@ the FB_CAP_FOURCC bit in the fb_fix_screeninfo capabilities field.
 FOURCC definitions are located in the linux/videodev2.h header. However, and
 despite starting with the V4L2_PIX_FMT_prefix, they are not restricted to V4L2
 and don't require usage of the V4L2 subsystem. FOURCC documentation is
-available in Documentation/media/uapi/v4l/pixfmt.rst.
+available in Documentation/userspace-api/media/v4l/pixfmt.rst.
 
 To select a format, applications set the grayscale field to the desired FOURCC.
 For YUV formats, they should also select the appropriate colorspace by setting
 the colorspace field to one of the colorspaces listed in linux/videodev2.h and
-documented in Documentation/media/uapi/v4l/colorspaces.rst.
+documented in Documentation/userspace-api/media/v4l/colorspaces.rst.
 
 The red, green, blue and transp fields are not used with the FOURCC-based API.
 For forward compatibility reasons applications must zero those fields, and

diff --git a/Documentation/media/index.rst b/Documentation/media/index.rst
@@ -12,7 +12,7 @@ Linux Media Subsystem Documentation
 .. toctree::
    :maxdepth: 2
 
-   media_uapi
+   ../userspace-api/media/index
    media_kapi
    dvb-drivers/index
    v4l-drivers/index

diff --git a/Documentation/translations/it_IT/doc-guide/parse-headers.rst b/Documentation/translations/it_IT/doc-guide/parse-headers.rst
@@ -17,7 +17,7 @@ con le modifiche del kernel.
 Il programma :ref:`parse_headers.pl <it_parse_headers>` genera questi riferimenti.
 Esso dev'essere invocato attraverso un Makefile, mentre si genera la
 documentazione. Per avere un esempio su come utilizzarlo all'interno del kernel
-consultate ``Documentation/media/Makefile``.
+consultate ``Documentation/userspace-api/media/Makefile``.
 
 .. _it_parse_headers:
 

diff --git a/Documentation/media/Makefile → Documentation/userspace-api/media/Makefile b/Documentation/media/Makefile → Documentation/userspace-api/media/Makefile
@@ -2,7 +2,7 @@
 
 # Rules to convert a .h file to inline RST documentation
 
-SRC_DIR=$(srctree)/Documentation/media
+SRC_DIR=$(srctree)/Documentation/userspace-api/media
 PARSER = $(srctree)/Documentation/sphinx/parse-headers.pl
 UAPI = $(srctree)/include/uapi/linux
 KAPI = $(srctree)/include/linux

diff --git a/Documentation/media/audio.h.rst.exceptions → ...serspace-api/media/audio.h.rst.exceptions b/Documentation/media/audio.h.rst.exceptions → ...serspace-api/media/audio.h.rst.exceptions
diff --git a/Documentation/media/ca.h.rst.exceptions → ...n/userspace-api/media/ca.h.rst.exceptions b/Documentation/media/ca.h.rst.exceptions → ...n/userspace-api/media/ca.h.rst.exceptions
diff --git a/Documentation/media/cec.h.rst.exceptions → .../userspace-api/media/cec.h.rst.exceptions b/Documentation/media/cec.h.rst.exceptions → .../userspace-api/media/cec.h.rst.exceptions
diff --git a/Documentation/media/uapi/cec/cec-api.rst → ...ation/userspace-api/media/cec/cec-api.rst b/Documentation/media/uapi/cec/cec-api.rst → ...ation/userspace-api/media/cec/cec-api.rst
@@ -3,7 +3,7 @@
 .. Version 1.1 or any later version published by the Free Software
 .. Foundation, with no Invariant Sections, no Front-Cover Texts
 .. and no Back-Cover Texts. A copy of the license is included at
-.. Documentation/media/uapi/fdl-appendix.rst.
+.. Documentation/userspace-api/media/fdl-appendix.rst.
 ..
 .. TODO: replace it to GFDL-1.1-or-later WITH no-invariant-sections
 

diff --git a/...ntation/media/uapi/cec/cec-func-close.rst → ...serspace-api/media/cec/cec-func-close.rst b/...ntation/media/uapi/cec/cec-func-close.rst → ...serspace-api/media/cec/cec-func-close.rst
@@ -3,7 +3,7 @@
 .. Version 1.1 or any later version published by the Free Software
 .. Foundation, with no Invariant Sections, no Front-Cover Texts
 .. and no Back-Cover Texts. A copy of the license is included at
-.. Documentation/media/uapi/fdl-appendix.rst.
+.. Documentation/userspace-api/media/fdl-appendix.rst.
 ..
 .. TODO: replace it to GFDL-1.1-or-later WITH no-invariant-sections
 

diff --git a/...ntation/media/uapi/cec/cec-func-ioctl.rst → ...serspace-api/media/cec/cec-func-ioctl.rst b/...ntation/media/uapi/cec/cec-func-ioctl.rst → ...serspace-api/media/cec/cec-func-ioctl.rst
@@ -3,7 +3,7 @@
 .. Version 1.1 or any later version published by the Free Software
 .. Foundation, with no Invariant Sections, no Front-Cover Texts
 .. and no Back-Cover Texts. A copy of the license is included at
-.. Documentation/media/uapi/fdl-appendix.rst.
+.. Documentation/userspace-api/media/fdl-appendix.rst.
 ..
 .. TODO: replace it to GFDL-1.1-or-later WITH no-invariant-sections
 

diff --git a/...entation/media/uapi/cec/cec-func-open.rst → ...userspace-api/media/cec/cec-func-open.rst b/...entation/media/uapi/cec/cec-func-open.rst → ...userspace-api/media/cec/cec-func-open.rst
@@ -3,7 +3,7 @@
 .. Version 1.1 or any later version published by the Free Software
 .. Foundation, with no Invariant Sections, no Front-Cover Texts
 .. and no Back-Cover Texts. A copy of the license is included at
-.. Documentation/media/uapi/fdl-appendix.rst.
+.. Documentation/userspace-api/media/fdl-appendix.rst.
 ..
 .. TODO: replace it to GFDL-1.1-or-later WITH no-invariant-sections
 

diff --git a/...entation/media/uapi/cec/cec-func-poll.rst → ...userspace-api/media/cec/cec-func-poll.rst b/...entation/media/uapi/cec/cec-func-poll.rst → ...userspace-api/media/cec/cec-func-poll.rst
@@ -3,7 +3,7 @@
 .. Version 1.1 or any later version published by the Free Software
 .. Foundation, with no Invariant Sections, no Front-Cover Texts
 .. and no Back-Cover Texts. A copy of the license is included at
-.. Documentation/media/uapi/fdl-appendix.rst.
+.. Documentation/userspace-api/media/fdl-appendix.rst.
 ..
 .. TODO: replace it to GFDL-1.1-or-later WITH no-invariant-sections
 

diff --git a/Documentation/media/uapi/cec/cec-funcs.rst → ...ion/userspace-api/media/cec/cec-funcs.rst b/Documentation/media/uapi/cec/cec-funcs.rst → ...ion/userspace-api/media/cec/cec-funcs.rst
@@ -3,7 +3,7 @@
 .. Version 1.1 or any later version published by the Free Software
 .. Foundation, with no Invariant Sections, no Front-Cover Texts
 .. and no Back-Cover Texts. A copy of the license is included at
-.. Documentation/media/uapi/fdl-appendix.rst.
+.. Documentation/userspace-api/media/fdl-appendix.rst.
 ..
 .. TODO: replace it to GFDL-1.1-or-later WITH no-invariant-sections
 

diff --git a/Documentation/media/uapi/cec/cec-header.rst → ...on/userspace-api/media/cec/cec-header.rst b/Documentation/media/uapi/cec/cec-header.rst → ...on/userspace-api/media/cec/cec-header.rst
@@ -3,7 +3,7 @@
 .. Version 1.1 or any later version published by the Free Software
 .. Foundation, with no Invariant Sections, no Front-Cover Texts
 .. and no Back-Cover Texts. A copy of the license is included at
-.. Documentation/media/uapi/fdl-appendix.rst.
+.. Documentation/userspace-api/media/fdl-appendix.rst.
 ..
 .. TODO: replace it to GFDL-1.1-or-later WITH no-invariant-sections
 

diff --git a/Documentation/media/uapi/cec/cec-intro.rst → ...ion/userspace-api/media/cec/cec-intro.rst b/Documentation/media/uapi/cec/cec-intro.rst → ...ion/userspace-api/media/cec/cec-intro.rst
@@ -3,7 +3,7 @@
 .. Version 1.1 or any later version published by the Free Software
 .. Foundation, with no Invariant Sections, no Front-Cover Texts
 .. and no Back-Cover Texts. A copy of the license is included at
-.. Documentation/media/uapi/fdl-appendix.rst.
+.. Documentation/userspace-api/media/fdl-appendix.rst.
 ..
 .. TODO: replace it to GFDL-1.1-or-later WITH no-invariant-sections
 

diff --git a/...on/media/uapi/cec/cec-ioc-adap-g-caps.rst → ...ace-api/media/cec/cec-ioc-adap-g-caps.rst b/...on/media/uapi/cec/cec-ioc-adap-g-caps.rst → ...ace-api/media/cec/cec-ioc-adap-g-caps.rst
@@ -3,7 +3,7 @@
 .. Version 1.1 or any later version published by the Free Software
 .. Foundation, with no Invariant Sections, no Front-Cover Texts
 .. and no Back-Cover Texts. A copy of the license is included at
-.. Documentation/media/uapi/fdl-appendix.rst.
+.. Documentation/userspace-api/media/fdl-appendix.rst.
 ..
 .. TODO: replace it to GFDL-1.1-or-later WITH no-invariant-sections
 

diff --git a/...dia/uapi/cec/cec-ioc-adap-g-conn-info.rst → ...pi/media/cec/cec-ioc-adap-g-conn-info.rst b/...dia/uapi/cec/cec-ioc-adap-g-conn-info.rst → ...pi/media/cec/cec-ioc-adap-g-conn-info.rst
diff --git a/...dia/uapi/cec/cec-ioc-adap-g-log-addrs.rst → ...pi/media/cec/cec-ioc-adap-g-log-addrs.rst b/...dia/uapi/cec/cec-ioc-adap-g-log-addrs.rst → ...pi/media/cec/cec-ioc-adap-g-log-addrs.rst
@@ -3,7 +3,7 @@
 .. Version 1.1 or any later version published by the Free Software
 .. Foundation, with no Invariant Sections, no Front-Cover Texts
 .. and no Back-Cover Texts. A copy of the license is included at
-.. Documentation/media/uapi/fdl-appendix.rst.
+.. Documentation/userspace-api/media/fdl-appendix.rst.
 ..
 .. TODO: replace it to GFDL-1.1-or-later WITH no-invariant-sections
 

diff --git a/...dia/uapi/cec/cec-ioc-adap-g-phys-addr.rst → ...pi/media/cec/cec-ioc-adap-g-phys-addr.rst b/...dia/uapi/cec/cec-ioc-adap-g-phys-addr.rst → ...pi/media/cec/cec-ioc-adap-g-phys-addr.rst
@@ -3,7 +3,7 @@
 .. Version 1.1 or any later version published by the Free Software
 .. Foundation, with no Invariant Sections, no Front-Cover Texts
 .. and no Back-Cover Texts. A copy of the license is included at
-.. Documentation/media/uapi/fdl-appendix.rst.
+.. Documentation/userspace-api/media/fdl-appendix.rst.
 ..
 .. TODO: replace it to GFDL-1.1-or-later WITH no-invariant-sections
 

diff --git a/...tation/media/uapi/cec/cec-ioc-dqevent.rst → ...erspace-api/media/cec/cec-ioc-dqevent.rst b/...tation/media/uapi/cec/cec-ioc-dqevent.rst → ...erspace-api/media/cec/cec-ioc-dqevent.rst
@@ -3,7 +3,7 @@
 .. Version 1.1 or any later version published by the Free Software
 .. Foundation, with no Invariant Sections, no Front-Cover Texts
 .. and no Back-Cover Texts. A copy of the license is included at
-.. Documentation/media/uapi/fdl-appendix.rst.
+.. Documentation/userspace-api/media/fdl-appendix.rst.
 ..
 .. TODO: replace it to GFDL-1.1-or-later WITH no-invariant-sections
 

diff --git a/...ntation/media/uapi/cec/cec-ioc-g-mode.rst → ...serspace-api/media/cec/cec-ioc-g-mode.rst b/...ntation/media/uapi/cec/cec-ioc-g-mode.rst → ...serspace-api/media/cec/cec-ioc-g-mode.rst
@@ -3,7 +3,7 @@
 .. Version 1.1 or any later version published by the Free Software
 .. Foundation, with no Invariant Sections, no Front-Cover Texts
 .. and no Back-Cover Texts. A copy of the license is included at
-.. Documentation/media/uapi/fdl-appendix.rst.
+.. Documentation/userspace-api/media/fdl-appendix.rst.
 ..
 .. TODO: replace it to GFDL-1.1-or-later WITH no-invariant-sections
 

diff --git a/...tation/media/uapi/cec/cec-ioc-receive.rst → ...erspace-api/media/cec/cec-ioc-receive.rst b/...tation/media/uapi/cec/cec-ioc-receive.rst → ...erspace-api/media/cec/cec-ioc-receive.rst
@@ -3,7 +3,7 @@
 .. Version 1.1 or any later version published by the Free Software
 .. Foundation, with no Invariant Sections, no Front-Cover Texts
 .. and no Back-Cover Texts. A copy of the license is included at
-.. Documentation/media/uapi/fdl-appendix.rst.
+.. Documentation/userspace-api/media/fdl-appendix.rst.
 ..
 .. TODO: replace it to GFDL-1.1-or-later WITH no-invariant-sections
 

diff --git a/...tion/media/uapi/cec/cec-pin-error-inj.rst → ...space-api/media/cec/cec-pin-error-inj.rst b/...tion/media/uapi/cec/cec-pin-error-inj.rst → ...space-api/media/cec/cec-pin-error-inj.rst
@@ -3,7 +3,7 @@
 .. Version 1.1 or any later version published by the Free Software
 .. Foundation, with no Invariant Sections, no Front-Cover Texts
 .. and no Back-Cover Texts. A copy of the license is included at
-.. Documentation/media/uapi/fdl-appendix.rst.
+.. Documentation/userspace-api/media/fdl-appendix.rst.
 ..
 .. TODO: replace it to GFDL-1.1-or-later WITH no-invariant-sections
 

diff --git a/Documentation/media/conf_nitpick.py → ...ation/userspace-api/media/conf_nitpick.py b/Documentation/media/conf_nitpick.py → ...ation/userspace-api/media/conf_nitpick.py
diff --git a/Documentation/media/dmx.h.rst.exceptions → .../userspace-api/media/dmx.h.rst.exceptions b/Documentation/media/dmx.h.rst.exceptions → .../userspace-api/media/dmx.h.rst.exceptions
diff --git a/...pi/dvb/audio-bilingual-channel-select.rst → ...ia/dvb/audio-bilingual-channel-select.rst b/...pi/dvb/audio-bilingual-channel-select.rst → ...ia/dvb/audio-bilingual-channel-select.rst
@@ -3,7 +3,7 @@
 .. Version 1.1 or any later version published by the Free Software
 .. Foundation, with no Invariant Sections, no Front-Cover Texts
 .. and no Back-Cover Texts. A copy of the license is included at
-.. Documentation/media/uapi/fdl-appendix.rst.
+.. Documentation/userspace-api/media/fdl-appendix.rst.
 ..
 .. TODO: replace it to GFDL-1.1-or-later WITH no-invariant-sections
 

diff --git a/...n/media/uapi/dvb/audio-channel-select.rst → ...ce-api/media/dvb/audio-channel-select.rst b/...n/media/uapi/dvb/audio-channel-select.rst → ...ce-api/media/dvb/audio-channel-select.rst
@@ -3,7 +3,7 @@
 .. Version 1.1 or any later version published by the Free Software
 .. Foundation, with no Invariant Sections, no Front-Cover Texts
 .. and no Back-Cover Texts. A copy of the license is included at
-.. Documentation/media/uapi/fdl-appendix.rst.
+.. Documentation/userspace-api/media/fdl-appendix.rst.
 ..
 .. TODO: replace it to GFDL-1.1-or-later WITH no-invariant-sections
 

diff --git a/...ion/media/uapi/dvb/audio-clear-buffer.rst → ...pace-api/media/dvb/audio-clear-buffer.rst b/...ion/media/uapi/dvb/audio-clear-buffer.rst → ...pace-api/media/dvb/audio-clear-buffer.rst
@@ -3,7 +3,7 @@
 .. Version 1.1 or any later version published by the Free Software
 .. Foundation, with no Invariant Sections, no Front-Cover Texts
 .. and no Back-Cover Texts. A copy of the license is included at
-.. Documentation/media/uapi/fdl-appendix.rst.
+.. Documentation/userspace-api/media/fdl-appendix.rst.
 ..
 .. TODO: replace it to GFDL-1.1-or-later WITH no-invariant-sections
 

diff --git a/...ntation/media/uapi/dvb/audio-continue.rst → ...serspace-api/media/dvb/audio-continue.rst b/...ntation/media/uapi/dvb/audio-continue.rst → ...serspace-api/media/dvb/audio-continue.rst
@@ -3,7 +3,7 @@
 .. Version 1.1 or any later version published by the Free Software
 .. Foundation, with no Invariant Sections, no Front-Cover Texts
 .. and no Back-Cover Texts. A copy of the license is included at
-.. Documentation/media/uapi/fdl-appendix.rst.
+.. Documentation/userspace-api/media/fdl-appendix.rst.
 ..
 .. TODO: replace it to GFDL-1.1-or-later WITH no-invariant-sections
 

diff --git a/...mentation/media/uapi/dvb/audio-fclose.rst → .../userspace-api/media/dvb/audio-fclose.rst b/...mentation/media/uapi/dvb/audio-fclose.rst → .../userspace-api/media/dvb/audio-fclose.rst
@@ -3,7 +3,7 @@
 .. Version 1.1 or any later version published by the Free Software
 .. Foundation, with no Invariant Sections, no Front-Cover Texts
 .. and no Back-Cover Texts. A copy of the license is included at
-.. Documentation/media/uapi/fdl-appendix.rst.
+.. Documentation/userspace-api/media/fdl-appendix.rst.
 ..
 .. TODO: replace it to GFDL-1.1-or-later WITH no-invariant-sections
 

diff --git a/Documentation/media/uapi/dvb/audio-fopen.rst → ...n/userspace-api/media/dvb/audio-fopen.rst b/Documentation/media/uapi/dvb/audio-fopen.rst → ...n/userspace-api/media/dvb/audio-fopen.rst
@@ -3,7 +3,7 @@
 .. Version 1.1 or any later version published by the Free Software
 .. Foundation, with no Invariant Sections, no Front-Cover Texts
 .. and no Back-Cover Texts. A copy of the license is included at
-.. Documentation/media/uapi/fdl-appendix.rst.
+.. Documentation/userspace-api/media/fdl-appendix.rst.
 ..
 .. TODO: replace it to GFDL-1.1-or-later WITH no-invariant-sections
 

diff --git a/...mentation/media/uapi/dvb/audio-fwrite.rst → .../userspace-api/media/dvb/audio-fwrite.rst b/...mentation/media/uapi/dvb/audio-fwrite.rst → .../userspace-api/media/dvb/audio-fwrite.rst
@@ -3,7 +3,7 @@
 .. Version 1.1 or any later version published by the Free Software
 .. Foundation, with no Invariant Sections, no Front-Cover Texts
 .. and no Back-Cover Texts. A copy of the license is included at
-.. Documentation/media/uapi/fdl-appendix.rst.
+.. Documentation/userspace-api/media/fdl-appendix.rst.
 ..
 .. TODO: replace it to GFDL-1.1-or-later WITH no-invariant-sections
 

diff --git a/...media/uapi/dvb/audio-get-capabilities.rst → ...-api/media/dvb/audio-get-capabilities.rst b/...media/uapi/dvb/audio-get-capabilities.rst → ...-api/media/dvb/audio-get-capabilities.rst
@@ -3,7 +3,7 @@
 .. Version 1.1 or any later version published by the Free Software
 .. Foundation, with no Invariant Sections, no Front-Cover Texts
 .. and no Back-Cover Texts. A copy of the license is included at
-.. Documentation/media/uapi/fdl-appendix.rst.
+.. Documentation/userspace-api/media/fdl-appendix.rst.
 ..
 .. TODO: replace it to GFDL-1.1-or-later WITH no-invariant-sections
 

diff --git a/...ation/media/uapi/dvb/audio-get-status.rst → ...rspace-api/media/dvb/audio-get-status.rst b/...ation/media/uapi/dvb/audio-get-status.rst → ...rspace-api/media/dvb/audio-get-status.rst
@@ -3,7 +3,7 @@
 .. Version 1.1 or any later version published by the Free Software
 .. Foundation, with no Invariant Sections, no Front-Cover Texts
 .. and no Back-Cover Texts. A copy of the license is included at
-.. Documentation/media/uapi/fdl-appendix.rst.
+.. Documentation/userspace-api/media/fdl-appendix.rst.
 ..
 .. TODO: replace it to GFDL-1.1-or-later WITH no-invariant-sections
 

diff --git a/Documentation/media/uapi/dvb/audio-pause.rst → ...n/userspace-api/media/dvb/audio-pause.rst b/Documentation/media/uapi/dvb/audio-pause.rst → ...n/userspace-api/media/dvb/audio-pause.rst
@@ -3,7 +3,7 @@
 .. Version 1.1 or any later version published by the Free Software
 .. Foundation, with no Invariant Sections, no Front-Cover Texts
 .. and no Back-Cover Texts. A copy of the license is included at
-.. Documentation/media/uapi/fdl-appendix.rst.
+.. Documentation/userspace-api/media/fdl-appendix.rst.
 ..
 .. TODO: replace it to GFDL-1.1-or-later WITH no-invariant-sections
 

diff --git a/Documentation/media/uapi/dvb/audio-play.rst → ...on/userspace-api/media/dvb/audio-play.rst b/Documentation/media/uapi/dvb/audio-play.rst → ...on/userspace-api/media/dvb/audio-play.rst
@@ -3,7 +3,7 @@
 .. Version 1.1 or any later version published by the Free Software
 .. Foundation, with no Invariant Sections, no Front-Cover Texts
 .. and no Back-Cover Texts. A copy of the license is included at
-.. Documentation/media/uapi/fdl-appendix.rst.
+.. Documentation/userspace-api/media/fdl-appendix.rst.
 ..
 .. TODO: replace it to GFDL-1.1-or-later WITH no-invariant-sections
 

diff --git a/...on/media/uapi/dvb/audio-select-source.rst → ...ace-api/media/dvb/audio-select-source.rst b/...on/media/uapi/dvb/audio-select-source.rst → ...ace-api/media/dvb/audio-select-source.rst
@@ -3,7 +3,7 @@
 .. Version 1.1 or any later version published by the Free Software
 .. Foundation, with no Invariant Sections, no Front-Cover Texts
 .. and no Back-Cover Texts. A copy of the license is included at
-.. Documentation/media/uapi/fdl-appendix.rst.
+.. Documentation/userspace-api/media/fdl-appendix.rst.
 ..
 .. TODO: replace it to GFDL-1.1-or-later WITH no-invariant-sections
 

diff --git a/...tion/media/uapi/dvb/audio-set-av-sync.rst → ...space-api/media/dvb/audio-set-av-sync.rst b/...tion/media/uapi/dvb/audio-set-av-sync.rst → ...space-api/media/dvb/audio-set-av-sync.rst
@@ -3,7 +3,7 @@
 .. Version 1.1 or any later version published by the Free Software
 .. Foundation, with no Invariant Sections, no Front-Cover Texts
 .. and no Back-Cover Texts. A copy of the license is included at
-.. Documentation/media/uapi/fdl-appendix.rst.
+.. Documentation/userspace-api/media/fdl-appendix.rst.
 ..
 .. TODO: replace it to GFDL-1.1-or-later WITH no-invariant-sections
 

diff --git a/.../media/uapi/dvb/audio-set-bypass-mode.rst → ...e-api/media/dvb/audio-set-bypass-mode.rst b/.../media/uapi/dvb/audio-set-bypass-mode.rst → ...e-api/media/dvb/audio-set-bypass-mode.rst
@@ -3,7 +3,7 @@
 .. Version 1.1 or any later version published by the Free Software
 .. Foundation, with no Invariant Sections, no Front-Cover Texts
 .. and no Back-Cover Texts. A copy of the license is included at
-.. Documentation/media/uapi/fdl-appendix.rst.
+.. Documentation/userspace-api/media/fdl-appendix.rst.
 ..
 .. TODO: replace it to GFDL-1.1-or-later WITH no-invariant-sections
 

diff --git a/...mentation/media/uapi/dvb/audio-set-id.rst → .../userspace-api/media/dvb/audio-set-id.rst b/...mentation/media/uapi/dvb/audio-set-id.rst → .../userspace-api/media/dvb/audio-set-id.rst
@@ -3,7 +3,7 @@
 .. Version 1.1 or any later version published by the Free Software
 .. Foundation, with no Invariant Sections, no Front-Cover Texts
 .. and no Back-Cover Texts. A copy of the license is included at
-.. Documentation/media/uapi/fdl-appendix.rst.
+.. Documentation/userspace-api/media/fdl-appendix.rst.
 ..
 .. TODO: replace it to GFDL-1.1-or-later WITH no-invariant-sections
 

diff --git a/...tation/media/uapi/dvb/audio-set-mixer.rst → ...erspace-api/media/dvb/audio-set-mixer.rst b/...tation/media/uapi/dvb/audio-set-mixer.rst → ...erspace-api/media/dvb/audio-set-mixer.rst
@@ -3,7 +3,7 @@
 .. Version 1.1 or any later version published by the Free Software
 .. Foundation, with no Invariant Sections, no Front-Cover Texts
 .. and no Back-Cover Texts. A copy of the license is included at
-.. Documentation/media/uapi/fdl-appendix.rst.
+.. Documentation/userspace-api/media/fdl-appendix.rst.
 ..
 .. TODO: replace it to GFDL-1.1-or-later WITH no-invariant-sections
 

diff --git a/...ntation/media/uapi/dvb/audio-set-mute.rst → ...serspace-api/media/dvb/audio-set-mute.rst b/...ntation/media/uapi/dvb/audio-set-mute.rst → ...serspace-api/media/dvb/audio-set-mute.rst
@@ -3,7 +3,7 @@
 .. Version 1.1 or any later version published by the Free Software
 .. Foundation, with no Invariant Sections, no Front-Cover Texts
 .. and no Back-Cover Texts. A copy of the license is included at
-.. Documentation/media/uapi/fdl-appendix.rst.
+.. Documentation/userspace-api/media/fdl-appendix.rst.
 ..
 .. TODO: replace it to GFDL-1.1-or-later WITH no-invariant-sections
 

diff --git a/...n/media/uapi/dvb/audio-set-streamtype.rst → ...ce-api/media/dvb/audio-set-streamtype.rst b/...n/media/uapi/dvb/audio-set-streamtype.rst → ...ce-api/media/dvb/audio-set-streamtype.rst
@@ -3,7 +3,7 @@
 .. Version 1.1 or any later version published by the Free Software
 .. Foundation, with no Invariant Sections, no Front-Cover Texts
 .. and no Back-Cover Texts. A copy of the license is included at
-.. Documentation/media/uapi/fdl-appendix.rst.
+.. Documentation/userspace-api/media/fdl-appendix.rst.
 ..
 .. TODO: replace it to GFDL-1.1-or-later WITH no-invariant-sections
 

diff --git a/Documentation/media/uapi/dvb/audio-stop.rst → ...on/userspace-api/media/dvb/audio-stop.rst b/Documentation/media/uapi/dvb/audio-stop.rst → ...on/userspace-api/media/dvb/audio-stop.rst
@@ -3,7 +3,7 @@
 .. Version 1.1 or any later version published by the Free Software
 .. Foundation, with no Invariant Sections, no Front-Cover Texts
 .. and no Back-Cover Texts. A copy of the license is included at
-.. Documentation/media/uapi/fdl-appendix.rst.
+.. Documentation/userspace-api/media/fdl-appendix.rst.
 ..
 .. TODO: replace it to GFDL-1.1-or-later WITH no-invariant-sections
Original file line number	Diff line number	Diff line change
Expand Up		@@ -37,4 +37,4 @@ when changes are made.

		The following CEC error injection implementations exist:

		- Documentation/media/uapi/cec/cec-pin-error-inj.rst
		- Documentation/userspace-api/media/cec/cec-pin-error-inj.rst