git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: "Elijah Newren via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>, Elijah Newren <newren@gmail.com>
Subject: [PATCH v2 10/11] multimail: fix a few simple spelling errors
Date: Tue, 05 Nov 2019 17:07:29 +0000	[thread overview]
Message-ID: <9767da6f8e35efe23b23ff751dde7e7e57b49509.1572973653.git.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.418.v2.git.1572973650.gitgitgadget@gmail.com>

From: Elijah Newren <newren@gmail.com>

Also submitted upstream as:
  https://github.com/git-multimail/git-multimail/pull/208

Reported-by: Jens Schleusener <Jens.Schleusener@fossies.org>
Signed-off-by: Elijah Newren <newren@gmail.com>
---
 contrib/hooks/multimail/git_multimail.py     | 8 ++++----
 contrib/hooks/multimail/post-receive.example | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/contrib/hooks/multimail/git_multimail.py b/contrib/hooks/multimail/git_multimail.py
index 8823399e75..f563be82fc 100755
--- a/contrib/hooks/multimail/git_multimail.py
+++ b/contrib/hooks/multimail/git_multimail.py
@@ -95,7 +95,7 @@ def bytes_to_str(s, errors='strict'):
     unicode = str
 
     def write_str(f, msg):
-        # Try outputing with the default encoding. If it fails,
+        # Try outputting with the default encoding. If it fails,
         # try UTF-8.
         try:
             f.buffer.write(msg.encode(sys.getdefaultencoding()))
@@ -2129,7 +2129,7 @@ def call(klass, server, timeout):
                 # equivalent to
                 #     self.smtp.ehlo()
                 #     self.smtp.starttls()
-                # with acces to the ssl layer
+                # with access to the ssl layer
                 self.smtp.ehlo()
                 if not self.smtp.has_extn("starttls"):
                     raise smtplib.SMTPException("STARTTLS extension not supported by server")
@@ -2148,7 +2148,7 @@ def call(klass, server, timeout):
                         cert_reqs=ssl.CERT_NONE
                         )
                     self.environment.get_logger().error(
-                        '*** Warning, the server certificat is not verified (smtp) ***\n'
+                        '*** Warning, the server certificate is not verified (smtp) ***\n'
                         '***          set the option smtpCACerts                   ***\n'
                         )
                 if not hasattr(self.smtp.sock, "read"):
@@ -3189,7 +3189,7 @@ def __init__(self, **kw):
         self.COMPUTED_KEYS += ['projectdesc']
 
     def get_projectdesc(self):
-        """Return a one-line descripition of the project."""
+        """Return a one-line description of the project."""
 
         git_dir = get_git_dir()
         try:
diff --git a/contrib/hooks/multimail/post-receive.example b/contrib/hooks/multimail/post-receive.example
index b9bb11834e..0f98c5a23d 100755
--- a/contrib/hooks/multimail/post-receive.example
+++ b/contrib/hooks/multimail/post-receive.example
@@ -56,7 +56,7 @@ config = git_multimail.Config('multimailhook')
 
 # Set some Git configuration variables. Equivalent to passing var=val
 # to "git -c var=val" each time git is called, or to adding the
-# configuration in .git/config (must come before instanciating the
+# configuration in .git/config (must come before instantiating the
 # environment) :
 #git_multimail.Config.add_config_parameters('multimailhook.commitEmailFormat=html')
 #git_multimail.Config.add_config_parameters(('user.name=foo', 'user.email=foo@example.com'))
-- 
gitgitgadget


  parent reply	other threads:[~2019-11-05 17:07 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-10-23  0:29 [PATCH 0/1] Thyme two ficks sum Documentaton tyops and speling erors! Elijah Newren via GitGitGadget
2019-10-23  0:29 ` [PATCH 1/1] Documentation: fix a bunch of typos, both old and new Elijah Newren via GitGitGadget
2019-11-05 17:07 ` [PATCH v2 00/11] Thyme two ficks sum Documentaton tyops and speling erors! Elijah Newren via GitGitGadget
2019-11-05 17:07   ` [PATCH v2 01/11] Documentation: fix a bunch of typos, both old and new Elijah Newren via GitGitGadget
2019-11-05 17:07   ` [PATCH v2 02/11] Fix spelling errors in documentation outside of Documentation/ Elijah Newren via GitGitGadget
2019-11-05 17:07   ` [PATCH v2 03/11] Prefer 'up-to-date' spelling Elijah Newren via GitGitGadget
2019-11-07  5:11     ` Junio C Hamano
2019-11-07  5:16     ` Junio C Hamano
2019-11-07 17:01       ` Elijah Newren
2019-11-05 17:07   ` [PATCH v2 04/11] Fix spelling errors in code comments Elijah Newren via GitGitGadget
2019-11-05 17:07   ` [PATCH v2 05/11] Fix spelling errors in comments of testcases Elijah Newren via GitGitGadget
2019-11-05 17:07   ` [PATCH v2 06/11] Fix spelling errors in names of tests Elijah Newren via GitGitGadget
2019-11-05 17:07   ` [PATCH v2 07/11] Fix spelling errors in messages shown to users Elijah Newren via GitGitGadget
2019-11-05 17:07   ` [PATCH v2 08/11] Fix spelling errors in test commands Elijah Newren via GitGitGadget
2019-11-05 17:07   ` [PATCH v2 09/11] sha1dc: fix trivial comment spelling error Elijah Newren via GitGitGadget
2019-11-05 17:07   ` Elijah Newren via GitGitGadget [this message]
2019-11-05 17:07   ` [PATCH v2 11/11] Fix spelling errors in no-longer-updated-from-upstream modules Elijah Newren via GitGitGadget

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=9767da6f8e35efe23b23ff751dde7e7e57b49509.1572973653.git.gitgitgadget@gmail.com \
    --to=gitgitgadget@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=newren@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

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).