diff options
| author | Adam Bard <github@adambard.com> | 2017-08-18 10:11:05 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-18 10:11:05 -0700 |
| commit | 90ab1bcc90c72ac4aaeef48cf7af25ab9a8c3650 (patch) | |
| tree | 660a28400c82e92dabbd48134a4685321ff8b70c /json.html.markdown | |
| parent | f8d6297f3cce494915c29e8c372ca2f17d2aefdd (diff) | |
| parent | 2c83e5e181c987996b4f7ad6c4ed6839ebef7402 (diff) | |
Merge pull request #2827 from AdamLombard/master
[json/en] add carriage return to fix broken bullet list
Diffstat (limited to 'json.html.markdown')
| -rw-r--r-- | json.html.markdown | 1 |
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 (`{ }`). |