diff options
author | Jonathan Scott Duff <duff@pobox.com> | 2015-06-25 22:58:56 -0500 |
---|---|---|
committer | Jonathan Scott Duff <duff@pobox.com> | 2015-06-25 22:58:56 -0500 |
commit | 2162639cd901a81a24eb4a566ba5108da87634cf (patch) | |
tree | 3bef6c762bcc04609e0a6cb219c3c169e5aa5748 /json.html.markdown | |
parent | 041064416115985ef336babe6ef7dbac726327fa (diff) | |
parent | ef771384ae672e341ec309cf71cf372143607892 (diff) |
Merge remote-tracking branch 'upstream/master'
Conflicts:
perl6.html.markdown
Diffstat (limited to 'json.html.markdown')
-rw-r--r-- | json.html.markdown | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/json.html.markdown b/json.html.markdown index f5287138..f57b82b8 100644 --- a/json.html.markdown +++ b/json.html.markdown @@ -10,7 +10,7 @@ As JSON is an extremely simple data-interchange format, this is most likely goin to be the simplest Learn X in Y Minutes ever. JSON in its purest form has no actual comments, but most parsers will accept -C-style (//, /\* \*/) comments. For the purposes of this, however, everything is +C-style (`//`, `/* */`) comments. For the purposes of this, however, everything is going to be 100% valid JSON. Luckily, it kind of speaks for itself. ```json |