History

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

Linus Torvalds committed 6 years ago

Commit 41dcd672 parents 11777ee d1c90389 files · +27 −17Browse files

Unified · Split

9 files
  1. .mailmap +1 −0
  2. Documentation/doc-guide/contributing.rst +1 −0
  3. Documentation/doc-guide/maintainer-profile.rst +1 −0
  4. Documentation/locking/spinlocks.rst +2 −2
  5. Documentation/process/changes.rst +9 −5
  6. Documentation/trace/kprobetrace.rst +0 −1
  7. Documentation/translations/it_IT/process/changes.rst +9 −5
  8. Documentation/translations/ko_KR/howto.rst +3 −3
  9. scripts/sphinx-pre-install +1 −1
.mailmap+1−0
@@ -262,6 +262,7 @@ Sumit Semwal <sumit.semwal@ti.com> · 261 unmodified lines
262Tejun Heo <htejun@gmail.com>262Tejun Heo <htejun@gmail.com>
263Thomas Graf <tgraf@suug.ch>263Thomas Graf <tgraf@suug.ch>
264Thomas Pedersen <twp@codeaurora.org>264Thomas Pedersen <twp@codeaurora.org>
265Tiezhu Yang <yangtiezhu@loongson.cn> <kernelpatch@126.com>
265Todor Tomov <todor.too@gmail.com> <todor.tomov@linaro.org>266Todor Tomov <todor.too@gmail.com> <todor.tomov@linaro.org>
266Tony Luck <tony.luck@intel.com>267Tony Luck <tony.luck@intel.com>
267TripleX Chung <xxx.phy@gmail.com> <zhongyu@18mail.cn>268TripleX Chung <xxx.phy@gmail.com> <zhongyu@18mail.cn>
Documentation/doc-guide/contributing.rst+1−0
@@ -1,4 +1,5 @@
1.. SPDX-License-Identifier: GPL-2.01.. SPDX-License-Identifier: GPL-2.0
2
2How to help improve kernel documentation3How to help improve kernel documentation
3========================================4========================================
4 5
Documentation/doc-guide/maintainer-profile.rst+1−0
@@ -1,4 +1,5 @@
1.. SPDX-License-Identifier: GPL-2.01.. SPDX-License-Identifier: GPL-2.0
2
2Documentation subsystem maintainer entry profile3Documentation subsystem maintainer entry profile
3================================================4================================================
4 5
Documentation/locking/spinlocks.rst+2−2
@@ -25,9 +25,9 @@ worry about UP vs SMP issues: the spinlocks work correctly under both. · 24 unmodified lines
25 25
26 Documentation/memory-barriers.txt26 Documentation/memory-barriers.txt
27 27
28 (5) LOCK operations.28 (5) ACQUIRE operations.
29 29
30 (6) UNLOCK operations.30 (6) RELEASE operations.
31 31
32The above is usually pretty simple (you usually need and want only one32The above is usually pretty simple (you usually need and want only one
33spinlock for most things - using more than one spinlock can make things a33spinlock for most things - using more than one spinlock can make things a
Documentation/process/changes.rst+9−5
@@ -383,7 +383,8 @@ Mkinitrd · 382 unmodified lines
383E2fsprogs383E2fsprogs
384---------384---------
385 385
386- <http://prdownloads.sourceforge.net/e2fsprogs/e2fsprogs-1.29.tar.gz>386- <https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/>
387- <https://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git/>
387 388
388JFSutils389JFSutils
389--------390--------
@@ -393,12 +394,13 @@ JFSutils · 3 unmodified lines
393Reiserfsprogs394Reiserfsprogs
394-------------395-------------
395 396
396- <http://www.kernel.org/pub/linux/utils/fs/reiserfs/>397- <https://git.kernel.org/pub/scm/linux/kernel/git/jeffm/reiserfsprogs.git/>
397 398
398Xfsprogs399Xfsprogs
399--------400--------
400 401
401- <ftp://oss.sgi.com/projects/xfs/>402- <https://git.kernel.org/pub/scm/fs/xfs/xfsprogs-dev.git>
403- <https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/>
402 404
403Pcmciautils405Pcmciautils
404-----------406-----------
@@ -437,7 +439,9 @@ Networking · 32 unmodified lines
437PPP439PPP
438---440---
439 441
440- <ftp://ftp.samba.org/pub/ppp/>442- <https://download.samba.org/pub/ppp/>
443- <https://git.ozlabs.org/?p=ppp.git>
444- <https://github.com/paulusmack/ppp/>
441 445
442NFS-utils446NFS-utils
443---------447---------
@@ -447,7 +451,7 @@ NFS-utils · 3 unmodified lines
447Iptables451Iptables
448--------452--------
449 453
450- <http://www.iptables.org/downloads.html>454- <https://netfilter.org/projects/iptables/index.html>
451 455
452Ip-route2456Ip-route2
453---------457---------
Documentation/trace/kprobetrace.rst+0−1
@@ -253,4 +253,3 @@ And you can see the traced information via /sys/kernel/debug/tracing/trace. · 252 unmodified lines
253Each line shows when the kernel hits an event, and <- SYMBOL means kernel253Each line shows when the kernel hits an event, and <- SYMBOL means kernel
254returns from SYMBOL(e.g. "sys_open+0x1b/0x1d <- do_sys_open" means kernel254returns from SYMBOL(e.g. "sys_open+0x1b/0x1d <- do_sys_open" means kernel
255returns from do_sys_open to sys_open+0x1b).255returns from do_sys_open to sys_open+0x1b).
256
Documentation/translations/it_IT/process/changes.rst+9−5
@@ -390,7 +390,8 @@ Mkinitrd · 389 unmodified lines
390E2fsprogs390E2fsprogs
391---------391---------
392 392
393- <http://prdownloads.sourceforge.net/e2fsprogs/e2fsprogs-1.29.tar.gz>393- <https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/>
394- <https://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git/>
394 395
395JFSutils396JFSutils
396--------397--------
@@ -400,12 +401,13 @@ JFSutils · 3 unmodified lines
400Reiserfsprogs401Reiserfsprogs
401-------------402-------------
402 403
403- <http://www.kernel.org/pub/linux/utils/fs/reiserfs/>404- <https://git.kernel.org/pub/scm/linux/kernel/git/jeffm/reiserfsprogs.git/>
404 405
405Xfsprogs406Xfsprogs
406--------407--------
407 408
408- <ftp://oss.sgi.com/projects/xfs/>409- <https://git.kernel.org/pub/scm/fs/xfs/xfsprogs-dev.git>
410- <https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/>
409 411
410Pcmciautils412Pcmciautils
411-----------413-----------
@@ -444,7 +446,9 @@ Rete · 32 unmodified lines
444PPP446PPP
445---447---
446 448
447- <ftp://ftp.samba.org/pub/ppp/>449- <https://download.samba.org/pub/ppp/>
450- <https://git.ozlabs.org/?p=ppp.git>
451- <https://github.com/paulusmack/ppp/>
448 452
449 453
450NFS-utils454NFS-utils
@@ -455,7 +459,7 @@ NFS-utils · 4 unmodified lines
455Iptables459Iptables
456--------460--------
457 461
458- <http://www.iptables.org/downloads.html>462- <https://netfilter.org/projects/iptables/index.html>
459 463
460Ip-route2464Ip-route2
461---------465---------
Documentation/translations/ko_KR/howto.rst+3−3
@@ -318,8 +318,8 @@ Andrew Morton의 글이 있다. · 317 unmodified lines
318리뷰 프로세스는 patchwork라는 도구를 통해 추적된다. patchwork은 등록된 패치와318리뷰 프로세스는 patchwork라는 도구를 통해 추적된다. patchwork은 등록된 패치와
319패치에 대한 코멘트, 패치의 버전을 볼 수 있는 웹 인터페이스를 제공하고,319패치에 대한 코멘트, 패치의 버전을 볼 수 있는 웹 인터페이스를 제공하고,
320메인테이너는 패치를 리뷰 중, 리뷰 통과, 또는 반려됨으로 표시할 수 있다.320메인테이너는 패치를 리뷰 중, 리뷰 통과, 또는 반려됨으로 표시할 수 있다.
321대부분의 이러한 patchwork 사이트는 https://patchwork.kernel.org/ 또는321대부분의 이러한 patchwork 사이트는 https://patchwork.kernel.org/ 에 나열되어
322http://patchwork.ozlabs.org/ 에 나열되어 있다.322있다.
323 323
324통합 테스트를 위한 linux-next 커널 트리324통합 테스트를 위한 linux-next 커널 트리
325~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~325~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -328,7 +328,7 @@ http://patchwork.ozlabs.org/ 에 나열되어 있다. · 2 unmodified lines
328거쳐야 한다. 이런 목적으로, 모든 서브시스템 트리의 변경사항을 거의 매일328거쳐야 한다. 이런 목적으로, 모든 서브시스템 트리의 변경사항을 거의 매일
329받아가는 특수한 테스트 저장소가 존재한다:329받아가는 특수한 테스트 저장소가 존재한다:
330 330
331 https://git.kernel.org/?p=linux/kernel/git/sfr/linux-next.git331 https://git.kernel.org/?p=linux/kernel/git/next/linux-next.git
332 332
333이런 식으로, linux-next 커널을 통해 다음 머지 기간에 메인라인 커널에 어떤333이런 식으로, linux-next 커널을 통해 다음 머지 기간에 메인라인 커널에 어떤
334변경이 가해질 것인지 간략히 알 수 있다. 모험심 강한 테스터라면 linux-next334변경이 가해질 것인지 간략히 알 수 있다. 모험심 강한 테스터라면 linux-next
scripts/sphinx-pre-install+1−1
@@ -272,7 +272,7 @@ sub check_sphinx() · 271 unmodified lines
272 272
273 open IN, "$sphinx --version 2>&1 |" or die "$sphinx returned an error";273 open IN, "$sphinx --version 2>&1 |" or die "$sphinx returned an error";
274 while (<IN>) {274 while (<IN>) {
275 if (m/^\s*sphinx-build\s+([\d\.]+)$/) {275 if (m/^\s*sphinx-build\s+([\d\.]+)(\+\/[\da-f]+)?$/) {
276 $cur_version=$1;276 $cur_version=$1;
277 last;277 last;
278 }278 }