federico/django-mailbox
1
0
Fork 0
forked from mirror/django-mailbox
Code Activity

Merging in upstream changes.

Browse source
This commit is contained in:
Adam Coddington 2013-06-13 10:27:16 -07:00
commit 406989fc9e
2 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
docs/topics/mailbox_types.rst
View file

@ -6,9 +6,9 @@ Django Mailbox supports polling both common internet mailboxes like POP3 and IMA
.. table:: 'Protocol' Options .. table:: 'Protocol' Options
============ ============== =============================================================== ============ ============== ===============================================
Mailbox Type 'Protocol':// Notes Mailbox Type 'Protocol':// Notes
============ ============== =============================================================== ============ ============== ===============================================
POP3 ``pop3://`` Can also specify SSL with ``pop3+ssl://`` POP3 ``pop3://`` Can also specify SSL with ``pop3+ssl://``
IMAP ``imap://`` Can also specify SSL with ``imap+ssl://`` IMAP ``imap://`` Can also specify SSL with ``imap+ssl://``
Maildir ``maildir://`` Maildir ``maildir://``
@ -16,8 +16,8 @@ Django Mailbox supports polling both common internet mailboxes like POP3 and IMA
Babyl ``babyl://`` Babyl ``babyl://``
MH ``mh://`` MH ``mh://``
MMDF ``mmdf://`` MMDF ``mmdf://``
Piped Mail *empty* See `Receiving mail directly from Exim4 or Postfix via a pipe`_ Piped Mail *empty* See :ref:`receiving-mail-from-exim4-or-postfix`
============ ============== =============================================================== ============ ============== ===============================================
.. WARNING:: .. WARNING::
This will delete any messages it can find in the inbox you specify; This will delete any messages it can find in the inbox you specify;

2
docs/topics/polling.rst
View file

@ -29,6 +29,8 @@ You can easily consume incoming mail by running the management command named ``g
python manage.py getmail python manage.py getmail
.. _receiving-mail-from-exim4-or-postfix:
Receiving mail directly from Exim4 or Postfix via a pipe Receiving mail directly from Exim4 or Postfix via a pipe
-------------------------------------------------------- --------------------------------------------------------