diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-08-07 10:23:17 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-08-07 10:23:17 -0400 |
commit | 52ddb7e9dd735c1a10722c58d3e069af4d3e6df2 (patch) | |
tree | 10746baee8fd439130ab78e6caaadc609a7920d7 /Documentation/cgroup-v1/cgroups.txt | |
parent | e9d488c3114acb6a0a93e99c02f9cd1d656f46c7 (diff) | |
parent | bdf107d87eb8ce1d1313fee40f3de1a1029a3eca (diff) |
Merge tag 'doc-4.8-fixes' of git://git.lwn.net/linux
Pull documentation fixes from Jonathan Corbet:
"Three fixes for the docs build, including removing an annoying warning
on 'make help' if sphinx isn't present"
* tag 'doc-4.8-fixes' of git://git.lwn.net/linux:
DocBook: use DOCBOOKS="" to ignore DocBooks instead of IGNORE_DOCBOOKS=1
Documenation: update cgroup's document path
Documentation/sphinx: do not warn about missing tools in 'make help'
Diffstat (limited to 'Documentation/cgroup-v1/cgroups.txt')
-rw-r--r-- | Documentation/cgroup-v1/cgroups.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/cgroup-v1/cgroups.txt b/Documentation/cgroup-v1/cgroups.txt index 947e6fe31ef9..308e5ff7207a 100644 --- a/Documentation/cgroup-v1/cgroups.txt +++ b/Documentation/cgroup-v1/cgroups.txt @@ -2,7 +2,7 @@ ------- Written by Paul Menage <menage@google.com> based on -Documentation/cgroups/cpusets.txt +Documentation/cgroup-v1/cpusets.txt Original copyright statements from cpusets.txt: Portions Copyright (C) 2004 BULL SA. @@ -72,7 +72,7 @@ On their own, the only use for cgroups is for simple job tracking. The intention is that other subsystems hook into the generic cgroup support to provide new attributes for cgroups, such as accounting/limiting the resources which processes in a cgroup can -access. For example, cpusets (see Documentation/cgroups/cpusets.txt) allow +access. For example, cpusets (see Documentation/cgroup-v1/cpusets.txt) allow you to associate a set of CPUs and a set of memory nodes with the tasks in each cgroup. |