summaryrefslogtreecommitdiffhomepage
path: root/javascript.html.markdown
diff options
context:
space:
mode:
authorDennis Keller <dk.denniskeller@gmail.com>2015-10-31 11:11:06 +0100
committerDennis Keller <dk.denniskeller@gmail.com>2015-10-31 11:11:06 +0100
commitca6ea580c7df41730fe547b0c35b3406dc9e590f (patch)
tree8f6daf20606ce1dd0e050c8b65ebcef452e20d0e /javascript.html.markdown
parent2c99b0a9553f25a7ac43b04a14c4e2d78fe2b318 (diff)
parentedfc99e198fd2e87802ea81d6779fbadfab64919 (diff)
Merge remote-tracking branch 'upstream/master' into scala/de
Diffstat (limited to 'javascript.html.markdown')
-rw-r--r--javascript.html.markdown4
1 files changed, 4 insertions, 0 deletions
diff --git a/javascript.html.markdown b/javascript.html.markdown
index cd75b0d2..e285ca4e 100644
--- a/javascript.html.markdown
+++ b/javascript.html.markdown
@@ -101,6 +101,10 @@ false;
// Strings are concatenated with +
"Hello " + "world!"; // = "Hello world!"
+// ... which works with more than just strings
+"1, 2, " + 3; // = "1, 2, 3"
+"Hello " + ["world", "!"] // = "Hello world,!"
+
// and are compared with < and >
"a" < "b"; // = true