Merge tag 'docs-5.3' of git://git.lwn.net/linux

Pull Documentation updates from Jonathan Corbet:
 "It's been a relatively busy cycle for docs:

   - A fair pile of RST conversions, many from Mauro. These create more
     than the usual number of simple but annoying merge conflicts with
     other trees, unfortunately. He has a lot more of these waiting on
     the wings that, I think, will go to you directly later on.

   - A new document on how to use merges and rebases in kernel repos,
     and one on Spectre vulnerabilities.

   - Various improvements to the build system, including automatic
     markup of function() references because some people, for reasons I
     will never understand, were of the opinion that
     :c:func:``function()`` is unattractive and not fun to type.

   - We now recommend using sphinx 1.7, but still support back to 1.4.

   - Lots of smaller improvements, warning fixes, typo fixes, etc"

* tag 'docs-5.3' of git://git.lwn.net/linux: (129 commits)
  docs: automarkup.py: ignore exceptions when seeking for xrefs
  docs: Move binderfs to admin-guide
  Disable Sphinx SmartyPants in HTML output
  doc: RCU callback locks need only _bh, not necessarily _irq
  docs: format kernel-parameters -- as code
  Doc : doc-guide : Fix a typo
  platform: x86: get rid of a non-existent document
  Add the RCU docs to the core-api manual
  Documentation: RCU: Add TOC tree hooks
  Documentation: RCU: Rename txt files to rst
  Documentation: RCU: Convert RCU UP systems to reST
  Documentation: RCU: Convert RCU linked list to reST
  Documentation: RCU: Convert RCU basic concepts to reST
  docs: filesystems: Remove uneeded .rst extension on toctables
  scripts/sphinx-pre-install: fix out-of-tree build
  docs: zh_CN: submitting-drivers.rst: Remove a duplicated Documentation/
  Documentation: PGP: update for newer HW devices
  Documentation: Add section about CPU vulnerabilities for Spectre
  Documentation: platform: Delete x86-laptop-drivers.txt
  docs: Note that :c:func: should no longer be used
  ...

1 files changed, 3 insertions, 3 deletions

diff --git a/init/Kconfig b/init/Kconfig
index d3a1df424ce4..d3ad48272924 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -787,7 +787,7 @@ menuconfig CGROUPS
           use with process control subsystems such as Cpusets, CFS, memory
           controls or device isolation.
           See
-                - Documentation/scheduler/sched-design-CFS.txt  (CFS)
+                - Documentation/scheduler/sched-design-CFS.rst  (CFS)
                 - Documentation/cgroup-v1/ (features for grouping, isolation
                                           and resource control)
 
@@ -880,7 +880,7 @@ config CFS_BANDWIDTH
           tasks running within the fair group scheduler.  Groups with no limit
           set are considered to be unconstrained and will run with no
           restriction.
-          See Documentation/scheduler/sched-bwc.txt for more information.
+          See Documentation/scheduler/sched-bwc.rst for more information.
 
 config RT_GROUP_SCHED
         bool "Group scheduling for SCHED_RR/FIFO"
@@ -891,7 +891,7 @@ config RT_GROUP_SCHED
           to task groups. If enabled, it will also make it impossible to
           schedule realtime tasks for non-root users until you allocate
           realtime bandwidth for them.
-          See Documentation/scheduler/sched-rt-group.txt for more information.
+          See Documentation/scheduler/sched-rt-group.rst for more information.
 
 endif #CGROUP_SCHED