Skip to content

Commit d07d3e2

Browse files
committed
Roles: cosmetics
1 parent 1dd9de0 commit d07d3e2

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

doc/concepts/configuration.rst

+3-3
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ Enabling and configuring roles
184184
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
185185

186186
An application role is a Lua module that implements specific functions or logic.
187-
You can enable or turn off a specific role for certain instances in a configuration without restarting these instances.
187+
You can enable or turn off a particular role for certain instances in a configuration without restarting these instances.
188188

189189
This section describes how to enable and configure roles.
190190
To learn how to develop custom roles, see :ref:`application_roles`.
@@ -242,7 +242,7 @@ Roles and configuration scopes
242242
As the most of configuration options, roles and their configurations can be defined at :ref:`different levels <configuration_scopes>`.
243243
Given that the ``roles`` option has the ``array`` type and ``roles_cfg`` has the ``map`` type, there are some specifics when applying the configuration:
244244

245-
- For ``roles``, an instance's role takes precedence over roles defined at another levels.
245+
- For ``roles``, an instance's role takes precedence over roles defined at another level.
246246
In the example below, ``instance001`` has only ``role3``:
247247

248248
.. code-block:: yaml
@@ -258,7 +258,7 @@ Given that the ``roles`` option has the ``array`` type and ``roles_cfg`` has the
258258

259259
- For ``roles_cfg``, the following rules are applied:
260260

261-
- If a configuration for the same role is provided at different levels, an instance configuration takes precedence over configuration defined at another levels.
261+
- If a configuration for the same role is provided at different levels, an instance configuration takes precedence over the configuration defined at another level.
262262
In the example below, ``role1.greeting`` is ``'Hi'``:
263263

264264
.. code-block:: yaml

doc/how-to/app/app_roles.rst

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Application roles
44
=================
55

66
An application role is a Lua module that implements specific functions or logic.
7-
You can enable or turn off a specific role for certain instances in a :ref:`configuration <configuration>` without restarting these instances.
7+
You can enable or turn off a particular role for certain instances in a :ref:`configuration <configuration>` without restarting these instances.
88
A role is run when a configuration is loaded or reloaded.
99

1010
Roles can be divided into the following groups:
@@ -104,7 +104,7 @@ In the example below, the ``validate()`` function is used to validate the ``gree
104104
:end-before: local function apply
105105
:dedent:
106106

107-
If the configuration is not valid, ``validate`` reports an unrecoverable error by throwing an error object.
107+
If the configuration is not valid, ``validate()`` reports an unrecoverable error by throwing an error object.
108108

109109

110110

@@ -268,7 +268,7 @@ Roles' life cycle includes the stages described below.
268268
All role's functions report an unrecoverable error by throwing an error object.
269269
If an error is thrown in any phase, applying a configuration is stopped.
270270
If starting or stopping a role throws an error, no roles are stopped or started afterward.
271-
An error is catched and shown in :ref:`config:info() <config_api_reference_info>` in the ``alerts`` section.
271+
An error is caught and shown in :ref:`config:info() <config_api_reference_info>` in the ``alerts`` section.
272272

273273

274274
.. _roles_life_cycle_dependencies_specifics:
@@ -285,7 +285,7 @@ Suppose, there are two independent roles (``role1``, ``role2``) and three roles
285285
└─── role4
286286
└─── role5
287287
288-
The roles are enable in a configuration as follows:
288+
The roles are enabled in a configuration as follows:
289289

290290
.. code-block:: yaml
291291

0 commit comments

Comments
 (0)