summaryrefslogtreecommitdiffstats
path: root/Documentation/cgroup-v1/00-INDEX
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/cgroup-v1/00-INDEX
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/cgroup-v1/00-INDEX')
-rw-r--r--Documentation/cgroup-v1/00-INDEX2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/cgroup-v1/00-INDEX b/Documentation/cgroup-v1/00-INDEX
index 106885ad670d..13e0c85e7b35 100644
--- a/Documentation/cgroup-v1/00-INDEX
+++ b/Documentation/cgroup-v1/00-INDEX
@@ -8,7 +8,7 @@ cpuacct.txt
- CPU Accounting Controller; account CPU usage for groups of tasks.
cpusets.txt
- documents the cpusets feature; assign CPUs and Mem to a set of tasks.
-devices.txt
+admin-guide/devices.rst
- Device Whitelist Controller; description, interface and security.
freezer-subsystem.txt
- checkpointing; rationale to not use signals, interface.