summaryrefslogtreecommitdiffstats
path: root/Documentation/conf.py
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2021-02-26 14:21:18 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2021-02-26 14:21:18 -0800
commit3fb6d0e00efc958d01c2f109c8453033a2d96796 (patch)
tree32a9a9ae4b3836b27cb4e247f855948f83bd2d20 /Documentation/conf.py
parenta3905af5be36b9aa9f17657a02eeb2a08e939c13 (diff)
parentf37a15ea8db022373a2cb6d1a6004c65c2b7f17e (diff)
downloadlinux-3fb6d0e00efc958d01c2f109c8453033a2d96796.tar.gz
linux-3fb6d0e00efc958d01c2f109c8453033a2d96796.tar.bz2
linux-3fb6d0e00efc958d01c2f109c8453033a2d96796.zip
Merge tag 'docs-5.12-2' of git://git.lwn.net/linux
Pull documentation fixes from Jonathan Corbet: "A handful of late-arriving documentation fixes, nothing all that notable" * tag 'docs-5.12-2' of git://git.lwn.net/linux: docs: proc.rst: fix indentation warning Documentation: cgroup-v2: fix path to example BPF program docs: powerpc: Fix tables in syscall64-abi.rst Documentation: features: refresh feature list Documentation: features: remove c6x references docs: ABI: testing: ima_policy: Fixed missing bracket Fix unaesthetic indentation scripts: kernel-doc: fix array element capture in pointer-to-func parsing doc: use KCFLAGS instead of EXTRA_CFLAGS to pass flags from command line Documentation: proc.rst: add more about the 6 fields in loadavg
Diffstat (limited to 'Documentation/conf.py')
-rw-r--r--Documentation/conf.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/Documentation/conf.py b/Documentation/conf.py
index 5bd45d5fb0a0..fd65168c10f8 100644
--- a/Documentation/conf.py
+++ b/Documentation/conf.py
@@ -49,8 +49,7 @@ extensions = ['kerneldoc', 'rstFlatTable', 'kernel_include',
if major >= 3:
sys.stderr.write('''WARNING: The kernel documentation build process
support for Sphinx v3.0 and above is brand new. Be prepared for
- possible issues in the generated output.
- ''')
+ possible issues in the generated output.\n''')
if (major > 3) or (minor > 0 or patch >= 2):
# Sphinx c function parser is more pedantic with regards to type
# checking. Due to that, having macros at c:function cause problems.