http://git-wip-us.apache.org/repos/asf/incubator-atlas-website/blob/b4557f9c/api/v2/resource_TypesREST.html
----------------------------------------------------------------------
diff --git a/api/v2/resource_TypesREST.html b/api/v2/resource_TypesREST.html
index 5bd2729..de94d05 100644
--- a/api/v2/resource_TypesREST.html
+++ b/api/v2/resource_TypesREST.html
@@ -147,7 +147,7 @@ Content-Type: application/json
       "ordinal" : 12345
     } ],
     "defaultValue" : "...",
-    "category" : "PRIMITIVE",
+    "category" : "STRUCT",
     "guid" : "...",
     "createdBy" : "...",
     "updatedBy" : "...",
@@ -172,7 +172,7 @@ Content-Type: application/json
       "ordinal" : 12345
     } ],
     "defaultValue" : "...",
-    "category" : "ENTITY",
+    "category" : "ARRAY",
     "guid" : "...",
     "createdBy" : "...",
     "updatedBy" : "...",
@@ -202,7 +202,7 @@ Content-Type: application/json
       "name" : "...",
       "typeName" : "...",
       "isOptional" : true,
-      "cardinality" : "LIST",
+      "cardinality" : "SINGLE",
       "valuesMinCount" : 12345,
       "valuesMaxCount" : 12345,
       "isUnique" : true,
@@ -238,14 +238,14 @@ Content-Type: application/json
       "name" : "...",
       "typeName" : "...",
       "isOptional" : true,
-      "cardinality" : "LIST",
+      "cardinality" : "SET",
       "valuesMinCount" : 12345,
       "valuesMaxCount" : 12345,
       "isUnique" : true,
       "isIndexable" : true,
       "constraints" : [ { }, { } ]
     } ],
-    "category" : "MAP",
+    "category" : "ENUM",
     "guid" : "...",
     "createdBy" : "...",
     "updatedBy" : "...",
@@ -266,7 +266,7 @@ Content-Type: application/json
       "name" : "...",
       "typeName" : "...",
       "isOptional" : true,
-      "cardinality" : "SET",
+      "cardinality" : "LIST",
       "valuesMinCount" : 12345,
       "valuesMaxCount" : 12345,
       "isUnique" : true,
@@ -276,14 +276,14 @@ Content-Type: application/json
       "name" : "...",
       "typeName" : "...",
       "isOptional" : true,
-      "cardinality" : "LIST",
+      "cardinality" : "SINGLE",
       "valuesMinCount" : 12345,
       "valuesMaxCount" : 12345,
       "isUnique" : true,
       "isIndexable" : true,
       "constraints" : [ { }, { } ]
     } ],
-    "category" : "ARRAY",
+    "category" : "MAP",
     "guid" : "...",
     "createdBy" : "...",
     "updatedBy" : "...",
@@ -303,7 +303,7 @@ Content-Type: application/json
       "name" : "...",
       "typeName" : "...",
       "isOptional" : true,
-      "cardinality" : "SET",
+      "cardinality" : "LIST",
       "valuesMinCount" : 12345,
       "valuesMaxCount" : 12345,
       "isUnique" : true,
@@ -313,14 +313,14 @@ Content-Type: application/json
       "name" : "...",
       "typeName" : "...",
       "isOptional" : true,
-      "cardinality" : "SINGLE",
+      "cardinality" : "SET",
       "valuesMinCount" : 12345,
       "valuesMaxCount" : 12345,
       "isUnique" : true,
       "isIndexable" : true,
       "constraints" : [ { }, { } ]
     } ],
-    "category" : "ENTITY",
+    "category" : "STRUCT",
     "guid" : "...",
     "createdBy" : "...",
     "updatedBy" : "...",
@@ -341,7 +341,7 @@ Content-Type: application/json
       "name" : "...",
       "typeName" : "...",
       "isOptional" : true,
-      "cardinality" : "LIST",
+      "cardinality" : "SINGLE",
       "valuesMinCount" : 12345,
       "valuesMaxCount" : 12345,
       "isUnique" : true,
@@ -358,7 +358,7 @@ Content-Type: application/json
       "isIndexable" : true,
       "constraints" : [ { }, { } ]
     } ],
-    "category" : "MAP",
+    "category" : "CLASSIFICATION",
     "guid" : "...",
     "createdBy" : "...",
     "updatedBy" : "...",
@@ -378,7 +378,7 @@ Content-Type: application/json
       "name" : "...",
       "typeName" : "...",
       "isOptional" : true,
-      "cardinality" : "SINGLE",
+      "cardinality" : "SET",
       "valuesMinCount" : 12345,
       "valuesMaxCount" : 12345,
       "isUnique" : true,
@@ -388,7 +388,7 @@ Content-Type: application/json
       "name" : "...",
       "typeName" : "...",
       "isOptional" : true,
-      "cardinality" : "LIST",
+      "cardinality" : "SET",
       "valuesMinCount" : 12345,
       "valuesMaxCount" : 12345,
       "isUnique" : true,
@@ -496,7 +496,7 @@ Content-Type: application/json
       "ordinal" : 12345
     } ],
     "defaultValue" : "...",
-    "category" : "ENTITY",
+    "category" : "STRUCT",
     "guid" : "...",
     "createdBy" : "...",
     "updatedBy" : "...",
@@ -521,7 +521,7 @@ Content-Type: application/json
       "ordinal" : 12345
     } ],
     "defaultValue" : "...",
-    "category" : "ARRAY",
+    "category" : "ENUM",
     "guid" : "...",
     "createdBy" : "...",
     "updatedBy" : "...",
@@ -541,7 +541,7 @@ Content-Type: application/json
       "name" : "...",
       "typeName" : "...",
       "isOptional" : true,
-      "cardinality" : "LIST",
+      "cardinality" : "SET",
       "valuesMinCount" : 12345,
       "valuesMaxCount" : 12345,
       "isUnique" : true,
@@ -558,7 +558,7 @@ Content-Type: application/json
       "isIndexable" : true,
       "constraints" : [ { }, { } ]
     } ],
