summaryrefslogtreecommitdiffhomepage
path: root/json.html.markdown
diff options
context:
space:
mode:
authorAdam Lombard <willcodeforgin@gmail.com>2017-08-16 12:32:09 -0700
committerAdam Lombard <willcodeforgin@gmail.com>2017-08-16 12:34:39 -0700
commit2c83e5e181c987996b4f7ad6c4ed6839ebef7402 (patch)
tree836cfef1fa70191313144c309d8c6f49e4c6f2a7 /json.html.markdown
parent6e7c5c793327f4a63b13e555894597915ca91fda (diff)
[json/en] add carriage return to fix broken bullet list
Diffstat (limited to 'json.html.markdown')
-rw-r--r--json.html.markdown1
1 files changed, 1 insertions, 0 deletions
diff --git a/json.html.markdown b/json.html.markdown
index a612cffe..cd42d42d 100644
--- a/json.html.markdown
+++ b/json.html.markdown
@@ -11,6 +11,7 @@ contributors:
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.
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 (`{ }`).