Skip to content

Commit

Permalink
Merge pull request #98 from timgates42/bugfix_typos
Browse files Browse the repository at this point in the history
docs: Fix a few typos
  • Loading branch information
stevepiercy committed Sep 17, 2022
2 parents 19ddee6 + 0f49b15 commit 9d851e8
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ It is compatible with Python 2.7, 3.4, 3.5, 3.6, and 3.7 as well as PyPy.
This package includes:

1. Wrapping the low-level Python ``email`` library with an easy-to-use
API, which includes attachments and mulipart content.
API, which includes attachments and multipart content.

2. Sending emails immediately or add to a ``maildir`` queue.

Expand All @@ -24,7 +24,7 @@ This package includes:
4. Features to help with unit testing.

``pyramid_mailer`` uses the ``repoze.sendmail`` library for managing email
sending and transacton management, and borrows code (with permission) from
sending and transaction management, and borrows code (with permission) from
Zed Shaw's `lamson <https://github.com/zedshaw/lamson>`_ for wrapping email
messages. See the ``LICENSE.txt`` file for more information.

Expand Down
2 changes: 1 addition & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@
# The format is a list of tuples containing the path and title.
# epub_pre_files = []

# HTML files shat should be inserted after the pages created by sphinx.
# HTML files that should be inserted after the pages created by sphinx.
# The format is a list of tuples containing the path and title.
# epub_post_files = []

Expand Down
2 changes: 1 addition & 1 deletion pyramid_mailer/mailer.py
Original file line number Diff line number Diff line change
Expand Up @@ -399,7 +399,7 @@ def send_to_queue(self, message):
def _message_args(self, message):

message.sender = message.sender or self.default_sender
# convert Lamson message to Python email package msessage
# convert Lamson message to Python email package message
msg = message.to_message()
return (message.sender, message.send_to, msg)

Expand Down

0 comments on commit 9d851e8

Please sign in to comment.