Commit 41dcd67e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull Documentation fixes from Jonathan Corbet:
 "A handful of small documentation fixes that wandered in"

* tag 'docs-5.6-2' of git://git.lwn.net/linux:
  Allow git builds of Sphinx
  Documentation: changes.rst: update several outdated project URLs
  Documentation: build warnings related to missing blank lines after explicit markups has been fixed
  mailmap: add entry for Tiezhu Yang
  Documentation/ko_KR/howto: Update a broken link
  Documentation/ko_KR/howto: Update broken web addresses
  docs/locking: Fix outdated section names
parents 11777ee8 d1c9038a

.mailmap

+1 −0
Original line number Original line Diff line number Diff line
@@ -262,6 +262,7 @@ Sumit Semwal <sumit.semwal@ti.com> 
Tejun Heo <htejun@gmail.com>

Tejun Heo <htejun@gmail.com>

Thomas Graf <tgraf@suug.ch>

Thomas Graf <tgraf@suug.ch>

Thomas Pedersen <twp@codeaurora.org>

Thomas Pedersen <twp@codeaurora.org>

Tiezhu Yang <yangtiezhu@loongson.cn> <kernelpatch@126.com>

Todor Tomov <todor.too@gmail.com> <todor.tomov@linaro.org>

Todor Tomov <todor.too@gmail.com> <todor.tomov@linaro.org>

Tony Luck <tony.luck@intel.com>

Tony Luck <tony.luck@intel.com>

TripleX Chung <xxx.phy@gmail.com> <zhongyu@18mail.cn>

TripleX Chung <xxx.phy@gmail.com> <zhongyu@18mail.cn>

Documentation/doc-guide/contributing.rst

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

.. SPDX-License-Identifier: GPL-2.0



How to help improve kernel documentation

How to help improve kernel documentation

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

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

Documentation/doc-guide/maintainer-profile.rst

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

.. SPDX-License-Identifier: GPL-2.0



Documentation subsystem maintainer entry profile

Documentation subsystem maintainer entry profile

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

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

Documentation/locking/spinlocks.rst

+2 −2
Original line number Original line Diff line number Diff line
@@ -25,9 +25,9 @@ worry about UP vs SMP issues: the spinlocks work correctly under both. 




     Documentation/memory-barriers.txt

     Documentation/memory-barriers.txt





       (5) LOCK operations.

       (5) ACQUIRE operations.





       (6) UNLOCK operations.

       (6) RELEASE operations.





The above is usually pretty simple (you usually need and want only one

The above is usually pretty simple (you usually need and want only one

spinlock for most things - using more than one spinlock can make things a

spinlock for most things - using more than one spinlock can make things a

Documentation/process/changes.rst

+9 −5
Original line number Original line Diff line number Diff line
@@ -383,7 +383,8 @@ Mkinitrd 
E2fsprogs

E2fsprogs

---------

---------





- <http://prdownloads.sourceforge.net/e2fsprogs/e2fsprogs-1.29.tar.gz>

- <https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/>

- <https://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git/>





JFSutils

JFSutils

--------

--------
@@ -393,12 +394,13 @@ JFSutils 
Reiserfsprogs

Reiserfsprogs

-------------

-------------





- <http://www.kernel.org/pub/linux/utils/fs/reiserfs/>

- <https://git.kernel.org/pub/scm/linux/kernel/git/jeffm/reiserfsprogs.git/>





Xfsprogs

Xfsprogs

--------

--------





- <ftp://oss.sgi.com/projects/xfs/>

- <https://git.kernel.org/pub/scm/fs/xfs/xfsprogs-dev.git>

- <https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/>





Pcmciautils

Pcmciautils

-----------

-----------
@@ -437,7 +439,9 @@ Networking 
PPP

PPP

---

---





- <ftp://ftp.samba.org/pub/ppp/>

- <https://download.samba.org/pub/ppp/>

- <https://git.ozlabs.org/?p=ppp.git>

- <https://github.com/paulusmack/ppp/>





NFS-utils

NFS-utils

---------

---------
@@ -447,7 +451,7 @@ NFS-utils 
Iptables

Iptables

--------

--------





- <http://www.iptables.org/downloads.html>

- <https://netfilter.org/projects/iptables/index.html>





Ip-route2

Ip-route2

---------

---------