From 2a6cff403be015ae12243741cf30dfc388cb199c Mon Sep 17 00:00:00 2001
From: Matthias Kuhn <matthias@opengis.ch>
Date: Sun, 20 Sep 2015 13:59:54 +0200
Subject: [PATCH] More examples for the expression function help

---
 resources/function_help/json/concat | 6 ++++--
 resources/function_help/text/||     | 1 +
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/resources/function_help/json/concat b/resources/function_help/json/concat
index d4b524ca6966..9f7c95887de1 100644
--- a/resources/function_help/json/concat
+++ b/resources/function_help/json/concat
@@ -1,10 +1,12 @@
 {
   "function": "concat",
-  "description": "Concatenates several strings to one. NULL values are converted to empty strings.",
+  "description": "Concatenates several strings to one. NULL values are converted to empty strings. Other values (like numbers) are converted to strings.",
   "variableLenArguments": true,
   "arguments": [ {"arg":"string1", "syntaxOnly": true},
                  {"arg":"string2", "syntaxOnly": true},
                  {"arg":"string", "descOnly": true, "description":"a string value"}],
-  "examples": [ { "expression":"concat('a','b','c','d','e')", "returns":"'abcde'"},
+  "examples": [ { "expression":"concat('sun', 'set')", "returns":"'sunset'"},
+                { "expression":"concat('a','b','c','d','e')", "returns":"'abcde'"},
+                { "expression":"concat('Anno ', 1984)", "returns":"'Anno 1984'"},
                 { "expression":"concat('The Wall', NULL)", "returns":"'The Wall'"}]
 }
diff --git a/resources/function_help/text/|| b/resources/function_help/text/||
index 2f13c6d05ff3..4f0ea0631c2f 100644
--- a/resources/function_help/text/||
+++ b/resources/function_help/text/||
@@ -11,4 +11,5 @@ None
 <h4>Examples</h4>
 <pre> 'Here ' || 'and ' || 'there' &rarr; 'Here and there' </pre>
 <pre> 'Nothing' || NULL &rarr; NULL </pre>
+<pre> 'Dia: ' || "Diameter" &rarr; 'Dia: 25' </pre>
 <pre> 1 || 2 &rarr; '12' </pre>