Commit 4e743b3f authored by Chris's avatar Chris
Browse files

Merge branch 'Spelling-Correction' into 'master'

Minor spelling corrections.

See merge request !2
parents 83fbbc5a cebdf5ee
......@@ -12,7 +12,7 @@ try {
ISPConfigLog::setLogPriority(ISPConfigLog::PRIO_INFO);
ISPConfig::run();
} catch(Exception $e) {
ISPConfigLog::error('Exception occured: ' . get_class($e) . ' -> ' . $e->getMessage(), true);
ISPConfigLog::error('Exception occurred: ' . get_class($e) . ' -> ' . $e->getMessage(), true);
//var_dump($e);
exit;
}
\ No newline at end of file
......@@ -285,7 +285,7 @@ Possible arguments are:
--use-unbound ->Use unbound instead of bind9 for local resolving. Only allowed if --no-dns is set.
--use-php ->Use specific PHP versions, comma separated, instead of installing multiple PHP, e.g. --use-php=7.4,8.0 (5.6, 7.0, 7.1, 7.2, 7.3, 7.4 and 8.0 available).
->--use-php=system disables the sury repository and just installs the system\'s default PHP version.
->ommiting the argument (use all versions)
->omitting the argument (use all versions)
--use-ftp-ports ->This option sets the passive port range for pure-ftpd. You have to specify the port range separated by hyphen, e. g. --use-ftp-ports=40110-40210.
->If not provided the passive port range will not be configured.
--use-certbot ->Use Certbot instead of acme.sh for issuing Let\'s Encrypt certificates. Not adviced unless you are migrating from a old server that uses Certbot.
......
......@@ -378,7 +378,7 @@ class ISPConfigDatabase {
* - 2 parameters
* executes the given query, replaces the first ? in the query with the second parameter
* - 3 parameters
* if the 2nd parameter is a boolean true, the 3rd parameter has to be an array containing all the replacements for every occuring ? in the query, otherwise the second parameter replaces the first ?, the third parameter replaces the second ? in the query
* if the 2nd parameter is a boolean true, the 3rd parameter has to be an array containing all the replacements for every occurring ? in the query, otherwise the second parameter replaces the first ?, the third parameter replaces the second ? in the query
* - 4 or more parameters
* all ? in the query are replaced from left to right by the parameters 2 to x
*
......
......@@ -265,7 +265,7 @@ class ISPConfigBaseOS {
if($if_not) {
if(preg_match($search, $content, $matches)) {
if(strpos($matches[0], $if_not) !== false) {
// dont add!
// don't add!
continue;
}
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment