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/ocis-pkg/service/external/external.go b/ocis-pkg/service/external/external.go
index 6e24a27a67..7b90fe7fb6 100644
--- a/ocis-pkg/service/external/external.go
+++ b/ocis-pkg/service/external/external.go
@@ -9,7 +9,7 @@ import (
 	"go-micro.dev/v4/registry"
 )
 
-// RegisterGRPCEndpoint publishes an arbitrary endpoint to the service-registry. This allows to query nodes of
+// RegisterGRPCEndpoint publishes an arbitrary endpoint to the service-registry. This allows querying nodes of
 // non-micro GRPC-services like reva. No health-checks are done, thus the caller is responsible for canceling.
 func RegisterGRPCEndpoint(ctx context.Context, serviceID, uuid, addr string, version string, logger log.Logger) error {
 	node := &registry.Node{
@@ -64,7 +64,7 @@ func RegisterGRPCEndpoint(ctx context.Context, serviceID, uuid, addr string, ver
 	return nil
 }
 
-// RegisterHTTPEndpoint publishes an arbitrary endpoint to the service-registry. This allows to query nodes of
+// RegisterHTTPEndpoint publishes an arbitrary endpoint to the service-registry. This allows querying nodes of
 // non-micro HTTP-services like reva. No health-checks are done, thus the caller is responsible for canceling.
 func RegisterHTTPEndpoint(ctx context.Context, serviceID, uuid, addr string, version string, logger log.Logger) error {
 	node := &registry.Node{
diff --git a/ocis-pkg/service/grpc/client.go b/ocis-pkg/service/grpc/client.go
index 8309e80cd2..528118237d 100644
--- a/ocis-pkg/service/grpc/client.go
+++ b/ocis-pkg/service/grpc/client.go
@@ -28,14 +28,14 @@ type ClientOptions struct {
 // Option is used to pass client options
 type ClientOption func(opts *ClientOptions)
 
-// WithTLSMode allows to set the TLSMode option for grpc clients
+// WithTLSMode allows setting the TLSMode option for grpc clients
 func WithTLSMode(v string) ClientOption {
 	return func(o *ClientOptions) {
 		o.tlsMode = v
 	}
 }
 
-// WithTLSCACert allows to set the CA Certificate for grpc clients
+// WithTLSCACert allows setting the CA Certificate for grpc clients
 func WithTLSCACert(v string) ClientOption {
 	return func(o *ClientOptions) {
 		o.caCert = v
diff --git a/ocis-pkg/shared/shared_types.go b/ocis-pkg/shared/shared_types.go
index 349541c8ed..32cf118d48 100644
--- a/ocis-pkg/shared/shared_types.go
+++ b/ocis-pkg/shared/shared_types.go
@@ -38,7 +38,7 @@ type Reva struct {
 }
 
 type GRPCClientTLS struct {
-	Mode   string `yaml:"mode" env:"OCIS_GRPC_CLIENT_TLS_MODE" desc:"TLS mode for grpc connection to the go-micro based grpc services. Possible values are 'off', 'insecure' and 'on'. 'off': disables transport security for the clients. 'insecure' allows to use transport security, but disables certificate verification (to be used with the autogenerated self-signed certificates). 'on' enables transport security, including server ceritificate verification."`
+	Mode   string `yaml:"mode" env:"OCIS_GRPC_CLIENT_TLS_MODE" desc:"TLS mode for grpc connection to the go-micro based grpc services. Possible values are 'off', 'insecure' and 'on'. 'off': disables transport security for the clients. 'insecure' allows using transport security, but disables certificate verification (to be used with the autogenerated self-signed certificates). 'on' enables transport security, including server certificate verification."`
 	CACert string `yaml:"cacert" env:"OCIS_GRPC_CLIENT_TLS_CACERT" desc:"Path/File name for the root CA certificate (in PEM format) used to validate TLS server certificates of the go-micro based grpc services."`
 }
 
diff --git a/services/eventhistory/pkg/service/service.go b/services/eventhistory/pkg/service/service.go
index 66019532c5..0c9bd723d6 100644
--- a/services/eventhistory/pkg/service/service.go
+++ b/services/eventhistory/pkg/service/service.go
@@ -73,7 +73,7 @@ func (eh *EventHistoryService) StoreEvents() {
 	}
 }
 
-// GetEvents allows to retrieve events from the eventstore by id
+// GetEvents allows retrieving events from the eventstore by id
 func (eh *EventHistoryService) GetEvents(ctx context.Context, req *ehsvc.GetEventsRequest, resp *ehsvc.GetEventsResponse) error {
 	for _, id := range req.Ids {
 		ev, err := eh.getEvent(id)
@@ -87,7 +87,7 @@ func (eh *EventHistoryService) GetEvents(ctx context.Context, req *ehsvc.GetEven
 	return nil
 }
 
-// GetEventsForUser allows to retrieve events from the eventstore by userID
+// GetEventsForUser allows retrieving events from the eventstore by userID
 // This function will match all events that contains the user ID between two non-word characters.
 // The reasoning behind this is that events put the userID in many different fields, which can differ
 // per event type. This function will match all events that contain the userID by using a regex.
diff --git a/services/eventhistory/pkg/service/service_test.go b/services/eventhistory/pkg/service/service_test.go
index 0d3510df36..2591b8c384 100644
--- a/services/eventhistory/pkg/service/service_test.go
+++ b/services/eventhistory/pkg/service/service_test.go
@@ -42,7 +42,7 @@ var _ = Describe("EventHistoryService", func() {
 		close(bus)
 	})
 
-	It("Records events, stores them and allows to retrieve them", func() {
+	It("Records events, stores them and allows them to be retrieved", func() {
 		id := bus.Publish(events.UploadReady{})
 
 		// service will store eventually
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/proxy/pkg/userroles/defaultrole.go b/services/proxy/pkg/userroles/defaultrole.go
index ac5cc6e2b2..d1a59eb2d8 100644
--- a/services/proxy/pkg/userroles/defaultrole.go
+++ b/services/proxy/pkg/userroles/defaultrole.go
@@ -15,7 +15,7 @@ type defaultRoleAssigner struct {
 	Options
 }
 
-// NewDefaultRoleAssigner returns an implemenation of the UserRoleAssigner interface
+// NewDefaultRoleAssigner returns an implementation of the UserRoleAssigner interface
 func NewDefaultRoleAssigner(opts ...Option) UserRoleAssigner {
 	opt := Options{}
 	for _, o := range opts {
diff --git a/services/proxy/pkg/userroles/oidcroles.go b/services/proxy/pkg/userroles/oidcroles.go
index 647b216cc7..0d36c922ff 100644
--- a/services/proxy/pkg/userroles/oidcroles.go
+++ b/services/proxy/pkg/userroles/oidcroles.go
@@ -18,7 +18,7 @@ type oidcRoleAssigner struct {
 	Options
 }
 
-// NewOIDCRoleAssigner returns an implemenation of the UserRoleAssigner interface
+// NewOIDCRoleAssigner returns an implementation of the UserRoleAssigner interface
 func NewOIDCRoleAssigner(opts ...Option) UserRoleAssigner {
 	opt := Options{}
 	for _, o := range opts {
diff --git a/services/proxy/pkg/userroles/userroles.go b/services/proxy/pkg/userroles/userroles.go
index 55d8afc7e1..994ab318ad 100644
--- a/services/proxy/pkg/userroles/userroles.go
+++ b/services/proxy/pkg/userroles/userroles.go
@@ -12,7 +12,7 @@ import (
 
 //go:generate mockery --name=UserRoleAssigner
 
-// UserRoleAssigner allows to provide different implemenation for how users get their default roles
+// UserRoleAssigner allows providing different implementations for how users get their default roles
 // assigned by the proxy during authentication
 type UserRoleAssigner interface {
 	// UpdateUserRoleAssignment is called by the account resolver middleware. It updates the user's role assignment
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/services/settings/pkg/service/v0/settings.go b/services/settings/pkg/service/v0/settings.go
index ab58b915ff..0c38a81f90 100644
--- a/services/settings/pkg/service/v0/settings.go
+++ b/services/settings/pkg/service/v0/settings.go
@@ -378,7 +378,7 @@ func generatePermissionRequests() []*settingssvc.AddSettingToBundleRequest {
 				Id:          SetSpaceQuotaPermissionID,
 				Name:        SetSpaceQuotaPermissionName,
 				DisplayName: "Set Space Quota",
-				Description: "This permission allows to manage space quotas.",
+				Description: "This permission allows managing space quotas.",
 				Resource: &settingsmsg.Resource{
 					Type: settingsmsg.Resource_TYPE_SYSTEM,
 				},
@@ -396,7 +396,7 @@ func generatePermissionRequests() []*settingssvc.AddSettingToBundleRequest {
 				Id:          CreateSpacePermissionID,
 				Name:        CreateSpacePermissionName,
 				DisplayName: "Create own Space",
-				Description: "This permission allows to create a space owned by the current user.",
+				Description: "This permission allows creating a space owned by the current user.",
 				Resource: &settingsmsg.Resource{
 					Type: settingsmsg.Resource_TYPE_SYSTEM, // TODO resource type space? self? me? own?
 				},
@@ -414,7 +414,7 @@ func generatePermissionRequests() []*settingssvc.AddSettingToBundleRequest {
 				Id:          CreateSpacePermissionID,
 				Name:        CreateSpacePermissionName,
 				DisplayName: "Create Space",
-				Description: "This permission allows to create new spaces.",
+				Description: "This permission allows creating new spaces.",
 				Resource: &settingsmsg.Resource{
 					Type: settingsmsg.Resource_TYPE_SYSTEM,
 				},
@@ -468,7 +468,7 @@ func generatePermissionRequests() []*settingssvc.AddSettingToBundleRequest {
 				Id:          CreateSpacePermissionID,
 				Name:        CreateSpacePermissionName,
 				DisplayName: "Create Space",
-				Description: "This permission allows to create new spaces.",
+				Description: "This permission allows creating new spaces.",
 				Resource: &settingsmsg.Resource{
 					Type: settingsmsg.Resource_TYPE_SYSTEM,
 				},
@@ -486,7 +486,7 @@ func generatePermissionRequests() []*settingssvc.AddSettingToBundleRequest {
 				Id:          SetSpaceQuotaPermissionID,
 				Name:        SetSpaceQuotaPermissionName,
 				DisplayName: "Set Space Quota",
-				Description: "This permission allows to manage space quotas.",
+				Description: "This permission allows managing space quotas.",
 				Resource: &settingsmsg.Resource{
 					Type: settingsmsg.Resource_TYPE_SYSTEM,
 				},
diff --git a/services/settings/pkg/store/defaults/defaults.go b/services/settings/pkg/store/defaults/defaults.go
index 100c019d10..53388915da 100644
--- a/services/settings/pkg/store/defaults/defaults.go
+++ b/services/settings/pkg/store/defaults/defaults.go
@@ -229,7 +229,7 @@ func generateBundleAdminRole() *settingsmsg.Bundle {
 				Id:          SetPersonalSpaceQuotaPermissionID,
 				Name:        SetPersonalSpaceQuotaPermissionName,
 				DisplayName: "Set Personal Space Quota",
-				Description: "This permission allows to manage personal space quotas.",
+				Description: "This permission allows managing personal space quotas.",
 				Resource: &settingsmsg.Resource{
 					Type: settingsmsg.Resource_TYPE_SYSTEM,
 				},
@@ -244,7 +244,7 @@ func generateBundleAdminRole() *settingsmsg.Bundle {
 				Id:          SetProjectSpaceQuotaPermissionID,
 				Name:        SetProjectSpaceQuotaPermissionName,
 				DisplayName: "Set Project Space Quota",
-				Description: "This permission allows to manage project space quotas.",
+				Description: "This permission allows managing project space quotas.",
 				Resource: &settingsmsg.Resource{
 					Type: settingsmsg.Resource_TYPE_SYSTEM,
 				},
@@ -259,7 +259,7 @@ func generateBundleAdminRole() *settingsmsg.Bundle {
 				Id:          CreateSpacePermissionID,
 				Name:        CreateSpacePermissionName,
 				DisplayName: "Create Space",
-				Description: "This permission allows to create new spaces.",
+				Description: "This permission allows creating new spaces.",
 				Resource: &settingsmsg.Resource{
 					Type: settingsmsg.Resource_TYPE_SYSTEM,
 				},
@@ -274,7 +274,7 @@ func generateBundleAdminRole() *settingsmsg.Bundle {
 				Id:          ListAllSpacesPermissionID,
 				Name:        ListAllSpacesPermissionName,
 				DisplayName: "List All Spaces",
-				Description: "This permission allows to list all spaces.",
+				Description: "This permission allows listing all spaces.",
 				Resource: &settingsmsg.Resource{
 					Type: settingsmsg.Resource_TYPE_SYSTEM,
 				},
@@ -289,7 +289,7 @@ func generateBundleAdminRole() *settingsmsg.Bundle {
 				Id:          DeleteHomeSpacesPermissionID,
 				Name:        DeleteHomeSpacesPermissionName,
 				DisplayName: "Delete All Home Spaces",
-				Description: "This permission allows to delete home spaces.",
+				Description: "This permission allows deleting home spaces.",
 				Resource: &settingsmsg.Resource{
 					Type: settingsmsg.Resource_TYPE_SYSTEM,
 				},
@@ -304,7 +304,7 @@ func generateBundleAdminRole() *settingsmsg.Bundle {
 				Id:          DeleteAllSpacesPermissionID,
 				Name:        DeleteAllSpacesPermissionName,
 				DisplayName: "Delete AllSpaces",
-				Description: "This permission allows to delete all spaces.",
+				Description: "This permission allows deleting all spaces.",
 				Resource: &settingsmsg.Resource{
 					Type: settingsmsg.Resource_TYPE_SYSTEM,
 				},
@@ -334,7 +334,7 @@ func generateBundleAdminRole() *settingsmsg.Bundle {
 				Id:          WritePublicLinkPermissionID,
 				Name:        WritePublicLinkPermissionName,
 				DisplayName: "Write publiclink",
-				Description: "This permission allows to create public links.",
+				Description: "This permission allows creating public links.",
 				Resource: &settingsmsg.Resource{
 					Type: settingsmsg.Resource_TYPE_SHARE,
 				},
@@ -349,7 +349,7 @@ func generateBundleAdminRole() *settingsmsg.Bundle {
 				Id:          ManageSpacePropertiesPermissionID,
 				Name:        ManageSpacePropertiesPermissionName,
 				DisplayName: "Manage space properties",
-				Description: "This permission allows to manage space properties such as name and description.",
+				Description: "This permission allows managing space properties such as name and description.",
 				Resource: &settingsmsg.Resource{
 					Type: settingsmsg.Resource_TYPE_SYSTEM,
 				},
@@ -364,7 +364,7 @@ func generateBundleAdminRole() *settingsmsg.Bundle {
 				Id:          SpaceAbilityPermissionID,
 				Name:        SpaceAbilityPermissionName,
 				DisplayName: "Space ability",
-				Description: "This permission allows to enable and disable spaces.",
+				Description: "This permission allows enabling and disabling spaces.",
 				Resource: &settingsmsg.Resource{
 					Type: settingsmsg.Resource_TYPE_SYSTEM,
 				},
@@ -394,7 +394,7 @@ func generateBundleSpaceAdminRole() *settingsmsg.Bundle {
 				Id:          ManageSpacePropertiesPermissionID,
 				Name:        ManageSpacePropertiesPermissionName,
 				DisplayName: "Manage space properties",
-				Description: "This permission allows to manage space properties such as name and description.",
+				Description: "This permission allows managing space properties such as name and description.",
 				Resource: &settingsmsg.Resource{
 					Type: settingsmsg.Resource_TYPE_SYSTEM,
 				},
@@ -409,7 +409,7 @@ func generateBundleSpaceAdminRole() *settingsmsg.Bundle {
 				Id:          SpaceAbilityPermissionID,
 				Name:        SpaceAbilityPermissionName,
 				DisplayName: "Space ability",
-				Description: "This permission allows to enable and disable spaces.",
+				Description: "This permission allows enabling and disabling spaces.",
 				Resource: &settingsmsg.Resource{
 					Type: settingsmsg.Resource_TYPE_SYSTEM,
 				},
@@ -439,7 +439,7 @@ func generateBundleSpaceAdminRole() *settingsmsg.Bundle {
 				Id:          SetProjectSpaceQuotaPermissionID,
 				Name:        SetProjectSpaceQuotaPermissionName,
 				DisplayName: "Set Project Space Quota",
-				Description: "This permission allows to manage project space quotas.",
+				Description: "This permission allows managing project space quotas.",
 				Resource: &settingsmsg.Resource{
 					Type: settingsmsg.Resource_TYPE_SYSTEM,
 				},
@@ -454,7 +454,7 @@ func generateBundleSpaceAdminRole() *settingsmsg.Bundle {
 				Id:          CreateSpacePermissionID,
 				Name:        CreateSpacePermissionName,
 				DisplayName: "Create Space",
-				Description: "This permission allows to create new spaces.",
+				Description: "This permission allows creating new spaces.",
 				Resource: &settingsmsg.Resource{
 					Type: settingsmsg.Resource_TYPE_SYSTEM,
 				},
@@ -530,7 +530,7 @@ func generateBundleSpaceAdminRole() *settingsmsg.Bundle {
 				Id:          CreateSpacePermissionID,
 				Name:        CreateSpacePermissionName,
 				DisplayName: "Create own Space",
-				Description: "This permission allows to create a space owned by the current user.",
+				Description: "This permission allows creating a space owned by the current user.",
 				Resource: &settingsmsg.Resource{
 					Type: settingsmsg.Resource_TYPE_SYSTEM, // TODO resource type space? self? me? own?
 				},
@@ -621,7 +621,7 @@ func generateBundleUserRole() *settingsmsg.Bundle {
 				Id:          CreateSpacePermissionID,
 				Name:        CreateSpacePermissionName,
 				DisplayName: "Create own Space",
-				Description: "This permission allows to create a space owned by the current user.",
+				Description: "This permission allows creating a space owned by the current user.",
 				Resource: &settingsmsg.Resource{
 					Type: settingsmsg.Resource_TYPE_SYSTEM, // TODO resource type space? self? me? own?
 				},
diff --git a/services/userlog/pkg/service/service.go b/services/userlog/pkg/service/service.go
index 8429919a49..d9a663ffb8 100644
--- a/services/userlog/pkg/service/service.go
+++ b/services/userlog/pkg/service/service.go
@@ -162,7 +162,7 @@ func (ul *UserlogService) MemorizeEvents(ch <-chan events.Event) {
 	}
 }
 
-// GetEvents allows to retrieve events from the eventhistory by userid
+// GetEvents allows retrieving events from the eventhistory by userid
 func (ul *UserlogService) GetEvents(ctx context.Context, userid string) ([]*ehmsg.Event, error) {
 	rec, err := ul.store.Read(userid)
 	if err != nil && err != store.ErrNotFound {
diff --git a/services/web/pkg/config/options.go b/services/web/pkg/config/options.go
index 474f54b6e7..2ea9696391 100644
--- a/services/web/pkg/config/options.go
+++ b/services/web/pkg/config/options.go
@@ -2,7 +2,7 @@ package config
 
 // Options are the option for the web
 type Options struct {
-	HomeFolder               string           `json:"homeFolder,omitempty" yaml:"homeFolder" env:"WEB_OPTION_HOME_FOLDER" desc:"Specifies a folder that is used when the user navigates 'home'. Navigating home gets triggered by clicking on the 'All files' menu item. The user will not be jailed in that directory, it simply serves as a default location. A static location can be provided, or variables of the user object to come up with a user specific home path can be used. This uses the twig template variable style and allows to pick a value or a substring of a value of the authenticated user. Examples are '/Shares', '/{{.Id}}' and '/{{substr 0 3 .Id}}/{{.Id}'."`
+	HomeFolder               string           `json:"homeFolder,omitempty" yaml:"homeFolder" env:"WEB_OPTION_HOME_FOLDER" desc:"Specifies a folder that is used when the user navigates 'home'. Navigating home gets triggered by clicking on the 'All files' menu item. The user will not be jailed in that directory, it simply serves as a default location. A static location can be provided, or variables of the user object to come up with a user specific home path can be used. This uses the twig template variable style and allows picking a value or a substring of a value of the authenticated user. Examples are '/Shares', '/{{.Id}}' and '/{{substr 0 3 .Id}}/{{.Id}'."`
 	OpenAppsInTab            bool             `json:"openAppsInTab,omitempty" yaml:"openAppsInTab" env:"WEB_OPTION_OPEN_APPS_IN_TAB" desc:"Configures whether apps and extensions should generally open in a new tab. Defaults to false."`
 	DisablePreviews          bool             `json:"disablePreviews,omitempty" yaml:"disablePreviews" env:"WEB_OPTION_DISABLE_PREVIEWS" desc:"Set this option to 'true' to disable previews in all the different file listing views. The only list view that is not affected by this setting is the trash bin, as it does not allow previewing at all."`
 	PreviewFileMimeTypes     []string         `json:"previewFileMimeTypes,omitempty" yaml:"previewFileMimeTypes" env:"WEB_OPTION_PREVIEW_FILE_MIMETYPES" desc:"Specifies which mimeTypes will be previewed in the UI. For example to only preview jpg and text files, set this option to ['image/jpeg', 'text/plain']."`
diff --git a/services/webdav/pkg/config/config.go b/services/webdav/pkg/config/config.go
index 66e6383692..c4462833a5 100644
--- a/services/webdav/pkg/config/config.go
+++ b/services/webdav/pkg/config/config.go
@@ -23,7 +23,7 @@ type Config struct {
 	OcisPublicURL        string          `yaml:"ocis_public_url" env:"OCIS_URL;OCIS_PUBLIC_URL" desc:"URL, where oCIS is reachable for users."`
 	WebdavNamespace      string          `yaml:"webdav_namespace" env:"WEBDAV_WEBDAV_NAMESPACE" desc:"CS3 path layout to use when forwarding /webdav requests"`
 	RevaGateway          string          `yaml:"reva_gateway" env:"OCIS_REVA_GATEWAY;REVA_GATEWAY" desc:"CS3 gateway used to look up user metadata" deprecationVersion:"3.0" removalVersion:"4.0.0" deprecationInfo:"REVA_GATEWAY changing name for consistency" deprecationReplacement:"OCIS_REVA_GATEWAY"`
-	RevaGatewayTLSMode   string          `yaml:"reva_gateway_tls_mode" env:"OCIS_REVA_GATEWAY_TLS_MODE;REVA_GATEWAY_TLS_MODE" desc:"TLS mode for grpc connection to the CS3 gateway endpoint. Possible values are 'off', 'insecure' and 'on'. 'off': disables transport security for the clients. 'insecure' allows to use transport security, but disables certificate verification (to be used with the autogenerated self-signed certificates). 'on' enables transport security, including server ceritificate verification." deprecationVersion:"3.0" removalVersion:"4.0.0" deprecationInfo:"REVA_GATEWAY_TLS_MODE changing name for consistency" deprecationReplacement:"OCIS_REVA_GATEWAY_TLS_MODE"`
+	RevaGatewayTLSMode   string          `yaml:"reva_gateway_tls_mode" env:"OCIS_REVA_GATEWAY_TLS_MODE;REVA_GATEWAY_TLS_MODE" desc:"TLS mode for grpc connection to the CS3 gateway endpoint. Possible values are 'off', 'insecure' and 'on'. 'off': disables transport security for the clients. 'insecure' allows using transport security, but disables certificate verification (to be used with the autogenerated self-signed certificates). 'on' enables transport security, including server certificate verification." deprecationVersion:"3.0" removalVersion:"4.0.0" deprecationInfo:"REVA_GATEWAY_TLS_MODE changing name for consistency" deprecationReplacement:"OCIS_REVA_GATEWAY_TLS_MODE"`
 	RevaGatewayTLSCACert string          `yaml:"reva_gateway_tls_cacert" env:"OCIS_REVA_GATEWAY_TLS_CACERT;REVA_GATEWAY_TLS_CACERT" desc:"The root CA certificate used to validate the gateway's TLS certificate." deprecationVersion:"3.0" removalVersion:"4.0.0" deprecationInfo:"REVA_GATEWAY_TLS_CACERT changing name for consistency" deprecationReplacement:"OCIS_REVA_GATEWAY_TLS_CACERT"`
 	Context              context.Context `yaml:"-"`
 }
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