-    "category" : "MAP",
+    "category" : "CLASSIFICATION",
     "guid" : "...",
     "createdBy" : "...",
     "updatedBy" : "...",
@@ -577,7 +577,7 @@ Content-Type: application/json
       "name" : "...",
       "typeName" : "...",
       "isOptional" : true,
-      "cardinality" : "SINGLE",
+      "cardinality" : "LIST",
       "valuesMinCount" : 12345,
       "valuesMaxCount" : 12345,
       "isUnique" : true,
@@ -587,14 +587,14 @@ Content-Type: application/json
       "name" : "...",
       "typeName" : "...",
       "isOptional" : true,
-      "cardinality" : "LIST",
+      "cardinality" : "SET",
       "valuesMinCount" : 12345,
       "valuesMaxCount" : 12345,
       "isUnique" : true,
       "isIndexable" : true,
       "constraints" : [ { }, { } ]
     } ],
-    "category" : "ENUM",
+    "category" : "OBJECT_ID_TYPE",
     "guid" : "...",
     "createdBy" : "...",
     "updatedBy" : "...",
@@ -615,7 +615,7 @@ Content-Type: application/json
       "name" : "...",
       "typeName" : "...",
       "isOptional" : true,
-      "cardinality" : "LIST",
+      "cardinality" : "SINGLE",
       "valuesMinCount" : 12345,
       "valuesMaxCount" : 12345,
       "isUnique" : true,
@@ -625,14 +625,14 @@ Content-Type: application/json
       "name" : "...",
       "typeName" : "...",
       "isOptional" : true,
-      "cardinality" : "SINGLE",
+      "cardinality" : "LIST",
       "valuesMinCount" : 12345,
       "valuesMaxCount" : 12345,
       "isUnique" : true,
       "isIndexable" : true,
       "constraints" : [ { }, { } ]
     } ],
-    "category" : "OBJECT_ID_TYPE",
+    "category" : "PRIMITIVE",
     "guid" : "...",
     "createdBy" : "...",
     "updatedBy" : "...",
@@ -652,7 +652,7 @@ Content-Type: application/json
       "name" : "...",
       "typeName" : "...",
       "isOptional" : true,
-      "cardinality" : "LIST",
+      "cardinality" : "SET",
       "valuesMinCount" : 12345,
       "valuesMaxCount" : 12345,
       "isUnique" : true,
@@ -662,7 +662,7 @@ Content-Type: application/json
       "name" : "...",
       "typeName" : "...",
       "isOptional" : true,
-      "cardinality" : "SET",
+      "cardinality" : "LIST",
       "valuesMinCount" : 12345,
       "valuesMaxCount" : 12345,
       "isUnique" : true,
@@ -700,14 +700,14 @@ Content-Type: application/json
       "name" : "...",
       "typeName" : "...",
       "isOptional" : true,
-      "cardinality" : "SET",
+      "cardinality" : "SINGLE",
       "valuesMinCount" : 12345,
       "valuesMaxCount" : 12345,
       "isUnique" : true,
       "isIndexable" : true,
       "constraints" : [ { }, { } ]
     } ],
-    "category" : "ENTITY",
+    "category" : "ARRAY",
     "guid" : "...",
     "createdBy" : "...",
     "updatedBy" : "...",
@@ -727,7 +727,7 @@ Content-Type: application/json
       "name" : "...",
       "typeName" : "...",
       "isOptional" : true,
-      "cardinality" : "SET",
+      "cardinality" : "SINGLE",
       "valuesMinCount" : 12345,
       "valuesMaxCount" : 12345,
       "isUnique" : true,
@@ -737,14 +737,14 @@ Content-Type: application/json
       "name" : "...",
       "typeName" : "...",
       "isOptional" : true,
-      "cardinality" : "SINGLE",
+      "cardinality" : "LIST",
       "valuesMinCount" : 12345,
       "valuesMaxCount" : 12345,
       "isUnique" : true,
       "isIndexable" : true,
       "constraints" : [ { }, { } ]
     } ],
-    "category" : "CLASSIFICATION",
+    "category" : "ARRAY",
     "guid" : "...",
     "createdBy" : "...",
     "updatedBy" : "...",
@@ -911,14 +911,14 @@ Accept: application/json
       "name" : "...",
       "typeName" : "...",
       "isOptional" : true,
-      "cardinality" : "SINGLE",
+      "cardinality" : "LIST",
       "valuesMinCount" : 12345,
       "valuesMaxCount" : 12345,
       "isUnique" : true,
       "isIndexable" : true,
       "constraints" : [ { }, { } ]
     } ],
-    "category" : "STRUCT",
+    "category" : "ENTITY",
     "guid" : "...",
     "createdBy" : "...",
     "updatedBy" : "...",
@@ -947,14 +947,14 @@ Accept: application/json
       "name" : "...",
       "typeName" : "...",
       "isOptional" : true,
-      "cardinality" : "SINGLE",
+      "cardinality" : "LIST",
       "valuesMinCount" : 12345,
       "valuesMaxCount" : 12345,
       "isUnique" : true,
       "isIndexable" : true,
       "constraints" : [ { }, { } ]
     } ],
-    "category" : "ENUM",
+    "category" : "CLASSIFICATION",
     "guid" : "...",
     "createdBy" : "...",
     "updatedBy" : "...",
@@ -975,7 +975,7 @@ Accept: application/json
       "name" : "...",
       "typeName" : "...",
       "isOptional" : true,
-      "cardinality" : "SET",
+      "cardinality" : "SINGLE",
       "valuesMinCount" : 12345,
       "valuesMaxCount" : 12345,
       "isUnique" : true,
@@ -992,7 +992,7 @@ Accept: application/json
       "isIndexable" : true,
       "constraints" : [ { }, { } ]
     } ],
-    "category" : "PRIMITIVE",
+    "category" : "STRUCT",
     "guid" : "...",
     "createdBy" : "...",
     "updatedBy" : "...",
@@ -1029,7 +1029,7 @@ Accept: application/json
       "isIndexable" : true,
       "constraints" : [ { }, { } ]
     } ],
-    "category" : "CLASSIFICATION",
+    "category" : "ENTITY",
     "guid" : "...",
     "createdBy" : "...",
     "updatedBy" : "...",
