From: Vsevolod Stakhov Date: Mon, 6 Jan 2014 09:23:56 +0000 (+0000) Subject: Some more fixes. X-Git-Tag: 0.6.7~20 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=526144ca3b6350c1c2d429fd9d6cb295444d9d9b;p=rspamd.git Some more fixes. --- diff --git a/doc/markdown/configuration/ucl.md b/doc/markdown/configuration/ucl.md index 54f410d8c..e72caf223 100644 --- a/doc/markdown/configuration/ucl.md +++ b/doc/markdown/configuration/ucl.md @@ -66,7 +66,9 @@ There are various things that make ucl configuration more convenient for editing ~~~json "key": "value" ~~~ + is equal to: + ~~~json {"key": "value"} ~~~ @@ -79,7 +81,9 @@ section { key = value; } ~~~ + is equal to: + ~~~json { "key": "value", @@ -97,6 +101,7 @@ is equal to: "key2": "value", } ~~~ + ### Automatic arrays creation * Non-unique keys in an object are allowed and are automatically converted to the arrays internally: @@ -107,7 +112,9 @@ is equal to: "key": "value2" } ~~~ + is converted to: + ~~~json { "key": ["value1", "value2"] @@ -116,7 +123,8 @@ is converted to: ### Named keys hierarchy -UCL accepts named keys and organize them into objects hierarchy internally. Here is an example of this process: +UCL accepts named keys and organise them into objects hierarchy internally. Here is an example of this process: + ~~~nginx section "blah" { key = value; @@ -178,6 +186,7 @@ UCL supports different style of comments: * multiline: `/* ... */` Multiline comments may be nested: + ~~~c # Sample single line comment /* @@ -190,6 +199,7 @@ Multiline comments may be nested: ### Macros support UCL supports external macros both multiline and single line ones: + ~~~nginx .macro "sometext"; .macro { @@ -224,6 +234,7 @@ to change in future libucl releases. ### Multiline strings UCL can handle multiline strings as well as single line ones. It uses shell/perl like notation for such objects: + ~~~ key = <). Then I checked jansson library that performs json parsing and emitting and compared it with UCL. Here are results: ~~~