From 4874da778ccb9f839bb77997146ab44970808051 Mon Sep 17 00:00:00 2001 From: Phil Davis Date: Wed, 17 May 2023 16:24:04 +0545 Subject: [PATCH] Reword 'allow to' sentences --- docs/ocis/adr/0007-api-for-spaces.md | 2 +- docs/ocis/adr/0016-files-metadata.md | 2 +- services/graph/pkg/config/config.go | 2 +- services/invitations/pkg/backends/keycloak/backend.go | 4 ++-- services/settings/pkg/service/v0/service.go | 2 +- tests/acceptance/docker/src/run-tests.sh | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/ocis/adr/0007-api-for-spaces.md b/docs/ocis/adr/0007-api-for-spaces.md index feed42fb2d..020499da95 100644 --- a/docs/ocis/adr/0007-api-for-spaces.md +++ b/docs/ocis/adr/0007-api-for-spaces.md @@ -23,7 +23,7 @@ The purpose of this new API is to give clients a very simple way to query the dy This API is supposed to be queried often, to give clients a condensed view of the available spaces for a user, but also their eTags and cTags. Hence the clients do not have to perform a PROPFIND for every space separately. -This API would even allow to provide (WebDAV-) endpoints depending on the kind and version of the client asking for it. +This API would even allow providing (WebDAV-) endpoints depending on the kind and version of the client asking for it. ## Decision Drivers diff --git a/docs/ocis/adr/0016-files-metadata.md b/docs/ocis/adr/0016-files-metadata.md index 55fe7fe61d..50069d09c6 100644 --- a/docs/ocis/adr/0016-files-metadata.md +++ b/docs/ocis/adr/0016-files-metadata.md @@ -57,7 +57,7 @@ Use a Database or an external key/value store to persist metadata. ### Extended File Attributes -Extended File Attributes allow to store arbitrary properties. There are 4 namespaces `user`, `system`, `trusted` and `security`. We can safely use the `user` namespace. An example attribute name would be `user.ocis.owner.id`. The linux kernel has length limits on attribute names and values. +Extended File Attributes allow storing arbitrary properties. There are 4 namespaces `user`, `system`, `trusted` and `security`. We can safely use the `user` namespace. An example attribute name would be `user.ocis.owner.id`. The linux kernel has length limits on attribute names and values. From Wikipedia on [Extended file attributes](https://en.wikipedia.org/wiki/Extended_file_attributes#Linux): diff --git a/services/graph/pkg/config/config.go b/services/graph/pkg/config/config.go index 93984b4170..83b9a3e5da 100644 --- a/services/graph/pkg/config/config.go +++ b/services/graph/pkg/config/config.go @@ -53,7 +53,7 @@ type LDAP struct { BindPassword string `yaml:"bind_password" env:"LDAP_BIND_PASSWORD;GRAPH_LDAP_BIND_PASSWORD" desc:"Password to use for authenticating the 'bind_dn'."` UseServerUUID bool `yaml:"use_server_uuid" env:"GRAPH_LDAP_SERVER_UUID" desc:"If set to true, rely on the LDAP Server to generate a unique ID for users and groups, like when using 'entryUUID' as the user ID attribute."` UsePasswordModExOp bool `yaml:"use_password_modify_exop" env:"GRAPH_LDAP_SERVER_USE_PASSWORD_MODIFY_EXOP" desc:"Use the 'Password Modify Extended Operation' for updating user passwords."` - WriteEnabled bool `yaml:"write_enabled" env:"OCIS_LDAP_SERVER_WRITE_ENABLED;GRAPH_LDAP_SERVER_WRITE_ENABLED" desc:"Allow to create, modify and delete LDAP users via the GRAPH API. This is only works when the default Schema is used."` + WriteEnabled bool `yaml:"write_enabled" env:"OCIS_LDAP_SERVER_WRITE_ENABLED;GRAPH_LDAP_SERVER_WRITE_ENABLED" desc:"Allow creating, modifying and deleting LDAP users via the GRAPH API. This is only works when the default Schema is used."` RefintEnabled bool `yaml:"refint_enabled" env:"GRAPH_LDAP_REFINT_ENABLED" desc:"Signals that the server has the refint plugin enabled, which makes some actions not needed."` UserBaseDN string `yaml:"user_base_dn" env:"OCIS_LDAP_USER_BASE_DN;LDAP_USER_BASE_DN;GRAPH_LDAP_USER_BASE_DN" desc:"Search base DN for looking up LDAP users." deprecationVersion:"3.0" removalVersion:"4.0.0" deprecationInfo:"LDAP_USER_BASE_DN changing name for consistency" deprecationReplacement:"OCIS_LDAP_USER_BASE_DN"` diff --git a/services/invitations/pkg/backends/keycloak/backend.go b/services/invitations/pkg/backends/keycloak/backend.go index 7d718de4d4..9454d81ca5 100644 --- a/services/invitations/pkg/backends/keycloak/backend.go +++ b/services/invitations/pkg/backends/keycloak/backend.go @@ -86,10 +86,10 @@ func (b Backend) CreateUser(ctx context.Context, invitation *invitations.Invitat return id, nil } -// CanSendMail returns true because keycloak does allow to send mail. +// CanSendMail returns true because keycloak does allow sending mail. func (b Backend) CanSendMail() bool { return true } -// SendMail sends a mail to the user with details on how to reedeem the invitation. +// SendMail sends a mail to the user with details on how to redeem the invitation. func (b Backend) SendMail(ctx context.Context, id string) error { return b.client.SendActionsMail(ctx, b.userRealm, id, userRequiredActions) } diff --git a/services/settings/pkg/service/v0/service.go b/services/settings/pkg/service/v0/service.go index 40c6187dd3..58ed710d9a 100644 --- a/services/settings/pkg/service/v0/service.go +++ b/services/settings/pkg/service/v0/service.go @@ -373,7 +373,7 @@ func (g Service) ListRoles(c context.Context, req *settingssvc.ListBundlesReques if err != nil { return merrors.NotFound(g.id, "%s", err) } - // TODO: only allow to list roles when user has account/role/... management permissions + // TODO: only allow listing roles when user has account/role/... management permissions res.Bundles = r return nil } diff --git a/tests/acceptance/docker/src/run-tests.sh b/tests/acceptance/docker/src/run-tests.sh index 2c76558947..09808f7737 100644 --- a/tests/acceptance/docker/src/run-tests.sh +++ b/tests/acceptance/docker/src/run-tests.sh @@ -55,7 +55,7 @@ fi if [ ! -z "$BEHAT_FEATURE" ] then echo "feature selected: " + $BEHAT_FEATURE - # allow to run without filters if its a feature + # allow running without filters if its a feature unset BEHAT_FILTER_TAGS unset DIVIDE_INTO_NUM_PARTS