@@ -1050,7 +1050,7 @@ Accept: application/json
       "name" : "...",
       "typeName" : "...",
       "isOptional" : true,
-      "cardinality" : "LIST",
+      "cardinality" : "SINGLE",
       "valuesMinCount" : 12345,
       "valuesMaxCount" : 12345,
       "isUnique" : true,
@@ -1067,7 +1067,7 @@ Accept: application/json
       "isIndexable" : true,
       "constraints" : [ { }, { } ]
     } ],
-    "category" : "CLASSIFICATION",
+    "category" : "ENUM",
     "guid" : "...",
     "createdBy" : "...",
     "updatedBy" : "...",
@@ -1097,14 +1097,14 @@ Accept: application/json
       "name" : "...",
       "typeName" : "...",
       "isOptional" : true,
-      "cardinality" : "SINGLE",
+      "cardinality" : "LIST",
       "valuesMinCount" : 12345,
       "valuesMaxCount" : 12345,
       "isUnique" : true,
       "isIndexable" : true,
       "constraints" : [ { }, { } ]
     } ],
-    "category" : "ARRAY",
+    "category" : "ENUM",
     "guid" : "...",
     "createdBy" : "...",
     "updatedBy" : "...",
@@ -1143,7 +1143,7 @@ Content-Type: application/json
       "ordinal" : 12345
     } ],
     "defaultValue" : "...",
-    "category" : "MAP",
+    "category" : "STRUCT",
     "guid" : "...",
     "createdBy" : "...",
     "updatedBy" : "...",
@@ -1168,7 +1168,7 @@ Content-Type: application/json
       "ordinal" : 12345
     } ],
     "defaultValue" : "...",
-    "category" : "CLASSIFICATION",
+    "category" : "ENUM",
     "guid" : "...",
     "createdBy" : "...",
     "updatedBy" : "...",
@@ -1188,7 +1188,7 @@ Content-Type: application/json
       "name" : "...",
       "typeName" : "...",
       "isOptional" : true,
-      "cardinality" : "SET",
+      "cardinality" : "LIST",
       "valuesMinCount" : 12345,
       "valuesMaxCount" : 12345,
       "isUnique" : true,
@@ -1205,7 +1205,7 @@ Content-Type: application/json
       "isIndexable" : true,
       "constraints" : [ { }, { } ]
     } ],
-    "category" : "OBJECT_ID_TYPE",
+    "category" : "PRIMITIVE",
     "guid" : "...",
     "createdBy" : "...",
     "updatedBy" : "...",
@@ -1224,7 +1224,7 @@ Content-Type: application/json
       "name" : "...",
       "typeName" : "...",
       "isOptional" : true,
-      "cardinality" : "SET",
+      "cardinality" : "SINGLE",
       "valuesMinCount" : 12345,
       "valuesMaxCount" : 12345,
       "isUnique" : true,
@@ -1234,14 +1234,14 @@ Content-Type: application/json
       "name" : "...",
       "typeName" : "...",
       "isOptional" : true,
-      "cardinality" : "SET",
+      "cardinality" : "SINGLE",
       "valuesMinCount" : 12345,
       "valuesMaxCount" : 12345,
       "isUnique" : true,
       "isIndexable" : true,
       "constraints" : [ { }, { } ]
     } ],
-    "category" : "ARRAY",
+    "category" : "PRIMITIVE",
     "guid" : "...",
     "createdBy" : "...",
     "updatedBy" : "...",
@@ -1279,7 +1279,7 @@ Content-Type: application/json
       "isIndexable" : true,
       "constraints" : [ { }, { } ]
     } ],
-    "category" : "CLASSIFICATION",
+    "category" : "ENTITY",
     "guid" : "...",
     "createdBy" : "...",
     "updatedBy" : "...",
@@ -1309,14 +1309,14 @@ Content-Type: application/json
       "name" : "...",
       "typeName" : "...",
       "isOptional" : true,
-      "cardinality" : "LIST",
+      "cardinality" : "SET",
       "valuesMinCount" : 12345,
       "valuesMaxCount" : 12345,
       "isUnique" : true,
       "isIndexable" : true,
       "constraints" : [ { }, { } ]
     } ],
-    "category" : "MAP",
+    "category" : "CLASSIFICATION",
     "guid" : "...",
     "createdBy" : "...",
     "updatedBy" : "...",
@@ -1337,7 +1337,7 @@ Content-Type: application/json
       "name" : "...",
       "typeName" : "...",
       "isOptional" : true,
-      "cardinality" : "SINGLE",
+      "cardinality" : "LIST",
       "valuesMinCount" : 12345,
       "valuesMaxCount" : 12345,
       "isUnique" : true,
@@ -1354,7 +1354,7 @@ Content-Type: application/json
       "isIndexable" : true,
       "constraints" : [ { }, { } ]
     } ],
-    "category" : "MAP",
+    "category" : "ENTITY",
     "guid" : "...",
     "createdBy" : "...",
     "updatedBy" : "...",
@@ -1374,7 +1374,7 @@ Content-Type: application/json
       "name" : "...",
       "typeName" : "...",
       "isOptional" : true,
-      "cardinality" : "LIST",
+      "cardinality" : "SET",
       "valuesMinCount" : 12345,
       "valuesMaxCount" : 12345,
       "isUnique" : true,
@@ -1501,7 +1501,7 @@ Accept: application/json
       "ordinal" : 12345
     } ],
     "defaultValue" : "...",
-    "category" : "MAP",
+    "category" : "CLASSIFICATION",
     "guid" : "...",
     "createdBy" : "...",
     "updatedBy" : "...",
@@ -1526,7 +1526,7 @@ Accept: application/json
       "ordinal" : 12345
     } ],
     "defaultValue" : "...",
-    "category" : "PRIMITIVE",
+    "category" : "OBJECT_ID_TYPE",
     "guid" : "...",
     "createdBy" : "...",
     "updatedBy" : "...",
@@ -1546,7 +1546,7 @@ Accept: application/json
       "name" : "...",
       "typeName" : "...",
       "isOptional" : true,
