fix conflicts

[roojs1] / docs / symbols / Roo.form.Form.json

diff --git a/docs/symbols/Roo.form.Form.json b/docs/symbols/Roo.form.Form.json
index 75d14e3..b4372d9 100644 (file)
--- a/docs/symbols/Roo.form.Form.json
+++ b/docs/symbols/Roo.form.Form.json
@@ -72,14 +72,6 @@
         "right"
       ]
     },
-    {
-      "name" : "(left|center|right)",
-      "type" : "String",
-      "desc" : "buttonAlign Valid values are \"left,\" \"center\" and \"right\" (defaults to \"center\")",
-      "memberOf" : "",
-      "isOptional" : false,
-      "optvals" : []
-    },
     {
       "name" : "listeners",
       "type" : "Object",
@@ -136,6 +128,18 @@
       "isOptional" : false,
       "optvals" : []
     },
+    {
+      "name" : "buttonAlign",
+      "type" : "String",
+      "desc" : "t)  Valid values are \"left,\" \"center\" and \"right\" (defaults to \"center",
+      "memberOf" : "",
+      "isOptional" : false,
+      "optvals" : [
+        "left",
+        "center",
+        "right"
+      ]
+    },
     {
       "name" : "method",
       "type" : "String",
@@ -147,13 +151,10 @@
     {
       "name" : "errorMask",
       "type" : "Boolean",
-      "desc" : "e) default fal",
+      "desc" : "Should the form be masked (and the active element highlighted on error - default false",
       "memberOf" : "Roo.form.BasicForm",
       "isOptional" : false,
-      "optvals" : [
-        "true",
-        "false"
-      ]
+      "optvals" : []
     },
     {
       "name" : "itemCls",
@@ -230,7 +231,7 @@
     {
       "name" : "maskOffset",
       "type" : "Number",
-      "desc" : "Default 100",
+      "desc" : "space around form element to mask if there is an error Default 100",
       "memberOf" : "Roo.form.BasicForm",
       "isOptional" : false,
       "optvals" : []
@@ -808,7 +809,7 @@
         {
           "name" : "asString",
           "type" : "Boolean",
-          "desc" : "",
+          "desc" : "(def)",
           "isOptional" : false
         }
       ],