Merge pull request #1 from wekan/master

Update master

2 files changed, 9 insertions, 11 deletions

diff --git a/snap-src/bin/config b/snap-src/bin/config
index aba15f63..21e2608d 100755
--- a/snap-src/bin/config
+++ b/snap-src/bin/config
@@ -104,11 +104,11 @@ DESCRIPTION_IMAGE_COMPRESS_RATIO="Image compress ratio: Allow to shrink attached
 DEFAULT_IMAGE_COMPRESS_RATIO=""
 KEY_IMAGE_COMPRESS_RATIO="image-compress-ratio"
 
-DESCRIPTION_BIGEVENTS_PATTERN="Big events pattern: Notify always due etc regardless of notification settings. Default: due, All: received|start|due|end, Disabled: NONE"
-DEFAULT_BIGEVENTS_PATTERN=""
+DESCRIPTION_BIGEVENTS_PATTERN="Big events pattern: Notify always due etc regardless of notification settings. Default: NONE, All: received|start|due|end, Disabled: NONE"
+DEFAULT_BIGEVENTS_PATTERN="NONE"
 KEY_BIGEVENTS_PATTERN="bigevents-pattern"
 
-DESCRIPTION_NOTIFY_DUE_DAYS_BEFORE_AND_AFTER="Notify due days, default 2 days before and after. 0 = due notifications disabled. Default: 2"
+DESCRIPTION_NOTIFY_DUE_DAYS_BEFORE_AND_AFTER="Notify due days, accepts ',' delimited string, i.e. 2,0 means notify will be sent out 2 days before and right on due day. Default: empty"
 DEFAULT_NOTIFY_DUE_DAYS_BEFORE_AND_AFTER=""
 KEY_NOTIFY_DUE_DAYS_BEFORE_AND_AFTER="notify-due-days-before-and-after"
 
diff --git a/snap-src/bin/wekan-help b/snap-src/bin/wekan-help
index f1e8ce28..6df3a1b4 100755
--- a/snap-src/bin/wekan-help
+++ b/snap-src/bin/wekan-help
@@ -104,13 +104,10 @@ echo -e "\t$ snap set $SNAP_NAME bigevents-pattern='NONE'"
 echo -e "\n"
 echo -e "EMAIL DUE DATE NOTIFICATION https://github.com/wekan/wekan/pull/2536"
 echo -e "System timelines will be showing any user modification for dueat startat endat receivedat, also notification to the watchers and if any card is due, about due or past due."
-echo -e "Notify due days, default 2 days before and after. 0 = due notifications disabled. Default: 2"
-echo -e "To enable different Notify Due Days Before And After than default 2:"
-echo -e "\t$ snap set $SNAP_NAME notify-due-days-before-and-after='4'"
+echo -e "Notify due days, number less than 15 or negative number accepted, you can specify multiple days delimited by ','. Default: NONE"
+echo -e "To enable different Notify for Due Days on 2 days before, and on the event day "
+echo -e "\t$ snap set $SNAP_NAME notify-due-days-before-and-after='2,0'"
 echo -e "\t-Disable Notifying for Due Days:"
-echo -e "\t$ snap set $SNAP_NAME notify-due-days-before-and-after='0'"
-echo -e "\n"
-echo -e "\t-To set back to default 2:"
 echo -e "\t$ snap set $SNAP_NAME notify-due-days-before-and-after=''"
 echo -e "\n"
 echo -e "Notify due at hour of day. Default every morning at 8am. Can be 0-23."
@@ -281,8 +278,9 @@ echo -e "If the LDAP needs a user account to search:"
 echo -e "\t$ snap set $SNAP_NAME ldap-authentication='true'"
 echo -e "\n"
 echo -e "Ldap Authentication User Dn."
-echo -e "The search user Dn:"
-echo -e "\t$ snap set $SNAP_NAME ldap-authentication-userdn='cn=admin,dc=example,dc=org'"
+echo -e "The search user Dn, 2 examples:"
+echo -e "\t$ snap set $SNAP_NAME ldap-authentication-userdn='CN=ldap admin,CN=users,DC=domainmatter,DC=lan'"
+echo -e "\t$ snap set $SNAP_NAME ldap-authentication-userdn='CN=wekan_adm,OU=serviceaccounts,OU=admin,OU=prod,DC=mydomain,DC=com'"
 echo -e "\n"
 echo -e "Ldap Authentication Password."
 echo -e "The password for the search user:"