Skip to content

Commit ae821ff

Browse files
newrengitster
authored andcommitted
multimail: fix a few simple spelling errors
Also submitted upstream as: git-multimail/git-multimail#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>
1 parent 557c589 commit ae821ff

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

contrib/hooks/multimail/git_multimail.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ def bytes_to_str(s, errors='strict'):
9595
unicode = str
9696

9797
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,
9999
# try UTF-8.
100100
try:
101101
f.buffer.write(msg.encode(sys.getdefaultencoding()))
@@ -2129,7 +2129,7 @@ def call(klass, server, timeout):
21292129
# equivalent to
21302130
# self.smtp.ehlo()
21312131
# self.smtp.starttls()
2132-
# with acces to the ssl layer
2132+
# with access to the ssl layer
21332133
self.smtp.ehlo()
21342134
if not self.smtp.has_extn("starttls"):
21352135
raise smtplib.SMTPException("STARTTLS extension not supported by server")
@@ -2148,7 +2148,7 @@ def call(klass, server, timeout):
21482148
cert_reqs=ssl.CERT_NONE
21492149
)
21502150
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'
21522152
'*** set the option smtpCACerts ***\n'
21532153
)
21542154
if not hasattr(self.smtp.sock, "read"):
@@ -3189,7 +3189,7 @@ def __init__(self, **kw):
31893189
self.COMPUTED_KEYS += ['projectdesc']
31903190

31913191
def get_projectdesc(self):
3192-
"""Return a one-line descripition of the project."""
3192+
"""Return a one-line description of the project."""
31933193

31943194
git_dir = get_git_dir()
31953195
try:

contrib/hooks/multimail/post-receive.example

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ config = git_multimail.Config('multimailhook')
5656

5757
# Set some Git configuration variables. Equivalent to passing var=val
5858
# 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
6060
# environment) :
6161
#git_multimail.Config.add_config_parameters('multimailhook.commitEmailFormat=html')
6262
#git_multimail.Config.add_config_parameters(('user.name=foo', 'user.email=foo@example.com'))

0 commit comments

Comments
 (0)