diff options
| author | miguel araujo <miguelarauj1o@gmail.com> | 2014-06-19 11:05:48 -0300 |
|---|---|---|
| committer | miguel araujo <miguelarauj1o@gmail.com> | 2014-06-19 11:05:48 -0300 |
| commit | 8c44cb9b4fe45df82588956473e01f7eb7a07dd9 (patch) | |
| tree | 1a56d8999e1c5402d0e66256b8baeaa6b24ce30c | |
| parent | 7bc3a435c6716931addb11251bd40fc13d77ce1a (diff) | |
| parent | 9862212ed15a4b28c946a7b00cd3624d00971b97 (diff) | |
Merge branch 'master' of https://github.com/miguelarauj1o/learnxinyminutes-docs into translate_br
| -rw-r--r-- | json.html.markdown | 10 | ||||
| -rw-r--r-- | python3.html.markdown | 5 | ||||
| -rw-r--r-- | zh-cn/json-cn.html.markdown | 2 |
3 files changed, 15 insertions, 2 deletions
diff --git a/json.html.markdown b/json.html.markdown index 0e1a7d24..9041eaa2 100644 --- a/json.html.markdown +++ b/json.html.markdown @@ -3,6 +3,7 @@ language: json filename: learnjson.json contributors: - ["Anna Harren", "https://github.com/iirelu"] + - ["Marco Scannadinari", "https://github.com/marcoms"] --- As JSON is an extremely simple data-interchange format, this is most likely going @@ -14,6 +15,9 @@ going to be 100% valid JSON. Luckily, it kind of speaks for itself. ```json { + "key": "value", + + "keys": "must always be enclosed in quotes (either double or single)", "numbers": 0, "strings": "Hellø, wørld. All unicode is allowed, along with \"escaping\".", "has bools?": true, @@ -42,6 +46,12 @@ going to be 100% valid JSON. Luckily, it kind of speaks for itself. [0, 0, 0, 1] ] ], + + "alternative style": { + "comment": "check this out!" + , "comma position": "doesn't matter - as long as its before the value, then its valid" + , "another comment": "how nice" + }, "that was short": "And, you're done. You now know everything JSON has to offer." } diff --git a/python3.html.markdown b/python3.html.markdown index 77811535..778076f8 100644 --- a/python3.html.markdown +++ b/python3.html.markdown @@ -238,7 +238,10 @@ empty_set = set() # Initialize a set with a bunch of values. Yeah, it looks a bit like a dict. Sorry. some_set = {1, 1, 2, 2, 3, 4} # some_set is now {1, 2, 3, 4} -# Add more items to a set +#Can set new variables to a set +filled_set = some_set + +# Add one more item to the set filled_set.add(5) # filled_set is now {1, 2, 3, 4, 5} # Do set intersection with & diff --git a/zh-cn/json-cn.html.markdown b/zh-cn/json-cn.html.markdown index 75966595..3a8db2cf 100644 --- a/zh-cn/json-cn.html.markdown +++ b/zh-cn/json-cn.html.markdown @@ -46,6 +46,6 @@ lang: zh-cn ] ], - "that was short": "And, you're done. You know know everything JSON has to offer." + "that was short": "And, you're done. You now know everything JSON has to offer." } ``` |