|
From: Tom H. <why...@us...> - 2011-08-22 21:43:30
|
- Log -----------------------------------------------------------------
commit 97c29bd15a9374d933a63cf596e637a0396fa921
Merge: 7af2900 04a6eae
Author: Tom Hendrikx <to...@wh...>
Date: Mon Aug 22 23:38:17 2011 +0200
Merge branch 'RELENG_3' into RELENG_3_10
-----------------------------------------------------------------------
Summary of changes:
CHANGELOG | 10 ++
README | 66 +++++-----
contrib/Makefile.am | 3 +
.../dspam-retrain-forward.pl | 5 +-
contrib/plugins/thunderbird/install.rdf | 2 +-
doc/postfix.txt | 4 +-
doc/relay.txt | 16 ++--
m4/.gitignore | 7 +
src/dspam.conf.in | 16 ++--
src/tools.pgsql_drv/.gitignore | 2 +
src/tools/dspam_notify.in | 6 +-
txt/firstrun.txt | 10 +-
txt/firstspam.txt | 8 +-
txt/quarantinefull.txt | 8 +-
webui/cgi-bin/admin.cgi | 1 -
webui/cgi-bin/configure.pl.in | 2 +-
webui/cgi-bin/dspam.cgi | 11 +--
webui/cgi-bin/subadmins | 6 +-
webui/cgi-bin/templates/fr/nav_admin_error.html | 4 +-
.../templates/fr/nav_admin_preferences.html | 11 +-
webui/cgi-bin/templates/fr/nav_admin_status.html | 10 +-
webui/cgi-bin/templates/fr/nav_admin_user.html | 4 +-
webui/cgi-bin/templates/fr/nav_alerts.html | 12 +-
webui/cgi-bin/templates/fr/nav_analysis.html | 10 +-
webui/cgi-bin/templates/fr/nav_error.html | 6 +-
webui/cgi-bin/templates/fr/nav_fragment.html | 14 ++-
webui/cgi-bin/templates/fr/nav_history.html | 10 +-
webui/cgi-bin/templates/fr/nav_performance.html | 8 +-
webui/cgi-bin/templates/fr/nav_preferences.html | 11 +-
webui/cgi-bin/templates/fr/nav_quarantine.html | 8 +-
webui/cgi-bin/templates/fr/nav_viewmessage.html | 6 +-
webui/cgi-bin/templates/fr/strings.pl | 124 ++++++++++----------
webui/cgi-bin/templates/nav_admin_error.html | 4 +-
webui/cgi-bin/templates/nav_admin_preferences.html | 4 +-
webui/cgi-bin/templates/nav_admin_status.html | 8 +-
webui/cgi-bin/templates/nav_admin_user.html | 4 +-
webui/cgi-bin/templates/nav_alerts.html | 10 +-
webui/cgi-bin/templates/nav_analysis.html | 10 +-
webui/cgi-bin/templates/nav_error.html | 6 +-
webui/cgi-bin/templates/nav_fragment.html | 10 +-
webui/cgi-bin/templates/nav_history.html | 8 +-
webui/cgi-bin/templates/nav_performance.html | 8 +-
webui/cgi-bin/templates/nav_preferences.html | 8 +-
webui/cgi-bin/templates/nav_quarantine.html | 8 +-
webui/cgi-bin/templates/nav_viewmessage.html | 6 +-
45 files changed, 288 insertions(+), 227 deletions(-)
create mode 100644 m4/.gitignore
create mode 100644 src/tools.pgsql_drv/.gitignore
hooks/post-receive
--
dspam
|
