diff --git a/changelog b/changelog index 89dbad93c..79c681b3a 100644 --- a/changelog +++ b/changelog @@ -2041,7 +2041,7 @@ lemonldap-ng (1.0.6) stable; urgency=low * [LEMONLDAP-304] - Cannot use spaces between values of Multi authentication parameter - * [LEMONLDAP-305] - Parameters are not overriden in the first Multi module + * [LEMONLDAP-305] - Parameters are not overridden in the first Multi module * [LEMONLDAP-307] - Base64 encoded IDs can contain more than one "/", but only the first is escaped @@ -2049,7 +2049,7 @@ lemonldap-ng (1.0.5) stable; urgency=low * [LEMONLDAP-292] - Application menu is not well displayed with multiple users having differents rights - * [LEMONLDAP-294] - Subroutines can not be overriden in lemonldap-ng.ini + * [LEMONLDAP-294] - Subroutines can not be overridden in lemonldap-ng.ini * [LEMONLDAP-293] - Password Manager - Sending Mail lemonldap-ng (1.0.4) stable; urgency=low diff --git a/doc/sources/admin/configvhost.rst b/doc/sources/admin/configvhost.rst index 57c9187fc..9ff7c3e15 100644 --- a/doc/sources/admin/configvhost.rst +++ b/doc/sources/admin/configvhost.rst @@ -516,7 +516,7 @@ Some options are available: This default level is required for ALL locations relative to this virtual host. It can be overrided for each locations. - **DevOps rules file URL**: option to define URL to retreive DevOps rules file. - This option can be overriden with ``uwsgi_param/fastcgi_param RULES_URL`` parameter. + This option can be overridden with ``uwsgi_param/fastcgi_param RULES_URL`` parameter. - **ServiceToken timeout**: by default, ServiceToken is just valid during 30 seconds. This TTL can be customized for each virtual host. diff --git a/doc/sources/admin/idpcas.rst b/doc/sources/admin/idpcas.rst index 636e712a3..30e494b08 100644 --- a/doc/sources/admin/idpcas.rst +++ b/doc/sources/admin/idpcas.rst @@ -47,7 +47,7 @@ Configuring the CAS Service Then go in ``CAS Service`` to define: - **CAS login**: the session key transmitted to CAS client as the main - identifier (CAS Principal). This setting can be overriden + identifier (CAS Principal). This setting can be overridden per-application. - **Access control policy**: define if access control should be done on CAS service. Three options: diff --git a/doc/sources/admin/renater.rst b/doc/sources/admin/renater.rst index b6235c351..f8ca523bc 100644 --- a/doc/sources/admin/renater.rst +++ b/doc/sources/admin/renater.rst @@ -98,7 +98,7 @@ The script provide the following options * -h (--help): print this message * -m (--metadata): URL of metadata document * -s (--spconfprefix): Prefix used to set SP configuration key - * --ignore-sp: ignore SP maching this entityID (can be specified multiple times) + * --ignore-sp: ignore SP matching this entityID (can be specified multiple times) * --ignore-idp: ignore IdP matching this entityID (can be specified multiple times) * -a (--nagios): output statistics in Nagios format * -n (--dry-run): print statistics but do not apply changes diff --git a/doc/sources/admin/samlservice.rst b/doc/sources/admin/samlservice.rst index adcf6b0ae..fdd910236 100644 --- a/doc/sources/admin/samlservice.rst +++ b/doc/sources/admin/samlservice.rst @@ -144,7 +144,7 @@ To define keys, you can: .. versionchanged:: 2.0.10 - The signature method can now be overriden for a SP or IDP. This will only work + The signature method can now be overridden for a SP or IDP. This will only work if you are using a certificate for signature instead of a public key. diff --git a/lemonldap-ng-common/lib/Lemonldap/NG/Common/Util.pm b/lemonldap-ng-common/lib/Lemonldap/NG/Common/Util.pm index b15e7222b..569bea4a8 100644 --- a/lemonldap-ng-common/lib/Lemonldap/NG/Common/Util.pm +++ b/lemonldap-ng-common/lib/Lemonldap/NG/Common/Util.pm @@ -65,7 +65,7 @@ This method computes the unique ID of each 2F device, for use with the API and C =head3 getSameSite($conf) Try to find a sensible value for the SameSite cookie attribute. -If the user has overriden it, return the forced value +If the user has overridden it, return the forced value =head1 AUTHORS diff --git a/lemonldap-ng-common/scripts/importMetadata b/lemonldap-ng-common/scripts/importMetadata index cab1f1641..42c0bfc9c 100755 --- a/lemonldap-ng-common/scripts/importMetadata +++ b/lemonldap-ng-common/scripts/importMetadata @@ -556,7 +556,7 @@ Options: -m, --metadata URL of metadata document -i, --idpconfprefix Prefix used to set IDP configuration key -s, --spconfprefix Prefix used to set SP configuration key - --ignore-sp ignore SP maching this entityID (can be specified multiple times) + --ignore-sp ignore SP matching this entityID (can be specified multiple times) --ignore-idp ignore IdP matching this entityID (can be specified multiple times) -a, --nagios output statistics in Nagios format -r, --remove remove provider from LemonLDAP::NG if it does not appear in metadata diff --git a/lemonldap-ng-common/scripts/lemonldap-ng-sessions b/lemonldap-ng-common/scripts/lemonldap-ng-sessions index 39a7e2b0e..186a65eaf 100755 --- a/lemonldap-ng-common/scripts/lemonldap-ng-sessions +++ b/lemonldap-ng-common/scripts/lemonldap-ng-sessions @@ -311,7 +311,7 @@ is the same as This option replaces the standard JSON output format with a simpler format of one session ID per line. -This allows some intersting combos using xargs. For example, if you want to +This allows some interesting combos using xargs. For example, if you want to remove all sessions started by "dwho" lemonldap-ng-sessions search --where uid=dwho --id-only | \ diff --git a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Lib/SAML.pm b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Lib/SAML.pm index c5f53e964..004021c19 100644 --- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Lib/SAML.pm +++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Lib/SAML.pm @@ -300,7 +300,7 @@ sub loadIDPs { } $self->logger->debug("Set encryption mode $encryption_mode on IDP $_"); - # Set signature method if overriden + # Set signature method if overridden my $signature_method = $self->conf->{samlIDPMetaDataOptions}->{$_} ->{samlIDPMetaDataOptionsSignatureMethod}; if ($signature_method) { @@ -471,7 +471,7 @@ sub loadSPs { } $self->logger->debug("Set encryption mode $encryption_mode on SP $_"); - # Set signature method if overriden + # Set signature method if overridden my $signature_method = $self->conf->{samlSPMetaDataOptions}->{$_} ->{samlSPMetaDataOptionsSignatureMethod}; if ($signature_method) { diff --git a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/SecondFactor.pm b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/SecondFactor.pm index 982e604e9..3f05a059e 100644 --- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/SecondFactor.pm +++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Main/SecondFactor.pm @@ -45,7 +45,7 @@ has authnLevel => ( sub init { my ($self) = @_; - # Set logo if overriden + # Set logo if overridden $self->logo( $self->conf->{ $self->prefix . "2fLogo" } ) if ( $self->conf->{ $self->prefix . "2fLogo" } ); diff --git a/lemonldap-ng-portal/site/htdocs/static/bwr/jquery-ui/jquery-ui.js b/lemonldap-ng-portal/site/htdocs/static/bwr/jquery-ui/jquery-ui.js index 021355237..c12337fe8 100644 --- a/lemonldap-ng-portal/site/htdocs/static/bwr/jquery-ui/jquery-ui.js +++ b/lemonldap-ng-portal/site/htdocs/static/bwr/jquery-ui/jquery-ui.js @@ -9474,7 +9474,7 @@ var widgetsMouse = $.widget( "ui.mouse", { return this.mouseDelayMet; }, - // These are placeholder methods, to be overriden by extending plugin + // These are placeholder methods, to be overridden by extending plugin _mouseStart: function( /* event */ ) {}, _mouseDrag: function( /* event */ ) {}, _mouseStop: function( /* event */ ) {}, @@ -18703,4 +18703,4 @@ var widgetsTooltip = $.ui.tooltip; -})); \ No newline at end of file +})); diff --git a/lemonldap-ng-portal/t/30-Auth-and-issuer-SAML-Metadata.t b/lemonldap-ng-portal/t/30-Auth-and-issuer-SAML-Metadata.t index aa225160a..1c8f093a8 100644 --- a/lemonldap-ng-portal/t/30-Auth-and-issuer-SAML-Metadata.t +++ b/lemonldap-ng-portal/t/30-Auth-and-issuer-SAML-Metadata.t @@ -31,7 +31,7 @@ SKIP: { 'Metadata does not contain SP information' ); ok( $res->[2]->[0] =~ m#entityID="urn:example\.com"#s, - 'IDP EntityID is overriden' ); + 'IDP EntityID is overridden' ); ok( $res = $issuer->_get('/saml/metadata/sp'), 'Get SP metadata' ); ok( $res->[2]->[0] =~ m#^<\?xml version="1.0"\?>#s, 'Metadata is XML' ); diff --git a/lemonldap-ng-portal/t/77-2F-Extra.t b/lemonldap-ng-portal/t/77-2F-Extra.t index 2c0a9fbdb..dafa7bfc5 100644 --- a/lemonldap-ng-portal/t/77-2F-Extra.t +++ b/lemonldap-ng-portal/t/77-2F-Extra.t @@ -123,7 +123,7 @@ ok( $res->[2]->[0] =~ qq%

%, 'Found translation label' ) or print STDERR Dumper( $res->[2]->[0] ); count(1); -ok( $res->[2]->[0] =~ qq%

Home Label

%, 'Found overriden label' ) +ok( $res->[2]->[0] =~ qq%

Home Label

%, 'Found overridden label' ) or print STDERR Dumper( $res->[2]->[0] ); count(1);