diff --git a/convert.sh b/convert.sh index 66a60053..05dec430 100644 --- a/convert.sh +++ b/convert.sh @@ -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 diff --git a/faq/2-iredadmin-pro.default.password.policy.md b/faq/2-iredadmin-pro.default.password.policy.md index 60c01d63..8bd4ba0d 100644 --- a/faq/2-iredadmin-pro.default.password.policy.md +++ b/faq/2-iredadmin-pro.default.password.policy.md @@ -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 diff --git a/html/iredadmin-pro.default.password.policy.html b/html/iredadmin-pro.default.password.policy.html index 5681f746..a4ae9e0a 100644 --- a/html/iredadmin-pro.default.password.policy.html +++ b/html/iredadmin-pro.default.password.policy.html @@ -12,9 +12,10 @@ // Document Index

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
 
 # Special characters which can be used in password.