Merge branch '1.0.x'

spring-restdocs-core/src/test/resources/link-payloads/atom/wrong-format.json

@@ -1,5 +1,9 @@
 {
-	"_links": {
-		"alpha": ["http://alpha.example.com/one", "http://alpha.example.com/two"]
+	"links": {
+		"alpha": [{
+		    "href": "http://alpha.example.com/one"
+		}, {
+		    "href": "http://alpha.example.com/two"
+		}]
 	}
 }

spring-restdocs-core/src/test/resources/link-payloads/hal/multiple-links-different-rels.json

@@ -1,6 +1,10 @@
 {
 	"_links": {
-		"alpha": "http://alpha.example.com",
-		"bravo": "http://bravo.example.com"
+		"alpha": {
+			"href": "http://alpha.example.com"
+		},
+		"bravo": {
+			"href": "http://bravo.example.com"
+		}
 	}
 }

spring-restdocs-core/src/test/resources/link-payloads/hal/multiple-links-same-rels.json

@@ -1,5 +1,9 @@
 {
 	"_links": {
-		"alpha": ["http://alpha.example.com/one", "http://alpha.example.com/two"]
+		"alpha": [{
+		    "href": "http://alpha.example.com/one"
+		}, {
+		    "href": "http://alpha.example.com/two"
+		}]
 	}
 }

spring-restdocs-core/src/test/resources/link-payloads/hal/single-link.json

@@ -1,5 +1,7 @@
 {
 	"_links": {
-		"alpha": "http://alpha.example.com"
+		"alpha": {
+		    "href": "http://alpha.example.com"
+		}
 	}
 }