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>
Elijah Newren committed
Nov 5, 2019 at 17:07 UTC
ae821ffe8327ebb24b16ba5a42c6d675050319d7
2 files changed
+5
-5
contrib/hooks/multimail/git_multimail.py
+4
-4
@@ -95,7 +95,7 @@ if PYTHON3:
95
unicode = str
96
97
def write_str(f, msg):
98
- # Try outputing with the default encoding. If it fails,
98
+ # Try outputting with the default encoding. If it fails,
99
# try UTF-8.
100
try:
101
f.buffer.write(msg.encode(sys.getdefaultencoding()))
@@ -2129,7 +2129,7 @@ class SMTPMailer(Mailer):
2129
# equivalent to
2130
# self.smtp.ehlo()
2131
# self.smtp.starttls()
2132
- # with acces to the ssl layer
2132
+ # with access to the ssl layer
2133
self.smtp.ehlo()
2134
if not self.smtp.has_extn("starttls"):
2135
raise smtplib.SMTPException("STARTTLS extension not supported by server")
@@ -2148,7 +2148,7 @@ class SMTPMailer(Mailer):
2148
cert_reqs=ssl.CERT_NONE
2149
)
2150
self.environment.get_logger().error(
2151
- '*** Warning, the server certificat is not verified (smtp) ***\n'
2151
+ '*** Warning, the server certificate is not verified (smtp) ***\n'
2152
'*** set the option smtpCACerts ***\n'
2153
)
2154
if not hasattr(self.smtp.sock, "read"):
@@ -3189,7 +3189,7 @@ class ProjectdescEnvironmentMixin(Environment):
3189
self.COMPUTED_KEYS += ['projectdesc']
3190
3191
def get_projectdesc(self):
3192
- """Return a one-line descripition of the project."""
3192
+ """Return a one-line description of the project."""
3193
3194
git_dir = get_git_dir()
3195
try:
contrib/hooks/multimail/post-receive.example
+1
-1
@@ -56,7 +56,7 @@ config = git_multimail.Config('multimailhook')
56
57
# Set some Git configuration variables. Equivalent to passing var=val
58
# to "git -c var=val" each time git is called, or to adding the
59
-# configuration in .git/config (must come before instanciating the
59
+# configuration in .git/config (must come before instantiating the
60
# environment) :
61
#git_multimail.Config.add_config_parameters('multimailhook.commitEmailFormat=html')
62
#git_multimail.Config.add_config_parameters(('user.name=foo', 'user.email=foo@example.com'))