summaryrefslogtreecommitdiff
path: root/Documentation/filesystems
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-08-07 10:23:17 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2016-08-07 10:23:17 -0400
commit52ddb7e9dd735c1a10722c58d3e069af4d3e6df2 (patch)
tree10746baee8fd439130ab78e6caaadc609a7920d7 /Documentation/filesystems
parente9d488c3114acb6a0a93e99c02f9cd1d656f46c7 (diff)
parentbdf107d87eb8ce1d1313fee40f3de1a1029a3eca (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/filesystems')
-rw-r--r--Documentation/filesystems/tmpfs.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/filesystems/tmpfs.txt b/Documentation/filesystems/tmpfs.txt
index d9c11d25bf02..a85355cf85f4 100644
--- a/Documentation/filesystems/tmpfs.txt
+++ b/Documentation/filesystems/tmpfs.txt
@@ -98,7 +98,7 @@ A memory policy with a valid NodeList will be saved, as specified, for
use at file creation time. When a task allocates a file in the file
system, the mount option memory policy will be applied with a NodeList,
if any, modified by the calling task's cpuset constraints
-[See Documentation/cgroups/cpusets.txt] and any optional flags, listed
+[See Documentation/cgroup-v1/cpusets.txt] and any optional flags, listed
below. If the resulting NodeLists is the empty set, the effective memory
policy for the file will revert to "default" policy.