All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] docs: Fix typos in Documentation/trace/ftrace.rst
@ 2021-05-31  8:39 Haocheng Xie
  2021-06-01 22:53 ` Jonathan Corbet
  0 siblings, 1 reply; 3+ messages in thread
From: Haocheng Xie @ 2021-05-31  8:39 UTC (permalink / raw)
  To: rostedt, mingo, corbet; +Cc: linux-doc, linux-kernel, Haocheng Xie

Fix the usage of "a/the" and improve the readability.

Signed-off-by: Haocheng Xie <xiehaocheng.cn@gmail.com>
---
 Documentation/trace/ftrace.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Documentation/trace/ftrace.rst b/Documentation/trace/ftrace.rst
index 62c98e9..11cc1c2 100644
--- a/Documentation/trace/ftrace.rst
+++ b/Documentation/trace/ftrace.rst
@@ -354,8 +354,8 @@ of ftrace. Here is a list of some of the key files:
 	is being directly called by the function. If the count is greater
 	than 1 it most likely will be ftrace_ops_list_func().
 
-	If the callback of the function jumps to a trampoline that is
-	specific to a the callback and not the standard trampoline,
+	If the callback of a function jumps to a trampoline which is
+	specific to the callback and which is not the standard trampoline,
 	its address will be printed as well as the function that the
 	trampoline calls.
 
-- 
2.9.5


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH] docs: Fix typos in Documentation/trace/ftrace.rst
  2021-05-31  8:39 [PATCH] docs: Fix typos in Documentation/trace/ftrace.rst Haocheng Xie
@ 2021-06-01 22:53 ` Jonathan Corbet
  2021-06-02  2:25   ` Steven Rostedt
  0 siblings, 1 reply; 3+ messages in thread
From: Jonathan Corbet @ 2021-06-01 22:53 UTC (permalink / raw)
  To: Haocheng Xie, rostedt, mingo; +Cc: linux-doc, linux-kernel, Haocheng Xie

Haocheng Xie <xiehaocheng.cn@gmail.com> writes:

> Fix the usage of "a/the" and improve the readability.
>
> Signed-off-by: Haocheng Xie <xiehaocheng.cn@gmail.com>
> ---
>  Documentation/trace/ftrace.rst | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/Documentation/trace/ftrace.rst b/Documentation/trace/ftrace.rst
> index 62c98e9..11cc1c2 100644
> --- a/Documentation/trace/ftrace.rst
> +++ b/Documentation/trace/ftrace.rst
> @@ -354,8 +354,8 @@ of ftrace. Here is a list of some of the key files:
>  	is being directly called by the function. If the count is greater
>  	than 1 it most likely will be ftrace_ops_list_func().
>  
> -	If the callback of the function jumps to a trampoline that is
> -	specific to a the callback and not the standard trampoline,
> +	If the callback of a function jumps to a trampoline which is
> +	specific to the callback and which is not the standard trampoline,

The "that" in the first line was actually correct and best left
unchanged.  I've applied the patch, but took the liberty of putting
"that" back.

Thanks,

jon

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] docs: Fix typos in Documentation/trace/ftrace.rst
  2021-06-01 22:53 ` Jonathan Corbet
@ 2021-06-02  2:25   ` Steven Rostedt
  0 siblings, 0 replies; 3+ messages in thread
From: Steven Rostedt @ 2021-06-02  2:25 UTC (permalink / raw)
  To: Jonathan Corbet; +Cc: Haocheng Xie, mingo, linux-doc, linux-kernel

On Tue, 01 Jun 2021 16:53:37 -0600
Jonathan Corbet <corbet@lwn.net> wrote:

> Haocheng Xie <xiehaocheng.cn@gmail.com> writes:
> 
> > Fix the usage of "a/the" and improve the readability.
> >
> > Signed-off-by: Haocheng Xie <xiehaocheng.cn@gmail.com>
> > ---
> >  Documentation/trace/ftrace.rst | 4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/Documentation/trace/ftrace.rst b/Documentation/trace/ftrace.rst
> > index 62c98e9..11cc1c2 100644
> > --- a/Documentation/trace/ftrace.rst
> > +++ b/Documentation/trace/ftrace.rst
> > @@ -354,8 +354,8 @@ of ftrace. Here is a list of some of the key files:
> >  	is being directly called by the function. If the count is greater
> >  	than 1 it most likely will be ftrace_ops_list_func().
> >  
> > -	If the callback of the function jumps to a trampoline that is
> > -	specific to a the callback and not the standard trampoline,
> > +	If the callback of a function jumps to a trampoline which is
> > +	specific to the callback and which is not the standard trampoline,  
> 
> The "that" in the first line was actually correct and best left
> unchanged.  I've applied the patch, but took the liberty of putting
> "that" back.

Right. And if it is modifying the "the" here, it should be modifying
the "the function" in the previous paragraph as well.

-- Steve

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2021-06-02  2:25 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-31  8:39 [PATCH] docs: Fix typos in Documentation/trace/ftrace.rst Haocheng Xie
2021-06-01 22:53 ` Jonathan Corbet
2021-06-02  2:25   ` Steven Rostedt

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.