summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorLevi Bostian <levi.bostian@gmail.com>2014-06-18 23:11:09 -0500
committerLevi Bostian <levi.bostian@gmail.com>2014-06-18 23:11:09 -0500
commit9862212ed15a4b28c946a7b00cd3624d00971b97 (patch)
treeefa2d3202d91a0f34d47be8abd242861d01ffa2e
parentcb974f0a3f4bdfc0a3a939fc46d9c5ebd7b566e3 (diff)
parentde369eaa29e6cd1b979014a2a23742297d8e9edf (diff)
Merge pull request #643 from marcoms/patch-1
Add extra detail
-rw-r--r--json.html.markdown10
1 files changed, 10 insertions, 0 deletions
diff --git a/json.html.markdown b/json.html.markdown
index 0e1a7d24..9041eaa2 100644
--- a/json.html.markdown
+++ b/json.html.markdown
@@ -3,6 +3,7 @@ language: json
filename: learnjson.json
contributors:
- ["Anna Harren", "https://github.com/iirelu"]
+ - ["Marco Scannadinari", "https://github.com/marcoms"]
---
As JSON is an extremely simple data-interchange format, this is most likely going
@@ -14,6 +15,9 @@ going to be 100% valid JSON. Luckily, it kind of speaks for itself.
```json
{
+ "key": "value",
+
+ "keys": "must always be enclosed in quotes (either double or single)",
"numbers": 0,
"strings": "Hellø, wørld. All unicode is allowed, along with \"escaping\".",
"has bools?": true,
@@ -42,6 +46,12 @@ going to be 100% valid JSON. Luckily, it kind of speaks for itself.
[0, 0, 0, 1]
]
],
+
+ "alternative style": {
+ "comment": "check this out!"
+ , "comma position": "doesn't matter - as long as its before the value, then its valid"
+ , "another comment": "how nice"
+ },
"that was short": "And, you're done. You now know everything JSON has to offer."
}