summaryrefslogtreecommitdiffstats
path: root/Documentation/media
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@s-opensource.com>2016-07-18 14:01:20 -0400
committerMauro Carvalho Chehab <mchehab@s-opensource.com>2016-07-18 14:01:20 -0400
commite1813eda8e7fdacd992224b79102925cf134be8b (patch)
tree24ce04692a5abdeea8fd17e3832b5c7263a16f70 /Documentation/media
parentcf022874b687f73fa5356edf99f9869523fbb300 (diff)
[media] doc-rst: better name the media books
The titles at the media books were misleading, and some books were not numbered. Rename the kAPI book to better reflect its contents, be more consistent on the initial rst file for each book and better name them. Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Diffstat (limited to 'Documentation/media')
-rw-r--r--Documentation/media/dvb-drivers/index.rst9
-rw-r--r--Documentation/media/media_kapi.rst (renamed from Documentation/media/media_drivers.rst)9
-rw-r--r--Documentation/media/media_uapi.rst10
-rw-r--r--Documentation/media/v4l-drivers/index.rst8
4 files changed, 22 insertions, 14 deletions
diff --git a/Documentation/media/dvb-drivers/index.rst b/Documentation/media/dvb-drivers/index.rst
index 14da36fe4d01..e1d4d87f2a47 100644
--- a/Documentation/media/dvb-drivers/index.rst
+++ b/Documentation/media/dvb-drivers/index.rst
@@ -2,9 +2,9 @@
2 2
3.. include:: <isonum.txt> 3.. include:: <isonum.txt>
4 4
5############################################# 5##############################################
6Linux Digital Video Broadcast (DVB) subsystem 6Linux Digital TV driver-specific documentation
7############################################# 7##############################################
8 8
9**Copyright** |copy| 2001-2016 : LinuxTV Developers 9**Copyright** |copy| 2001-2016 : LinuxTV Developers
10 10
@@ -17,6 +17,9 @@ License".
17 17
18.. toctree:: 18.. toctree::
19 :maxdepth: 5 19 :maxdepth: 5
20 :numbered:
21 :caption: Table of Contents
22 :name: dvb_mastertoc
20 23
21 intro 24 intro
22 avermedia 25 avermedia
diff --git a/Documentation/media/media_drivers.rst b/Documentation/media/media_kapi.rst
index 8e0f455ff6e0..0af80e90b7b5 100644
--- a/Documentation/media/media_drivers.rst
+++ b/Documentation/media/media_kapi.rst
@@ -2,9 +2,9 @@
2 2
3.. include:: <isonum.txt> 3.. include:: <isonum.txt>
4 4
5========================= 5===================================
6Media subsystem core kAPI 6Media subsystem kernel internal API
7========================= 7===================================
8 8
9**Copyright** |copy| 2009-2016 : LinuxTV Developers 9**Copyright** |copy| 2009-2016 : LinuxTV Developers
10 10
@@ -16,6 +16,9 @@ License".
16 16
17.. toctree:: 17.. toctree::
18 :maxdepth: 5 18 :maxdepth: 5
19 :numbered:
20 :caption: Table of Contents
21 :name: kapi_mastertoc
19 22
20 kapi/v4l2-framework 23 kapi/v4l2-framework
21 kapi/v4l2-controls 24 kapi/v4l2-controls
diff --git a/Documentation/media/media_uapi.rst b/Documentation/media/media_uapi.rst
index 5e872c8297b0..debe4531040b 100644
--- a/Documentation/media/media_uapi.rst
+++ b/Documentation/media/media_uapi.rst
@@ -2,9 +2,9 @@
2 2
3.. include:: <isonum.txt> 3.. include:: <isonum.txt>
4 4
5############################## 5########################################
6Linux Media Infrastructure API 6Linux Media Infrastructure userspace API
7############################## 7########################################
8 8
9**Copyright** |copy| 2009-2016 : LinuxTV Developers 9**Copyright** |copy| 2009-2016 : LinuxTV Developers
10 10
@@ -15,10 +15,10 @@ the license is included in the chapter entitled "GNU Free Documentation
15License". 15License".
16 16
17 17
18.. contents::
19
20.. toctree:: 18.. toctree::
21 :maxdepth: 5 19 :maxdepth: 5
20 :caption: Table of Contents
21 :name: uapi_mastertoc
22 22
23 intro 23 intro
24 uapi/v4l/v4l2 24 uapi/v4l/v4l2
diff --git a/Documentation/media/v4l-drivers/index.rst b/Documentation/media/v4l-drivers/index.rst
index 34990b536d39..8d1710234e5a 100644
--- a/Documentation/media/v4l-drivers/index.rst
+++ b/Documentation/media/v4l-drivers/index.rst
@@ -2,9 +2,9 @@
2 2
3.. include:: <isonum.txt> 3.. include:: <isonum.txt>
4 4
5########################### 5################################################
6Video4Linux (V4L) subsystem 6Video4Linux (V4L) driver-specific documentation
7########################### 7################################################
8 8
9**Copyright** |copy| 1999-2016 : LinuxTV Developers 9**Copyright** |copy| 1999-2016 : LinuxTV Developers
10 10
@@ -18,6 +18,8 @@ License".
18.. toctree:: 18.. toctree::
19 :maxdepth: 5 19 :maxdepth: 5
20 :numbered: 20 :numbered:
21 :caption: Table of Contents
22 :name: v4l_mastertoc
21 23
22 fourcc 24 fourcc
23 v4l-with-ir 25 v4l-with-ir