-      "cardinality" : "SINGLE",
+      "cardinality" : "SET",
       "valuesMinCount" : 12345,
       "valuesMaxCount" : 12345,
       "isUnique" : true,
@@ -1556,14 +1556,14 @@ Accept: application/json
       "name" : "...",
       "typeName" : "...",
       "isOptional" : true,
-      "cardinality" : "LIST",
+      "cardinality" : "SET",
       "valuesMinCount" : 12345,
       "valuesMaxCount" : 12345,
       "isUnique" : true,
       "isIndexable" : true,
       "constraints" : [ { }, { } ]
     } ],
-    "category" : "ENUM",
+    "category" : "STRUCT",
     "guid" : "...",
     "createdBy" : "...",
     "updatedBy" : "...",
@@ -1592,14 +1592,14 @@ Accept: application/json
       "name" : "...",
       "typeName" : "...",
       "isOptional" : true,
-      "cardinality" : "LIST",
+      "cardinality" : "SET",
       "valuesMinCount" : 12345,
       "valuesMaxCount" : 12345,
       "isUnique" : true,
       "isIndexable" : true,
       "constraints" : [ { }, { } ]
     } ],
-    "category" : "PRIMITIVE",
+    "category" : "ARRAY",
     "guid" : "...",
     "createdBy" : "...",
     "updatedBy" : "...",
@@ -1637,7 +1637,7 @@ Accept: application/json
       "isIndexable" : true,
       "constraints" : [ { }, { } ]
     } ],
-    "category" : "PRIMITIVE",
+    "category" : "OBJECT_ID_TYPE",
     "guid" : "...",
     "createdBy" : "...",
     "updatedBy" : "...",
@@ -1657,7 +1657,7 @@ Accept: application/json
       "name" : "...",
       "typeName" : "...",
       "isOptional" : true,
-      "cardinality" : "SINGLE",
+      "cardinality" : "LIST",
       "valuesMinCount" : 12345,
       "valuesMaxCount" : 12345,
       "isUnique" : true,
@@ -1674,7 +1674,7 @@ Accept: application/json
       "isIndexable" : true,
       "constraints" : [ { }, { } ]
     } ],
-    "category" : "ENUM",
+    "category" : "ENTITY",
     "guid" : "...",
     "createdBy" : "...",
     "updatedBy" : "...",
@@ -1695,7 +1695,7 @@ Accept: application/json
       "name" : "...",
       "typeName" : "...",
       "isOptional" : true,
-      "cardinality" : "SINGLE",
+      "cardinality" : "SET",
       "valuesMinCount" : 12345,
       "valuesMaxCount" : 12345,
       "isUnique" : true,
@@ -1712,7 +1712,7 @@ Accept: application/json
       "isIndexable" : true,
       "constraints" : [ { }, { } ]
     } ],
-    "category" : "MAP",
+    "category" : "OBJECT_ID_TYPE",
     "guid" : "...",
     "createdBy" : "...",
     "updatedBy" : "...",
@@ -1732,7 +1732,7 @@ Accept: application/json
       "name" : "...",
       "typeName" : "...",
       "isOptional" : true,
-      "cardinality" : "SET",
+      "cardinality" : "LIST",
       "valuesMinCount" : 12345,
       "valuesMaxCount" : 12345,
       "isUnique" : true,
@@ -1742,14 +1742,14 @@ Accept: application/json
       "name" : "...",
       "typeName" : "...",
       "isOptional" : true,
-      "cardinality" : "SET",
+      "cardinality" : "LIST",
       "valuesMinCount" : 12345,
       "valuesMaxCount" : 12345,
       "isUnique" : true,
       "isIndexable" : true,
       "constraints" : [ { }, { } ]
     } ],
-    "category" : "ENUM",
+    "category" : "CLASSIFICATION",
     "guid" : "...",
     "createdBy" : "...",
     "updatedBy" : "...",
@@ -1788,7 +1788,7 @@ Content-Type: application/json
       "ordinal" : 12345
     } ],
     "defaultValue" : "...",
-    "category" : "ENTITY",
+    "category" : "CLASSIFICATION",
     "guid" : "...",
     "createdBy" : "...",
     "updatedBy" : "...",
@@ -1813,7 +1813,7 @@ Content-Type: application/json
       "ordinal" : 12345
     } ],
     "defaultValue" : "...",
-    "category" : "CLASSIFICATION",
+    "category" : "ENUM",
     "guid" : "...",
     "createdBy" : "...",
     "updatedBy" : "...",
@@ -1843,14 +1843,14 @@ Content-Type: application/json
       "name" : "...",
       "typeName" : "...",
       "isOptional" : true,
-      "cardinality" : "LIST",
+      "cardinality" : "SINGLE",
       "valuesMinCount" : 12345,
       "valuesMaxCount" : 12345,
       "isUnique" : true,
       "isIndexable" : true,
       "constraints" : [ { }, { } ]
     } ],
-    "category" : "ENTITY",
+    "category" : "PRIMITIVE",
     "guid" : "...",
     "createdBy" : "...",
     "updatedBy" : "...",
@@ -1869,7 +1869,7 @@ Content-Type: application/json
       "name" : "...",
       "typeName" : "...",
       "isOptional" : true,
-      "cardinality" : "SET",
+      "cardinality" : "SINGLE",
       "valuesMinCount" : 12345,
       "valuesMaxCount" : 12345,
       "isUnique" : true,
@@ -1886,7 +1886,7 @@ Content-Type: application/json
       "isIndexable" : true,
       "constraints" : [ { }, { } ]
     } ],
-    "category" : "OBJECT_ID_TYPE",
+    "category" : "STRUCT",
     "guid" : "...",
     "createdBy" : "...",
     "updatedBy" : "...",
@@ -1907,7 +1907,7 @@ Content-Type: application/json
       "name" : "...",
       "typeName" : "...",
       "isOptional" : true,
-      "cardinality" : "SET",
+      "cardinality" : "SINGLE",
       "valuesMinCount" : 12345,
       "valuesMaxCount" : 12345,
       "isUnique" : true,
