summaryrefslogtreecommitdiffstats
path: root/Documentation/index.rst
diff options
context:
space:
mode:
authorJonathan Corbet <corbet@lwn.net>2016-10-25 18:05:23 -0600
committerJonathan Corbet <corbet@lwn.net>2016-10-25 18:05:23 -0600
commit9e1f08607f904e89568e197f4e30985484a87fd7 (patch)
treeeb1e5388ce1d7f65302597c495f5b45b8b3d700e /Documentation/index.rst
parentbb118c56fda53fbca71ee8f35ff870d35370c969 (diff)
parent3cbd4b543bef00c638fd63f6f043006c0c432f23 (diff)
downloadlinux-stable-9e1f08607f904e89568e197f4e30985484a87fd7.tar.gz
linux-stable-9e1f08607f904e89568e197f4e30985484a87fd7.tar.bz2
linux-stable-9e1f08607f904e89568e197f4e30985484a87fd7.zip
Merge branch 'mauro-books' into docs-next
Merge Mauro's massive patch series creating the process and admin-guide books. I think there's a lot of stuff to clean up here, but there's no point in holding things up for that. Mauro sez: This patch series continues the efforts of converting the Linux Kernel documentation to Sphinx. It contains text to ReST conversion of several files under Documentation, and a few ones under the main dir (README, REPORTING-BUGS). All patches on this series can be found on my development tree: https://git.linuxtv.org/mchehab/experimental.git/log/?h=lkml-books-v2 The Kernel docs html output after this series can be seen at: https://mchehab.fedorapeople.org/kernel_docs/
Diffstat (limited to 'Documentation/index.rst')
-rw-r--r--Documentation/index.rst3
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/index.rst b/Documentation/index.rst
index c53d089455a4..f6a3d4766495 100644
--- a/Documentation/index.rst
+++ b/Documentation/index.rst
@@ -11,8 +11,9 @@ Contents:
.. toctree::
:maxdepth: 2
+ admin-guide/index
kernel-documentation
- development-process/index
+ process/index
dev-tools/tools
driver-api/index
media/index