1 files changed, 38 insertions, 22 deletions
diff --git a/Documentation/userspace-api/media/dvb/headers.rst b/Documentation/userspace-api/media/dvb/headers.rst
index ffd8f432484a..6d69622bf1e0 100644
--- a/Documentation/userspace-api/media/dvb/headers.rst
+++ b/Documentation/userspace-api/media/dvb/headers.rst
@@ -1,30 +1,46 @@
-.. Permission is granted to copy, distribute and/or modify this
-.. document under the terms of the GNU Free Documentation License,
-.. 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/userspace-api/media/fdl-appendix.rst.
-..
-.. TODO: replace it to GFDL-1.1-or-later WITH no-invariant-sections
-
-****************************
-Digital TV uAPI header files
-****************************
-
-Digital TV uAPI headers
+.. SPDX-License-Identifier: GFDL-1.1-no-invariants-or-later
+
+***********************
+Digital TV uAPI symbols
 ***********************
 
-.. kernel-include:: $BUILDDIR/frontend.h.rst
+.. contents:: Table of Contents
+   :depth: 2
+   :local:
+
+Frontend
+========
+
+.. kernel-include:: include/uapi/linux/dvb/frontend.h
+    :generate-cross-refs:
+    :exception-file: frontend.h.rst.exceptions
+    :toc:
+    :warn-broken:
+
+Demux
+=====
 
-.. kernel-include:: $BUILDDIR/dmx.h.rst
+.. kernel-include:: include/uapi/linux/dvb/dmx.h
+    :generate-cross-refs:
+    :exception-file: dmx.h.rst.exceptions
+    :toc:
+    :warn-broken:
 
-.. kernel-include:: $BUILDDIR/ca.h.rst
+Conditional Access
+==================
 
-.. kernel-include:: $BUILDDIR/net.h.rst
+.. kernel-include:: include/uapi/linux/dvb/ca.h
+    :generate-cross-refs:
+    :exception-file: ca.h.rst.exceptions
+    :toc:
+    :warn-broken:
 
-Legacy uAPI
-***********
+Network
+=======
 
-.. kernel-include:: $BUILDDIR/audio.h.rst
+.. kernel-include:: include/uapi/linux/dvb/net.h
+    :generate-cross-refs:
+    :exception-file: net.h.rst.exceptions
+    :toc:
+    :warn-broken:
 
-.. kernel-include:: $BUILDDIR/video.h.rst