@@ -1917,14 +1917,14 @@ Content-Type: application/json
       "name" : "...",
       "typeName" : "...",
       "isOptional" : true,
-      "cardinality" : "SINGLE",
+      "cardinality" : "SET",
       "valuesMinCount" : 12345,
       "valuesMaxCount" : 12345,
       "isUnique" : true,
       "isIndexable" : true,
       "constraints" : [ { }, { } ]
     } ],
-    "category" : "CLASSIFICATION",
+    "category" : "ARRAY",
     "guid" : "...",
     "createdBy" : "...",
     "updatedBy" : "...",
@@ -1944,7 +1944,7 @@ Content-Type: application/json
       "name" : "...",
       "typeName" : "...",
       "isOptional" : true,
-      "cardinality" : "SET",
+      "cardinality" : "LIST",
       "valuesMinCount" : 12345,
       "valuesMaxCount" : 12345,
       "isUnique" : true,
@@ -1954,14 +1954,14 @@ Content-Type: application/json
       "name" : "...",
       "typeName" : "...",
       "isOptional" : true,
-      "cardinality" : "SET",
+      "cardinality" : "SINGLE",
       "valuesMinCount" : 12345,
       "valuesMaxCount" : 12345,
       "isUnique" : true,
       "isIndexable" : true,
       "constraints" : [ { }, { } ]
     } ],
-    "category" : "MAP",
+    "category" : "PRIMITIVE",
     "guid" : "...",
     "createdBy" : "...",
     "updatedBy" : "...",
@@ -1982,7 +1982,7 @@ Content-Type: application/json
       "name" : "...",
       "typeName" : "...",
       "isOptional" : true,
-      "cardinality" : "SET",
+      "cardinality" : "LIST",
       "valuesMinCount" : 12345,
       "valuesMaxCount" : 12345,
       "isUnique" : true,
@@ -1992,14 +1992,14 @@ Content-Type: application/json
       "name" : "...",
       "typeName" : "...",
       "isOptional" : true,
-      "cardinality" : "SET",
+      "cardinality" : "SINGLE",
       "valuesMinCount" : 12345,
       "valuesMaxCount" : 12345,
       "isUnique" : true,
       "isIndexable" : true,
       "constraints" : [ { }, { } ]
     } ],
-    "category" : "MAP",
+    "category" : "PRIMITIVE",
     "guid" : "...",
     "createdBy" : "...",
     "updatedBy" : "...",
@@ -2019,7 +2019,7 @@ Content-Type: application/json
       "name" : "...",
       "typeName" : "...",
       "isOptional" : true,
-      "cardinality" : "SINGLE",
+      "cardinality" : "LIST",
       "valuesMinCount" : 12345,
       "valuesMaxCount" : 12345,
       "isUnique" : true,
@@ -2036,7 +2036,7 @@ Content-Type: application/json
       "isIndexable" : true,
       "constraints" : [ { }, { } ]
     } ],
-    "category" : "ENUM",
+    "category" : "ARRAY",
     "guid" : "...",
     "createdBy" : "...",
     "updatedBy" : "...",
@@ -2122,7 +2122,7 @@ Content-Type: application/json
 [ {
   "guid" : "...",
   "name" : "...",
-  "category" : "MAP"
+  "category" : "STRUCT"
 } ]
                 </code>
               </pre>
@@ -2239,7 +2239,7 @@ Content-Type: application/json
     &quot;name&quot; : &quot;...&quot;,
     &quot;typeName&quot; : &quot;...&quot;,
     &quot;isOptional&quot; : true,
-    &quot;cardinality&quot; : &quot;SINGLE&quot;,
+    &quot;cardinality&quot; : &quot;LIST&quot;,
     &quot;valuesMinCount&quot; : 12345,
     &quot;valuesMaxCount&quot; : 12345,
     &quot;isUnique&quot; : true,
@@ -2258,7 +2258,7 @@ Content-Type: application/json
       }
     } ]
   } ],
-  &quot;category&quot; : &quot;ENTITY&quot;,
+  &quot;category&quot; : &quot;PRIMITIVE&quot;,
   &quot;guid&quot; : &quot;...&quot;,
   &quot;createdBy&quot; : &quot;...&quot;,
   &quot;updatedBy&quot; : &quot;...&quot;,
@@ -2388,7 +2388,7 @@ Content-Type: application/json
     &quot;name&quot; : &quot;...&quot;,
     &quot;typeName&quot; : &quot;...&quot;,
     &quot;isOptional&quot; : true,
-    &quot;cardinality&quot; : &quot;SINGLE&quot;,
+    &quot;cardinality&quot; : &quot;SET&quot;,
     &quot;valuesMinCount&quot; : 12345,
     &quot;valuesMaxCount&quot; : 12345,
     &quot;isUnique&quot; : true,
@@ -2407,7 +2407,7 @@ Content-Type: application/json
       }
     } ]
   } ],
-  &quot;category&quot; : &quot;ENUM&quot;,
+  &quot;category&quot; : &quot;ARRAY&quot;,
   &quot;guid&quot; : &quot;...&quot;,
   &quot;createdBy&quot; : &quot;...&quot;,
   &quot;updatedBy&quot; : &quot;...&quot;,
@@ -2515,7 +2515,7 @@ Content-Type: application/json
     &quot;name&quot; : &quot;...&quot;,
     &quot;typeName&quot; : &quot;...&quot;,
     &quot;isOptional&quot; : true,
-    &quot;cardinality&quot; : &quot;SET&quot;,
+    &quot;cardinality&quot; : &quot;LIST&quot;,
     &quot;valuesMinCount&quot; : 12345,
     &quot;valuesMaxCount&quot; : 12345,
     &quot;isUnique&quot; : true,
@@ -2556,7 +2556,7 @@ Content-Type: application/json
       }
     } ]
   } ],
-  &quot;category&quot; : &quot;PRIMITIVE&quot;,
+  &quot;category&quot; : &quot;OBJECT_ID_TYPE&quot;,
   &quot;guid&quot; : &quot;...&quot;,
   &quot;createdBy&quot; : &quot;...&quot;,
   &quot;updatedBy&quot; : &quot;...&quot;,
