Skip to content

Commit 72c3950

Browse files
committed
Merge tag 'docs-7.0' of git://git.kernel.org/pub/scm/linux/kernel/git/docs/linux
Pull documentation updates from Jonathan Corbet: "A slightly calmer cycle for docs this time around, though there is still a fair amount going on, including: - Some signs of life on the long-moribund Japanese translation - Documentation on policies around the use of generative tools for patch submissions, and a separate document intended for consumption by generative tools - The completion of the move of the documentation tools to tools/docs. For now we're leaving a /scripts/kernel-doc symlink behind to avoid breaking scripts - Ongoing build-system work includes the incorporation of documentation in Python code, better support for documenting variables, and lots of improvements and fixes - Automatic linking of man-page references -- cat(1), for example -- to the online pages in the HTML build ...and the usual array of typo fixes and such" * tag 'docs-7.0' of git://git.kernel.org/pub/scm/linux/kernel/git/docs/linux: (107 commits) doc: development-process: add notice on testing tools: sphinx-build-wrapper: improve its help message docs: sphinx-build-wrapper: allow -v override -q docs: kdoc: Fix pdfdocs build for tools docs: ja_JP: process: translate 'Obtain a current source tree' docs: fix 're-use' -> 'reuse' in documentation docs: ioctl-number: fix a typo in ioctl-number.rst docs: filesystems: ensure proc pid substitutable is complete docs: automarkup.py: Skip common English words as C identifiers Documentation: use a source-read extension for the index link boilerplate docs: parse_features: make documentation more consistent docs: add parse_features module documentation docs: jobserver: do some documentation improvements docs: add jobserver module documentation docs: kabi: helpers: add documentation for each "enum" value docs: kabi: helpers: add helper for debug bits 7 and 8 docs: kabi: system_symbols: end docstring phrases with a dot docs: python: abi_regex: do some improvements at documentation docs: python: abi_parser: do some improvements at documentation docs: add kabi modules documentation ...
2 parents 0c61526 + 0a83293 commit 72c3950

227 files changed

Lines changed: 1806 additions & 4378 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

CREDITS

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -695,7 +695,7 @@ S: USA
695695
N: Chih-Jen Chang
696696
E: chihjenc@scf.usc.edu
697697
E: chihjen@iis.sinica.edu.tw
698-
D: IGMP(Internet Group Management Protocol) version 2
698+
D: IGMP (Internet Group Management Protocol) version 2
699699
S: 3F, 65 Tajen street
700700
S: Tamsui town, Taipei county,
701701
S: Taiwan 251
@@ -1997,7 +1997,7 @@ E: bkaindl@netway.at
19971997
E: edv@bartelt.via.at
19981998
D: Author of a menu based configuration tool, kmenu, which
19991999
D: is the predecessor of 'make menuconfig' and 'make xconfig'.
2000-
D: digiboard driver update(modularisation work and 2.1.x upd)
2000+
D: digiboard driver update (modularisation work and 2.1.x upd)
20012001
S: Tallak 95
20022002
S: 8103 Rein
20032003
S: Austria
@@ -3613,7 +3613,7 @@ S: Finland
36133613
N: Deepak Saxena
36143614
E: dsaxena@plexity.net
36153615
D: I2O kernel layer (config, block, core, pci, net). I2O disk support for LILO
3616-
D: XScale(IOP, IXP) porting and other random ARM bits
3616+
D: XScale (IOP, IXP) porting and other random ARM bits
36173617
S: Portland, OR
36183618

36193619
N: Eric Schenk
@@ -3990,7 +3990,7 @@ S: D-50968 Köln
39903990

39913991
N: Tsu-Sheng Tsao
39923992
E: tsusheng@scf.usc.edu
3993-
D: IGMP(Internet Group Management Protocol) version 2
3993+
D: IGMP (Internet Group Management Protocol) version 2
39943994
S: 2F 14 ALY 31 LN 166 SEC 1 SHIH-PEI RD
39953995
S: Taipei
39963996
S: Taiwan 112

Documentation/ABI/testing/pstore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ Description: Generic interface to platform dependent persistent storage.
2626

2727
Once the information in a file has been read, removing
2828
the file will signal to the underlying persistent storage
29-
device that it can reclaim the space for later re-use::
29+
device that it can reclaim the space for later reuse::
3030

3131
$ rm /sys/fs/pstore/dmesg-erst-1
3232

Documentation/Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,8 @@ dochelp:
9898
@echo ' cleandocs - clean all generated files'
9999
@echo
100100
@echo ' make SPHINXDIRS="s1 s2" [target] Generate only docs of folder s1, s2'
101-
@echo ' top level values for SPHINXDIRS are: $(_SPHINXDIRS)'
101+
@echo ' top level values for SPHINXDIRS are:'
102+
@echo '$(_SPHINXDIRS)' | fmt -s -w 75 -g 75 | sed 's/^/ /'
102103
@echo ' you may also use a subdirectory like SPHINXDIRS=userspace-api/media,'
103104
@echo ' provided that there is an index.rst file at the subdirectory.'
104105
@echo

Documentation/RCU/index.rst

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,3 @@ RCU Handbook
2828
Design/Expedited-Grace-Periods/Expedited-Grace-Periods
2929
Design/Requirements/Requirements
3030
Design/Data-Structures/Data-Structures
31-
32-
.. only:: subproject and html
33-
34-
Indices
35-
=======
36-
37-
* :ref:`genindex`

