Adding additional help texts for config properties

1 files changed, 29 insertions, 21 deletions

diff --git a/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties b/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
index b5784b64b..e8013c5b3 100644
--- a/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
+++ b/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
@@ -614,40 +614,40 @@ archiva.redback.usermanager.ldap=LDAP User Manager
 archiva.redback.usermanager.jdo=Database User Manager
 archiva.redback.usermanager.jpa=Database JPA User Manager
 redback.runtime.properties.help.title=Property Description
-security.policy.password.rule.alphacount.enabled.help.content=Minimum of letter characters in the password.
-security.policy.password.rule.reuse.enabled.help.content=Prevent reuse of previous passwords.
+security.policy.password.rule.alphacount.enabled.help.content=If true, minimum number of letter characters in new passwords will be checked.
+security.policy.password.rule.reuse.enabled.help.content=If true, reuse of passwords will be checked.
 email.validation.subject.help.content=Subject of the validation email.
-security.policy.password.previous.count.help.content=Number of previous password verified when verifying not reused.
+security.policy.password.previous.count.help.content=This is the number of previous passwords a new password is matched against. The password is rejected if one of the previous passwords matches.
 security.policy.password.expiration.days.help.content=Number of days before password expiration.
 email.validation.timeout.help.content=Timeout (in minutes) for the key generated for an email validation to remain valid.
-security.policy.password.rule.alphanumeric.enabled.help.content=Minimum number of characters in the password rule enabled.
-security.policy.password.rule.alphacount.minimum.help.content=Minimum number of characters in the password.
-ldap.config.max.result.count.help.content=Maximum of result when searching users in LDAP.
-security.policy.password.rule.numericalcount.enabled.help.content=Minimum of number characters in the password.
-security.policy.allowed.login.attempt.help.content=Maximum number of login attempt before loking account.
+security.policy.password.rule.alphanumeric.enabled.help.content=If true, only alphanumeric values in new passwords are allowed.
+security.policy.password.rule.alphacount.minimum.help.content=Minimum number of letter characters in the password.
+ldap.config.max.result.count.help.content=Maximum number of results when searching users in LDAP (0 means no limit). 
+security.policy.password.rule.numericalcount.enabled.help.content=If true, new passwords must contain a minimum number of numerical characters.
+security.policy.allowed.login.attempt.help.content=Maximum number of unsuccessful login attempts before locking account.
 security.rememberme.enabled.help.content=Enable rememberme on login.
 security.rememberme.timeout.help.content=Timeout in days for rememberme cookie.
 security.rememberme.path.help.content=Path for rememberme cookie.
-security.rememberme.secure.help.content=rememberme cookie secured.
-security.rememberme.domain.help.content=rememberme cookie domain.
-security.policy.unlockable.accounts.help.content=Non lockable accounts.
+security.rememberme.secure.help.content=If true, the rememberme cookie is set as secure.
+security.rememberme.domain.help.content=Name of the rememberme cookie domain.
+security.policy.unlockable.accounts.help.content=Comma separated list of User-IDs, that cannot be locked.
 ldap.config.groups.class.help.content=The name of the objectClass in the ldap server used to identify groups. The default is groupOfUniqueNames.
 ldap.config.groups.member.help.content=The name of the attribute on a group that contains the user DN of group members. The default is uniqueMember.
-ldap.config.mapper.attribute.fullname.help.content=The name of the attribute on a user that contains the users fullName.
-security.policy.password.rule.characterlength.enabled.help.content=Character length password rule enabled.
-security.policy.password.rule.musthave.enabled.help.content=Password mandatory rule enabled.
+ldap.config.mapper.attribute.fullname.help.content=The name of the attribute on a user that contains the users full name.
+security.policy.password.rule.characterlength.enabled.help.content=If true, minimum and maximum number of characters in new passwords are checked.
+security.policy.password.rule.musthave.enabled.help.content=If true, each user must have a password.
 security.policy.password.rule.numericalcount.minimum.help.content=Minimum number of numerical characters in the password.
-redback.default.admin.help.content=Id of the administrator user.
+redback.default.admin.help.content=User-Id of the primary administrator.
 security.policy.password.rule.characterlength.minimum.help.content=Minimum size of the password.
-ldap.config.mapper.attribute.user.object.class.help.content=the objectClass used in the ldap server for indentifying users, most commonly inetOrgPerson.
+ldap.config.mapper.attribute.user.object.class.help.content=The objectClass used in the ldap server for identifying users, most commonly inetOrgPerson.
 ldap.config.mapper.attribute.password.help.content=The name of the attribute containing the users password, used for the authentiction using the user manager and not the ldap bind authenticator.
-security.policy.password.rule.nowhitespace.enabled.help.content=Enabled no whitespace in password rule.
-security.policy.password.expiration.enabled.help.content=Enable password expiration.
-ldap.config.mapper.attribute.user.id.help.content=The name of the attribute containing the users userId, most commonly cn or sn.
+security.policy.password.rule.nowhitespace.enabled.help.content=If true, no whitespace is allowed in passwords.
+security.policy.password.expiration.enabled.help.content=If true, password expiration is enabled.
+ldap.config.mapper.attribute.user.id.help.content=The name of the attribute containing the users User-ID, most commonly cn or sn.
 security.policy.password.rule.characterlength.maximum.help.content=Maximum size of the password.
-security.signon.timeout.help.content=not used.
+security.signon.timeout.help.content=Not used.
 ldap.config.mapper.attribute.email.help.content=The name of the attribute on a user that contains the email address.
-email.validation.required.help.content=If all email addresses (from new user registration) require an account validation email.
+email.validation.required.help.content=If true, all email addresses (from new user registration) require an account validation email.
 redback.runtime.properties.title=Properties
 redback.runtime.ldap.port.label=port
 redback.runtime.ldap.host.label=host
@@ -671,6 +671,14 @@ redback.runtime.ldap.checkServer=Verify LDAP configuration on server side.
 redback.runtime.useUsersCache.label=Use a cache for users.
 redback.runtime.users.cache.title=Users Cache
 
+ldap.config.dn.help.content=The name of the attribute containing the DN
+ldap.config.user.attribute.help.content=The name of the RDN attribute in the DN of the user object containing the User-ID (e.g. for cn=usr1,ou=users,ou=tst,ou=org, the value would be cn)
+redback.default.role.guest.id.help.content=The User-ID of the guest user
+rest.baseUrl.help.content=URL that is used as base url for validating REST requests. If empty, the URL ist determined automatically.
+rest.csrffilter.absentorigin.deny.help.content=If true and no Origin/Referer header can be found on REST requests, the requests will be denied. Default: true.
+rest.csrffilter.disableTokenValidation.help.content=If true, token based origin validation of REST requests will be omitted. Default: false. 
+rest.csrffilter.enabled.help.content=If true, validation of REST requests will be validated based on header values, otherwise no validation is done at all. Default: true.
+
 archiva.redback.rbacmanager.ldap=LDAP RBac Manager
 archiva.redback.rbacmanager.jdo=Database RBac Manager
 archiva.redback.rbackmanager.jpa=Database JPA RBac Manager