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
262262 Tejun Heo <htejun@gmail.com>
263263 Thomas Graf <tgraf@suug.ch>
264264 Thomas Pedersen <twp@codeaurora.org>
265+Tiezhu Yang <yangtiezhu@loongson.cn> <kernelpatch@126.com>
265266 Todor Tomov <todor.too@gmail.com> <todor.tomov@linaro.org>
266267 Tony Luck <tony.luck@intel.com>
267268 TripleX Chung <xxx.phy@gmail.com> <zhongyu@18mail.cn>
Documentation/doc-guide/contributing.rst+1−0
@@ -1,4 +1,5 @@
11 .. SPDX-License-Identifier: GPL-2.0
2+
23 How to help improve kernel documentation
34 ========================================
45
Documentation/doc-guide/maintainer-profile.rst+1−0
@@ -1,4 +1,5 @@
11 .. SPDX-License-Identifier: GPL-2.0
2+
23 Documentation subsystem maintainer entry profile
34 ================================================
45
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
2525
2626 Documentation/memory-barriers.txt
2727
28− (5) LOCK operations.
28+ (5) ACQUIRE operations.
2929
30− (6) UNLOCK operations.
30+ (6) RELEASE operations.
3131
3232 The above is usually pretty simple (you usually need and want only one
3333 spinlock 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
383383 E2fsprogs
384384 ---------
385385
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/>
387388
388389 JFSutils
389390 --------
@@ -393,12 +394,13 @@ JFSutils · 3 unmodified lines
393394 Reiserfsprogs
394395 -------------
395396
396−- <http://www.kernel.org/pub/linux/utils/fs/reiserfs/>
397+- <https://git.kernel.org/pub/scm/linux/kernel/git/jeffm/reiserfsprogs.git/>
397398
398399 Xfsprogs
399400 --------
400401
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/>
402404
403405 Pcmciautils
404406 -----------
@@ -437,7 +439,9 @@ Networking · 32 unmodified lines
437439 PPP
438440 ---
439441
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/>
441445
442446 NFS-utils
443447 ---------
@@ -447,7 +451,7 @@ NFS-utils · 3 unmodified lines
447451 Iptables
448452 --------
449453
450−- <http://www.iptables.org/downloads.html>
454+- <https://netfilter.org/projects/iptables/index.html>
451455
452456 Ip-route2
453457 ---------
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
253253 Each line shows when the kernel hits an event, and <- SYMBOL means kernel
254254 returns from SYMBOL(e.g. "sys_open+0x1b/0x1d <- do_sys_open" means kernel
255255 returns 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
390390 E2fsprogs
391391 ---------
392392
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/>
394395
395396 JFSutils
396397 --------
@@ -400,12 +401,13 @@ JFSutils · 3 unmodified lines
400401 Reiserfsprogs
401402 -------------
402403
403−- <http://www.kernel.org/pub/linux/utils/fs/reiserfs/>
404+- <https://git.kernel.org/pub/scm/linux/kernel/git/jeffm/reiserfsprogs.git/>
404405
405406 Xfsprogs
406407 --------
407408
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/>
409411
410412 Pcmciautils
411413 -----------
@@ -444,7 +446,9 @@ Rete · 32 unmodified lines
444446 PPP
445447 ---
446448
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/>
448452
449453
450454 NFS-utils
@@ -455,7 +459,7 @@ NFS-utils · 4 unmodified lines
455459 Iptables
456460 --------
457461
458−- <http://www.iptables.org/downloads.html>
462+- <https://netfilter.org/projects/iptables/index.html>
459463
460464 Ip-route2
461465 ---------
Documentation/translations/ko_KR/howto.rst+3−3
@@ -318,8 +318,8 @@ Andrew Morton의 글이 있다. · 317 unmodified lines
318318 리뷰 프로세스는 patchwork라는 도구를 통해 추적된다. patchwork은 등록된 패치와
319319 패치에 대한 코멘트, 패치의 버전을 볼 수 있는 웹 인터페이스를 제공하고,
320320 메인테이너는 패치를 리뷰 중, 리뷰 통과, 또는 반려됨으로 표시할 수 있다.
321−대부분의 이러한 patchwork 사이트는 https://patchwork.kernel.org/ 또는
322−http://patchwork.ozlabs.org/ 에 나열되어 있다.
321+대부분의 이러한 patchwork 사이트는 https://patchwork.kernel.org/ 에 나열되어
322+있다.
323323
324324 통합 테스트를 위한 linux-next 커널 트리
325325 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -328,7 +328,7 @@ http://patchwork.ozlabs.org/ 에 나열되어 있다. · 2 unmodified lines
328328 거쳐야 한다. 이런 목적으로, 모든 서브시스템 트리의 변경사항을 거의 매일
329329 받아가는 특수한 테스트 저장소가 존재한다:
330330
331− https://git.kernel.org/?p=linux/kernel/git/sfr/linux-next.git
331+ https://git.kernel.org/?p=linux/kernel/git/next/linux-next.git
332332
333333 이런 식으로, linux-next 커널을 통해 다음 머지 기간에 메인라인 커널에 어떤
334334 변경이 가해질 것인지 간략히 알 수 있다. 모험심 강한 테스터라면 linux-next
scripts/sphinx-pre-install+1−1
@@ -272,7 +272,7 @@ sub check_sphinx() · 271 unmodified lines
272272
273273 open IN, "$sphinx --version 2>&1 |" or die "$sphinx returned an error";
274274 while (<IN>) {
275− if (m/^\s*sphinx-build\s+([\d\.]+)$/) {
275+ if (m/^\s*sphinx-build\s+([\d\.]+)(\+\/[\da-f]+)?$/) {
276276 $cur_version=$1;
277277 last;
278278 }