[PATCH] docs: use "buses" rather than "busses"

[PATCH] docs: use "buses" rather than "busses"

[Samuel Tardieu]

If "busses" might be encountered as a plural of "bus" (5 instances),
the correct spelling is "buses" (26 instances). Fixing those 5
instances makes the doc more consistent.

Signed-off-by: Samuel Tardieu <sam@rfc1149.net>
---
 docs/system/arm/palm.rst    | 2 +-
 docs/system/arm/xscale.rst  | 2 +-
 docs/system/devices/can.rst | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/system/arm/palm.rst b/docs/system/arm/palm.rst
index 47ff9b36d4..61bc8d34f4 100644
--- a/docs/system/arm/palm.rst
+++ b/docs/system/arm/palm.rst
@@ -14,7 +14,7 @@ following elements:
 -  On-chip Real Time Clock
 
 -  TI TSC2102i touchscreen controller / analog-digital converter /
-   Audio CODEC, connected through MicroWire and |I2S| busses
+   Audio CODEC, connected through MicroWire and |I2S| buses
 
 -  GPIO-connected matrix keypad
 
diff --git a/docs/system/arm/xscale.rst b/docs/system/arm/xscale.rst
index d2d5949e10..e239136c3c 100644
--- a/docs/system/arm/xscale.rst
+++ b/docs/system/arm/xscale.rst
@@ -32,4 +32,4 @@ The clamshell PDA models emulation includes the following peripherals:
 
 -  Three on-chip UARTs
 
--  WM8750 audio CODEC on |I2C| and |I2S| busses
+-  WM8750 audio CODEC on |I2C| and |I2S| buses
diff --git a/docs/system/devices/can.rst b/docs/system/devices/can.rst
index 0af3d9912a..09121836fd 100644
--- a/docs/system/devices/can.rst
+++ b/docs/system/devices/can.rst
@@ -1,12 +1,12 @@
 CAN Bus Emulation Support
 =========================
 The CAN bus emulation provides mechanism to connect multiple
-emulated CAN controller chips together by one or multiple CAN busses
-(the controller device "canbus"  parameter). The individual busses
+emulated CAN controller chips together by one or multiple CAN buses
+(the controller device "canbus"  parameter). The individual buses
 can be connected to host system CAN API (at this time only Linux
 SocketCAN is supported).
 
-The concept of busses is generic and different CAN controllers
+The concept of buses is generic and different CAN controllers
 can be implemented.
 
 The initial submission implemented SJA1000 controller which
-- 
2.42.0

Re: [PATCH] docs: use "buses" rather than "busses"

[Philippe Mathieu-Daudé]

On 3/1/24 18:28, Samuel Tardieu wrote:
> If "busses" might be encountered as a plural of "bus" (5 instances),
> the correct spelling is "buses" (26 instances). Fixing those 5
> instances makes the doc more consistent.
> 
> Signed-off-by: Samuel Tardieu <sam@rfc1149.net>
> ---
>   docs/system/arm/palm.rst    | 2 +-
>   docs/system/arm/xscale.rst  | 2 +-
>   docs/system/devices/can.rst | 6 +++---
>   3 files changed, 5 insertions(+), 5 deletions(-)

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>

Re: [PATCH] docs: use "buses" rather than "busses"

[Pavel Pisa]

On Wednesday 03 of January 2024 18:28:17 Samuel Tardieu wrote:
> If "busses" might be encountered as a plural of "bus" (5 instances),
> the correct spelling is "buses" (26 instances). Fixing those 5
> instances makes the doc more consistent.
>
> Signed-off-by: Samuel Tardieu <sam@rfc1149.net>
Reviewed-by: Pavel Pisa <pisa@cmp.felk.cvut.cz>

PS: there is waiting my previous CAN FIX from December 14
and I have received any feedback if it will be taken
by somebody with commit rights

  https://gitlab.com/qemu-project/qemu/-/issues/2028
  https://patchew.org/QEMU/20231214104623.31147-1-pisa@fel.cvut.cz/

Should I resend it?

Re: [PATCH] docs: use "buses" rather than "busses"

[Thomas Huth]

On 03/01/2024 22.34, Pavel Pisa wrote:
> On Wednesday 03 of January 2024 18:28:17 Samuel Tardieu wrote:
>> If "busses" might be encountered as a plural of "bus" (5 instances),
>> the correct spelling is "buses" (26 instances). Fixing those 5
>> instances makes the doc more consistent.
>>
>> Signed-off-by: Samuel Tardieu <sam@rfc1149.net>
> Reviewed-by: Pavel Pisa <pisa@cmp.felk.cvut.cz>
> 
> PS: there is waiting my previous CAN FIX from December 14
> and I have received any feedback if it will be taken
> by somebody with commit rights
> 
>    https://gitlab.com/qemu-project/qemu/-/issues/2028
>    https://patchew.org/QEMU/20231214104623.31147-1-pisa@fel.cvut.cz/
> 
> Should I resend it?

Since you (and Vikram) are listed as a maintainer for the CAN subsystem,  so 
if there were no objections, it's maybe easiest if you send a pull request 
for it. See this page for some more information:

  https://www.qemu.org/docs/master/devel/submitting-a-pull-request.html

Basically:
- Stick your patch(es) in a branch on your public repository
- Create a signed git tag ("git tag -s ...") and push it to your repo
- git format-patch --cover-letter --subject-prefix=PULL ...
- Use "git request-pull" to create the contents of the cover letter
- Send them to the qemu-devel mailing list

  HTH,
   Thomas

Re: [PATCH] docs: use "buses" rather than "busses"

[Zhao Liu]

On Wed, Jan 03, 2024 at 06:28:17PM +0100, Samuel Tardieu wrote:
> Date: Wed,  3 Jan 2024 18:28:17 +0100
> From: Samuel Tardieu <sam@rfc1149.net>
> Subject: [PATCH] docs: use "buses" rather than "busses"
> X-Mailer: git-send-email 2.42.0
> 
> If "busses" might be encountered as a plural of "bus" (5 instances),
> the correct spelling is "buses" (26 instances). Fixing those 5
> instances makes the doc more consistent.
> 
> Signed-off-by: Samuel Tardieu <sam@rfc1149.net>
> ---
>  docs/system/arm/palm.rst    | 2 +-
>  docs/system/arm/xscale.rst  | 2 +-
>  docs/system/devices/can.rst | 6 +++---
>  3 files changed, 5 insertions(+), 5 deletions(-)
> 

Reviewed-by: Zhao Liu <zhao1.liu@intel.com>

Re: [PATCH] docs: use "buses" rather than "busses"

[Peter Maydell]

On Wed, 3 Jan 2024 at 17:28, Samuel Tardieu <sam@rfc1149.net> wrote:
>
> If "busses" might be encountered as a plural of "bus" (5 instances),
> the correct spelling is "buses" (26 instances). Fixing those 5
> instances makes the doc more consistent.
>
> Signed-off-by: Samuel Tardieu <sam@rfc1149.net>

Applied to target-arm.next, thanks (since 2 out of 3 of these
are arm related).

-- PMM