elmau
/
iredmail-doc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Support markdown extension 'admonition'.

This commit is contained in:
Zhang Huangbin 2016-02-29 20:43:32 +08:00
parent d2a6d58acb
commit c0d738b8c2
6 changed files with 87 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
en_US/howto/per-account.transport.md
View File

@ -1,5 +1,12 @@
# Per-domain or per-user transport (relay)
[TOC]
Transport mentioned in this tutorial is used to deliver received email to
local mailbox.
## Manage relay manually
With OpenLDAP backend, per-domain transport is set in domain account with
attribute `mtaTransport`, per-user transport is set in user account with
the same attribute. For example:
@ -26,9 +33,10 @@ Per-user transport is set in table `vmail.mailbox`, column `transport`.
Per-user transport has higher priority. If no per-user transport is set
for your mail user, per-domain transport will be used.
If you have our advanced web admin panel iRedAdmin-Pro installed, you can
easily manage per-domain or per-user transport in account profile page.
Screenshots:
## Manage relay with iRedAdmin-Pro
With iRedAdmin-Pro, you can easily manage per-domain or per-user transport in
account profile page. Screenshots attached.
* Per-domain transport/relay:

6
en_US/upgrade/1-iredmail.releases.md
View File

@ -30,10 +30,10 @@
> We provide remote upgrade support, check [the price](../support.html) and [contact us](../contact.html).
* [0.9.4](http://www.iredmail.org/forum/topic10512.html), Jan 25, 2016. [Upgrade from iRedMail-0.9.3](./upgrade.iredmail.0.9.3-0.9.4.html)
* [0.9.3](http://www.iredmail.org/forum/topic10261.html), Dec 14, 2015. [Upgrade from iRedMail-0.9.2](./upgrade.iredmail.0.9.2-0.9.3.html)
* [0.9.3](http://www.iredmail.org/forum/topic10261.html), Dec 14, 2015. [Upgrade from iRedMail-0.9.2](./upgrade.iredmail.0.9.2-0.9.3.html) (contains SQL/LDAP structure changes)
* [0.9.2](http://www.iredmail.org/forum/topic9280.html), Jun 3, 2015. [Upgrade from iRedMail-0.9.1](./upgrade.iredmail.0.9.1-0.9.2.html)
* [0.9.1](http://www.iredmail.org/forum/topic9144.html), May 15, 2015. [Upgrade from iRedMail-0.9.0](./upgrade.iredmail.0.9.0-0.9.1.html)
* [0.9.0](http://www.iredmail.org/forum/topic8443.html), Dec 31, 2014. [Upgrade from iRedMail-0.8.7](./upgrade.iredmail.0.8.7-0.9.0.html)
* [0.9.1](http://www.iredmail.org/forum/topic9144.html), May 15, 2015. [Upgrade from iRedMail-0.9.0](./upgrade.iredmail.0.9.0-0.9.1.html) (contains SQL/LDAP structure changes)
* [0.9.0](http://www.iredmail.org/forum/topic8443.html), Dec 31, 2014. [Upgrade from iRedMail-0.8.7](./upgrade.iredmail.0.8.7-0.9.0.html) (contains SQL/LDAP structure changes)
* [0.8.7](http://www.iredmail.org/forum/topic6872-news-announcements-bug-fixes-iredmail087-has-been-released.html), May 13, 2014. [Upgrade from iRedMail-0.8.6](./upgrade.iredmail.0.8.6-0.8.7.html)
* [0.8.6](http://www.iredmail.org/forum/topic5831-iredmail086-has-been-released.html), Dec 16, 2013. [Upgrade from iRedMail-0.8.5](./upgrade.iredmail.0.8.5-0.8.6.html)
* [0.8.5](http://www.iredmail.org/forum/topic5167-news-announcements-bug-fixes-iredmail085-has-been-released.html), Jul 16, 2013. [Upgrade from iRedMail-0.8.4](./upgrade.iredmail.0.8.4-0.8.5.html)

54
html/css/markdown.css
View File

@ -312,3 +312,57 @@ code.bash { background-color: green; color: white; }
pre { margin-left: 30px; }
p, ul, ol { font-size: 17px; }
li { line-height: 26px; }
/*
.note {
background: #e7f2fa;
padding: 12px;
line-height: 24px;
margin-bottom: 24px;
}
.note .admonition-title {
background: #6ab0de;
}
.note p:last-child {
margin-bottom: 0;
}
*/
.note, .attention, .caution, .danger, .error, .hint, .important, .tip, .warning, .seealso, .admonition-todo {
padding: 12px;
line-height: 24px;
margin-bottom: 24px;
background: #e7f2fa;
/*
background: #fdf3f2;
*/
}
.admonition-title {
font-weight: bold;
display: block;
color: #fff;
/*
background: #6ab0de;
*/
margin: -12px;
padding: 6px 12px;
margin-bottom: 12px
}
/*
.caution .admonition-title,
.danger .admonition-title,
.error .admonition-title,
.hint .admonition-title,
.important .admonition-title,
.tip .admonition-title,
.seealso .admonition-title,
.admonition-todo .admonition-title {
color: #404040;
}
*/
.note .admonition-title { background: #6ab0de; }
.warning .admonition-title { background: #e7f2fa; }
.attention .admonition-title { background: #fff; }

6
html/iredmail.releases.html
View File

@ -52,10 +52,10 @@
</blockquote>
<ul>
<li><a href="http://www.iredmail.org/forum/topic10512.html">0.9.4</a>, Jan 25, 2016. <a href="./upgrade.iredmail.0.9.3-0.9.4.html">Upgrade from iRedMail-0.9.3</a></li>
<li><a href="http://www.iredmail.org/forum/topic10261.html">0.9.3</a>, Dec 14, 2015. <a href="./upgrade.iredmail.0.9.2-0.9.3.html">Upgrade from iRedMail-0.9.2</a></li>
<li><a href="http://www.iredmail.org/forum/topic10261.html">0.9.3</a>, Dec 14, 2015. <a href="./upgrade.iredmail.0.9.2-0.9.3.html">Upgrade from iRedMail-0.9.2</a> (contains SQL/LDAP structure changes)</li>
<li><a href="http://www.iredmail.org/forum/topic9280.html">0.9.2</a>, Jun 3, 2015. <a href="./upgrade.iredmail.0.9.1-0.9.2.html">Upgrade from iRedMail-0.9.1</a></li>
<li><a href="http://www.iredmail.org/forum/topic9144.html">0.9.1</a>, May 15, 2015. <a href="./upgrade.iredmail.0.9.0-0.9.1.html">Upgrade from iRedMail-0.9.0</a></li>
<li><a href="http://www.iredmail.org/forum/topic8443.html">0.9.0</a>, Dec 31, 2014. <a href="./upgrade.iredmail.0.8.7-0.9.0.html">Upgrade from iRedMail-0.8.7</a></li>
<li><a href="http://www.iredmail.org/forum/topic9144.html">0.9.1</a>, May 15, 2015. <a href="./upgrade.iredmail.0.9.0-0.9.1.html">Upgrade from iRedMail-0.9.0</a> (contains SQL/LDAP structure changes)</li>
<li><a href="http://www.iredmail.org/forum/topic8443.html">0.9.0</a>, Dec 31, 2014. <a href="./upgrade.iredmail.0.8.7-0.9.0.html">Upgrade from iRedMail-0.8.7</a> (contains SQL/LDAP structure changes)</li>
<li><a href="http://www.iredmail.org/forum/topic6872-news-announcements-bug-fixes-iredmail087-has-been-released.html">0.8.7</a>, May 13, 2014. <a href="./upgrade.iredmail.0.8.6-0.8.7.html">Upgrade from iRedMail-0.8.6</a></li>
<li><a href="http://www.iredmail.org/forum/topic5831-iredmail086-has-been-released.html">0.8.6</a>, Dec 16, 2013. <a href="./upgrade.iredmail.0.8.5-0.8.6.html">Upgrade from iRedMail-0.8.5</a></li>
<li><a href="http://www.iredmail.org/forum/topic5167-news-announcements-bug-fixes-iredmail085-has-been-released.html">0.8.5</a>, Jul 16, 2013. <a href="./upgrade.iredmail.0.8.4-0.8.5.html">Upgrade from iRedMail-0.8.4</a></li>

18
html/per-account.transport.html
View File

@ -9,6 +9,18 @@
<div id="navigation">
<a href="http://www.iredmail.org" target="_blank"><img alt="iRedMail web site" src="images/logo-iredmail.png" style="vertical-align: middle; height: 30px;"/> <span>iRedMail</span></a>
&nbsp;&nbsp;//&nbsp;&nbsp;<a href="./index.html">Document Index</a></div><h1 id="per-domain-or-per-user-transport-relay">Per-domain or per-user transport (relay)</h1>
<div class="toc">
<ul>
<li><a href="#per-domain-or-per-user-transport-relay">Per-domain or per-user transport (relay)</a><ul>
<li><a href="#manage-relay-manually">Manage relay manually</a></li>
<li><a href="#manage-relay-with-iredadmin-pro">Manage relay with iRedAdmin-Pro</a></li>
</ul>
</li>
</ul>
</div>
<p>Transport mentioned in this tutorial is used to deliver received email to
local mailbox.</p>
<h2 id="manage-relay-manually">Manage relay manually</h2>
<p>With OpenLDAP backend, per-domain transport is set in domain account with
attribute <code>mtaTransport</code>, per-user transport is set in user account with
the same attribute. For example:</p>
@ -29,9 +41,9 @@ sql&gt; UPDATE domain SET transport='[new_transport_here]' WHERE domain='my_doma
<p>Per-user transport is set in table <code>vmail.mailbox</code>, column <code>transport</code>.</p>
<p>Per-user transport has higher priority. If no per-user transport is set
for your mail user, per-domain transport will be used.</p>
<p>If you have our advanced web admin panel iRedAdmin-Pro installed, you can
easily manage per-domain or per-user transport in account profile page.
Screenshots:</p>
<h2 id="manage-relay-with-iredadmin-pro">Manage relay with iRedAdmin-Pro</h2>
<p>With iRedAdmin-Pro, you can easily manage per-domain or per-user transport in
account profile page. Screenshots attached.</p>
<ul>
<li>Per-domain transport/relay:</li>
</ul>

2
tools/markdown2html.py
View File

@ -12,7 +12,7 @@ import web
import markdown
# Markdown extensions
MD_EXTENSIONS = ['toc', 'meta', 'extra', 'footnotes']
MD_EXTENSIONS = ['toc', 'meta', 'extra', 'footnotes', 'admonition']
# Get file name
filename = sys.argv[1]