bug#34756: 26.1.92; Minor typos across manuals

bug#34756: 26.1.92; Minor typos across manuals

[Basil L. Contovounesios]

[-- Attachment #1: Type: text/plain, Size: 29 bytes --]

Severity: minor
Tags: patch


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Fix-some-plural-Message-IDs-typos-in-Gnus-docs.patch --]
[-- Type: text/x-diff, Size: 2746 bytes --]

From fcd0f14e4492ce59c214e54cc4c3d2854be62190 Mon Sep 17 00:00:00 2001
From: "Basil L. Contovounesios" <contovob@tcd.ie>
Date: Tue, 5 Mar 2019 08:01:44 +0000
Subject: [PATCH 1/3] Fix some plural "Message-IDs" typos in Gnus docs

doc/misc/gnus.texi (Article Buttons):
lisp/gnus/gnus-art.el (gnus-button-mid-or-mail-heuristic-alist)
(gnus-button-mid-or-mail-heuristic): Write singular number of
Message-IDs, rather than plural.
lisp/gnus/message.el (message-user-fqdn): Capitalize initialism.
---
 doc/misc/gnus.texi    | 2 +-
 lisp/gnus/gnus-art.el | 4 ++--
 lisp/gnus/message.el  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi
index a0c5732943..4ee80eacb2 100644
--- a/doc/misc/gnus.texi
+++ b/doc/misc/gnus.texi
@@ -9394,7 +9394,7 @@ Article Buttons
 @item gnus-button-mid-or-mail-heuristic
 @findex gnus-button-mid-or-mail-heuristic
 Function that guesses whether its argument is a message ID or a mail
-address.  Returns @code{mid} if it's a message IDs, @code{mail} if
+address.  Returns @code{mid} if it's a message ID, @code{mail} if
 it's a mail address, @code{ask} if unsure and @code{invalid} if the
 string is invalid.
 
diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index 9cd5a1f643..4eb6249490 100644
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -7504,7 +7504,7 @@ gnus-button-mid-or-mail-heuristic-alist
     (2.0   . "^[A-Z][a-z][A-Z][a-z][a-z][^a-z]")) ;; ^[A-Z][a-z]{4,4}
   "An alist of (RATE . REGEXP) pairs for `gnus-button-mid-or-mail-heuristic'.
 
