From 6118e0dc377089f1e61649192e499d0e0aa54f7d Mon Sep 17 00:00:00 2001
From: Alex Pott <alex.a.pott@googlemail.com>
Date: Sun, 8 Oct 2023 09:34:52 +0100
Subject: [PATCH] Issue #3389282 by quietone, smustgrave, alexpott: Fix
 spelling for words that are only misspelled  in comments

---
 .../scaffold/files/default.settings.php       | 20 +++++++++----------
 core/lib/Drupal/Component/Utility/Unicode.php |  2 +-
 .../Core/Entity/Query/QueryInterface.php      |  6 +++---
 .../Plugin/Field/FieldType/PasswordItem.php   |  2 +-
 .../PathProcessor/PathProcessorDecode.php     |  2 +-
 core/misc/cspell/dictionary.txt               | 17 ----------------
 core/modules/ckeditor5/js/ckeditor5.js        |  2 +-
 .../Kernel/ContentTranslationSyncUnitTest.php |  2 +-
 .../source/d6/FieldOptionTranslation.php      |  2 +-
 .../image/tests/src/Kernel/ImageItemTest.php  |  2 +-
 .../src/Functional/LanguageSwitchingTest.php  |  6 +++---
 .../src/Functional/MediaRevisionTest.php      |  2 +-
 .../src/Controller/AssetControllerBase.php    |  2 +-
 .../SecurityFileUploadEventSubscriber.php     |  2 +-
 .../LinksetControllerMultiLingualTest.php     |  4 ++--
 .../Plugin/views/access/AccessPluginBase.php  |  2 +-
 .../tests/src/Functional/AnalyzeTest.php      |  2 +-
 core/phpunit.xml.dist                         |  2 +-
 .../Functional/ScaffoldUpgradeTest.php        |  2 +-
 .../Drupal/Tests/Core/Datetime/DateTest.php   |  4 ++--
 .../Core/Render/RendererBubblingTest.php      |  4 ++--
 core/themes/claro/claro.theme                 |  4 ++--
 sites/default/default.settings.php            | 20 +++++++++----------
 23 files changed, 48 insertions(+), 65 deletions(-)

diff --git a/core/assets/scaffold/files/default.settings.php b/core/assets/scaffold/files/default.settings.php
index 0c1b1155d6e2..d69b1865ecf0 100644
--- a/core/assets/scaffold/files/default.settings.php
+++ b/core/assets/scaffold/files/default.settings.php
@@ -78,8 +78,8 @@
  * @code
  * $databases['default']['default'] = [
  *   'database' => 'databasename',
- *   'username' => 'sqlusername',
- *   'password' => 'sqlpassword',
+ *   'username' => 'sql_username',
+ *   'password' => 'sql_password',
  *   'host' => 'localhost',
  *   'port' => '3306',
  *   'driver' => 'mysql',
@@ -194,8 +194,8 @@
  *   $databases['default']['default'] = [
  *     'driver' => 'pgsql',
  *     'database' => 'databasename',
- *     'username' => 'sqlusername',
- *     'password' => 'sqlpassword',
+ *     'username' => 'sql_username',
+ *     'password' => 'sql_password',
  *     'host' => 'localhost',
  *     'prefix' => '',
  *   ];
@@ -205,7 +205,7 @@
  * @code
  *   $databases['default']['default'] = [
  *     'driver' => 'sqlite',
- *     'database' => '/path/to/databasefilename',
+ *     'database' => '/path/to/database_filename',
  *   ];
  * @endcode
  *
@@ -216,8 +216,8 @@
  *     'namespace' => 'Drupal\my_module\Driver\Database\my_driver',
  *     'autoload' => 'modules/my_module/src/Driver/Database/my_driver/',
  *     'database' => 'databasename',
- *     'username' => 'sqlusername',
- *     'password' => 'sqlpassword',
+ *     'username' => 'sql_username',
+ *     'password' => 'sql_password',
  *     'host' => 'localhost',
  *     'prefix' => '',
  *   ];
