added 2.x api branch

docs/configuration.asciidoc

@@ -64,6 +64,7 @@ Options in node :::
   * `"1.1"`
   * `"1.0"`
   * `"0.90"`
+  * `"2.x"` (unstable)
   * `"master"` (unstable)
 
 Options in the browser :::

package.json

@@ -33,6 +33,7 @@
       "0.90"
     ],
     "unstable_es_branches": [
+      "2.x",
       "master"
     ]
   },
@@ -100,4 +101,4 @@
     "node": ">=0.8 <3.0",
     "iojs": ">=1.5"
   }
-}
+}

scripts/Version.js

@@ -19,7 +19,7 @@ Version.fromBranch = function (branch) {
   var m;
 
   // master === the highest version number
-  if (branch === 'master') return new Version('2.0.0');
+  if (branch === 'master') return new Version('3.0.0');
 
   // n.m -> n.m.0
   if (m = branch.match(/^\d+\.\d+$/)) return new Version(branch + '.0');
@@ -53,4 +53,4 @@ Version.prototype.mergeOpts = function (opts) {
   .reduce(_.merge, {});
 };
 
-module.exports = Version;
+module.exports = Version;

src/lib/apis/index.js

@@ -1,5 +1,6 @@
 module.exports = {
   'master': require('./master'),
+  '2.x': require('./2_x'),
   '2.0': require('./2_0'),
   '1.7': require('./1_7'),
   '1.6': require('./1_6'),

src/lib/apis/master.js

@@ -4318,9 +4318,7 @@ api.msearch = ca({
         'query_then_fetch',
         'query_and_fetch',
         'dfs_query_then_fetch',
-        'dfs_query_and_fetch',
-        'count',
-        'scan'
+        'dfs_query_and_fetch'
       ],
       name: 'search_type'
     }
@@ -5183,9 +5181,7 @@ api.search = ca({
       type: 'enum',
       options: [
         'query_then_fetch',
-        'dfs_query_then_fetch',
-        'count',
-        'scan'
+        'dfs_query_then_fetch'
       ],
       name: 'search_type'
     },
@@ -5506,9 +5502,7 @@ api.searchTemplate = ca({
         'query_then_fetch',
         'query_and_fetch',
         'dfs_query_then_fetch',
-        'dfs_query_and_fetch',
-        'count',
-        'scan'
+        'dfs_query_and_fetch'
       ],
       name: 'search_type'
     }