diff --git a/administrator/components/com_users/src/Model/UsersModel.php b/administrator/components/com_users/src/Model/UsersModel.php index c3695de7b5ddf..657ccdfba653c 100644 --- a/administrator/components/com_users/src/Model/UsersModel.php +++ b/administrator/components/com_users/src/Model/UsersModel.php @@ -235,7 +235,7 @@ public function getItems() return false; } - // Second pass: collect the group counts into the master items array. + // Second pass: collect the group counts into the main items array. foreach ($items as &$item) { if (isset($userGroups[$item->id])) { $item->group_count = $userGroups[$item->id]->group_count; diff --git a/build/media_source/templates/site/cassiopeia/scss/tools/variables/_variables.scss b/build/media_source/templates/site/cassiopeia/scss/tools/variables/_variables.scss index 8c0c82f1c7b93..8dc871a3f6340 100644 --- a/build/media_source/templates/site/cassiopeia/scss/tools/variables/_variables.scss +++ b/build/media_source/templates/site/cassiopeia/scss/tools/variables/_variables.scss @@ -204,7 +204,7 @@ $form-select-multiple-padding-y: .3rem !default; $form-range-thumb-active-bg: tint-color($standard-color-primary, 70%) !default; -// Z-index master list +// Z-index source list $zindex-negative: -1 !default; $zindex-actions: auto !default; $zindex-toolbar: 1000 !default; diff --git a/components/com_content/src/Model/ArchiveModel.php b/components/com_content/src/Model/ArchiveModel.php index 3920d073d189e..66df84c761dd0 100644 --- a/components/com_content/src/Model/ArchiveModel.php +++ b/components/com_content/src/Model/ArchiveModel.php @@ -82,7 +82,7 @@ protected function populateState($ordering = null, $direction = null) } /** - * Get the master query for retrieving a list of articles subject to the model state. + * Get the main query for retrieving a list of articles subject to the model state. * * @return \Joomla\Database\DatabaseQuery * diff --git a/plugins/extension/joomla/src/Extension/Joomla.php b/plugins/extension/joomla/src/Extension/Joomla.php index 814b1f408a1d8..7595150646f4c 100644 --- a/plugins/extension/joomla/src/Extension/Joomla.php +++ b/plugins/extension/joomla/src/Extension/Joomla.php @@ -21,7 +21,7 @@ // phpcs:enable PSR1.Files.SideEffects /** - * Joomla! master extension plugin. + * Joomla! main extension plugin. * * @since 1.6 */