From 8239b2f02e555183b0aafdd7225a56664631d642 Mon Sep 17 00:00:00 2001 From: Abdellatif Ait boudad Date: Sun, 17 Mar 2013 00:12:30 +0000 Subject: [PATCH 1/3] [Config][Normalization] added a tip about altered keys --- components/config/definition.rst | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/components/config/definition.rst b/components/config/definition.rst index 77898e6b576..24003f1da01 100644 --- a/components/config/definition.rst +++ b/components/config/definition.rst @@ -325,6 +325,10 @@ The separator used in keys is typically ``_`` in Yaml and ``-`` in XML. For example, ``auto_connect`` in Yaml and ``auto-connect``. The normalization would make both of these ``auto_connect``. +.. tip:: + + The target key will not be altered if it's mixed like ``foo-bar_moo`` or if it already exists. + Another difference between Yaml and XML is in the way arrays of values may be represented. In Yaml you may have: From d773f2ee2e26c76da875dae1a206daef9f7d275e Mon Sep 17 00:00:00 2001 From: Abdellatif Ait boudad Date: Sun, 17 Mar 2013 12:14:57 +0000 Subject: [PATCH 2/3] replace block 'tip' to 'caution --- components/config/definition.rst | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/components/config/definition.rst b/components/config/definition.rst index 24003f1da01..848fbc4dc0f 100644 --- a/components/config/definition.rst +++ b/components/config/definition.rst @@ -325,9 +325,10 @@ The separator used in keys is typically ``_`` in Yaml and ``-`` in XML. For example, ``auto_connect`` in Yaml and ``auto-connect``. The normalization would make both of these ``auto_connect``. -.. tip:: +.. caution:: - The target key will not be altered if it's mixed like ``foo-bar_moo`` or if it already exists. + The target key will not be altered if it's mixed like ``foo-bar_moo`` or if + it already exists. Another difference between Yaml and XML is in the way arrays of values may be represented. In Yaml you may have: From 9108c4bb495e38b5c5910e8be8ef13c2ff902c5f Mon Sep 17 00:00:00 2001 From: Abdellatif Ait boudad Date: Tue, 19 Mar 2013 22:01:53 +0000 Subject: [PATCH 3/3] Break the line after the first word crossing 72 chars --- 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 848fbc4dc0f..293da6b0b9b 100644 --- a/components/config/definition.rst +++ b/components/config/definition.rst @@ -327,8 +327,8 @@ make both of these ``auto_connect``. .. caution:: - The target key will not be altered if it's mixed like ``foo-bar_moo`` or if - it already exists. + The target key will not be altered if it's mixed like + ``foo-bar_moo`` or if it already exists. Another difference between Yaml and XML is in the way arrays of values may be represented. In Yaml you may have: