public inbox for binutils@sourceware.org
 help / color / mirror / Atom feed
* [PATCH] gas: Fix some typos in the Info manual
@ 2022-08-08 17:38 Štěpán Němec
  2022-08-09 14:39 ` Nick Clifton
  0 siblings, 1 reply; 5+ messages in thread
From: Štěpán Němec @ 2022-08-08 17:38 UTC (permalink / raw)
  To: binutils

* gas/doc/as.texi: Fix some typos.
---
 gas/doc/as.texi | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/gas/doc/as.texi b/gas/doc/as.texi
index 09b0ca5f565c..e915893da869 100644
--- a/gas/doc/as.texi
+++ b/gas/doc/as.texi
@@ -2885,9 +2885,9 @@
 If the first line of an input file is @code{#NO_APP} or if you use the
 @samp{-f} option, whitespace and comments are not removed from the input file.
 Within an input file, you can ask for whitespace and comment removal in
-specific portions of the by putting a line that says @code{#APP} before the
+specific portions of the file by putting a line that says @code{#APP} before the
 text that may contain whitespace or comments, and putting a line that says
-@code{#NO_APP} after this text.  This feature is mainly intend to support
+@code{#NO_APP} after this text.  This feature is mainly intended to support
 @code{asm} statements in compilers whose output is otherwise free of comments
 and whitespace.
 
@@ -2923,12 +2923,13 @@
 @cindex line comment character
 Anything from a @dfn{line comment} character up to the next newline is
 considered a comment and is ignored.  The line comment character is target
-specific, and some targets multiple comment characters.  Some targets also have
-line comment characters that only work if they are the first character on a
-line.  Some targets use a sequence of two characters to introduce a line
-comment.  Some targets can also change their line comment characters depending
-upon command-line options that have been used.  For more details see the
-@emph{Syntax} section in the documentation for individual targets.
+specific, and some targets support multiple comment characters.  Some targets
+also have line comment characters that only work if they are the first
+character on a line.  Some targets use a sequence of two characters to
+introduce a line comment.  Some targets can also change their line comment
+characters depending upon command-line options that have been used.  For more
+details see the @emph{Syntax} section in the documentation for individual
+targets.
 
 If the line comment character is the hash sign (@samp{#}) then it still has the
 special ability to enable and disable preprocessing (@pxref{Preprocessing}) and
@@ -3649,7 +3650,7 @@
 
 @cindex expr (internal section)
 @item expr section
-The assembler stores complex expression internally as combinations of
+The assembler stores complex expressions internally as combinations of
 symbols.  When it needs to represent an expression as a symbol, it puts
 it in the expr section.
 @c FIXME item debug
@@ -4356,7 +4357,7 @@
 @dfn{Is Less Than Or Equal To}
 
 The comparison operators can be used as infix operators.  A true result has a
-value of -1 whereas a false result has a value of 0.   Note, these operators
+value of -1 whereas a false result has a value of 0.  Note, these operators
 perform signed comparisons.
 @end table
 
@@ -4371,7 +4372,7 @@
 
 These two logical operations can be used to combine the results of sub
 expressions.  Note, unlike the comparison operators a true result returns a
-value of 1 but a false results does still return 0.  Also note that the logical
+value of 1 but a false result does still return 0.  Also note that the logical
 or operator has a slightly lower precedence than logical and.
 
 @end table

base-commit: e441b55e94c905c6ee4417be3e5d88021d9c5aa6
-- 
2.37.1


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

* Re: [PATCH] gas: Fix some typos in the Info manual
  2022-08-08 17:38 [PATCH] gas: Fix some typos in the Info manual Štěpán Němec
@ 2022-08-09 14:39 ` Nick Clifton
  2022-08-09 15:06   ` Štěpán Němec
  0 siblings, 1 reply; 5+ messages in thread
From: Nick Clifton @ 2022-08-09 14:39 UTC (permalink / raw)
  To: Štěpán Němec, binutils

Hi Štěpán,

> * gas/doc/as.texi: Fix some typos.

Thanks.  I have applied your patch.

Cheers
   Nick


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

* Re: [PATCH] gas: Fix some typos in the Info manual
  2022-08-09 14:39 ` Nick Clifton
