Commit 50fd82b3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull documentation fixes from Jonathan Corbet:
 "A handful of late-arriving documentation fixes and the addition of an
  SVG tux logo which, I'm assured, we're going to want"

* tag 'docs-5.19-2' of git://git.lwn.net/linux:
  documentation: Format button_dev as a pointer.
  docs: add SVG version of the Linux logo
  docs: move Linux logo into a new `images` folder
  docs: blockdev: change title to match section content
  docs/conf.py: Cope with removal of language=None in Sphinx 5.0.0
parents baf86ac1 a27e51b4

Documentation/admin-guide/blockdev/index.rst

+3 −3
Original line number Diff line number Diff line 
.. SPDX-License-Identifier: GPL-2.0



===========================

The Linux RapidIO Subsystem

===========================

=============

Block Devices

=============



.. toctree::

   :maxdepth: 1

Documentation/conf.py

+1 −1
Original line number Diff line number Diff line
@@ -161,7 +161,7 @@ finally: 
#

# This is also used if you do content translation via gettext catalogs.

# Usually you set "language" from the command line for these cases.

language = None

language = 'en'



# There are two options for replacing |today|: either, you set today to some

# non-false value, then it is used:

Documentation/COPYING-logo→Documentation/images/COPYING-logo

+8 −0
Original line number Diff line number Diff line
@@ -11,3 +11,11 @@ Larry's web-page: 


	https://www.isc.tamu.edu/~lewing/linux/



The SVG version was re-illustrated in vector by Garrett LeSage and

refined and cleaned up by IFo Hancroft. It is also freely usable

as long as you acknowledge Larry, Garrett and IFo as above.



There are also black-and-white and inverted vector versions at

Garrett's repository:



	https://github.com/garrett/Tux

Documentation/logo.gif→Documentation/images/logo.gif

(16 KiB)

File moved.

View file

Documentation/images/logo.svg

0 → 100644
+2040 −0

File added.

Preview size limit exceeded, changes collapsed.