summaryrefslogtreecommitdiffstats
path: root/Documentation/virtual
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-03-04 20:32:18 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2017-03-04 20:32:18 +0100
commitbe834aafdf5f8a37c191e697ac8ee6d53ab5020c (patch)
treee5c4bce3fd97c046c7367b9eb46d25b35c2f84aa /Documentation/virtual
parentMerge tag 'staging-4.11-rc1-part2' of git://git.kernel.org/pub/scm/linux/kern... (diff)
parentDocumentation/sphinx: fix primary_domain configuration (diff)
downloadlinux-be834aafdf5f8a37c191e697ac8ee6d53ab5020c.tar.xz
linux-be834aafdf5f8a37c191e697ac8ee6d53ab5020c.zip
Merge tag 'docs-4.11-fixes' of git://git.lwn.net/linux
Pull documentation fixes from Jonathan Corbet: "A few fixes for the docs tree, including one for a 4.11 build regression" * tag 'docs-4.11-fixes' of git://git.lwn.net/linux: Documentation/sphinx: fix primary_domain configuration docs: Fix htmldocs build failure doc/ko_KR/memory-barriers: Update control-dependencies section pcieaer doc: update the link Documentation: Update path to sysrq.txt
Diffstat (limited to 'Documentation/virtual')
-rw-r--r--Documentation/virtual/uml/UserModeLinux-HOWTO.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/virtual/uml/UserModeLinux-HOWTO.txt b/Documentation/virtual/uml/UserModeLinux-HOWTO.txt
index f4099ca6b483..87b80f589e1c 100644
--- a/Documentation/virtual/uml/UserModeLinux-HOWTO.txt
+++ b/Documentation/virtual/uml/UserModeLinux-HOWTO.txt
@@ -2401,9 +2401,9 @@
This takes one argument, which is a single letter. It calls the
generic kernel's SysRq driver, which does whatever is called for by
- that argument. See the SysRq documentation in Documentation/sysrq.txt
- in your favorite kernel tree to see what letters are valid and what
- they do.
+ that argument. See the SysRq documentation in
+ Documentation/admin-guide/sysrq.rst in your favorite kernel tree to
+ see what letters are valid and what they do.