diff --git a/README.md b/README.md
index 1f6b30cc8c..437309afba 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@
| [ scrutinizer](https://scrutinizer-ci.com/g/EGroupware/egroupware/) | runs static analysis on our codebase |
|
| manual testing with unusual browser versions or platforms |
-### Default and prefered installation method for EGroupware is via your Linux package manager:
+### Default and preferred installation method for EGroupware is via your Linux package manager:
* [Installation & Update instructions](https://github.com/EGroupware/egroupware/wiki/Installation-using-egroupware-docker-RPM-DEB-package)
* [Distribution specific instructions](https://github.com/EGroupware/egroupware/wiki/Distribution-specific-instructions)
@@ -17,7 +17,7 @@
EGroupware 23.1 can be installed via Docker, in fact the DEB/RPM packages also does that. Instructions on how to run EGroupware in Docker are in our [Wiki](https://github.com/EGroupware/egroupware/wiki/Docker-compose-installation) and in [doc/docker](https://github.com/EGroupware/egroupware/tree/23.1/doc/docker) subdirectory.
### Installing EGroupware development version via Docker:
-* this is the prefered developer installation, as it contains eg. a push-server container
+* this is the preferred developer installation, as it contains eg. a push-server container
* https://github.com/EGroupware/egroupware/tree/master/doc/docker/development
### Deprecated EGroupware development installation:
@@ -49,11 +49,11 @@ cd /path/to/your/egroupware
setup/setup-cli.php # will tell you if a schema-update is necessary
```
install-cli.php supports the following "channels":
-- release: taged maintenance releases only eg. 19.1.20200701
+- release: tagged maintenance releases only eg. 19.1.20200701
- bugfix: release-branch incl. latest bugfixes eg. 20.1, if you are currently on 20.1.20200710
- \: switch to given branch
- master: latest development for next release
To change the channel, call ```install-cli.php ```.
-For further instalation instructions see our wiki.
+For further installation instructions see our wiki.
diff --git a/about.php b/about.php
index 5815a9e8cf..65dd48a052 100644
--- a/about.php
+++ b/about.php
@@ -1,6 +1,6 @@
.
@@ -41,9 +41,9 @@
* @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
*/
-chdir(__DIR__); // to enable relative pathes to work
+chdir(__DIR__); // to enable relative paths to work
-if (php_sapi_name() !== 'cli') // security precaution: forbit calling setup-cli as web-page
+if (php_sapi_name() !== 'cli') // security precaution: forbid calling setup-cli as web-page
{
die('install-cli.php must NOT be called as web-page --> exiting !!!
');
}
@@ -324,7 +324,7 @@ exit(count($failed));
/**
* Run a command and collect number of succieded or failed command
*
- * @param string $cmd comamnd to run
+ * @param string $cmd command to run
* @param string $name task name to report on failure
* @return int exit code of command
*/
@@ -381,7 +381,7 @@ function run_git(array $argv, $main_too=true)
/**
* Get the latest release
*
- * @param boolean $prerelease =false include releases taged as prerelease
+ * @param boolean $prerelease =false include releases tagged as prerelease
* @param boolean $return_name =true true: just return name, false: full release object
* @return array|string|null null if no release found
*/
diff --git a/login.php b/login.php
index 4f19bfe658..52482486be 100755
--- a/login.php
+++ b/login.php
@@ -79,7 +79,7 @@ if (($GLOBALS['sessionid'] = Api\Auth::login()))
}
else
{
- // allow template to overide login-template (without modifying header.inc.php) by setting default or forced pref
+ // allow template to override login-template (without modifying header.inc.php) by setting default or forced pref
$prefs = new Api\Preferences();
$prefs->account_id = Api\Preferences::DEFAULT_ID;
$prefs->read_repository();
@@ -180,7 +180,7 @@ else
}
}
- // use HTTP status code 401 for a failed login, so tools like fail2ban can recognice that for login page too
+ // use HTTP status code 401 for a failed login, so tools like fail2ban can recognize that for login page too
if ($_GET['cd'] == Api\Session::CD_BAD_LOGIN_OR_PASSWORD)
{
http_response_code(401);
diff --git a/service-worker.js b/service-worker.js
index 7069a3a2e3..9d1d3d0736 100644
--- a/service-worker.js
+++ b/service-worker.js
@@ -8,5 +8,5 @@
*/
this.addEventListener('fetch', function (event) {
- // temporary just to ommit error app not installable
+ // temporary just to omit error app not installable
});
\ No newline at end of file