Martin Peřina has uploaded a new change for review. Change subject: tools: Doc fixes of provider type in engine-manage-domains ......................................................................
tools: Doc fixes of provider type in engine-manage-domains Fixes provider type description in man page and help for engine-manage-domains. Change-Id: I013547823809e1cec8025f3bcbcfa7577939b76f Bug-Url: https://bugzilla.redhat.com/1056999 Signed-off-by: Martin Perina <[email protected]> --- M backend/manager/tools/src/main/java/org/ovirt/engine/core/domains/ManageDomainsArguments.java M backend/manager/tools/src/main/resources/manage-domains-help.properties M packaging/man/man8/engine-manage-domains.8 3 files changed, 13 insertions(+), 13 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/54/24354/1 diff --git a/backend/manager/tools/src/main/java/org/ovirt/engine/core/domains/ManageDomainsArguments.java b/backend/manager/tools/src/main/java/org/ovirt/engine/core/domains/ManageDomainsArguments.java index 7916c1d..d0c9d8c 100644 --- a/backend/manager/tools/src/main/java/org/ovirt/engine/core/domains/ManageDomainsArguments.java +++ b/backend/manager/tools/src/main/java/org/ovirt/engine/core/domains/ManageDomainsArguments.java @@ -329,7 +329,7 @@ LdapProviderType.valueOfIgnoreCase(get(ARG_PROVIDER)); } catch (IllegalArgumentException | NullPointerException ex) { throw new ManageDomainsResult(ManageDomainsResultEnum.INVALID_ARGUMENT_VALUE, - String.format("Invalid provider, valid providers are %s", + String.format("Invalid provider, valid providers are: '%s'.", StringUtils.join( new String[] { PROV_AD, PROV_IPA, PROV_RHDS, PROV_ITDS, PROV_OLDAP }, ", "))); diff --git a/backend/manager/tools/src/main/resources/manage-domains-help.properties b/backend/manager/tools/src/main/resources/manage-domains-help.properties index 17f94cf..965e27b 100644 --- a/backend/manager/tools/src/main/resources/manage-domains-help.properties +++ b/backend/manager/tools/src/main/resources/manage-domains-help.properties @@ -47,12 +47,12 @@ \n\tA comma delimited list of LDAP servers to be set to the domain.\ \n\ \n--provider=PROVIDER\ -\n\tThe LDAP provider type of server used for the domain, can be one of:\ -\n\t\tAD Microsoft Active Directory\ -\n\t\tIPA freeIPA\ -\n\t\tRHDS Red Hat Directory Server\ -\n\t\tITDS IBM Tivoli Directory Server\ -\n\t\tOLDAP OpenLDAP\ +\n\tThe LDAP provider type of server used for the domain, can be one of (case insensitive):\ +\n\t\tad Microsoft Active Directory\ +\n\t\tipa freeIPA\ +\n\t\trhds Red Hat Directory Server\ +\n\t\titds IBM Tivoli Directory Server\ +\n\t\toldap OpenLDAP\ \n\ \n--report\ \n\tReport all validation error, if occured (default behaviour is to exit when a validation error occurs).\ diff --git a/packaging/man/man8/engine-manage-domains.8 b/packaging/man/man8/engine-manage-domains.8 index 535c25f..7e5dce6 100644 --- a/packaging/man/man8/engine-manage-domains.8 +++ b/packaging/man/man8/engine-manage-domains.8 @@ -84,22 +84,22 @@ .PP \fB\-\-provider\fR=\fIPROVIDER\fR .RS 4 -The LDAP provider type of server used for the domain. +The LDAP provider type of server used for the domain (case insensitive). .RE .RS 8 -AD Microsoft Active Directory +ad Microsoft Active Directory .RE .RS 8 -IPA freeIPA +ipa freeIPA .RE .RS 8 -RHDS Red Hat Directory Server +rhds Red Hat Directory Server .RE .RS 8 -ITDS IBM Tivoli Directory Server +itds IBM Tivoli Directory Server .RE .RS 8 -OLDAP OpenLDAP +oldap OpenLDAP .RE .PP \fB\-\-report\fR -- To view, visit http://gerrit.ovirt.org/24354 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I013547823809e1cec8025f3bcbcfa7577939b76f Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.4 Gerrit-Owner: Martin Peřina <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
