Merge pull request #2827 from AdamLombard/master

[json/en] add carriage return to fix broken bullet list
This commit is contained in:
Adam Bard 2017-08-18 10:11:05 -07:00 committed by GitHub
commit 90ab1bcc90

View File

@ -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 (`{ }`).