From 2c83e5e181c987996b4f7ad6c4ed6839ebef7402 Mon Sep 17 00:00:00 2001 From: Adam Lombard Date: Wed, 16 Aug 2017 12:32:09 -0700 Subject: [json/en] add carriage return to fix broken bullet list --- json.html.markdown | 1 + 1 file changed, 1 insertion(+) (limited to 'json.html.markdown') 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 (`{ }`). -- cgit v1.2.3 From 1e26ac4badd24fed4c76f71baee0095e105d5007 Mon Sep 17 00:00:00 2001 From: Apoorv Choubey Date: Sat, 20 Oct 2018 21:19:46 +0530 Subject: add JSON resource --- json.html.markdown | 2 ++ 1 file changed, 2 insertions(+) (limited to 'json.html.markdown') diff --git a/json.html.markdown b/json.html.markdown index cd42d42d..322c7a47 100644 --- a/json.html.markdown +++ b/json.html.markdown @@ -81,3 +81,5 @@ Supported data types: ## Further Reading * [JSON.org](http://json.org) All of JSON beautifully explained using flowchart-like graphics. + +* [JSON Tutorial](https://www.youtube.com/watch?v=wI1CWzNtE-M) A concise introduction to JSON. -- cgit v1.2.3 From 58fa4274a898c75e90cb1a306a5cd84011b7c86c Mon Sep 17 00:00:00 2001 From: Athanasios Emmanouilidis Date: Mon, 12 Nov 2018 21:14:08 +0200 Subject: Fixed typo. --- json.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'json.html.markdown') 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. -- cgit v1.2.3 From 0c680e425fc9cf206d26e98c08c1324d267d6237 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=AD=E4=B9=9D=E9=BC=8E?= <109224573@qq.com> Date: Tue, 20 Oct 2020 15:47:53 +0800 Subject: [json/en] use https --- json.html.markdown | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'json.html.markdown') diff --git a/json.html.markdown b/json.html.markdown index 3ec7a3af..1ccdb5cf 100644 --- a/json.html.markdown +++ b/json.html.markdown @@ -9,7 +9,7 @@ contributors: - ["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. +JSON is an extremely simple data-interchange format. As [json.org](https://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: @@ -80,6 +80,5 @@ Supported data types: ## Further Reading -* [JSON.org](http://json.org) All of JSON beautifully explained using flowchart-like graphics. - +* [JSON.org](https://json.org) All of JSON beautifully explained using flowchart-like graphics. * [JSON Tutorial](https://www.youtube.com/watch?v=wI1CWzNtE-M) A concise introduction to JSON. -- cgit v1.2.3