Skip to content

Commit babe393

Browse files
committed
Merge tag 'docs-6.7' of git://git.lwn.net/linux
Pull documentation updates from Jonathan Corbet: "The number of commits for documentation is not huge this time around, but there are some significant changes nonetheless: - Some more Spanish-language and Chinese translations - The much-discussed documentation of the confidential-computing threat model - Powerpc and RISCV documentation move under Documentation/arch - these complete this particular bit of documentation churn - A large traditional-Chinese documentation update - A new document on backporting and conflict resolution - Some kernel-doc and Sphinx fixes Plus the usual smattering of smaller updates and typo fixes" * tag 'docs-6.7' of git://git.lwn.net/linux: (40 commits) scripts/kernel-doc: Fix the regex for matching -Werror flag docs: backporting: address feedback Documentation: driver-api: pps: Update PPS generator documentation speakup: Document USB support doc: blk-ioprio: Bring the doc in line with the implementation docs: usb: fix reference to nonexistent file in UVC Gadget docs: doc-guide: mention 'make refcheckdocs' Documentation: fix typo in dynamic-debug howto scripts/kernel-doc: match -Werror flag strictly Documentation/sphinx: Remove the repeated word "the" in comments. docs: sparse: add SPDX-License-Identifier docs/zh_CN: Add subsystem-apis Chinese translation docs/zh_TW: update contents for zh_TW docs: submitting-patches: encourage direct notifications to commenters docs: add backporting and conflict resolution document docs: move riscv under arch docs: update link to powerpc/vmemmap_dedup.rst mm/memory-hotplug: fix typo in documentation docs: move powerpc under arch PCI: Update the devres documentation regarding to pcim_*() ...
2 parents 7dc0e9c + cf63348 commit babe393

File tree

190 files changed

+9293
-2168
lines changed

Some content is hidden

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

190 files changed

+9293
-2168
lines changed

Documentation/ABI/testing/sysfs-bus-papr-pmem

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Description:
88
more bits set in the dimm-health-bitmap retrieved in
99
response to H_SCM_HEALTH hcall. The details of the bit
1010
flags returned in response to this hcall is available
11-
at 'Documentation/powerpc/papr_hcalls.rst' . Below are
11+
at 'Documentation/arch/powerpc/papr_hcalls.rst' . Below are
1212
the flags reported in this sysfs file:
1313

1414
* "not_armed"

Documentation/PCI/pci-error-recovery.rst

Lines changed: 2 additions & 2 deletions

Documentation/admin-guide/cgroup-v2.rst

Lines changed: 6 additions & 4 deletions

Documentation/admin-guide/dynamic-debug-howto.rst

Lines changed: 1 addition & 1 deletion

Documentation/admin-guide/efi-stub.rst

Lines changed: 1 addition & 1 deletion

Documentation/admin-guide/hw-vuln/mds.rst

Lines changed: 13 additions & 21 deletions

Documentation/admin-guide/hw-vuln/processor_mmio_stale_data.rst

Lines changed: 12 additions & 1 deletion

Documentation/admin-guide/hw-vuln/tsx_async_abort.rst

Lines changed: 13 additions & 20 deletions

Documentation/admin-guide/mm/memory-hotplug.rst

Lines changed: 5 additions & 5 deletions

Documentation/admin-guide/spkguide.txt

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Last modified on Mon Sep 27 14:26:31 2010
77
Document version 1.3
88

99
Copyright (c) 2005 Gene Collins
10-
Copyright (c) 2008 Samuel Thibault
10+
Copyright (c) 2008, 2023 Samuel Thibault
1111
Copyright (c) 2009, 2010 the Speakup Team
1212

1313
Permission is granted to copy, distribute and/or modify this document
@@ -83,8 +83,7 @@ spkout -- Speak Out
8383
txprt -- Transport
8484
dummy -- Plain text terminal
8585

86-
Note: Speakup does * NOT * support usb connections! Speakup also does *
87-
NOT * support the internal Tripletalk!
86+
Note: Speakup does * NOT * support the internal Tripletalk!
8887

8988
Speakup does support two other synthesizers, but because they work in
9089
conjunction with other software, they must be loaded as modules after
@@ -94,6 +93,12 @@ These are as follows:
9493
decpc -- DecTalk PC (not available at boot up)
9594
soft -- One of several software synthesizers (not available at boot up)
9695

96+
By default speakup looks for the synthesizer on the ttyS0 serial port. This can
97+
be changed with the device parameter of the modules, for instance for
98+
DoubleTalk LT:
99+
100+
speakup_ltlk.dev=ttyUSB0
101+
97102
See the sections on loading modules and software synthesizers later in
98103
this manual for further details. It should be noted here that the
99104
speakup.synth boot parameter will have no effect if Speakup has been

0 commit comments

Comments
 (0)