Documentation/accel/index.rst

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,3 @@ Compute Accelerators
1111
amdxdna/index
1212
qaic/index
1313
rocket/index
14-
15-
.. only:: subproject and html
16-
17-
Indices
18-
=======
19-
20-
* :ref:`genindex`

Documentation/admin-guide/README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ Documentation
5353
these typically contain kernel-specific installation notes for some
5454
drivers for example. Please read the
5555
:ref:`Documentation/process/changes.rst <changes>` file, as it
56-
contains information about the problems, which may result by upgrading
56+
contains information about the problems which may result from upgrading
5757
your kernel.
5858

5959
Installing the kernel source

Documentation/admin-guide/aoe/index.rst

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,3 @@ ATA over Ethernet (AoE)
88
aoe
99
todo
1010
examples
11-
12-
.. only:: subproject and html
13-
14-
Indices
15-
=======
16-
17-
* :ref:`genindex`

Documentation/admin-guide/auxdisplay/index.rst

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,3 @@ Auxiliary Display Support
77

88
ks0108.rst
99
cfag12864b.rst
10-
11-
.. only:: subproject and html
12-
13-
Indices
14-
=======
15-
16-
* :ref:`genindex`

Documentation/admin-guide/bug-hunting.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,14 +52,14 @@ line is usually required to identify and handle the bug. Along this chapter,
5252
we'll refer to "Oops" for all kinds of stack traces that need to be analyzed.
5353

5454
If the kernel is compiled with ``CONFIG_DEBUG_INFO``, you can enhance the
55-
quality of the stack trace by using file:`scripts/decode_stacktrace.sh`.
55+
quality of the stack trace by using ``scripts/decode_stacktrace.sh``.
5656

5757
Modules linked in
5858
-----------------
5959

6060
Modules that are tainted or are being loaded or unloaded are marked with
6161
"(...)", where the taint flags are described in
62-
file:`Documentation/admin-guide/tainted-kernels.rst`, "being loaded" is
62+
Documentation/admin-guide/tainted-kernels.rst, "being loaded" is
6363
annotated with "+", and "being unloaded" is annotated with "-".
6464

6565

@@ -235,7 +235,7 @@ Dave Miller)::
235235
mov 0x8(%ebp), %ebx ! %ebx = skb->sk
236236
mov 0x13c(%ebx), %eax ! %eax = inet_sk(sk)->opt
237237

238-
file:`scripts/decodecode` can be used to automate most of this, depending
238+
``scripts/decodecode`` can be used to automate most of this, depending
239239
on what CPU architecture is being debugged.
240240

241241
Reporting the bug

Documentation/admin-guide/cgroup-v1/hugetlb.rst

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ control group and enforces the limit during page fault. Since HugeTLB
7777
doesn't support page reclaim, enforcing the limit at page fault time implies
7878
that, the application will get SIGBUS signal if it tries to fault in HugeTLB
7979
pages beyond its limit. Therefore the application needs to know exactly how many
80-
HugeTLB pages it uses before hand, and the sysadmin needs to make sure that
80+
HugeTLB pages it uses beforehand, and the sysadmin needs to make sure that
8181
there are enough available on the machine for all the users to avoid processes
8282
getting SIGBUS.
8383

@@ -91,23 +91,23 @@ getting SIGBUS.
9191
hugetlb.<hugepagesize>.rsvd.usage_in_bytes
9292
hugetlb.<hugepagesize>.rsvd.failcnt
9393

94-
The HugeTLB controller allows to limit the HugeTLB reservations per control
94+
The HugeTLB controller allows limiting the HugeTLB reservations per control
9595
group and enforces the controller limit at reservation time and at the fault of
9696
HugeTLB memory for which no reservation exists. Since reservation limits are
97-
enforced at reservation time (on mmap or shget), reservation limits never causes
98-
the application to get SIGBUS signal if the memory was reserved before hand. For
97+
enforced at reservation time (on mmap or shget), reservation limits never cause
98+
the application to get SIGBUS signal if the memory was reserved beforehand. For
9999
MAP_NORESERVE allocations, the reservation limit behaves the same as the fault
100100
limit, enforcing memory usage at fault time and causing the application to
101101
receive a SIGBUS if it's crossing its limit.
102102

103103
Reservation limits are superior to page fault limits described above, since
104104
reservation limits are enforced at reservation time (on mmap or shget), and
105-
never causes the application to get SIGBUS signal if the memory was reserved
106-
before hand. This allows for easier fallback to alternatives such as
105+
never cause the application to get SIGBUS signal if the memory was reserved
106+
beforehand. This allows for easier fallback to alternatives such as
107107
non-HugeTLB memory for example. In the case of page fault accounting, it's very
108-
hard to avoid processes getting SIGBUS since the sysadmin needs precisely know
109-
the HugeTLB usage of all the tasks in the system and make sure there is enough
110-
pages to satisfy all requests. Avoiding tasks getting SIGBUS on overcommited
108+
hard to avoid processes getting SIGBUS since the sysadmin needs to precisely know
109+
the HugeTLB usage of all the tasks in the system and make sure there are enough
110+
pages to satisfy all requests. Avoiding tasks getting SIGBUS on overcommitted
111111
systems is practically impossible with page fault accounting.
112112

113113

0 commit comments

Comments
 (0)