Merge tag 'docs-6.0-fixes' of git://git.lwn.net/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 29 Aug 2022 16:49:48 +0000 (09:49 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 29 Aug 2022 16:49:48 +0000 (09:49 -0700)
commitd68d289fbec70b50a25f5818964b26349320ddb5
tree0f0f2400cc08a8a803fcabc4db8dfce2e51220f6
parentb90cb1053190353cc30f0fef0ef1f378ccc063c5
parent5479d6d4bf122d4b137659559a7bd17784b97b7e
Merge tag 'docs-6.0-fixes' of git://git.lwn.net/linux

Pull documentation fixes from Jonathan Corbet:
 "A handful of fixes for documentation and the docs build system"

* tag 'docs-6.0-fixes' of git://git.lwn.net/linux:
  docs/conf.py: add function attribute '__fix_address' to conf.py
  Docs/admin-guide/mm/damon/usage: fix the example code snip
  docs: Update version number from 5.x to 6.x in README.rst
  docs/ja_JP/SubmittingPatches: Remove reference to submitting-drivers.rst
  docs: kerneldoc-preamble: Test xeCJK.sty before loading