summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorMarkus Heiser <markus.heiser@darmarIT.de>2016-08-13 10:12:43 -0400
committerJonathan Corbet <corbet@lwn.net>2016-08-14 13:52:16 -0400
commitb32febad77068b4a28daf7b7e063438d0cca8a42 (patch)
treeddbdb188e8166587a5d15cceb8f9db9f58b31622 /Documentation
parent606b9ac81a63ab3adb7e61206b9ae34ee186a89d (diff)
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>
Diffstat (limited to 'Documentation')
-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 @@
6Welcome to The Linux Kernel's documentation! 6Welcome to The Linux Kernel's documentation!
7============================================ 7============================================
8 8
9Nothing for you to see here *yet*. Please move along.
10
11Contents: 9Contents:
12 10
13.. toctree:: 11.. toctree::
14 :maxdepth: 2 12 :maxdepth: 2
15 13
16 kernel-documentation 14 kernel-documentation
17 media/media_uapi 15 media/index
18 media/media_kapi
19 media/dvb-drivers/index
20 media/v4l-drivers/index
21 gpu/index 16 gpu/index
22 17
23Indices and tables 18Indices 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 @@
1# -*- coding: utf-8; mode: python -*-
2
3project = '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 @@
1Linux Media Subsystem Documentation
2===================================
3
4Contents:
5
6.. toctree::
7 :maxdepth: 2
8
9 media_uapi
10 media_kapi
11 dvb-drivers/index
12 v4l-drivers/index