diff --git a/application/forms/IcingaObjectFieldForm.php b/application/forms/IcingaObjectFieldForm.php index 3b503fcc..1172e9b1 100644 --- a/application/forms/IcingaObjectFieldForm.php +++ b/application/forms/IcingaObjectFieldForm.php @@ -111,8 +111,8 @@ class IcingaObjectFieldForm extends DirectorObjectForm $this->addFilterElement('var_filter', [ 'description' => $this->translate( 'You might want to show this field only when certain conditions are met.' - . ' Otherwise it will not be available and values eventually set before' - . ' will be cleared once stored' + . ' Be careful, if previously satisfied conditions are no longer met' + . ' and the object is updated, the field\'s value will be lost.' ), 'columns' => $filterFields, ]); diff --git a/doc/10-How-it-works.md b/doc/10-How-it-works.md index 5f683fb6..2d93c0ce 100644 --- a/doc/10-How-it-works.md +++ b/doc/10-How-it-works.md @@ -17,8 +17,8 @@ the Director. The Director uses the Icinga 2 API to ship the configuration. It does so by shipping full config packages, it does not deal with single objects. This makes deployments much faster. It also makes it easier to -eventually use Director in parallel with manual configuration or -configuration shipped by other tools. +use Director in parallel with manual configuration or configuration +shipped by other tools. Internally, Icinga 2 manages part of its configuration in its `var/lib` directory. This is usually to be found in `/var/lib/icinga2`. Config diff --git a/doc/60-CLI.md b/doc/60-CLI.md index 5d352446..895f9654 100644 --- a/doc/60-CLI.md +++ b/doc/60-CLI.md @@ -137,7 +137,7 @@ Use this command to modify specific properties of an existing Icinga object. | `-- ` | Provide all properties as single command line options | | `--append- ` | Appends to array values, like `imports`, | | | `groups` or `vars.system_owners` | -| `--remove- []` | Remove a specific property, eventually only | +| `--remove- []` | Remove a specific property, potentially only | | | when matching `value`. In case the property is an | | | array it will remove just `value` when given | | `--json` | Otherwise provide all options as a JSON string | @@ -174,7 +174,7 @@ you whether an object has either been created or (not) modified. With `set` you only set the specified properties and do not touch the other ones. You could also want to completely override an object, purging all other -eventually existing and unspecified parameters. Please use `--replace` if this +unspecified parameters that might already exist. Please use `--replace` if this is the desired behaviour. @@ -504,8 +504,8 @@ You can override this by adding the `--force` parameter. It will then tell you: Config matches active stage, deploying anyway ``` -In case you want to do not want `deploy` to waste time to re-render your -config or in case you decide to re-deploy a specific, eventually older config +In case you do not want `deploy` to waste time re-rendering your config +or in case you decide to re-deploy a specific, possibly older, config version the `deploy` command allows you to provide a specific checksum: ```shell diff --git a/doc/79-Jobs.md b/doc/79-Jobs.md index 09ab6020..76359d25 100644 --- a/doc/79-Jobs.md +++ b/doc/79-Jobs.md @@ -2,8 +2,8 @@ ===================== The [background daemon](75-Background-Daemon.md) is responsible for running -Jobs accoring our schedule. Director allows you to schedule eventually long- -running tasks so that they can run in the background. +jobs according to our schedule. Director allows you to schedule long- +running tasks, so they can run in the background. Currently this includes: diff --git a/library/Director/KickstartHelper.php b/library/Director/KickstartHelper.php index 5010255c..3628ed58 100644 --- a/library/Director/KickstartHelper.php +++ b/library/Director/KickstartHelper.php @@ -446,7 +446,7 @@ class KickstartHelper $object->delete(); } catch (Exception $e) { throw new RuntimeException(sprintf( - "Failed to remove %s '%s', it's eventually still in use", + "Failed to remove %s '%s', it might still be in use", $typeName, $object->getObjectName() ), 0, $e);