diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-03-04 11:32:18 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-03-04 11:32:18 -0800 |
| commit | be834aafdf5f8a37c191e697ac8ee6d53ab5020c (patch) | |
| tree | e5c4bce3fd97c046c7367b9eb46d25b35c2f84aa /Documentation/sysctl/kernel.txt | |
| parent | 91aff98b79f10bf38c0d51b2d8538ecca35f916e (diff) | |
| parent | fd5d666932d51b2552ecc0280047d6b35d9b6cd1 (diff) | |
| download | linux-be834aafdf5f8a37c191e697ac8ee6d53ab5020c.tar.bz2 | |
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/sysctl/kernel.txt')
| -rw-r--r-- | Documentation/sysctl/kernel.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/sysctl/kernel.txt b/Documentation/sysctl/kernel.txt index a32b4b748644..bac23c198360 100644 --- a/Documentation/sysctl/kernel.txt +++ b/Documentation/sysctl/kernel.txt @@ -85,7 +85,7 @@ show up in /proc/sys/kernel: - softlockup_all_cpu_backtrace - soft_watchdog - stop-a [ SPARC only ] -- sysrq ==> Documentation/sysrq.txt +- sysrq ==> Documentation/admin-guide/sysrq.rst - sysctl_writes_strict - tainted - threads-max |