summaryrefslogtreecommitdiffstats
path: root/template/en
diff options
context:
space:
mode:
Diffstat (limited to 'template/en')
-rw-r--r--template/en/default/admin/params/ldap.html.tmpl4
-rw-r--r--template/en/default/global/code-error.html.tmpl2
2 files changed, 4 insertions, 2 deletions
diff --git a/template/en/default/admin/params/ldap.html.tmpl b/template/en/default/admin/params/ldap.html.tmpl
index a3c7e4643..22375cdf7 100644
--- a/template/en/default/admin/params/ldap.html.tmpl
+++ b/template/en/default/admin/params/ldap.html.tmpl
@@ -30,7 +30,9 @@
"URI syntax can also be used, such as "_
"ldaps://ldap.company.com (for a secure connection) or " _
"ldapi://%2fvar%2flib%2fldap_sock (for a socket-based " _
- "local connection.",
+ "local connection. Multiple hostnames or URIs can be comma " _
+ "separated; each will be tried in turn until a connection is " _
+ "established.",
LDAPstartls => "Whether to require encrypted communication once normal " _
"LDAP connection achieved with the server.",
diff --git a/template/en/default/global/code-error.html.tmpl b/template/en/default/global/code-error.html.tmpl
index 2de8bd6a2..91044064d 100644
--- a/template/en/default/global/code-error.html.tmpl
+++ b/template/en/default/global/code-error.html.tmpl
@@ -279,7 +279,7 @@
The specified LDAP attribute [% attr FILTER html %] was not found.
[% ELSIF error == "ldap_connect_failed" %]
- Could not connect to the LDAP server <code>[% server FILTER html %]</code>.
+ Could not connect to the LDAP server(s) <code>[% server FILTER html %]</code>.
[% ELSIF error == "ldap_start_tls_failed" %]
Could not start TLS with LDAP server: <code>[% error FILTER html %]</code>.