diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index f47a8cbee..f088e8544 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -615,7 +615,7 @@ that should hopefully be there, to a new section named `UPGRADE FROM 42.3.1 to 4 #### Upgrading code comments and deprecation messages -All occurences of `42.x` in comments or deprecation messages should be updating +All occurrences of `42.x` in comments or deprecation messages should be updating by resolving `x` to its value at the time of the release. :warning: You can do it quickly with a "Search and Replace" feature, but be careful not to replace unwanted matches. diff --git a/docs/reference/audit.rst b/docs/reference/audit.rst index ff8af92ad..a05d09283 100755 --- a/docs/reference/audit.rst +++ b/docs/reference/audit.rst @@ -78,7 +78,7 @@ Once the ``EntityAuditBundle`` is set, then 3 new actions are available: * `/admin/vendor/entity/{id}/history`: displays the history list * `/admin/vendor/entity/{id}/history/{revision}`: displays the object at a specific revision -* `/admin/vendor/entity/{id}/history/{base_revision}/{compare_revision}`: displays a comparision of an object between two specified revisions +* `/admin/vendor/entity/{id}/history/{base_revision}/{compare_revision}`: displays a comparison of an object between two specified revisions These actions are available in the ``view`` and ``edit`` action. Please note the current implementation uses the ``show`` definition to display the revision. diff --git a/tests/Admin/FieldDescriptionTest.php b/tests/Admin/FieldDescriptionTest.php index 8e3cfe5f5..6ff47eea5 100644 --- a/tests/Admin/FieldDescriptionTest.php +++ b/tests/Admin/FieldDescriptionTest.php @@ -47,7 +47,7 @@ public function testOptions(): void $this->assertSame(['key1' => 'key_1', 'key2' => 'key_2'], $field->getOption('array')); - $field->mergeOption('non_existant', ['key1' => 'key_1', 'key2' => 'key_2']); + $field->mergeOption('non_existent', ['key1' => 'key_1', 'key2' => 'key_2']); $this->assertSame(['key1' => 'key_1', 'key2' => 'key_2'], $field->getOption('array')); @@ -74,7 +74,7 @@ public function testOptions(): void 'key2' => 'key_2', 'key3' => 'key_3', ], - 'non_existant' => [ + 'non_existent' => [ 'key1' => 'key_1', 'key2' => 'key_2', ],