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

Typo in faq/2-iredadmin-pro.default.password.policy.md.

This commit is contained in:
Zhang Huangbin 2015-07-03 22:43:19 +08:00
parent e97ec8f516
commit 30b7b01143
3 changed files with 8 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
convert.sh
View File

@ -11,10 +11,6 @@ OUTPUT_DIR="${PWD}/html"
# Markdown file used to store index of chapters/articles.
INDEX_MD="${OUTPUT_DIR}/index.md"
# Pack all converted HTML files for downloading
PACK_NAME="iredmail-docs"
PACK_TAR_NAME="iredmail-docs.tar.bz2"
[ -d ${OUTPUT_DIR} ] || mkdir -p ${OUTPUT_DIR}
CONVERTER="${PWD}/tools/markdown2html.py"
@ -141,17 +137,6 @@ ${CMD_CONVERT} ${INDEX_MD} ${OUTPUT_DIR} title="iRedMail Documentations"
# Cleanup
rm -f ${INDEX_MD}
if echo "$@" | grep -q -- '--pack'; then
echo "* Pack all HTML files: ${PACK_TAR_NAME}"
cd ${PWD}
pack_dir="${PACK_NAME}-${TODAY}"
mkdir -p ${pack_dir}
cp -rf html/* ${pack_dir}
tar cjf ${PACK_TAR_NAME} ${pack_dir}
rm -rf ${pack_dir}
fi
# Sync newly generated HTML files to local diretories.
if echo "$@" | grep -q -- '--sync-local'; then
# Copy to local hg repo of http://www.iredmail.org/docs/
@ -159,16 +144,7 @@ if echo "$@" | grep -q -- '--sync-local'; then
rm -rf ../web/docs/*
cp -rf html/* ../web/docs/
if [ -f ${PACK_TAR_NAME} ]; then
cp ${PACK_TAR_NAME} ../web/docs/
fi
# Copy to iredmail.com/docs/
rm -rf /Volumes/STORAGE/Dropbox/Backup/iredmail.com/docs/*
cp -rf html/* /Volumes/STORAGE/Dropbox/Backup/iredmail.com/docs/
if [ -f ${PACK_TAR_NAME} ]; then
cp -f ${PACK_TAR_NAME} /Volumes/STORAGE/Dropbox/Backup/iredmail.com/docs/
fi
rm -f ${PACK_TAR_NAME}
fi

7
faq/2-iredadmin-pro.default.password.policy.md
View File

@ -1,9 +1,10 @@
# iRedAdmin-Pro: Default password restrictions
iRedAdmin-Pro has some default password restrictions, you can find default
settings in file `libs/default_settings.py`. If you want to change them, please
copy the parameters to iRedAdmin-Pro config file `settings.py` then update its
value. Restarting Apache/Nginx web service is required.
settings in file `libs/default_settings.py` under iRedAdmin-Pro directory.
If you want to change them, please copy the parameters to iRedAdmin-Pro config
file `settings.py` then update their values. Restarting Apache or uwsgi (if
you're running Nginx) service is required after modified `settings.py`.
```
# default password restriction setting in file: libs/default_settings.py

7
html/iredadmin-pro.default.password.policy.html
View File

@ -12,9 +12,10 @@
// <a href="./index.html">Document Index</a>
</div><h1 id="iredadmin-pro-default-password-restrictions">iRedAdmin-Pro: Default password restrictions</h1>
<p>iRedAdmin-Pro has some default password restrictions, you can find default
settings in file <code>libs/default_settings.py</code>. If you want to change them, please
copy the parameters to iRedAdmin-Pro config file <code>settings.py</code> then update its
value. Restarting Apache/Nginx web service is required. </p>
settings in file <code>libs/default_settings.py</code> under iRedAdmin-Pro directory.
If you want to change them, please copy the parameters to iRedAdmin-Pro config
file <code>settings.py</code> then update their values. Restarting Apache or uwsgi (if
you're running Nginx) service is required after modified <code>settings.py</code>.</p>
<pre><code># default password restriction setting in file: libs/default_settings.py
# Special characters which can be used in password.