From 100a0314db08fa2c1ca65368fabfe8dc594ea9e2 Mon Sep 17 00:00:00 2001 From: Andrew M Date: Thu, 23 Jan 2014 20:55:56 +0200 Subject: [PATCH 1/2] Add 'in XML' for additional clarity --- components/config/definition.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/config/definition.rst b/components/config/definition.rst index 78961575c19..f02d5aadb72 100644 --- a/components/config/definition.rst +++ b/components/config/definition.rst @@ -399,7 +399,7 @@ process is used to remove some of the differences that result from different configuration formats, mainly the differences between YAML and XML. The separator used in keys is typically ``_`` in YAML and ``-`` in XML. For -example, ``auto_connect`` in YAML and ``auto-connect``. The normalization would +example, ``auto_connect`` in YAML and ``auto-connect`` in XML. The normalization would make both of these ``auto_connect``. .. caution:: From 69d9277fe3d1d01e3be53b7bb5bc92c3191ba408 Mon Sep 17 00:00:00 2001 From: Andrew M Date: Thu, 30 Jan 2014 10:35:08 +0200 Subject: [PATCH 2/2] Adjust line length --- components/config/definition.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/config/definition.rst b/components/config/definition.rst index f02d5aadb72..0361f7c05db 100644 --- a/components/config/definition.rst +++ b/components/config/definition.rst @@ -399,8 +399,8 @@ process is used to remove some of the differences that result from different configuration formats, mainly the differences between YAML and XML. The separator used in keys is typically ``_`` in YAML and ``-`` in XML. For -example, ``auto_connect`` in YAML and ``auto-connect`` in XML. The normalization would -make both of these ``auto_connect``. +example, ``auto_connect`` in YAML and ``auto-connect`` in XML. +The normalization would make both of these ``auto_connect``. .. caution::