summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorDivay Prakash <divayprakash@users.noreply.github.com>2018-11-16 17:22:49 +0530
committerGitHub <noreply@github.com>2018-11-16 17:22:49 +0530
commit6fe978ff4ef8ca9b84c94dcb9bc98cca238fc961 (patch)
tree78df7dae68212cc59165aa3ce6b540e8d1ada63f
parent314511a223667f68f1dec5e09aac57025fd64f80 (diff)
parent58fa4274a898c75e90cb1a306a5cd84011b7c86c (diff)
Merge pull request #3391 from athanasiosem/patch-2
[en-us]Fixed typo.
-rw-r--r--json.html.markdown2
1 files changed, 1 insertions, 1 deletions
diff --git a/json.html.markdown b/json.html.markdown
index 322c7a47..3ec7a3af 100644
--- a/json.html.markdown
+++ b/json.html.markdown
@@ -6,6 +6,7 @@ contributors:
- ["Marco Scannadinari", "https://github.com/marcoms"]
- ["himanshu", "https://github.com/himanshu81494"]
- ["Michael Neth", "https://github.com/infernocloud"]
+ - ["Athanasios Emmanouilidis", "https://github.com/athanasiosem"]
---
JSON is an extremely simple data-interchange format. As [json.org](http://json.org) says, it is easy for humans to read and write and for machines to parse and generate.
@@ -14,7 +15,6 @@ A piece of JSON must represent either:
* A collection of name/value pairs (`{ }`). In various languages, this is realized as an object, record, struct, dictionary, hash table, keyed list, or associative array.
* An ordered list of values (`[ ]`). In various languages, this is realized as an array, vector, list, or sequence.
- an array/list/sequence (`[ ]`) or a dictionary/object/associated array (`{ }`).
JSON in its purest form has no actual comments, but most parsers will accept C-style (`//`, `/* */`) comments. Some parsers also tolerate a trailing comma (i.e. a comma after the last element of an array or the after the last property of an object), but they should be avoided for better compatibility.