Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 7dd970d

Browse filesBrowse files
committed
[#1721] Very minor proofreading tweaks
1 parent 2c3d526 commit 7dd970d
Copy full SHA for 7dd970d

File tree

Expand file treeCollapse file tree

1 file changed

+7
-7
lines changed
Filter options
Expand file treeCollapse file tree

1 file changed

+7
-7
lines changed

‎components/config/definition.rst

Copy file name to clipboardExpand all lines: components/config/definition.rst
+7-7Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -274,10 +274,10 @@ of the config that are repeated in different places.
274274
Normalization
275275
-------------
276276

277-
When the config files are processed they are first normalized, they are then
278-
merged and then the tree is used to validate the resulting array. The normalization
279-
is to remove some of the differences that result from different configuration formats,
280-
mainly the differences between Yaml and XML.
277+
When the config files are processed they are first normalized, then merged
278+
and finally the tree is used to validate the resulting array. The normalization
279+
process is used to remove some of the differences that result from different
280+
configuration formats, mainly the differences between Yaml and XML.
281281

282282
The separator used in keys is typically ``_`` in Yaml and ``-`` in XML. For
283283
example, ``auto_connect`` in Yaml and ``auto-connect``. The normalization would
@@ -323,8 +323,8 @@ a second argument::
323323
->end()
324324
;
325325

326-
As well as fixing this it ensures that single xml elements are still turned into an array.
327-
So you may have:
326+
As well as fixing this, ``fixXmlConfig`` ensures that single xml elements
327+
are still turned into an array. So you may have:
328328

329329
.. code-block:: xml
330330
@@ -341,7 +341,7 @@ By default ``connection`` would be an array in the first case and a string
341341
in the second making it difficult to validate. You can ensure it is always
342342
an array with with ``fixXmlConfig``.
343343

344-
You can further control the normalization process if you need to. For example
344+
You can further control the normalization process if you need to. For example,
345345
you may want to allow a string to be set and used as a particular key or several
346346
keys to be set explicitly. So that, if everything apart from id is optional in this
347347
config:

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.