Skip to content

Commit

Permalink
Fix typos
Browse files Browse the repository at this point in the history
  • Loading branch information
pgrimaud authored and OskarStark committed Apr 19, 2020
1 parent 16c7219 commit 2d47d1e
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion docs/reference/audit.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions tests/Admin/FieldDescriptionTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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'));

Expand All @@ -74,7 +74,7 @@ public function testOptions(): void
'key2' => 'key_2',
'key3' => 'key_3',
],
'non_existant' => [
'non_existent' => [
'key1' => 'key_1',
'key2' => 'key_2',
],
Expand Down

0 comments on commit 2d47d1e

Please sign in to comment.