-A negative RATE indicates a message IDs, whereas a positive indicates a mail
+A negative RATE indicates a message ID, whereas a positive indicates a mail
 address.  The REGEXP is processed with `case-fold-search' set to nil."
   :version "22.1"
   :group 'gnus-article-buttons
@@ -7513,7 +7513,7 @@ gnus-button-mid-or-mail-heuristic-alist
 
 (defun gnus-button-mid-or-mail-heuristic (mid-or-mail)
   "Guess whether MID-OR-MAIL is a message ID or a mail address.
-Returns `mid' if MID-OR-MAIL is a message IDs, `mail' if it's a mail
+Returns `mid' if MID-OR-MAIL is a message ID, `mail' if it's a mail
 address, `ask' if unsure and `invalid' if the string is invalid."
   (let ((case-fold-search nil)
 	(list gnus-button-mid-or-mail-heuristic-alist)
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index 0d166fb8ce..d260bdb2a2 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -1741,7 +1741,7 @@ message-wide-reply-confirm-recipients
   :type 'boolean)
 
 (defcustom message-user-fqdn nil
-  "Domain part of Message-Ids."
+  "Domain part of Message-IDs."
   :version "22.1"
   :group 'message-headers
   :link '(custom-manual "(message)News Headers")
-- 
2.20.1


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #3: 0002-Fix-possessive-it-s-its-typos-in-manuals.patch --]
[-- Type: text/x-diff, Size: 4301 bytes --]

From 66fdf582ba22b1197655d43080797bcd42ae92bb Mon Sep 17 00:00:00 2001
From: "Basil L. Contovounesios" <contovob@tcd.ie>
Date: Tue, 5 Mar 2019 07:48:23 +0000
Subject: [PATCH 2/3] Fix possessive "it's" -> "its" typos in manuals

doc/misc/cc-mode.texi (Style Variables, Customizing Indentation):
doc/misc/ede.texi (Extending EDE, ede-project-placeholder)
(ede-target, ede-proj-target, ede-compilation-program, ede-compiler)
(ede-linker): Remove apostrophe from possessive "it's".
---
 doc/misc/cc-mode.texi |  4 ++--
 doc/misc/ede.texi     | 16 ++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/doc/misc/cc-mode.texi b/doc/misc/cc-mode.texi
index 1a77a64e01..47ae83ab39 100644
--- a/doc/misc/cc-mode.texi
+++ b/doc/misc/cc-mode.texi
@@ -2548,7 +2548,7 @@ Style Variables
 @item
 The style variable @code{c-offsets-alist} (@pxref{c-offsets-alist}) is
 an association list with an element for each syntactic symbol.  It's
-handled a little differently from the other style variables.  It's
+handled a little differently from the other style variables.  Its
 default global binding is the empty list @code{nil}, rather than
 @code{set-from-style}.  Before the style system is initialized, you
 can add individual elements to @code{c-offsets-alist} by calling
@@ -5286,7 +5286,7 @@ Customizing Indentation
 @defopt c-basic-offset
 @vindex basic-offset @r{(c-)}
 This style variable holds the basic offset between indentation levels.
-It's factory default is 4, but all the built-in styles set it
+Its factory default is 4, but all the built-in styles set it
 themselves, to some value between 2 (for @code{gnu} style) and 8 (for
 @code{bsd}, @code{linux}, and @code{python} styles).
 @end defopt
diff --git a/doc/misc/ede.texi b/doc/misc/ede.texi
index 513461d0e0..4edb53d953 100644
--- a/doc/misc/ede.texi
+++ b/doc/misc/ede.texi
@@ -1038,7 +1038,7 @@ Extending EDE
 
 If you intend to extend @ede{}, it is most likely that a new target type is
 needed in one of the existing project types.  The rest of this chapter
-will discuss extending the @code{ede-project} class, and it's targets.
+will discuss extending the @code{ede-project} class, and its targets.
 See @file{project-am.el} for basic details on adding targets to it.
 
 For the @code{ede-project} type, the core target class is called
@@ -1477,7 +1477,7 @@ ede-project-placeholder
 @end deffn
 
 @deffn Method ede-project-root :AFTER this
-If a project knows it's root, return it here.
+If a project knows its root, return it here.
 Allows for one-project-object-for-a-tree type systems.
 @end deffn
 
@@ -1486,7 +1486,7 @@ ede-project-placeholder
 @end deffn
 
 @deffn Method ede-project-root-directory :AFTER this &optional file
-If a project knows it's root, return it here.
+If a project knows its root, return it here.
 Allows for one-project-object-for-a-tree type systems.
 Optional @var{FILE} is the file to test.  It is ignored in preference
 of the anchor file for the project.
@@ -2516,7 +2516,7 @@ ede-target
 @end deffn
 
 @deffn Method project-delete-target :AFTER ot
-Delete the current target @var{OT} from it's parent project.
+Delete the current target @var{OT} from its parent project.
 @end deffn
 
 @deffn Method ede-target-sourcecode :AFTER this
@@ -2715,7 +2715,7 @@ ede-proj-target
 @end deffn
 
 @deffn Method project-delete-target :AFTER this
-Delete the current target @var{THIS} from it's parent project.
+Delete the current target @var{THIS} from its parent project.
 @end deffn
 
 @deffn Method ede-proj-makefile-target-name :AFTER this
@@ -4013,7 +4013,7 @@ ede-compilation-program
 
 The commands used to execute this compiler.
 The object which uses this compiler will place these commands after
-it's rule definition.
+its rule definition.
 
 @item :autoconf
 Type: @code{list} @*
@@ -4125,7 +4125,7 @@ ede-compiler
 
 The commands used to execute this compiler.
 The object which uses this compiler will place these commands after
-it's rule definition.
+its rule definition.
 
 @item :objectextention
 Type: @code{string}
@@ -4265,7 +4265,7 @@ ede-linker
 
 The commands used to execute this compiler.
 The object which uses this compiler will place these commands after
-it's rule definition.
+its rule definition.
 
 @item :objectextention
 Type: @code{string}
-- 
2.20.1


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #4: 0003-Fix-an-other-another-typos-in-manuals.patch --]
[-- Type: text/x-diff, Size: 1660 bytes --]

From 289800f11f4dc6ac133a2af13b1d2f691f33b9f3 Mon Sep 17 00:00:00 2001
From: "Basil L. Contovounesios" <contovob@tcd.ie>
Date: Tue, 5 Mar 2019 08:00:37 +0000
Subject: [PATCH 3/3] Fix "an other" -> "another" typos in manuals

doc/lispintro/emacs-lisp-intro.texi (Find a File):
doc/misc/gnus-faq.texi (FAQ 2-2): Write "an other" as a single word.
---
 doc/lispintro/emacs-lisp-intro.texi | 2 +-
 doc/misc/gnus-faq.texi              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/lispintro/emacs-lisp-intro.texi b/doc/lispintro/emacs-lisp-intro.texi
index 3305f5b3ad..c4b19a4e50 100644
--- a/doc/lispintro/emacs-lisp-intro.texi
+++ b/doc/lispintro/emacs-lisp-intro.texi
@@ -14824,7 +14824,7 @@ Find a File
 @code{describe-function} command), the @code{find-file-noselect}
 function reads the named file into a buffer and returns the buffer.
 (Its most recent version includes an optional @var{wildcards} argument,
-too, as well as another to read a file literally and an other you
+too, as well as another to read a file literally and another to
 suppress warning messages.  These optional arguments are irrelevant.)
 
 However, the @code{find-file-noselect} function does not select the
diff --git a/doc/misc/gnus-faq.texi b/doc/misc/gnus-faq.texi
index 55010d4e43..d4be7b1f0c 100644
--- a/doc/misc/gnus-faq.texi
+++ b/doc/misc/gnus-faq.texi
@@ -284,7 +284,7 @@ FAQ 2-2
 @subsubheading Answer
 
 You get the message described in the q/a pair above while
-starting Gnus, right? It's an other symptom for the same
+starting Gnus, right? It's another symptom for the same
 problem, so read the answer above.
 
 @node FAQ 2-3
-- 
2.20.1


[-- Attachment #5: Type: text/plain, Size: 446 bytes --]


Are the three attached patches acceptable for the emacs-26 branch?
If so, should I add this bug number to all or none of them?

Thanks,

-- 
Basil

In GNU Emacs 26.1.92 (build 5, x86_64-pc-linux-gnu, X toolkit, Xaw3d scroll bars)
 of 2019-03-05 built on thunk
Repository revision: 52fd40068e0f8b41bd29eaec1334299eb86d0bff
Windowing system distributor 'The X.Org Foundation', version 11.0.12003000
System Description:	Debian GNU/Linux buster/sid

bug#34756: 26.1.92; Minor typos across manuals

[Eli Zaretskii]

> From: "Basil L. Contovounesios" <contovob@tcd.ie>
> Date: Tue, 05 Mar 2019 08:41:21 +0000
> 
> Are the three attached patches acceptable for the emacs-26 branch?

Documentation changes should always go to the release branch, unless
they document features only available on master.

> If so, should I add this bug number to all or none of them?

It's okay to push all of them under the same bug number, and even in a
single commit.  There's no need to distinguish between changes that
correct typos, they are all "alike" for all practical purposes.

Thanks.

bug#34756: 26.1.92; Minor typos across manuals

[Basil L. Contovounesios]

fixed 34756 26.2
quit

Eli Zaretskii <eliz@gnu.org> writes:

>> From: "Basil L. Contovounesios" <contovob@tcd.ie>
>> Date: Tue, 05 Mar 2019 08:41:21 +0000
>> 
>> Are the three attached patches acceptable for the emacs-26 branch?
>
> Documentation changes should always go to the release branch, unless
> they document features only available on master.
>
>> If so, should I add this bug number to all or none of them?
>
> It's okay to push all of them under the same bug number, and even in a
> single commit.  There's no need to distinguish between changes that
> correct typos, they are all "alike" for all practical purposes.

Thanks for clarifying, I've now pushed to the release branch.  Let me
know if anything is amiss, e.g. if signed commits are frowned upon.

-- 
Basil

bug#34756: 26.1.92; Minor typos across manuals

[Basil L. Contovounesios]

"Basil L. Contovounesios" <contovob@tcd.ie> writes:

> Thanks for clarifying, I've now pushed to the release branch.  Let me
> know if anything is amiss, e.g. if signed commits are frowned upon.

Ugh, I got the Changelog format slightly wrong.  Sorry about that.

-- 
Basil

bug#34756: 26.1.92; Minor typos across manuals

[Eli Zaretskii]

> From: "Basil L. Contovounesios" <contovob@tcd.ie>
> Cc: <34756-done@debbugs.gnu.org>
> Date: Tue, 05 Mar 2019 20:44:12 +0000
> 
> if signed commits are frowned upon.

They are; see CONTRIBUTE.

bug#34756: 26.1.92; Minor typos across manuals

[Eli Zaretskii]

> From: "Basil L. Contovounesios" <contovob@tcd.ie>
> Cc: <34756@debbugs.gnu.org>
> Date: Tue, 05 Mar 2019 20:48:16 +0000
> 
> Ugh, I got the Changelog format slightly wrong.

You did?  Where?

bug#34756: 26.1.92; Minor typos across manuals

[Basil L. Contovounesios]

Eli Zaretskii <eliz@gnu.org> writes:

>> From: "Basil L. Contovounesios" <contovob@tcd.ie>
>> Cc: <34756-done@debbugs.gnu.org>
>> Date: Tue, 05 Mar 2019 20:44:12 +0000
>> 
>> if signed commits are frowned upon.
>
> They are; see CONTRIBUTE.

I checked CONTRIBUTE, but I only saw mention of "Signed-off-by:" lines,
not GPG signing.  Is the latter also unwelcome?  I assumed not, given
the existence of a Project Member GPG Keyring on Savannah.

-- 
Basil

bug#34756: 26.1.92; Minor typos across manuals

[Basil L. Contovounesios]

Eli Zaretskii <eliz@gnu.org> writes:

>> From: "Basil L. Contovounesios" <contovob@tcd.ie>
>> Cc: <34756@debbugs.gnu.org>
>> Date: Tue, 05 Mar 2019 20:48:16 +0000
>> 
>> Ugh, I got the Changelog format slightly wrong.
>
> You did?  Where?

I forgot to denote file names with a leading asterisk:
http://git.savannah.gnu.org/cgit/emacs.git/commit/?id=099ef446c2c1014727cfe98268fe468eb2e8828b

-- 
Basil

bug#34756: 26.1.92; Minor typos across manuals

[Eli Zaretskii]

> From: "Basil L. Contovounesios" <contovob@tcd.ie>
> Cc: <34756@debbugs.gnu.org>
> Date: Wed, 13 Mar 2019 17:31:02 +0000
> 
> Eli Zaretskii <eliz@gnu.org> writes:
> 
> >> From: "Basil L. Contovounesios" <contovob@tcd.ie>
> >> Cc: <34756-done@debbugs.gnu.org>
> >> Date: Tue, 05 Mar 2019 20:44:12 +0000
> >> 
> >> if signed commits are frowned upon.
> >
> > They are; see CONTRIBUTE.
> 
> I checked CONTRIBUTE, but I only saw mention of "Signed-off-by:" lines,
> not GPG signing.

Well, you didn't really explain what you meant by "signed commits".

> Is the latter also unwelcome?  I assumed not, given the existence of
> a Project Member GPG Keyring on Savannah.

I don't think this was ever discussed.  Are there any GPG signed
commits in the repository?

bug#34756: 26.1.92; Minor typos across manuals

[Basil L. Contovounesios]

Eli Zaretskii <eliz@gnu.org> writes:

>> From: "Basil L. Contovounesios" <contovob@tcd.ie>
>> Cc: <34756@debbugs.gnu.org>
>> Date: Wed, 13 Mar 2019 17:31:02 +0000
>> 
>> Eli Zaretskii <eliz@gnu.org> writes:
>> 
>> >> From: "Basil L. Contovounesios" <contovob@tcd.ie>
>> >> Cc: <34756-done@debbugs.gnu.org>
>> >> Date: Tue, 05 Mar 2019 20:44:12 +0000
>> >> 
>> >> if signed commits are frowned upon.
>> >
>> > They are; see CONTRIBUTE.
>> 
>> I checked CONTRIBUTE, but I only saw mention of "Signed-off-by:" lines,
>> not GPG signing.
>
> Well, you didn't really explain what you meant by "signed commits".

True; sorry about that.

>> Is the latter also unwelcome?  I assumed not, given the existence of
>> a Project Member GPG Keyring on Savannah.
>
> I don't think this was ever discussed.  Are there any GPG signed
> commits in the repository?

Yes, predominantly those of Nicolas Petton.  I listed them thusly:
git log --since=2018-01-01 --format='%h %aI %GS' | awk 'NF>2'

-- 
Basil