@ 2022-08-09 15:06   ` Štěpán Němec
  2022-08-09 15:33     ` Nick Clifton
  0 siblings, 1 reply; 5+ messages in thread
From: Štěpán Němec @ 2022-08-09 15:06 UTC (permalink / raw)
  To: Nick Clifton, binutils

Hello Nick,

On Tue, 09 Aug 2022 15:39:56 +0100
Nick Clifton wrote:

> Thanks.  I have applied your patch.

Any reason you dropped the last hunk?

(Rebased on top of master:)

-- >8 --
diff --git a/gas/doc/as.texi b/gas/doc/as.texi
index c1ac22c22979..e915893da869 100644
--- a/gas/doc/as.texi
+++ b/gas/doc/as.texi
@@ -4372,7 +4372,7 @@

 These two logical operations can be used to combine the results of sub
 expressions.  Note, unlike the comparison operators a true result returns a
-value of 1 but a false results does still return 0.  Also note that the logical
+value of 1 but a false result does still return 0.  Also note that the logical
 or operator has a slightly lower precedence than logical and.

 @end table

-- 8< --

Was there anything wrong with my patch? It seems you applied (most of)
the changes by hand instead of using git(-am) (the latter would have
also preserved the correct spelling of my name).

  Thanks,

  Štěpán

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

* Re: [PATCH] gas: Fix some typos in the Info manual
  2022-08-09 15:06   ` Štěpán Němec
@ 2022-08-09 15:33     ` Nick Clifton
  2022-08-09 21:36       ` Štěpán Němec
  0 siblings, 1 reply; 5+ messages in thread
From: Nick Clifton @ 2022-08-09 15:33 UTC (permalink / raw)
  To: Štěpán Němec, binutils

Hi Štěpán,

> Any reason you dropped the last hunk?

Stupidity on my part - I missed it.
I have now checked in this last part.

> Was there anything wrong with my patch? It seems you applied (most of)
> the changes by hand

Correct.

> instead of using git(-am) (the latter would have
> also preserved the correct spelling of my name).

This is because I did not know about "git am".

If I have understood correctly, I have to save the entire email to a
file, and then run "git am <file>" to have the patch applied.  But
this automatically commits the patch, even if I do not want to do so.
So then if I decide that the patch is wrong in some way I have to
revert the commit and reset the sources.  But if I like the commit
I can push it straight away.  Right ?

Cheers
   Nick




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

* Re: [PATCH] gas: Fix some typos in the Info manual
  2022-08-09 15:33     ` Nick Clifton
@ 2022-08-09 21:36       ` Štěpán Němec
  0 siblings, 0 replies; 5+ messages in thread
From: Štěpán Němec @ 2022-08-09 21:36 UTC (permalink / raw)
  To: Nick Clifton, binutils

Hello Nick,

On Tue, 09 Aug 2022 16:33:49 +0100
Nick Clifton wrote:

> If I have understood correctly, I have to save the entire email to a
> file, and then run "git am <file>" to have the patch applied.

Yes, that's one way. Many people use some kind of MUA or text editor
integration or scripts, e.g., pipe the message to a command (like
git-am(1)) directly without an explicit saving middle step.

> But this automatically commits the patch, even if I do not want to do
> so. So then if I decide that the patch is wrong in some way I have to
> revert the commit and reset the sources. But if I like the commit I
> can push it straight away. Right ?

If you wish to only apply the patch changes without committing you could
use git-apply(1) instead of git-am(1), though it might be more
convenient to commit the patch first anyway (git am), check or test it
and if you want to change something in-place, you can just make the
changes and use `git commit --amend` to modify that last commit (HEAD)
before pushing.

  Thanks,

  Štěpán

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

end of thread, other threads:[~2022-08-09 21:34 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-08-08 17:38 [PATCH] gas: Fix some typos in the Info manual Štěpán Němec
2022-08-09 14:39 ` Nick Clifton
2022-08-09 15:06   ` Štěpán Němec
2022-08-09 15:33     ` Nick Clifton
2022-08-09 21:36       ` Štěpán Němec

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).