summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--json.html.markdown5
-rw-r--r--yaml.html.markdown6
2 files changed, 5 insertions, 6 deletions
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.
diff --git a/yaml.html.markdown b/yaml.html.markdown
index 4f10a128..6dc5905e 100644
--- a/yaml.html.markdown
+++ b/yaml.html.markdown
@@ -127,11 +127,11 @@ base: &base
# indicate that all the keys of one or more specified maps should be inserted
# into the current map.
-foo: &foo
+foo:
<<: *base
age: 10
-bar: &bar
+bar:
<<: *base
age: 20
@@ -184,5 +184,5 @@ set2:
### More Resources
-+ [YAML official website](http://yaml.org/)
++ [YAML official website](https://yaml.org/)
+ [Online YAML Validator](http://www.yamllint.com/)