Skip to content

Commit 3702ffc

Browse files
authored
Remove false friend 'eventually' (#3005)
Remove (user-facing) occurrences of wrong usage of the word '**_eventually_**' (wrongly translated → german '**_eventuell_**' `!=` english '**_eventual(ly_)**').
1 parent 6749b4f commit 3702ffc

File tree

5 files changed

+11
-11
lines changed

5 files changed

+11
-11
lines changed

application/forms/IcingaObjectFieldForm.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,8 @@ public function setup()
111111
$this->addFilterElement('var_filter', [
112112
'description' => $this->translate(
113113
'You might want to show this field only when certain conditions are met.'
114-
. ' Otherwise it will not be available and values eventually set before'
115-
. ' will be cleared once stored'
114+
. ' Be careful, if previously satisfied conditions are no longer met'
115+
. ' and the object is updated, the field\'s value will be lost.'
116116
),
117117
'columns' => $filterFields,
118118
]);

doc/10-How-it-works.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ the Director.
1717
The Director uses the Icinga 2 API to ship the configuration. It does
1818
so by shipping full config packages, it does not deal with single
1919
objects. This makes deployments much faster. It also makes it easier to
20-
eventually use Director in parallel with manual configuration or
21-
configuration shipped by other tools.
20+
use Director in parallel with manual configuration or configuration
21+
shipped by other tools.
2222

2323
Internally, Icinga 2 manages part of its configuration in its `var/lib`
2424
directory. This is usually to be found in `/var/lib/icinga2`. Config

doc/60-CLI.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ Use this command to modify specific properties of an existing Icinga object.
137137
| `--<key> <value>` | Provide all properties as single command line options |
138138
| `--append-<key> <value>` | Appends to array values, like `imports`, |
139139
| | `groups` or `vars.system_owners` |
140-
| `--remove-<key> [<value>]` | Remove a specific property, eventually only |
140+
| `--remove-<key> [<value>]` | Remove a specific property, potentially only |
141141
| | when matching `value`. In case the property is an |
142142
| | array it will remove just `value` when given |
143143
| `--json` | Otherwise provide all options as a JSON string |
@@ -174,7 +174,7 @@ you whether an object has either been created or (not) modified.
174174

175175
With `set` you only set the specified properties and do not touch the other
176176
ones. You could also want to completely override an object, purging all other
177-
eventually existing and unspecified parameters. Please use `--replace` if this
177+
unspecified parameters that might already exist. Please use `--replace` if this
178178
is the desired behaviour.
179179

180180

@@ -504,8 +504,8 @@ You can override this by adding the `--force` parameter. It will then tell you:
504504
Config matches active stage, deploying anyway
505505
```
506506

507-
In case you want to do not want `deploy` to waste time to re-render your
508-
config or in case you decide to re-deploy a specific, eventually older config
507+
In case you do not want `deploy` to waste time re-rendering your config
508+
or in case you decide to re-deploy a specific, possibly older, config
509509
version the `deploy` command allows you to provide a specific checksum:
510510

511511
```shell

doc/79-Jobs.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
=====================
33

44
The [background daemon](75-Background-Daemon.md) is responsible for running
5-
Jobs accoring our schedule. Director allows you to schedule eventually long-
6-
running tasks so that they can run in the background.
5+
jobs according to our schedule. Director allows you to schedule long-
6+
running tasks, so they can run in the background.
77

88
Currently this includes:
99

library/Director/KickstartHelper.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -446,7 +446,7 @@ protected function removeObjects(array $objects, $typeName)
446446
$object->delete();
447447
} catch (Exception $e) {
448448
throw new RuntimeException(sprintf(
449-
"Failed to remove %s '%s', it's eventually still in use",
449+
"Failed to remove %s '%s', it might still be in use",
450450
$typeName,
451451
$object->getObjectName()
452452
), 0, $e);

0 commit comments

Comments
 (0)