@@ -231,8 +231,8 @@
  *     'namespace' => 'Drupal\my_module\Driver\Database\my_driver',
  *     'autoload' => 'modules/my_module/src/Driver/Database/my_driver/',
  *     'database' => 'databasename',
- *     'username' => 'sqlusername',
- *     'password' => 'sqlpassword',
+ *     'username' => 'sql_username',
+ *     'password' => 'sql_password',
  *     'host' => 'localhost',
  *     'prefix' => '',
  *     'dependencies' => [
@@ -588,7 +588,7 @@
  * the output of phpinfo(). The full output can contain sensitive information
  * so by default Drupal removes some sections.
  *
- * This behaviour can be configured by setting this variable to a different
+ * This behavior can be configured by setting this variable to a different
  * value corresponding to the flags parameter of phpinfo().
  *
  * If you need to expose more information in the report - for example to debug a
diff --git a/core/lib/Drupal/Component/Utility/Unicode.php b/core/lib/Drupal/Component/Utility/Unicode.php
index 834e3fbda3ce..34868a146cf2 100644
--- a/core/lib/Drupal/Component/Utility/Unicode.php
+++ b/core/lib/Drupal/Component/Utility/Unicode.php
@@ -294,7 +294,7 @@ public static function ucwords($text) {
    *   string "See MyVeryLongURLExample.com for more information" to a word-safe
    *   return length of 20, the only available word boundary within 20 characters
    *   is after the word "See", which wouldn't leave a very informative string. If
-   *   you had set $min_wordsafe_length to 10, though, the function would realise
+   *   you had set $min_wordsafe_length to 10, though, the function would realize
    *   that "See" alone is too short, and would then just truncate ignoring word
    *   boundaries, giving you "See MyVeryLongURL..." (assuming you had set
    *   $add_ellipsis to TRUE).
diff --git a/core/lib/Drupal/Core/Entity/Query/QueryInterface.php b/core/lib/Drupal/Core/Entity/Query/QueryInterface.php
index b9dedbd83ad6..975f6a53a37a 100644
--- a/core/lib/Drupal/Core/Entity/Query/QueryInterface.php
+++ b/core/lib/Drupal/Core/Entity/Query/QueryInterface.php
@@ -259,14 +259,14 @@ public function andConditionGroup();
    *
    * For example, consider a map entity with an 'attributes' field
    * containing 'building_type' and 'color' columns. To find all green and
-   * red bikesheds:
+   * red sheds:
    * @code
    *   $query = \Drupal::entityQuery('map')->accessCheck(FALSE);
    *   $group = $query->orConditionGroup()
    *     ->condition('attributes.color', 'red')
    *     ->condition('attributes.color', 'green');
    *   $entity_ids = $query
-   *     ->condition('attributes.building_type', 'bikeshed')
+   *     ->condition('attributes.building_type', 'shed')
    *     ->condition($group)
    *     ->execute();
    * @endcode
@@ -274,7 +274,7 @@ public function andConditionGroup();
    * @code
    *   $entity_ids = $query
    *     ->condition('attributes.color', ['red', 'green'])
-   *     ->condition('attributes.building_type', 'bikeshed')
+   *     ->condition('attributes.building_type', 'shed')
    *     ->execute();
    * @endcode
    *
diff --git a/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/PasswordItem.php b/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/PasswordItem.php
index e6afc01620aa..1e5eca9e9405 100644
--- a/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/PasswordItem.php
+++ b/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/PasswordItem.php
@@ -60,7 +60,7 @@ public function preSave() {
       }
     }
 
-    // Ensure that the existing password is unset to minimise risks of it
+    // Ensure that the existing password is unset to minimize risks of it
     // getting serialized and stored somewhere.
     $this->existing = NULL;
   }
