Skip to content

Commit b4b0881

Browse files
committed
Merge tag 'docs-6.14-2' of git://git.lwn.net/linux
Pull documentation fixes from Jonathan Corbet: "Two fixes for footnote-related warnings that appeared with Sphinx 8.x. We want to encourage use of newer Sphinx - they fixed a performance problem and the docs build takes less than half the time it used to" * tag 'docs-6.14-2' of git://git.lwn.net/linux: docs: power: Fix footnote reference for Toshiba Satellite P10-554 Documentation: ublk: Drop Stefan Hajnoczi's message footnote
2 parents b8a1c9f + 96720ce commit b4b0881

File tree

2 files changed

+1
-3
lines changed

2 files changed

+1
-3
lines changed

Documentation/block/ublk.rst

-2
Original file line numberDiff line numberDiff line change
@@ -333,6 +333,4 @@ References
333333
334334
.. [#userspace_readme] https://github.com/ming1/ubdsrv/blob/master/README
335335
336-
.. [#stefan] https://lore.kernel.org/linux-block/[email protected]/
337-
338336
.. [#xiaoguang] https://lore.kernel.org/linux-block/[email protected]/

Documentation/power/video.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ Toshiba Portege 3020CT s3_mode (3)
190190
Toshiba Satellite 4030CDT s3_mode (3) (S1 also works OK)
191191
Toshiba Satellite 4080XCDT s3_mode (3) (S1 also works OK)
192192
Toshiba Satellite 4090XCDT ??? [#f1]_
193-
Toshiba Satellite P10-554 s3_bios,s3_mode (4)[#f3]_
193+
Toshiba Satellite P10-554 s3_bios,s3_mode (4) [#f3]_
194194
Toshiba M30 (2) xor X with nvidia driver using internal AGP
195195
Uniwill 244IIO ??? [#f1]_
196196
=============================== ===============================================

0 commit comments

Comments
 (0)