diff --git a/core/assets/scaffold/files/default.settings.php b/core/assets/scaffold/files/default.settings.php
index d69b1865ecf0442d90fb009c3e31ac19baa6be1b..63fb2df74a1bc9faf82fc5a72d9a76e090d6f20c 100644
--- a/core/assets/scaffold/files/default.settings.php
+++ b/core/assets/scaffold/files/default.settings.php
@@ -24,18 +24,18 @@
* 'sites/default' will be used.
*
* For example, for a fictitious site installed at
- * https://www.drupal.org:8080/mysite/test/, the 'settings.php' file is searched
+ * https://www.drupal.org:8080/my-site/test/, the 'settings.php' file is searched
* for in the following directories:
*
- * - sites/8080.www.drupal.org.mysite.test
- * - sites/www.drupal.org.mysite.test
- * - sites/drupal.org.mysite.test
- * - sites/org.mysite.test
+ * - sites/8080.www.drupal.org.my-site.test
+ * - sites/www.drupal.org.my-site.test
+ * - sites/drupal.org.my-site.test
+ * - sites/org.my-site.test
*
- * - sites/8080.www.drupal.org.mysite
- * - sites/www.drupal.org.mysite
- * - sites/drupal.org.mysite
- * - sites/org.mysite
+ * - sites/8080.www.drupal.org.my-site
+ * - sites/www.drupal.org.my-site
+ * - sites/drupal.org.my-site
+ * - sites/org.my-site
*
* - sites/8080.www.drupal.org
* - sites/www.drupal.org
@@ -46,8 +46,8 @@
*
* Note that if you are installing on a non-standard port number, prefix the
* hostname with that number. For example,
- * https://www.drupal.org:8080/mysite/test/ could be loaded from
- * sites/8080.www.drupal.org.mysite.test/.
+ * https://www.drupal.org:8080/my-site/test/ could be loaded from
+ * sites/8080.www.drupal.org.my-site.test/.
*
* @see example.sites.php
* @see \Drupal\Core\DrupalKernel::getSitePath()
diff --git a/core/assets/scaffold/files/example.sites.php b/core/assets/scaffold/files/example.sites.php
index 32dca95ad6371a73e18570a57f84b1027b10350c..3b32b5aba1699ae93a35da0063c339b42c2bec4e 100644
--- a/core/assets/scaffold/files/example.sites.php
+++ b/core/assets/scaffold/files/example.sites.php
@@ -23,14 +23,14 @@
*
* Aliases are defined in an associative array named $sites. The array is
* written in the format: '<port>.<domain>.<path>' => 'directory'. As an
- * example, to map https://www.drupal.org:8080/mysite/test to the configuration
+ * example, to map https://www.drupal.org:8080/my-site/test to the configuration
* directory sites/example.com, the array should be defined as:
* @code
* $sites = [
- * '8080.www.drupal.org.mysite.test' => 'example.com',
+ * '8080.www.drupal.org.my-site.test' => 'example.com',
* ];
* @endcode
- * The URL, https://www.drupal.org:8080/mysite/test/, could be a symbolic link
+ * The URL, https://www.drupal.org:8080/my-site/test/, could be a symbolic link
* or an Apache Alias directive that points to the Drupal root containing
* index.php. An alias could also be created for a subdomain. See the
* @link https://www.drupal.org/documentation/install online Drupal installation guide @endlink
@@ -47,8 +47,8 @@
* URL: http://localhost:8080/example
* $sites['8080.localhost.example'] = 'example.com';
*
- * URL: https://www.drupal.org:8080/mysite/test/
- * $sites['8080.www.drupal.org.mysite.test'] = 'example.com';
+ * URL: https://www.drupal.org:8080/my-site/test/
+ * $sites['8080.www.drupal.org.my-site.test'] = 'example.com';
* @endcode
*
* @see default.settings.php
diff --git a/core/authorize.php b/core/authorize.php
index 9ffe8e2b7d3e03d3ff0c435cc1aa42685ef98ca8..484b57fb7068305e119a135e8023f0b64a60249f 100644
--- a/core/authorize.php
+++ b/core/authorize.php
@@ -11,7 +11,7 @@
* user interface which knows how to redirect the user to this script as part of
* a multistep process. This script actually performs the selected operations
* without loading all of Drupal, to be able to more gracefully recover from
- * errors. Access to the script is controlled by a global killswitch in
+ * errors. Access to the script is controlled by a global kill switch in
* settings.php ('allow_authorize_operations') and via the 'administer software
* updates' permission.
*
@@ -47,7 +47,7 @@
/**
* Determines if the current user is allowed to run authorize.php.
*
- * The killswitch in settings.php overrides all else, otherwise, the user must
+ * The kill switch in settings.php overrides all else, otherwise, the user must
* have access to the 'administer software updates' permission.
*
* @param \Symfony\Component\HttpFoundation\Request $request
diff --git a/core/core.api.php b/core/core.api.php
index 97cbfd05b277317e4aecde275fe587c57861697f..0bc2099ccc526ed9682029b10609c3d718145731 100644
--- a/core/core.api.php
+++ b/core/core.api.php
@@ -455,9 +455,9 @@
*
* When you request a cache object, you can specify the bin name in your call to
* \Drupal::cache(). Alternatively, you can request a bin by getting service
- * "cache.nameofbin" from the container. The default bin is called "default", with
- * service name "cache.default", it is used to store common and frequently used
- * caches.
+ * "cache.name_of_bin" from the container. The default bin is called "default",
+ * with service name "cache.default", it is used to store common and frequently
+ * used caches.
*
* Other common cache bins are the following:
* - bootstrap: Data needed from the beginning to the end of most requests,
@@ -470,14 +470,14 @@
*
* A module can define a cache bin by defining a service in its
* modulename.services.yml file as follows (substituting the desired name for
- * "nameofbin"):
+ * "name_of_bin"):
* @code
- * cache.nameofbin:
+ * cache.name_of_bin:
* class: Drupal\Core\Cache\CacheBackendInterface
* tags:
* - { name: cache.bin }
* factory: ['@cache_factory', 'get']
- * arguments: [nameofbin]
+ * arguments: [name_of_bin]
* @endcode
* See the @link container Services topic @endlink for more on defining
* services.
@@ -1038,7 +1038,7 @@
* Typically, you will want to extend one of the classes listed in the
* sections above as a starting point.
* - Make your class into a DataType plugin. To do that, put it in namespace
- * \Drupal\yourmodule\Plugin\DataType (where "yourmodule" is your module's
+ * \Drupal\your_module\Plugin\DataType (where "your_module" is your module's
* short name), and add annotation of type
* \Drupal\Core\TypedData\Annotation\DataType to the documentation header.
* See the @link plugin_api Plugin API topic @endlink and the
@@ -1098,8 +1098,8 @@
* (database, settings, etc.) and web browser are not needed for the test,
* or if the Drupal environment can be replaced by a "mock" object.
* - Base class: \Drupal\Tests\UnitTestCase
- * - Namespace: \Drupal\Tests\yourmodule\Unit (or a subdirectory)
- * - Directory location: yourmodule/tests/src/Unit (or a subdirectory)
+ * - Namespace: \Drupal\Tests\your_module\Unit (or a subdirectory)
+ * - Directory location: your_module/tests/src/Unit (or a subdirectory)
* - Kernel tests:
* - Purpose: Test functionality of a class if the full Drupal environment
* and web browser are not needed for the test, but the functionality has
@@ -1109,21 +1109,21 @@
* are only installed to the point of having services and hooks, unless you
* install them explicitly.
* - Base class: \Drupal\KernelTests\KernelTestBase
- * - Namespace: \Drupal\Tests\yourmodule\Kernel (or a subdirectory)
- * - Directory location: yourmodule/tests/src/Kernel (or a subdirectory)
+ * - Namespace: \Drupal\Tests\your_module\Kernel (or a subdirectory)
+ * - Directory location: your_module/tests/src/Kernel (or a subdirectory)
* - Browser tests:
* - Purpose: Test functionality with the full Drupal environment and an
* internal simulated web browser, if JavaScript is not needed.
* - Base class: \Drupal\Tests\BrowserTestBase
- * - Namespace: \Drupal\Tests\yourmodule\Functional (or a subdirectory)
- * - Directory location: yourmodule/tests/src/Functional (or a subdirectory)
+ * - Namespace: \Drupal\Tests\your_module\Functional (or a subdirectory)
+ * - Directory location: your_module/tests/src/Functional (or a subdirectory)
* - Browser tests with JavaScript:
* - Purpose: Test functionality with the full Drupal environment and an
* internal web browser that includes JavaScript execution.
* - Base class: \Drupal\FunctionalJavascriptTests\WebDriverTestBase
- * - Namespace: \Drupal\Tests\yourmodule\FunctionalJavascript (or a
+ * - Namespace: \Drupal\Tests\your_module\FunctionalJavascript (or a
* subdirectory)
- * - Directory location: yourmodule/tests/src/FunctionalJavascript (or a
+ * - Directory location: your_module/tests/src/FunctionalJavascript (or a
* subdirectory)
* - Build tests:
* - Purpose: Test building processes and their outcomes, such as whether a
@@ -1132,9 +1132,9 @@
* workspace and a PHP-native HTTP server to send requests to the site
* you've built.
* - Base class: \Drupal\BuildTests\Framework\BuildTestBase
- * - Namespace: \Drupal\Tests\yourmodule\Build (or a
+ * - Namespace: \Drupal\Tests\your_module\Build (or a
* subdirectory)
- * - Directory location: yourmodule/tests/src/Build (or a
+ * - Directory location: your_module/tests/src/Build (or a
* subdirectory)
*
* Some notes about writing PHP test classes:
@@ -1148,7 +1148,7 @@
* test methods need to have a phpDoc block with @covers annotation telling
* which class method they are testing.
* - In some cases, you may need to write a test module to support your test;
- * put such modules under the yourmodule/tests/modules directory.
+ * put such modules under the your_module/tests/modules directory.
*
* Besides the PHPUnit tests described above, Drupal Core also includes a few
* JavaScript-only tests, which use the Nightwatch.js framework to test
diff --git a/core/lib/Drupal/Component/Datetime/DateTimePlus.php b/core/lib/Drupal/Component/Datetime/DateTimePlus.php
index 6213275ed89d2d0b2a99a0d72508d7101256f9d5..08734733dea40cb25212a350cf3d55d0ebf395c3 100644
--- a/core/lib/Drupal/Component/Datetime/DateTimePlus.php
+++ b/core/lib/Drupal/Component/Datetime/DateTimePlus.php
@@ -30,7 +30,7 @@
* @method $this setDate(int $year, int $month, int $day)
* @method $this setISODate(int $year, int $week, int $day = 1)
* @method $this setTime(int $hour, int $minute, int $second = 0, int $microseconds = 0)
- * @method $this setTimestamp(int $unixtimestamp)
+ * @method $this setTimestamp(int $unix_timestamp)
* @method $this setTimezone(\DateTimeZone $timezone)
* @method $this sub(\DateInterval $interval)
* @method int getOffset()
diff --git a/core/lib/Drupal/Component/PhpStorage/MTimeProtectedFileStorage.php b/core/lib/Drupal/Component/PhpStorage/MTimeProtectedFileStorage.php
index 4f30d9f5607643f1e3c9f1363b404f413aec8670..e4c368b2d9dc1ec67cb852a50d7504f7170d92c9 100644
--- a/core/lib/Drupal/Component/PhpStorage/MTimeProtectedFileStorage.php
+++ b/core/lib/Drupal/Component/PhpStorage/MTimeProtectedFileStorage.php
@@ -26,7 +26,7 @@
* at the cost of an additional system call for every load() and exists().
*
* The containing directory is created with the same name as the virtual file
- * name (slashes replaced with hashmarks) to assist with debugging, since the
+ * name (slashes replaced with hash marks) to assist with debugging, since the
* file itself is stored with a name that's meaningless to humans.
*/
class MTimeProtectedFileStorage extends MTimeProtectedFastFileStorage {
diff --git a/core/lib/Drupal/Component/Transliteration/PhpTransliteration.php b/core/lib/Drupal/Component/Transliteration/PhpTransliteration.php
index aa6cd91470b8403f14e43a60f7661f1d1fd740c2..781c088cfec018b399e513b4a858c06b05e26a43 100644
--- a/core/lib/Drupal/Component/Transliteration/PhpTransliteration.php
+++ b/core/lib/Drupal/Component/Transliteration/PhpTransliteration.php
@@ -2,7 +2,7 @@
namespace Drupal\Component\Transliteration;
-// cspell:ignore vibber
+// cspell:ignore Brion Vibber
/**
* Implements transliteration without using the PECL extensions.
diff --git a/core/lib/Drupal/Component/Utility/UrlHelper.php b/core/lib/Drupal/Component/Utility/UrlHelper.php
index 6b1f3ab12f3f779322ad86a24257100a4cfc64ee..6bc65584cf7111024ca33518b618dc68af2705f0 100644
--- a/core/lib/Drupal/Component/Utility/UrlHelper.php
+++ b/core/lib/Drupal/Component/Utility/UrlHelper.php
@@ -17,7 +17,7 @@ class UrlHelper {
protected static $allowedProtocols = ['http', 'https'];
/**
- * Parses an array into a valid, rawurlencoded query string.
+ * Parses an array into a valid query string encoded with rawurlencode().
*
* Function rawurlencode() is RFC3986 compliant, and as a consequence RFC3987
* compliant. The latter defines the required format of "URLs" in HTML5.
@@ -34,8 +34,8 @@ class UrlHelper {
* nested items. Defaults to an empty string.
*
* @return string
- * A rawurlencoded string which can be used as or appended to the URL query
- * string.
+ * A string encoded with rawurlencode() which can be used as or appended to
+ * the URL query string.
*
* @ingroup php_wrappers
*/
diff --git a/core/lib/Drupal/Core/Asset/CssOptimizer.php b/core/lib/Drupal/Core/Asset/CssOptimizer.php
index 413106cf9833f0af7709c7272d10580286a07c07..f075666a8d1975c2c2be89e23514521f67ade815 100644
--- a/core/lib/Drupal/Core/Asset/CssOptimizer.php
+++ b/core/lib/Drupal/Core/Asset/CssOptimizer.php
@@ -106,8 +106,8 @@ protected function processFile($css_asset) {
* color.module enabled themes with CSS aggregation turned off.
*
* Note: the only reason this method is public is so color.module can call it;
- * it is not on the AssetOptimizerInterface, so future refactorings can make
- * it protected.
+ * it is not on the AssetOptimizerInterface, so any future refactoring can
+ * make it protected.
*
* @param $file
* Name of the stylesheet to be processed.
@@ -271,8 +271,8 @@ protected function processCss($contents, $optimize = FALSE) {
* Prefixes all paths within a CSS file for processFile().
*
* Note: the only reason this method is public is so color.module can call it;
- * it is not on the AssetOptimizerInterface, so future refactorings can make
- * it protected.
+ * it is not on the AssetOptimizerInterface, so any future refactoring can
+ * make it protected.
*
* @param array $matches
* An array of matches by a preg_replace_callback() call that scans for
diff --git a/core/lib/Drupal/Core/Database/database.api.php b/core/lib/Drupal/Core/Database/database.api.php
index 50e4bb506073d73cbf8aab0026a9f27b6d97e846..28b8e42b299ccde1e3512f1cd21e2dc11f0088b6 100644
--- a/core/lib/Drupal/Core/Database/database.api.php
+++ b/core/lib/Drupal/Core/Database/database.api.php
@@ -324,7 +324,7 @@
* 'varchar' must specify the 'length' parameter.
* - 'primary key': An array of one or more key column specifiers (see below)
* that form the primary key.
- * - 'unique keys': An associative array of unique keys ('keyname' =>
+ * - 'unique keys': An associative array of unique keys ('key_name' =>
* specification). Each specification is an array of one or more
* key column specifiers (see below) that form a unique key on the table.
* - 'foreign keys': An associative array of relations ('my_relation' =>
diff --git a/core/lib/Drupal/Core/DrupalKernel.php b/core/lib/Drupal/Core/DrupalKernel.php
index d778693888f699508fbc44c9cab1b182a668bf5f..9eb5eec531fd8b7ff9fa4a9ab2885367521cfcf0 100644
--- a/core/lib/Drupal/Core/DrupalKernel.php
+++ b/core/lib/Drupal/Core/DrupalKernel.php
@@ -348,11 +348,11 @@ protected static function guessApplicationRoot() {
* The sites.php file in the sites directory can define aliases in an
* associative array named $sites. The array is written in the format
* '<port>.<domain>.<path>' => 'directory'. As an example, to create a
- * directory alias for https://www.drupal.org:8080/mysite/test whose
+ * directory alias for https://www.drupal.org:8080/my-site/test whose
* configuration file is in sites/example.com, the array should be defined as:
* @code
* $sites = array(
- * '8080.www.drupal.org.mysite.test' => 'example.com',
+ * '8080.www.drupal.org.my-site.test' => 'example.com',
* );
* @endcode
*
diff --git a/core/lib/Drupal/Core/Entity/ContentEntityForm.php b/core/lib/Drupal/Core/Entity/ContentEntityForm.php
index 16e3df8694b8ad955a5ca1b119ff8f7c9f0f1f92..0855f1e3f77557466a197ecf969ca0767f9d199e 100644
--- a/core/lib/Drupal/Core/Entity/ContentEntityForm.php
+++ b/core/lib/Drupal/Core/Entity/ContentEntityForm.php
@@ -223,8 +223,8 @@ public function validateForm(array &$form, FormStateInterface $form_state) {
/**
* Gets the names of all fields edited in the form.
*
- * If the entity form customly adds some fields to the form (i.e. without
- * using the form display), it needs to add its fields here and override
+ * If a custom entity form adds some fields to the form (i.e. without using
+ * the form display), it needs to add its fields here and override
* flagViolations() for displaying the violations.
*
* @param \Drupal\Core\Form\FormStateInterface $form_state
@@ -240,8 +240,8 @@ protected function getEditedFieldNames(FormStateInterface $form_state) {
/**
* Flags violations for the current form.
*
- * If the entity form customly adds some fields to the form (i.e. without
- * using the form display), it needs to add its fields to array returned by
+ * If a custom entity form adds some fields to the form (i.e. without using
+ * the form display), it needs to add its fields to array returned by
* getEditedFieldNames() and overwrite this method in order to show any
* violations for those fields; e.g.:
* @code
diff --git a/core/lib/Drupal/Core/Logger/LoggerChannelInterface.php b/core/lib/Drupal/Core/Logger/LoggerChannelInterface.php
index ff6551335dd374a809daa44e8a0be8f2badfec5e..c5c2bec0321b253cab426041d531d53133154aab 100644
--- a/core/lib/Drupal/Core/Logger/LoggerChannelInterface.php
+++ b/core/lib/Drupal/Core/Logger/LoggerChannelInterface.php
@@ -11,7 +11,7 @@
*
* This interface defines the full behavior of the central Drupal logger
* facility. However, when writing code that does logging, use the generic
- * \Psr\Log\LoggerInterface for typehinting instead (you shouldn't need the
+ * \Psr\Log\LoggerInterface for type hinting instead (you shouldn't need the
* methods here).
*
* To add a new logger to the system, implement \Psr\Log\LoggerInterface and
diff --git a/core/lib/Drupal/Core/PathProcessor/PathProcessorFront.php b/core/lib/Drupal/Core/PathProcessor/PathProcessorFront.php
index 1136de701f2dfe8f8ad7ea2d20e6ba0e9d787491..f8ef4c28b2a250191c0daf2fa5475babbb638ccc 100644
--- a/core/lib/Drupal/Core/PathProcessor/PathProcessorFront.php
+++ b/core/lib/Drupal/Core/PathProcessor/PathProcessorFront.php
@@ -35,7 +35,7 @@ public function processInbound($path, Request $request) {
if ($path === '/') {
$path = $this->config->get('system.site')->get('page.front');
if (empty($path)) {
- // We have to return a valid path but / won't be routable and config
+ // We have to return a valid path but / does not have a route and config
// might be broken so stop execution.
throw new NotFoundHttpException();
}
diff --git a/core/lib/Drupal/Core/TempStore/PrivateTempStore.php b/core/lib/Drupal/Core/TempStore/PrivateTempStore.php
index 17f25c874cb077579f28073dc68280b4d4a56db4..1815de4a6298cdf75ab1f90e6227640558e8143b 100644
--- a/core/lib/Drupal/Core/TempStore/PrivateTempStore.php
+++ b/core/lib/Drupal/Core/TempStore/PrivateTempStore.php
@@ -15,7 +15,7 @@
* A PrivateTempStore can be used to make temporary, non-cache data available
* across requests. The data for the PrivateTempStore is stored in one
* key/value collection. PrivateTempStore data expires automatically after a
- * given timeframe.
+ * given time frame.
*
* The PrivateTempStore is different from a cache, because the data in it is not
* yet saved permanently and so it cannot be rebuilt. Typically, the
diff --git a/core/lib/Drupal/Core/TempStore/SharedTempStore.php b/core/lib/Drupal/Core/TempStore/SharedTempStore.php
index 089941c8de047dda95e070a401f61d30cd1244f5..47795183783e50cc889433947880de3ef7340116 100644
--- a/core/lib/Drupal/Core/TempStore/SharedTempStore.php
+++ b/core/lib/Drupal/Core/TempStore/SharedTempStore.php
@@ -14,7 +14,7 @@
* A SharedTempStore can be used to make temporary, non-cache data available
* across requests. The data for the SharedTempStore is stored in one key/value
* collection. SharedTempStore data expires automatically after a given
- * timeframe.
+ * time frame.
*
* The SharedTempStore is different from a cache, because the data in it is not
* yet saved permanently and so it cannot be rebuilt. Typically, the
diff --git a/core/misc/cspell/dictionary.txt b/core/misc/cspell/dictionary.txt
index 8fcbd4fe32ae774028877d851f3e6c5714ec9289..c9225e6024be7ed56501feaeaee4e3ee34a76e16 100644
--- a/core/misc/cspell/dictionary.txt
+++ b/core/misc/cspell/dictionary.txt
@@ -33,7 +33,6 @@ arrowthick
arrowthickstop
arrr
assertable
-authless
autocompletefocus
autocompleteselect
autocompleting
@@ -75,7 +74,6 @@ bebebe
beforeclose
beforecreate
behat
-behaviour
bergmann
berne
bgblue
@@ -98,7 +96,6 @@ blocktest
bodyless
boing
bovigo
-brion
brotli
browserkit
browsertest
@@ -106,7 +103,6 @@ browsertestbase
brûlée
bubbleable
buildable
-buildinfo
buildtest
bundleable
bundleless
@@ -155,7 +151,6 @@ classname
classtype
cldr
clearfix
-clicksorter
closethick
cnenzrgre
codesniffer
@@ -176,7 +171,6 @@ contextuals
controlgroup
conv
corge
-countquery
cpio
createkey
createrole
@@ -191,7 +185,6 @@ csstools
curle
curlopt
customevent
-customly
customrequest
cweagans
cádiz
@@ -326,7 +319,6 @@ filemime
filesort
filesystems
filetransfer
-filevalidationerror
findwith
flickr
flipfit
@@ -339,7 +331,6 @@ fooalert
foobarbaz
foofoo
formattable
-formvalidation
fouc
fourcol
fozzie
@@ -366,7 +357,6 @@ groupwise
guzzlehttp
hande
harkonnen
-hashmarks
hateoas
hexcode
hilited
@@ -422,10 +412,8 @@ kangarookitten
kerneltest
kernighan
keyevent
-keyname
keypresses
keyvalue
-killswitch
kinberg
kitt
kolkata
@@ -527,11 +515,9 @@ multivalued
muuuh
myclabs
mymodule
-mysite
mysqladmin
mysqldump
mystarterkit
-nameofbin
namespacing
navs
ndocs
@@ -686,7 +672,6 @@ ragdoll
ralouphie
rasterizable
rasterizes
-rawurlencoded
readmore
realpaths
realword
@@ -727,8 +712,6 @@ revlog
revpub
ribisi
ritchie
-routable
-routeable
rowspans
rsyslog
rtsp
@@ -897,7 +880,6 @@ theseparator
threecol
tids
timecurrent
-timeframe
timegate
timemap
timespan
@@ -931,7 +913,6 @@ twistie
twocol
typehint
typehinted
-typehinting
typehints
tzid
uids
@@ -966,14 +947,12 @@ uninstallations
uninstantiatable
uninstantiated
unixepoch
-unixtimestamp
unkeyed
unmanaged
unmatch
unminified
unmoderated
unparseable
-unpermissioned
unpreloaded
unpromote
unpromoted
@@ -1054,7 +1033,6 @@ yearless
yokotsoko
yottabyte
yottabytes
-yourmodule
yygroup
zartan
zettabyte
diff --git a/core/misc/message.js b/core/misc/message.js
index 9db487cd90855107d75b9e1cca33834dbf0097a8..88ac66dc03745f67c447872456bc1cc38b37c3cb 100644
--- a/core/misc/message.js
+++ b/core/misc/message.js
@@ -73,8 +73,8 @@
* @param {object} [options]
* The context of the message.
* @param {string} [options.id]
- * The message ID, it can be a simple value: `'filevalidationerror'`
- * or several values separated by a space: `'mymodule formvalidation'`
+ * The message ID, it can be a simple value: `'file_validation_error'`
+ * or several values separated by a space: `'my_module form_validation'`
* which can be used as an explicit selector for a message.
* @param {string} [options.type=status]
* Message type, can be either 'status', 'error' or 'warning'.
diff --git a/core/modules/node/tests/src/Functional/PageViewTest.php b/core/modules/node/tests/src/Functional/PageViewTest.php
index e7c302f7a9775fb54664f15e33faeb939e97a979..e316460975e795783f5768a3e23f6b318efa2390 100644
--- a/core/modules/node/tests/src/Functional/PageViewTest.php
+++ b/core/modules/node/tests/src/Functional/PageViewTest.php
@@ -17,7 +17,7 @@ class PageViewTest extends NodeTestBase {
protected $defaultTheme = 'stark';
/**
- * Tests an anonymous and unpermissioned user attempting to edit the node.
+ * Tests editing a node by users with various access permissions.
*/
public function testPageView() {
// Create a node to view.
diff --git a/core/modules/rest/tests/src/Functional/AnonResourceTestTrait.php b/core/modules/rest/tests/src/Functional/AnonResourceTestTrait.php
index 19bd2de2791fb8bd810efb655938bd9525d10a84..2011aa427d8551d71492b3bbb544eb10da465501 100644
--- a/core/modules/rest/tests/src/Functional/AnonResourceTestTrait.php
+++ b/core/modules/rest/tests/src/Functional/AnonResourceTestTrait.php
@@ -6,7 +6,10 @@
use Psr\Http\Message\ResponseInterface;
/**
- * Trait for ResourceTestBase subclasses testing $auth=NULL, i.e. authless/anon.
+ * Defines a trait for testing with no authentication provider.
+ *
+ * This is intended to be used with
+ * \Drupal\Tests\rest\Functional\ResourceTestBase.
*
* Characteristics:
* - When no authentication provider is being used, there also cannot be any
diff --git a/core/modules/system/tests/modules/entity_test/entity_test.module b/core/modules/system/tests/modules/entity_test/entity_test.module
index 5644ef696b37b8cfa7512265635caad3583deeae..9977fd3c5416654d1c23587ea4a0e5abf29d524a 100644
--- a/core/modules/system/tests/modules/entity_test/entity_test.module
+++ b/core/modules/system/tests/modules/entity_test/entity_test.module
@@ -32,7 +32,7 @@
const ENTITY_TEST_TYPES_MULTILINGUAL = 2;
/**
- * Filter that limits test entity list to routeable ones.
+ * Filter that limits test entity list to ones that can be routed.
*/
const ENTITY_TEST_TYPES_ROUTING = 3;
diff --git a/core/modules/update/update.manager.inc b/core/modules/update/update.manager.inc
index a51c81d7dfc39bd2c03816640f54dc84935f14c8..ca44f20ad93967f72b390b2155b1b1e6dd201c35 100644
--- a/core/modules/update/update.manager.inc
+++ b/core/modules/update/update.manager.inc
@@ -6,7 +6,7 @@
*
* This allows site administrators with the 'administer software updates'
* permission to either upgrade existing projects, or download and install new
- * ones, so long as the killswitch setting ('allow_authorize_operations') is
+ * ones, so long as the kill switch setting ('allow_authorize_operations') is
* not FALSE.
*
* To install new code, the administrator is prompted for either the URL of an
diff --git a/core/modules/views/src/Plugin/views/field/EntityField.php b/core/modules/views/src/Plugin/views/field/EntityField.php
index 0c4eed513d4be01c4f9f42aa63a6ce253c0b293b..6ef6b011b86347ac7d88ca841c9995fb66004232 100644
--- a/core/modules/views/src/Plugin/views/field/EntityField.php
+++ b/core/modules/views/src/Plugin/views/field/EntityField.php
@@ -329,7 +329,7 @@ public function clickSortable() {
}
/**
- * Called to determine what to tell the clicksorter.
+ * Called to determine what to tell the click sorter.
*/
public function clickSort($order) {
// No column selected, can't continue.
diff --git a/core/modules/views/src/Plugin/views/query/QueryPluginBase.php b/core/modules/views/src/Plugin/views/query/QueryPluginBase.php
index 1e0740fc9d25def71c25e415461c045b2658b80f..446b636f37571b24b5bc225909432053f0444b73 100644
--- a/core/modules/views/src/Plugin/views/query/QueryPluginBase.php
+++ b/core/modules/views/src/Plugin/views/query/QueryPluginBase.php
@@ -60,10 +60,10 @@ abstract class QueryPluginBase extends PluginBase implements CacheableDependency
protected $groupOperator;
/**
- * Generate a query and a countquery from all of the information supplied.
+ * Generate a query and a countQuery from all of the information supplied.
*
* @param $get_count
- * Provide a countquery if this is true, otherwise provide a normal query.
+ * Provide a countQuery if this is true, otherwise provide a normal query.
*/
public function query($get_count = FALSE) {}
diff --git a/core/modules/views/src/Plugin/views/query/Sql.php b/core/modules/views/src/Plugin/views/query/Sql.php
index e1ee41bf695f71f08d72b0b8c3b53d6ab125516a..c0f9c8867f219521768725f316fcc6df94937dd9 100644
--- a/core/modules/views/src/Plugin/views/query/Sql.php
+++ b/core/modules/views/src/Plugin/views/query/Sql.php
@@ -1293,10 +1293,10 @@ public function getConnection() {
}
/**
- * Generates a query and a countquery from all of the information supplied.
+ * Generates a query and count query from all of the information supplied.
*
* @param $get_count
- * Provide a countquery if this is true, otherwise provide a normal query.
+ * Provide a countQuery if this is true, otherwise provide a normal query.
*/
public function query($get_count = FALSE) {
// Check query distinct value.
diff --git a/core/modules/views_ui/src/ViewUI.php b/core/modules/views_ui/src/ViewUI.php
index a7a6e5ef7b37f89a5f61b34f0b52eafaa1a9c2fb..65983ad37301d3a2fed04ae702bbce7b6ba208d5 100644
--- a/core/modules/views_ui/src/ViewUI.php
+++ b/core/modules/views_ui/src/ViewUI.php
@@ -512,7 +512,7 @@ public function startQueryCapture() {
}
/**
- * Add the list of queries run during render to buildinfo.
+ * Add the list of queries run during render to build info.
*
* @see ViewUI::startQueryCapture()
*/
diff --git a/core/scripts/drupal.sh b/core/scripts/drupal.sh
index b6685db4c21de0870e6b22fd89c0bb6d752350a2..ad44e63082336297299341a7ce7d5df70deb926e 100755
--- a/core/scripts/drupal.sh
+++ b/core/scripts/drupal.sh
@@ -22,7 +22,7 @@
Execute a Drupal page from the shell.
Usage: {$script} [OPTIONS] "<URI>"
-Example: {$script} "http://mysite.org/node"
+Example: {$script} "http://my-site.org/node"
All arguments are long options.
diff --git a/core/tests/Drupal/Tests/BrowserTestBase.php b/core/tests/Drupal/Tests/BrowserTestBase.php
index 082292646eefac000238680c92ef3b3215abba70..35e8f55e9449445ad8b7aba97cc0ac6eea2d1c50 100644
--- a/core/tests/Drupal/Tests/BrowserTestBase.php
+++ b/core/tests/Drupal/Tests/BrowserTestBase.php
@@ -31,8 +31,8 @@
* Provides a test case for functional Drupal tests.
*
* Tests extending BrowserTestBase must exist in the
- * Drupal\Tests\yourmodule\Functional namespace and live in the
- * modules/yourmodule/tests/src/Functional directory.
+ * Drupal\Tests\your_module\Functional namespace and live in the
+ * modules/your_module/tests/src/Functional directory.
*
* Tests extending this base class should only translate text when testing
* translation functionality. For example, avoid wrapping test text with t()
diff --git a/sites/default/default.settings.php b/sites/default/default.settings.php
index d69b1865ecf0442d90fb009c3e31ac19baa6be1b..63fb2df74a1bc9faf82fc5a72d9a76e090d6f20c 100644
--- a/sites/default/default.settings.php
+++ b/sites/default/default.settings.php
@@ -24,18 +24,18 @@
* 'sites/default' will be used.
*
* For example, for a fictitious site installed at
- * https://www.drupal.org:8080/mysite/test/, the 'settings.php' file is searched
+ * https://www.drupal.org:8080/my-site/test/, the 'settings.php' file is searched
* for in the following directories:
*
- * - sites/8080.www.drupal.org.mysite.test
- * - sites/www.drupal.org.mysite.test
- * - sites/drupal.org.mysite.test
- * - sites/org.mysite.test
+ * - sites/8080.www.drupal.org.my-site.test
+ * - sites/www.drupal.org.my-site.test
+ * - sites/drupal.org.my-site.test
+ * - sites/org.my-site.test
*
- * - sites/8080.www.drupal.org.mysite
- * - sites/www.drupal.org.mysite
- * - sites/drupal.org.mysite
- * - sites/org.mysite
+ * - sites/8080.www.drupal.org.my-site
+ * - sites/www.drupal.org.my-site
+ * - sites/drupal.org.my-site
+ * - sites/org.my-site
*
* - sites/8080.www.drupal.org
* - sites/www.drupal.org
@@ -46,8 +46,8 @@
*
* Note that if you are installing on a non-standard port number, prefix the
* hostname with that number. For example,
- * https://www.drupal.org:8080/mysite/test/ could be loaded from
- * sites/8080.www.drupal.org.mysite.test/.
+ * https://www.drupal.org:8080/my-site/test/ could be loaded from
+ * sites/8080.www.drupal.org.my-site.test/.
*
* @see example.sites.php
* @see \Drupal\Core\DrupalKernel::getSitePath()
diff --git a/sites/example.sites.php b/sites/example.sites.php
index 32dca95ad6371a73e18570a57f84b1027b10350c..3b32b5aba1699ae93a35da0063c339b42c2bec4e 100644
--- a/sites/example.sites.php
+++ b/sites/example.sites.php
@@ -23,14 +23,14 @@
*
* Aliases are defined in an associative array named $sites. The array is
* written in the format: '<port>.<domain>.<path>' => 'directory'. As an
- * example, to map https://www.drupal.org:8080/mysite/test to the configuration
+ * example, to map https://www.drupal.org:8080/my-site/test to the configuration
* directory sites/example.com, the array should be defined as:
* @code
* $sites = [
- * '8080.www.drupal.org.mysite.test' => 'example.com',
+ * '8080.www.drupal.org.my-site.test' => 'example.com',
* ];
* @endcode
- * The URL, https://www.drupal.org:8080/mysite/test/, could be a symbolic link
+ * The URL, https://www.drupal.org:8080/my-site/test/, could be a symbolic link
* or an Apache Alias directive that points to the Drupal root containing
* index.php. An alias could also be created for a subdomain. See the
* @link https://www.drupal.org/documentation/install online Drupal installation guide @endlink
@@ -47,8 +47,8 @@
* URL: http://localhost:8080/example
* $sites['8080.localhost.example'] = 'example.com';
*
- * URL: https://www.drupal.org:8080/mysite/test/
- * $sites['8080.www.drupal.org.mysite.test'] = 'example.com';
+ * URL: https://www.drupal.org:8080/my-site/test/
+ * $sites['8080.www.drupal.org.my-site.test'] = 'example.com';
* @endcode
*
* @see default.settings.php