diff options
author | Louise Crow <louise.crow@gmail.com> | 2014-08-18 17:00:41 +0100 |
---|---|---|
committer | Louise Crow <louise.crow@gmail.com> | 2014-08-18 17:00:41 +0100 |
commit | 05c2d968c8f7980327b9c1b2eda07f0d181d5460 (patch) | |
tree | e9e7e7d17ef007ee201e8c7a697b2b914595e849 /docs/glossary.md | |
parent | a64dbe172662fe1a9dfc572c1b21635ff086cc62 (diff) | |
parent | e98fb0be4418aaa1335b8a9e6544b3546f239ca0 (diff) |
Merge branch 'gh-pages-postfix' into gh-pages
Diffstat (limited to 'docs/glossary.md')
-rw-r--r-- | docs/glossary.md | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/docs/glossary.md b/docs/glossary.md index dd4076020..989bf4ce6 100644 --- a/docs/glossary.md +++ b/docs/glossary.md @@ -19,6 +19,7 @@ Definitions <li><a href="#agnostic">asker agnostic</a></li> <li><a href="#authority">authority</a></li> <li><a href="#blackhole">black hole</a></li> + <li><a href="#bounce-message">bounce message</a></li> <li><a href="#capistrano">Capistrano</a></li> <li><a href="#censor-rule">censor rule</a></li> <li><a href="#development">development site</a></li> @@ -147,6 +148,24 @@ Definitions </dd> <dt> + <a name="bounce-message">bounce message</a> + </dt> + <dd> + A <strong>bounce message</strong> is an automated electronic mail message from a mail system informing the sender of another message about a delivery problem. + </p> + <div class="more-info"> + <p>More information:</p> + <ul> + <li> + <a href="{{ site.baseurl }}docs/installing/email#how-alaveteli-handles-email">How Alaveteli handles email</a> + </li> + <li>The wikipedia page on <a href="http://en.wikipedia.org/wiki/Bounce_message">bounce messages</a> + </li> + </ul> + </div> + </dd> + + <dt> <a name="capistrano">Capistrano</a> </dt> <dd> |