@@ -2686,7 +2686,7 @@ Content-Type: application/json
     &quot;name&quot; : &quot;...&quot;,
     &quot;typeName&quot; : &quot;...&quot;,
     &quot;isOptional&quot; : true,
-    &quot;cardinality&quot; : &quot;LIST&quot;,
+    &quot;cardinality&quot; : &quot;SINGLE&quot;,
     &quot;valuesMinCount&quot; : 12345,
     &quot;valuesMaxCount&quot; : 12345,
     &quot;isUnique&quot; : true,
@@ -2705,7 +2705,7 @@ Content-Type: application/json
       }
     } ]
   } ],
-  &quot;category&quot; : &quot;PRIMITIVE&quot;,
+  &quot;category&quot; : &quot;MAP&quot;,
   &quot;guid&quot; : &quot;...&quot;,
   &quot;createdBy&quot; : &quot;...&quot;,
   &quot;updatedBy&quot; : &quot;...&quot;,
@@ -2818,7 +2818,7 @@ Content-Type: application/json
     &quot;ordinal&quot; : 12345
   } ],
   &quot;defaultValue&quot; : &quot;...&quot;,
-  &quot;category&quot; : &quot;MAP&quot;,
+  &quot;category&quot; : &quot;ENUM&quot;,
   &quot;guid&quot; : &quot;...&quot;,
   &quot;createdBy&quot; : &quot;...&quot;,
   &quot;updatedBy&quot; : &quot;...&quot;,
@@ -3060,7 +3060,7 @@ Content-Type: application/json
     &quot;name&quot; : &quot;...&quot;,
     &quot;typeName&quot; : &quot;...&quot;,
     &quot;isOptional&quot; : true,
-    &quot;cardinality&quot; : &quot;SINGLE&quot;,
+    &quot;cardinality&quot; : &quot;SET&quot;,
     &quot;valuesMinCount&quot; : 12345,
     &quot;valuesMaxCount&quot; : 12345,
     &quot;isUnique&quot; : true,
@@ -3079,7 +3079,7 @@ Content-Type: application/json
       }
     } ]
   } ],
-  &quot;category&quot; : &quot;STRUCT&quot;,
+  &quot;category&quot; : &quot;OBJECT_ID_TYPE&quot;,
   &quot;guid&quot; : &quot;...&quot;,
   &quot;createdBy&quot; : &quot;...&quot;,
   &quot;updatedBy&quot; : &quot;...&quot;,
@@ -3186,7 +3186,7 @@ Content-Type: application/json
     &quot;name&quot; : &quot;...&quot;,
     &quot;typeName&quot; : &quot;...&quot;,
     &quot;isOptional&quot; : true,
-    &quot;cardinality&quot; : &quot;SET&quot;,
+    &quot;cardinality&quot; : &quot;LIST&quot;,
     &quot;valuesMinCount&quot; : 12345,
     &quot;valuesMaxCount&quot; : 12345,
     &quot;isUnique&quot; : true,
@@ -3227,7 +3227,7 @@ Content-Type: application/json
       }
     } ]
   } ],
-  &quot;category&quot; : &quot;CLASSIFICATION&quot;,
+  &quot;category&quot; : &quot;ENTITY&quot;,
   &quot;guid&quot; : &quot;...&quot;,
   &quot;createdBy&quot; : &quot;...&quot;,
   &quot;updatedBy&quot; : &quot;...&quot;,
