summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElijah Newren <newren@gmail.com>2019-11-05 17:07:29 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-11-10 07:00:55 (GMT)
commitae821ffe8327ebb24b16ba5a42c6d675050319d7 (patch)
tree99cfd1c8b1e6f9c92924cc9fcf552bb361383af7
parent557c5895c2bd55e5bf58e186a769e2565917cc8b (diff)
downloadgit-ae821ffe8327ebb24b16ba5a42c6d675050319d7.zip
git-ae821ffe8327ebb24b16ba5a42c6d675050319d7.tar.gz
git-ae821ffe8327ebb24b16ba5a42c6d675050319d7.tar.bz2
multimail: fix a few simple spelling errors
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> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xcontrib/hooks/multimail/git_multimail.py8
-rwxr-xr-xcontrib/hooks/multimail/post-receive.example2
2 files changed, 5 insertions, 5 deletions
diff --git a/contrib/hooks/multimail/git_multimail.py b/contrib/hooks/multimail/git_multimail.py
index 8823399..f563be8 100755
--- a/contrib/hooks/multimail/git_multimail.py
+++ b/contrib/hooks/multimail/git_multimail.py
@@ -95,7 +95,7 @@ if PYTHON3:
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 @@ class SMTPMailer(Mailer):
# 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 @@ class SMTPMailer(Mailer):
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 @@ class ProjectdescEnvironmentMixin(Environment):
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 b9bb118..0f98c5a 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'))