diff options
| author | miguel araujo <miguelarauj1o@gmail.com> | 2014-06-19 11:05:48 -0300 |
|---|---|---|
| committer | miguel araujo <miguelarauj1o@gmail.com> | 2014-06-19 11:05:48 -0300 |
| commit | 8c44cb9b4fe45df82588956473e01f7eb7a07dd9 (patch) | |
| tree | 1a56d8999e1c5402d0e66256b8baeaa6b24ce30c /json.html.markdown | |
| parent | 7bc3a435c6716931addb11251bd40fc13d77ce1a (diff) | |
| parent | 9862212ed15a4b28c946a7b00cd3624d00971b97 (diff) | |
Merge branch 'master' of https://github.com/miguelarauj1o/learnxinyminutes-docs into translate_br
Diffstat (limited to 'json.html.markdown')
| -rw-r--r-- | json.html.markdown | 10 |
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." } |