@@ -3330,7 +3330,7 @@ Content-Type: application/json
 
                 <code class="prettyprint language-js">
 {
-  &quot;category&quot; : &quot;ENUM&quot;,
+  &quot;category&quot; : &quot;MAP&quot;,
   &quot;guid&quot; : &quot;...&quot;,
   &quot;createdBy&quot; : &quot;...&quot;,
   &quot;updatedBy&quot; : &quot;...&quot;,
@@ -3433,7 +3433,7 @@ Content-Type: application/json
 
                 <code class="prettyprint language-js">
 {
-  &quot;category&quot; : &quot;CLASSIFICATION&quot;,
+  &quot;category&quot; : &quot;PRIMITIVE&quot;,
   &quot;guid&quot; : &quot;...&quot;,
   &quot;createdBy&quot; : &quot;...&quot;,
   &quot;updatedBy&quot; : &quot;...&quot;,

http://git-wip-us.apache.org/repos/asf/incubator-atlas-website/blob/b4557f9c/api/v2/resources.html
----------------------------------------------------------------------
diff --git a/api/v2/resources.html b/api/v2/resources.html
index b96c769..fcfffb4 100644
--- a/api/v2/resources.html
+++ b/api/v2/resources.html
@@ -84,11 +84,13 @@
     <tr class="clickable-row" data-href="resource_DiscoveryREST.html">
       <td>  <span class="resource-name">DiscoveryREST</span>
 </td>
-      <td class="text-nowrap"><ul class="list-unstyled"><li><samp>  <span 
class="resource-path">/v2/search/dsl</span>
+      <td class="text-nowrap"><ul class="list-unstyled"><li><samp>  <span 
class="resource-path">/v2/search/basic</span>
+</samp></li><li><samp>  <span class="resource-path">/v2/search/dsl</span>
 </samp></li><li><samp>  <span class="resource-path">/v2/search/fulltext</span>
 </samp></li></ul></td>
       <td class="text-nowrap"><ul class="list-unstyled"><li><samp>  <span 
class="label label-default resource-method">GET</span> 
 </samp></li><li><samp>  <span class="label label-default 
resource-method">GET</span> 
+</samp></li><li><samp>  <span class="label label-default 
resource-method">GET</span> 
 </samp></li></ul></td>
       <td>  <span class="resource-description">REST interface for data 
discovery using dsl or full text search</span>
 </td>
@@ -107,8 +109,8 @@
       <td class="text-nowrap"><ul class="list-unstyled"><li><samp>  <span 
class="label label-default resource-method">POST</span> 
 </samp></li><li><samp>  <span class="label label-default 
resource-method">DELETE</span> <span class="label label-default 
resource-method">GET</span> <span class="label label-default 
resource-method">POST</span> 
 </samp></li><li><samp>  <span class="label label-default 
resource-method">POST</span> 
-</samp></li><li><samp>  <span class="label label-default 
resource-method">DELETE</span> <span class="label label-default 
resource-method">GET</span> 
-</samp></li><li><samp>  <span class="label label-default 
resource-method">GET</span> <span class="label label-default 
resource-method">POST</span> <span class="label label-default 
resource-method">PUT</span> 
+</samp></li><li><samp>  <span class="label label-default 
resource-method">DELETE</span> <span class="label label-default 
resource-method">GET</span> <span class="label label-default 
resource-method">PUT</span> 
+</samp></li><li><samp>  <span class="label label-default 
resource-method">GET</span> <span class="label label-default 
resource-method">POST</span> 
 </samp></li><li><samp>  <span class="label label-default 
resource-method">DELETE</span> <span class="label label-default 
resource-method">GET</span> <span class="label label-default 
resource-method">PUT</span> 
 </samp></li><li><samp>  <span class="label label-default 
resource-method">DELETE</span> <span class="label label-default 
resource-method">GET</span> 
 </samp></li></ul></td>

http://git-wip-us.apache.org/repos/asf/incubator-atlas-website/blob/b4557f9c/api/v2/syntax_json.html
----------------------------------------------------------------------
diff --git a/api/v2/syntax_json.html b/api/v2/syntax_json.html
index baf6637..1f2d1f3 100644
--- a/api/v2/syntax_json.html
+++ b/api/v2/syntax_json.html
@@ -73,13 +73,13 @@
     <tr class="clickable-row" data-href="json_AtlasAttributeDef.html">
       <td>  <span class="datatype-name">AtlasAttributeDef</span>
 </td>
-      <td>  <span class="datatype-description">class that captures details of 
a struct-attribute.</span>
+      <td>  <span class="datatype-description">Details of a 
struct-attribute.</span>
 </td>
     </tr>
     <tr class="clickable-row" data-href="json_AtlasBaseTypeDef.html">
       <td>  <span class="datatype-name">AtlasBaseTypeDef</span>
 </td>
-      <td>  <span class="datatype-description">Base class that captures 
common-attributes for all Atlas types.</span>
+      <td>  <span class="datatype-description">Common-attributes for all Atlas 
types.</span>
 </td>
     </tr>
     <tr class="clickable-row" data-href="json_AtlasClassification.html">
@@ -91,7 +91,7 @@
     <tr class="clickable-row" data-href="json_AtlasClassificationDef.html">
       <td>  <span class="datatype-name">AtlasClassificationDef</span>
 </td>
-      <td>  <span class="datatype-description">class that captures details of 
a classification-type.</span>
+      <td>  <span class="datatype-description">Details of a 
classification-type.</span>
 </td>
     </tr>
     <tr class="clickable-row" data-href="json_AtlasClassifications.html">
@@ -103,31 +103,31 @@
     <tr class="clickable-row" data-href="json_AtlasConstraintDef.html">
       <td>  <span class="datatype-name">AtlasConstraintDef</span>
 </td>
-      <td>  <span class="datatype-description">class that captures details of 
a constraint.</span>
+      <td>  <span class="datatype-description">Details of a constraint.</span>
 </td>
     </tr>
     <tr class="clickable-row" data-href="json_AtlasEntitiesWithExtInfo.html">
       <td>  <span class="datatype-name">AtlasEntitiesWithExtInfo</span>
 </td>
-      <td>  <span class="datatype-description">An instance of an entity along 
with extended info - like hive_table, hive_database.</span>
+      <td>  <span class="datatype-description">List of Atlas entity along with 
the referred entities</span>
 </td>
     </tr>
     <tr class="clickable-row" data-href="json_AtlasEntity.html">
       <td>  <span class="datatype-name">AtlasEntity</span>
 </td>
-      <td>  <span class="datatype-description">An instance of an entity - like 
hive_table, hive_database.</span>
+      <td>  <span class="datatype-description">Atlas entity 
representation</span>
 </td>
     </tr>
     <tr class="clickable-row" data-href="json_AtlasEntityDef.html">
       <td>  <span class="datatype-name">AtlasEntityDef</span>
 </td>
-      <td>  <span class="datatype-description">class that captures details of 
a entity-type.</span>
+      <td>  <span class="datatype-description">Details of an 
entity-type.</span>
 </td>
     </tr>
     <tr class="clickable-row" data-href="json_AtlasEntityExtInfo.html">
       <td>  <span class="datatype-name">AtlasEntityExtInfo</span>
 </td>
-      <td>  <span class="datatype-description">An instance of an entity along 
with extended info - like hive_table, hive_database.</span>
+      <td>  <span class="datatype-description">Entity representation along 
with extended info which included the entities being referred to</span>
 </td>
     </tr>
     <tr class="clickable-row" data-href="json_AtlasEntityHeader.html">
@@ -139,109 +139,109 @@
     <tr class="clickable-row" data-href="json_AtlasEntityWithExtInfo.html">
       <td>  <span class="datatype-name">AtlasEntityWithExtInfo</span>
 </td>
-      <td>  <span class="datatype-description">An instance of an entity along 
with extended info - like hive_table, hive_database.</span>
+      <td>  <span class="datatype-description">Entity with information about 
the referred entities</span>
 </td>
     </tr>
     <tr class="clickable-row" data-href="json_AtlasEnumDef.html">
       <td>  <span class="datatype-name">AtlasEnumDef</span>
 </td>
-      <td>  <span class="datatype-description">class that captures details of 
an enum-type.</span>
+      <td>  <span class="datatype-description">Details of an enum-type.</span>
 </td>
     </tr>
     <tr class="clickable-row" data-href="json_AtlasEnumElementDef.html">
       <td>  <span class="datatype-name">AtlasEnumElementDef</span>
 </td>
-      <td>  <span class="datatype-description">class that captures details of 
an enum-element.</span>
+      <td>  <span class="datatype-description">Details of an 
enum-element.</span>
 </td>
     </tr>
     <tr class="clickable-row" data-href="json_AtlasFullTextResult.html">
       <td>  <span class="datatype-name">AtlasFullTextResult</span>
 </td>
-      <td>  <span class="datatype-description"></span>
+      <td>  <span class="datatype-description">Search results for FullText 
APIs</span>
 </td>
     </tr>
     <tr class="clickable-row" data-href="json_AtlasLineageInfo.html">
       <td>  <span class="datatype-name">AtlasLineageInfo</span>
 </td>
-      <td>  <span class="datatype-description"></span>
+      <td>  <span class="datatype-description">Lineage information for a 
single entity</span>
 </td>
     </tr>
     <tr class="clickable-row" data-href="json_AtlasQueryType.html">
       <td>  <span class="datatype-name">AtlasQueryType</span>
 </td>
-      <td>  <span class="datatype-description"></span>
+      <td>  <span class="datatype-description">Various querying mechanisms 
supported by Atlas</span>
 </td>
     </tr>
     <tr class="clickable-row" data-href="json_AtlasSearchResult.html">
       <td>  <span class="datatype-name">AtlasSearchResult</span>
 </td>
-      <td>  <span class="datatype-description"></span>
+      <td>  <span class="datatype-description">Search results of the Discovery 
APIs</span>
 </td>
     </tr>
     <tr class="clickable-row" data-href="json_AtlasStruct.html">
       <td>  <span class="datatype-name">AtlasStruct</span>
 </td>
-      <td>  <span class="datatype-description">Captures details of struct 
contents. Not instantiated directly, used only via AtlasEntity, 
AtlasClassification.</span>
+      <td>  <span class="datatype-description">Details of a struct. Not 
instantiated directly, used only via AtlasEntity, AtlasClassification.</span>
 </td>
     </tr>
     <tr class="clickable-row" data-href="json_AtlasStructDef.html">
       <td>  <span class="datatype-name">AtlasStructDef</span>
 </td>
-      <td>  <span class="datatype-description">class that captures details of 
a struct-type.</span>
+      <td>  <span class="datatype-description">Details of a struct-type.</span>
 </td>
     </tr>
     <tr class="clickable-row" data-href="json_AtlasTypeDefHeader.html">
       <td>  <span class="datatype-name">AtlasTypeDefHeader</span>
 </td>
-      <td>  <span class="datatype-description"></span>
+      <td>  <span class="datatype-description">Minimal set of information 
about a type definition</span>
 </td>
     </tr>
     <tr class="clickable-row" data-href="json_AtlasTypesDef.html">
       <td>  <span class="datatype-name">AtlasTypesDef</span>
 </td>
-      <td>  <span class="datatype-description"></span>
+      <td>  <span class="datatype-description">A collection of atlas enum, 
struct, classification and entity definitions (models).</span>
 </td>
     </tr>
     <tr class="clickable-row" data-href="json_AttributeSearchResult.html">
       <td>  <span class="datatype-name">AttributeSearchResult</span>
 </td>
-      <td>  <span class="datatype-description"></span>
+      <td>  <span class="datatype-description">Search results for 
attribute(s)</span>
 </td>
     </tr>
     <tr class="clickable-row" data-href="json_Cardinality.html">
       <td>  <span class="datatype-name">Cardinality</span>
 </td>
-      <td>  <span class="datatype-description">single-valued attribute or 
multi-valued attribute.</span>
+      <td>  <span class="datatype-description">Cardinality of an attribute 
i.e. single-valued or multi-valued.</span>
 </td>
     </tr>
     <tr class="clickable-row" 
data-href="json_ClassificationAssociateRequest.html">
       <td>  <span class="datatype-name">ClassificationAssociateRequest</span>
 </td>
-      <td>  <span class="datatype-description"></span>
+      <td>  <span class="datatype-description">Tag association request for a 
list of entities</span>
 </td>
     </tr>
     <tr class="clickable-row" data-href="json_EntityMutationResponse.html">
       <td>  <span class="datatype-name">EntityMutationResponse</span>
 </td>
-      <td>  <span class="datatype-description"></span>
+      <td>  <span class="datatype-description">Entity modification response. 
Contains entity headers for each successful modification 
(create/update/delete)</span>
 </td>
     </tr>
     <tr class="clickable-row" data-href="json_EntityOperation.html">
       <td>  <span class="datatype-name">EntityOperation</span>
 </td>
-      <td>  <span class="datatype-description"></span>
+      <td>  <span class="datatype-description">Entity operations supported by 
Atlas via REST</span>
 </td>
     </tr>
     <tr class="clickable-row" data-href="json_LineageDirection.html">
       <td>  <span class="datatype-name">LineageDirection</span>
 </td>
-      <td>  <span class="datatype-description"></span>
+      <td>  <span class="datatype-description">Lineage direction</span>
 </td>
     </tr>
     <tr class="clickable-row" data-href="json_LineageRelation.html">
       <td>  <span class="datatype-name">LineageRelation</span>
 </td>
-      <td>  <span class="datatype-description"></span>
+      <td>  <span class="datatype-description">Lineage relation between two 
entities</span>
 </td>
     </tr>
     <tr class="clickable-row" data-href="json_PList.html">
@@ -253,19 +253,19 @@
     <tr class="clickable-row" data-href="json_SortType.html">
       <td>  <span class="datatype-name">SortType</span>
 </td>
-      <td>  <span class="datatype-description">to specify whether the result 
should be sorted? If yes, whether asc or desc.</span>
+      <td>  <span class="datatype-description">Type of sorting to be applied 
on the result set, defaults to NONE</span>
 </td>
     </tr>
     <tr class="clickable-row" data-href="json_Status.html">
       <td>  <span class="datatype-name">Status</span>
 </td>
-      <td>  <span class="datatype-description">Status of the entity - can be 
active or deleted. Deleted entities are not removed from Atlas store.</span>
+      <td>  <span class="datatype-description">Status of the entity - can be 
active or deleted.</span>
 </td>
     </tr>
     <tr class="clickable-row" data-href="json_TypeCategory.html">
       <td>  <span class="datatype-name">TypeCategory</span>
 </td>
-      <td>  <span class="datatype-description"></span>
+      <td>  <span class="datatype-description">Category of a defined 
type</span>
 </td>
     </tr>
   </tbody>

Reply via email to