summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Heiser <markus.heiser@darmarIT.de>2016-08-13 17:12:43 +0300
committerJonathan Corbet <corbet@lwn.net>2016-08-14 20:52:16 +0300
commitb32febad77068b4a28daf7b7e063438d0cca8a42 (patch)
treeddbdb188e8166587a5d15cceb8f9db9f58b31622
parent606b9ac81a63ab3adb7e61206b9ae34ee186a89d (diff)
downloadlinux-b32febad77068b4a28daf7b7e063438d0cca8a42.tar.xz
doc-rst: add stand-alone conf.py to media folder
With the media/conf.py, and media/index.rst the media folder can be build and distributed stand-alone. Signed-off-by: Markus Heiser <markus.heiser@darmarIT.de> Signed-off-by: Jonathan Corbet <corbet@lwn.net>
-rw-r--r--Documentation/index.rst7
-rw-r--r--Documentation/media/conf.py3
-rw-r--r--Documentation/media/index.rst12
3 files changed, 16 insertions, 6 deletions
diff --git a/Documentation/index.rst b/Documentation/index.rst
index e0fc72963e87..bdd9525e05aa 100644
--- a/Documentation/index.rst
+++ b/Documentation/index.rst
@@ -6,18 +6,13 @@
Welcome to The Linux Kernel's documentation!
============================================
-Nothing for you to see here *yet*. Please move along.
-
Contents:
.. toctree::
:maxdepth: 2
kernel-documentation
- media/media_uapi
- media/media_kapi
- media/dvb-drivers/index
- media/v4l-drivers/index
+ media/index
gpu/index
Indices and tables
diff --git a/Documentation/media/conf.py b/Documentation/media/conf.py
new file mode 100644
index 000000000000..62bdba237917
--- /dev/null
+++ b/Documentation/media/conf.py
@@ -0,0 +1,3 @@
+# -*- coding: utf-8; mode: python -*-
+
+project = 'Linux Media Subsystem Documentation'
diff --git a/Documentation/media/index.rst b/Documentation/media/index.rst
new file mode 100644
index 000000000000..e85c557eeea3
--- /dev/null
+++ b/Documentation/media/index.rst
@@ -0,0 +1,12 @@
+Linux Media Subsystem Documentation
+===================================
+
+Contents:
+
+.. toctree::
+ :maxdepth: 2
+
+ media_uapi
+ media_kapi
+ dvb-drivers/index
+ v4l-drivers/index