freshlybakedca.ke / git
Git fork
fork atom

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>

authored by

Elijah Newren and committed by
Junio C Hamano ae821ffe 557c5895

+5 -5
unified split
+4 -4
contrib/hooks/multimail/git_multimail.py
··· 95 95 unicode = str 96 96 97 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 99 # try UTF-8. 100 100 try: 101 101 f.buffer.write(msg.encode(sys.getdefaultencoding())) ··· 2129 2129 # equivalent to 2130 2130 # self.smtp.ehlo() 2131 2131 # self.smtp.starttls() 2132 - # with acces to the ssl layer 2132 + # with access to the ssl layer 2133 2133 self.smtp.ehlo() 2134 2134 if not self.smtp.has_extn("starttls"): 2135 2135 raise smtplib.SMTPException("STARTTLS extension not supported by server") ··· 2148 2148 cert_reqs=ssl.CERT_NONE 2149 2149 ) 2150 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 2152 '*** set the option smtpCACerts ***\n' 2153 2153 ) 2154 2154 if not hasattr(self.smtp.sock, "read"): ··· 3189 3189 self.COMPUTED_KEYS += ['projectdesc'] 3190 3190 3191 3191 def get_projectdesc(self): 3192 - """Return a one-line descripition of the project.""" 3192 + """Return a one-line description of the project.""" 3193 3193 3194 3194 git_dir = get_git_dir() 3195 3195 try:
+1 -1
contrib/hooks/multimail/post-receive.example
··· 56 56 57 57 # Set some Git configuration variables. Equivalent to passing var=val 58 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 60 # environment) : 61 61 #git_multimail.Config.add_config_parameters('multimailhook.commitEmailFormat=html') 62 62 #git_multimail.Config.add_config_parameters(('user.name=foo', 'user.email=foo@example.com'))