diff --git a/core/lib/Drupal/Core/PathProcessor/PathProcessorDecode.php b/core/lib/Drupal/Core/PathProcessor/PathProcessorDecode.php
index b173585bd614..a74b1461b235 100644
--- a/core/lib/Drupal/Core/PathProcessor/PathProcessorDecode.php
+++ b/core/lib/Drupal/Core/PathProcessor/PathProcessorDecode.php
@@ -5,7 +5,7 @@
 use Symfony\Component\HttpFoundation\Request;
 
 /**
- * Processes the inbound path by urldecoding it.
+ * Processes the inbound path by decoding the URL.
  *
  * Parameters in the URL sometimes represent code-meaningful strings. It is
  * therefore useful to always urldecode() those values so that individual
diff --git a/core/misc/cspell/dictionary.txt b/core/misc/cspell/dictionary.txt
index f52b560b3864..7153bbc5ff10 100644
--- a/core/misc/cspell/dictionary.txt
+++ b/core/misc/cspell/dictionary.txt
@@ -22,8 +22,6 @@ alternatif
 amet
 amphibius
 ampm
-analyse
-analysed
 andif
 annot
 anonyme
@@ -107,8 +105,6 @@ bgblue
 bgred
 bidi
 bigpipe
-bikeshed
-bikesheds
 bitmask
 bkmgtpezy
 bkslshv
@@ -254,10 +250,8 @@ customly
 customrequest
 cweagans
 cádiz
-databasefilename
 databasename
 datas
-dateformatter
 datelist
 dateonly
 daterange
@@ -286,7 +280,6 @@ denormalizer
 denormalizers
 denormalizes
 denormalizing
-denyall
 depcn
 dependee
 dependee's
@@ -464,7 +457,6 @@ gnumeric
 goldfinger
 googleapis
 gotit
-grandgrandchild
 grayskull
 greeking
 gripsmall
@@ -644,7 +636,6 @@ mikey
 milli
 mimetypes
 minifyzombies
-minimise
 minipager
 minusthick
 missingkey
@@ -885,7 +876,6 @@ rasterizes
 rawurlencoded
 readmore
 readonlydir
-realise
 realpaths
 realword
 rebuilder
@@ -922,7 +912,6 @@ restriped
 restui
 rethrown
 returntransfer
-revisionability
 revisionable
 revisioned
 revisionid
@@ -953,7 +942,6 @@ schemaapi
 schemeless
 schipulcon
 scorewords
-screenreaders
 scriptable
 scrollbars
 searchdirs
@@ -996,8 +984,6 @@ spiffiness
 splitbutton
 splitbuttons
 spreadsheetml
-sqlpassword
-sqlusername
 squaresmall
 squiz
 squizlabs
@@ -1050,7 +1036,6 @@ subrequest's
 subrequests
 subresults
 subselect
-subsequentially
 subshell
 substrategies
 subsubtheme
@@ -1255,7 +1240,6 @@ unshortened
 unsimplified
 unsticky
 unstripped
-unsynchronized
 untabbable
 untarring
 untrustable
@@ -1272,7 +1256,6 @@ uppercased
 upscaling
 urandom
 urlalias
-urldecoding
 usecase
 userid
 userinfo
diff --git a/core/modules/ckeditor5/js/ckeditor5.js b/core/modules/ckeditor5/js/ckeditor5.js
index 8e92ff2843cc..e204023d7a4c 100644
--- a/core/modules/ckeditor5/js/ckeditor5.js
+++ b/core/modules/ckeditor5/js/ckeditor5.js
@@ -251,7 +251,7 @@
    * To ensure they have higher specificity and are not reset too aggressively.
    *
    * @param {CSSRule} rule
-   *  A single CSS rule to be analysed and changed if necessary.
+   *  A single CSS rule to be analyzed and changed if necessary.
    */
   function ckeditor5SelectorProcessing(rule) {
     // Handle nested rules in @media, @support, etc.
diff --git a/core/modules/content_translation/tests/src/Kernel/ContentTranslationSyncUnitTest.php b/core/modules/content_translation/tests/src/Kernel/ContentTranslationSyncUnitTest.php
index 5d41f34a7d8b..9a80ed9b4365 100644
--- a/core/modules/content_translation/tests/src/Kernel/ContentTranslationSyncUnitTest.php
+++ b/core/modules/content_translation/tests/src/Kernel/ContentTranslationSyncUnitTest.php
@@ -252,7 +252,7 @@ public function testDifferingSyncedColumns() {
       for ($delta = 0; $delta < $this->cardinality; $delta++) {
         foreach ($this->columns as $column) {
           // If the column is synchronized, the value should have been synced,
-          // for unsynchronized columns, the value must not change.
+          // for columns that are not synchronized, the value must not change.
           $expected_value = in_array($column, $this->synchronized) ? $changed_items[$delta][$column] : $this->unchangedFieldValues[$langcode][$delta][$column];
           $this->assertEquals($expected_value, $field_values[$langcode][$delta][$column], "Differing Item {$delta} column {$column} for langcode {$langcode} synced correctly");
         }
diff --git a/core/modules/field/src/Plugin/migrate/source/d6/FieldOptionTranslation.php b/core/modules/field/src/Plugin/migrate/source/d6/FieldOptionTranslation.php
index 8f9d4b14ddaf..75d615cc74c9 100644
--- a/core/modules/field/src/Plugin/migrate/source/d6/FieldOptionTranslation.php
+++ b/core/modules/field/src/Plugin/migrate/source/d6/FieldOptionTranslation.php
@@ -38,7 +38,7 @@ public function query() {
     $query->leftJoin('content_node_field', 'cnf', '[cnf].[field_name] = [i18n].[objectid]');
     $query->addField('cnf', 'field_name');
     $query->addField('cnf', 'global_settings');
-    // Minimise changes to the d6_field_option_translation.yml, which is copied
+    // Minimize changes to the d6_field_option_translation.yml, which is copied
     // from d6_field.yml, by ensuring the 'type' property is from
     // content_node_field table.
     $query->addField('cnf', 'type');
diff --git a/core/modules/image/tests/src/Kernel/ImageItemTest.php b/core/modules/image/tests/src/Kernel/ImageItemTest.php
index c776fd22f754..fc0699aaf6a8 100644
--- a/core/modules/image/tests/src/Kernel/ImageItemTest.php
+++ b/core/modules/image/tests/src/Kernel/ImageItemTest.php
@@ -159,7 +159,7 @@ public function testImageItem() {
    */
   public function testImageItemSampleValueGeneration() {
 
-    // Default behaviour. No resolution configuration.
+    // Default behavior. No resolution configuration.
     $entity = EntityTest::create();
     $entity->image_test->generateSampleItems();
     $this->entityValidateAndSave($entity);
diff --git a/core/modules/language/tests/src/Functional/LanguageSwitchingTest.php b/core/modules/language/tests/src/Functional/LanguageSwitchingTest.php
index 17d20995c686..9918190e8b0a 100644
--- a/core/modules/language/tests/src/Functional/LanguageSwitchingTest.php
+++ b/core/modules/language/tests/src/Functional/LanguageSwitchingTest.php
@@ -84,14 +84,14 @@ public function testLanguageBlock() {
     $this->doTestLanguageBlockAnonymous($block->label());
     $this->doTestLanguageBlock404($block->label(), 'system/404');
 
-    // Test 404s with big_pipe where the behaviour is different for logged-in
+    // Test 404s with big_pipe where the behavior is different for logged-in
     // users.
     \Drupal::service('module_installer')->install(['big_pipe']);
     $this->rebuildAll();
     $this->doTestLanguageBlock404($block->label(), 'system/404');
     $this->drupalLogin($this->drupalCreateUser());
-    // @todo This is testing the current behaviour with the big_pipe module
-    //   enabled. This behaviour is a bug will be fixed in
+    // @todo This is testing the current behavior with the big_pipe module
+    //   enabled. This behavior is a bug will be fixed in
     //   https://www.drupal.org/project/drupal/issues/3349201.
     $this->doTestLanguageBlock404($block->label(), '<front>');
   }
diff --git a/core/modules/media/tests/src/Functional/MediaRevisionTest.php b/core/modules/media/tests/src/Functional/MediaRevisionTest.php
index d3c89fc72a3d..44e02905d6c6 100644
--- a/core/modules/media/tests/src/Functional/MediaRevisionTest.php
+++ b/core/modules/media/tests/src/Functional/MediaRevisionTest.php
@@ -9,7 +9,7 @@
 use Drupal\user\RoleInterface;
 
 /**
- * Tests the revisionability of media entities.
+ * Tests the revisions of media entities.
  *
  * @group media
  */
diff --git a/core/modules/system/src/Controller/AssetControllerBase.php b/core/modules/system/src/Controller/AssetControllerBase.php
index 3c662294a2e4..19c2eec6f105 100644
--- a/core/modules/system/src/Controller/AssetControllerBase.php
+++ b/core/modules/system/src/Controller/AssetControllerBase.php
@@ -57,7 +57,7 @@ abstract class AssetControllerBase extends FileDownloadController {
    * for the file will be served from disk and be cached. This is done to
    * avoid situations such as where one CDN endpoint is serving a version
    * cached from PHP, while another is serving a version cached from disk.
-   * Should there be any discrepancy in behaviour between those files, this
+   * Should there be any discrepancy in behavior between those files, this
    * can make debugging very difficult.
    */
   protected const CACHE_CONTROL = 'private, no-store';
diff --git a/core/modules/system/src/EventSubscriber/SecurityFileUploadEventSubscriber.php b/core/modules/system/src/EventSubscriber/SecurityFileUploadEventSubscriber.php
index 16d75fdcaa76..8dfcd24d6cde 100644
--- a/core/modules/system/src/EventSubscriber/SecurityFileUploadEventSubscriber.php
+++ b/core/modules/system/src/EventSubscriber/SecurityFileUploadEventSubscriber.php
@@ -102,7 +102,7 @@ public function sanitizeName(FileUploadSanitizeNameEvent $event): void {
 
     // Munge the filename to protect against possible malicious extension hiding
     // within an unknown file type (i.e. filename.html.foo). This was introduced
-    // as part of SA-2006-006 to fix Apache's risky fallback behaviour.
+    // as part of SA-2006-006 to fix Apache's risky fallback behavior.
 
     // Loop through the middle parts of the name and add an underscore to the
     // end of each section that could be a file extension but isn't in the
diff --git a/core/modules/system/tests/src/Functional/Menu/LinksetControllerMultiLingualTest.php b/core/modules/system/tests/src/Functional/Menu/LinksetControllerMultiLingualTest.php
index d01a3f634473..af765efb7a11 100644
--- a/core/modules/system/tests/src/Functional/Menu/LinksetControllerMultiLingualTest.php
+++ b/core/modules/system/tests/src/Functional/Menu/LinksetControllerMultiLingualTest.php
@@ -197,7 +197,7 @@ public function setUp(): void {
   }
 
   /**
-   * Test core functions of the linkset for multilingual behaviour.
+   * Test core functions of the linkset for multilingual behavior.
    *
    * @throws \Exception
    */
@@ -210,7 +210,7 @@ public function testBasicMultilingualFunctions() {
   }
 
   /**
-   * Test core functions of the linkset for multilingual behaviour.
+   * Test core functions of the linkset for multilingual behavior.
    *
    * @throws \Exception
    */
diff --git a/core/modules/views/src/Plugin/views/access/AccessPluginBase.php b/core/modules/views/src/Plugin/views/access/AccessPluginBase.php
index ee568e118f3b..9469cc361a5b 100644
--- a/core/modules/views/src/Plugin/views/access/AccessPluginBase.php
+++ b/core/modules/views/src/Plugin/views/access/AccessPluginBase.php
@@ -32,7 +32,7 @@
  * plugin should have an annotation that includes the plugin's metadata, for
  * example:
  * @Plugin(
- *   id = "denyall",
+ *   id = "deny_all",
  *   title = @Translation("No Access"),
  *   help = @Translation("Will not be accessible.")
  * )
diff --git a/core/modules/views_ui/tests/src/Functional/AnalyzeTest.php b/core/modules/views_ui/tests/src/Functional/AnalyzeTest.php
index 8d4580bf960a..5eb2e2d7bb33 100644
--- a/core/modules/views_ui/tests/src/Functional/AnalyzeTest.php
+++ b/core/modules/views_ui/tests/src/Functional/AnalyzeTest.php
@@ -42,7 +42,7 @@ public function testAnalyzeBasic() {
     $this->assertSession()->titleEquals('View analysis | Drupal');
 
     foreach (['ok', 'warning', 'error'] as $type) {
-      // Check that analyse messages with the expected type found.
+      // Check that analyze messages with the expected type found.
       $this->assertSession()->elementExists('css', 'div.' . $type);
     }
 
diff --git a/core/phpunit.xml.dist b/core/phpunit.xml.dist
index 6e014f70d4d5..3b44c182acc2 100644
--- a/core/phpunit.xml.dist
+++ b/core/phpunit.xml.dist
@@ -36,7 +36,7 @@
 
     <!-- Deprecation testing is managed through Symfony's PHPUnit Bridge.
       The environment variable SYMFONY_DEPRECATIONS_HELPER is used to configure
-      the behaviour of the deprecation tests.
+      the behavior of the deprecation tests.
       See https://symfony.com/doc/current/components/phpunit_bridge.html#configuration
       Drupal core's testing framework is setting this variable to its defaults.
       Projects with their own requirements need to manage this variable
diff --git a/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/Functional/ScaffoldUpgradeTest.php b/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/Functional/ScaffoldUpgradeTest.php
index 35f74f1e2ce3..5102b6233fc8 100644
--- a/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/Functional/ScaffoldUpgradeTest.php
+++ b/core/tests/Drupal/Tests/Composer/Plugin/Scaffold/Functional/ScaffoldUpgradeTest.php
@@ -13,7 +13,7 @@
  *
  * Upgrading a Composer plugin can be a dangerous operation. If the plugin
  * instantiates any classes during the activate method, and the plugin code
- * is subsequentially modified by a `composer update` operation, then any
+ * is subsequently modified by a `composer update` operation, then any
  * post-update hook (& etc.) may run with inconsistent code, leading to
  * runtime errors. This test ensures that it is possible to upgrade from the
  * last available stable 8.8.x tag to the current Scaffold plugin code (e.g. in
diff --git a/core/tests/Drupal/Tests/Core/Datetime/DateTest.php b/core/tests/Drupal/Tests/Core/Datetime/DateTest.php
index aad4ecf46dd2..a3a17ba685e1 100644
--- a/core/tests/Drupal/Tests/Core/Datetime/DateTest.php
+++ b/core/tests/Drupal/Tests/Core/Datetime/DateTest.php
@@ -192,7 +192,7 @@ public function testFormatTimeDiffUntil() {
     $timestamp = $this->createTimestamp('2013-12-11 10:09:09');
     $options = [];
 
-    // Mocks the formatDiff function of the dateformatter object.
+    // Mocks the formatDiff function of the DateFormatter object.
     $this->dateFormatterStub
       ->expects($this->exactly(2))
       ->method('formatDiff')
@@ -225,7 +225,7 @@ public function testFormatTimeDiffSince() {
     $request_time = $this->createTimestamp('2013-12-11 10:09:08');
     $options = [];
 
-    // Mocks the formatDiff function of the dateformatter object.
+    // Mocks the formatDiff function of the DateFormatter object.
     $this->dateFormatterStub
       ->expects($this->exactly(2))
       ->method('formatDiff')
diff --git a/core/tests/Drupal/Tests/Core/Render/RendererBubblingTest.php b/core/tests/Drupal/Tests/Core/Render/RendererBubblingTest.php
index 88517acc6e77..8a86bb72fed0 100644
--- a/core/tests/Drupal/Tests/Core/Render/RendererBubblingTest.php
+++ b/core/tests/Drupal/Tests/Core/Render/RendererBubblingTest.php
@@ -342,7 +342,7 @@ public function testConditionalCacheContextBubblingSelfHealing() {
             // A lower max-age; the redirecting cache item should be updated.
             'max-age' => 1800,
           ],
-          'grandgrandchild' => [
+          'great grandchild' => [
             '#access_callback' => function () use (&$current_user_role) {
               // Only role C can access this subtree.
               return $current_user_role === 'C';
@@ -400,7 +400,7 @@ public function testConditionalCacheContextBubblingSelfHealing() {
       '#markup' => 'parent',
     ]);
 
-    // Request 3: role C, both the grandchild and the grandgrandchild are
+    // Request 3: role C, both the grandchild and the great grandchild are
     // accessible => bubbled cache contexts: foo, bar, user.roles + merged
     // max-age: 300.
     $element = $test_element;
diff --git a/core/themes/claro/claro.theme b/core/themes/claro/claro.theme
index 0e53735e32ee..4540cb9f9b36 100644
--- a/core/themes/claro/claro.theme
+++ b/core/themes/claro/claro.theme
@@ -458,7 +458,7 @@ function claro_form_alter(array &$form, FormStateInterface $form_state, $form_id
 
         // Group the bulk actions select and submit elements, and add a label
         // that makes the purpose of these elements more clear to
-        // screenreaders.
+        // screen readers.
         $form['bulk_actions_container']['#attributes']['role'] = 'group';
         $form['bulk_actions_container']['#attributes']['aria-labelledby'] = $label_id;
         $form['bulk_actions_container']['group_label'] = [
@@ -835,7 +835,7 @@ function claro_form_views_exposed_form_alter(&$form, FormStateInterface $form_st
   $view = $form_state->getStorage()['view'];
   $view_title = $view->getTitle();
 
-  // Add a label so screenreaders can identify the purpose of the exposed form
+  // Add a label so screen readers can identify the purpose of the exposed form
   // without having to scan content that appears further down the page.
   $form['#attributes']['aria-label'] = t('Filter the contents of the %view_title view', ['%view_title' => $view_title]);
 }
diff --git a/sites/default/default.settings.php b/sites/default/default.settings.php
index 0c1b1155d6e2..d69b1865ecf0 100644
--- a/sites/default/default.settings.php
+++ b/sites/default/default.settings.php
@@ -78,8 +78,8 @@
  * @code
  * $databases['default']['default'] = [
  *   'database' => 'databasename',
- *   'username' => 'sqlusername',
- *   'password' => 'sqlpassword',
+ *   'username' => 'sql_username',
+ *   'password' => 'sql_password',
  *   'host' => 'localhost',
  *   'port' => '3306',
  *   'driver' => 'mysql',
@@ -194,8 +194,8 @@
  *   $databases['default']['default'] = [
  *     'driver' => 'pgsql',
  *     'database' => 'databasename',
- *     'username' => 'sqlusername',
- *     'password' => 'sqlpassword',
+ *     'username' => 'sql_username',
+ *     'password' => 'sql_password',
  *     'host' => 'localhost',
  *     'prefix' => '',
  *   ];
@@ -205,7 +205,7 @@
  * @code
  *   $databases['default']['default'] = [
  *     'driver' => 'sqlite',
- *     'database' => '/path/to/databasefilename',
+ *     'database' => '/path/to/database_filename',
  *   ];
  * @endcode
  *
@@ -216,8 +216,8 @@
  *     'namespace' => 'Drupal\my_module\Driver\Database\my_driver',
  *     'autoload' => 'modules/my_module/src/Driver/Database/my_driver/',
  *     'database' => 'databasename',
- *     'username' => 'sqlusername',
- *     'password' => 'sqlpassword',
+ *     'username' => 'sql_username',
+ *     'password' => 'sql_password',
  *     'host' => 'localhost',
  *     'prefix' => '',
  *   ];
@@ -231,8 +231,8 @@
  *     'namespace' => 'Drupal\my_module\Driver\Database\my_driver',
  *     'autoload' => 'modules/my_module/src/Driver/Database/my_driver/',
  *     'database' => 'databasename',
- *     'username' => 'sqlusername',
- *     'password' => 'sqlpassword',
+ *     'username' => 'sql_username',
+ *     'password' => 'sql_password',
  *     'host' => 'localhost',
  *     'prefix' => '',
  *     'dependencies' => [
@@ -588,7 +588,7 @@
  * the output of phpinfo(). The full output can contain sensitive information
  * so by default Drupal removes some sections.
  *
- * This behaviour can be configured by setting this variable to a different
+ * This behavior can be configured by setting this variable to a different
  * value corresponding to the flags parameter of phpinfo().
  *
  * If you need to expose more information in the report - for example to debug a
-- 
GitLab