diff --git a/README.md b/README.md index 1c8ddbcd..a8885726 100644 --- a/README.md +++ b/README.md @@ -41,7 +41,7 @@ they fit your needs. They are being used in productive environments: * [AWS - Amazon Web Services](https://github.com/Thomas-Gelf/icingaweb2-module-aws): provides an Import Source for Autoscaling Groups on AWS * [File-Shipper](https://github.com/Thomas-Gelf/icingaweb2-module-fileshipper): - allows Director to ship additional config files with manual config with it's + allows Director to ship additional config files with manual config with its deployments * [PuppetDB](https://github.com/Thomas-Gelf/icingaweb2-module-puppetdb): provides an Import Source dealing with your PuppetDB diff --git a/application/forms/IcingaImportObjectForm.php b/application/forms/IcingaImportObjectForm.php index 5d27d583..7f8eeb88 100644 --- a/application/forms/IcingaImportObjectForm.php +++ b/application/forms/IcingaImportObjectForm.php @@ -12,7 +12,7 @@ class IcingaImportObjectForm extends QuickForm public function setup() { $this->addNote($this->translate( - "Importing an object means that it's type will change from" + "Importing an object means that its type will change from" . ' "external" to "object". That way it will make part of the' . ' next deployment. So in case you imported this object from' . ' your Icinga node make sure to remove it from your local' diff --git a/application/forms/SyncRuleForm.php b/application/forms/SyncRuleForm.php index 82c664ae..75cbb76f 100644 --- a/application/forms/SyncRuleForm.php +++ b/application/forms/SyncRuleForm.php @@ -39,7 +39,7 @@ class SyncRuleForm extends DirectorObjectForm 'label' => $this->translate('Update Policity'), 'description' => $this->translate( 'Define what should happen when an object with a matching key' - . " already exists. You could merge it's properties (import source" + . " already exists. You could merge its properties (import source" . ' wins), replace it completely with the imported object or ignore' . ' it (helpful for one-time imports)' ), diff --git a/application/locale/de_DE/LC_MESSAGES/director.po b/application/locale/de_DE/LC_MESSAGES/director.po index 6c198634..5f04a280 100644 --- a/application/locale/de_DE/LC_MESSAGES/director.po +++ b/application/locale/de_DE/LC_MESSAGES/director.po @@ -798,7 +798,7 @@ msgstr "" #: /usr/share/icingaweb2/modules/director/application/forms/SyncRuleForm.php:41 msgid "" "Define what should happen when an object with a matching key already exists. " -"You could merge it's properties (import source wins), replace it completely " +"You could merge its properties (import source wins), replace it completely " "with the imported object or ignore it (helpful for one-time imports)" msgstr "" "Angeben, was geschehen soll wenn ein Objekt mit gleichem Schlüssel bereits " @@ -1214,7 +1214,7 @@ msgid "" "IP address / hostname of your Icinga node. Please note that this information " "will only be used for the very first connection to your Icinga instance. The " "Director then relies on a correctly configured Endpoint object. Correctly " -"configures means that either it's name is resolvable or that it's host " +"configures means that either its name is resolvable or that its host " "property contains either an IP address or a resolvable host name. Your " "Director must be able to reach this endpoint" msgstr "" @@ -1375,7 +1375,7 @@ msgstr "Importierte Reihen" #: /usr/share/icingaweb2/modules/director/application/forms/IcingaImportObjectForm.php:15 msgid "" -"Importing an object means that it's type will change from \"external\" to " +"Importing an object means that its type will change from \"external\" to " "\"object\". That way it will make part of the next deployment. So in case " "you imported this object from your Icinga node make sure to remove it from " "your local configuration before issueing the next deployment. In case of a " @@ -1408,7 +1408,7 @@ msgstr "Interne Kommandos" #: /usr/share/icingaweb2/modules/director/application/views/scripts/syncrule/index.phtml:53 #, php-format -msgid "It has been renamed since then, it's former name was %s" +msgid "It has been renamed since then, its former name was %s" msgstr "Es wurde seither umbenannt. Sein bisheriger Name war %s" #: /usr/share/icingaweb2/modules/director/application/views/scripts/importsource/index.phtml:9 @@ -2805,9 +2805,9 @@ msgstr "Das Objekt wird nicht ausgebracht, da es deaktiviert wurde" #: /usr/share/icingaweb2/modules/director/application/views/scripts/host/agent.phtml:30 msgid "" -"This requires the Icinga Agent to be installed. It generates and signs it's " +"This requires the Icinga Agent to be installed. It generates and signs its " "certificate and it also generates a minimal icinga2.conf to get your agent " -"connected to it's parents" +"connected to its parents" msgstr "" "Dafür muss der Icinga Agent installiert sein. Es erstellt und signiert sein " "Zertifikat und erstellt eine minimale icinga2.conf mit der der Agent mit den " diff --git a/application/views/scripts/syncrule/index.phtml b/application/views/scripts/syncrule/index.phtml index 9ac398e9..66971da7 100644 --- a/application/views/scripts/syncrule/index.phtml +++ b/application/views/scripts/syncrule/index.phtml @@ -50,7 +50,7 @@ TODO: check whether... render('syncrule/syncRunDetails.phtml') ?>
rule_name !== $rule->rule_name): ?> escape(sprintf( - $this->translate("It has been renamed since then, it's former name was %s"), + $this->translate("It has been renamed since then, its former name was %s"), $run->rule_name )) ?> diff --git a/doc/03-Automation.md b/doc/03-Automation.md index 764cab97..a65f447b 100644 --- a/doc/03-Automation.md +++ b/doc/03-Automation.md @@ -8,7 +8,7 @@ chapter is what you're looking for! Generic hints ------------- -Director keeps all of it's configuration in a relational database. So, +Director keeps all of its configuration in a relational database. So, all you need to tell him is how it can reach and access that db. In case you already rolled out Icinga Web 2 you should already be used to handle resource definitions. @@ -31,7 +31,7 @@ charset = "utf8" Please note that the charset is required and MUST be `utf8`. Next you need to tell the Director to use this database resource. Create -it's `config.ini` with the only required setting: +its `config.ini` with the only required setting: ```ini [db] @@ -92,7 +92,7 @@ supported. ### Kickstart an empty Director database The Director kickstart wizard helps you with setting up a connection to -Icinga2 master node, import it's endpoint and zone definition and it also +Icinga2 master node, import its endpoint and zone definition and it also syncs already configured command definitions. But this wizard is not only available through the web frontend, you can perfectly trigger it in an idempotent way with Puppet: diff --git a/doc/05-Upgrading.md b/doc/05-Upgrading.md index f2f7d5a1..0a7907e5 100644 --- a/doc/05-Upgrading.md +++ b/doc/05-Upgrading.md @@ -18,7 +18,7 @@ always a good idea before an upgrade. Work with the latest GIT master -------------------------------------------------------- -Icinga Director is still a very young project. Lot's of changes are going on, +Icinga Director is still a very young project. Lots of changes are going on, a lot of improvements, bug fixes and new features are still being added every month. People living on the bleeding edge might prefer to use all of them as soon as possible. diff --git a/doc/10-How-it-works.md b/doc/10-How-it-works.md index 7f207251..84a8cce5 100644 --- a/doc/10-How-it-works.md +++ b/doc/10-How-it-works.md @@ -20,7 +20,7 @@ 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. -Internally, Icinga 2 manages part of it's configuration in it's `var/lib` +Internally, Icinga 2 manages part of its configuration in its `var/lib` directory. This is usually to be found in `/var/lib/icinga2`. Config packages are stored to `/var/lib/icinga2/api/packages` once shipped through the API. So as soon as you deployed your first configuration @@ -33,7 +33,7 @@ that new stage. In case it fails, Icinga 2 will keep running with the former configuration. When it succeeds, it will terminate the old process and keep running with the new configuration. -In either scenario, it writes an exit code and it's startup log to the +In either scenario, it writes an exit code and its startup log to the corresponding stage directory. This allows the Director to check back later on to fetch this information. That's why you see all those nice startup log outputs along with your deployment history in your frontend. @@ -56,7 +56,7 @@ true for them: The director does not try to create additional zones your nodes do not know about. In a distributed environment it is essential that the Director can ship parts of the configuration to specific zones and -other parts to a global zone. The name of it's preferred global zone +other parts to a global zone. The name of its preferred global zone is currently hardcoded to `director-global`. Please make sure that such a zone exists on all involved nodes that should get config from the Director in a direct or indirect way: diff --git a/doc/14-Fields-example-interfaces-array.md b/doc/14-Fields-example-interfaces-array.md index c81f6449..e2a3ba6c 100644 --- a/doc/14-Fields-example-interfaces-array.md +++ b/doc/14-Fields-example-interfaces-array.md @@ -7,7 +7,7 @@ and choose the `Define data fields` dashlet: ![Dashboard - Define data fields](screenshot/director/14_fields-for-interfaces/141_define_datafields.png) -Then create a new data field and select `Array` as it's data type: +Then create a new data field and select `Array` as its data type: ![Define data field - Array](screenshot/director/14_fields-for-interfaces/142_add_datafield.png) diff --git a/doc/24-Working-with-agents.md b/doc/24-Working-with-agents.md index b360ec27..33e9c312 100644 --- a/doc/24-Working-with-agents.md +++ b/doc/24-Working-with-agents.md @@ -2,7 +2,7 @@ ==================================================================== Working with Icinga 2 Agents can be quite tricky, as each Agent needs -it's own Endpoint and Zone definition, correct parent, peering host and +its own Endpoint and Zone definition, correct parent, peering host and log settings. There may always be reasons for a completely custom-made configuration. I'd however strongly suggest to give the Director-assisted variant at least a try first. It might safe you a lot of headaches. diff --git a/doc/60-CLI.md b/doc/60-CLI.md index 091a713f..cbf82bbf 100644 --- a/doc/60-CLI.md +++ b/doc/60-CLI.md @@ -52,7 +52,7 @@ Use this command to create a new Icinga object #### Examples -To create a new host you can provide all it's properties as command line +To create a new host you can provide all of its properties as command line parameters: ```shell @@ -255,7 +255,7 @@ The Icinga Director distincts between the following object types: Please take a lot of care when modifying object types, you should not do so for a good reason. The CLI allows you to issue operations that are not allowed in the -web frontend. Do not use this unless you really understand it's implications. And +web frontend. Do not use this unless you really understand its implications. And remember, with great power comes great responsibility. diff --git a/doc/70-Import-and-Sync.md b/doc/70-Import-and-Sync.md index 5b833f27..a413ab93 100644 --- a/doc/70-Import-and-Sync.md +++ b/doc/70-Import-and-Sync.md @@ -51,7 +51,7 @@ binary in your AD? There is a dedicated modifier: ![SID modifier](screenshot/director/08_import-and-sync/083_director_import_modifier_sid.png) -You do not agree with the way Microsoft represents it's version numbers? Regular +You do not agree with the way Microsoft represents its version numbers? Regular expressions are able to fix everything: ![Regular expression modifier](screenshot/director/08_import-and-sync/084_director_import_modifier_regex.png) diff --git a/doc/79-Jobs.md b/doc/79-Jobs.md index e9ee009d..7e72141c 100644 --- a/doc/79-Jobs.md +++ b/doc/79-Jobs.md @@ -30,7 +30,7 @@ executed within that period. Execution methods ----------------- -Jobs are executed on CLI, basically with the `jobs` CLI command and it's +Jobs are executed on CLI, basically with the `jobs` CLI command and its available actions and options. A call to... ```sh @@ -64,7 +64,7 @@ So, like the above init script, please expect the Job Runner to terminate at any time. Want so see more details? Add `--verbose` to get colorful log lines on STDERR. -In case the Job Runner is running with Systemd, those log lines will find it's +In case the Job Runner is running with Systemd, those log lines will find its way to your system log. Time periods