Core changes:

* Removed "integer" type in favor of {"type":"number", "divisibleBy":1}.
* Restricted "type" to only the core JSON types.

Content changes:
* Improved wording of several sections.
* Merged Conventions and Terminology sections.
* Defined terms used in specification.

Author: garycourt

draft-04/schema

@@ -5,9 +5,19 @@
 
 	"properties" : {
 		"type" : {
-			"type" : ["string", "array"],
+			"type" : [
+				{
+					"id" : "#simple-type",
+					"type" : "string",
+					"enum" : ["object", "array", "string", "number", "boolean", "null", "any"]
+				}, 
+				"array"
+			],
 			"items" : {
-				"type" : ["string", {"$ref" : "#"}]
+				"type" : [
+					{"$ref" : "#simple-type"}, 
+					{"$ref" : "#"}
+				]
 			},
 			"uniqueItems" : true,
 			"default" : "any"